@stackql/provider-utils 0.4.4 → 0.4.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stackql/provider-utils",
-  "version": "0.4.4",
+  "version": "0.4.6",
   "description": "Utilities for building StackQL providers from OpenAPI specifications.",
   "type": "module",
   "main": "./src/index.js",

package/src/docgen/helpers.js

@@ -31,8 +31,15 @@ export function getIndefiniteArticle(resourceName) {
 export function sanitizeHtml(text) {
   if (!text) return '';
   
-  // First apply the general sanitization
+  // Special handling for code tags - temporarily replace them with placeholders
+  // that won't get escaped in the general sanitization
   let result = text
+    // Replace <code> tags with a safe placeholder
+    .replace(/<code>/g, '___CODE_OPEN___')
+    .replace(/<\/code>/g, '___CODE_CLOSE___');
+  
+  // Then apply the general sanitization
+  result = result
     .replace(/{/g, '&#123;')
     .replace(/}/g, '&#125;')
     .replace(/>/g, '&gt;')
@@ -58,6 +65,11 @@ export function sanitizeHtml(text) {
     return '`' + fixedContent + '`';
   });
   
+  // Finally, restore the code tags
+  result = result
+    .replace(/___CODE_OPEN___/g, '<code>')
+    .replace(/___CODE_CLOSE___/g, '</code>');
+  
   return result;
 }
 
@@ -241,7 +253,12 @@ function formatProperties(respProps) {
             if (typeof fieldValue != 'string') {
                 continue;
             } else {
-                additionalDescriptionPaths.push(`${fieldName}: ${String(fieldValue)}`);
+                // Specifically wrap pattern fields in code tags
+                if (fieldName === 'pattern') {
+                    additionalDescriptionPaths.push(`${fieldName}: <code>${String(fieldValue)}</code>`);
+                } else {
+                    additionalDescriptionPaths.push(`${fieldName}: ${String(fieldValue)}`);
+                }
             }
         }
         
@@ -250,7 +267,6 @@ function formatProperties(respProps) {
         // Store formatted property details
         allProperties[propName] = {
             type: typeString,
-            // description: escapeHtml(fullDescription),
             description: fullDescription
         };
     }

package/src/docgen/resource/examples/delete-example.js

@@ -66,7 +66,7 @@ export function createDeleteExamples(providerName, serviceName, resourceName, re
             });
         }
         
-        content += ';\n```\n</TabItem>\n';
+        content += '\n;\n```\n</TabItem>\n';
     });
     
     // Close tabs

package/src/docgen/resource/examples/exec-example.js

@@ -113,7 +113,7 @@ export function createExecExamples(providerName, serviceName, resourceName, reso
             content += '}\'';
         }
         
-        content += ';\n```\n</TabItem>\n';
+        content += '\n;\n```\n</TabItem>\n';
     });
     
     // Close tabs

package/src/docgen/resource/examples/insert-example.js

@@ -87,9 +87,9 @@ export function createInsertExamples(providerName, serviceName, resourceName, re
             }
             
             if (isNumber || isBoolean) {
-                return '{{ ' + paramName + ' }}' + (isRequiredBodyParam ? ' --required' : '');
+                return '{{ ' + paramName + ' }}' + (isRequiredBodyParam ? ' /* required */' : '');
             } else {
-                return '\'{{ ' + paramName + ' }}\'' + (isRequiredBodyParam ? ' --required' : '');
+                return '\'{{ ' + paramName + ' }}\'' + (isRequiredBodyParam ? ' /* required */' : '');
             }
         });
         

package/src/docgen/resource/examples/select-example.js

@@ -67,7 +67,7 @@ export function createSelectExamples(providerName, serviceName, resourceName, re
             });
         }
         
-        content += ';\n```\n</TabItem>\n';
+        content += '\n;\n```\n</TabItem>\n';
     });
     
     // Close tabs

package/src/docgen/resource/examples/update-example.js

@@ -148,7 +148,7 @@ export function createUpdateExamples(providerName, serviceName, resourceName, re
             });
         }
 
-        content += ';\n```\n</TabItem>\n';
+        content += '\n;\n```\n</TabItem>\n';
     });
     
     // Close tabs

package/src/providerdev/split.js

@@ -65,11 +65,11 @@ function retServiceNameAndDesc(providerName, opItem, pathKey, svcDiscriminator,
   else if (svcDiscriminator === "path") {
     const pathParts = pathKey.replace(/^\//, '').split('/');
     if (pathParts.length > 0) {
-      // Find the first path segment that is not 'api' or 'v{number}'
+      // Find the first path segment that is not 'api', 'v{number}', or '{apiVersion}'
       for (const part of pathParts) {
         const lowerPart = part.toLowerCase();
-        // Skip if it's 'api' or matches version pattern 'v1', 'v2', etc.
-        if (lowerPart === 'api' || /^v\d+$/.test(lowerPart)) {
+        // Skip if it's 'api', matches version pattern 'v1', 'v2', etc., or is '{apiVersion}'
+        if (lowerPart === 'api' || /^v\d+$/.test(lowerPart) || /^\{.*version\}$/i.test(part)) {
           continue;
         }
         service = lowerPart.replace(/-/g, '_').replace(/ /g, '_').replace(/\./g, '_');
@@ -78,7 +78,7 @@ function retServiceNameAndDesc(providerName, opItem, pathKey, svcDiscriminator,
       serviceDesc = `${providerName} ${service} API`;
     }
   }
-  
+
   // Check if service should be skipped
   if (service === "skip") {
     return ["skip", ""];

package/src/utils.js

@@ -9,7 +9,7 @@ import logger from './logger.js';
  */
 export function camelToSnake(name) {
   const s1 = name.replace(/([a-z0-9])([A-Z][a-z]+)/g, '$1_$2');
-  return s1.replace(/([a-z0-9])([A-Z])/g, '$1_$2').toLowerCase();
+  return s1.replace(/([a-z0-9])([A-Z])/g, '$1_$2').toLowerCase().replace(/-/g, '_');
 }
 
 /**