fix: handle negative property names correctly in case and zod plugins

.changeset/popular-poems-tease.md

@@ -0,0 +1,5 @@
+---
+'@hey-api/openapi-ts': patch
+---
+
+"Fix handling of negative property names in TypeScript code generation"

packages/openapi-ts-tests/test/3.1.x.test.ts

@@ -518,6 +518,13 @@ describe(`OpenAPI ${version}`, () => {
       description:
         'does not set oneOf composition ref model properties as required',
     },
+    {
+      config: createConfig({
+        input: 'negative-property-names.json',
+        output: 'negative-property-names',
+      }),
+      description: 'handles negative property names correctly',
+    },
     {
       config: createConfig({
         input: 'schema-const.yaml',

packages/openapi-ts-tests/test/__snapshots__/3.1.x/negative-property-names/index.ts

@@ -0,0 +1,2 @@
+// This file is auto-generated by @hey-api/openapi-ts
+export * from './types.gen';

packages/openapi-ts-tests/test/__snapshots__/3.1.x/negative-property-names/types.gen.ts

@@ -0,0 +1,18 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+export type ReactionRollup = {
+    url: string;
+    total_count: number;
+    '+1': number;
+    "-1": number;
+    laugh: number;
+    confused: number;
+    heart: number;
+    hooray: number;
+    eyes: number;
+    rocket: number;
+};
+
+export type ClientOptions = {
+    baseUrl: `${string}://${string}` | (string & {});
+};

packages/openapi-ts-tests/test/spec/3.1.x/negative-property-names.json

@@ -0,0 +1,60 @@
+{
+  "openapi": "3.1.1",
+  "info": {
+    "title": "OpenAPI 3.1.1 negative property names example",
+    "version": "1"
+  },
+  "components": {
+    "schemas": {
+      "ReactionRollup": {
+        "title": "Reaction Rollup",
+        "type": "object",
+        "properties": {
+          "url": {
+            "format": "uri",
+            "type": "string"
+          },
+          "total_count": {
+            "type": "integer"
+          },
+          "+1": {
+            "type": "integer"
+          },
+          "-1": {
+            "type": "integer"
+          },
+          "laugh": {
+            "type": "integer"
+          },
+          "confused": {
+            "type": "integer"
+          },
+          "heart": {
+            "type": "integer"
+          },
+          "hooray": {
+            "type": "integer"
+          },
+          "eyes": {
+            "type": "integer"
+          },
+          "rocket": {
+            "type": "integer"
+          }
+        },
+        "required": [
+          "url",
+          "total_count",
+          "+1",
+          "-1",
+          "laugh",
+          "confused",
+          "heart",
+          "hooray",
+          "eyes",
+          "rocket"
+        ]
+      }
+    }
+  }
+}

packages/openapi-ts/src/plugins/shared/utils/case.ts

@@ -17,6 +17,10 @@
 }) => {
   numberRegExp.lastIndex = 0;
   if (numberRegExp.test(name)) {
+    // For negative numbers, use string literals instead
+    if (name.startsWith('-')) {
+      return ts.factory.createStringLiteral(name);
+    }
     return ts.factory.createNumericLiteral(name);
   }
 

packages/openapi-ts/src/plugins/zod/plugin.ts

@@ -360,9 +360,16 @@
     });
 
     numberRegExp.lastIndex = 0;
-    let propertyName = numberRegExp.test(name)
-      ? ts.factory.createNumericLiteral(name)
-      : name;
+    let propertyName;
+    if (numberRegExp.test(name)) {
+      // For numeric literals, we'll handle negative numbers by using a string literal
+      // instead of trying to use a PrefixUnaryExpression
+      propertyName = name.startsWith('-')
+        ? ts.factory.createStringLiteral(name)
+        : ts.factory.createNumericLiteral(name);
+    } else {
+      propertyName = name;
+    }
     // TODO: parser - abstract safe property name logic
     if (
       ((name.match(/^[0-9]/) && name.match(/\D+/g)) || name.match(/\W/g)) &&