@sinclair/typebox 0.26.8 → 0.26.9

package/compiler/compiler.js

@@ -79,35 +79,6 @@ var Character;
     Character.IsNumeric = IsNumeric;
 })(Character || (Character = {}));
 // -------------------------------------------------------------------
-// MemberExpression
-// -------------------------------------------------------------------
-var MemberExpression;
-(function (MemberExpression) {
-    function IsFirstCharacterNumeric(value) {
-        if (value.length === 0)
-            return false;
-        return Character.IsNumeric(value.charCodeAt(0));
-    }
-    function IsAccessor(value) {
-        if (IsFirstCharacterNumeric(value))
-            return false;
-        for (let i = 0; i < value.length; i++) {
-            const code = value.charCodeAt(i);
-            const check = Character.IsAlpha(code) || Character.IsNumeric(code) || Character.DollarSign(code) || Character.IsUnderscore(code);
-            if (!check)
-                return false;
-        }
-        return true;
-    }
-    function EscapeHyphen(key) {
-        return key.replace(/'/g, "\\'");
-    }
-    function Encode(object, key) {
-        return IsAccessor(key) ? `${object}.${key}` : `${object}['${EscapeHyphen(key)}']`;
-    }
-    MemberExpression.Encode = Encode;
-})(MemberExpression || (MemberExpression = {}));
-// -------------------------------------------------------------------
 // Identifier
 // -------------------------------------------------------------------
 var Identifier;
@@ -127,6 +98,25 @@ var Identifier;
     }
     Identifier.Encode = Encode;
 })(Identifier || (Identifier = {}));
