create-swdg-frontend 0.1.0 → 0.1.1

package/README.md

@@ -1,25 +1,15 @@
-# create-swdg
+# create-swdg-frontend
 
 Scaffold a new project from the SWDG frontend template.
 
 ## Usage
 
 ```bash
-pnpm create swdg my-app
+pnpm create swdg-frontend my-app
 # or
-pnpm dlx create-swdg my-app
+pnpm dlx create-swdg-frontend my-app
 ```
 
-Options:
-
-- `--install` to install dependencies after creation
-- `--no-install` to skip installing dependencies
-- `--pm pnpm|npm|yarn` to choose the package manager (default: pnpm)
-- `--git` to run `git init`
-- `--no-git` to skip `git init`
-- `--gis` to include Cesium GIS assets
-- `--no-gis` to exclude Cesium GIS assets
-
 ## Sync template
 
 ```bash

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-swdg-frontend",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Scaffold a new SWDG frontend project",
   "type": "module",
   "bin": {

package/template/scripts/gen-api.cjs

@@ -4,9 +4,6 @@ const axios = require('axios');
 const { execFileSync } = require('child_process');
 const fse = require('fs-extra');
 
-/**
- * 修复旧式参数结构
- */
 function fixTypeName(name) {
   return name.replace(/\s+/g, '');
 }
@@ -71,26 +68,99 @@ function fixSwagger(doc) {
   return doc;
 }
 
-/**
- * 下载并保存 API 文档
- */
 async function fetchAndFixSwagger(url, outputPath) {
   const { data } = await axios.get(url);
   const fixed = fixSwagger(data);
   fs.writeFileSync(outputPath, JSON.stringify(fixed, null, 2), 'utf-8');
 }
 
+function quoteForCmd(arg) {
+  if (arg === '') return '""';
+  const needsQuote = /[\s&()^\[\]{}=;!'+,`~|<>"]/g.test(arg);
+  if (!needsQuote) return arg;
+  return `"${String(arg).replace(/"/g, '\\"')}"`;
+}
+
+function execOnWindowsViaCmd(commandLine) {
+  execFileSync('cmd.exe', ['/d', '/s', '/c', commandLine], { stdio: 'inherit' });
+}
+
+function runAndReport(cmd, args, options = {}) {
+  try {
+    execFileSync(cmd, args, options);
+  } catch (e) {
+    const stdout = e && e.stdout ? e.stdout.toString() : '';
+    const stderr = e && e.stderr ? e.stderr.toString() : '';
+    if (stdout.trim()) console.error(`\n[openapi-generator stdout]\n${stdout}\n`);
+    if (stderr.trim()) console.error(`\n[openapi-generator stderr]\n${stderr}\n`);
+    throw e;
+  }
+}
+
 /**
- * 调用 openapi-generator 生成代码
+ * 如果你不想改系统环境变量：
+ * 1) 安装 JDK 后，改这里的路径为你的 JDK 安装目录
+ * 2) 脚本会临时把 JAVA_HOME/bin 注入 PATH，只影响本次运行
  */
