@sinclair/typebox 0.34.34 → 0.34.36

package/build/cjs/value/cast/cast.js

@@ -109,10 +109,26 @@ function FromImport(schema, references, value) {
     const target = schema.$defs[schema.$ref];
     return Visit(target, [...references, ...definitions], value);
 }
+// ------------------------------------------------------------------
+// Intersect
+// ------------------------------------------------------------------
+function IntersectAssign(correct, value) {
+    // trust correct on mismatch | value on non-object
+    if (((0, index_1.IsObject)(correct) && !(0, index_1.IsObject)(value)) || (!(0, index_1.IsObject)(correct) && (0, index_1.IsObject)(value)))
+        return correct;
+    if (!(0, index_1.IsObject)(correct) || !(0, index_1.IsObject)(value))
+        return value;
+    return globalThis.Object.getOwnPropertyNames(correct).reduce((result, key) => {
+        const property = key in value ? IntersectAssign(correct[key], value[key]) : correct[key];
+        return { ...result, [key]: property };
+    }, {});
+}
 function FromIntersect(schema, references, value) {
-    const created = (0, index_4.Create)(schema, references);
-    const mapped = (0, index_1.IsObject)(created) && (0, index_1.IsObject)(value) ? { ...created, ...value } : value;
-    return (0, index_5.Check)(schema, references, mapped) ? mapped : (0, index_4.Create)(schema, references);
+    if ((0, index_5.Check)(schema, references, value))
+        return value;
+    const correct = (0, index_4.Create)(schema, references);
+    const assigned = IntersectAssign(correct, value);
+    return (0, index_5.Check)(schema, references, assigned) ? assigned : correct;
 }
 function FromNever(schema, references, value) {
     throw new ValueCastError(schema, 'Never types cannot be cast');

package/build/cjs/value/create/create.js

@@ -8,15 +8,14 @@ const index_2 = require("../check/index");
 const index_3 = require("../clone/index");
 const index_4 = require("../deref/index");
 const index_5 = require("../../type/template-literal/index");
-const index_6 = require("../../type/patterns/index");
-const index_7 = require("../../type/registry/index");
-const index_8 = require("../../type/symbols/index");
-const index_9 = require("../../type/error/index");
+const index_6 = require("../../type/registry/index");
+const index_7 = require("../../type/symbols/index");
+const index_8 = require("../../type/error/index");
 const guard_1 = require("../guard/guard");
 // ------------------------------------------------------------------
 // Errors
 // ------------------------------------------------------------------
-class ValueCreateError extends index_9.TypeBoxError {
+class ValueCreateError extends index_8.TypeBoxError {
     constructor(schema, message) {
         super(message);
         this.schema = schema;
@@ -239,17 +238,9 @@ function FromPromise(schema, references) {
     }
 }
 function FromRecord(schema, references) {
-    const [keyPattern, valueSchema] = Object.entries(schema.patternProperties)[0];
     if ((0, index_1.HasPropertyKey)(schema, 'default')) {
         return FromDefault(schema.default);
     }
-    else if (!(keyPattern === index_6.PatternStringExact || keyPattern === index_6.PatternNumberExact)) {
-        const propertyKeys = keyPattern.slice(1, keyPattern.length - 1).split('|');
-        const Acc = {};
-        for (const key of propertyKeys)
-            Acc[key] = Visit(valueSchema, references);
-        return Acc;
-    }
     else {
         return {};
     }
@@ -398,7 +389,7 @@ function FromKind(schema, references) {
 function Visit(schema, references) {
     const references_ = (0, index_4.Pushref)(schema, references);
     const schema_ = schema;
-    switch (schema_[index_8.Kind]) {
+    switch (schema_[index_7.Kind]) {
         case 'Any':
             return FromAny(schema_, references_);
         case 'Argument':
@@ -466,7 +457,7 @@ function Visit(schema, references) {
         case 'Void':
             return FromVoid(schema_, references_);
         default:
-            if (!index_7.TypeRegistry.Has(schema_[index_8.Kind]))
+            if (!index_6.TypeRegistry.Has(schema_[index_7.Kind]))
                 throw new ValueCreateError(schema_, 'Unknown type');
             return FromKind(schema_, references_);
     }

package/build/esm/value/cast/cast.mjs

@@ -103,10 +103,26 @@ function FromImport(schema, references, value) {
     const target = schema.$defs[schema.$ref];
     return Visit(target, [...references, ...definitions], value);
 }
+// ------------------------------------------------------------------
+// Intersect
+// ------------------------------------------------------------------
+function IntersectAssign(correct, value) {
+    // trust correct on mismatch | value on non-object
+    if ((IsObject(correct) && !IsObject(value)) || (!IsObject(correct) && IsObject(value)))
+        return correct;
+    if (!IsObject(correct) || !IsObject(value))
+        return value;
+    return globalThis.Object.getOwnPropertyNames(correct).reduce((result, key) => {
+        const property = key in value ? IntersectAssign(correct[key], value[key]) : correct[key];
+        return { ...result, [key]: property };
+    }, {});
+}
 function FromIntersect(schema, references, value) {
-    const created = Create(schema, references);
-    const mapped = IsObject(created) && IsObject(value) ? { ...created, ...value } : value;
-    return Check(schema, references, mapped) ? mapped : Create(schema, references);
+    if (Check(schema, references, value))
+        return value;
+    const correct = Create(schema, references);
+    const assigned = IntersectAssign(correct, value);
+    return Check(schema, references, assigned) ? assigned : correct;
 }
 function FromNever(schema, references, value) {
     throw new ValueCastError(schema, 'Never types cannot be cast');

package/build/esm/value/create/create.mjs

@@ -3,7 +3,6 @@ import { Check } from '../check/index.mjs';
 import { Clone } from '../clone/index.mjs';
 import { Deref, Pushref } from '../deref/index.mjs';
 import { TemplateLiteralGenerate, IsTemplateLiteralFinite } from '../../type/template-literal/index.mjs';
-import { PatternStringExact, PatternNumberExact } from '../../type/patterns/index.mjs';
 import { TypeRegistry } from '../../type/registry/index.mjs';
 import { Kind } from '../../type/symbols/index.mjs';
 import { TypeBoxError } from '../../type/error/index.mjs';
@@ -233,17 +232,9 @@ function FromPromise(schema, references) {
     }
 }
 function FromRecord(schema, references) {
-    const [keyPattern, valueSchema] = Object.entries(schema.patternProperties)[0];
     if (HasPropertyKey(schema, 'default')) {
         return FromDefault(schema.default);
     }
-    else if (!(keyPattern === PatternStringExact || keyPattern === PatternNumberExact)) {
-        const propertyKeys = keyPattern.slice(1, keyPattern.length - 1).split('|');
-        const Acc = {};
-        for (const key of propertyKeys)
-            Acc[key] = Visit(valueSchema, references);
-        return Acc;
-    }
     else {
         return {};
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sinclair/typebox",
-  "version": "0.34.34",
+  "version": "0.34.36",
   "description": "Json Schema Type Builder with Static Type Resolution for TypeScript",
   "keywords": [
     "typescript",

package/readme.md

@@ -1738,6 +1738,7 @@ The following is a list of community packages that offer general tooling, extend
 | [ts2typebox](https://github.com/xddq/ts2typebox) | Creating TypeBox code from Typescript types |
 | [typebox-cli](https://github.com/gsuess/typebox-cli) | Generate Schema with TypeBox from the CLI |
 | [typebox-form-parser](https://github.com/jtlapp/typebox-form-parser) | Parses form and query data based on TypeBox schemas |
+| [typebox-schema-faker](https://github.com/iam-medvedev/typebox-schema-faker) | Generate fake data from TypeBox schemas for testing, prototyping and development |
 
 
 <a name='benchmark'></a>