@cfworker/json-schema 1.12.7 → 2.0.0

package/dist/format.js

@@ -110,7 +110,7 @@ function regex(str) {
     if (Z_ANCHOR.test(str))
         return false;
     try {
-        new RegExp(str);
+        new RegExp(str, 'u');
         return true;
     }
     catch (e) {

package/dist/types.d.ts

@@ -1,10 +1,10 @@
-export declare type SchemaDraft = '4' | '7' | '2019-09' | '2020-12';
+export type SchemaDraft = '4' | '7' | '2019-09' | '2020-12';
 export declare const enum OutputFormat {
     Flag = 1,
     Basic = 2,
     Detailed = 4
 }
-export declare type InstanceType = 'array' | 'boolean' | 'integer' | 'null' | 'number' | 'object' | 'string';
+export type InstanceType = 'array' | 'boolean' | 'integer' | 'null' | 'number' | 'object' | 'string';
 export interface Schema {
     $id?: string;
     $anchor?: string;

package/dist/validate.d.ts

@@ -1,3 +1,3 @@
 import { Schema, SchemaDraft, ValidationResult } from './types.js';
-export declare type Evaluated = Record<string | number, boolean>;
+export type Evaluated = Record<string | number, boolean>;
 export declare function validate(instance: any, schema: Schema | boolean, draft?: SchemaDraft, lookup?: Record<string, boolean | Schema>, shortCircuit?: boolean, recursiveAnchor?: Schema | null, instanceLocation?: string, schemaLocation?: string, evaluated?: Evaluated): ValidationResult;

package/dist/validate.js

@@ -426,7 +426,7 @@ export function validate(instance, schema, draft = '2019-09', lookup = dereferen
         if (!stop && $patternProperties !== undefined) {
             const keywordLocation = `${schemaLocation}/patternProperties`;
             for (const pattern in $patternProperties) {
-                const regex = new RegExp(pattern);
+                const regex = new RegExp(pattern, 'u');
                 const subSchema = $patternProperties[pattern];
                 for (const key in instance) {
                     if (!regex.test(key)) {
@@ -779,7 +779,7 @@ export function validate(instance, schema, draft = '2019-09', lookup = dereferen
                 error: `String is too long (${length} > ${$maxLength}).`
             });
         }
-        if ($pattern !== undefined && !new RegExp($pattern).test(instance)) {
+        if ($pattern !== undefined && !new RegExp($pattern, 'u').test(instance)) {
             errors.push({
                 instanceLocation,
                 keyword: 'pattern',

package/dist/validator.js

@@ -1,6 +1,10 @@
 import { dereference } from './dereference.js';
 import { validate } from './validate.js';
 export class Validator {
+    schema;
+    draft;
+    shortCircuit;
+    lookup;
     constructor(schema, draft = '2019-09', shortCircuit = true) {
         this.schema = schema;
         this.draft = draft;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cfworker/json-schema",
   "type": "module",
-  "version": "1.12.7",
+  "version": "2.0.0",
   "description": "A JSON schema validator that will run on Cloudflare workers. Supports drafts 4, 7, 2019-09, and 2020-12.",
   "keywords": [
     "json-schema",
@@ -34,16 +34,17 @@
   "scripts": {
     "build": "tsc --build",
     "clean": "tsc --build --clean",
-    "pretest": "node --experimental-import-meta-resolve suite-gen.js",
-    "test": "cfworker test test/**/*.spec.ts --nocheck"
+    "pretest": "node --experimental-import-meta-resolve suite-gen.js && esbuild test/test.ts --target=esnext --bundle --format=esm --conditions=worker,browser --outdir=dist-test --ignore-annotations",
+    "test": "node ../../test.mjs"
   },
   "devDependencies": {
-    "@cfworker/dev": "^1.14.2",
-    "@types/chai": "^4.3.3",
-    "@types/mocha": "^10.0.0",
-    "chai": "^4.3.6",
+    "@types/chai": "^4.3.17",
+    "@types/mocha": "^10.0.7",
+    "chai": "^5.1.1",
     "json-schema-test-suite": "git+https://github.com/json-schema-org/JSON-Schema-Test-Suite#76b529f",
-    "mocha": "^10.0.0",
-    "typescript": "^4.8.4"
+    "esbuild": "^0.23.1",
+    "mocha": "^10.7.3",
+    "typescript": "^5.5.4",
+    "wrangler": "^3.72.0"
   }
 }

package/src/format.ts

@@ -164,7 +164,7 @@ const Z_ANCHOR = /[^\\]\\Z/;
 function regex(str: string) {
   if (Z_ANCHOR.test(str)) return false;
   try {
-    new RegExp(str);
+    new RegExp(str, 'u');
     return true;
   } catch (e) {
     return false;

package/src/validate.ts

@@ -673,7 +673,7 @@ export function validate(
     if (!stop && $patternProperties !== undefined) {
       const keywordLocation = `${schemaLocation}/patternProperties`;
       for (const pattern in $patternProperties) {
-        const regex = new RegExp(pattern);
+        const regex = new RegExp(pattern, 'u');
         const subSchema = $patternProperties[pattern];
         for (const key in instance) {
           if (!regex.test(key)) {
@@ -1142,7 +1142,7 @@ export function validate(
         error: `String is too long (${length} > ${$maxLength}).`
       });
     }
-    if ($pattern !== undefined && !new RegExp($pattern).test(instance)) {
+    if ($pattern !== undefined && !new RegExp($pattern, 'u').test(instance)) {
       errors.push({
         instanceLocation,
         keyword: 'pattern',

package/tsconfig.json

@@ -1,14 +1,8 @@
 {
   "extends": "../../tsconfig-base",
   "compilerOptions": {
-    "target": "ES2021",
+    "target": "ESNext",
     "lib": ["ESNext", "WebWorker", "Webworker.Iterable"],
-    "types": [
-      "chai",
-      "mocha",
-      "@cfworker/worker-types",
-      "@cloudflare/workers-types"
-    ],
     "outDir": "dist",
     "rootDir": "./src"
   },