@miroir-framework/jzod-ts 0.8.0 → 0.8.3

package/README.md

@@ -1,3 +1,3 @@
-# Jzod-ts
-
+# Jzod-ts
+
 see [Jzod](https://github.com/miroir-framework/jzod) for usage information.

package/dist/index.cjs

@@ -53,14 +53,20 @@ module.exports = __toCommonJS(index_exports);
 // src/JzodToTs.ts
 var import_zod_to_ts = require("zod-to-ts");
 var import_jzod = require("@miroir-framework/jzod");
+var typeScriptLazyReferenceConverter = (innerReference, relativeReference) => (0, import_zod_to_ts.withGetType)(innerReference, (ts) => {
+  const actualTypeName = relativeReference ? relativeReference.replace(/^(.)(.*)$/, (a, b, c) => b.toUpperCase() + c) : "";
+  return ts.factory.createTypeReferenceNode(
+    ts.factory.createIdentifier(actualTypeName ?? "RELATIVEPATH_NOT_DEFINED"),
+    void 0
+  );
+});
 function jzodToZodTextAndZodSchemaForTsGeneration(element, context = {}) {
   const contextFunction = () => context;
   const elementZodSchemaAndDescription = (0, import_jzod.jzodToZodTextAndZodSchema)(
     element,
     contextFunction,
     contextFunction,
-    true
-    // typeScriptGeneration
+    { typeScriptLazyConverter: typeScriptLazyReferenceConverter }
   );
   return elementZodSchemaAndDescription;
 }
@@ -75,7 +81,6 @@ function jzodToZodTextAndTsTypeText(element, context = {}, typeName) {
       const tsNode = (0, import_zod_to_ts.zodToTs)(curr[1], typeName).node;
       const typeAlias = (0, import_zod_to_ts.createTypeAlias)(tsNode, actualTypeName2);
       const tsTypeString2 = (0, import_zod_to_ts.printNode)(typeAlias);
-      console.log("jzodToZodTextAndTsTypeText producing TS type for contextElement", curr[0]);
       return [curr[0], tsTypeString2];
     })
   );