+function withJavaEnv(baseEnv) {
+  const env = { ...baseEnv };
+
+  // ✅ 如果你已全局装好 Java（java -version 可用），可以把这块注释掉
+  // TODO: 把这里改成你的 JDK 路径
+  const JDK_HOME = env.JDK_HOME || env.JAVA_HOME || 'C:\\Program Files\\Java\\jdk-17';
+
+  if (process.platform === 'win32') {
+    const javaBin = path.join(JDK_HOME, 'bin');
+    env.JAVA_HOME = JDK_HOME;
+    env.PATH = `${javaBin};${env.PATH || ''}`;
+  } else {
+    // Unix: 一般装好后 java 已在 PATH；如需也可注入
+    // env.JAVA_HOME = JDK_HOME;
+    // env.PATH = `${path.join(JDK_HOME, 'bin')}:${env.PATH || ''}`;
+  }
+
+  return env;
+}
+
+function runOpenapiGenerator(args) {
+  const localCliMain = path.resolve(
+    process.cwd(),
+    'node_modules',
+    '@openapitools',
+    'openapi-generator-cli',
+    'main.js'
+  );
+
+  const env = withJavaEnv(process.env);
+
+  if (fs.existsSync(localCliMain)) {
+    runAndReport(process.execPath, [localCliMain, ...args], {
+      stdio: ['ignore', 'pipe', 'pipe'],
+      env,
+    });
+    return;
+  }
+
+  if (process.platform === 'win32') {
+    const cmdline = ['npx', 'openapi-generator-cli', ...args]
+      .map(quoteForCmd)
+      .join(' ');
+    execFileSync('cmd.exe', ['/d', '/s', '/c', cmdline], { stdio: 'inherit', env });
+    return;
+  }
+
+  runAndReport('npx', ['openapi-generator-cli', ...args], {
+    stdio: ['ignore', 'pipe', 'pipe'],
+    env,
+  });
+}
+
 function generateClient(inputPath, outputDir) {
-  // Avoid space issues by passing relative paths to the CLI
   const relativeInputPath = path.relative(process.cwd(), inputPath);
   const relativeOutputDir = path.relative(process.cwd(), outputDir);
-  execFileSync(
-    'npx',
-    [
-      'openapi-generator-cli',
+
+  try {
+    runOpenapiGenerator([
       'generate',
       '--skip-validate-spec',
       '-i',
@@ -99,19 +169,18 @@ function generateClient(inputPath, outputDir) {
       'typescript-axios',
       '-o',
       relativeOutputDir,
-    ],
-    { stdio: 'inherit' }
-  );
+    ]);
+  } catch (e) {
+    const msg = e && e.message ? e.message : String(e);
+    console.error(`❌ openapi-generator 执行失败: ${msg}`);
+    throw e;
+  }
 }
 
-/**
- * 清理和移动生成结果
- */
 function moveToSrcApi(serviceName, tempDir, targetBase) {
   const destDir = path.join(targetBase, serviceName);
   if (fs.existsSync(destDir)) fse.removeSync(destDir);
 
-  // 移除无用文件
   const filesToRemove = [
     '.swagger-codegen',
     '.gitignore',
@@ -128,14 +197,9 @@ function moveToSrcApi(serviceName, tempDir, targetBase) {
   }
 
   fse.moveSync(tempDir, destDir, { overwrite: true });
-  console.log(
-    `✅ ${serviceName} 接口生成完毕，已移动到 src/api/${serviceName}`
-  );
+  console.log(`✅ ${serviceName} 接口生成完毕，已移动到 src/api/${serviceName}`);
 }
 
-/**
- * 入口函数
- */
 async function generateService(serviceName, apiUrl) {
   const tempPath = path.join(__dirname, '.tmp', serviceName);
   const fixedJsonPath = path.join(tempPath, 'swagger-fixed.json');
@@ -146,31 +210,19 @@ async function generateService(serviceName, apiUrl) {
   moveToSrcApi(serviceName, tempPath, path.resolve(__dirname, '../src/api'));
 }
 
-/**
- * 多服务入口
- */
 async function main() {
   const base = 'http://10.20.124.50:30030';
   const services = [
-    {
-      name: 'userservice',
-      url: `${base}/userservice/v2/v3/api-docs`,
-    },
-    {
-      name: 'storageservice',
-      url: `${base}/storageservice/v2/v3/api-docs`,
-    },
-    {
-      name: 'underwatersys',
-      url: `${base}/underwatersys/v3/api-docs`,
-    },
+    { name: 'userservice', url: `${base}/userservice/v2/v3/api-docs` },
+    { name: 'storageservice', url: `${base}/storageservice/v2/v3/api-docs` },
+    { name: 'underwatersys', url: `${base}/underwatersys/v3/api-docs` },
   ];
 
   for (const svc of services) {
     try {
       await generateService(svc.name, svc.url);
     } catch (err) {
-      console.error(`❌ 生成失败: ${svc.name}`, err.message);
+      console.error(`❌ 生成失败: ${svc.name}`, err && err.message ? err.message : err);
     }
   }
 }

package/template/swdg/bin/index.js

@@ -1,23 +0,0 @@
-#!/usr/bin/env node
-import { spawn } from 'node:child_process';
-import { createRequire } from 'node:module';
-
-const require = createRequire(import.meta.url);
-let cliPath;
-
-try {
-  cliPath = require.resolve('create-swdg/bin/index.js');
-} catch (error) {
-  console.error(
-    'Failed to resolve create-swdg. Please run: npm i -g create-swdg'
-  );
-  process.exit(1);
-}
-
-const child = spawn(process.execPath, [cliPath, ...process.argv.slice(2)], {
-  stdio: 'inherit',
-});
-
-child.on('exit', (code) => {
-  process.exit(code ?? 1);
-});

package/template/swdg/package.json

@@ -1,27 +0,0 @@
-{
-  "name": "swdg",
-  "version": "0.1.1",
-  "description": "SWDG frontend scaffolding CLI wrapper",
-  "type": "module",
-  "bin": {
-    "swdg": "bin/index.js"
-  },
-  "files": [
-    "bin"
-  ],
-  "dependencies": {
-    "create-swdg": "^0.1.3"
-  },
-  "engines": {
-    "node": ">=18"
-  },
-  "keywords": [
-    "swdg",
-    "create",
-    "scaffold",
-    "vite",
-    "vue"
-  ],
-  "author": "inupedia",
-  "license": "MIT"
-}