beer-swagger 1.0.4 → 1.1.1

package/generate-apis.js

@@ -5,7 +5,6 @@ import path from 'path';
 import { createInterface } from 'readline';
 
 const ENV_PATH = path.join(process.cwd(), '.env');
-const CLIENT_TYPES = new Set(['WEB', 'WeChatMiniProgram']);
 const SKIPPED_SERVICES = new Set([
   'billbear-common-web-gateway',
   'billbear-common-data-panel'
@@ -403,7 +402,7 @@ function toPascal(value) {
 }
 
 // Generate API file content for a service.
-function generateForSpec(spec, serviceName, fileBase, clientType) {
+function generateForSpec(spec, serviceName, fileBase, isDefaultFetch) {
   const {
     components = {},
     tags: specTags = [],
@@ -702,7 +701,7 @@ function generateForSpec(spec, serviceName, fileBase, clientType) {
   lines.push(' * This file is auto-generated. Do not edit manually.');
   lines.push(' * To update, run the generate-apis.js script.');
   lines.push(' */');
-  const fetchImport = clientType === 'WeChatMiniProgram' ? './fetch' : 'beer-network/api';
+  const fetchImport = isDefaultFetch ? 'beer-network/api' : './fetch';
   lines.push(`import type { JsonResponse } from '${fetchImport}';`);
   lines.push(`import Fetch from '${fetchImport}';`);
   if (fileBase) {
@@ -918,22 +917,23 @@ function writeEnvFile(nextEnv) {
   fs.writeFileSync(ENV_PATH, `${lines.join('\n')}\n`, 'utf8');
 }
 
-function normalizeClientType(value) {
-  if (!value) {
-    return '';
+function normalizeBoolean(value) {
+  if (value === undefined || value === null || value === '') {
+    return undefined;
   }
-  if (CLIENT_TYPES.has(value)) {
+  if (typeof value === 'boolean') {
     return value;
   }
-  if (value.toUpperCase() === 'WEB') {
-    return 'WEB';
-  }
-  const normalized = value.replace(/[-_\s]/g, '')
+  const normalized = String(value)
+    .trim()
     .toLowerCase();
-  if (normalized === 'wechatminiprogram') {
-    return 'WeChatMiniProgram';
+  if (['true', '1', 'yes', 'y'].includes(normalized)) {
+    return true;
   }
-  return '';
+  if (['false', '0', 'no', 'n'].includes(normalized)) {
+    return false;
+  }
+  return undefined;
 }
 
 // Ask user for missing values via CLI.
@@ -953,13 +953,12 @@ async function promptForMissing(env) {
   if (!result.SWAGGER_OUT_DIRECTORY) {
     result.SWAGGER_OUT_DIRECTORY = (await ask('DIRECTORY: ')).trim();
   }
-  if (!result.CLIENT_TYPE || !CLIENT_TYPES.has(result.CLIENT_TYPE)) {
-    let selected = '';
-    while (!CLIENT_TYPES.has(selected)) {
-      selected = normalizeClientType((await ask('CLIENT_TYPE (WEB/WeChatMiniProgram): ')).trim());
-    }
-    result.CLIENT_TYPE = selected;
+  let isDefaultFetch = normalizeBoolean(result.IS_DEFAULT_FETCH);
+  while (isDefaultFetch === undefined) {
+    const selected = (await ask('IS_DEFAULT_FETCH (true/false): ')).trim();
+    isDefaultFetch = normalizeBoolean(selected);
   }
+  result.IS_DEFAULT_FETCH = String(isDefaultFetch);
   rl.close();
   return result;
 }
@@ -970,23 +969,23 @@ async function main() {
   let {
     SWAGGER_BASE_URL: baseUrl,
     SWAGGER_OUT_DIRECTORY: directory,
-    CLIENT_TYPE: clientType
+    IS_DEFAULT_FETCH: isDefaultFetch
   } = { ...process.env, ...envFile };
-  clientType = normalizeClientType(clientType);
+  isDefaultFetch = normalizeBoolean(isDefaultFetch);
 
-  if (!baseUrl || !directory || !clientType) {
+  if (!baseUrl || !directory || isDefaultFetch === undefined) {
     const filled = await promptForMissing({
       SWAGGER_BASE_URL: baseUrl || '',
       SWAGGER_OUT_DIRECTORY: directory || '',
-      CLIENT_TYPE: clientType || ''
+      IS_DEFAULT_FETCH: isDefaultFetch === undefined ? '' : String(isDefaultFetch)
     });
     baseUrl = filled.SWAGGER_BASE_URL;
     directory = filled.SWAGGER_OUT_DIRECTORY;
-    clientType = normalizeClientType(filled.CLIENT_TYPE);
+    isDefaultFetch = normalizeBoolean(filled.IS_DEFAULT_FETCH);
     writeEnvFile({
       SWAGGER_BASE_URL: baseUrl,
       SWAGGER_OUT_DIRECTORY: directory,
-      CLIENT_TYPE: clientType
+      IS_DEFAULT_FETCH: String(isDefaultFetch)
     });
   }
 
@@ -996,10 +995,9 @@ async function main() {
   if (!directory) {
     throw new Error('SWAGGER_OUT_DIRECTORY is required.');
   }
-  if (!clientType) {
-    throw new Error('CLIENT_TYPE is required.');
+  if (isDefaultFetch === undefined) {
+    throw new Error('IS_DEFAULT_FETCH is required.');
   }
-
   const configUrl = `${baseUrl}/v3/api-docs/swagger-config`;
   const outputDirectory = path.isAbsolute(directory) ? directory : path.join(process.cwd(), directory);
   const typesDirectory = path.join(outputDirectory, 'types');
@@ -1037,7 +1035,7 @@ async function main() {
     const specUrl = `${baseUrl}${url}`;
     const spec = await fetchJson(specUrl);
     const fileBase = toFileBase(serviceName);
-    const content = generateForSpec(spec, serviceName, fileBase, clientType);
+    const content = generateForSpec(spec, serviceName, fileBase, isDefaultFetch);
     const typesContent = generateTypes(spec);
 
     const outPath = path.join(outputDirectory, `${fileBase}.ts`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "beer-swagger",
-  "version": "1.0.4",
+  "version": "1.1.1",
   "bin": {
     "beer-swagger": "./generate-apis.js"
   },