@stackql/provider-utils 0.4.9 → 0.5.1

package/package.json

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

package/src/docgen/helpers.js

@@ -32,17 +32,16 @@ export function sanitizeHtml(text) {
   if (!text) return '';
   
   // 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___');
-  
- // Remove <nobr> tags completely
+    
+  // Remove <nobr> tags completely
   result = result
     .replace(/<nobr>/g, '')
     .replace(/<\/nobr>/g, '');
-
+  
   // Then apply the general sanitization
   result = result
     .replace(/{/g, '&#123;')
@@ -51,17 +50,18 @@ export function sanitizeHtml(text) {
     .replace(/</g, '&lt;')
     // edge case
     .replace(/&#125;_&#123;/g, '&#125;&#95;&#123;')
+    // Handle all types of line breaks - very important!
+    .replace(/\r\n/g, '<br />')
+    .replace(/\r/g, '<br />')
     .replace(/\n/g, '<br />');
   
   // Fix 1: Replace &lt;br&gt;, &lt;br/&gt;, &lt;p&gt;, &lt;/p&gt; back to their literal HTML tags
-  // Make sure <br> is always self-closing for MDX compatibility
   result = result
     .replace(/&lt;br\s*\/?&gt;/gi, '<br />')
     .replace(/&lt;p&gt;/gi, '<p>')
     .replace(/&lt;\/p&gt;/gi, '</p>');
   
-  // Fix 2: Find any &lt; or &gt; inside backticks and convert them back to < and >
-  // We need to handle the backtick content by finding pairs of backticks
+  // Fix 2: Handle backticked content more carefully
   result = result.replace(/`([^`]*)`/g, (match, content) => {
     // Convert &lt; and &gt; back to < and > only within backticked content
     const fixedContent = content
@@ -70,11 +70,16 @@ export function sanitizeHtml(text) {
     return '`' + fixedContent + '`';
   });
   
+  // IMPORTANT: Explicitly sanitize any <location> tags that might be in the text
+  // This ensures they get properly escaped even if added later
+  result = result.replace(/<location>/g, '&lt;location&gt;')
+                .replace(/<\/location>/g, '&lt;/location&gt;');
+  
   // Finally, restore the code tags
   result = result
     .replace(/___CODE_OPEN___/g, '<code>')
     .replace(/___CODE_CLOSE___/g, '</code>');
-
+  
   return result;
 }
 

package/src/providerdev/analyze.js

@@ -63,6 +63,11 @@ function detectObjectKey(spec, operation) {
     return '';
   }
   
+  // Check for explicit x-stackql-objectKey first
+  if (operation['x-stackql-objectKey']) {
+    return operation['x-stackql-objectKey'];
+  }
+  
   let responseObject = null;
   let responseCode = null;
   
@@ -341,11 +346,26 @@ export async function analyze(options) {
           // Find existing mapping if available
           let { resourceName, methodName, sqlVerb, objectKey } = findExistingMapping(spec, pathRef);
           
+          // Check for explicit x-stackql-resource in operation
+          if (operation['x-stackql-resource']) {
+            resourceName = operation['x-stackql-resource'];
+          }
+          
+          // Check for explicit x-stackql-method in operation
+          if (operation['x-stackql-method']) {
+            methodName = operation['x-stackql-method'];
+          }
+          
           // CHANGE 1: Default methodName to formattedOpId if not found
           if (!methodName) {
             methodName = formattedOpId;
           }
           
+          // Check for explicit x-stackql-sqlVerb in operation
+          if (operation['x-stackql-sqlVerb']) {
+            sqlVerb = operation['x-stackql-sqlVerb'];
+          }
+          
           // CHANGE 2: Default sqlVerb based on HTTP verb if not found
           if (!sqlVerb) {
             sqlVerb = mapToSqlVerb(verb);