@stackql/provider-utils 0.3.8 → 0.3.9

package/package.json

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

package/src/providerdev/split.js

@@ -154,35 +154,37 @@ function getAllRefs(obj) {
 }
 
 /**
- * Extract all $ref values from path-level parameters
+ * Extract all $ref values from path-level parameters and non-operation elements
  * @param {Object} pathItem - Path item from OpenAPI doc
  * @returns {Set<string>} - Set of refs
  */
 function getPathLevelRefs(pathItem) {
   const refs = new Set();
-  const relevantVerbs = ["get", "put", "post", "patch", "delete"];
   
   // Check for path-level parameters
   if (pathItem.parameters) {
-    // Only collect path parameters if they're used by relevant operations
-    let hasRelevantOperation = false;
-    for (const verb of relevantVerbs) {
-      if (pathItem[verb] && typeof pathItem[verb] === 'object') {
-        hasRelevantOperation = true;
-        break;
+    for (const param of pathItem.parameters) {
+      if (param.$ref) {
+        refs.add(param.$ref);
+      } else if (typeof param === 'object') {
+        // Extract refs from schema if present
+        if (param.schema && param.schema.$ref) {
+          refs.add(param.schema.$ref);
+        }
+        
+        // Also get all nested refs in the parameter object
+        for (const ref of getAllRefs(param)) {
+          refs.add(ref);
+        }
       }
     }
-    
-    if (hasRelevantOperation) {
-      for (const param of pathItem.parameters) {
-        if (param.$ref) {
-          refs.add(param.$ref);
-        } else if (typeof param === 'object') {
-          // Extract refs from schema if present
-          for (const ref of getAllRefs(param)) {
-            refs.add(ref);
-          }
-        }
+  }
+  
+  // Also check other non-operation properties for refs
+  for (const key in pathItem) {
+    if (!OPERATIONS.includes(key)) {
+      for (const ref of getAllRefs(pathItem[key])) {
+        refs.add(ref);
       }
     }
   }
@@ -256,6 +258,73 @@ function addMissingObjectTypes(obj) {
   return obj;
 }
 
+/**
+ * Recursively resolve and add all references to service components
+ * @param {Set<string>} refs - Set of references to resolve
+ * @param {Object} service - Service object to add components to
+ * @param {Object} components - Source components from API doc
+ * @param {boolean} debug - Debug flag
+ * @param {Set<string>} processed - Set of already processed refs (to prevent infinite recursion)
+ */
+function resolveReferences(refs, service, components, debug, processed = new Set()) {
+  let newRefs = new Set();
+  
+  for (const ref of refs) {
+    // Skip if already processed
+    if (processed.has(ref)) {
+      continue;
+    }
+    
+    processed.add(ref);
+    
+    const parts = ref.split('/');
+    
+    // Only process refs that point to components
+    if (parts.length >= 4 && parts[1] === "components") {
+      const componentType = parts[2];
+      const componentName = parts[3];
+      
+      // Check if component type exists in service
+      if (!service.components[componentType]) {
+        service.components[componentType] = {};
+      }
+      
+      // Skip if component already added
+      if (service.components[componentType][componentName]) {
+        continue;
+      }
+      
+      // Add component if it exists in source document
+      if (components[componentType] && components[componentType][componentName]) {
+        service.components[componentType][componentName] = 
+          JSON.parse(JSON.stringify(components[componentType][componentName]));
+        
+        if (debug) {
+          logger.debug(`Added component ${componentType}/${componentName}`);
+        }
+        
+        // Find all refs in the newly added component
+        const componentRefs = getAllRefs(service.components[componentType][componentName]);
+        for (const cRef of componentRefs) {
+          if (!processed.has(cRef)) {
+            newRefs.add(cRef);
+          }
+        }
+      } else if (debug) {
+        logger.debug(`WARNING: Could not find component ${componentType}/${componentName}`);
+      }
+    }
+  }
+  
+  // If we found new refs, resolve them too (recursively)
+  if (newRefs.size > 0) {
+    if (debug) {
+      logger.debug(`Found ${newRefs.size} additional refs to resolve`);
+    }
+    resolveReferences(newRefs, service, components, debug, processed);
+  }
+}
+
 /**
  * Split OpenAPI document into service-specific files
  * @param {Object} options - Options for splitting
@@ -307,7 +376,7 @@ export async function split(options) {
   const services = {};
   let opCounter = 0;
   
-  // Process each path
+  // First pass: identify all services and collect operations
   for (const [pathKey, pathItem] of Object.entries(apiPaths)) {
     if (verbose) {
       logger.debug(`Processing path ${pathKey}`);
@@ -317,6 +386,9 @@ export async function split(options) {
       continue;
     }
     
+    // Collect all services that use this path
+    const pathServices = new Set();
+    
     // Process each operation (HTTP verb)
     for (const [verbKey, opItem] of Object.entries(pathItem)) {
       if (!OPERATIONS.includes(verbKey) || !opItem) {
@@ -333,7 +405,7 @@ export async function split(options) {
       }
       
       // Skip excluded operations
-      if (isOperationExcluded(excludeList, opItem, svcDiscriminator)) {
+      if (isOperationExcluded(excludeList, opItem)) {
         continue;
       }
       
@@ -349,6 +421,8 @@ export async function split(options) {
         continue;
       }
       
+      pathServices.add(service);
+      
       if (verbose) {
         logger.debug(`Service name: ${service}`);
         logger.debug(`Service desc: ${serviceDesc}`);
@@ -380,104 +454,58 @@ export async function split(options) {
           opItem['x-github'].subcategory
         );
       }
-      
-      // Get all refs for operation
-      const opRefs = getAllRefs(opItem);
-      
-      if (verbose) {
-        logger.debug(`Found ${opRefs.size} refs for ${service}`);
-      }
-      
-      // Add refs to components
-      addRefsToComponents(opRefs, services[service], apiDocObj.components || {}, verbose);
-      
-      // Get internal refs
-      for (let i = 0; i < 3; i++) {  // Internal ref depth
-        const intRefs = getAllRefs(services[service].components);
-        if (verbose) {
-          logger.debug(`Found ${intRefs.size} INTERNAL refs for service ${service}`);
-        }
-        addRefsToComponents(intRefs, services[service], apiDocObj.components || {}, verbose);
-      }
-      
-      // Get deeply nested schema refs
-      for (let i = 0; i < 10; i++) {  // Schema max ref depth
-        const intRefs = getAllRefs(services[service].components);
-        // Filter refs that are already in service components
-        const filteredRefs = new Set();
-        for (const ref of intRefs) {
-          const parts = ref.split('/');
-          if (parts.length >= 4 && parts[1] === "components" && parts[2] === "schemas" &&
-              !services[service].components.schemas[parts[3]]) {
-            filteredRefs.add(ref);
-          }
-        }
-        
-        if (verbose) {
-          logger.debug(`Found ${filteredRefs.size} INTERNAL schema refs for service ${service}`);
-        }
-        
-        if (filteredRefs.size > 0) {
-          if (verbose) {
-            logger.debug(`Adding ${filteredRefs.size} INTERNAL schema refs for service ${service}`);
-          }
-          addRefsToComponents(filteredRefs, services[service], apiDocObj.components || {}, verbose);
-        } else {
-          if (verbose) {
-            logger.debug(`Exiting INTERNAL schema refs for ${service}`);
-          }
-          break;
-        }
-      }
     }
     
-    // After processing all operations in the path, collect path-level refs
-    const pathRefs = getPathLevelRefs(pathItem);
-    
-    // Add path-level refs to all services that use this path
-    for (const svcName in services) {
-      if (services[svcName].paths[pathKey]) {
-        if (verbose) {
-          logger.debug(`Adding path-level refs for ${pathKey} to service ${svcName}`);
-        }
-        
-        // Copy path-level parameters if they exist
-        if (pathItem.parameters) {
-          services[svcName].paths[pathKey].parameters = pathItem.parameters;
+    // For each service that uses this path, add path-level parameters
+    for (const service of pathServices) {
+      // Copy non-operation elements (like parameters) to service paths
+      for (const key in pathItem) {
+        if (!OPERATIONS.includes(key)) {
+          if (!services[service].paths[pathKey]) {
+            services[service].paths[pathKey] = {};
+          }
+          services[service].paths[pathKey][key] = pathItem[key];
         }
-        
-        // Add references from path-level parameters
-        addRefsToComponents(pathRefs, services[svcName], apiDocObj.components || {}, verbose);
       }
     }
   }
   
-  // Add non-operations to each service
+  // Second pass: collect all references for each service
   for (const service in services) {
-    for (const pathKey of Object.keys(services[service].paths)) {
-      if (verbose) {
-        logger.debug(`Adding non operations to ${service} for path ${pathKey}`);
+    if (verbose) {
+      logger.debug(`Collecting references for service ${service}`);
+    }
+    
+    // Get all refs from all operations in this service
+    const allRefs = new Set();
+    
+    // Collect refs from paths
+    for (const pathKey in services[service].paths) {
+      const pathItem = services[service].paths[pathKey];
+      
+      // Get refs from path-level parameters
+      const pathRefs = getPathLevelRefs(pathItem);
+      for (const ref of pathRefs) {
+        allRefs.add(ref);
       }
       
-      for (const nonOp of NON_OPERATIONS) {
-        if (verbose) {
-          logger.debug(`Looking for non operation ${nonOp} in ${service} under path ${pathKey}`);
-        }
-        
-        if (apiPaths[pathKey] && apiPaths[pathKey][nonOp]) {
-          if (verbose) {
-            logger.debug(`Adding ${nonOp} to ${service} for path ${pathKey}`);
-          }
-          
-          // Special case for parameters
-          if (nonOp === 'parameters') {
-            for (const verbKey in services[service].paths[pathKey]) {
-              services[service].paths[pathKey][verbKey].parameters = apiPaths[pathKey].parameters;
-            }
+      // Get refs from operations
+      for (const verbKey in pathItem) {
+        if (OPERATIONS.includes(verbKey)) {
+          const opRefs = getAllRefs(pathItem[verbKey]);
+          for (const ref of opRefs) {
+            allRefs.add(ref);
           }
         }
       }
     }
+    
+    if (verbose) {
+      logger.debug(`Found ${allRefs.size} total refs for service ${service}`);
+    }
+    
+    // Resolve all references recursively
+    resolveReferences(allRefs, services[service], apiDocObj.components || {}, verbose);
   }
   
   // Update path param names (replace hyphens with underscores)
@@ -529,6 +557,15 @@ export async function split(options) {
     services[service].components = addMissingObjectTypes(services[service].components);
   }
   
+  // Cleanup empty components
+  for (const service in services) {
+    for (const componentType in services[service].components) {
+      if (Object.keys(services[service].components[componentType]).length === 0) {
+        delete services[service].components[componentType];
+      }
+    }
+  }
+  
   // Write out service docs
   for (const service in services) {
     logger.info(`✅ Writing out OpenAPI doc for [${service}]`);