+// ------------------------------------------------------------------
+// StringConstant
+// ------------------------------------------------------------------
+function IsString(value) {
+    return typeof value === 'string';
+}
+function StringConstant(value) {
+    if (!IsString(value))
+        throw Error('ConstantString: Not a String');
+    const canonical = JSON.stringify(value).slice(1, -1);
+    const escaped = canonical.replace(/'/g, "\\'");
+    return `'${escaped}'`;
+}
+// ------------------------------------------------------------------
+// MemberExpression
+// ------------------------------------------------------------------
+function MemberExpression(value, key) {
+    return `${value}[${StringConstant(key)}]`;
+}
 // -------------------------------------------------------------------
 // TypeCompiler
 // -------------------------------------------------------------------
@@ -170,7 +160,7 @@ var TypeCompiler;
     // Polices
     // -------------------------------------------------------------------
     function IsExactOptionalProperty(value, key, expression) {
-        return index_2.TypeSystem.ExactOptionalPropertyTypes ? `('${key}' in ${value} ? ${expression} : true)` : `(${MemberExpression.Encode(value, key)} !== undefined ? ${expression} : true)`;
+        return index_2.TypeSystem.ExactOptionalPropertyTypes ? `(${StringConstant(key)} in ${value} ? ${expression} : true)` : `(${MemberExpression(value, key)} !== undefined ? ${expression} : true)`;
     }
     function IsObjectCheck(value) {
         return !index_2.TypeSystem.AllowArrayObjects ? `(typeof ${value} === 'object' && ${value} !== null && !Array.isArray(${value}))` : `(typeof ${value} === 'object' && ${value} !== null)`;
@@ -255,14 +245,14 @@ var TypeCompiler;
         }
         else if (schema.unevaluatedProperties === false) {
             // prettier-ignore
-            const schemaKeys = Types.KeyResolver.Resolve(schema).map((key) => `'${key}'`).join(', ');
+            const schemaKeys = Types.KeyResolver.Resolve(schema).map((key) => `${StringConstant(key)}`).join(', ');
             const expressions = schema.allOf.map((schema) => CreateExpression(schema, references, value));
             const expression1 = `Object.getOwnPropertyNames(${value}).every(key => [${schemaKeys}].includes(key))`;
             yield `${expressions.join(' && ')} && ${expression1}`;
         }
         else if (typeof schema.unevaluatedProperties === 'object') {
             // prettier-ignore
-            const schemaKeys = Types.KeyResolver.Resolve(schema).map((key) => `'${key}'`).join(', ');
+            const schemaKeys = Types.KeyResolver.Resolve(schema).map((key) => `${StringConstant(key)}`).join(', ');
             const expressions = schema.allOf.map((schema) => CreateExpression(schema, references, value));
             const expression1 = CreateExpression(schema.unevaluatedProperties, references, 'value[key]');
             const expression2 = `Object.getOwnPropertyNames(${value}).every(key => [${schemaKeys}].includes(key) || ${expression1})`;
@@ -273,8 +263,11 @@ var TypeCompiler;
         if (typeof schema.const === 'number' || typeof schema.const === 'boolean') {
             yield `${value} === ${schema.const}`;
         }
+        else if (typeof schema.const === 'string') {
+            yield `(${value} === ${StringConstant(schema.const)})`;
+        }
         else {
-            yield `${value} === '${schema.const}'`;
+            throw Error('Invalid Literal Value');
         }
     }
     function* Never(schema, references, value) {
@@ -309,12 +302,12 @@ var TypeCompiler;
             yield `Object.getOwnPropertyNames(${value}).length <= ${schema.maxProperties}`;
         const knownKeys = globalThis.Object.getOwnPropertyNames(schema.properties);
         for (const knownKey of knownKeys) {
-            const memberExpression = MemberExpression.Encode(value, knownKey);
+            const memberExpression = MemberExpression(value, knownKey);
             const property = schema.properties[knownKey];
             if (schema.required && schema.required.includes(knownKey)) {
                 yield* Visit(property, references, memberExpression);
                 if (Types.ExtendsUndefined.Check(property))
-                    yield `('${knownKey}' in ${value})`;
+                    yield `(${StringConstant(knownKey)} in ${value})`;
             }
             else {
                 const expression = CreateExpression(property, references, memberExpression);
@@ -326,13 +319,13 @@ var TypeCompiler;
                 yield `Object.getOwnPropertyNames(${value}).length === ${knownKeys.length}`;
             }
             else {
-                const keys = `[${knownKeys.map((key) => `'${key}'`).join(', ')}]`;
+                const keys = `[${knownKeys.map((key) => `${StringConstant(key)}`).join(', ')}]`;
                 yield `Object.getOwnPropertyNames(${value}).every(key => ${keys}.includes(key))`;
             }
         }
         if (typeof schema.additionalProperties === 'object') {
             const expression = CreateExpression(schema.additionalProperties, references, 'value[key]');
-            const keys = `[${knownKeys.map((key) => `'${key}'`).join(', ')}]`;
+            const keys = `[${knownKeys.map((key) => `${StringConstant(key)}`).join(', ')}]`;
             yield `(Object.getOwnPropertyNames(${value}).every(key => ${keys}.includes(key) || ${expression}))`;
         }
     }
@@ -346,7 +339,7 @@ var TypeCompiler;
         if (IsNumber(schema.maxProperties))
             yield `Object.getOwnPropertyNames(${value}).length <= ${schema.maxProperties}`;
         const [keyPattern, valueSchema] = globalThis.Object.entries(schema.patternProperties)[0];
-        const local = PushLocal(`new RegExp(/${keyPattern}/)`);
+        const local = PushLocal(`${new RegExp(keyPattern)}`);
         yield `(Object.getOwnPropertyNames(${value}).every(key => ${local}.test(key)))`;
         const expression = CreateExpression(valueSchema, references, 'value');
         yield `Object.values(${value}).every(value => ${expression})`;
@@ -374,11 +367,11 @@ var TypeCompiler;
         if (IsNumber(schema.maxLength))
             yield `${value}.length <= ${schema.maxLength}`;
         if (schema.pattern !== undefined) {
-            const local = PushLocal(`${new RegExp(schema.pattern)};`);
+            const local = PushLocal(`${new RegExp(schema.pattern)}`);
             yield `${local}.test(${value})`;
         }
         if (schema.format !== undefined) {
-            yield `format('${schema.format}', ${value})`;
+            yield `format(${StringConstant(schema.format)}, ${value})`;
         }
     }
     function* Symbol(schema, references, value) {
@@ -388,6 +381,8 @@ var TypeCompiler;
         yield `(Array.isArray(${value}))`;
         if (schema.items === undefined)
             return yield `${value}.length === 0`;
+        if (!IsNumber(schema.maxItems))
+            throw Error('MaxItems: Not a Number');
         yield `(${value}.length === ${schema.maxItems})`;
         for (let i = 0; i < schema.items.length; i++) {
             const expression = CreateExpression(schema.items[i], references, `${value}[${i}]`);
@@ -417,7 +412,7 @@ var TypeCompiler;
     function* UserDefined(schema, references, value) {
         const schema_key = `schema_key_${state_remote_custom_types.size}`;
         state_remote_custom_types.set(schema_key, schema);
-        yield `custom('${schema[Types.Kind]}', '${schema_key}', ${value})`;
+        yield `custom(${StringConstant(schema[Types.Kind])}, '${schema_key}', ${value})`;
     }
     function* Visit(schema, references, value) {
         const references_ = IsString(schema.$id) ? [...references, schema] : references;

package/license

@@ -1,23 +1,23 @@
-TypeBox: JSON Schema Type Builder with Static Type Resolution for TypeScript 
-
-The MIT License (MIT)
-
-Copyright (c) 2017-2023 Haydn Paterson (sinclair) <haydn.developer@gmail.com>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+TypeBox: JSON Schema Type Builder with Static Type Resolution for TypeScript 
+
+The MIT License (MIT)
+
+Copyright (c) 2017-2023 Haydn Paterson (sinclair) <haydn.developer@gmail.com>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.

package/package.json

@@ -1,47 +1,50 @@
-{
-  "name": "@sinclair/typebox",
-  "version": "0.26.8",
-  "description": "JSONSchema Type Builder with Static Type Resolution for TypeScript",
-  "keywords": [
-    "typescript",
-    "json-schema",
-    "validate",
-    "typecheck"
-  ],
-  "author": "sinclairzx81",
-  "license": "MIT",
-  "main": "./typebox.js",
-  "types": "./typebox.d.ts",
-  "exports": {
-    "./compiler": "./compiler/index.js",
-    "./errors": "./errors/index.js",
-    "./system": "./system/index.js",
-    "./value": "./value/index.js",
-    ".": "./typebox.js"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/sinclairzx81/typebox"
-  },
-  "scripts": {
-    "clean": "hammer task clean",
-    "format": "hammer task format",
-    "start": "hammer task start",
-    "test": "hammer task test",
-    "benchmark": "hammer task benchmark",
-    "build": "hammer task build",
-    "publish": "hammer task publish"
-  },
-  "devDependencies": {
-    "@sinclair/hammer": "^0.17.1",
-    "@types/chai": "^4.3.3",
-    "@types/mocha": "^9.1.1",
-    "@types/node": "^18.11.9",
-    "ajv": "^8.11.2",
-    "ajv-formats": "^2.1.1",
-    "chai": "^4.3.6",
-    "mocha": "^9.2.2",
-    "prettier": "^2.7.1",
-    "typescript": "^5.0.2"
-  }
-}
+{
+  "name": "@sinclair/typebox",
+  "version": "0.26.9",
+  "description": "JSONSchema Type Builder with Static Type Resolution for TypeScript",
+  "keywords": [
+    "typescript",
+    "json-schema",
+    "validate",
+    "typecheck"
+  ],
+  "author": "sinclairzx81",
+  "license": "MIT",
+  "main": "./typebox.js",
+  "types": "./typebox.d.ts",
+  "exports": {
+    "./compiler": "./compiler/index.js",
+    "./errors": "./errors/index.js",
+    "./system": "./system/index.js",
+    "./value": "./value/index.js",
+    ".": "./typebox.js"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/sinclairzx81/sinclair-typebox"
+  },
+  "scripts": {
+    "clean": "hammer task clean",
+    "format": "hammer task format",
+    "start": "hammer task start",
+    "test": "hammer task test",
+    "benchmark": "hammer task benchmark",
+    "build": "hammer task build",
+    "publish": "hammer task publish"
+  },
+  "devDependencies": {
+    "@sinclair/hammer": "^0.17.1",
+    "@types/chai": "^4.3.3",
+    "@types/mocha": "^9.1.1",
+    "@types/node": "^18.11.9",
+    "ajv": "^8.11.2",
+    "ajv-formats": "^2.1.1",
+    "chai": "^4.3.6",
+    "mocha": "^9.2.2",
+    "prettier": "^2.7.1",
+    "typescript": "^5.0.2"
+  },
+  "allowScripts": {
+    "esbuild@0.14.53": true
+  }
+}