Feat/import type

example/heros.types.ts

@@ -34,3 +34,7 @@ export type SupermanName = z.infer<typeof generated.supermanNameSchema>;
 export type SupermanInvinciblePower = z.infer<
   typeof generated.supermanInvinciblePowerSchema
 >;
+
+export type EvilPlan = z.infer<typeof generated.evilPlanSchema>;
+
+export type EvilPlanDetails = z.infer<typeof generated.evilPlanDetailsSchema>;

example/heros.zod.ts

@@ -1,6 +1,7 @@
 // Generated by ts-to-zod
 import { z } from "zod";
-import { EnemyPower, Villain, EvilPlan, EvilPlanDetails } from "./heros";
+import type { Villain, EvilPlan, EvilPlanDetails } from "./heros";
+import { EnemyPower } from "./heros";
 
 export const enemyPowerSchema = z.nativeEnum(EnemyPower);
 

src/cli.ts

@@ -21,17 +21,28 @@ import { eachSeries } from "async";
 import { createConfig } from "./createConfig";
 import chokidar from "chokidar";
 
+type ConfigExt = ".js" | ".cjs";
+
 // Try to load `ts-to-zod.config.js`
 // We are doing this here to be able to infer the `flags` & `usage` in the cli help
-const tsToZodConfigJs = "ts-to-zod.config.js";
-const configPath = join(process.cwd(), tsToZodConfigJs);
+const tsToZodConfig = "ts-to-zod.config";
+const configPath = join(process.cwd(), tsToZodConfig);
 let config: TsToZodConfig | undefined;
 let haveMultiConfig = false;
 const configKeys: string[] = [];
 
