work on remaining bug with nested schema ID

Signed-off-by: Frederic BIDON <[email protected]>

Author: fredbi

circular_test.go

@@ -195,11 +195,12 @@ func TestExpandCircular_RemoteCircularID(t *testing.T) {
 	})
 
 	t.Run("withID", func(t *testing.T) {
+		t.SkipNow() // TODO(fred)
 		Debug = true
-		t.SkipNow() // TODO(fredbi)
 		const fixturePath = "fixtures/more_circulars/with-id.json"
 		jazon := expandThisOrDieTrying(t, fixturePath)
 		t.Log(jazon)
+		Debug = false
 
 		// cannot guarantee that the circular will always hook on the same $ref
 		// but we can assert that thre is only one

expander.go

@@ -204,6 +204,7 @@ func expandSchema(target Schema, parentRefs []string, resolver *schemaLoader, ba
 	if target.ID != "" {
 		var parent string
 		basePath, parent = resolver.setSchemaID(target, target.ID, basePath, pointer)
+		// TODO(fred): do we need this? resolver = resolver.transitiveResolver(basePath, MustCreateRef(parent))
 
 		// add normalized ID to the list of parents, in order to detect cycles
 		parentRefs = append(parentRefs, parent)

schema_loader.go

@@ -405,13 +405,17 @@ func (r *schemaLoader) setSchemaID(target interface{}, id, basePath, pointer str
 		r.context.rootID = id
 	}
 
+	// u, _ := url.Parse(refPath)
+
 	// remembers the schema id's encountered
 	// r.context.ids[id] = true
 
 	// updates the current base path
 	// * important: ID can be a relative path
 	// * registers target to be fetchable from the new base proposed by this id
 	newBasePath := normalizePaths(refPath, basePath)
+	debugLog("newBasePath: %s", newBasePath)
+	// debugLog("pointer: %s, %s", pointer, u.Path)
 
 	// store found IDs for possible future reuse in $ref
 	if _, found := r.cache.Get(newBasePath); !found {