@sinclair/typebox 0.31.29 → 0.31.30

package/compiler/compiler.d.ts

@@ -19,13 +19,6 @@ export declare class TypeCheck<T extends Types.TSchema> {
     /** Encodes a value or throws if error */
     Encode(value: unknown): Types.StaticEncode<T>;
 }
-export declare namespace StringUtil {
-    /**
-     * Unquoted string values are embedded into single-quote string. This
-     * function ensures that embedded string cannot be escaped.
-     */
-    function EscapeSingleQuote(value: string): string;
-}
 export declare class TypeCompilerUnknownTypeError extends Types.TypeBoxError {
     readonly schema: Types.TSchema;
     constructor(schema: Types.TSchema);

package/compiler/compiler.js

@@ -27,7 +27,7 @@ THE SOFTWARE.
 
 ---------------------------------------------------------------------------*/
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TypeCompiler = exports.Policy = exports.TypeCompilerTypeGuardError = exports.TypeCompilerUnknownTypeError = exports.StringUtil = exports.TypeCheck = void 0;
+exports.TypeCompiler = exports.Policy = exports.TypeCompilerTypeGuardError = exports.TypeCompilerUnknownTypeError = exports.TypeCheck = void 0;
 const transform_1 = require("../value/transform");
 const guard_1 = require("../value/guard");
 const errors_1 = require("../errors/errors");
@@ -95,49 +95,6 @@ var Character;
     }
     Character.IsNumeric = IsNumeric;
 })(Character || (Character = {}));
-// ------------------------------------------------------------------
-// StringUtil
-// ------------------------------------------------------------------
-var StringUtil;
-(function (StringUtil) {
-    /**
-     * Unquoted string values are embedded into single-quote string. This
-     * function ensures that embedded string cannot be escaped.
-     */
-    function EscapeSingleQuote(value) {
-        return JSON.stringify(value).slice(1, -1).replace(/'/g, "\\'");
-    }
-    StringUtil.EscapeSingleQuote = EscapeSingleQuote;
-})(StringUtil || (exports.StringUtil = StringUtil = {}));
-// -------------------------------------------------------------------
-// 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 StringUtil.EscapeSingleQuote(key);
-    }
-    function Encode(object, key) {
-        return IsAccessor(key) ? `${object}.${key}` : `${object}['${EscapeHyphen(key)}']`;
-    }
-    MemberExpression.Encode = Encode;
-})(MemberExpression || (MemberExpression = {}));
 // -------------------------------------------------------------------
 // Identifier
 // -------------------------------------------------------------------
@@ -158,16 +115,22 @@ var Identifier;
     }
     Identifier.Encode = Encode;
 })(Identifier || (Identifier = {}));
-// -------------------------------------------------------------------
-// LiteralString
-// -------------------------------------------------------------------
-var LiteralString;
-(function (LiteralString) {
-    function Escape(content) {
-        return StringUtil.EscapeSingleQuote(content);
-    }
-    LiteralString.Escape = Escape;
-})(LiteralString || (LiteralString = {}));
+// ------------------------------------------------------------------
+// StringConstant
+// ------------------------------------------------------------------
+function StringConstant(value) {
+    if (!(0, guard_1.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)}]`;
+}
 // -------------------------------------------------------------------
 // Errors
 // -------------------------------------------------------------------
@@ -191,7 +154,7 @@ exports.TypeCompilerTypeGuardError = TypeCompilerTypeGuardError;
 var Policy;
 (function (Policy) {
     function IsExactOptionalProperty(value, key, expression) {
-        return index_1.TypeSystemPolicy.ExactOptionalPropertyTypes ? `('${key}' in ${value} ? ${expression} : true)` : `(${MemberExpression.Encode(value, key)} !== undefined ? ${expression} : true)`;
+        return index_1.TypeSystemPolicy.ExactOptionalPropertyTypes ? `(${StringConstant(key)} in ${value} ? ${expression} : true)` : `(${MemberExpression(value, key)} !== undefined ? ${expression} : true)`;
     }
     Policy.IsExactOptionalProperty = IsExactOptionalProperty;
     function IsObjectLike(value) {
@@ -326,8 +289,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} === '${LiteralString.Escape(schema.const)}')`;
+            throw Error('Invalid Literal Value');
         }
     }
     function* TNever(schema, references, value) {
@@ -361,12 +327,12 @@ var TypeCompiler;
             yield `Object.getOwnPropertyNames(${value}).length <= ${schema.maxProperties}`;
         const knownKeys = 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) || IsAnyOrUnknown(property))
-                    yield `('${knownKey}' in ${value})`;
+                    yield `(${StringConstant(knownKey)} in ${value})`;
             }
             else {
                 const expression = CreateExpression(property, references, memberExpression);
@@ -378,13 +344,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}))`;
         }
     }
@@ -423,7 +389,7 @@ var TypeCompiler;
             yield `${variable}.test(${value})`;
         }
         if (schema.format !== undefined) {
-            yield `format('${schema.format}', ${value})`;
+            yield `format(${StringConstant(schema.format)}, ${value})`;
         }
     }
     function* TSymbol(schema, references, value) {
@@ -471,7 +437,7 @@ var TypeCompiler;
     function* TKind(schema, references, value) {
         const instance = state.instances.size;
         state.instances.set(instance, schema);
-        yield `kind('${schema[Types.Kind]}', ${instance}, ${value})`;
+        yield `kind(${StringConstant(schema[Types.Kind])}, ${instance}, ${value})`;
     }
     function* Visit(schema, references, value, useHoisting = true) {
         const references_ = (0, guard_1.IsString)(schema.$id) ? [...references, schema] : references;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sinclair/typebox",
-  "version": "0.31.29",
+  "version": "0.31.30",
   "description": "JSONSchema Type Builder with Static Type Resolution for TypeScript",
   "keywords": [
     "typescript",