@aloma.io/integration-sdk 3.8.62 → 3.8.64

package/build/openapi-to-connector.mjs

@@ -38,15 +38,18 @@ export class OpenAPIToConnector {
         if (!this.options.nestedPaths) {
             return this.generateMethodName({ method: httpMethod, path: urlPath, operationId });
         }
-        const VERSION_RE = /^v\d+$/;
+        const VERSION_RE = /^v\d+$|^\d{4}-\d{2}$/;
         const STRIP = new Set(['objects', 'items']);
+        // Convert hyphenated segment to camelCase identifier
+        const toCamel = (s) => s.replace(/-([a-z0-9])/g, (_, c) => c.toUpperCase());
         // Build namespace parts from the URL path
         const parts = urlPath
             .replace(/\{[^}]+\}/g, '')
             .split('/')
             .filter(Boolean)
             .filter((p) => !VERSION_RE.test(p))
-            .filter((p) => !STRIP.has(p));
+            .filter((p) => !STRIP.has(p))
+            .map(toCamel);
         // Extract the leaf action from operationId suffix
         let suffix = operationId.includes('_')
             ? operationId.split('_').pop()
@@ -59,10 +62,13 @@ export class OpenAPIToConnector {
                 .split('/')
                 .filter(Boolean)
                 .filter((p) => !VERSION_RE.test(p))
-                .filter((p) => !STRIP.has(p));
-            // Use the last meaningful segment from the URL-like suffix, or fall back to HTTP method
+                .filter((p) => !STRIP.has(p))
+                .map(toCamel);
             suffix = suffixParts.length > 0 ? suffixParts[suffixParts.length - 1] : httpMethod.toLowerCase();
         }
+        else {
+            suffix = toCamel(suffix);
+        }
         // Dedup: if suffix equals last path segment, don't repeat it
         const last = parts[parts.length - 1];
         if (suffix === last)
