exact-mirror 0.2.0 → 0.2.2

package/dist/cjs/index.d.ts

@@ -1,4 +1,4 @@
-import { TypeCompiler } from '@sinclair/typebox/compiler';
+import { TypeCompiler, type TypeCheck } from '@sinclair/typebox/compiler';
 import type { TAnySchema, TModule } from '@sinclair/typebox';
 export declare const mergeObjectIntersection: (schema: TAnySchema) => TAnySchema;
 type MaybeArray<T> = T | T[];
@@ -7,7 +7,7 @@ export interface Instruction {
     optionalsInArray: string[][];
     parentIsOptional: boolean;
     array: number;
-    unions: string[][];
+    unions: TypeCheck<any>[][];
     unionKeys: Record<string, 1>;
     sanitize: MaybeArray<(v: string) => string> | undefined;
     /**
@@ -38,8 +38,5 @@ export interface Instruction {
     removeUnknownUnionType: boolean;
 }
 export declare function deepClone<T>(source: T, weak?: WeakMap<object, any>): T;
-export declare const createMirrorCode: (schema: TAnySchema, { TypeCompiler, modules, definitions, sanitize, recursionLimit, removeUnknownUnionType, name }?: Partial<Pick<Instruction, "TypeCompiler" | "definitions" | "sanitize" | "modules" | "recursionLimit" | "removeUnknownUnionType"> & {
-    name?: string;
-}>) => string | [string, ((v: string) => string)[]];
 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 default createMirror;

package/dist/cjs/index.js

@@ -21,7 +21,6 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var index_exports = {};
 __export(index_exports, {
   createMirror: () => createMirror,
-  createMirrorCode: () => createMirrorCode,
   deepClone: () => deepClone,
   default: () => index_default,
   mergeObjectIntersection: () => mergeObjectIntersection
@@ -30,7 +29,7 @@ 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 isSpecialProperty = (name) => /(\ |-|\t|\n)/.test(name) || !isNaN(+name[0]);
+var isSpecialProperty = (name) => /(\ |-|\t|\n|\.)/.test(name) || !isNaN(+name[0]);
 var joinProperty = (v1, v2, isOptional = false) => {
   if (typeof v2 === "number") return `${v1}[${v2}]`;
   if (isSpecialProperty(v2)) return `${v1}${isOptional ? "?." : ""}["${v2}"]`;
@@ -40,7 +39,7 @@ var encodeProperty = (v) => isSpecialProperty(v) ? `"${v}"` : v;
 var sanitize = (key, sanitize2 = 0, schema) => {
   if (schema.type !== "string" || schema.const || schema.trusted) return key;
   let hof = "";
-  for (let i = sanitize2 - 1; i >= 0; i--) hof += `sanitize[${i}](`;
+  for (let i = sanitize2 - 1; i >= 0; i--) hof += `d.h${i}(`;
   return hof + key + ")".repeat(sanitize2);
 };
 var mergeObjectIntersection = (schema) => {
@@ -118,10 +117,6 @@ function deepClone(source, weak = /* @__PURE__ */ new WeakMap()) {
   }
   return source;
 }
