exact-mirror 0.0.4 → 0.0.6

package/dist/cjs/index.d.ts

@@ -18,6 +18,7 @@ interface Instruction {
      */
     TypeCompiler?: typeof TypeCompiler;
     typeCompilerWanred?: boolean;
+    definitions: Record<string, TAnySchema>;
 }
-export declare const createMirror: <T extends TAnySchema>(schema: T, { TypeCompiler }?: Pick<Instruction, "TypeCompiler">) => ((v: T["static"]) => T["static"]);
+export declare const createMirror: <T extends TAnySchema>(schema: T, { TypeCompiler, definitions }?: Partial<Pick<Instruction, "TypeCompiler" | "definitions">>) => ((v: T["static"]) => T["static"]);
 export default createMirror;

package/dist/cjs/index.js

@@ -27,6 +27,7 @@ __export(index_exports, {
 module.exports = __toCommonJS(index_exports);
 var import_compiler = require("@sinclair/typebox/compiler");
 var Kind = Symbol.for("TypeBox.Kind");
+var OptionalKind = Symbol.for("TypeBox.Optional");
 var isSpecialProperty = (name) => /(\ |-|\t|\n)/.test(name);
 var joinProperty = (v1, v2, isOptional = false) => {
   if (typeof v2 === "number") return `${v1}[${v2}]`;
@@ -112,6 +113,11 @@ var handleUnion = (schemas, property, instruction) => {
 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)
+    return mirror(schema.$defs[schema.$ref], property, {
+      ...instruction,
+      definitions: Object.assign(instruction.definitions, schema.$defs)
+    });
   if (isRoot && schema.type !== "object" && schema.type !== "array" && !schema.anyOf)
     return `return v`;
   let v = "";
@@ -169,8 +175,13 @@ var mirror = (schema, property, instruction) => {
       }
       const i = instruction.array;
       instruction.array++;
-      if (!isRoot) v = `(()=>{`;
-      v += `const ar${i}s=${property},ar${i}v=new Array(${property}.length);for(let i=0;i<ar${i}s.length;i++){const ar${i}p=ar${i}s[i];ar${i}v[i]=${mirror(schema.items, `ar${i}p`, instruction)}`;
+      let reference = property;
+      if (isRoot) v = `const ar${i}v=new Array(${property}.length);`;
+      else {
+        reference = `ar${i}s`;
+        v = `((${reference})=>{const ar${i}v=new Array(${reference}.length);`;
+      }
+      v += `for(let i=0;i<${reference}.length;i++){const ar${i}p=${reference}[i];ar${i}v[i]=${mirror(schema.items, `ar${i}p`, instruction)}`;
       const optionals = instruction.optionalsInArray[i + 1];
       if (optionals) {
         for (let oi = 0; oi < optionals.length; oi++) {
@@ -179,9 +190,15 @@ var mirror = (schema, property, instruction) => {
         }
       }
       v += `}`;
-      if (!isRoot) v += `return ar${i}v})()`;
+      if (!isRoot) v += `return ar${i}v})(${property})`;
       break;
     default:
+      if (schema.$ref && schema.$ref in instruction.definitions)
+        return mirror(
+          instruction.definitions[schema.$ref],
+          property,
+          instruction
+        );
       if (Array.isArray(schema.anyOf)) {
         v = handleUnion(schema.anyOf, property, instruction);
         break;
@@ -203,7 +220,10 @@ var mirror = (schema, property, instruction) => {
   }
   return `${v}return x`;
 };
-var createMirror = (schema, { TypeCompiler: TypeCompiler2 } = {}) => {
+var createMirror = (schema, {
+  TypeCompiler: TypeCompiler2,
+  definitions = {}
+} = {}) => {
   const unions = [];
   const f = mirror(schema, "v", {
     optionals: [],
@@ -212,7 +232,8 @@ var createMirror = (schema, { TypeCompiler: TypeCompiler2 } = {}) => {
     parentIsOptional: false,
     unions,
     unionKeys: {},
-    TypeCompiler: TypeCompiler2
+    TypeCompiler: TypeCompiler2,
+    definitions
   });
   if (!unions.length) return Function("v", f);
   const fn = `return function mirror(v){${f}}`;

package/dist/index.d.ts

@@ -18,6 +18,7 @@ interface Instruction {
      */
     TypeCompiler?: typeof TypeCompiler;
     typeCompilerWanred?: boolean;
+    definitions: Record<string, TAnySchema>;
 }
-export declare const createMirror: <T extends TAnySchema>(schema: T, { TypeCompiler }?: Pick<Instruction, "TypeCompiler">) => ((v: T["static"]) => T["static"]);
+export declare const createMirror: <T extends TAnySchema>(schema: T, { TypeCompiler, definitions }?: Partial<Pick<Instruction, "TypeCompiler" | "definitions">>) => ((v: T["static"]) => T["static"]);
 export default createMirror;

package/dist/index.mjs

@@ -1,6 +1,7 @@
 // src/index.ts
 import { TypeCompiler } from "@sinclair/typebox/compiler";
 var Kind = Symbol.for("TypeBox.Kind");
+var OptionalKind = Symbol.for("TypeBox.Optional");
 var isSpecialProperty = (name) => /(\ |-|\t|\n)/.test(name);
 var joinProperty = (v1, v2, isOptional = false) => {
   if (typeof v2 === "number") return `${v1}[${v2}]`;
@@ -86,6 +87,11 @@ var handleUnion = (schemas, property, instruction) => {
 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)
+    return mirror(schema.$defs[schema.$ref], property, {
+      ...instruction,
+      definitions: Object.assign(instruction.definitions, schema.$defs)
+    });
   if (isRoot && schema.type !== "object" && schema.type !== "array" && !schema.anyOf)
     return `return v`;
   let v = "";
@@ -143,8 +149,13 @@ var mirror = (schema, property, instruction) => {
       }
       const i = instruction.array;
       instruction.array++;
-      if (!isRoot) v = `(()=>{`;
-      v += `const ar${i}s=${property},ar${i}v=new Array(${property}.length);for(let i=0;i<ar${i}s.length;i++){const ar${i}p=ar${i}s[i];ar${i}v[i]=${mirror(schema.items, `ar${i}p`, instruction)}`;
+      let reference = property;
+      if (isRoot) v = `const ar${i}v=new Array(${property}.length);`;
+      else {
+        reference = `ar${i}s`;
+        v = `((${reference})=>{const ar${i}v=new Array(${reference}.length);`;
+      }
+      v += `for(let i=0;i<${reference}.length;i++){const ar${i}p=${reference}[i];ar${i}v[i]=${mirror(schema.items, `ar${i}p`, instruction)}`;
       const optionals = instruction.optionalsInArray[i + 1];
       if (optionals) {
         for (let oi = 0; oi < optionals.length; oi++) {
@@ -153,9 +164,15 @@ var mirror = (schema, property, instruction) => {
         }
       }
       v += `}`;
-      if (!isRoot) v += `return ar${i}v})()`;
+      if (!isRoot) v += `return ar${i}v})(${property})`;
       break;
     default:
+      if (schema.$ref && schema.$ref in instruction.definitions)
+        return mirror(
+          instruction.definitions[schema.$ref],
+          property,
+          instruction
+        );
       if (Array.isArray(schema.anyOf)) {
         v = handleUnion(schema.anyOf, property, instruction);
         break;
@@ -177,7 +194,10 @@ var mirror = (schema, property, instruction) => {
   }
   return `${v}return x`;
 };
-var createMirror = (schema, { TypeCompiler: TypeCompiler2 } = {}) => {
+var createMirror = (schema, {
+  TypeCompiler: TypeCompiler2,
+  definitions = {}
+} = {}) => {
   const unions = [];
   const f = mirror(schema, "v", {
     optionals: [],
@@ -186,7 +206,8 @@ var createMirror = (schema, { TypeCompiler: TypeCompiler2 } = {}) => {
     parentIsOptional: false,
     unions,
     unionKeys: {},
-    TypeCompiler: TypeCompiler2
+    TypeCompiler: TypeCompiler2,
+    definitions
   });
   if (!unions.length) return Function("v", f);
   const fn = `return function mirror(v){${f}}`;

package/package.json

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