@miroir-framework/jzod-ts 0.5.1 → 0.5.3

package/dist/src/index.d.ts

@@ -1,3 +1,3 @@
-export { jzodToTsCode, jzodToTsTypeAliasesAndZodText, TsTypeAliasesAndZodText as JzodTypeAliasesAndZodText, TsTypeAliases, } from "./JzodToTs";
-export { printTsTypeAlias, printTsTypeAliases } from "./tools";
-export { jzodArraySchema, jzodAttributeSchema, jzodAttributeDateValidationsSchema, jzodAttributeDateWithValidationsSchema, jzodAttributeNumberValidationsSchema, jzodAttributeNumberWithValidationsSchema, jzodAttributeStringValidationsSchema, jzodAttributeStringWithValidationsSchema, jzodElementSchema, jzodEnumAttributeTypesSchema, jzodEnumElementTypesSchema, jzodEnumSchema, jzodFunctionSchema, jzodIntersectionSchema, jzodLazySchema, jzodLiteralSchema, jzodMapSchema, jzodObjectSchema, jzodPromiseSchema, jzodRecordSchema, jzodReferenceSchema, jzodSetSchema, jzodTupleSchema, jzodUnionSchema, JzodArray, JzodAttribute, JzodAttributeDateValidations, JzodAttributeDateWithValidations, JzodAttributeNumberValidations, JzodAttributeNumberWithValidations, JzodAttributeStringValidations, JzodAttributeStringWithValidations, JzodElement, JzodEnum, JzodEnumTypes, JzodFunction, JzodEnumElementTypes, JzodIntersection, JzodLazy, JzodLiteral, JzodMap, JzodObject, JzodPromise, JzodRecord, JzodReference, JzodSet, JzodUnion, JzodTuple, } from "./JzodTsInterface";
+export { jzodToTsCode, jzodToTsTypeAliasesAndZodText, TsTypeAliasesAndZodText as JzodTypeAliasesAndZodText, TsTypeAliases, } from "./JzodToTs";
+export { printTsTypeAlias, printTsTypeAliases } from "./tools";
+export { jzodArray, jzodAttribute, jzodAttributeDateValidations, jzodAttributeDateWithValidations, jzodAttributeNumberValidations, jzodAttributeNumberWithValidations, jzodAttributeStringValidations, jzodAttributeStringWithValidations, jzodElement, jzodEnumAttributeTypes, jzodEnumElementTypes, jzodEnum, jzodFunction, jzodIntersection, jzodLazy, jzodLiteral, jzodMapSchema, jzodObject, jzodPromise, jzodRecord, jzodReference, jzodSet, jzodTuple, jzodUnion, JzodArray, JzodAttribute, JzodAttributeDateValidations, JzodAttributeDateWithValidations, JzodAttributeNumberValidations, JzodAttributeNumberWithValidations, JzodAttributeStringValidations, JzodAttributeStringWithValidations, JzodElement, JzodEnum, JzodEnumTypes, JzodFunction, JzodEnumElementTypes, JzodIntersection, JzodLazy, JzodLiteral, JzodMap, JzodObject, JzodPromise, JzodRecord, JzodReference, JzodSet, JzodUnion, JzodTuple, } from "./JzodTsInterface";

package/dist/src/tools.d.ts

@@ -1,4 +1,4 @@
-import ts from "typescript";
-import { TsTypeAliases } from "./JzodToTs";
-export declare function printTsTypeAlias(typeAlias: ts.TypeAliasDeclaration, exportPrefix?: boolean): string;
-export declare function printTsTypeAliases(typeAliases: TsTypeAliases, exportPrefix?: boolean): string;
+import ts from "typescript";
+import { TsTypeAliases } from "./JzodToTs";
+export declare function printTsTypeAlias(typeAlias: ts.TypeAliasDeclaration, exportPrefix?: boolean): string;
+export declare function printTsTypeAliases(typeAliases: TsTypeAliases, exportPrefix?: boolean): string;

package/jest.config.js

