@takeshape/json-schema 11.45.3 → 11.46.0

package/dist/schema-validator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schema-validator.d.ts","sourceRoot":"","sources":["../../src/schema-validator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,WAAW,EAAE,OAAO,EAAE,YAAY,EAAC,MAAM,KAAK,CAAC;AAC5D,OAAO,GAAG,MAAM,KAAK,CAAC;AAOtB,MAAM,MAAM,IAAI,GAAG,GAAG,CAAC;AAEvB,MAAM,MAAM,cAAc,GAAG;IAC3B,aAAa,EAAE,OAAO,CAAC;IACvB,WAAW,EAAE,OAAO,CAAC;IACrB,UAAU,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,KAAK,EAAE,OAAO,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,WAAW,EAAE,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC,KAAK,cAAc,CAAC;AAE1F,wBAAgB,aAAa,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,EAAE,CAE5D;AAwBD,wBAAgB,yBAAyB,CAAC,cAAc,EAAE,YAAY,EAAE,KAAK,EAAE,WAAW,GAAG,OAAO,CAWnG;AAYD,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAE/C;AAeD;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,cAAc,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,EAAE,GAAG,YAAY,GAAG,SAAS,CA6B/G;AAED,MAAM,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,UAAU,GAAG,QAAQ,GAAG,WAAW,GAAG,YAAY,CAAC,CAAC;AAsBvF,wBAAgB,QAAQ,CAAC,GAAG,EAAE,UAAU,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC,GAAG,cAAc,CA2BnH;AAED,OAAO,EAAC,GAAG,EAAE,KAAK,WAAW,EAAC,CAAC;AAC/B,wBAAgB,SAAS,CAAC,OAAO,CAAC,EAAE,OAAO,GAAG,GAAG,CAmBhD;AAeD;;;GAGG;AACH,wBAAgB,SAAS,CAAC,MAAM,EAAE,YAAY,GAAG,YAAY,CAmB5D;AAED,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,YAAY,GAAG,YAAY,EAAE,EACrC,WAAW,GAAE,YAAY,EAAO,EAChC,OAAO,GAAE,OAAY,GACpB,SAAS,CAqBX"}
+{"version":3,"file":"schema-validator.d.ts","sourceRoot":"","sources":["../../src/schema-validator.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,KAAK,CAAC;AAC9D,OAAO,GAAG,MAAM,KAAK,CAAC;AAMtB,MAAM,MAAM,IAAI,GAAG,GAAG,CAAC;AAEvB,MAAM,MAAM,cAAc,GAAG;IAC3B,aAAa,EAAE,OAAO,CAAC;IACvB,WAAW,EAAE,OAAO,CAAC;IACrB,UAAU,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,KAAK,EAAE,OAAO,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,WAAW,EAAE,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC,KAAK,cAAc,CAAC;AAE1F,wBAAgB,aAAa,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,EAAE,CAE5D;AAwBD,wBAAgB,yBAAyB,CAAC,cAAc,EAAE,YAAY,EAAE,KAAK,EAAE,WAAW,GAAG,OAAO,CAWnG;AAYD,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAE/C;AAeD;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,cAAc,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,EAAE,GAAG,YAAY,GAAG,SAAS,CA6B/G;AAED,MAAM,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,UAAU,GAAG,QAAQ,GAAG,WAAW,GAAG,YAAY,CAAC,CAAC;AAsBvF,wBAAgB,QAAQ,CAAC,GAAG,EAAE,UAAU,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC,GAAG,cAAc,CA2BnH;AAED,OAAO,EAAE,GAAG,EAAE,KAAK,WAAW,EAAE,CAAC;AACjC,wBAAgB,SAAS,CAAC,OAAO,CAAC,EAAE,OAAO,GAAG,GAAG,CAmBhD;AAcD;;;GAGG;AACH,wBAAgB,SAAS,CAAC,MAAM,EAAE,YAAY,GAAG,YAAY,CAmB5D;AAED,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,YAAY,GAAG,YAAY,EAAE,EACrC,WAAW,GAAE,YAAY,EAAO,EAChC,OAAO,GAAE,OAAY,GACpB,SAAS,CA0BX"}

package/dist/schema-validator.js

@@ -17,12 +17,12 @@ exports.isInvalidPropertyRequired = isInvalidPropertyRequired;
 exports.parseDataPath = parseDataPath;
 exports.refToPath = refToPath;
 exports.validate = validate;
+var _util = require("@takeshape/util");
 var _ajv = _interopRequireDefault(require("ajv"));
 var _ajvFormats = _interopRequireDefault(require("ajv-formats"));
 var _get = _interopRequireDefault(require("lodash/get"));
-var _unset = _interopRequireDefault(require("lodash/unset"));
 var _isString = _interopRequireDefault(require("lodash/isString"));
-var _util = require("@takeshape/util");
+var _unset = _interopRequireDefault(require("lodash/unset"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function parseDataPath(instancePath) {
   return instancePath.substr(1).split('/');
@@ -76,8 +76,8 @@ function followRef(topLevelSchema, schema) {
  * Given a schema object traverse it using a "instancePath" and return the schema at that path
  */
 function followSchemaPath(topLevelSchema, instancePath) {
-  const followPath = (schema, path) => {
-    schema = followRef(topLevelSchema, schema);
+  const followPath = (schemaObject, path) => {
+    const schema = followRef(topLevelSchema, schemaObject);
     if (path.length === 0) {
       return schema;
     }
@@ -172,7 +172,6 @@ function createAjv(options) {
  */
 function isValidRegex(str) {
   try {
-    // eslint-disable-next-line no-new
     new RegExp(str, 'u');
     return true;
   } catch {
@@ -210,9 +209,13 @@ function createSchemaValidator(schema, metaSchemas = [], options = {}) {
     ...options
   });
   if (metaSchemas) {
-    metaSchemas.forEach(metaSchema => ajv.addMetaSchema(metaSchema));
+    for (const metaSchema of metaSchemas) {
+      ajv.addMetaSchema(metaSchema);
+    }
+  }
+  for (const schema of schemas) {
+    ajv.addSchema(fixSchema(schema));
   }
-  schemas.forEach(schema => ajv.addSchema(fixSchema(schema)));
   const defaultRef = schemas[0].$id;
   if (!defaultRef) {
     throw Error('Failed to create schema validator: schema is missing $id');

package/es/schema-validator.js

@@ -1,9 +1,9 @@
+import { visit } from '@takeshape/util';
 import Ajv from 'ajv';
 import addFormats from 'ajv-formats';
 import get from 'lodash/get';
-import unset from 'lodash/unset';
 import isString from 'lodash/isString';
-import { visit } from '@takeshape/util';
+import unset from 'lodash/unset';
 export function parseDataPath(instancePath) {
   return instancePath.substr(1).split('/');
 }
@@ -56,8 +56,8 @@ function followRef(topLevelSchema, schema) {
  * Given a schema object traverse it using a "instancePath" and return the schema at that path
  */
 export function followSchemaPath(topLevelSchema, instancePath) {
-  const followPath = (schema, path) => {
-    schema = followRef(topLevelSchema, schema);
+  const followPath = (schemaObject, path) => {
+    const schema = followRef(topLevelSchema, schemaObject);
     if (path.length === 0) {
       return schema;
     }
@@ -153,7 +153,6 @@ export function createAjv(options) {
  */
 function isValidRegex(str) {
   try {
-    // eslint-disable-next-line no-new
     new RegExp(str, 'u');
     return true;
   } catch {
@@ -191,9 +190,13 @@ export function createSchemaValidator(schema, metaSchemas = [], options = {}) {
     ...options
   });
   if (metaSchemas) {
-    metaSchemas.forEach(metaSchema => ajv.addMetaSchema(metaSchema));
+    for (const metaSchema of metaSchemas) {
+      ajv.addMetaSchema(metaSchema);
+    }
+  }
+  for (const schema of schemas) {
+    ajv.addSchema(fixSchema(schema));
   }
-  schemas.forEach(schema => ajv.addSchema(fixSchema(schema)));
   const defaultRef = schemas[0].$id;
   if (!defaultRef) {
     throw Error('Failed to create schema validator: schema is missing $id');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@takeshape/json-schema",
-  "version": "11.45.3",
+  "version": "11.46.0",
   "description": "JSON Schema validator",
   "homepage": "https://www.takeshape.io",
   "repository": {
@@ -20,7 +20,7 @@
     "ajv": "^8.12.0",
     "ajv-formats": "^2.1.1",
     "lodash": "^4.17.21",
-    "@takeshape/util": "11.45.3"
+    "@takeshape/util": "11.46.0"
   },
   "devDependencies": {
     "@types/lodash": "^4.14.165"
@@ -38,8 +38,12 @@
     "build:types": "tsc --emitDeclarationOnly --project tsconfig.build.json",
     "build:types:ci": "mkdir -p  \"${GITHUB_WORKSPACE}/typecheck-results/${npm_package_name#*\\/}\" && tsc --emitDeclarationOnly --project tsconfig.build.json --pretty false | typescript-jest-junit-reporter | tee \"${GITHUB_WORKSPACE}/typecheck-results/${npm_package_name#*\\/}/typescript-results.xml\"",
     "clean": "del-cli dist es build *.tsbuildinfo",
-    "lint": "eslint . --ext .js,.ts,.json",
-    "lint:ci": "pnpm lint --quiet --format json -o \"${GITHUB_WORKSPACE}/test-results/${npm_package_name#*\\/}/eslint-results.json\"",
+    "lint": "pnpm lint:biome && pnpm lint:eslint",
+    "lint:biome": "biome check",
+    "lint:eslint": "eslint src -c ../../eslint.config.mjs",
+    "lint:ci": "pnpm lint:ci:biome",
+    "lint:ci:biome": "mkdir -p \"${GITHUB_WORKSPACE}/test-results/${npm_package_name#*\\/}\" && biome check --diagnostic-level error --reporter=junit > \"${GITHUB_WORKSPACE}/test-results/${npm_package_name#*\\/}/biome-results.xml\"",
+    "lint:ci:eslint": "pnpm lint:eslint --quiet --format json -o \"${GITHUB_WORKSPACE}/test-results/${npm_package_name#*\\/}/eslint-results.json\"",
     "test": "jest",
     "test-changed": "pnpm run test --changedSince=master",
     "test:ci": "JEST_JUNIT_OUTPUT_DIR=\"${GITHUB_WORKSPACE}/test-results/${npm_package_name#*\\/}\" JEST_JUNIT_OUTPUT_NAME=\"jest-results.xml\" jest --silent --ci --coverageDirectory=\"${GITHUB_WORKSPACE}/coverage/${npm_package_name#*\\/}\" --reporters=default  --reporters=jest-junit --maxWorkers=4",