@alagoni97/cli 0.72.2 → 0.72.4

package/dist/codegen/generators/typescript/channels/openapi.js

@@ -8,6 +8,7 @@ const utils_3 = require("../utils");
 const errors_1 = require("../../../errors");
 const utils_4 = require("../../../utils");
 const security_1 = require("../../../inputs/openapi/security");
+const utils_5 = require("../../../inputs/openapi/utils");
 const HTTP_METHODS = [
     'get',
     'post',
@@ -83,7 +84,11 @@ function processOperation(pathItem, method, path, payloads, parameters) {
     if (!operation) {
         return undefined;
     }
-    const operationId = getOperationId(operation, method, path);
+    const operationId = (0, utils_5.deriveOperationId)({
+        operationId: operation.operationId,
+        method,
+        path
+    });
     const hasBody = METHODS_WITH_BODY.includes(method);
     // Look up payloads
     const requestPayload = hasBody
@@ -120,9 +125,12 @@ function processOperation(pathItem, method, path, payloads, parameters) {
     // Extract operation metadata for JSDoc
     const description = operation.description ?? operation.summary;
     const deprecated = operation.deprecated === true;
-    // Generate the HTTP client function
+    // Generate the HTTP client function.
+    // Use the operationId directly as the function name; the HTTP method is
+    // already encoded in synthesized ids (and meaningful in spec-provided ones),
+    // so prepending the method here would double the verb (e.g. getGetUser).
     return (0, http_1.renderHttpFetchClient)({
-        subName: (0, utils_3.pascalCase)(operationId),
+        functionName: (0, utils_3.camelCase)(operationId),
         requestMessageModule: hasBody ? requestMessageModule : undefined,
         requestMessageType: hasBody ? requestMessageType : undefined,
         replyMessageModule,
@@ -154,15 +162,3 @@ function validateOpenAPIContext(context) {
     }
     return { openapiDocument };
 }
-/**
- * Gets the operation ID from an OpenAPI operation.
- * Falls back to generating one from method+path if not present.
- */
-function getOperationId(operation, method, path) {
-    if (operation.operationId) {
-        return operation.operationId;
-    }
-    // Generate from method + path
-    const sanitizedPath = path.replace(/[^a-zA-Z0-9]/g, '');
-    return `${method}${sanitizedPath}`;
-}

package/dist/codegen/inputs/openapi/generators/headers.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.processOpenAPIHeaders = void 0;
 const utils_1 = require("../../../generators/typescript/utils");
+const utils_2 = require("../utils");
 // Helper function to convert OpenAPI header schema to JSON Schema
 function convertHeaderSchemaToJsonSchema(header) {
     let schema;
@@ -44,8 +45,11 @@ function extractHeadersFromOperations(paths) {
                 return param.in === 'header';
             });
             if (allParameters.length > 0) {
-                const operationId = operationObj.operationId ??
-                    `${method}${pathKey.replace(/[^a-zA-Z0-9]/g, '')}`;
+                const operationId = (0, utils_2.deriveOperationId)({
+                    operationId: operationObj.operationId,
+                    method,
+                    path: pathKey
+                });
                 operationHeaders[operationId] = headerParams;
             }
         }

package/dist/codegen/inputs/openapi/generators/parameters.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createOpenAPIGenerator = exports.createParameterSchema = exports.convertParameterSchemaToJsonSchema = exports.processOpenAPIParameters = void 0;
 const utils_1 = require("../../../generators/typescript/utils");
+const utils_2 = require("../utils");
 const modelina_1 = require("@asyncapi/modelina");
 // Constants for OpenAPI parameter metadata keys
 const X_PARAMETER_LOCATION = 'x-parameter-location';
@@ -30,8 +31,11 @@ function processOpenAPIParameters(openapiDocument) {
                 return ['path', 'query'].includes(param.in);
             });
             if (filteredParams.length > 0) {
-                const operationId = operationObj.operationId ??
-                    `${method}${pathKey.replace(/[^a-zA-Z0-9]/g, '')}`;
+                const operationId = (0, utils_2.deriveOperationId)({
+                    operationId: operationObj.operationId,
+                    method,
+                    path: pathKey
+                });
                 // Create schema for the parameters
                 const parameterSchema = createParameterSchema(operationId, filteredParams, 'Parameters', pathKey);
                 channelParameters[operationId] = {

package/dist/codegen/inputs/openapi/generators/payloads.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.processOpenAPIPayloads = void 0;
 const utils_1 = require("../../../generators/typescript/utils");
 const utils_2 = require("../../../utils");
+const utils_3 = require("../utils");
 // Constants
 const JSON_SCHEMA_DRAFT_07 = 'http://json-schema.org/draft-07/schema';
 // Helper function to extract schema from OpenAPI 2.0 response
@@ -98,19 +99,26 @@ function extractPayloadsFromOperations(paths) {
                 continue;
             }
             const operationObj = operation;
-            const operationId = operationObj.operationId ??
-                `${method}${pathKey.replace(/[^a-zA-Z0-9]/g, '')}`;
-            // Extract request payload schema
+            const operationId = (0, utils_3.deriveOperationId)({
+                operationId: operationObj.operationId,
+                method,
+                path: pathKey
+            });
+            // Extract request payload schema.
+            // Prefer the 3.x `requestBody`: 3.x operations also carry a `parameters`
+            // array (path/query/header), so presence of `parameters` cannot be used
+            // to detect 2.0 - doing so would drop the body on any 3.x operation that
+            // declares parameters. The 2.0 body lives in a `parameters` entry with
+            // `in: 'body'`, so fall back to that only when there is no `requestBody`.
             let requestSchema = null;
-            // Check if this is OpenAPI 2.0 vs 3.x based on the structure
-            if ('parameters' in operationObj && operationObj.parameters) {
-                // OpenAPI 2.0 style
-                requestSchema = extractOpenAPI2RequestSchema(operationObj.parameters);
-            }
-            else if ('requestBody' in operationObj && operationObj.requestBody) {
+            if ('requestBody' in operationObj && operationObj.requestBody) {
                 // OpenAPI 3.x style
                 requestSchema = extractOpenAPI3RequestSchema(operationObj.requestBody);
             }
+            else if ('parameters' in operationObj && operationObj.parameters) {
+                // OpenAPI 2.0 style (body carried as a `in: 'body'` parameter)
+                requestSchema = extractOpenAPI2RequestSchema(operationObj.parameters);
+            }
             if (requestSchema) {
                 const requestSchemaId = (0, utils_1.pascalCase)(`${operationId}_Request`);
                 requestPayloads[operationId] = {

package/dist/codegen/inputs/openapi/generators/types.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateOpenAPITypes = void 0;
+const utils_1 = require("../utils");
 async function generateOpenAPITypes(openapiDocument, generator) {
     const paths = openapiDocument.paths ?? {};
     const allPaths = Object.keys(paths);
@@ -22,8 +23,11 @@ async function generateOpenAPITypes(openapiDocument, generator) {
             if (operationObj &&
                 typeof operationObj === 'object' &&
                 method !== 'parameters') {
-                const operationId = operationObj.operationId ??
-                    `${method}${pathStr.replace(/[^a-zA-Z0-9]/g, '')}`;
+                const operationId = (0, utils_1.deriveOperationId)({
+                    operationId: operationObj.operationId,
+                    method,
+                    path: pathStr
+                });
                 operationIds.push(operationId);
                 operationIdToPathMap[operationId] = pathStr;
                 pathOperationIds.push(operationId);

package/dist/codegen/inputs/openapi/utils.d.ts

@@ -0,0 +1,15 @@
+/**
+ * Derive the operation identifier used to correlate payloads, parameters,
+ * headers and channel functions for a single OpenAPI operation.
+ *
+ * When the spec provides an `operationId` it is used verbatim so generated
+ * names stay predictable. Otherwise a name is synthesized from the HTTP method
+ * and path segments, preserving word boundaries so it can be cased cleanly
+ * (e.g. `GET /v2/connect/{referenceId}` -> `getV2ConnectReferenceId`) instead
+ * of collapsing into an uncasable blob (`getv2connectreferenceId`).
+ */
+export declare function deriveOperationId({ operationId, method, path }: {
+    operationId?: string;
+    method: string;
+    path: string;
+}): string;

package/dist/codegen/inputs/openapi/utils.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.deriveOperationId = void 0;
+/**
+ * Shared helpers for deriving stable identifiers from OpenAPI operations.
+ */
+const modelina_1 = require("@asyncapi/modelina");
+/**
+ * Derive the operation identifier used to correlate payloads, parameters,
+ * headers and channel functions for a single OpenAPI operation.
+ *
+ * When the spec provides an `operationId` it is used verbatim so generated
+ * names stay predictable. Otherwise a name is synthesized from the HTTP method
+ * and path segments, preserving word boundaries so it can be cased cleanly
+ * (e.g. `GET /v2/connect/{referenceId}` -> `getV2ConnectReferenceId`) instead
+ * of collapsing into an uncasable blob (`getv2connectreferenceId`).
+ */
+function deriveOperationId({ operationId, method, path }) {
+    if (operationId) {
+        return operationId;
+    }
+    const segments = path
+        .split('/')
+        .map((segment) => segment.replace(/[{}]/g, ''))
+        .filter((segment) => segment.length > 0);
+    return modelina_1.FormatHelpers.toCamelCase([method, ...segments].join(' '));
+}
+exports.deriveOperationId = deriveOperationId;

package/oclif.manifest.json

@@ -506,5 +506,5 @@
       ]
     }
   },
-  "version": "0.72.2"
+  "version": "0.72.4"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@alagoni97/cli",
   "description": "CLI to work with code generation in any environment",
-  "version": "0.72.2",
+  "version": "0.72.4",
   "bin": {
     "codegen": "./bin/run.mjs"
   },