Fixing remote ref tests on draft-7

The late initialisation is already executed on the detached
context but the anchor / json pointer resolution requires late
initialisation. Adding ugly API layer to resolve this issue.

sitelib/text/json/schema/validators/api.scm

@@ -60,6 +60,8 @@
 	    make-disjoint-context
 	    make-schema-context
 
+	    schema-context->schema-validator/late-initiation
+
 	    schema-context:find-by-id schema-context:set-id!
 	    schema-context:root-schema
 	    schema-context:find-by-anchor schema-context:add-anchor!
@@ -518,10 +520,14 @@
   validator)
 
 (define (initial-schema-context->schema-validator initial-context)
+  (schema-context->schema-validator/late-initiation initial-context '("#")))
+
+(define (schema-context->schema-validator/late-initiation context schema-path)
   (define (finish validator)
-    (schema-context:execute-late-init! initial-context)
+    (schema-context:execute-late-init! context)
     validator)
-  (finish (schema-context->schema-validator initial-context '("#"))))
+  (finish (schema-context->schema-validator context schema-path)))
+
 
 ;; schema-context -> validator
 ;; schema-path is debug or reporting purpose
@@ -569,7 +575,6 @@
   (define (initializer)
     (schema-validator->core-validator
      (schema-context->schema-validator context schema-path)))
-
   (cond ((hashtable-ref cache context #f))
 	(else
 	 (let ((validator (schema-context:delayed-validator

sitelib/text/json/schema/validators/ref.scm

@@ -66,7 +66,7 @@
 
 (define (ref-not-found value schema-path)
   (assertion-violation 'json-schema:$ref "$ref not found" value schema-path))
-(define (check-anchor schema id anchor schema-path)
+(define (check-anchor schema id anchor schema-path remote?)
   (cond ((not anchor)
 	 (cond ((schema-context-validator schema))
 	       ;; in case of cross reference or self $id reference
@@ -79,6 +79,15 @@
 	     (ref-not-found anchor schema-path))
 	   (let ((schema (make-schema-context s schema)))
 	     (cond ((schema-context-validator schema))
+		   ;; if it's from remote schema, then the target schema
+		   ;; is already resolved (i.e. after
+		   ;; initial-schema-context->schema-validator procedure
+		   ;; execution), which means no late execution will be
+		   ;; done. So, the delayed validator initializer won't
+		   ;; be executed by default.
+		   (remote?
+		    (schema-context->schema-validator/late-initiation
+		     schema (list anchor)))
 		   (else (->cached-validator schema id anchor))))))
 	((string-null? anchor)
 	 ;; recursive
@@ -100,7 +109,7 @@
       ;; If the schema has it, then it'd be overwritten anyway.
       (json-schema:$id id this-context "#")
       (let ((validator (initial-schema-context->schema-validator this-context)))
-	(cond ((check-anchor this-context id anchor schema-path))
+	(cond ((check-anchor this-context id anchor schema-path #t))
 	      (else validator))))))
 
 (define (find-by-id value context)
@@ -130,10 +139,10 @@
 		  (cond ((not schema)
 			 (resolve-external-schema context id
 						  anchor schema-path))
-			((check-anchor schema #f anchor schema-path))
+			((check-anchor schema #f anchor schema-path #f))
 			(else (schema-context-validator schema))))))
 	     (list (string-append (or id "") "#"))))
-	   ((check-anchor schema #f anchor schema-path))
+	   ((check-anchor schema #f anchor schema-path #f))
 	   (else
 	    (schema-context:delayed-validator context
 	     (lambda ()