+let configExt: ConfigExt | undefined;
 try {
-  if (existsSync(configPath)) {
-    const rawConfig = require(slash(relative(__dirname, configPath)));
+  if (existsSync(`${configPath}.js`)) {
+    configExt = ".js";
+  } else if (existsSync(`${configPath}.cjs`)) {
+    configExt = ".cjs";
+  }
+
+  if (configExt) {
+    const rawConfig = require(slash(
+      relative(__dirname, `${configPath}${configExt}`)
+    ));
     config = tsToZodConfigSchema.parse(rawConfig);
     if (Array.isArray(config)) {
       haveMultiConfig = true;
@@ -41,7 +52,7 @@ try {
 } catch (e) {
   if (e instanceof Error) {
     oclifError(
-      `"${tsToZodConfigJs}" invalid:
+      `"${tsToZodConfig}${configExt}" invalid:
   ${e.message}
 
   Please fix the invalid configuration
@@ -67,6 +78,11 @@ class TsToZod extends Command {
   static flags = {
     version: flags.version({ char: "v" }),
     help: flags.help({ char: "h" }),
+    esm: flags.boolean({
+      default: false,
+      description:
+        'Generate TypeScript import statements in ESM format (with ".js" extension)',
+    }),
     keepComments: flags.boolean({
       char: "k",
       description: "Keep parameters comments",
@@ -123,7 +139,7 @@ class TsToZod extends Command {
       return;
     }
 
-    const fileConfig = await this.loadFileConfig(config, flags);
+    const fileConfig = await this.loadFileConfig(config, flags, configExt!);
 
     if (Array.isArray(fileConfig)) {
       if (args.input || args.output) {
@@ -278,7 +294,7 @@ See more help with --help`,
           relativePath: "./source.integration.ts",
         },
         zodSchemas: {
-          sourceText: getZodSchemasFile("./source"),
+          sourceText: getZodSchemasFile("./source", sourceText),
           relativePath: "./source.zod.ts",
         },
         skipParseJSDoc: Boolean(generateOptions.skipParseJSDoc),
@@ -297,7 +313,8 @@ See more help with --help`,
     }
 
     const zodSchemasFile = getZodSchemasFile(
-      getImportPath(outputPath, inputPath)
+      getImportPath(outputPath, inputPath) + (flags.esm ? ".js" : ""),
+      sourceText,
     );
 
     const prettierConfig = await prettier.resolveConfig(process.cwd());
@@ -354,7 +371,8 @@ See more help with --help`,
    */
   async loadFileConfig(
     config: TsToZodConfig | undefined,
-    flags: OutputFlags<typeof TsToZod.flags>
+    flags: OutputFlags<typeof TsToZod.flags>,
+    ext: ConfigExt
   ): Promise<TsToZodConfig | undefined> {
     if (!config) {
       return undefined;
@@ -366,7 +384,7 @@ See more help with --help`,
         }>([
           {
             name: "mode",
-            message: `You have multiple configs available in "${tsToZodConfigJs}"\n What do you want?`,
+            message: `You have multiple configs available in "${tsToZodConfig}${ext}"\n What do you want?`,
             type: "list",
             choices: [
               {

src/config.zod.ts

@@ -24,6 +24,7 @@ export const jSDocTagFilterSchema = z
 export const configSchema = z.object({
   input: z.string(),
   output: z.string(),
+  esm: z.boolean().optional().default(false),
   skipValidation: z.boolean().optional(),
   nameFilter: nameFilterSchema.optional(),
   jsDocTagFilter: jSDocTagFilterSchema.optional(),

src/core/const.ts

@@ -0,0 +1,75 @@
+// Reference: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects
+export const standardBuiltInObjects = [
+  // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects#fundamental_objects
+  "Object",
+  "Function",
+  "Boolean",
+  "Symbol",
+  // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects#error_objects
+  "Error",
+  "AggregateError",
+  "EvalError",
+  "RangeError",
+  "ReferenceError",
+  "SyntaxError",
+  "TypeError",
+  "URIError",
+  // "InternalError",
+  // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects#numbers_and_dates
+  "Number",
+  "BigInt",
+  "Math",
+  // "Date",
+  // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects#indexed_collections
+  // "Array",
+  "Int8Array",
+  "Uint8Array",
+  "Uint8ClampedArray",
+  "Int16Array",
+  "Uint16Array",
+  "Int32Array",
+  "Uint32Array",
+  "BigInt64Array",
+  "BigUint64Array",
+  "Float32Array",
+  "Float64Array",
+  // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects#keyed_collections
+  "Map",
+  "Set",
+  "WeakMap",
+  "WeakSet",
+  // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects#structured_data
+  "ArrayBuffer",
+  "SharedArrayBuffer",
+  "DataView",
+  "Atomics",
+  "JSON",
+  // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects#managing_memory
+  "WeakRef",
+  "FinalizationRegistry",
+  // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects#control_abstraction_objects
+  "Promise",
+  "GeneratorFunction",
+  "AsyncGeneratorFunction",
+  "Generator",
+  "AsyncGenerator",
+  "AsyncFunction",
+  // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects#reflection
+  "Reflect",
+  "Proxy",
+  // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects#internationalization
+  // "Intl",
+  // "Intl.Collator",
+  // "Intl.DateTimeFormat",
+  // "Intl.DisplayNames",
+  // "Intl.ListFormat",
+  // "Intl.Locale",
+  // "Intl.NumberFormat",
+  // "Intl.PluralRules",
+  // "Intl.RelativeTimeFormat",
+  // "Intl.Segmenter",
+];
+
+export const standardBuiltInObjectVarNames = standardBuiltInObjects.map(
+  (n) => n[0].toLocaleLowerCase() + n.substring(1) + "Schema"
+);

src/core/generate.test.ts

@@ -26,7 +26,7 @@ describe("generate", () => {
     });
 
     it("should generate the zod schemas", () => {
-      expect(getZodSchemasFile("./hero")).toMatchInlineSnapshot(`
+      expect(getZodSchemasFile("./hero", sourceText)).toMatchInlineSnapshot(`
         "// Generated by ts-to-zod
         import { z } from \\"zod\\";
 
@@ -95,7 +95,7 @@ describe("generate", () => {
     });
 
     it("should generate the zod schemas", () => {
-      expect(getZodSchemasFile("./superhero")).toMatchInlineSnapshot(`
+      expect(getZodSchemasFile("./superhero", sourceText)).toMatchInlineSnapshot(`
         "// Generated by ts-to-zod
         import { z } from \\"zod\\";
         import { Superhero } from \\"./superhero\\";
@@ -160,7 +160,7 @@ describe("generate", () => {
       }
 
       export interface IHaveUnknownDependency {
-        dep: UnknwonDependency; // <- Missing dependency
+        dep: UnknownDependency; // <- Missing dependency
       }
       `;
 
@@ -169,10 +169,10 @@ describe("generate", () => {
     });
 
     it("should generate the zod schemas", () => {
-      expect(getZodSchemasFile("./villain")).toMatchInlineSnapshot(`
+      expect(getZodSchemasFile("./villain", sourceText)).toMatchInlineSnapshot(`
         "// Generated by ts-to-zod
         import { z } from \\"zod\\";
-        import { Villain, EvilPlan, EvilPlanDetails } from \\"./villain\\";
+        import type { Villain, EvilPlan, EvilPlanDetails } from \\"./villain\\";
 
         export const villainSchema: z.ZodSchema<Villain> = z.lazy(() => z.object({
             name: z.string(),
@@ -228,6 +228,7 @@ describe("generate", () => {
       expect(errors).toMatchInlineSnapshot(`
         Array [
           "Some schemas can't be generated due to direct or indirect missing dependencies:
+        unknownDependencySchema
         iHaveUnknownDependencySchema",
         ]
       `);
@@ -256,7 +257,7 @@ describe("generate", () => {
     });
 
     it("should generate superman schema", () => {
-      expect(getZodSchemasFile("./hero")).toMatchInlineSnapshot(`
+      expect(getZodSchemasFile("./hero", sourceText)).toMatchInlineSnapshot(`
         "// Generated by ts-to-zod
         import { z } from \\"zod\\";
 
@@ -286,7 +287,7 @@ describe("generate", () => {
     });
 
     it("should generate superman schema", () => {
-      expect(getZodSchemasFile("./hero")).toMatchInlineSnapshot(`
+      expect(getZodSchemasFile("./hero", sourceText)).toMatchInlineSnapshot(`
         "// Generated by ts-to-zod
         import { z } from \\"zod\\";
 
@@ -334,7 +335,7 @@ describe("generate", () => {
         jsDocTagFilter: (tags) => tags.map((tag) => tag.name).includes("zod"),
       });
 
-      expect(getZodSchemasFile("./source")).toMatchInlineSnapshot(`
+      expect(getZodSchemasFile("./source", sourceText)).toMatchInlineSnapshot(`
         "// Generated by ts-to-zod
         import { z } from \\"zod\\";
 
@@ -427,7 +428,7 @@ describe("generate", () => {
     });
 
     it("should generate the zod schemas", () => {
-      expect(getZodSchemasFile("./hero")).toMatchInlineSnapshot(`
+      expect(getZodSchemasFile("./hero", sourceText)).toMatchInlineSnapshot(`
         "// Generated by ts-to-zod
         import { z } from \\"zod\\";
 

src/core/generate.ts

@@ -13,6 +13,7 @@ import { generateIntegrationTests } from "./generateIntegrationTests";
 import { generateZodInferredType } from "./generateZodInferredType";
 import { generateZodSchemaVariableStatement } from "./generateZodSchema";
 import { transformRecursiveSchema } from "./transformRecursiveSchema";
+import { standardBuiltInObjectVarNames } from "./const";
 
 export interface GenerateProps {
   /**
@@ -131,6 +132,43 @@ export function generate({
   });
   const zodSchemaNames = zodSchemas.map(({ varName }) => varName);
 
+  // Zod schemas with direct or indirect dependencies that are not in `zodSchemas`, won't be generated
+  const zodSchemasWithMissingDependencies = new Set<string>();
+  const standardBuiltInObjects = new Set<string>();
+  zodSchemas.forEach(
+    ({ varName, dependencies, statement, typeName, requiresImport }) => {
+      dependencies
+        .filter((dep) => !zodSchemaNames.includes(dep))
+        .forEach((dep) => {
+          if (standardBuiltInObjectVarNames.includes(dep)) {
+            standardBuiltInObjects.add(dep);
+          } else {
+            zodSchemasWithMissingDependencies.add(dep);
+            zodSchemasWithMissingDependencies.add(varName);
+          }
+        });
+    }
+  );
+  zodSchemaNames.push(...standardBuiltInObjects);
+
+  zodSchemas.push(
+    ...Array.from(standardBuiltInObjects).map((obj) => {
+      const typeName = obj[0].toUpperCase() + obj.substring(1, obj.length - 6);
+      return {
+        typeName,
+        varName: obj,
+        ...generateZodSchemaVariableStatement({
+          typeName,
+          zodImportValue: "z",
+          sourceFile,
+          varName: obj,
+          getDependencyName: getSchemaName,
+          skipParseJSDoc,
+        }),
+      };
+    })
+  );
+
   // Resolves statements order
   // A schema can't be declared if all the referenced schemas used inside this one are not previously declared.
   const statements = new Map<
@@ -139,9 +177,6 @@ export function generate({
   >();
   const typeImports: Set<string> = new Set();
 
-  // Zod schemas with direct or indirect dependencies that are not in `zodSchemas`, won't be generated
-  const zodSchemasWithMissingDependencies = new Set<string>();
-
   let done = false;
   // Loop until no more schemas can be generated and no more schemas with direct or indirect missing dependencies are found
   while (
@@ -232,19 +267,34 @@ ${Array.from(zodSchemasWithMissingDependencies).join("\n")}`
   const transformedSourceText = printerWithComments.printFile(sourceFile);
 
   const imports = Array.from(typeImports.values());
-  const getZodSchemasFile = (
-    typesImportPath: string
-  ) => `// Generated by ts-to-zod
+  const getZodSchemasFile = (typesImportPath: string, sourceText: string) => {
+    const typeImports = [];
+    const valueImports = [];
+
+    for (const type of imports) {
+      if (new RegExp(`(type|interface) ${type}(?!w)`).test(sourceText)) {
+        typeImports.push(type);
+      } else {
+        valueImports.push(type);
+      }
+    }
+
+    return `// Generated by ts-to-zod
 import { z } from "zod";
 ${
-  imports.length
-    ? `import { ${imports.join(", ")} } from "${typesImportPath}";\n`
+  typeImports.length
+    ? `import type { ${typeImports.join(", ")} } from "${typesImportPath}";\n`
+    : ""
+}${
+  valueImports.length
+    ? `import { ${valueImports.join(", ")} } from "${typesImportPath}";\n`
     : ""
 }
 ${Array.from(statements.values())
   .map((statement) => print(statement.value))
   .join("\n\n")}
 `;
+  };
 
   const testCases = generateIntegrationTests(
     Array.from(statements.values())