publish: bump version to v10.0.0

Author: sagold

dist/jsonSchemaLibrary.js

@@ -19,7 +19,6 @@ function getDraft(drafts, $schema) {
  */
 export function compileSchema(schema, options = {}) {
     var _a, _b, _c, _d, _e;
-    /** @todo this option has to be passed to all drafts (remotes) */
     let formatAssertion = (_a = options.formatAssertion) !== null && _a !== void 0 ? _a : true;
     const drafts = (_b = options.drafts) !== null && _b !== void 0 ? _b : defaultDrafts;
     const draft = getDraft(drafts, schema === null || schema === void 0 ? void 0 : schema.$schema);

dist/module/src/compileSchema.js

@@ -128,5 +128,5 @@ function getRef(node, $ref = node === null || node === void 0 ? void 0 : node.$r
         // console.error("REF: UNFOUND 2", $ref);
         return undefined;
     }
-    console.error("REF: UNHANDLED", $ref);
+    console.error("REF: INVALID", $ref);
 }

dist/module/src/draft04/keywords/$ref.js

@@ -44,7 +44,6 @@ function validateItems({ node, data, pointer = "#", path }) {
         // note: schema is valid when data does not have enough elements as defined by array-list
         for (let i = 0; i < Math.min(node.prefixItems.length, data.length); i += 1) {
             const itemData = data[i];
-            // @todo v1 reevaluate: incomplete schema is created here?
             const itemNode = node.prefixItems[i];
             const result = validateNode(itemNode, itemData, `${pointer}/${i}`, path);
             errors.push(...result);

dist/module/src/draft2019-09/keywords/items.js

@@ -264,7 +264,6 @@ const TYPE = {
         // @ts-expect-error asd
         if ((node.items && canResolveRef(node.items, opts)) || (data === null || data === void 0 ? void 0 : data.length) > 0) {
             // @attention this should disable cache or break intended behaviour as we reset it after loop
-            // @todo test recursion of items
             // intention: reset cache after each property. last call will add counters
             const cache = { ...opts.cache };
             for (let i = 0, l = Math.max(minItems, d.length); i < l; i += 1) {

dist/module/src/draft2019-09/methods/getData.js

@@ -1,10 +1,3 @@
-// @todo this should be done with every added property in evaluationPath
-// @todo this creates a mixed schema, where $defs, etc are not uri-encoded (would be %24defs)
-function urlEncodeJsonPointerProperty(property) {
-    property = property.replace(/~/g, "~0");
-    property = property.replace(/\//g, "~1");
-    return encodeURIComponent(property);
-}
 export const $defsKeyword = {
     id: "$defs",
     keyword: "$defs",
@@ -25,3 +18,8 @@ export function parseDefs(node) {
         });
     }
 }
+function urlEncodeJsonPointerProperty(property) {
+    property = property.replace(/~/g, "~0");
+    property = property.replace(/\//g, "~1");
+    return encodeURIComponent(property);
+}

dist/module/src/keywords/$defs.js

@@ -136,7 +136,6 @@ function compileNext(referencedNode, evaluationPath = referencedNode.evaluationP
     return referencedNode.compileSchema(referencedSchema, `${evaluationPath}/$ref`, referencedNode.schemaLocation);
 }
 export function getRef(node, $ref = node === null || node === void 0 ? void 0 : node.$ref) {
-    var _a;
     if ($ref == null) {
         return node;
     }
@@ -166,14 +165,11 @@ export function getRef(node, $ref = node === null || node === void 0 ? void 0 :
             return compileNext(node.context.remotes[$ref], node.evaluationPath);
         }
         if ($ref[0] === "#") {
-            // @todo there is a bug joining multiple fragments to e.g. #/base#/examples/0
-            // from "$id": "/base" +  $ref "#/examples/0" (in refOfUnknownKeyword spec)
-            const ref = (_a = $ref.match(/#[^#]*$/)) === null || _a === void 0 ? void 0 : _a.pop(); // sanitize pointer
             // support refOfUnknownKeyword
             const rootSchema = node.context.rootNode.schema;
-            const targetSchema = get(rootSchema, ref);
+            const targetSchema = get(rootSchema, $ref);
             if (targetSchema) {
-                return node.compileSchema(targetSchema, `${node.evaluationPath}/$ref`, ref);
+                return node.compileSchema(targetSchema, `${node.evaluationPath}/$ref`, $ref);
             }
         }
         // console.error("REF: UNFOUND 1", $ref);

dist/module/src/keywords/$ref.js

@@ -42,21 +42,21 @@ const ARRAY_PROPERTIES = [
  */
 export function getSchemaType(node, data) {
     const dataType = getTypeOf(data);
-    // @ts-expect-error boolean schema true
-    if (node.schema === true) {
+    const schema = node.schema;
+    if (schema === true) {
         return SCHEMA_TYPES.includes(dataType) ? dataType : undefined;
     }
     // boolean schema false or invalid schema
-    if (!isObject(node.schema)) {
+    if (!isObject(schema)) {
         return undefined;
     }
-    const schemaType = node.schema.type;
+    const schemaType = schema.type;
     // type: []
     if (Array.isArray(schemaType)) {
         if (schemaType.includes(dataType)) {
             return dataType;
         }
-        const defaultType = getTypeOf(node.schema.default);
+        const defaultType = getTypeOf(schema.default);
         if (schemaType.includes(defaultType)) {
             return defaultType;
         }
@@ -67,13 +67,13 @@ export function getSchemaType(node, data) {
         return schemaType;
     }
     // type: undefined, enum: []
-    if (Array.isArray(node.schema.enum)) {
-        const schemaEnum = node.schema.enum;
+    if (Array.isArray(schema.enum)) {
+        const schemaEnum = schema.enum;
         const enumSchemaType = schemaEnum.map((value) => getTypeOf(value)).filter((p, i, l) => l.indexOf(p) === i);
         if (enumSchemaType.includes(dataType)) {
             return dataType;
         }
-        const defaultType = getTypeOf(node.schema.default);
+        const defaultType = getTypeOf(schema.default);
         if (enumSchemaType.includes(defaultType)) {
             return defaultType;
         }

dist/module/src/utils/getSchemaType.js

@@ -19,6 +19,9 @@ function _joinScope(previous, id) {
         return id.replace(trailingHash, "");
     }
     if (id[0] === "#") {
+        if (previous[0] === "/") {
+            return id;
+        }
         return `${previous.replace(idAndPointer, "")}${id.replace(suffixes, "")}`;
     }
     if (isDomain.test(id)) {

dist/module/src/utils/joinId.js

@@ -1,7 +1,7 @@
 import { Draft } from "./Draft";
 import { errors } from "./errors/errors";
 import { SchemaNode, isSchemaNode, GetNodeOptions } from "./SchemaNode";
-export type JsonBooleanSchema = boolean;
+export type BooleanSchema = boolean;
 export interface JsonSchema {
     [p: string]: any;
 }