fix: support numeric literal keys (#120)

* fix: support numeric literal keys * Remove unused parameters
fabien0102 · Mar 13, 2023 · 7bbed16 · 7bbed16
1 parent 20e18d3
commit 7bbed16
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 14 deletions.
diff --git a/src/core/generate.ts b/src/core/generate.ts
@@ -198,15 +198,13 @@ export function generate({
         !statements.has(varName) &&
         !zodSchemasWithMissingDependencies.has(varName)
     )
-    .forEach(
-      ({ varName, dependencies, statement, typeName, requiresImport }) => {
-        typeImports.add(typeName);
-        statements.set(varName, {
-          value: transformRecursiveSchema("z", statement, typeName),
-          typeName,
-        });
-      }
-    );
+    .forEach(({ varName, statement, typeName }) => {
+      typeImports.add(typeName);
+      statements.set(varName, {
+        value: transformRecursiveSchema("z", statement, typeName),
+        typeName,
+      });
+    });
 
   // Warn the user of possible not resolvable loops
   const errors: string[] = [];

diff --git a/src/core/generateZodSchema.test.ts b/src/core/generateZodSchema.test.ts
@@ -177,6 +177,30 @@ describe("generateZodSchema", () => {
     `);
   });
 
+  it("should generate a numerical key", () => {
+    const source = `export type responses = {
+     200: {
+      content: {
+        "application/json": {
+          id: string
+        }
+      }
+     }
+   };`;
+
+    expect(generate(source)).toMatchInlineSnapshot(`
+      "export const responsesSchema = z.object({
+          200: z.object({
+              content: z.object({
+                  \\"application/json\\": z.object({
+                      id: z.string()
+                  })
+              })
+          })
+      });"
+    `);
+  });
+
   it("should generate a promise schema", () => {
     const source = `export type KrytonResponse = Promise<boolean>`;
     expect(generate(source)).toMatchInlineSnapshot(

diff --git a/src/core/generateZodSchema.ts b/src/core/generateZodSchema.ts
@@ -169,14 +169,18 @@ function buildZodProperties({
   skipParseJSDoc: boolean;
 }) {
   const properties = new Map<
-    ts.Identifier | ts.StringLiteral,
+    ts.Identifier | ts.StringLiteral | ts.NumericLiteral,
     ts.CallExpression | ts.Identifier | ts.PropertyAccessExpression
   >();
   members.forEach((member) => {
     if (
       !ts.isPropertySignature(member) ||
       !member.type ||
-      !(ts.isIdentifier(member.name) || ts.isStringLiteral(member.name))
+      !(
+        ts.isIdentifier(member.name) ||
+        ts.isStringLiteral(member.name) ||
+        ts.isNumericLiteral(member.name)
+      )
     ) {
       return;
     }
@@ -894,15 +898,15 @@ function buildZodObject({
           getDependencyName,
           skipParseJSDoc,
         })
-      : undefined;
+      : new Map();
 
   if (schemaExtensionClauses && schemaExtensionClauses.length > 0) {
     objectSchema = buildZodExtendedSchema(
       schemaExtensionClauses,
       properties.length > 0
         ? [
             f.createObjectLiteralExpression(
-              Array.from(parsedProperties!.entries()).map(([key, tsCall]) => {
+              Array.from(parsedProperties.entries()).map(([key, tsCall]) => {
                 return f.createPropertyAssignment(key, tsCall);
               }),
               true
@@ -913,7 +917,7 @@ function buildZodObject({
   } else if (properties.length > 0) {
     objectSchema = buildZodSchema(z, "object", [
       f.createObjectLiteralExpression(
-        Array.from(parsedProperties!.entries()).map(([key, tsCall]) => {
+        Array.from(parsedProperties.entries()).map(([key, tsCall]) => {
           return f.createPropertyAssignment(key, tsCall);
         }),
         true