Add a namespace in the example and fix generation

fabien0102 · Sep 17, 2021 · 61301de · 61301de
1 parent b98006d
commit 61301de
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 5 deletions.
diff --git a/example/heros.ts b/example/heros.ts
@@ -4,9 +4,12 @@ export enum EnemyPower {
   Speed = "speed",
 }
 
-export type SpeedEnemy = {
-  power: EnemyPower.Speed;
-};
+// eslint-disable-next-line @typescript-eslint/no-namespace
+export namespace Skills {
+  export type SpeedEnemy = {
+    power: EnemyPower.Speed;
+  };
+}
 
 export interface Enemy {
   name: string;

diff --git a/example/heros.zod.ts b/example/heros.zod.ts
@@ -4,7 +4,7 @@ import { EnemyPower, Villain } from "./heros";
 
 export const enemyPowerSchema = z.nativeEnum(EnemyPower);
 
-export const speedEnemySchema = z.object({
+export const skillsSpeedEnemySchema = z.object({
   power: z.literal(EnemyPower.Speed),
 });
 

diff --git a/src/cli.ts b/src/cli.ts
@@ -241,6 +241,7 @@ See more help with --help`,
 
     const {
       errors,
+      transformedSourceText,
       getZodSchemasFile,
       getIntegrationTestFile,
       hasCircularDependencies,
@@ -261,7 +262,7 @@ See more help with --help`,
       if (flags.all) validatorSpinner.indent = 1;
       const generationErrors = await worker.validateGeneratedTypesInWorker({
         sourceTypes: {
-          sourceText,
+          sourceText: transformedSourceText,
           relativePath: "./source.ts",
         },
         integrationTests: {

diff --git a/src/core/generate.ts b/src/core/generate.ts
@@ -139,9 +139,16 @@ ${missingStatements.map(({ varName }) => `${varName}`).join("\n")}`
     newLine: ts.NewLineKind.LineFeed,
     removeComments: !keepComments,
   });
+
+  const printerWithComments = ts.createPrinter({
+    newLine: ts.NewLineKind.LineFeed,
+  });
+
   const print = (node: ts.Node) =>
     printer.printNode(ts.EmitHint.Unspecified, node, sourceFile);
 
+  const transformedSourceText = printerWithComments.printFile(sourceFile);
+
   const imports = Array.from(typeImports.values());
   const getZodSchemasFile = (
     typesImportPath: string
@@ -197,6 +204,11 @@ ${testCases.map(print).join("\n")}
 `;
 
   return {
+    /**
+     * Source text with pre-process applied.
+     */
+    transformedSourceText,
+
     /**
      * Get the content of the zod schemas file.
      *