exact-mirror 0.2.6 → 1.0.0

package/dist/cjs/index.d.ts

@@ -1,15 +1,49 @@
-import { TypeCompiler, type TypeCheck } from '@sinclair/typebox/compiler';
-import type { TAnySchema, TModule } from '@sinclair/typebox';
-export declare const mergeObjectIntersection: (schema: TAnySchema) => TAnySchema;
+import type { TSchema, TModule, Static } from 'typebox';
+import type { Compile, Validator } from 'typebox/compile';
+interface BaseSchema {
+    '~kind': string;
+    id?: string;
+    $id?: string;
+    type?: string;
+    $schema?: string;
+    const?: unknown[];
+    pattern?: string;
+    additionalItems?: boolean | AnySchema;
+    items?: AnySchema | AnySchema[];
+    required?: string[];
+    additionalProperties?: boolean | AnySchema;
+    definitions?: {
+        [name: string]: AnySchema;
+    };
+    properties?: {
+        [name: string]: AnySchema;
+    };
+    patternProperties?: {
+        [name: string]: AnySchema;
+    };
+    dependencies?: {
+        [name: string]: AnySchema | string[];
+    };
+    enum?: any[];
+    allOf?: AnySchema[];
+    anyOf?: AnySchema[];
+    oneOf?: AnySchema[];
+    not?: AnySchema;
+    $ref?: string;
+    $defs?: Record<string, AnySchema>;
+}
+type AnySchema = TSchema & BaseSchema;
+export declare const mergeObjectIntersection: (schema: AnySchema) => AnySchema;
 type MaybeArray<T> = T | T[];
 export interface Instruction {
     optionals: string[];
     optionalsInArray: string[][];
     parentIsOptional: boolean;
     array: number;
-    unions: TypeCheck<any>[][];
+    unions: Validator<any>[][];
     unionKeys: Record<string, 1>;
     sanitize: MaybeArray<(v: string) => string> | undefined;
+    fromUnion?: boolean;
     /**
      * TypeCompiler is required when using Union
      *
@@ -18,10 +52,10 @@ export interface Instruction {
      *
      * @default undefined
      */
-    TypeCompiler?: typeof TypeCompiler;
+    Compile?: typeof Compile;
     typeCompilerWanred?: boolean;
-    modules?: TModule<any, any>;
-    definitions: Record<string, TAnySchema>;
+    modules?: TModule<{}>;
+    definitions: Record<string, AnySchema>;
     recursion: number;
     /**
      * @default 8
@@ -38,5 +72,5 @@ export interface Instruction {
     removeUnknownUnionType: boolean;
 }
 export declare function deepClone<T>(source: T, weak?: WeakMap<object, any>): T;
-export declare const createMirror: <T extends TAnySchema>(schema: T, { TypeCompiler, modules, definitions, sanitize, recursionLimit, removeUnknownUnionType }?: Partial<Pick<Instruction, "TypeCompiler" | "definitions" | "sanitize" | "modules" | "recursionLimit" | "removeUnknownUnionType">>) => ((v: T["static"]) => T["static"]);
+export declare const createMirror: <T extends TSchema>(schema: T, { Compile, modules, definitions, sanitize, recursionLimit, removeUnknownUnionType }?: Partial<Pick<Instruction, "Compile" | "definitions" | "sanitize" | "modules" | "recursionLimit" | "removeUnknownUnionType">>) => ((v: Static<T>) => Static<T>);
 export default createMirror;

package/dist/cjs/index.js

@@ -26,9 +26,8 @@ __export(index_exports, {
   mergeObjectIntersection: () => mergeObjectIntersection
 });
 module.exports = __toCommonJS(index_exports);
-var import_compiler = require("@sinclair/typebox/compiler");
-var Kind = Symbol.for("TypeBox.Kind");
-var Hint = Symbol.for("TypeBox.Hint");
+var Kind = "~kind";
+var Hint = "~hint";
 var isSpecialProperty = (name) => /(\ |-|\t|\n|\.|\[|\]|\{|\})/.test(name) || !isNaN(+name[0]);
 var joinProperty = (v1, v2, isOptional = false) => {
   if (typeof v2 === "number") return `${v1}[${v2}]`;
@@ -89,7 +88,11 @@ var handleTuple = (schema, property, instruction) => {
     if (i2 !== 0) v += ",";
     v += mirror(
       schema[i2],
-      joinProperty(property, i2, instruction.parentIsOptional),
+      joinProperty(
+        property,
+        i2,
+        instruction.parentIsOptional || instruction.fromUnion
+      ),
       instruction
     );
   }
@@ -120,7 +123,7 @@ function deepClone(source, weak = /* @__PURE__ */ new WeakMap()) {
   return source;
 }
 var handleUnion = (schemas, property, instruction) => {
-  if (instruction.TypeCompiler === void 0) {
+  if (instruction.Compile === void 0) {
     if (!instruction.typeCompilerWanred) {
       console.warn(
         new Error(
@@ -138,19 +141,16 @@ var handleUnion = (schemas, property, instruction) => {
 `;
   const unwrapRef = (type) => {
     if (!(Kind in type) || !type.$ref) return type;
-    if (type[Kind] === "This") {
+    if (type[Kind] === "This")
       return deepClone(instruction.definitions[type.$ref]);
-    } else if (type[Kind] === "Ref") {
+    else if (type[Kind] === "Cyclic") {
       if (!instruction.modules)
         console.warn(
           new Error(
             "[exact-mirror] modules is required when using nested cyclic reference"
           )
         );
-      else
-        return instruction.modules.Import(
-          type.$ref
-        );
+      else return instruction.modules.$defs[type.$ref];
     }
     return type;
   };
@@ -166,21 +166,23 @@ var handleUnion = (schemas, property, instruction) => {
           type.items[i2] = unwrapRef(type.items[i2]);
       else type.items = unwrapRef(type.items);
     }
-    typeChecks.push(import_compiler.TypeCompiler.Compile(type));
+    typeChecks.push(instruction.Compile(type));
     v += `if(d.unions[${ui}][${i}].Check(${property})){return ${mirror(
       type,
       property,
       {
         ...instruction,
         recursion: instruction.recursion + 1,
-        parentIsOptional: true
+        parentIsOptional: true,
+        fromUnion: true
       }
     )}}
 `;
     cleanThenCheck += (i ? "" : "let ") + "tmp=" + mirror(type, property, {
       ...instruction,
       recursion: instruction.recursion + 1,
-      parentIsOptional: true
+      parentIsOptional: true,
+      fromUnion: true
     }) + `
 if(d.unions[${ui}][${i}].Check(tmp))return tmp
 `;
@@ -192,7 +194,7 @@ if(d.unions[${ui}][${i}].Check(tmp))return tmp
 var mirror = (schema, property, instruction) => {
   if (!schema) return "";
   const isRoot = property === "v" && !instruction.unions.length;
-  if (Kind in schema && schema[Kind] === "Import" && schema.$ref in schema.$defs)
+  if (Kind in schema && schema[Kind] === "~Cyclic" && schema.$ref in schema.$defs)
     return mirror(schema.$defs[schema.$ref], property, {
       ...instruction,
       definitions: Object.assign(instruction.definitions, schema.$defs)
@@ -223,7 +225,8 @@ var mirror = (schema, property, instruction) => {
         const name = joinProperty(
           property,
           key,
-          instruction.parentIsOptional
+          // If parent is a union, any property could be undefined
+          instruction.parentIsOptional || instruction.fromUnion
         );
         if (isOptional) {
           const index = instruction.array;
@@ -267,7 +270,11 @@ var mirror = (schema, property, instruction) => {
       v += "}";
       break;
     case "array":
-      if (schema.items.type !== "object" && schema.items.type !== "array") {
+      if (
+        // @ts-expect-error
+        schema.items.type !== "object" && // @ts-expect-error
+        schema.items.type !== "array"
+      ) {
         if (Array.isArray(schema.items)) {
           v = handleTuple(schema.items, property, instruction);
           break;
@@ -341,7 +348,7 @@ var mirror = (schema, property, instruction) => {
   return `${v}return x`;
 };
 var createMirror = (schema, {
-  TypeCompiler: TypeCompiler2,
+  Compile,
   modules,
   definitions,
   sanitize: sanitize2,
@@ -357,7 +364,7 @@ var createMirror = (schema, {
     parentIsOptional: false,
     unions,
     unionKeys: {},
-    TypeCompiler: TypeCompiler2,
+    Compile,
     modules,
     // @ts-ignore private property
     definitions: definitions ?? modules?.$defs ?? {},

package/dist/index.d.ts

@@ -1,15 +1,49 @@
-import { TypeCompiler, type TypeCheck } from '@sinclair/typebox/compiler';
-import type { TAnySchema, TModule } from '@sinclair/typebox';
-export declare const mergeObjectIntersection: (schema: TAnySchema) => TAnySchema;
+import type { TSchema, TModule, Static } from 'typebox';
+import type { Compile, Validator } from 'typebox/compile';
+interface BaseSchema {
+    '~kind': string;
+    id?: string;
+    $id?: string;
+    type?: string;
+    $schema?: string;
+    const?: unknown[];
+    pattern?: string;
+    additionalItems?: boolean | AnySchema;
+    items?: AnySchema | AnySchema[];
+    required?: string[];
+    additionalProperties?: boolean | AnySchema;
+    definitions?: {
+        [name: string]: AnySchema;
+    };
+    properties?: {
+        [name: string]: AnySchema;
+    };
+    patternProperties?: {
+        [name: string]: AnySchema;
+    };
+    dependencies?: {
+        [name: string]: AnySchema | string[];
+    };
+    enum?: any[];
+    allOf?: AnySchema[];
+    anyOf?: AnySchema[];
+    oneOf?: AnySchema[];
+    not?: AnySchema;
+    $ref?: string;
+    $defs?: Record<string, AnySchema>;
+}
+type AnySchema = TSchema & BaseSchema;
+export declare const mergeObjectIntersection: (schema: AnySchema) => AnySchema;
 type MaybeArray<T> = T | T[];
 export interface Instruction {
     optionals: string[];
     optionalsInArray: string[][];
     parentIsOptional: boolean;
     array: number;
-    unions: TypeCheck<any>[][];
+    unions: Validator<any>[][];
     unionKeys: Record<string, 1>;
     sanitize: MaybeArray<(v: string) => string> | undefined;
+    fromUnion?: boolean;
     /**
      * TypeCompiler is required when using Union
      *
@@ -18,10 +52,10 @@ export interface Instruction {
      *
      * @default undefined
      */
-    TypeCompiler?: typeof TypeCompiler;
+    Compile?: typeof Compile;
     typeCompilerWanred?: boolean;
-    modules?: TModule<any, any>;
-    definitions: Record<string, TAnySchema>;
+    modules?: TModule<{}>;
+    definitions: Record<string, AnySchema>;
     recursion: number;
     /**
      * @default 8
@@ -38,5 +72,5 @@ export interface Instruction {
     removeUnknownUnionType: boolean;
 }
 export declare function deepClone<T>(source: T, weak?: WeakMap<object, any>): T;
-export declare const createMirror: <T extends TAnySchema>(schema: T, { TypeCompiler, modules, definitions, sanitize, recursionLimit, removeUnknownUnionType }?: Partial<Pick<Instruction, "TypeCompiler" | "definitions" | "sanitize" | "modules" | "recursionLimit" | "removeUnknownUnionType">>) => ((v: T["static"]) => T["static"]);
+export declare const createMirror: <T extends TSchema>(schema: T, { Compile, modules, definitions, sanitize, recursionLimit, removeUnknownUnionType }?: Partial<Pick<Instruction, "Compile" | "definitions" | "sanitize" | "modules" | "recursionLimit" | "removeUnknownUnionType">>) => ((v: Static<T>) => Static<T>);
 export default createMirror;

package/dist/index.mjs

@@ -1,7 +1,6 @@
 // src/index.ts
-import { TypeCompiler } from "@sinclair/typebox/compiler";
-var Kind = Symbol.for("TypeBox.Kind");
-var Hint = Symbol.for("TypeBox.Hint");
+var Kind = "~kind";
+var Hint = "~hint";
 var isSpecialProperty = (name) => /(\ |-|\t|\n|\.|\[|\]|\{|\})/.test(name) || !isNaN(+name[0]);
 var joinProperty = (v1, v2, isOptional = false) => {
   if (typeof v2 === "number") return `${v1}[${v2}]`;
@@ -62,7 +61,11 @@ var handleTuple = (schema, property, instruction) => {
     if (i2 !== 0) v += ",";
     v += mirror(
       schema[i2],
-      joinProperty(property, i2, instruction.parentIsOptional),
+      joinProperty(
+        property,
+        i2,
+        instruction.parentIsOptional || instruction.fromUnion
+      ),
       instruction
     );
   }
@@ -93,7 +96,7 @@ function deepClone(source, weak = /* @__PURE__ */ new WeakMap()) {
   return source;
 }
 var handleUnion = (schemas, property, instruction) => {
-  if (instruction.TypeCompiler === void 0) {
+  if (instruction.Compile === void 0) {
     if (!instruction.typeCompilerWanred) {
       console.warn(
         new Error(
@@ -111,19 +114,16 @@ var handleUnion = (schemas, property, instruction) => {
 `;
   const unwrapRef = (type) => {
     if (!(Kind in type) || !type.$ref) return type;
-    if (type[Kind] === "This") {
+    if (type[Kind] === "This")
       return deepClone(instruction.definitions[type.$ref]);
-    } else if (type[Kind] === "Ref") {
+    else if (type[Kind] === "Cyclic") {
       if (!instruction.modules)
         console.warn(
           new Error(
             "[exact-mirror] modules is required when using nested cyclic reference"
           )
         );
-      else
-        return instruction.modules.Import(
-          type.$ref
-        );
+      else return instruction.modules.$defs[type.$ref];
     }
     return type;
   };
@@ -139,21 +139,23 @@ var handleUnion = (schemas, property, instruction) => {
           type.items[i2] = unwrapRef(type.items[i2]);
       else type.items = unwrapRef(type.items);
     }
-    typeChecks.push(TypeCompiler.Compile(type));
+    typeChecks.push(instruction.Compile(type));
     v += `if(d.unions[${ui}][${i}].Check(${property})){return ${mirror(
       type,
       property,
       {
         ...instruction,
         recursion: instruction.recursion + 1,
-        parentIsOptional: true
+        parentIsOptional: true,
+        fromUnion: true
       }
     )}}
 `;
     cleanThenCheck += (i ? "" : "let ") + "tmp=" + mirror(type, property, {
       ...instruction,
       recursion: instruction.recursion + 1,
-      parentIsOptional: true
+      parentIsOptional: true,
+      fromUnion: true
     }) + `
 if(d.unions[${ui}][${i}].Check(tmp))return tmp
 `;
@@ -165,7 +167,7 @@ if(d.unions[${ui}][${i}].Check(tmp))return tmp
 var mirror = (schema, property, instruction) => {
   if (!schema) return "";
   const isRoot = property === "v" && !instruction.unions.length;
-  if (Kind in schema && schema[Kind] === "Import" && schema.$ref in schema.$defs)
+  if (Kind in schema && schema[Kind] === "~Cyclic" && schema.$ref in schema.$defs)
     return mirror(schema.$defs[schema.$ref], property, {
       ...instruction,
       definitions: Object.assign(instruction.definitions, schema.$defs)
@@ -196,7 +198,8 @@ var mirror = (schema, property, instruction) => {
         const name = joinProperty(
           property,
           key,
-          instruction.parentIsOptional
+          // If parent is a union, any property could be undefined
+          instruction.parentIsOptional || instruction.fromUnion
         );
         if (isOptional) {
           const index = instruction.array;
@@ -240,7 +243,11 @@ var mirror = (schema, property, instruction) => {
       v += "}";
       break;
     case "array":
-      if (schema.items.type !== "object" && schema.items.type !== "array") {
+      if (
+        // @ts-expect-error
+        schema.items.type !== "object" && // @ts-expect-error
+        schema.items.type !== "array"
+      ) {
         if (Array.isArray(schema.items)) {
           v = handleTuple(schema.items, property, instruction);
           break;
@@ -314,7 +321,7 @@ var mirror = (schema, property, instruction) => {
   return `${v}return x`;
 };
 var createMirror = (schema, {
-  TypeCompiler: TypeCompiler2,
+  Compile,
   modules,
   definitions,
   sanitize: sanitize2,
@@ -330,7 +337,7 @@ var createMirror = (schema, {
     parentIsOptional: false,
     unions,
     unionKeys: {},
-    TypeCompiler: TypeCompiler2,
+    Compile,
     modules,
     // @ts-ignore private property
     definitions: definitions ?? modules?.$defs ?? {},

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "exact-mirror",
-	"version": "0.2.6",
+	"version": "1.0.0",
 	"description": "Mirror exact value to TypeBox/OpenAPI model",
 	"license": "MIT",
 	"scripts": {
@@ -11,21 +11,22 @@
 		"release": "npm run build && npm run test && npm publish --access public"
 	},
 	"peerDependencies": {
-		"@sinclair/typebox": "^0.34.15"
+		"typebox": ">= 1.1.0"
 	},
 	"peerDependenciesMeta": {
-		"@sinclair/typebox": {
+		"typebox": {
 			"optional": true
 		}
 	},
 	"devDependencies": {
-		"@types/bun": "1.2.2",
-		"elysia": "^1.2.11",
+		"@types/bun": "1.3.8",
+		"elysia": "^1.4.28",
 		"eslint": "9.6.0",
 		"mitata": "^1.0.33",
 		"tsup": "^8.1.0",
 		"tsx": "^4.19.2",
-		"typescript": "^5.5.3"
+		"typebox": "^1.1.15",
+		"typescript": "^6.0.0"
 	},
 	"main": "./dist/cjs/index.js",
 	"module": "./dist/index.mjs",