exact-mirror 0.0.9 → 0.1.1

package/dist/cjs/index.d.ts

@@ -1,5 +1,5 @@
 import { TypeCompiler, type TypeCheck } from '@sinclair/typebox/compiler';
-import type { TAnySchema } from '@sinclair/typebox';
+import type { TAnySchema, TModule } from '@sinclair/typebox';
 export declare const mergeObjectIntersection: (schema: TAnySchema) => TAnySchema;
 type MaybeArray<T> = T | T[];
 export interface Instruction {
@@ -20,7 +20,14 @@ export interface Instruction {
      */
     TypeCompiler?: typeof TypeCompiler;
     typeCompilerWanred?: boolean;
+    modules?: TModule<any, any>;
     definitions: Record<string, TAnySchema>;
+    recursion: number;
+    /**
+     * @default 8
+     */
+    recursionLimit: number;
 }
-export declare const createMirror: <T extends TAnySchema>(schema: T, { TypeCompiler, definitions, sanitize }?: Partial<Pick<Instruction, "TypeCompiler" | "definitions" | "sanitize">>) => ((v: T["static"]) => T["static"]);
+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 }?: Partial<Pick<Instruction, "TypeCompiler" | "definitions" | "sanitize" | "modules" | "recursionLimit">>) => ((v: T["static"]) => T["static"]);
 export default createMirror;

package/dist/cjs/index.js