@@ -152,7 +158,9 @@ export class OpenAPIToConnector {
             // Extract the last part after underscore if it exists
             const parts = cleaned.split('_');
             if (parts.length > 1) {
-                const lastPart = parts[parts.length - 1];
+                let lastPart = parts[parts.length - 1];
+                // Convert hyphens to camelCase before testing
+                lastPart = lastPart.replace(/-([a-z0-9])/g, (_, c) => c.toUpperCase());
                 // If the last part looks like a method name (camelCase), use it
                 if (lastPart && /^[a-z][a-zA-Z0-9]*$/.test(lastPart)) {
                     cleaned = lastPart;
@@ -192,7 +200,7 @@ export class OpenAPIToConnector {
             .filter((p) => p.toLowerCase() !== baseName.toLowerCase());
         // Use the last path segment before the method name as a distinguishing prefix
         if (pathParts.length > 0) {
-            const prefix = pathParts[pathParts.length - 1];
+            const prefix = pathParts[pathParts.length - 1].replace(/-([a-z0-9])/g, (_, c) => c.toUpperCase());
             const capitalizedBase = baseName.charAt(0).toUpperCase() + baseName.slice(1);
             return `${prefix}${capitalizedBase}`;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aloma.io/integration-sdk",
-  "version": "3.8.62",
+  "version": "3.8.64",
   "description": "",
   "author": "aloma.io",
   "license": "Apache-2.0",

package/src/openapi-to-connector.mts

@@ -62,16 +62,21 @@ export class OpenAPIToConnector {
       return this.generateMethodName({method: httpMethod, path: urlPath, operationId});
     }
 
-    const VERSION_RE = /^v\d+$/;
+    const VERSION_RE = /^v\d+$|^\d{4}-\d{2}$/;
     const STRIP = new Set(['objects', 'items']);
 
+    // Convert hyphenated segment to camelCase identifier
+    const toCamel = (s: string): string =>
+      s.replace(/-([a-z0-9])/g, (_, c) => c.toUpperCase());
+
     // Build namespace parts from the URL path
     const parts = urlPath
       .replace(/\{[^}]+\}/g, '')
       .split('/')
       .filter(Boolean)
       .filter((p) => !VERSION_RE.test(p))
-      .filter((p) => !STRIP.has(p));
+      .filter((p) => !STRIP.has(p))
+      .map(toCamel);
 
     // Extract the leaf action from operationId suffix
     let suffix = operationId.includes('_')
@@ -86,9 +91,11 @@ export class OpenAPIToConnector {
         .split('/')
         .filter(Boolean)
         .filter((p) => !VERSION_RE.test(p))
-        .filter((p) => !STRIP.has(p));
-      // Use the last meaningful segment from the URL-like suffix, or fall back to HTTP method
+        .filter((p) => !STRIP.has(p))
+        .map(toCamel);
       suffix = suffixParts.length > 0 ? suffixParts[suffixParts.length - 1] : httpMethod.toLowerCase();
+    } else {
+      suffix = toCamel(suffix);
     }
 
     // Dedup: if suffix equals last path segment, don't repeat it
@@ -190,7 +197,9 @@ export class OpenAPIToConnector {
       // Extract the last part after underscore if it exists
       const parts = cleaned.split('_');
       if (parts.length > 1) {
-        const lastPart = parts[parts.length - 1];
+        let lastPart = parts[parts.length - 1];
+        // Convert hyphens to camelCase before testing
+        lastPart = lastPart.replace(/-([a-z0-9])/g, (_, c) => c.toUpperCase());
         // If the last part looks like a method name (camelCase), use it
         if (lastPart && /^[a-z][a-zA-Z0-9]*$/.test(lastPart)) {
           cleaned = lastPart;
@@ -237,7 +246,7 @@ export class OpenAPIToConnector {
 
     // Use the last path segment before the method name as a distinguishing prefix
     if (pathParts.length > 0) {
-      const prefix = pathParts[pathParts.length - 1];
+      const prefix = pathParts[pathParts.length - 1].replace(/-([a-z0-9])/g, (_, c) => c.toUpperCase());
       const capitalizedBase = baseName.charAt(0).toUpperCase() + baseName.slice(1);
       return `${prefix}${capitalizedBase}`;
     }

package/test/openapi-identifier-sanitise.test.mjs

@@ -0,0 +1,69 @@
+import assert from 'assert';
+
+const { OpenAPIToConnector } = await import('../build/openapi-to-connector.mjs');
+
+let passed = 0;
+let failed = 0;
+
+function test(name, fn) {
+  try { fn(); console.log(`✓ PASS: ${name}`); passed++; }
+  catch(e) { console.log(`✗ FAIL: ${name} — ${e.message}`); failed++; }
+}
+
+const minimalSpec = { openapi: '3.0.0', info: { title: 'Test', version: '1.0' }, paths: {} };
+const gen = new OpenAPIToConnector(minimalSpec, 'test', { nestedPaths: true });
+
+// Bug 4: hyphenated path segment must not appear in dotted method path
+test('hyphenated path segment sanitised in nested method path', () => {
+  const path = gen.deriveMethodPath('PUT',
+    '/crm/lists/2025-09/{listId}/memberships/add-and-remove',
+    'put-/crm/lists/2025-09/{listId}/memberships/add-and-remove_addAndRemove');
+  const segments = path.split('.');
+  segments.forEach(seg => {
+    assert(!seg.includes('-'), `Method path segment contains hyphen: "${seg}" in "${path}"`);
+  });
+});
+
+// Bug 4: path with object-type-id (hyphenated) must produce clean segments
+test('object-type-id hyphenated path sanitised to camelCase', () => {
+  const path = gen.deriveMethodPath('GET',
+    '/crm/lists/2025-09/object-type-id/{objectTypeId}/name/{listName}',
+    'get-/crm/lists/2025-09/object-type-id/{objectTypeId}/name/{listName}_getByName');
+  const segments = path.split('.');
+  segments.forEach(seg => {
+    assert(!seg.includes('-'), `Method path segment contains hyphen: "${seg}" in "${path}"`);
+  });
+});
+
+// Bug 5: operationId suffix that IS a raw URL path must not duplicate the full path
+test('raw URL suffix does not produce duplicated path in method name', () => {
+  const path = gen.deriveMethodPath('GET',
+    '/crm/lists/2025-09',
+    'get-/crm/lists/2025-09_/crm/lists/2025-09');
+  // Should be short and clean, not a duplicated path
+  assert(path.length < 40, `Path too long (duplication): "${path}" (${path.length} chars)`);
+  assert(!path.includes('_'), `Path contains underscores (non-nested fallback used): "${path}"`);
+});
+
+// Bug 5: same duplication test for the batch/read endpoint
+test('batch/read raw URL suffix does not produce duplicated path', () => {
+  const path = gen.deriveMethodPath('POST',
+    '/crm/lists/2025-09/records/memberships/batch/read',
+    'post-/crm/lists/2025-09/records/memberships/batch/read_/crm/lists/2025-09/records/memberships/batch/read');
+  assert(path.length < 60, `Path too long (duplication): "${path}" (${path.length} chars)`);
+  assert(!path.includes('_'), `Path contains underscores (non-nested fallback used): "${path}"`);
+});
+
+// Bug 4: generateMethodName fallback (no operationId) must sanitise hyphens
+test('generateMethodName fallback sanitises hyphens to camelCase', () => {
+  const name = gen.generateMethodName({
+    method: 'PUT',
+    path: '/crm/lists/2025-09/folders/move-list',
+    operationId: undefined
+  });
+  assert(!name.includes('-'), `Fallback name contains hyphen: "${name}"`);
+  assert(/^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(name), `Not a valid identifier: "${name}"`);
+});
+
+console.log(`\n${passed} passing / ${failed} failing`);
+if (failed > 0) process.exit(1);