@ps-aux/api-client-gen 0.7.0-rc.7 → 0.7.0-rc.9

package/dist/generate.cjs

@@ -11355,6 +11355,10 @@ class ZodSchemaGenerator {
           "z.string().datetime()",
           "z.string().datetime({local: true})"
         );
+        generated = generated.replaceAll(
+          "z.iso.datetime()",
+          "z.iso.datetime({ local: true })"
+        );
       }
       return this.codeFormatter.format(generated);
     });
@@ -13677,10 +13681,10 @@ const toHttpMethodUpper = (method) => {
 class OperationProjector {
   constructor(options) {
     this.options = options;
-    __publicField$1(this, "seenOperationIds", /* @__PURE__ */ new Set());
+    __publicField$1(this, "rawOperationIdsByName", /* @__PURE__ */ new Map());
     __publicField$1(this, "typeExprConverter");
     __publicField$1(this, "project", (openApi) => {
-      this.seenOperationIds.clear();
+      this.rawOperationIdsByName.clear();
       this.typeExprConverter = new ToTypeExprConverter(
         openApi.schemas,
         this.options.typeExtraction
@@ -13689,16 +13693,32 @@ class OperationProjector {
         this.typeExprConverter.registerAllSchemaDefinitions();
       }
       const operations = openApi.operations.map((operation) => {
-        const operationName = (operation.operationId ?? syntheticOperationId(operation.method, operation.path)).trim();
-        if (!operationName) {
+        const operationId = (operation.operationId ?? syntheticOperationId(operation.method, operation.path)).trim();
+        if (!operationId) {
           throw new Error(
             `Operation id is empty for ${operation.method.toUpperCase()} ${operation.path}`
           );
         }
-        if (this.seenOperationIds.has(operationName)) {
-          throw new Error(`Duplicate operation id: ${operationName}`);
+        let operationName;
+        try {
+          operationName = toTsCamelIdentifier(operationId, {
+            leadingDigitPrefix: "operation"
+          });
+        } catch {
+          throw new Error(
+            `Invalid operation id "${operationId}": could not derive a client method name.`
+          );
+        }
+        const existingRawOperationId = this.rawOperationIdsByName.get(operationName);
+        if (existingRawOperationId) {
+          if (existingRawOperationId === operationId) {
+            throw new Error(`Duplicate operation id: ${operationId}`);
+          }
+          throw new Error(
+            `Operation naming collision: "${existingRawOperationId}" and "${operationId}" both normalize to "${operationName}". Rename one of these OpenAPI operation ids to continue.`
+          );
         }
-        return this.projectOne(operationName, operation);
+        return this.projectOne(operationId, operationName, operation);
       });
       return {
         api: {
@@ -13710,8 +13730,8 @@ class OperationProjector {
         schemaDefinitions: this.typeExprConverter.getSchemaDefinitions()
       };
     });
-    __publicField$1(this, "projectOne", (operationName, operation) => {
-      this.seenOperationIds.add(operationName);
+    __publicField$1(this, "projectOne", (operationId, operationName, operation) => {
+      this.rawOperationIdsByName.set(operationName, operationId);
       const parameters = [];
       const pathParameter = this.projectPathParameter(operation);
       const queryParameter = this.projectQueryParameter(operation);
@@ -13722,7 +13742,7 @@ class OperationProjector {
       return {
         op: {
           signature: {
-            doc: this.toOperationDoc(operationName, operation),
+            doc: this.toOperationDoc(operationId, operation),
             name: operationName,
             parameters,
             returnType: this.projectReturnType(operation)

package/dist/generate.mjs

@@ -11333,6 +11333,10 @@ class ZodSchemaGenerator {
           "z.string().datetime()",
           "z.string().datetime({local: true})"
         );
+        generated = generated.replaceAll(
+          "z.iso.datetime()",
+          "z.iso.datetime({ local: true })"
+        );
       }
       return this.codeFormatter.format(generated);
     });
@@ -13655,10 +13659,10 @@ const toHttpMethodUpper = (method) => {
 class OperationProjector {
   constructor(options) {
     this.options = options;
-    __publicField$1(this, "seenOperationIds", /* @__PURE__ */ new Set());
+    __publicField$1(this, "rawOperationIdsByName", /* @__PURE__ */ new Map());
     __publicField$1(this, "typeExprConverter");
     __publicField$1(this, "project", (openApi) => {
-      this.seenOperationIds.clear();
+      this.rawOperationIdsByName.clear();
       this.typeExprConverter = new ToTypeExprConverter(
         openApi.schemas,
         this.options.typeExtraction
@@ -13667,16 +13671,32 @@ class OperationProjector {
         this.typeExprConverter.registerAllSchemaDefinitions();
       }
       const operations = openApi.operations.map((operation) => {
-        const operationName = (operation.operationId ?? syntheticOperationId(operation.method, operation.path)).trim();
-        if (!operationName) {
+        const operationId = (operation.operationId ?? syntheticOperationId(operation.method, operation.path)).trim();
+        if (!operationId) {
           throw new Error(
             `Operation id is empty for ${operation.method.toUpperCase()} ${operation.path}`
           );
         }
-        if (this.seenOperationIds.has(operationName)) {
-          throw new Error(`Duplicate operation id: ${operationName}`);
+        let operationName;
+        try {
+          operationName = toTsCamelIdentifier(operationId, {
+            leadingDigitPrefix: "operation"
+          });
+        } catch {
+          throw new Error(
+            `Invalid operation id "${operationId}": could not derive a client method name.`
+          );
+        }
+        const existingRawOperationId = this.rawOperationIdsByName.get(operationName);
+        if (existingRawOperationId) {
+          if (existingRawOperationId === operationId) {
+            throw new Error(`Duplicate operation id: ${operationId}`);
+          }
+          throw new Error(
+            `Operation naming collision: "${existingRawOperationId}" and "${operationId}" both normalize to "${operationName}". Rename one of these OpenAPI operation ids to continue.`
+          );
         }
-        return this.projectOne(operationName, operation);
+        return this.projectOne(operationId, operationName, operation);
       });
       return {
         api: {
@@ -13688,8 +13708,8 @@ class OperationProjector {
         schemaDefinitions: this.typeExprConverter.getSchemaDefinitions()
       };
     });
-    __publicField$1(this, "projectOne", (operationName, operation) => {
-      this.seenOperationIds.add(operationName);
+    __publicField$1(this, "projectOne", (operationId, operationName, operation) => {
+      this.rawOperationIdsByName.set(operationName, operationId);
       const parameters = [];
       const pathParameter = this.projectPathParameter(operation);
       const queryParameter = this.projectQueryParameter(operation);
@@ -13700,7 +13720,7 @@ class OperationProjector {
       return {
         op: {
           signature: {
-            doc: this.toOperationDoc(operationName, operation),
+            doc: this.toOperationDoc(operationId, operation),
             name: operationName,
             parameters,
             returnType: this.projectReturnType(operation)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ps-aux/api-client-gen",
-  "version": "0.7.0-rc.7",
+  "version": "0.7.0-rc.9",
   "main": "dist/index.cjs",
   "type": "module",
   "bin": {