@@ -21,17 +21,19 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var index_exports = {};
 __export(index_exports, {
   createMirror: () => createMirror,
+  deepClone: () => deepClone,
   default: () => index_default,
   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 isSpecialProperty = (name) => /(\ |-|\t|\n)/.test(name);
 var joinProperty = (v1, v2, isOptional = false) => {
-  if (typeof v2 === "number") return `${v1}?.[${v2}]`;
-  if (isSpecialProperty(v2)) return `${v1}${true ? "?." : ""}["${v2}"]`;
-  return `${v1}${true ? "?" : ""}.${v2}`;
+  if (typeof v2 === "number") return `${v1}[${v2}]`;
+  if (isSpecialProperty(v2)) return `${v1}${isOptional ? "?." : ""}["${v2}"]`;
+  return `${v1}${isOptional ? "?" : ""}.${v2}`;
 };
 var encodeProperty = (v) => isSpecialProperty(v) ? `"${v}"` : v;
 var sanitize = (key, sanitize2 = 0, schema) => {
@@ -85,11 +87,35 @@ var handleTuple = (schema, property, instruction) => {
   if (!isRoot) v += `return ar${i}v})()`;
   return v;
 };
+function deepClone(source, weak = /* @__PURE__ */ new WeakMap()) {
+  if (source === null || typeof source !== "object" || typeof source === "function")
+    return source;
+  if (weak.has(source)) return weak.get(source);
+  if (Array.isArray(source)) {
+    const copy = new Array(source.length);
+    weak.set(source, copy);
+    for (let i = 0; i < source.length; i++)
+      copy[i] = deepClone(source[i], weak);
+    return copy;
+  }
+  if (typeof source === "object") {
+    const keys = Object.keys(source).concat(
+      Object.getOwnPropertySymbols(source)
+    );
+    const cloned = {};
+    for (const key of keys)
+      cloned[key] = deepClone(source[key], weak);
+    return cloned;
+  }
+  return source;
+}
 var handleUnion = (schemas, property, instruction) => {
   if (instruction.TypeCompiler === void 0) {
     if (!instruction.typeCompilerWanred) {
       console.warn(
-        new Error("TypeBox's TypeCompiler is required to use Union")
+        new Error(
+          "[exact-mirror] TypeBox's TypeCompiler is required to use Union"
+        )
       );
       instruction.typeCompilerWanred = true;
     }
@@ -100,13 +126,42 @@ var handleUnion = (schemas, property, instruction) => {
   const typeChecks = instruction.unions[ui] = [];
   let v = `(()=>{
 `;
+  const unwrapRef = (type) => {
+    if (!(Kind in type) || !type.$ref) return type;
+    if (type[Kind] === "This") {
+      return deepClone(instruction.definitions[type.$ref]);
+    } else if (type[Kind] === "Ref") {
+      if (!instruction.modules)
+        console.warn(
+          new Error(
+            "[exact-mirror] modules is required when using nested cyclic reference"
+          )
+        );
+      else
+        return instruction.modules.Import(
+          type.$ref
+        );
+    }
+    return type;
+  };
   for (let i = 0; i < schemas.length; i++) {
-    typeChecks.push(import_compiler.TypeCompiler.Compile(schemas[i]));
+    let type = unwrapRef(schemas[i]);
+    if (Array.isArray(type.anyOf))
+      for (let i2 = 0; i2 < type.anyOf.length; i2++)
+        type.anyOf[i2] = unwrapRef(type.anyOf[i2]);
+    else if (type.items) {
+      if (Array.isArray(type.items))
+        for (let i2 = 0; i2 < type.items.length; i2++)
+          type.items[i2] = unwrapRef(type.items[i2]);
+      else type.items = unwrapRef(type.items);
+    }
+    typeChecks.push(import_compiler.TypeCompiler.Compile(type));
     v += `if(d.unions[${ui}][${i}].Check(${property})){return ${mirror(
-      schemas[i],
+      type,
       property,
       {
         ...instruction,
+        recursion: instruction.recursion + 1,
         parentIsOptional: true
       }
     )}}
@@ -123,10 +178,12 @@ var mirror = (schema, property, instruction) => {
       ...instruction,
       definitions: Object.assign(instruction.definitions, schema.$defs)
     });
-  if (isRoot && schema.type !== "object" && schema.type !== "array" && !schema.anyOf) {
+  if (isRoot && schema.type !== "object" && schema.type !== "array" && !schema.anyOf)
     return `return ${sanitize("v", instruction.sanitize?.length, schema)}`;
-  }
+  if (instruction.recursion >= instruction.recursionLimit) return property;
   let v = "";
+  if (schema.$id && Hint in schema)
+    instruction.definitions[schema.$id] = schema;
   switch (schema.type) {
     case "object":
       if (schema[Kind] === "Record") {
@@ -165,6 +222,7 @@ var mirror = (schema, property, instruction) => {
           name,
           {
             ...instruction,
+            recursion: instruction.recursion + 1,
             parentIsOptional: isOptional
           }
         )}`;
@@ -173,11 +231,24 @@ var mirror = (schema, property, instruction) => {
       break;
     case "array":
       if (schema.items.type !== "object" && schema.items.type !== "array") {
-        if (Array.isArray(schema.items))
+        if (Array.isArray(schema.items)) {
           v = handleTuple(schema.items, property, instruction);
-        else if (isRoot) return "return v";
-        else v = property;
-        break;
+          break;
+        } else if (isRoot) return "return v";
+        else if (Kind in schema.items && schema.items.$ref && (schema.items[Kind] === "Ref" || schema.items[Kind] === "This"))
+          v = mirror(
+            deepClone(instruction.definitions[schema.items.$ref]),
+            property,
+            {
+              ...instruction,
+              parentIsOptional: true,
+              recursion: instruction.recursion + 1
+            }
+          );
+        else {
+          v = property;
+          break;
+        }
       }
       const i = instruction.array;
       instruction.array++;
@@ -228,8 +299,10 @@ var mirror = (schema, property, instruction) => {
 };
 var createMirror = (schema, {
   TypeCompiler: TypeCompiler2,
-  definitions = {},
-  sanitize: sanitize2
+  modules,
+  definitions,
+  sanitize: sanitize2,
+  recursionLimit = 8
 } = {}) => {
   const unions = [];
   if (typeof sanitize2 === "function") sanitize2 = [sanitize2];
@@ -241,8 +314,12 @@ var createMirror = (schema, {
     unions,
     unionKeys: {},
     TypeCompiler: TypeCompiler2,
-    definitions,
-    sanitize: sanitize2
+    modules,
+    // @ts-ignore private property
+    definitions: definitions ?? modules?.$defs ?? {},
+    sanitize: sanitize2,
+    recursion: 0,
+    recursionLimit
   });
   if (!unions.length && !sanitize2?.length) return Function("v", f);
   let hof;
@@ -262,5 +339,6 @@ var index_default = createMirror;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   createMirror,
+  deepClone,
   mergeObjectIntersection
 });

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import { TypeCompiler, type TypeCheck } from '@sinclair/typebox/compiler';
-import type { TAnySchema } from '@sinclair/typebox';
+import type { TAnySchema, TModule } from '@sinclair/typebox';
 export declare const mergeObjectIntersection: (schema: TAnySchema) => TAnySchema;
 type MaybeArray<T> = T | T[];
 export interface Instruction {
@@ -20,7 +20,14 @@ export interface Instruction {
      */
     TypeCompiler?: typeof TypeCompiler;
     typeCompilerWanred?: boolean;
+    modules?: TModule<any, any>;
     definitions: Record<string, TAnySchema>;
+    recursion: number;
+    /**
+     * @default 8
+     */
+    recursionLimit: number;
 }
-export declare const createMirror: <T extends TAnySchema>(schema: T, { TypeCompiler, definitions, sanitize }?: Partial<Pick<Instruction, "TypeCompiler" | "definitions" | "sanitize">>) => ((v: T["static"]) => T["static"]);
+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 }?: Partial<Pick<Instruction, "TypeCompiler" | "definitions" | "sanitize" | "modules" | "recursionLimit">>) => ((v: T["static"]) => T["static"]);
 export default createMirror;

package/dist/index.mjs

@@ -1,11 +1,12 @@
 // src/index.ts
 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);
 var joinProperty = (v1, v2, isOptional = false) => {
-  if (typeof v2 === "number") return `${v1}?.[${v2}]`;
-  if (isSpecialProperty(v2)) return `${v1}${true ? "?." : ""}["${v2}"]`;
-  return `${v1}${true ? "?" : ""}.${v2}`;
+  if (typeof v2 === "number") return `${v1}[${v2}]`;
+  if (isSpecialProperty(v2)) return `${v1}${isOptional ? "?." : ""}["${v2}"]`;
+  return `${v1}${isOptional ? "?" : ""}.${v2}`;
 };
 var encodeProperty = (v) => isSpecialProperty(v) ? `"${v}"` : v;
 var sanitize = (key, sanitize2 = 0, schema) => {
@@ -59,11 +60,35 @@ var handleTuple = (schema, property, instruction) => {
   if (!isRoot) v += `return ar${i}v})()`;
   return v;
 };
+function deepClone(source, weak = /* @__PURE__ */ new WeakMap()) {
+  if (source === null || typeof source !== "object" || typeof source === "function")
+    return source;
+  if (weak.has(source)) return weak.get(source);
+  if (Array.isArray(source)) {
+    const copy = new Array(source.length);
+    weak.set(source, copy);
+    for (let i = 0; i < source.length; i++)
+      copy[i] = deepClone(source[i], weak);
+    return copy;
+  }
+  if (typeof source === "object") {
+    const keys = Object.keys(source).concat(
+      Object.getOwnPropertySymbols(source)
+    );
+    const cloned = {};
+    for (const key of keys)
+      cloned[key] = deepClone(source[key], weak);
+    return cloned;
+  }
+  return source;
+}
 var handleUnion = (schemas, property, instruction) => {
   if (instruction.TypeCompiler === void 0) {
     if (!instruction.typeCompilerWanred) {
       console.warn(
-        new Error("TypeBox's TypeCompiler is required to use Union")
+        new Error(
+          "[exact-mirror] TypeBox's TypeCompiler is required to use Union"
+        )
       );
       instruction.typeCompilerWanred = true;
     }
@@ -74,13 +99,42 @@ var handleUnion = (schemas, property, instruction) => {
   const typeChecks = instruction.unions[ui] = [];
   let v = `(()=>{
 `;
+  const unwrapRef = (type) => {
+    if (!(Kind in type) || !type.$ref) return type;
+    if (type[Kind] === "This") {
+      return deepClone(instruction.definitions[type.$ref]);
+    } else if (type[Kind] === "Ref") {
+      if (!instruction.modules)
+        console.warn(
+          new Error(
+            "[exact-mirror] modules is required when using nested cyclic reference"
+          )
+        );
+      else
+        return instruction.modules.Import(
+          type.$ref
+        );
+    }
+    return type;
+  };
   for (let i = 0; i < schemas.length; i++) {
-    typeChecks.push(TypeCompiler.Compile(schemas[i]));
+    let type = unwrapRef(schemas[i]);
+    if (Array.isArray(type.anyOf))
+      for (let i2 = 0; i2 < type.anyOf.length; i2++)
+        type.anyOf[i2] = unwrapRef(type.anyOf[i2]);
+    else if (type.items) {
+      if (Array.isArray(type.items))
+        for (let i2 = 0; i2 < type.items.length; i2++)
+          type.items[i2] = unwrapRef(type.items[i2]);
+      else type.items = unwrapRef(type.items);
+    }
+    typeChecks.push(TypeCompiler.Compile(type));
     v += `if(d.unions[${ui}][${i}].Check(${property})){return ${mirror(
-      schemas[i],
+      type,
       property,
       {
         ...instruction,
+        recursion: instruction.recursion + 1,
         parentIsOptional: true
       }
     )}}
@@ -97,10 +151,12 @@ var mirror = (schema, property, instruction) => {
       ...instruction,
       definitions: Object.assign(instruction.definitions, schema.$defs)
     });
-  if (isRoot && schema.type !== "object" && schema.type !== "array" && !schema.anyOf) {
+  if (isRoot && schema.type !== "object" && schema.type !== "array" && !schema.anyOf)
     return `return ${sanitize("v", instruction.sanitize?.length, schema)}`;
-  }
+  if (instruction.recursion >= instruction.recursionLimit) return property;
   let v = "";
+  if (schema.$id && Hint in schema)
+    instruction.definitions[schema.$id] = schema;
   switch (schema.type) {
     case "object":
       if (schema[Kind] === "Record") {
@@ -139,6 +195,7 @@ var mirror = (schema, property, instruction) => {
           name,
           {
             ...instruction,
+            recursion: instruction.recursion + 1,
             parentIsOptional: isOptional
           }
         )}`;
@@ -147,11 +204,24 @@ var mirror = (schema, property, instruction) => {
       break;
     case "array":
       if (schema.items.type !== "object" && schema.items.type !== "array") {
-        if (Array.isArray(schema.items))
+        if (Array.isArray(schema.items)) {
           v = handleTuple(schema.items, property, instruction);
-        else if (isRoot) return "return v";
-        else v = property;
-        break;
+          break;
+        } else if (isRoot) return "return v";
+        else if (Kind in schema.items && schema.items.$ref && (schema.items[Kind] === "Ref" || schema.items[Kind] === "This"))
+          v = mirror(
+            deepClone(instruction.definitions[schema.items.$ref]),
+            property,
+            {
+              ...instruction,
+              parentIsOptional: true,
+              recursion: instruction.recursion + 1
+            }
+          );
+        else {
+          v = property;
+          break;
+        }
       }
       const i = instruction.array;
       instruction.array++;
@@ -202,8 +272,10 @@ var mirror = (schema, property, instruction) => {
 };
 var createMirror = (schema, {
   TypeCompiler: TypeCompiler2,
-  definitions = {},
-  sanitize: sanitize2
+  modules,
+  definitions,
+  sanitize: sanitize2,
+  recursionLimit = 8
 } = {}) => {
   const unions = [];
   if (typeof sanitize2 === "function") sanitize2 = [sanitize2];
@@ -215,8 +287,12 @@ var createMirror = (schema, {
     unions,
     unionKeys: {},
     TypeCompiler: TypeCompiler2,
-    definitions,
-    sanitize: sanitize2
+    modules,
+    // @ts-ignore private property
+    definitions: definitions ?? modules?.$defs ?? {},
+    sanitize: sanitize2,
+    recursion: 0,
+    recursionLimit
   });
   if (!unions.length && !sanitize2?.length) return Function("v", f);
   let hof;
@@ -235,6 +311,7 @@ var createMirror = (schema, {
 var index_default = createMirror;
 export {
   createMirror,
+  deepClone,
   index_default as default,
   mergeObjectIntersection
 };

package/package.json

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