@@ -1,63 +1,63 @@
-// import { pathsToModuleNameMapper } from 'ts-jest';
-// import compilerOptions from './tsconfig'
-
-const esModules = ['uuid'].join('|');
-
-export default (path, options) =>({
-  "verbose": true,
-  "rootDir": ".",
-  "moduleDirectories": [
-    "node_modules",
-  ],
-  transformIgnorePatterns: [`<rootDir>\/(?!(/node_modules/(?!${esModules})))\/`],
-  // modulePaths: ["./packages/miroir-standalone-app/src/"], // <-- This will be set to 'baseUrl' value
-  modulePaths: ["./src/"], // <-- This will be set to 'baseUrl' value
-  // modulePaths: [compilerOptions.baseUrl], // <-- This will be set to 'baseUrl' value
-  moduleNameMapper: 
-    // Object.assign(
-      {
-      // "^miroir-fwk(.*)$": "<rootDir>/src/$1",
-      // "^(.*)$": "$1",
-      '\\.(css|scss|sass)$': 'identity-obj-proxy',
-      }
-    // pathsToModuleNameMapper(compilerOptions.paths /*, { prefix: '<rootDir>/' } */)
-    // )
-  ,
-  // resolver:options.defaultResolver(path, {...options}),
-  testEnvironment: "node",
-  moduleFileExtensions:[
-    "ts", "tsx", "js", "mjs", "cjs", "jsx", "json", "node"
-  ],
-  // preset:'ts-jest/presets/default-esm',
-  "transform": {
-    "^.+\\.tsx?$": [
-      "ts-jest",
-      {
-        // useESM:true,
-        // tsconfig: "../../tsconfig.json"
-        tsconfig: 
-        {
-          resolveJsonModule: true,
-          esModuleInterop: true,
-          allowSyntheticDefaultImports:true,
-          allowJs: true,
-          moduleResolution: "node",
-          // module: "ESNext",
-          // target: "ES2017",
-                // rootDir: "./src/",
-          traceResolution: true,
-          module:"commonjs"
-        },
-      }
-    ],
-    "^.+\\.js?$": ["babel-jest"],
-  },
-  // moduleNameMapper: {
-  //   "^miroir-fwk\/(.+)$": "<rootDir>/src/$1",
-  //   '\\.(css|scss|sass)$': 'identity-obj-proxy',
-  // },
-  "testPathIgnorePatterns": [
-    "./node_modules/",
-    "./.cache/"
-  ],
+// import { pathsToModuleNameMapper } from 'ts-jest';
+// import compilerOptions from './tsconfig'
+
+const esModules = ['uuid'].join('|');
+
+export default (path, options) =>({
+  "verbose": true,
+  "rootDir": ".",
+  "moduleDirectories": [
+    "node_modules",
+  ],
+  transformIgnorePatterns: [`<rootDir>\/(?!(/node_modules/(?!${esModules})))\/`],
+  // modulePaths: ["./packages/miroir-standalone-app/src/"], // <-- This will be set to 'baseUrl' value
+  modulePaths: ["./src/"], // <-- This will be set to 'baseUrl' value
+  // modulePaths: [compilerOptions.baseUrl], // <-- This will be set to 'baseUrl' value
+  moduleNameMapper: 
+    // Object.assign(
+      {
+      // "^miroir-fwk(.*)$": "<rootDir>/src/$1",
+      // "^(.*)$": "$1",
+      '\\.(css|scss|sass)$': 'identity-obj-proxy',
+      }
+    // pathsToModuleNameMapper(compilerOptions.paths /*, { prefix: '<rootDir>/' } */)
+    // )
+  ,
+  // resolver:options.defaultResolver(path, {...options}),
+  testEnvironment: "node",
+  moduleFileExtensions:[
+    "ts", "tsx", "js", "mjs", "cjs", "jsx", "json", "node"
+  ],
+  // preset:'ts-jest/presets/default-esm',
+  "transform": {
+    "^.+\\.tsx?$": [
+      "ts-jest",
+      {
+        // useESM:true,
+        // tsconfig: "../../tsconfig.json"
+        tsconfig: 
+        {
+          resolveJsonModule: true,
+          esModuleInterop: true,
+          allowSyntheticDefaultImports:true,
+          allowJs: true,
+          moduleResolution: "node",
+          // module: "ESNext",
+          // target: "ES2017",
+                // rootDir: "./src/",
+          traceResolution: true,
+          module:"commonjs"
+        },
+      }
+    ],
+    "^.+\\.js?$": ["babel-jest"],
+  },
+  // moduleNameMapper: {
+  //   "^miroir-fwk\/(.+)$": "<rootDir>/src/$1",
+  //   '\\.(css|scss|sass)$': 'identity-obj-proxy',
+  // },
+  "testPathIgnorePatterns": [
+    "./node_modules/",
+    "./.cache/"
+  ],
 })

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@miroir-framework/jzod-ts",
   "private": false,
-  "version": "0.5.1",
+  "version": "0.5.3",
   "description": "The Typescript-related functionalities of Jzod.",
   "main": "dist/bundle.js",
   "types": "dist/bundle.d.ts",
@@ -15,7 +15,7 @@
   "bugs": "https://github.com/miroir-framework/jzod/issues",
   "license": "MIT",
   "dependencies": {
-    "@miroir-framework/jzod": "0.5.1",
+    "@miroir-framework/jzod": "0.5.3",
     "zod": "^3.22.2",
     "zod-to-ts": "^1.2.0"
   },

package/rollup.config.js

@@ -1,36 +1,36 @@
-import typescript from 'rollup-plugin-typescript2';
-import dts from 'rollup-plugin-dts';
-
-export default [
-  {
-    input: ["src/index.ts"],
-    external: [
-      'zod',
-      'zod-to-ts',
-      '@miroir-framework/jzod',
-    ],
-    output: [
-        {
-            file: `dist/bundle.js`,
-            entryFileNames: "[name].js",
-            format: "es",
-            exports: "named"
-        }
-    ],
-    plugins: [
-      typescript(),
-    ],
-  },
-  {
-    input: ["dist/src/index.d.ts"],
-    output: [
-        {
-          file: `dist/bundle.d.ts`,
-          format: 'es',
-        }
-    ],
-    plugins: [
-      dts(),
-    ],
-  }
-];
+import typescript from 'rollup-plugin-typescript2';
+import dts from 'rollup-plugin-dts';
+
+export default [
+  {
+    input: ["src/index.ts"],
+    external: [
+      'zod',
+      'zod-to-ts',
+      '@miroir-framework/jzod',
+    ],
+    output: [
+        {
+            file: `dist/bundle.js`,
+            entryFileNames: "[name].js",
+            format: "es",
+            exports: "named"
+        }
+    ],
+    plugins: [
+      typescript(),
+    ],
+  },
+  {
+    input: ["dist/src/index.d.ts"],
+    output: [
+        {
+          file: `dist/bundle.d.ts`,
+          format: 'es',
+        }
+    ],
+    plugins: [
+      dts(),
+    ],
+  }
+];

package/src/JzodToTs.ts

@@ -1,104 +1,109 @@
-import ts from "typescript";
-import { ZodLazy } from "zod";
-import { createTypeAlias, printNode, withGetType, zodToTs } from "zod-to-ts";
-
-import { jzodElementSchemaToZodSchemaAndDescription } from "@miroir-framework/jzod";
-
-import { JzodElement } from "./JzodTsInterface";
-
-import { printTsTypeAliases } from "./tools";
-// ################################################################################################
-export type TsTypeAliases =  {
-  [k: string]: ts.TypeAliasDeclaration;
-}
-
-// ################################################################################################
-export interface TsTypeAliasesAndZodText {
-  contextTsTypeAliases: { [k: string]: ts.TypeAliasDeclaration },
-  contextZodText: { [k: string]: string },
-  mainTsTypeAlias: ts.TypeAliasDeclaration,
-  mainZodText: string 
-}
-
-// ################################################################################################
-export function jzodToTsTypeAliasesAndZodText(
-  element: JzodElement,
-  typeName?: string,
-): TsTypeAliasesAndZodText
-{
-  const elementZodSchemaAndDescription = jzodElementSchemaToZodSchemaAndDescription(
-    element,
-    () => ({}),
-    () => ({}),
-    (innerReference: ZodLazy<any>, relativeReference: string | undefined) =>
-      withGetType(innerReference, (ts) => {
-        return ts.factory.createTypeReferenceNode(
-          ts.factory.createIdentifier(relativeReference ? relativeReference : "RELATIVEPATH_NOT_DEFINED")
-        );
-      }
-    )
-  );
-
-  const contextTsTypesString = Object.fromEntries(
-    Object.entries(elementZodSchemaAndDescription.contextZodSchema ?? {}).map((curr) => {
-      // console.log("getTsCodeCorrespondingToZodSchemaAndDescription ", JSON.stringify(curr));
-      const tsNode = zodToTs(curr[1], typeName).node;
-      const typeAlias = createTypeAlias(tsNode, curr[0]);
-      return [curr[0], typeAlias];
-    })
-  );
-
-  const tsTypeStringNode = zodToTs(elementZodSchemaAndDescription.zodSchema, typeName).node;
-  const tsTypeStringTypeAlias = createTypeAlias(tsTypeStringNode, typeName??"");
-
-  return {
-    contextTsTypeAliases: contextTsTypesString,
-    contextZodText: elementZodSchemaAndDescription.contextZodText??{},
-    mainZodText: elementZodSchemaAndDescription.zodText,
-    mainTsTypeAlias: tsTypeStringTypeAlias,
-  };
-}
-
-
-// ################################################################################################
-export function jzodToTsCode (
-  jzodElement: JzodElement,
-  exportPrefix: boolean = true,
-  typeName?: string,
-): string {
-  // console.log(
-  //   "getTsCodeCorrespondingToZodSchemaAndDescription jzodSchemaZodSchemaAndDescription.contextZodSchema",
-  //   "jzodElement",
-  //   JSON.stringify(jzodElement)
-  // );
-  
-  const schemaName = typeName?typeName.replace(/^(.)(.*)$/, (a, b, c) => b.toLowerCase() + c):"";
-  // console.log("getTsCodeCorrespondingToZodSchemaAndDescription convertedJsonZodSchema", bodyJsCode);
-
-  const header = `import { ZodType, ZodTypeAny, z } from "zod";`;
-
-  const typeAliasesAndZodText = jzodToTsTypeAliasesAndZodText(jzodElement, typeName);
-
-  const bodyJsCode = `export const ${schemaName}: z.ZodType<${schemaName}> = ${typeAliasesAndZodText.mainZodText};`;
-
-  const contextTsTypesString = printTsTypeAliases(typeAliasesAndZodText.contextTsTypeAliases, exportPrefix);
-  // console.log("getTsCodeCorrespondingToZodSchemaAndDescription contextTsTypesString",contextTsTypesString);
-
-  const contextJsCode = typeAliasesAndZodText.contextZodText
-    ? Object.entries(typeAliasesAndZodText.contextZodText).reduce((acc, curr) => {
-        return `${acc}
-export const ${curr[0]}=${curr[1]};`;
-      }, "")
-    : ""
-  ;
-
-  const tsTypesString = (exportPrefix?"export ":"") + printNode(typeAliasesAndZodText.mainTsTypeAlias);
-  // console.log("getTsCodeCorrespondingToZodSchemaAndDescription tsTypeString",tsTypesString);
-
-  return `${header}
-${contextTsTypesString}
-${tsTypesString}
-${contextJsCode}
-${bodyJsCode}
-`;
-}
+import ts from "typescript";
+import { ZodLazy } from "zod";
+import { createTypeAlias, printNode, withGetType, zodToTs } from "zod-to-ts";
+
+import { jzodElementSchemaToZodSchemaAndDescription } from "@miroir-framework/jzod";
+
+import { JzodElement } from "./JzodTsInterface";
+
+import { printTsTypeAliases } from "./tools";
+// ################################################################################################
+export type TsTypeAliases =  {
+  [k: string]: ts.TypeAliasDeclaration;
+}
+
+// ################################################################################################
+export interface TsTypeAliasesAndZodText {
+  contextTsTypeAliases: { [k: string]: ts.TypeAliasDeclaration },
+  contextZodText: { [k: string]: string },
+  mainTsTypeAlias: ts.TypeAliasDeclaration,
+  mainZodText: string 
+}
+
+// ################################################################################################
+export function jzodToTsTypeAliasesAndZodText(
+  element: JzodElement,
+  typeName?: string,
+): TsTypeAliasesAndZodText
+{
+  const elementZodSchemaAndDescription = jzodElementSchemaToZodSchemaAndDescription(
+    element,
+    () => ({}),
+    () => ({}),
+    (innerReference: ZodLazy<any>, relativeReference: string | undefined) =>
+      withGetType(innerReference, (ts) => {
+        const actualTypeName = relativeReference?relativeReference.replace(/^(.)(.*)$/, (a, b, c) => b.toUpperCase() + c):"";
+        return ts.factory.createTypeReferenceNode(
+
+          ts.factory.createIdentifier(actualTypeName ? actualTypeName : "RELATIVEPATH_NOT_DEFINED")
+        );
+      }
+    )
+  );
+
+  const contextTsTypesString = Object.fromEntries(
+    Object.entries(elementZodSchemaAndDescription.contextZodSchema ?? {}).map((curr) => {
+      const actualTypeName = curr[0]?curr[0].replace(/^(.)(.*)$/, (a, b, c) => b.toUpperCase() + c):"";
+      // console.log("getTsCodeCorrespondingToZodSchemaAndDescription ", JSON.stringify(curr));
+      const tsNode = zodToTs(curr[1], typeName).node;
+      const typeAlias = createTypeAlias(tsNode, actualTypeName);
+      return [curr[0], typeAlias];
+    })
+  );
+
+  const tsTypeStringNode = zodToTs(elementZodSchemaAndDescription.zodSchema, typeName).node;
+  const tsTypeStringTypeAlias = createTypeAlias(tsTypeStringNode, typeName??"");
+
+  return {
+    contextTsTypeAliases: contextTsTypesString,
+    contextZodText: elementZodSchemaAndDescription.contextZodText??{},
+    mainZodText: elementZodSchemaAndDescription.zodText,
+    mainTsTypeAlias: tsTypeStringTypeAlias,
+  };
+}
+
+
+// ################################################################################################
+export function jzodToTsCode (
+  jzodElement: JzodElement,
+  exportPrefix: boolean = true,
+  typeName?: string,
+): string {
+  // console.log(
+  //   "getTsCodeCorrespondingToZodSchemaAndDescription jzodSchemaZodSchemaAndDescription.contextZodSchema",
+  //   "jzodElement",
+  //   JSON.stringify(jzodElement)
+  // );
+  
+  const schemaName = typeName?typeName.replace(/^(.)(.*)$/, (a, b, c) => b.toLowerCase() + c):"";
+  const actualTypeName = typeName?typeName.replace(/^(.)(.*)$/, (a, b, c) => b.toUpperCase() + c):"";
+  // console.log("getTsCodeCorrespondingToZodSchemaAndDescription convertedJsonZodSchema", bodyJsCode);
+
+  const header = `import { ZodType, ZodTypeAny, z } from "zod";`;
+
+  const typeAliasesAndZodText = jzodToTsTypeAliasesAndZodText(jzodElement, actualTypeName);
+
+  const bodyJsCode = `export const ${schemaName}: z.ZodType<${actualTypeName}> = ${typeAliasesAndZodText.mainZodText};`;
+
+  const contextTsTypesString = printTsTypeAliases(typeAliasesAndZodText.contextTsTypeAliases, exportPrefix);
+  // console.log("getTsCodeCorrespondingToZodSchemaAndDescription contextTsTypesString",contextTsTypesString);
+
+  const contextJsCode = typeAliasesAndZodText.contextZodText
+    ? Object.entries(typeAliasesAndZodText.contextZodText).reduce((acc, curr) => {
+        const contextTypeName = curr[0]?curr[0].replace(/^(.)(.*)$/, (a, b, c) => b.toUpperCase() + c):"";
+        return `${acc}
+export const ${curr[0]}:z.ZodType<${contextTypeName}> = ${curr[1]};`;
+      }, "")
+    : ""
+  ;
+
+  const tsTypesString = (exportPrefix?"export ":"") + printNode(typeAliasesAndZodText.mainTsTypeAlias);
+  // console.log("getTsCodeCorrespondingToZodSchemaAndDescription tsTypeString",tsTypesString);
+
+  return `${header}
+${contextTsTypesString}
+${tsTypesString}
+${contextJsCode}
+${bodyJsCode}
+`;
+}