z-schema 12.1.1 → 12.3.1

package/src/report.ts

@@ -76,7 +76,7 @@ export class Report {
   commonErrorMessage?: string;
   __$recursiveAnchorStack: JsonSchemaInternal[] = [];
   __$dynamicScopeStack: JsonSchemaInternal[] = [];
-  __validationResultCache: Map<unknown, Map<unknown, boolean>> = new Map();
+  __validationResultCache = new Map<unknown, Map<unknown, boolean>>();
   errors: SchemaErrorDetail[] = [];
   json?: unknown;
   path: Array<number | string> = [];
@@ -88,8 +88,7 @@ export class Report {
   reportOptions: ReportOptions;
   validateOptions: ValidateOptions = {};
 
-  constructor(zschemaOptions: ZSchemaOptions, validateOptions?: ValidateOptions); // primary
-  constructor(parentReport: Report, validateOptions?: ValidateOptions); // subreport
+  constructor(parentOrOptions: ZSchemaOptions | Report, validateOptions?: ValidateOptions); // primary | subreport
   constructor(parentReport: Report, reportOptions: ReportOptions, validateOptions?: ValidateOptions); // subreport with options
   constructor(
     parentOrOptions: ZSchemaOptions | Report,
@@ -102,8 +101,8 @@ export class Report {
       // subreport
       this.reportOptions = (reportOptionsOrValidate as ReportOptions) || {};
       this.validateOptions = validateOptions || parentOrOptions.validateOptions;
-      this.__$recursiveAnchorStack = [...parentOrOptions.__$recursiveAnchorStack];
-      this.__$dynamicScopeStack = [...parentOrOptions.__$dynamicScopeStack];
+      this.__$recursiveAnchorStack = parentOrOptions.__$recursiveAnchorStack.slice();
+      this.__$dynamicScopeStack = parentOrOptions.__$dynamicScopeStack.slice();
       this.__validationResultCache = parentOrOptions.__validationResultCache;
     } else {
       // primary
@@ -122,7 +121,7 @@ export class Report {
     return this.errors.length === 0;
   }
 
-  addAsyncTask<FV, FN extends (...args: any[]) => FV>(
+  addAsyncTask<FN extends (...args: any[]) => any>(
     fn: FN,
     args: Parameters<FN>,
     asyncTaskResultProcessFn: (result: ReturnType<FN>) => void
@@ -212,39 +211,32 @@ export class Report {
   }
 
   getPath(returnPathAsString?: boolean) {
-    let path: Array<string | number> = [];
-    if (this.parentReport) {
-      path = path.concat(this.parentReport.path);
-    }
-    path = path.concat(this.path);
+    const path: Array<string | number> = this.parentReport
+      ? this.parentReport.path.concat(this.path)
+      : this.path.slice();
 
     if (returnPathAsString !== true) {
       // Sanitize the path segments (http://tools.ietf.org/html/rfc6901#section-4)
-      return (
-        '#/' +
-        path
-          .map(function (segment) {
-            segment = segment.toString();
-
-            if (isAbsoluteUri(segment)) {
-              return 'uri(' + segment + ')';
-            }
-
-            return segment.replace(/~/g, '~0').replace(/\//g, '~1');
-          })
-          .join('/')
-      );
+      return `#/${path
+        .map((segment) => {
+          segment = segment.toString();
+
+          if (isAbsoluteUri(segment)) {
+            return `uri(${segment})`;
+          }
+
+          return segment.replaceAll('~', '~0').replaceAll('/', '~1');
+        })
+        .join('/')}`;
     }
     return path;
   }
 
   getSchemaPath(): Array<string | number> {
-    let schemaPath: Array<string | number> = [];
     if (this.parentReport) {
-      schemaPath = schemaPath.concat(this.parentReport.schemaPath);
+      return this.parentReport.schemaPath.concat(this.schemaPath);
     }
-    schemaPath = schemaPath.concat(this.schemaPath);
-    return schemaPath;
+    return this.schemaPath.slice();
   }
 
   getSchemaId(): string | undefined {
@@ -253,16 +245,12 @@ export class Report {
     }
 
     // get the error path as an array
-    let path: Array<string | number> = [];
-    if (this.parentReport) {
-      path = path.concat(this.parentReport.path);
-    }
-    path = path.concat(this.path);
+    const path = this.parentReport ? this.parentReport.path.concat(this.path) : this.path.slice();
 
     // try to find id in the error path
     while (path.length > 0) {
       const obj = get(this.rootSchema, path);
-      if (obj && obj.id) {
+      if (isObject(obj) && typeof obj.id === 'string') {
         return obj.id;
       }
       path.pop();
@@ -272,7 +260,7 @@ export class Report {
     return this.rootSchema.id;
   }
 
-  hasError(errCode: string, errParams: Array<any>) {
+  hasError(errCode: string, errParams: any[]) {
     for (let idx = 0; idx < this.errors.length; idx++) {
       if (this.errors[idx].code === errCode) {
         // assume match
@@ -331,28 +319,27 @@ export class Report {
     }
 
     if (!errorMessage) {
-      throw new Error('No errorMessage known for code ' + errorCode);
+      throw new Error(`No errorMessage known for code ${errorCode}`);
     }
 
-    params = params || [];
+    params ||= [];
 
     for (let idx = 0; idx < params.length; idx++) {
       const param = params[idx] === null || isObject(params[idx]) ? JSON.stringify(params[idx]) : params[idx];
-      errorMessage = errorMessage.replace('{' + idx + '}', param.toString());
+      errorMessage = errorMessage.replace(`{${idx}}`, param.toString());
     }
 
-    const err: SchemaErrorDetail = {
+    const err = {
       code: errorCode,
-      params: params,
+      params,
       message: errorMessage,
       path: this.getPath(this.options.reportPathAsArray),
       schemaPath: this.getSchemaPath(),
       schemaId: this.getSchemaId(),
-      keyword: keyword,
-    };
-
-    (err as any)[schemaSymbol] = schema;
-    (err as any)[jsonSymbol] = this.getJson();
+      keyword,
+      [schemaSymbol]: schema,
+      [jsonSymbol]: this.getJson(),
+    } as SchemaErrorDetail;
 
     if (schema && typeof schema === 'string') {
       err.description = schema;
@@ -370,9 +357,10 @@ export class Report {
         subReports = [subReports];
       }
       err.inner = [];
-      for (const subReport of subReports) {
-        for (const error of subReport.errors) {
-          err.inner.push(error);
+      for (let si = 0; si < subReports.length; si++) {
+        const errs = subReports[si].errors;
+        for (let ei = 0; ei < errs.length; ei++) {
+          err.inner.push(errs[ei]);
         }
       }
       if (err.inner.length === 0) {

package/src/schema-cache.ts

@@ -27,7 +27,7 @@ function getSafeRemotePath(uri: string): string | undefined {
 const getEffectiveId = (schema: JsonSchemaInternal): string | undefined => {
   let id = getId(schema);
   if ((!id || !isAbsoluteUri(id)) && typeof schema.id === 'string' && isAbsoluteUri(schema.id)) {
-    id = schema.id;
+    ({ id } = schema);
   }
   return id;
 };
@@ -43,13 +43,9 @@ export function prepareRemoteSchema(
   validationOptions?: ZSchemaOptions,
   maxCloneDepth?: number
 ): JsonSchemaInternal {
-  let _schema: JsonSchemaInternal;
-
-  if (typeof schema === 'string') {
-    _schema = JSON.parse(schema);
-  } else {
-    _schema = deepClone(schema, maxCloneDepth);
-  }
+  const _schema = (
+    typeof schema === 'string' ? JSON.parse(schema) : deepClone(schema, maxCloneDepth)
+  ) as JsonSchemaInternal;
 
   if (!_schema.id) {
     _schema.id = uri;
@@ -63,10 +59,13 @@ export function prepareRemoteSchema(
 }
 
 export class SchemaCache {
-  static global_cache: SchemaCacheStorage = Object.create(null);
-  cache: SchemaCacheStorage = Object.create(null);
+  static global_cache: SchemaCacheStorage = Object.create(null) as SchemaCacheStorage;
+  cache: SchemaCacheStorage = Object.create(null) as SchemaCacheStorage;
+  private readonly validator: ZSchemaBase;
 
-  constructor(private validator: ZSchemaBase) {}
+  constructor(validator: ZSchemaBase) {
+    this.validator = validator;
+  }
 
   static cacheSchemaByUri(uri: string, schema: JsonSchemaInternal) {
     const remotePath = getSafeRemotePath(uri);
@@ -190,7 +189,7 @@ export class SchemaCache {
           usesAncestorReport = true;
         } else {
           remoteReport = new Report(report);
-          const noCache = result.id && isAbsoluteUri(result.id) ? false : true;
+          const noCache = !(result.id && isAbsoluteUri(result.id));
           if (this.validator.sc.compileSchema(remoteReport, result, { noCache })) {
             const savedOptions = this.validator.options;
             try {
@@ -220,7 +219,7 @@ export class SchemaCache {
         report.path.pop();
 
         if (!remoteReportIsValid) {
-          return undefined;
+          return;
         }
       }
     }
@@ -231,6 +230,7 @@ export class SchemaCache {
       const parts = queryPath.split('/');
       for (let idx = 0, lim = parts.length; result && idx < lim; idx++) {
         const key = decodeJSONPointer(parts[idx]);
+        // oxlint-disable-next-line unicorn/prefer-ternary
         if (idx === 0) {
           // it's an id
           result = findId(result, key, remotePath, remotePath, this.validator.options.maxRecursionDepth);