wrekenfile-converter 2.2.3 → 2.2.4

package/README.md

@@ -171,7 +171,7 @@ METHODS:
         STATUS: 200
 ```
 
-The full deterministic spec (for re-implementing in SDKs/other languages) is documented in [`specification/canonical_id.md`](./specification/canonical_id.md).
+The full deterministic spec (for re-implementing in SDKs/other languages) is documented in the source at [`src/v2/utils/canonical-id.ts`](./src/v2/utils/canonical-id.ts).
 
 ## Parameter Structure
 

package/dist/v2/index.d.ts

@@ -3,3 +3,4 @@ export { generateWrekenfile as generateWrekenfileV2 } from './openapi-v2-to-wrek
 export { generateWrekenfile as generateWrekenfileFromPostman, extractStructs, extractOperations, mapType, parseJsonExample, extractFieldsFromObject, loadEnvironmentFile, extractCollectionVariables, resolveVariables } from './postman-to-wrekenfile';
 export { generateMiniWrekenfiles, saveMiniWrekenfiles, MiniWrekenfile } from './mini-wrekenfile-generator';
 export { computeCanonicalId, resolveCanonicalIds, type MethodCanonicalInput, } from './utils/canonical-id';
+export { filterStructsByUsage, extractAllStructNames, } from './utils/struct-utils';

package/dist/v2/index.js

@@ -1,7 +1,7 @@
 "use strict";
 // v2 entry point - Wrekenfile spec version 2.1.0
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveCanonicalIds = exports.computeCanonicalId = exports.saveMiniWrekenfiles = exports.generateMiniWrekenfiles = exports.resolveVariables = exports.extractCollectionVariables = exports.loadEnvironmentFile = exports.extractFieldsFromObject = exports.parseJsonExample = exports.mapType = exports.extractOperations = exports.extractStructs = exports.generateWrekenfileFromPostman = exports.generateWrekenfileV2 = exports.generateWrekenfile = void 0;
+exports.extractAllStructNames = exports.filterStructsByUsage = exports.resolveCanonicalIds = exports.computeCanonicalId = exports.saveMiniWrekenfiles = exports.generateMiniWrekenfiles = exports.resolveVariables = exports.extractCollectionVariables = exports.loadEnvironmentFile = exports.extractFieldsFromObject = exports.parseJsonExample = exports.mapType = exports.extractOperations = exports.extractStructs = exports.generateWrekenfileFromPostman = exports.generateWrekenfileV2 = exports.generateWrekenfile = void 0;
 // Export OpenAPI v3 converter
 var openapi_to_wreken_1 = require("./openapi-to-wreken");
 Object.defineProperty(exports, "generateWrekenfile", { enumerable: true, get: function () { return openapi_to_wreken_1.generateWrekenfile; } });
@@ -27,3 +27,7 @@ Object.defineProperty(exports, "saveMiniWrekenfiles", { enumerable: true, get: f
 var canonical_id_1 = require("./utils/canonical-id");
 Object.defineProperty(exports, "computeCanonicalId", { enumerable: true, get: function () { return canonical_id_1.computeCanonicalId; } });
 Object.defineProperty(exports, "resolveCanonicalIds", { enumerable: true, get: function () { return canonical_id_1.resolveCanonicalIds; } });
+// Export struct utilities
+var struct_utils_1 = require("./utils/struct-utils");
+Object.defineProperty(exports, "filterStructsByUsage", { enumerable: true, get: function () { return struct_utils_1.filterStructsByUsage; } });
+Object.defineProperty(exports, "extractAllStructNames", { enumerable: true, get: function () { return struct_utils_1.extractAllStructNames; } });

package/dist/v2/mini-wrekenfile-generator.js

@@ -39,6 +39,7 @@ const yaml = __importStar(require("js-yaml"));
 const fs = __importStar(require("fs"));
 const constants_1 = require("./utils/constants");
 const yaml_utils_1 = require("./utils/yaml-utils");
+const struct_utils_1 = require("./utils/struct-utils");
 function generateMiniWrekenfiles(wrekenfileContent) {
     if (!wrekenfileContent || typeof wrekenfileContent !== 'string') {
         throw new Error("Argument 'wrekenfileContent' is required and must be a string");
@@ -295,7 +296,7 @@ function extractTypeFromInput(value) {
     return null;
 }
 function collectStructRefsFromType(type, structRefs) {
-    const structNames = extractAllStructNames(type);
+    const structNames = (0, struct_utils_1.extractAllStructNames)(type);
     for (const structName of structNames) {
         if (structName)
             structRefs.add(structName);
@@ -313,7 +314,7 @@ function collectStructRecursively(structName, allStructs, requiredStructs, proce
         // Old format: array of fields
         for (const field of structData) {
             if (field.type) {
-                const nestedStructNames = extractAllStructNames(field.type);
+                const nestedStructNames = (0, struct_utils_1.extractAllStructNames)(field.type);
                 for (const nestedStructName of nestedStructNames) {
                     if (nestedStructName) {
                         collectStructRecursively(nestedStructName, allStructs, requiredStructs, processedStructs);
@@ -326,7 +327,7 @@ function collectStructRecursively(structName, allStructs, requiredStructs, proce
         // New format: { DESC: ..., FIELDS: [...] }
         for (const field of structData.FIELDS) {
             if (field.TYPE) {
-                const nestedStructNames = extractAllStructNames(field.TYPE);
+                const nestedStructNames = (0, struct_utils_1.extractAllStructNames)(field.TYPE);
                 for (const nestedStructName of nestedStructNames) {
                     if (nestedStructName) {
                         collectStructRecursively(nestedStructName, allStructs, requiredStructs, processedStructs);
@@ -336,22 +337,6 @@ function collectStructRecursively(structName, allStructs, requiredStructs, proce
         }
     }
 }
-const STRUCT_REGEX = /^STRUCT\(([^)]+)\)/;
-const ARRAY_STRUCT_REGEX = /^\[\]STRUCT\(([^)]+)\)/;
-const MAP_STRUCT_REGEX = /map\[[^\]]+\]STRUCT\(([^)]+)\)/;
-function extractAllStructNames(typeString) {
-    const matches = [];
-    const match1 = typeString.match(STRUCT_REGEX);
-    const match2 = typeString.match(ARRAY_STRUCT_REGEX);
-    const match3 = typeString.match(MAP_STRUCT_REGEX);
-    if (match1)
-        matches.push(match1[1]);
-    if (match2)
-        matches.push(match2[1]);
-    if (match3)
-        matches.push(match3[1]);
-    return matches;
-}
 function sanitizeFilename(name) {
     return name
         .replace(constants_1.FILENAME_LEADING_SLASHES, '')

package/dist/v2/utils/canonical-id.js

@@ -59,15 +59,24 @@ function normalizePath(path) {
  */
 function pathSegmentsWithoutParams(path) {
     const segments = path.split('/').filter(Boolean);
-    return segments.filter((s) => {
-        // Remove {param} style
+    return segments.reduce((acc, s) => {
+        // Remove pure {param} style
         if (s.startsWith('{') && s.endsWith('}'))
-            return false;
+            return acc;
         // Remove :param style
         if (s.startsWith(':'))
-            return false;
-        return true;
-    });
+            return acc;
+        // Handle Google API-style segments like {property}:runReport —
+        // strip any {param} placeholders and remove a leading colon from the remainder.
+        if (s.includes('{')) {
+            const remainder = s.replace(/\{[^}]+\}/g, '').replace(/^:/, '');
+            if (remainder)
+                acc.push(remainder);
+            return acc;
+        }
+        acc.push(s);
+        return acc;
+    }, []);
 }
 /**
  * Singularize a resource name (simple rules + irregular map).

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wrekenfile-converter",
-  "version": "2.2.3",
+  "version": "2.2.4",
   "description": "Convert OpenAPI and Postman specs into Wrekenfiles, with chunking for vector database storage",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -32,7 +32,7 @@
   "homepage": "https://wreken.com",
   "repository": {
     "type": "git",
-    "url": "https://gitlab.com/swytchcode/wrekenfile.git"
+    "url": "git+https://gitlab.com/swytchcode/wrekenfile.git"
   },
   "license": "MIT",
   "files": [