swaggie 2.1.2 → 2.1.3

package/dist/gen/genOperations.js

@@ -623,23 +623,36 @@ const PRIMITIVES =
  * and inline object types (including PascalCase names used as property value types
  * inside `{ key: SomeType }` shapes).
  *
- * @example prefixApiType('Pet')                          → 'API.Pet'
- * @example prefixApiType('Pet[]')                        → 'API.Pet[]'
- * @example prefixApiType('Pet | null')                   → 'API.Pet | null'
- * @example prefixApiType('unknown')                      → 'unknown'
- * @example prefixApiType('{ id: number }')               → '{ id: number }'
- * @example prefixApiType('{ profile: MyEnum; }')         → '{ profile: API.MyEnum; }'
- * @example prefixApiType('API.Pet')                      → 'API.Pet' (API itself is in the exclude list)
+ * Quoted string literals (single or double) are left entirely untouched so that
+ * enum-derived types like `"AZURE" | "AWS"` are never incorrectly rewritten to
+ * `"API.AZURE" | "API.AWS"`.
+ *
+ * @example prefixApiType('Pet')                             → 'API.Pet'
+ * @example prefixApiType('Pet[]')                           → 'API.Pet[]'
+ * @example prefixApiType('Pet | null')                      → 'API.Pet | null'
+ * @example prefixApiType('unknown')                         → 'unknown'
+ * @example prefixApiType('{ id: number }')                  → '{ id: number }'
+ * @example prefixApiType('{ profile: MyEnum; }')            → '{ profile: API.MyEnum; }'
+ * @example prefixApiType('API.Pet')                         → 'API.Pet'
+ * @example prefixApiType('"AZURE" | "AWS"')                 → '"AZURE" | "AWS"'
+ * @example prefixApiType('"available" | Pet')               → '"available" | API.Pet'
  */
  function prefixApiType(typeStr) {
   if (!typeStr) {
     return typeStr;
   }
-  // The negative lookbehind `(?<!\.)` skips identifiers that are already part
-  // of a namespace reference (e.g. `API.Pet` — when the regex reaches `Pet` it
-  // is preceded by `.`, so we leave it alone).
-  return typeStr.replace(/(?<!\.)\b([A-Z][A-Za-z0-9_]*)\b/g, (match) =>
-    PRIMITIVES.test(match) ? match : `API.${match}`
+  // The alternation has two branches:
+  //   Group 1: a full quoted string literal ("..." or '...') — returned as-is so
+  //            that enum-derived values like "AZURE" are never prefixed.
+  //   Group 2: an uppercase-starting identifier that is NOT already preceded by a
+  //            dot (negative lookbehind) — prefixed with API. unless it is a known
+  //            primitive / built-in.
+  return typeStr.replace(
+    /("(?:[^"\\]|\\.)*"|'(?:[^'\\]|\\.)*')|(?<!\.)\b([A-Z][A-Za-z0-9_]*)\b/g,
+    (match, quotedLiteral, ident) => {
+      if (quotedLiteral !== undefined) return quotedLiteral;
+      return PRIMITIVES.test(ident) ? ident : `API.${ident}`;
+    },
   );
 } exports.prefixApiType = prefixApiType;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "swaggie",
-  "version": "2.1.2",
+  "version": "2.1.3",
   "description": "Generate a fully typed TypeScript API client from your OpenAPI 3 spec",
   "author": {
     "name": "Piotr Dabrowski",
@@ -72,16 +72,16 @@
   "dependencies": {
     "case": "^1.6.3",
     "commander": "^14.0.3",
-    "eta": "^4.5.1",
+    "eta": "^4.6.0",
     "yaml": "^2.8.3",
     "picocolors": "^1.1.1"
   },
   "devDependencies": {
-    "bun-types": "1.3.11",
+    "bun-types": "1.3.13",
     "openapi-types": "^12.1.3",
     "sucrase": "3.35.1",
-    "typescript": "6.0.2",
+    "typescript": "6.0.3",
     "vitepress": "^2.0.0-alpha.17",
-    "vitepress-plugin-tabs": "0.8.0"
+    "vitepress-plugin-tabs": "0.9.0"
   }
 }