@miroir-framework/jzod-ts 0.5.2 → 0.5.3

package/dist/src/JzodTsInterface.d.ts

@@ -7,10 +7,10 @@ declare const jzodRootSchema: z.ZodObject<{
     optional?: boolean | undefined;
 }>;
 type JzodRoot = z.infer<typeof jzodRootSchema>;
-export declare const jzodEnumAttributeTypesSchema: z.ZodEnum<["any", "bigint", "boolean", "date", "never", "null", "number", "string", "uuid", "undefined", "unknown", "void"]>;
-export type JzodEnumTypes = z.infer<typeof jzodEnumAttributeTypesSchema>;
-export declare const jzodEnumElementTypesSchema: z.ZodEnum<["array", "enum", "function", "lazy", "literal", "intersection", "map", "object", "promise", "record", "schemaReference", "set", "simpleType", "tuple", "union"]>;
-export type JzodEnumElementTypes = z.infer<typeof jzodEnumElementTypesSchema>;
+export declare const jzodEnumAttributeTypes: z.ZodEnum<["any", "bigint", "boolean", "date", "never", "null", "number", "string", "uuid", "undefined", "unknown", "void"]>;
+export type JzodEnumTypes = z.infer<typeof jzodEnumAttributeTypes>;
+export declare const jzodEnumElementTypes: z.ZodEnum<["array", "enum", "function", "lazy", "literal", "intersection", "map", "object", "promise", "record", "schemaReference", "set", "simpleType", "tuple", "union"]>;
+export type JzodEnumElementTypes = z.infer<typeof jzodEnumElementTypes>;
 export interface JzodArray extends JzodRoot {
     optional?: boolean;
     nullable?: boolean;
@@ -20,8 +20,8 @@ export interface JzodArray extends JzodRoot {
     type: 'array';
     definition: JzodElement;
 }
-export declare const jzodArraySchema: z.ZodType<JzodArray>;
-export declare const jzodAttributeDateValidationsSchema: z.ZodObject<{
+export declare const jzodArray: z.ZodType<JzodArray>;
+export declare const jzodAttributeDateValidations: z.ZodObject<{
     extra: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodAny>>;
     type: z.ZodEnum<["min", "max"]>;
     parameter: z.ZodAny;
@@ -34,8 +34,8 @@ export declare const jzodAttributeDateValidationsSchema: z.ZodObject<{
     extra?: Record<string, any> | undefined;
     parameter?: any;
 }>;
-export type JzodAttributeDateValidations = z.infer<typeof jzodAttributeDateValidationsSchema>;
-export declare const jzodAttributeNumberValidationsSchema: z.ZodObject<{
+export type JzodAttributeDateValidations = z.infer<typeof jzodAttributeDateValidations>;
+export declare const jzodAttributeNumberValidations: z.ZodObject<{
     extra: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodAny>>;
     type: z.ZodEnum<["gt", "gte", "lt", "lte", "int", "positive", "nonpositive", "negative", "nonnegative", "multipleOf", "finite", "safe"]>;
     parameter: z.ZodAny;
@@ -48,8 +48,8 @@ export declare const jzodAttributeNumberValidationsSchema: z.ZodObject<{
     extra?: Record<string, any> | undefined;
     parameter?: any;
 }>;
-export type JzodAttributeNumberValidations = z.infer<typeof jzodAttributeNumberValidationsSchema>;
-export declare const jzodAttributeStringValidationsSchema: z.ZodObject<{
+export type JzodAttributeNumberValidations = z.infer<typeof jzodAttributeNumberValidations>;
+export declare const jzodAttributeStringValidations: z.ZodObject<{
     extra: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodAny>>;
     type: z.ZodEnum<["max", "min", "length", "email", "url", "emoji", "uuid", "cuid", "cuid2", "ulid", "regex", "includes", "startsWith", "endsWith", "datetime", "ip"]>;
     parameter: z.ZodAny;
@@ -62,8 +62,8 @@ export declare const jzodAttributeStringValidationsSchema: z.ZodObject<{
     extra?: Record<string, any> | undefined;
     parameter?: any;
 }>;
-export type JzodAttributeStringValidations = z.infer<typeof jzodAttributeStringValidationsSchema>;
-export declare const jzodAttributeDateWithValidationsSchema: z.ZodObject<{
+export type JzodAttributeStringValidations = z.infer<typeof jzodAttributeStringValidations>;
+export declare const jzodAttributeDateWithValidations: z.ZodObject<{
     optional: z.ZodOptional<z.ZodBoolean>;
     nullable: z.ZodOptional<z.ZodBoolean>;
     extra: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodAny>>;
@@ -108,8 +108,8 @@ export declare const jzodAttributeDateWithValidationsSchema: z.ZodObject<{
     extra?: Record<string, any> | undefined;
     coerce?: boolean | undefined;
 }>;
-export type JzodAttributeDateWithValidations = z.infer<typeof jzodAttributeDateWithValidationsSchema>;
-export declare const jzodAttributeNumberWithValidationsSchema: z.ZodObject<{
+export type JzodAttributeDateWithValidations = z.infer<typeof jzodAttributeDateWithValidations>;
+export declare const jzodAttributeNumberWithValidations: z.ZodObject<{
     optional: z.ZodOptional<z.ZodBoolean>;
     nullable: z.ZodOptional<z.ZodBoolean>;
     extra: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodAny>>;
@@ -154,8 +154,8 @@ export declare const jzodAttributeNumberWithValidationsSchema: z.ZodObject<{
     extra?: Record<string, any> | undefined;
     coerce?: boolean | undefined;
 }>;
-export type JzodAttributeNumberWithValidations = z.infer<typeof jzodAttributeNumberWithValidationsSchema>;
-export declare const jzodAttributeStringWithValidationsSchema: z.ZodObject<{
+export type JzodAttributeNumberWithValidations = z.infer<typeof jzodAttributeNumberWithValidations>;
+export declare const jzodAttributeStringWithValidations: z.ZodObject<{
     optional: z.ZodOptional<z.ZodBoolean>;
     nullable: z.ZodOptional<z.ZodBoolean>;
     extra: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodAny>>;
@@ -200,8 +200,8 @@ export declare const jzodAttributeStringWithValidationsSchema: z.ZodObject<{
     extra?: Record<string, any> | undefined;
     coerce?: boolean | undefined;
 }>;
-export type JzodAttributeStringWithValidations = z.infer<typeof jzodAttributeStringWithValidationsSchema>;
-export declare const jzodAttributeSchema: z.ZodObject<{
+export type JzodAttributeStringWithValidations = z.infer<typeof jzodAttributeStringWithValidations>;
+export declare const jzodAttribute: z.ZodObject<{
     optional: z.ZodOptional<z.ZodBoolean>;
     nullable: z.ZodOptional<z.ZodBoolean>;
     extra: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodAny>>;
@@ -223,10 +223,10 @@ export declare const jzodAttributeSchema: z.ZodObject<{
     extra?: Record<string, any> | undefined;
     coerce?: boolean | undefined;
 }>;
-export type JzodAttribute = z.infer<typeof jzodAttributeSchema>;
+export type JzodAttribute = z.infer<typeof jzodAttribute>;
 export type JzodElement = JzodArray | JzodAttribute | JzodAttributeDateWithValidations | JzodAttributeNumberWithValidations | JzodAttributeStringWithValidations | JzodEnum | JzodFunction | JzodLazy | JzodLiteral | JzodIntersection | JzodMap | JzodRecord | JzodObject | JzodPromise | JzodReference | JzodSet | JzodTuple | JzodUnion;
-export declare const jzodElementSchema: z.ZodType<JzodElement>;
-export declare const jzodEnumSchema: z.ZodObject<{
+export declare const jzodElement: z.ZodType<JzodElement>;
+export declare const jzodEnum: z.ZodObject<{
     optional: z.ZodOptional<z.ZodBoolean>;
     nullable: z.ZodOptional<z.ZodBoolean>;
     extra: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodAny>>;
@@ -245,7 +245,7 @@ export declare const jzodEnumSchema: z.ZodObject<{
     nullable?: boolean | undefined;
     extra?: Record<string, any> | undefined;
 }>;
-export type JzodEnum = z.infer<typeof jzodEnumSchema>;
+export type JzodEnum = z.infer<typeof jzodEnum>;
 export interface JzodFunction {
     extra?: {
         [k: string]: any;
@@ -256,8 +256,8 @@ export interface JzodFunction {
         returns?: JzodElement;
     };
 }
-export declare const jzodFunctionSchema: ZodType<JzodFunction>;
-export declare const jzodLazySchema: z.ZodObject<{
+export declare const jzodFunction: ZodType<JzodFunction>;
+export declare const jzodLazy: z.ZodObject<{
     type: z.ZodLiteral<"lazy">;
     extra: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodAny>>;
     definition: ZodType<JzodFunction, z.ZodTypeDef, JzodFunction>;
@@ -270,8 +270,8 @@ export declare const jzodLazySchema: z.ZodObject<{
     definition: JzodFunction;
     extra?: Record<string, any> | undefined;
 }>;
-export type JzodLazy = z.infer<typeof jzodLazySchema>;
-export declare const jzodLiteralSchema: z.ZodObject<{
+export type JzodLazy = z.infer<typeof jzodLazy>;
+export declare const jzodLiteral: z.ZodObject<{
     optional: z.ZodOptional<z.ZodBoolean>;
     nullable: z.ZodOptional<z.ZodBoolean>;
     extra: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodAny>>;
@@ -290,7 +290,7 @@ export declare const jzodLiteralSchema: z.ZodObject<{
     nullable?: boolean | undefined;
     extra?: Record<string, any> | undefined;
 }>;
-export type JzodLiteral = z.infer<typeof jzodLiteralSchema>;
+export type JzodLiteral = z.infer<typeof jzodLiteral>;
 export interface JzodIntersection {
     optional?: boolean;
     nullable?: boolean;
@@ -303,7 +303,7 @@ export interface JzodIntersection {
         right: JzodElement;
     };
 }
-export declare const jzodIntersectionSchema: z.ZodType<JzodIntersection>;
+export declare const jzodIntersection: z.ZodType<JzodIntersection>;
 export interface JzodMap extends JzodRoot {
     optional?: boolean;
     nullable?: boolean;
@@ -327,7 +327,7 @@ export interface JzodObject extends JzodRoot {
         [attributeName: string]: JzodElement;
     };
 }
-export declare const jzodObjectSchema: z.ZodType<JzodObject>;
+export declare const jzodObject: z.ZodType<JzodObject>;
 export interface JzodPromise extends JzodRoot {
     extra?: {
         [k: string]: any;
@@ -335,7 +335,7 @@ export interface JzodPromise extends JzodRoot {
     type: 'promise';
     definition: JzodElement;
 }
-export declare const jzodPromiseSchema: z.ZodType<JzodPromise>;
+export declare const jzodPromise: z.ZodType<JzodPromise>;
 export interface JzodRecord {
     optional?: boolean;
     nullable?: boolean;
@@ -345,7 +345,7 @@ export interface JzodRecord {
     type: 'record';
     definition: JzodElement;
 }
-export declare const jzodRecordSchema: z.ZodType<JzodRecord>;
+export declare const jzodRecord: z.ZodType<JzodRecord>;
 export interface JzodReference {
     optional?: boolean;
     nullable?: boolean;
@@ -362,7 +362,7 @@ export interface JzodReference {
         absolutePath?: string;
     };
 }
-export declare const jzodReferenceSchema: ZodType<JzodReference>;
+export declare const jzodReference: ZodType<JzodReference>;
 export interface JzodSet extends JzodRoot {
     optional?: boolean;
     nullable?: boolean;
@@ -372,7 +372,7 @@ export interface JzodSet extends JzodRoot {
     type: 'set';
     definition: JzodElement;
 }
-export declare const jzodSetSchema: z.ZodType<JzodSet>;
+export declare const jzodSet: z.ZodType<JzodSet>;
 export interface JzodTuple {
     optional?: boolean;
     nullable?: boolean;
@@ -382,7 +382,7 @@ export interface JzodTuple {
     type: 'tuple';
     definition: JzodElement[];
 }
-export declare const jzodTupleSchema: z.ZodType<JzodTuple>;
+export declare const jzodTuple: z.ZodType<JzodTuple>;
 export interface JzodUnion {
     optional?: boolean;
     nullable?: boolean;
@@ -393,5 +393,5 @@ export interface JzodUnion {
     discriminator?: string;
     definition: JzodElement[];
 }
-export declare const jzodUnionSchema: z.ZodType<JzodUnion>;
+export declare const jzodUnion: z.ZodType<JzodUnion>;
 export {};

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 { 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/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@miroir-framework/jzod-ts",
   "private": false,
-  "version": "0.5.2",
+  "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.2",
+    "@miroir-framework/jzod": "0.5.3",
     "zod": "^3.22.2",
     "zod-to-ts": "^1.2.0"
   },

package/src/JzodToTs.ts

@@ -32,8 +32,10 @@ export function jzodToTsTypeAliasesAndZodText(
     () => ({}),
     (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(relativeReference ? relativeReference : "RELATIVEPATH_NOT_DEFINED")
+
+          ts.factory.createIdentifier(actualTypeName ? actualTypeName : "RELATIVEPATH_NOT_DEFINED")
         );
       }
     )
@@ -41,9 +43,10 @@ export function jzodToTsTypeAliasesAndZodText(
 
   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, curr[0]);
+      const typeAlias = createTypeAlias(tsNode, actualTypeName);
       return [curr[0], typeAlias];
     })
   );
@@ -73,21 +76,23 @@ export function jzodToTsCode (
   // );
   
   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, typeName);
+  const typeAliasesAndZodText = jzodToTsTypeAliasesAndZodText(jzodElement, actualTypeName);
 
-  const bodyJsCode = `export const ${schemaName}: z.ZodType<${schemaName}> = ${typeAliasesAndZodText.mainZodText};`;
+  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<${curr[0]}> = ${curr[1]};`;
+export const ${curr[0]}:z.ZodType<${contextTypeName}> = ${curr[1]};`;
       }, "")
     : ""
   ;