gtx-cli 2.5.29-alpha.1 → 2.5.29

package/dist/utils/processOpenApi.js

@@ -251,7 +251,14 @@ function parseOpenApiValue(value) {
         return null;
     let cursor = 0;
     let specPath;
-    if (tokens[0].toLowerCase().endsWith('.json')) {
+    const first = tokens[0];
+    const second = tokens[1];
+    const methodCandidate = second?.toUpperCase();
+    const firstLooksLikeSpec = first.toLowerCase().endsWith('.json') ||
+        (second &&
+            (second.toLowerCase() === 'webhook' ||
+                (methodCandidate && HTTP_METHODS.has(methodCandidate))));
+    if (firstLooksLikeSpec) {
         specPath = tokens[0];
         cursor = 1;
     }
@@ -260,9 +267,13 @@ function parseOpenApiValue(value) {
     const keyword = tokens[cursor];
     if (keyword.toLowerCase() === 'webhook') {
         const name = tokens.slice(cursor + 1).join(' ');
+        if (!name)
+            return null;
         return { kind: 'webhook', specPath, name };
     }
     const method = keyword.toUpperCase();
+    if (!HTTP_METHODS.has(method))
+        return null;
     const operationPath = tokens.slice(cursor + 1).join(' ');
     if (!operationPath)
         return null;
@@ -300,14 +311,38 @@ function resolveSpec(explicitPath, specs, filePath, configDir, warnings, refDesc
     if (!specs.length)
         return null;
     if (explicitPath) {
-        const normalizedExplicit = explicitPath.replace(/^\.?\/+/, '');
+        const normalizedExplicit = normalizeSlashes(explicitPath.replace(/^\.?\/+/, ''));
         const candidates = [
             path.resolve(configDir, normalizedExplicit),
             path.resolve(path.dirname(filePath), normalizedExplicit),
         ];
-        const foundSpec = specs.find((spec) => candidates.some((candidate) => samePath(candidate, spec.absPath)));
+        const foundSpec = specs.find((spec) => {
+            const normalizedSpecPath = normalizeSlashes(spec.absPath);
+            return candidates.some((candidate) => samePath(candidate, normalizedSpecPath));
+        });
         if (foundSpec)
             return foundSpec;
+        const explicitWithoutExt = stripExtension(normalizedExplicit);
+        const explicitBase = path.basename(normalizedExplicit);
+        const explicitBaseWithoutExt = stripExtension(explicitBase);
+        const matches = specs.filter((spec) => {
+            const configPath = normalizeSlashes(spec.configPath).replace(/^\.?\/+/, '');
+            const configBase = path.basename(configPath);
+            const configPathNoExt = stripExtension(configPath);
+            const configBaseNoExt = stripExtension(configBase);
+            return (configPath === normalizedExplicit ||
+                configPathNoExt === explicitWithoutExt ||
+                configBase === explicitBase ||
+                configBaseNoExt === explicitBaseWithoutExt);
+        });
+        if (matches.length === 1)
+            return matches[0];
+        if (matches.length > 1) {
+            warnings.add(`OpenAPI reference ${refDescription} in ${filePath} matches multiple specs (${matches
+                .map((m) => m.configPath)
+                .join(', ')}). Using the first configured match (${matches[0].configPath}).`);
+            return matches[0];
+        }
         warnings.add(`OpenAPI reference ${refDescription} in ${filePath} points to an unconfigured spec (${explicitPath}). Skipping localization for this reference.`);
         return null;
     }
@@ -325,12 +360,11 @@ function resolveSpec(explicitPath, specs, filePath, configDir, warnings, refDesc
     if (matches.length === 1)
         return matches[0];
     if (matches.length > 1) {
-        warnings.add(`OpenAPI reference ${refDescription} in ${filePath} is available in multiple specs. Using the first configured file (${matches[0].configPath}).`);
-        return matches[0];
+        warnings.add(`OpenAPI reference ${refDescription} in ${filePath} is available in multiple specs. Skipping localization for this reference.`);
+        return null;
     }
-    // Not found anywhere, fall back to first configured spec
-    warnings.add(`OpenAPI reference ${refDescription} in ${filePath} was not found in any configured spec. Using ${specs[0].configPath}.`);
-    return specs[0];
+    warnings.add(`OpenAPI reference ${refDescription} in ${filePath} was not found in any configured spec. Skipping localization for this reference.`);
+    return null;
 }
 /**
  * Map a spec to the locale-specific file path when available and normalize it
@@ -377,6 +411,11 @@ function describeOpenApiRef(value) {
         return `webhook ${value.name}`;
     return `${value.method.toUpperCase()} ${value.operationPath}`;
 }
+/** Remove a single trailing file extension while preserving directory segments. */
+function stripExtension(p) {
+    const parsed = path.parse(p);
+    return normalizeSlashes(path.join(parsed.dir, parsed.name));
+}
 /** Normalize separators for stable comparisons and output. */
 function normalizeSlashes(p) {
     return p.replace(/\\/g, '/');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gtx-cli",
-  "version": "2.5.29-alpha.1",
+  "version": "2.5.29",
   "main": "dist/index.js",
   "bin": "dist/main.js",
   "files": [
@@ -110,11 +110,6 @@
   "devDependencies": {
     "@babel/types": "^7.28.4",
     "@biomejs/biome": "^1.9.4",
-    "@rollup/plugin-commonjs": "^29.0.0",
-    "@rollup/plugin-json": "^6.1.0",
-    "@rollup/plugin-node-resolve": "^16.0.3",
-    "@rollup/plugin-terser": "^0.4.4",
-    "@rollup/plugin-typescript": "^12.3.0",
     "@types/babel__generator": "^7.27.0",
     "@types/babel__traverse": "^7.20.6",
     "@types/figlet": "^1.7.0",
@@ -129,13 +124,12 @@
     "mdast-util-mdx-jsx": "^3.2.0",
     "mdast-util-mdxjs-esm": "^2.0.1",
     "prettier": "^3.4.2",
-    "rollup": "^4.53.3",
     "ts-node": "^10.9.2",
     "tslib": "^2.8.1",
     "typescript": "^5.5.4"
   },
   "scripts": {
-    "build": "tsc && rollup -c",
+    "build": "tsc",
     "build:clean": "sh ../../scripts/clean.sh && pnpm run build",
     "build:release": "pnpm run build:clean",
     "lint": "eslint \"src/**/*.{js,ts}\" \"./**/__tests__/**/*.{js,ts}\"",