@zhin.js/cli 1.0.6 → 1.0.8

package/src/commands/install.ts

@@ -0,0 +1,242 @@
+import { Command } from 'commander';
+import { logger } from '../utils/logger.js';
+import fs from 'fs-extra';
+import path from 'path';
+import inquirer from 'inquirer';
+import { execSync } from 'node:child_process';
+
+interface InstallOptions {
+  save?: boolean;
+  saveDev?: boolean;
+  global?: boolean;
+}
+
+export const installCommand = new Command('install')
+  .description('安装插件（npm 包或 git 仓库）')
+  .argument('[plugin]', '插件名称或 git 地址')
+  .option('-S, --save', '安装到 dependencies（默认）', true)
+  .option('-D, --save-dev', '安装到 devDependencies', false)
+  .option('-g, --global', '全局安装', false)
+  .action(async (plugin: string, options: InstallOptions) => {
+    try {
+      let pluginToInstall = plugin;
+
+      // 如果没有指定插件，交互式输入
+      if (!pluginToInstall) {
+        const { input } = await inquirer.prompt([
+          {
+            type: 'input',
+            name: 'input',
+            message: '请输入插件名称或 git 地址:',
+            validate: (input: string) => {
+              if (!input.trim()) {
+                return '插件名称或地址不能为空';
+              }
+              return true;
+            }
+          }
+        ]);
+        pluginToInstall = input;
+      }
+
+      // 判断插件类型
+      const pluginType = detectPluginType(pluginToInstall);
+      
+      logger.info(`检测到插件类型: ${pluginType}`);
+      logger.info(`正在安装: ${pluginToInstall}`);
+      logger.log('');
+
+      // 构建安装命令
+      const installCmd = buildInstallCommand(pluginToInstall, pluginType, options);
+      
+      logger.log(`执行命令: ${installCmd}`);
+      logger.log('');
+
+      // 执行安装
+      try {
+        execSync(installCmd, {
+          cwd: process.cwd(),
+          stdio: 'inherit'
+        });
+
+        logger.success('✓ 插件安装成功！');
+        logger.log('');
+
+        // 如果是 git 插件，提供额外说明
+        if (pluginType === 'git') {
+          logger.log('📝 Git 插件已安装到 node_modules/');
+          logger.log('');
+        }
+
+        // 提示如何启用插件
+        const pluginName = extractPluginName(pluginToInstall, pluginType);
+        if (pluginName) {
+          logger.log('🔌 启用插件：');
+          logger.log(`在 zhin.config.ts 中添加：`);
+          logger.log('');
+          logger.log('  export default defineConfig({');
+          logger.log('    plugins: [');
+          logger.log(`      '${pluginName}'`);
+          logger.log('    ]');
+          logger.log('  });');
+        }
+
+      } catch (error) {
+        logger.error('安装失败');
+        throw error;
+      }
+
+    } catch (error: any) {
+      logger.error(`安装插件失败: ${error.message}`);
+      process.exit(1);
+    }
+  });
+
+// 别名命令
+export const addCommand = new Command('add')
+  .description('安装插件（install 的别名）')
+  .argument('[plugin]', '插件名称或 git 地址')
+  .option('-S, --save', '安装到 dependencies（默认）', true)
+  .option('-D, --save-dev', '安装到 devDependencies', false)
+  .option('-g, --global', '全局安装', false)
+  .action(async (plugin: string, options: InstallOptions) => {
+    await installCommand.parseAsync(['node', 'zhin', 'install', plugin || '', ...buildOptionsArray(options)], { from: 'user' });
+  });
+
+/**
+ * 检测插件类型
+ */
+function detectPluginType(plugin: string): 'npm' | 'git' | 'github' | 'gitlab' | 'bitbucket' {
+  // Git 协议
+  if (plugin.startsWith('git://') || plugin.startsWith('git+')) {
+    return 'git';
+  }
+
+  // HTTPS/SSH git 地址
+  if (plugin.includes('github.com') || plugin.includes('gitlab.com') || plugin.includes('bitbucket.org')) {
+    if (plugin.includes('github.com')) return 'github';
+    if (plugin.includes('gitlab.com')) return 'gitlab';
+    if (plugin.includes('bitbucket.org')) return 'bitbucket';
+    return 'git';
+  }
+
+  // GitHub 简写 (user/repo)
+  if (/^[\w-]+\/[\w-]+$/.test(plugin)) {
+    return 'github';
+  }
+
+  // 默认为 npm 包
+  return 'npm';
+}
+
+/**
+ * 构建安装命令
+ */
+function buildInstallCommand(plugin: string, type: string, options: InstallOptions): string {
+  const parts = ['pnpm', 'add'];
+
+  // 添加保存选项
+  if (options.saveDev) {
+    parts.push('-D');
+  }
+
+  if (options.global) {
+    parts.push('-g');
+  }
+
+  // 处理不同类型的插件
+  let packageSpec = plugin;
+
+  switch (type) {
+    case 'github':
+      // 如果是简写形式，转换为完整 GitHub URL
+      if (/^[\w-]+\/[\w-]+$/.test(plugin)) {
+        packageSpec = `github:${plugin}`;
+      } else if (!plugin.startsWith('git+') && !plugin.startsWith('https://')) {
+        packageSpec = `git+${plugin}`;
+      }
+      break;
+
+    case 'gitlab':
+      if (!plugin.startsWith('git+') && !plugin.startsWith('https://')) {
+        packageSpec = `git+${plugin}`;
+      }
+      break;
+
+    case 'bitbucket':
+      if (!plugin.startsWith('git+') && !plugin.startsWith('https://')) {
+        packageSpec = `git+${plugin}`;
+      }
+      break;
+
+    case 'git':
+      // Git URL 直接使用
+      break;
+
+    case 'npm':
+    default:
+      // npm 包名直接使用
+      break;
+  }
+
+  parts.push(packageSpec);
+
+  return parts.join(' ');
+}
+
+/**
+ * 提取插件名称
+ */
+function extractPluginName(plugin: string, type: string): string | null {
+  switch (type) {
+    case 'npm':
+      // npm 包名可能包含 scope 和版本号
+      // @scope/package@version -> @scope/package 或 package
+      const match = plugin.match(/^(@?[\w-]+\/)?([^@]+)/);
+      if (match) {
+        const fullName = match[0].replace(/@[\d.]+.*$/, ''); // 移除版本号
+        // 如果是 @zhin.js/ 开头的包，提取最后的名称
+        if (fullName.startsWith('@zhin.js/')) {
+          return fullName.replace('@zhin.js/', '');
+        }
+        return fullName;
+      }
+      return plugin;
+
+    case 'github':
+    case 'gitlab':
+    case 'bitbucket':
+      // 从 git URL 中提取仓库名
+      const repoMatch = plugin.match(/\/([^/]+?)(\.git)?$/);
+      if (repoMatch) {
+        return repoMatch[1];
+      }
+      // 简写形式 user/repo
+      if (/^[\w-]+\/([\w-]+)$/.test(plugin)) {
+        return plugin.split('/')[1];
+      }
+      return null;
+
+    case 'git':
+      // 从 git URL 中提取仓库名
+      const gitMatch = plugin.match(/\/([^/]+?)(\.git)?$/);
+      if (gitMatch) {
+        return gitMatch[1];
+      }
+      return null;
+
+    default:
+      return null;
+  }
+}
+
+/**
+ * 构建选项数组
+ */
+function buildOptionsArray(options: InstallOptions): string[] {
+  const arr: string[] = [];
+  if (options.saveDev) arr.push('-D');
+  if (options.global) arr.push('-g');
+  return arr;
+}
+