-var renameFunction = (v, name) => {
-  if (!v.startsWith("return")) v = v.replace(/check_T0/g, `_${name}`);
-  return v.replace("return function check(", `function ${name}(`);
-};
 var handleUnion = (schemas, property, instruction) => {
   if (instruction.TypeCompiler === void 0) {
     if (!instruction.typeCompilerWanred) {
@@ -168,13 +163,16 @@ var handleUnion = (schemas, property, instruction) => {
           type.items[i2] = unwrapRef(type.items[i2]);
       else type.items = unwrapRef(type.items);
     }
-    const name = `un_${ui}_${i}`;
-    typeChecks.push(renameFunction(import_compiler.TypeCompiler.Code(type), name));
-    v += `if(${name}(${property})){return ${mirror(type, property, {
-      ...instruction,
-      recursion: instruction.recursion + 1,
-      parentIsOptional: true
-    })}}
+    typeChecks.push(import_compiler.TypeCompiler.Compile(type));
+    v += `if(d.unions[${ui}][${i}].Check(${property})){return ${mirror(
+      type,
+      property,
+      {
+        ...instruction,
+        recursion: instruction.recursion + 1,
+        parentIsOptional: true
+      }
+    )}}
 `;
   }
   v += `return ${instruction.removeUnknownUnionType ? "undefined" : property}})()`;
@@ -313,18 +311,17 @@ var mirror = (schema, property, instruction) => {
   }
   return `${v}return x`;
 };
-var createMirrorCode = (schema, {
+var createMirror = (schema, {
   TypeCompiler: TypeCompiler2,
   modules,
   definitions,
   sanitize: sanitize2,
   recursionLimit = 8,
-  removeUnknownUnionType = false,
-  name = "mirror"
+  removeUnknownUnionType = false
 } = {}) => {
   const unions = [];
   if (typeof sanitize2 === "function") sanitize2 = [sanitize2];
-  let f = mirror(schema, "v", {
+  const f = mirror(schema, "v", {
     optionals: [],
     optionalsInArray: [],
     array: 0,
@@ -340,43 +337,24 @@ var createMirrorCode = (schema, {
     recursionLimit,
     removeUnknownUnionType
   });
-  if (unions.length) {
-    let header = "";
-    for (let i = 0; i < unions.length; i++) {
-      for (let j = 0; j < unions[i].length; j++)
-        header += unions[i][j] + "\n";
-    }
-    f = header + f;
-    unions.length = 0;
+  if (!unions.length && !sanitize2?.length) return Function("v", f);
+  let hof;
+  if (sanitize2?.length) {
+    hof = {};
+    for (let i = 0; i < sanitize2.length; i++) hof[`h${i}`] = sanitize2[i];
   }
-  f = `function ${name}(v){${f}}`;
-  if (!sanitize2?.length) return f;
-  return [`function ${name}(sanitize){return ${f}}`, sanitize2];
-};
-var createMirror = (schema, {
-  TypeCompiler: TypeCompiler2,
-  modules,
-  definitions,
-  sanitize: sanitize2,
-  recursionLimit = 8,
-  removeUnknownUnionType = false
-} = {}) => {
-  const code = createMirrorCode(schema, {
-    TypeCompiler: TypeCompiler2,
-    modules,
-    definitions,
-    sanitize: sanitize2,
-    recursionLimit,
-    removeUnknownUnionType
+  return Function(
+    "d",
+    `return function mirror(v){${f}}`
+  )({
+    unions,
+    ...hof
   });
-  if (typeof code === "string") return Function(`return ${code}`)();
-  return Function(`return ${code[0]}`)()(code[1]);
 };
 var index_default = createMirror;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   createMirror,
-  createMirrorCode,
   deepClone,
   mergeObjectIntersection
 });

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { TypeCompiler } from '@sinclair/typebox/compiler';
+import { TypeCompiler, type TypeCheck } from '@sinclair/typebox/compiler';
 import type { TAnySchema, TModule } from '@sinclair/typebox';
 export declare const mergeObjectIntersection: (schema: TAnySchema) => TAnySchema;
 type MaybeArray<T> = T | T[];
@@ -7,7 +7,7 @@ export interface Instruction {
     optionalsInArray: string[][];
     parentIsOptional: boolean;
     array: number;
-    unions: string[][];
+    unions: TypeCheck<any>[][];
     unionKeys: Record<string, 1>;
     sanitize: MaybeArray<(v: string) => string> | undefined;
     /**
@@ -38,8 +38,5 @@ export interface Instruction {
     removeUnknownUnionType: boolean;
 }
 export declare function deepClone<T>(source: T, weak?: WeakMap<object, any>): T;
-export declare const createMirrorCode: (schema: TAnySchema, { TypeCompiler, modules, definitions, sanitize, recursionLimit, removeUnknownUnionType, name }?: Partial<Pick<Instruction, "TypeCompiler" | "definitions" | "sanitize" | "modules" | "recursionLimit" | "removeUnknownUnionType"> & {
-    name?: string;
-}>) => string | [string, ((v: string) => string)[]];
 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 default createMirror;

package/dist/index.mjs

@@ -2,7 +2,7 @@
 import { TypeCompiler } from "@sinclair/typebox/compiler";
 var Kind = Symbol.for("TypeBox.Kind");
 var Hint = Symbol.for("TypeBox.Hint");
-var isSpecialProperty = (name) => /(\ |-|\t|\n)/.test(name) || !isNaN(+name[0]);
+var isSpecialProperty = (name) => /(\ |-|\t|\n|\.)/.test(name) || !isNaN(+name[0]);
 var joinProperty = (v1, v2, isOptional = false) => {
   if (typeof v2 === "number") return `${v1}[${v2}]`;
   if (isSpecialProperty(v2)) return `${v1}${isOptional ? "?." : ""}["${v2}"]`;
@@ -12,7 +12,7 @@ var encodeProperty = (v) => isSpecialProperty(v) ? `"${v}"` : v;
 var sanitize = (key, sanitize2 = 0, schema) => {
   if (schema.type !== "string" || schema.const || schema.trusted) return key;
   let hof = "";
-  for (let i = sanitize2 - 1; i >= 0; i--) hof += `sanitize[${i}](`;
+  for (let i = sanitize2 - 1; i >= 0; i--) hof += `d.h${i}(`;
   return hof + key + ")".repeat(sanitize2);
 };
 var mergeObjectIntersection = (schema) => {
@@ -90,10 +90,6 @@ function deepClone(source, weak = /* @__PURE__ */ new WeakMap()) {
   }
   return source;
 }
-var renameFunction = (v, name) => {
-  if (!v.startsWith("return")) v = v.replace(/check_T0/g, `_${name}`);
-  return v.replace("return function check(", `function ${name}(`);
-};
 var handleUnion = (schemas, property, instruction) => {
   if (instruction.TypeCompiler === void 0) {
     if (!instruction.typeCompilerWanred) {
@@ -140,13 +136,16 @@ var handleUnion = (schemas, property, instruction) => {
           type.items[i2] = unwrapRef(type.items[i2]);
       else type.items = unwrapRef(type.items);
     }
-    const name = `un_${ui}_${i}`;
-    typeChecks.push(renameFunction(TypeCompiler.Code(type), name));
-    v += `if(${name}(${property})){return ${mirror(type, property, {
-      ...instruction,
-      recursion: instruction.recursion + 1,
-      parentIsOptional: true
-    })}}
+    typeChecks.push(TypeCompiler.Compile(type));
+    v += `if(d.unions[${ui}][${i}].Check(${property})){return ${mirror(
+      type,
+      property,
+      {
+        ...instruction,
+        recursion: instruction.recursion + 1,
+        parentIsOptional: true
+      }
+    )}}
 `;
   }
   v += `return ${instruction.removeUnknownUnionType ? "undefined" : property}})()`;
@@ -285,18 +284,17 @@ var mirror = (schema, property, instruction) => {
   }
   return `${v}return x`;
 };
-var createMirrorCode = (schema, {
+var createMirror = (schema, {
   TypeCompiler: TypeCompiler2,
   modules,
   definitions,
   sanitize: sanitize2,
   recursionLimit = 8,
-  removeUnknownUnionType = false,
-  name = "mirror"
+  removeUnknownUnionType = false
 } = {}) => {
   const unions = [];
   if (typeof sanitize2 === "function") sanitize2 = [sanitize2];
-  let f = mirror(schema, "v", {
+  const f = mirror(schema, "v", {
     optionals: [],
     optionalsInArray: [],
     array: 0,
@@ -312,42 +310,23 @@ var createMirrorCode = (schema, {
     recursionLimit,
     removeUnknownUnionType
   });
-  if (unions.length) {
-    let header = "";
-    for (let i = 0; i < unions.length; i++) {
-      for (let j = 0; j < unions[i].length; j++)
-        header += unions[i][j] + "\n";
-    }
-    f = header + f;
-    unions.length = 0;
+  if (!unions.length && !sanitize2?.length) return Function("v", f);
+  let hof;
+  if (sanitize2?.length) {
+    hof = {};
+    for (let i = 0; i < sanitize2.length; i++) hof[`h${i}`] = sanitize2[i];
   }
-  f = `function ${name}(v){${f}}`;
-  if (!sanitize2?.length) return f;
-  return [`function ${name}(sanitize){return ${f}}`, sanitize2];
-};
-var createMirror = (schema, {
-  TypeCompiler: TypeCompiler2,
-  modules,
-  definitions,
-  sanitize: sanitize2,
-  recursionLimit = 8,
-  removeUnknownUnionType = false
-} = {}) => {
-  const code = createMirrorCode(schema, {
-    TypeCompiler: TypeCompiler2,
-    modules,
-    definitions,
-    sanitize: sanitize2,
-    recursionLimit,
-    removeUnknownUnionType
+  return Function(
+    "d",
+    `return function mirror(v){${f}}`
+  )({
+    unions,
+    ...hof
   });
-  if (typeof code === "string") return Function(`return ${code}`)();
-  return Function(`return ${code[0]}`)()(code[1]);
 };
 var index_default = createMirror;
 export {
   createMirror,
-  createMirrorCode,
   deepClone,
   index_default as default,
   mergeObjectIntersection

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "exact-mirror",
-	"version": "0.2.0",
+	"version": "0.2.2",
 	"description": "Mirror exact value to TypeBox/OpenAPI model",
 	"license": "MIT",
 	"scripts": {