@@ -135,9 +140,19 @@ function jzodToZodTextAndTsTypeAliases(element, context = {}, typeName) {
   };
 }
 function jzodToTsCode(typeName, jzodElement2, context = {}, exportPrefix = true, headerForZodImports = true, typeAnotationForSchema = [], extendedTsTypesText = "") {
+  console.log(
+    "################################### jzodToTsCodeeeeeeee typeName",
+    typeName,
+    "jzodElement",
+    jzodElement2 && jzodElement2.context ? JSON.stringify(
+      Object.entries(jzodElement2.context).map(([key, value]) => [key, !value]).map(([key, value]) => key + ": " + value),
+      null,
+      2
+    ) : void 0
+  );
   const schemaName = typeName ? typeName.replace(/^(.)(.*)$/, (a, b, c) => b.toLowerCase() + c) : "";
   const actualTypeName = typeName ? typeName.replace(/^(.)(.*)$/, (a, b, c) => b.toUpperCase() + c) : "";
-  const header = headerForZodImports ? `import { ZodType, ZodTypeAny, z } from "zod";` : "";
+  const header = typeof headerForZodImports == "string" ? headerForZodImports : headerForZodImports ? `import { ZodType, ZodTypeAny, z } from "zod";` : "";
   const tsTypeStringsAndZodText = jzodToZodTextAndTsTypeText(jzodElement2, context, actualTypeName);
   const contextTsTypesString = tsTypeStringsAndZodText.contextTsTypeText ? Object.entries(tsTypeStringsAndZodText.contextTsTypeText).reduce((acc, curr) => {
     return exportPrefix ? `${acc}
@@ -187,7 +202,7 @@ var jzodRecord = import_zod.z.object({ optional: import_zod.z.boolean().optional
 var jzodReference = import_zod.z.object({ optional: import_zod.z.boolean().optional(), nullable: import_zod.z.boolean().optional(), extra: import_zod.z.any().optional(), tag: import_zod.z.object({ value: import_zod.z.any(), schema: import_zod.z.object({ optional: import_zod.z.boolean().optional(), metaSchema: import_zod.z.lazy(() => jzodElement).optional(), valueSchema: import_zod.z.lazy(() => jzodElement).optional() }).strict().optional(), optional: import_zod.z.boolean().optional() }).strict().optional(), type: import_zod.z.literal("schemaReference"), context: import_zod.z.record(import_zod.z.string(), import_zod.z.lazy(() => jzodElement)).optional(), carryOn: import_zod.z.union([import_zod.z.lazy(() => jzodObject), import_zod.z.lazy(() => jzodUnion)]).optional(), definition: import_zod.z.object({ eager: import_zod.z.boolean().optional(), partial: import_zod.z.boolean().optional(), relativePath: import_zod.z.string().optional(), absolutePath: import_zod.z.string().optional() }).strict() }).strict();
 var jzodSet = import_zod.z.object({ optional: import_zod.z.boolean().optional(), nullable: import_zod.z.boolean().optional(), extra: import_zod.z.any().optional(), tag: import_zod.z.object({ value: import_zod.z.any(), schema: import_zod.z.object({ optional: import_zod.z.boolean().optional(), metaSchema: import_zod.z.lazy(() => jzodElement).optional(), valueSchema: import_zod.z.lazy(() => jzodElement).optional() }).strict().optional(), optional: import_zod.z.boolean().optional() }).strict().optional(), type: import_zod.z.literal("set"), definition: import_zod.z.lazy(() => jzodElement) }).strict();
 var jzodTuple = import_zod.z.object({ optional: import_zod.z.boolean().optional(), nullable: import_zod.z.boolean().optional(), extra: import_zod.z.any().optional(), tag: import_zod.z.object({ value: import_zod.z.any(), schema: import_zod.z.object({ optional: import_zod.z.boolean().optional(), metaSchema: import_zod.z.lazy(() => jzodElement).optional(), valueSchema: import_zod.z.lazy(() => jzodElement).optional() }).strict().optional(), optional: import_zod.z.boolean().optional() }).strict().optional(), type: import_zod.z.literal("tuple"), definition: import_zod.z.array(import_zod.z.lazy(() => jzodElement)) }).strict();
-var jzodUnion = import_zod.z.object({ optional: import_zod.z.boolean().optional(), nullable: import_zod.z.boolean().optional(), extra: import_zod.z.any().optional(), tag: import_zod.z.object({ value: import_zod.z.any(), schema: import_zod.z.object({ optional: import_zod.z.boolean().optional(), metaSchema: import_zod.z.lazy(() => jzodElement).optional(), valueSchema: import_zod.z.lazy(() => jzodElement).optional() }).strict().optional(), optional: import_zod.z.boolean().optional() }).strict().optional(), type: import_zod.z.literal("union"), discriminator: import_zod.z.union([import_zod.z.object({ discriminatorType: import_zod.z.literal("string"), value: import_zod.z.string() }).strict(), import_zod.z.object({ discriminatorType: import_zod.z.literal("array"), value: import_zod.z.array(import_zod.z.string()) }).strict()]).optional(), carryOn: import_zod.z.union([import_zod.z.lazy(() => jzodObject), import_zod.z.lazy(() => jzodUnion)]).optional(), definition: import_zod.z.array(import_zod.z.lazy(() => jzodElement)) }).strict();
+var jzodUnion = import_zod.z.object({ optional: import_zod.z.boolean().optional(), nullable: import_zod.z.boolean().optional(), extra: import_zod.z.any().optional(), tag: import_zod.z.object({ value: import_zod.z.any(), schema: import_zod.z.object({ optional: import_zod.z.boolean().optional(), metaSchema: import_zod.z.lazy(() => jzodElement).optional(), valueSchema: import_zod.z.lazy(() => jzodElement).optional() }).strict().optional(), optional: import_zod.z.boolean().optional() }).strict().optional(), type: import_zod.z.literal("union"), optInDiscriminator: import_zod.z.boolean().optional(), discriminator: import_zod.z.union([import_zod.z.object({ discriminatorType: import_zod.z.literal("string"), value: import_zod.z.string() }).strict(), import_zod.z.object({ discriminatorType: import_zod.z.literal("array"), value: import_zod.z.array(import_zod.z.string()) }).strict()]).optional(), carryOn: import_zod.z.union([import_zod.z.lazy(() => jzodObject), import_zod.z.lazy(() => jzodUnion)]).optional(), definition: import_zod.z.array(import_zod.z.lazy(() => jzodElement)) }).strict();
 var jzodBootstrapElementSchema = import_zod.z.lazy(() => jzodElement);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/index.d.ts

@@ -27,7 +27,7 @@ context?: ZodTextAndZodSchemaRecord, typeName?: string): TsTypeAliasesAndZodText
  * @returns a string containing the resulting TS code
  */
 declare function jzodToTsCode(typeName: string, jzodElement: any, // to avoid circulatity on JzodElement
-context?: ZodTextAndZodSchemaRecord, exportPrefix?: boolean, headerForZodImports?: boolean, typeAnotationForSchema?: string[], extendedTsTypesText?: string): string;
+context?: ZodTextAndZodSchemaRecord, exportPrefix?: boolean, headerForZodImports?: boolean | string, typeAnotationForSchema?: string[], extendedTsTypesText?: string): string;
 
 type JzodArray = {
     optional?: boolean | undefined;
@@ -366,6 +366,7 @@ type JzodUnion = {
         optional?: boolean | undefined;
     } | undefined;
     type: "union";
+    optInDiscriminator?: boolean | undefined;
     discriminator?: ({
         discriminatorType: "string";
         value: string;

package/dist/index.js

@@ -6,18 +6,24 @@ const __dirname = dirname(__filename)
 
 
 // src/JzodToTs.ts
-import { createTypeAlias, printNode, zodToTs } from "zod-to-ts";
+import { createTypeAlias, printNode, withGetType, zodToTs } from "zod-to-ts";
 import {
   jzodToZodTextAndZodSchema
 } from "@miroir-framework/jzod";
+var typeScriptLazyReferenceConverter = (innerReference, relativeReference) => withGetType(innerReference, (ts) => {
+  const actualTypeName = relativeReference ? relativeReference.replace(/^(.)(.*)$/, (a, b, c) => b.toUpperCase() + c) : "";
+  return ts.factory.createTypeReferenceNode(
+    ts.factory.createIdentifier(actualTypeName ?? "RELATIVEPATH_NOT_DEFINED"),
+    void 0
+  );
+});
 function jzodToZodTextAndZodSchemaForTsGeneration(element, context = {}) {
   const contextFunction = () => context;
   const elementZodSchemaAndDescription = jzodToZodTextAndZodSchema(
     element,
     contextFunction,
     contextFunction,
-    true
-    // typeScriptGeneration
+    { typeScriptLazyConverter: typeScriptLazyReferenceConverter }
   );
   return elementZodSchemaAndDescription;
 }
@@ -32,7 +38,6 @@ function jzodToZodTextAndTsTypeText(element, context = {}, typeName) {
       const tsNode = zodToTs(curr[1], typeName).node;
       const typeAlias = createTypeAlias(tsNode, actualTypeName2);
       const tsTypeString2 = printNode(typeAlias);
-      console.log("jzodToZodTextAndTsTypeText producing TS type for contextElement", curr[0]);
       return [curr[0], tsTypeString2];
     })
   );
@@ -92,9 +97,19 @@ function jzodToZodTextAndTsTypeAliases(element, context = {}, typeName) {
   };
 }
 function jzodToTsCode(typeName, jzodElement2, context = {}, exportPrefix = true, headerForZodImports = true, typeAnotationForSchema = [], extendedTsTypesText = "") {
+  console.log(
+    "################################### jzodToTsCodeeeeeeee typeName",
+    typeName,
+    "jzodElement",
+    jzodElement2 && jzodElement2.context ? JSON.stringify(
+      Object.entries(jzodElement2.context).map(([key, value]) => [key, !value]).map(([key, value]) => key + ": " + value),
+      null,
+      2
+    ) : void 0
+  );
   const schemaName = typeName ? typeName.replace(/^(.)(.*)$/, (a, b, c) => b.toLowerCase() + c) : "";
   const actualTypeName = typeName ? typeName.replace(/^(.)(.*)$/, (a, b, c) => b.toUpperCase() + c) : "";
-  const header = headerForZodImports ? `import { ZodType, ZodTypeAny, z } from "zod";` : "";
+  const header = typeof headerForZodImports == "string" ? headerForZodImports : headerForZodImports ? `import { ZodType, ZodTypeAny, z } from "zod";` : "";
   const tsTypeStringsAndZodText = jzodToZodTextAndTsTypeText(jzodElement2, context, actualTypeName);
   const contextTsTypesString = tsTypeStringsAndZodText.contextTsTypeText ? Object.entries(tsTypeStringsAndZodText.contextTsTypeText).reduce((acc, curr) => {
     return exportPrefix ? `${acc}
@@ -144,7 +159,7 @@ var jzodRecord = z.object({ optional: z.boolean().optional(), nullable: z.boolea
 var jzodReference = z.object({ optional: z.boolean().optional(), nullable: z.boolean().optional(), extra: z.any().optional(), tag: z.object({ value: z.any(), schema: z.object({ optional: z.boolean().optional(), metaSchema: z.lazy(() => jzodElement).optional(), valueSchema: z.lazy(() => jzodElement).optional() }).strict().optional(), optional: z.boolean().optional() }).strict().optional(), type: z.literal("schemaReference"), context: z.record(z.string(), z.lazy(() => jzodElement)).optional(), carryOn: z.union([z.lazy(() => jzodObject), z.lazy(() => jzodUnion)]).optional(), definition: z.object({ eager: z.boolean().optional(), partial: z.boolean().optional(), relativePath: z.string().optional(), absolutePath: z.string().optional() }).strict() }).strict();
 var jzodSet = z.object({ optional: z.boolean().optional(), nullable: z.boolean().optional(), extra: z.any().optional(), tag: z.object({ value: z.any(), schema: z.object({ optional: z.boolean().optional(), metaSchema: z.lazy(() => jzodElement).optional(), valueSchema: z.lazy(() => jzodElement).optional() }).strict().optional(), optional: z.boolean().optional() }).strict().optional(), type: z.literal("set"), definition: z.lazy(() => jzodElement) }).strict();
 var jzodTuple = z.object({ optional: z.boolean().optional(), nullable: z.boolean().optional(), extra: z.any().optional(), tag: z.object({ value: z.any(), schema: z.object({ optional: z.boolean().optional(), metaSchema: z.lazy(() => jzodElement).optional(), valueSchema: z.lazy(() => jzodElement).optional() }).strict().optional(), optional: z.boolean().optional() }).strict().optional(), type: z.literal("tuple"), definition: z.array(z.lazy(() => jzodElement)) }).strict();
-var jzodUnion = z.object({ optional: z.boolean().optional(), nullable: z.boolean().optional(), extra: z.any().optional(), tag: z.object({ value: z.any(), schema: z.object({ optional: z.boolean().optional(), metaSchema: z.lazy(() => jzodElement).optional(), valueSchema: z.lazy(() => jzodElement).optional() }).strict().optional(), optional: z.boolean().optional() }).strict().optional(), type: z.literal("union"), discriminator: z.union([z.object({ discriminatorType: z.literal("string"), value: z.string() }).strict(), z.object({ discriminatorType: z.literal("array"), value: z.array(z.string()) }).strict()]).optional(), carryOn: z.union([z.lazy(() => jzodObject), z.lazy(() => jzodUnion)]).optional(), definition: z.array(z.lazy(() => jzodElement)) }).strict();
+var jzodUnion = z.object({ optional: z.boolean().optional(), nullable: z.boolean().optional(), extra: z.any().optional(), tag: z.object({ value: z.any(), schema: z.object({ optional: z.boolean().optional(), metaSchema: z.lazy(() => jzodElement).optional(), valueSchema: z.lazy(() => jzodElement).optional() }).strict().optional(), optional: z.boolean().optional() }).strict().optional(), type: z.literal("union"), optInDiscriminator: z.boolean().optional(), discriminator: z.union([z.object({ discriminatorType: z.literal("string"), value: z.string() }).strict(), z.object({ discriminatorType: z.literal("array"), value: z.array(z.string()) }).strict()]).optional(), carryOn: z.union([z.lazy(() => jzodObject), z.lazy(() => jzodUnion)]).optional(), definition: z.array(z.lazy(() => jzodElement)) }).strict();
 var jzodBootstrapElementSchema = z.lazy(() => jzodElement);
 export {
   jzodArray,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@miroir-framework/jzod-ts",
   "private": false,
-  "version": "0.8.0",
+  "version": "0.8.3",
   "description": "The Typescript-related functionalities of Jzod.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -36,25 +36,13 @@
     "test": "cross-env NODE_ENV=test vitest run --poolOptions.threads.singleThread --passWithNoTests -t"
   },
   "dependencies": {
-    "@miroir-framework/jzod": "0.8.1",
+    "@miroir-framework/jzod": "0.8.3",
     "zod": "^3.24.2",
     "zod-to-ts": "^1.2.0"
   },
   "devDependencies": {
-    "@babel/parser": "^7.26.10",
-    "@babel/plugin-transform-modules-commonjs": "^7.20.11",
-    "@babel/preset-env": "^7.22.5",
-    "@babel/types": "^7.26.10",
-    "@jest/globals": "^29.3.1",
-    "@rollup/plugin-commonjs": "^24.0.1",
-    "@rollup/plugin-json": "^6.0.0",
-    "@types/jest": "^29.2.4",
-    "babel-jest": "^29.4.0",
+    "@types/node": "^25.6.0",
     "path": "^0.12.7",
-    "rollup": "^3.10.1",
-    "rollup-plugin-dts": "^5.1.1",
-    "rollup-plugin-typescript2": "^0.34.1",
-    "ts-jest": "^29.0.3",
     "tsconfig-paths": "^4.1.2",
     "tsup": "^8.4.0",
     "tsx": "^4.19.3",