package/src/commands/new.ts

@@ -7,16 +7,17 @@ import { execSync } from 'node:child_process';
 
 interface NewPluginOptions {
   skipInstall?: boolean;
+  isOfficial?: boolean;
 }
 
 export const newCommand = new Command('new')
   .description('创建插件包模板')
   .argument('[plugin-name]', '插件名称（如: my-plugin）')
+  .option('--is-official', '是否为官方插件', false)
   .option('--skip-install', '跳过依赖安装', false)
   .action(async (pluginName: string, options: NewPluginOptions) => {
     try {
       let name = pluginName;
-      
       if (!name) {
         const { pluginName: inputName } = await inquirer.prompt([
           {
@@ -53,7 +54,7 @@ export const newCommand = new Command('new')
       await createPluginPackage(pluginDir, name, options);
       
       // 自动添加到 app/package.json
-      await addPluginToApp(name);
+      await addPluginToApp(name, options.isOfficial);
       
       logger.success(`✓ 插件包 ${name} 创建成功！`);
       logger.log('');
@@ -76,11 +77,11 @@ export const newCommand = new Command('new')
 
 async function createPluginPackage(pluginDir: string, pluginName: string, options: NewPluginOptions) {
   const capitalizedName = pluginName.charAt(0).toUpperCase() + pluginName.slice(1).replace(/-([a-z])/g, (_, c) => c.toUpperCase());
-  const packageName = `@zhin.js/${pluginName}`;
+  const packageName = options.isOfficial ? `@zhin.js/${pluginName}` : `zhin.js-${pluginName}`;
   
   // 创建目录结构
   await fs.ensureDir(pluginDir);
-  await fs.ensureDir(path.join(pluginDir, 'app'));
+  await fs.ensureDir(path.join(pluginDir, 'src'));
   await fs.ensureDir(path.join(pluginDir, 'client'));
   await fs.ensureDir(path.join(pluginDir, 'lib'));
   await fs.ensureDir(path.join(pluginDir, 'dist'));
@@ -104,23 +105,23 @@ async function createPluginPackage(pluginDir: string, pluginName: string, option
     },
     files: [
       'lib',
-      'app',
+      'src',
       'dist',
       'client',
       'README.md',
       'CHANGELOG.md'
     ],
     scripts: {
-      build: 'pnpm build:app && pnpm build:client',
-      'build:app': 'tsc --project tsconfig.app.json',
-      'build:client': 'tsc --project tsconfig.client.json',
-      dev: 'tsc --project tsconfig.app.json --watch',
+      build: 'pnpm build:node && pnpm build:client',
+      'build:node': 'tsc --project node.tsconfig.json',
+      'build:client': 'zhin-console build',
+      dev: 'tsc --project node.tsconfig.json --watch',
       clean: 'rm -rf lib dist',
       prepublishOnly: 'pnpm build'
     },
     keywords: [
-      'zhin',
-      'zhin-plugin',
+      'zhin.js',
+      'plugin',
       pluginName
     ],
     author: '',
@@ -135,62 +136,77 @@ async function createPluginPackage(pluginDir: string, pluginName: string, option
       '@zhin.js/types': 'workspace:*',
       '@types/node': 'latest',
       '@types/react': 'latest',
+      '@types/react-dom': 'latest',
       'typescript': 'latest',
       'react': 'latest',
       'react-dom': 'latest',
-      'lucide-react': 'latest'
+      "@zhin.js/client":"workspace:*",
+      'lucide-react': 'latest',
+      'radix-ui': 'latest',
+      '@radix-ui/themes': 'latest'
     }
   };
   
   await fs.writeJson(path.join(pluginDir, 'package.json'), packageJson, { spaces: 2 });
   
-  // 创建 tsconfig.app.json (插件代码)
-  const tsConfigApp = {
-    extends: '../../tsconfig.json',
-    compilerOptions: {
-      rootDir: './app',
-      outDir: './lib',
-      declaration: true,
-      noEmit: false
+  // 创建 tsconfig.json (服务端主配置)
+  const tsConfig = {
+    "compilerOptions": {
+      "target": "ES2022",
+      "module": "ESNext",
+      "moduleResolution": "bundler",
+      "outDir": "./lib",
+      "rootDir": "./src",
+      "strict": true,
+      "esModuleInterop": true,
+      "skipLibCheck": true,
+      "forceConsistentCasingInFileNames": true,
+      "resolveJsonModule": true,
+      "isolatedModules": true,
+      "allowSyntheticDefaultImports": true,
+      "experimentalDecorators": true,
+      "emitDecoratorMetadata": true,
+      "declaration": true,
+      "declarationMap": true,
+      "sourceMap": true,
+      "verbatimModuleSyntax": false,
+      "types": [
+        "@zhin.js/http"
+      ]
     },
-    include: ['app/**/*'],
-    exclude: ['node_modules', 'lib', 'dist']
-  };
-  
-  await fs.writeJson(path.join(pluginDir, 'tsconfig.app.json'), tsConfigApp, { spaces: 2 });
+    "include": ["src/**/*"],
+    "exclude": ["lib", "node_modules", "client"]
+  } 
+  ;
   
-  // 创建 tsconfig.client.json (客户端代码)
-  const tsConfigClient = {
-    compilerOptions: {
-      target: 'ES2022',
-      module: 'ESNext',
-      moduleResolution: 'bundler',
-      rootDir: './client',
-      outDir: './dist',
-      declaration: false,
-      jsx: 'react-jsx',
-      baseUrl: '.',
-      skipLibCheck: true,
-      esModuleInterop: true,
-      allowSyntheticDefaultImports: true
-    },
-    include: ['client/**/*'],
-    exclude: ['node_modules', 'lib', 'dist']
-  };
+  await fs.writeJson(path.join(pluginDir, 'tsconfig.json'), tsConfig, { spaces: 2 });
   
-  await fs.writeJson(path.join(pluginDir, 'tsconfig.client.json'), tsConfigClient, { spaces: 2 });
   
-  // 创建 tsconfig.json (编辑器支持)
-  const tsConfig = {
-    extends: '../../tsconfig.json',
-    include: ['app/**/*', 'client/**/*'],
-    exclude: ['node_modules', 'lib', 'dist']
-  };
+  // 创建 client/tsconfig.json (客户端主配置)
+  const clientTsConfig = {
+    "compilerOptions": {
+      "outDir": "../dist",
+      "baseUrl": ".",
+      "declaration": true,
+      "module": "ESNext",
+      "moduleResolution": "bundler",
+      "target": "ES2022",
+      "jsx":"react-jsx",
+      "declarationMap": true,
+      "sourceMap": true,
+      "skipLibCheck": true,
+      "noEmit": false
+    },
+    "include": [
+      "./**/*"
+    ]
+  }
+  ;
   
-  await fs.writeJson(path.join(pluginDir, 'tsconfig.json'), tsConfig, { spaces: 2 });
+  await fs.writeJson(path.join(pluginDir, 'client', 'tsconfig.json'), clientTsConfig, { spaces: 2 });
   
-  // 创建插件主入口文件 app/index.ts
-  const appContent = `import {
+  // 创建服务端入口文件 src/index.ts
+  const indexContent = `import {
   useLogger,
   useContext,
   onDispose,
@@ -201,9 +217,10 @@ const logger = useLogger();
 
 // 注册客户端入口（如果有客户端代码）
 useContext('web', (web) => {
-  const dispose = web.addEntry(
-    path.resolve(import.meta.dirname, '../client/index.tsx')
-  );
+  const dispose = web.addEntry({
+    production: path.resolve(import.meta.dirname, '../dist/index.js'),
+    development: path.resolve(import.meta.dirname, '../client/index.tsx')
+  });
   return dispose;
 });
 
@@ -215,7 +232,7 @@ onDispose(() => {
 logger.info('${capitalizedName} 插件已加载');
 `;
   
-  await fs.writeFile(path.join(pluginDir, 'app', 'index.ts'), appContent);
+  await fs.writeFile(path.join(pluginDir, 'src', 'index.ts'), indexContent);
   
   // 创建客户端入口文件 client/index.tsx
   const clientContent = `import { addPage } from '@zhin.js/client';
@@ -234,7 +251,7 @@ export { ${capitalizedName}Page };
 `;
   
   await fs.writeFile(path.join(pluginDir, 'client', 'index.tsx'), clientContent);
-  
+
   // 创建客户端页面组件
   await fs.ensureDir(path.join(pluginDir, 'client', 'pages'));
   const pageContent = `import { useEffect } from 'react';
@@ -335,7 +352,7 @@ dist/
   }
 }
 
-async function addPluginToApp(pluginName: string) {
+async function addPluginToApp(pluginName: string, isOfficial?: boolean) {
   try {
     const rootPackageJsonPath = path.resolve(process.cwd(), 'package.json');
     
@@ -346,7 +363,7 @@ async function addPluginToApp(pluginName: string) {
     }
     
     const packageJson = await fs.readJson(rootPackageJsonPath);
-    const packageName = `@zhin.js/${pluginName}`;
+    const packageName = isOfficial ? `@zhin.js/${pluginName}` : `zhin.js-${pluginName}`;
     
     // 初始化 dependencies
     if (!packageJson.dependencies) {

package/src/commands/pub.ts

@@ -0,0 +1,176 @@
+import { Command } from 'commander';
+import { logger } from '../utils/logger.js';
+import fs from 'fs-extra';
+import path from 'path';
+import inquirer from 'inquirer';
+import { execSync } from 'node:child_process';
+
+interface PublishOptions {
+  tag?: string;
+  access?: 'public' | 'restricted';
+  registry?: string;
+  dryRun?: boolean;
+  skipBuild?: boolean;
+}
+
+export const pubCommand = new Command('pub')
+  .description('发布插件到 npm')
+  .argument('[plugin-name]', '插件名称（如: my-plugin）')
+  .option('--tag <tag>', '发布标签', 'latest')
+  .option('--access <access>', '访问级别 (public|restricted)', 'public')
+  .option('--registry <url>', '自定义 npm registry')
+  .option('--dry-run', '试运行，不实际发布', false)
+  .option('--skip-build', '跳过构建步骤', false)
+  .action(async (pluginName: string, options: PublishOptions) => {
+    try {
+      const pluginsDir = path.resolve(process.cwd(), 'plugins');
+      
+      // 检查 plugins 目录是否存在
+      if (!fs.existsSync(pluginsDir)) {
+        logger.error('未找到 plugins 目录，请在项目根目录运行此命令');
+        process.exit(1);
+      }
+
+      // 获取所有插件
+      const availablePlugins = fs.readdirSync(pluginsDir)
+        .filter(name => {
+          const pluginPath = path.join(pluginsDir, name);
+          return fs.statSync(pluginPath).isDirectory() && 
+                 fs.existsSync(path.join(pluginPath, 'package.json'));
+        });
+
+      if (availablePlugins.length === 0) {
+        logger.error('未找到可发布的插件');
+        process.exit(1);
+      }
+
+      // 如果没有指定插件名，让用户选择
+      let selectedPlugin = pluginName;
+      if (!selectedPlugin) {
+        if (availablePlugins.length === 1) {
+          selectedPlugin = availablePlugins[0];
+          logger.info(`自动选择插件: ${selectedPlugin}`);
+        } else {
+          const { plugin } = await inquirer.prompt([
+            {
+              type: 'list',
+              name: 'plugin',
+              message: '请选择要发布的插件:',
+              choices: availablePlugins
+            }
+          ]);
+          selectedPlugin = plugin;
+        }
+      }
+
+      // 验证插件是否存在
+      const pluginDir = path.join(pluginsDir, selectedPlugin);
+      if (!fs.existsSync(pluginDir)) {
+        logger.error(`插件不存在: ${selectedPlugin}`);
+        logger.log(`可用插件: ${availablePlugins.join(', ')}`);
+        process.exit(1);
+      }
+
+      const packageJsonPath = path.join(pluginDir, 'package.json');
+      if (!fs.existsSync(packageJsonPath)) {
+        logger.error(`未找到 package.json: ${packageJsonPath}`);
+        process.exit(1);
+      }
+
+      // 读取 package.json
+      const packageJson = await fs.readJson(packageJsonPath);
+      const packageName = packageJson.name;
+      const version = packageJson.version;
+
+      logger.info(`准备发布插件: ${packageName}@${version}`);
+      logger.log('');
+
+      // 确认发布
+      if (!options.dryRun) {
+        const { confirm } = await inquirer.prompt([
+          {
+            type: 'confirm',
+            name: 'confirm',
+            message: `确认发布 ${packageName}@${version} 到 npm？`,
+            default: false
+          }
+        ]);
+
+        if (!confirm) {
+          logger.warn('已取消发布');
+          process.exit(0);
+        }
+      }
+
+      // 构建插件
+      if (!options.skipBuild) {
+        logger.info('正在构建插件...');
+        try {
+          execSync('pnpm build', {
+            cwd: pluginDir,
+            stdio: 'inherit'
+          });
+          logger.success('✓ 构建完成');
+        } catch (error) {
+          logger.error('构建失败');
+          throw error;
+        }
+      }
+
+      // 构建 npm publish 命令
+      const publishArgs = ['publish'];
+      
+      if (options.access) {
+        publishArgs.push('--access', options.access);
+      }
+      
+      if (options.tag) {
+        publishArgs.push('--tag', options.tag);
+      }
+      
+      if (options.registry) {
+        publishArgs.push('--registry', options.registry);
+      }
+      
+      if (options.dryRun) {
+        publishArgs.push('--dry-run');
+      }
+
+      // 总是添加 --no-git-checks（因为 plugins 可能不是 git 根目录）
+      publishArgs.push('--no-git-checks');
+
+      // 发布插件
+      logger.info(`正在发布${options.dryRun ? '（试运行）' : ''}...`);
+      logger.log(`命令: pnpm ${publishArgs.join(' ')}`);
+      logger.log('');
+
+      try {
+        execSync(`pnpm ${publishArgs.join(' ')}`, {
+          cwd: pluginDir,
+          stdio: 'inherit'
+        });
+
+        if (options.dryRun) {
+          logger.success('✓ 试运行完成');
+          logger.log('');
+          logger.log('💡 提示: 移除 --dry-run 参数以实际发布');
+        } else {
+          logger.success(`✓ ${packageName}@${version} 发布成功！`);
+          logger.log('');
+          logger.log('📦 安装命令:');
+          logger.log(`  pnpm add ${packageName}`);
+          logger.log('');
+          logger.log('🔗 npm 链接:');
+          logger.log(`  https://www.npmjs.com/package/${packageName}`);
+        }
+      } catch (error) {
+        logger.error('发布失败');
+        throw error;
+      }
+
+    } catch (error: any) {
+      logger.error(`发布失败: ${error.message}`);
+      process.exit(1);
+    }
+  });
+