swaggie 2.1.2 → 2.1.4

package/dist/gen/genMocks.js

@@ -67,8 +67,13 @@ const MOCK_FILE_HEADER = `\
     .map((name) => {
       const fullName = servicePrefix + name;
       const camelName = _case.camel.call(void 0, fullName);
+      // `default` is a JS reserved word and cannot be used as a standalone
+      // `export const` identifier. The hooks templates rename it to `main`
+      // (see genOperations.ts — hooksCamelCaseName). Mock code that references
+      // the hooks namespace must use the same safe name.
+      const hooksCamelName = camelName === 'default' ? 'main' : camelName;
       const ops = _genOperations.prepareOperations.call(void 0, groups[name], options, spec.components);
-      return { name, camelName, ops };
+      return { name, camelName, hooksCamelName, ops };
     })
     .filter((g) => g.ops.length > 0);
 
@@ -399,16 +404,16 @@ function buildCreateSwrHookMocks(
   const spy = spyFn(fw);
   const lines = ['export function createApiHookMocks() {', '  return {'];
 
-  for (const { camelName, ops } of groups) {
+  for (const { hooksCamelName, ops } of groups) {
     const getOps = ops.filter((o) => o.method === 'GET');
     const mutOps = ops.filter((o) => o.method !== 'GET');
 
-    lines.push(`    ${camelName}: {`);
+    lines.push(`    ${hooksCamelName}: {`);
     lines.push('      queries: {');
     for (const op of getOps) {
       const hookName = toHookName(op.name, 'use');
       lines.push(
-        `        ${hookName}: withMockSWR(${spy}(${hooksAlias}.${camelName}.queries, '${hookName}').mockReturnValue(defaultSWRReturn)),`
+        `        ${hookName}: withMockSWR(${spy}(${hooksAlias}.${hooksCamelName}.queries, '${hookName}').mockReturnValue(defaultSWRReturn)),`
       );
     }
     lines.push('      },');
@@ -416,7 +421,7 @@ function buildCreateSwrHookMocks(
     for (const op of mutOps) {
       const hookName = 'use' + _case.pascal.call(void 0, op.name);
       lines.push(
-        `        ${hookName}: withMockSWRMutation(${spy}(${hooksAlias}.${camelName}.mutations, '${hookName}').mockReturnValue(defaultSWRMutationReturn as any)),`
+        `        ${hookName}: withMockSWRMutation(${spy}(${hooksAlias}.${hooksCamelName}.mutations, '${hookName}').mockReturnValue(defaultSWRMutationReturn as any)),`
       );
     }
     lines.push('      },');
@@ -436,16 +441,16 @@ function buildCreateTsqHookMocks(
   const spy = spyFn(fw);
   const lines = ['export function createApiHookMocks() {', '  return {'];
 
-  for (const { camelName, ops } of groups) {
+  for (const { hooksCamelName, ops } of groups) {
     const getOps = ops.filter((o) => o.method === 'GET');
     const mutOps = ops.filter((o) => o.method !== 'GET');
 
-    lines.push(`    ${camelName}: {`);
+    lines.push(`    ${hooksCamelName}: {`);
     lines.push('      queries: {');
     for (const op of getOps) {
       const hookName = toHookName(op.name, 'use');
       lines.push(
-        `        ${hookName}: withMockQuery(${spy}(${hooksAlias}.${camelName}.queries, '${hookName}').mockReturnValue(defaultQueryReturn as any)),`
+        `        ${hookName}: withMockQuery(${spy}(${hooksAlias}.${hooksCamelName}.queries, '${hookName}').mockReturnValue(defaultQueryReturn as any)),`
       );
     }
     lines.push('      },');
@@ -453,7 +458,7 @@ function buildCreateTsqHookMocks(
     for (const op of mutOps) {
       const hookName = 'use' + _case.pascal.call(void 0, op.name);
       lines.push(
-        `        ${hookName}: withMockMutation(${spy}(${hooksAlias}.${camelName}.mutations, '${hookName}').mockReturnValue(defaultMutationReturn as any)),`
+        `        ${hookName}: withMockMutation(${spy}(${hooksAlias}.${hooksCamelName}.mutations, '${hookName}').mockReturnValue(defaultMutationReturn as any)),`
       );
     }
     lines.push('      },');

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.4",
   "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",
-    "yaml": "^2.8.3",
+    "eta": "^4.6.0",
+    "yaml": "^2.9.0",
     "picocolors": "^1.1.1"
   },
   "devDependencies": {
-    "bun-types": "1.3.11",
+    "bun-types": "1.3.14",
     "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"
   }
 }