@zhin.js/cli 1.0.7 → 1.0.8

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']
-  };
+    "include": ["src/**/*"],
+    "exclude": ["lib", "node_modules", "client"]
+  } 
+  ;
   
-  await fs.writeJson(path.join(pluginDir, 'tsconfig.app.json'), tsConfigApp, { spaces: 2 });
-  
-  // 创建 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';
@@ -235,20 +252,6 @@ export { ${capitalizedName}Page };
   
   await fs.writeFile(path.join(pluginDir, 'client', 'index.tsx'), clientContent);
 
-  // 创建 client/tsconfig.json
-  const clientTsConfig = {
-    extends: '@zhin.js/console/browser.tsconfig.json',
-    compilerOptions: {
-      target: 'ES2022',
-      module: 'ESNext',
-      moduleResolution: 'bundler',
-      jsx: 'react-jsx',
-      baseUrl: '.'
-    }
-  };
-  
-  await fs.writeJson(path.join(pluginDir, 'client', 'tsconfig.json'), clientTsConfig, { spaces: 2 });
-  
   // 创建客户端页面组件
   await fs.ensureDir(path.join(pluginDir, 'client', 'pages'));
   const pageContent = `import { useEffect } from 'react';
@@ -349,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');
     
@@ -360,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);
+    }
+  });
+

package/src/commands/search.ts

@@ -0,0 +1,243 @@
+import { Command } from 'commander';
+import { logger } from '../utils/logger.js';
+import { execSync } from 'node:child_process';
+
+interface SearchOptions {
+  category?: string;
+  limit?: number;
+  official?: boolean;
+}
+
+export const searchCommand = new Command('search')
+  .description('搜索 Zhin.js 插件')
+  .argument('[keyword]', '搜索关键词')
+  .option('-c, --category <category>', '按分类搜索 (utility|service|game|adapter|admin|ai)')
+  .option('-l, --limit <number>', '限制结果数量', '20')
+  .option('--official', '仅显示官方插件', false)
+  .action(async (keyword: string, options: SearchOptions) => {
+    try {
+      logger.info('正在搜索插件...');
+      logger.log('');
+
+      // 构建搜索查询
+      let searchQuery = 'zhin';
+      
+      if (options.official) {
+        searchQuery = '@zhin.js';
+      } else if (keyword) {
+        searchQuery = `zhin.js ${keyword} `;
+      } else {
+        searchQuery = 'zhin.js plugin';
+      }
+
+      // 使用 npm search
+      const cmd = `npm search ${searchQuery} --json`;
+      
+      try {
+        const output = execSync(cmd, {
+          encoding: 'utf-8',
+          maxBuffer: 10 * 1024 * 1024, // 10MB
+          stdio: ['pipe', 'pipe', 'ignore'] // 忽略 stderr
+        });
+
+        const results = JSON.parse(output);
+        
+        // 过滤结果
+        let filteredResults = results.filter((pkg: any) => {
+          // 必须包含 zhin 关键词
+          const keywords = pkg.keywords || [];
+          const hasZhin = keywords.includes('zhin') || 
+                         keywords.includes('plugin') ||
+                         pkg.name.startsWith('@zhin.js/') ||
+                         pkg.name.startsWith('zhin.js-');
+          
+          if (!hasZhin) return false;
+
+          // 按分类过滤
+          if (options.category) {
+            const category = pkg.keywords?.find((k: string) => 
+              k.includes(options.category!)
+            );
+            if (!category) return false;
+          }
+
+          // 按关键词过滤
+          if (keyword) {
+            const searchIn = [
+              pkg.name,
+              pkg.description || '',
+              ...(pkg.keywords || [])
+            ].join(' ').toLowerCase();
+            
+            return searchIn.includes(keyword.toLowerCase());
+          }
+
+          return true;
+        });
+
+        // 限制结果数量
+        const limit = parseInt(String(options.limit) || '20');
+        if (filteredResults.length > limit) {
+          filteredResults = filteredResults.slice(0, limit);
+        }
+
+        // 显示结果
+        if (filteredResults.length === 0) {
+          logger.warn('未找到匹配的插件');
+          logger.log('');
+          logger.log('💡 提示：');
+          logger.log('  - 尝试使用不同的关键词');
+          logger.log('  - 访问插件市场: https://zhin.pages.dev/plugins');
+          logger.log('  - 在 GitHub 搜索: https://github.com/topics/zhin.js');
+          return;
+        }
+
+        logger.success(`找到 ${filteredResults.length} 个插件：`);
+        logger.log('');
+
+        // 按下载量排序
+        filteredResults.sort((a: any, b: any) => {
+          const aDownloads = parseInt(a.downloads || '0');
+          const bDownloads = parseInt(b.downloads || '0');
+          return bDownloads - aDownloads;
+        });
+
+        // 显示插件列表
+        filteredResults.forEach((pkg: any, index: number) => {
+          const name = pkg.name;
+          const version = pkg.version;
+          const description = pkg.description || '无描述';
+          const author = pkg.publisher?.username || '未知';
+          const date = pkg.date ? new Date(pkg.date).toLocaleDateString('zh-CN') : '未知';
+          
+          // 判断插件类型
+          let badge = '';
+          if (name.startsWith('@zhin.js/')) {
+            badge = '✨ [官方]';
+          } else if (name.startsWith('zhin.js-')) {
+            badge = '📦 [社区]';
+          }
+
+          logger.log(`${index + 1}. ${badge} ${name}@${version}`);
+          logger.log(`   ${description}`);
+          logger.log(`   作者: ${author} | 更新: ${date}`);
+          
+          // 显示安装命令
+          logger.log(`   安装: zhin install ${name}`);
+          logger.log('');
+        });
+
+        logger.log('💡 提示：');
+        logger.log('  - 使用 zhin info <package> 查看插件详情');
+        logger.log('  - 使用 zhin install <package> 安装插件');
+        logger.log('  - 访问 https://zhin.pages.dev/plugins 查看完整列表');
+
+      } catch (error) {
+        logger.error('搜索失败，请检查网络连接');
+        logger.log('');
+        logger.log('💡 替代方案：');
+        logger.log('  - 访问 npm: https://www.npmjs.com/search?q=zhin.js');
+        logger.log('  - 访问 GitHub: https://github.com/topics/zhin.js');
+        throw error;
+      }
+
+    } catch (error: any) {
+      logger.error(`搜索插件失败: ${error.message}`);
+      process.exit(1);
+    }
+  });
+
+export const infoCommand = new Command('info')
+  .description('查看插件详细信息')
+  .argument('<package>', '插件包名')
+  .action(async (packageName: string) => {
+    try {
+      logger.info(`正在获取 ${packageName} 的信息...`);
+      logger.log('');
+
+      const cmd = `npm view ${packageName} --json`;
+      
+      try {
+        const output = execSync(cmd, {
+          encoding: 'utf-8',
+          stdio: ['pipe', 'pipe', 'ignore']
+        });
+
+        const info = JSON.parse(output);
+        
+        // 显示插件信息
+        logger.success('插件信息：');
+        logger.log('');
+        
+        logger.log(`📦 名称: ${info.name}`);
+        logger.log(`📝 版本: ${info.version}`);
+        logger.log(`📄 描述: ${info.description || '无'}`);
+        logger.log(`👤 作者: ${info.author?.name || info.maintainers?.[0]?.name || '未知'}`);
+        logger.log(`📅 发布时间: ${new Date(info.time?.modified || info.time?.created).toLocaleDateString('zh-CN')}`);
+        
+        if (info.keywords?.length > 0) {
+          logger.log(`🏷️  标签: ${info.keywords.join(', ')}`);
+        }
+        
+        if (info.homepage) {
+          logger.log(`🏠 主页: ${info.homepage}`);
+        }
+        
+        if (info.repository?.url) {
+          logger.log(`📂 仓库: ${info.repository.url.replace(/^git\+/, '').replace(/\.git$/, '')}`);
+        }
+        
+        if (info.bugs?.url) {
+          logger.log(`🐛 问题: ${info.bugs.url}`);
+        }
+        
+        if (info.license) {
+          logger.log(`⚖️  许可: ${info.license}`);
+        }
+
+        // 显示依赖
+        if (info.peerDependencies) {
+          logger.log('');
+          logger.log('🔗 对等依赖:');
+          Object.entries(info.peerDependencies).forEach(([dep, ver]) => {
+            logger.log(`   ${dep}: ${ver}`);
+          });
+        }
+
+        // 显示安装命令
+        logger.log('');
+        logger.log('📥 安装命令:');
+        logger.log(`   zhin install ${info.name}`);
+        logger.log(`   # 或`);
+        logger.log(`   pnpm add ${info.name}`);
+
+        // Zhin 特定信息
+        if (info.zhin) {
+          logger.log('');
+          logger.log('🎯 Zhin 信息:');
+          if (info.zhin.displayName) {
+            logger.log(`   显示名称: ${info.zhin.displayName}`);
+          }
+          if (info.zhin.category) {
+            logger.log(`   分类: ${info.zhin.category}`);
+          }
+          if (info.zhin.features?.length > 0) {
+            logger.log(`   功能: ${info.zhin.features.join(', ')}`);
+          }
+        }
+
+      } catch (error) {
+        logger.error(`未找到插件: ${packageName}`);
+        logger.log('');
+        logger.log('💡 提示：');
+        logger.log('  - 检查插件名称是否正确');
+        logger.log('  - 使用 zhin search 搜索插件');
+        throw error;
+      }
+
+    } catch (error: any) {
+      logger.error(`获取插件信息失败: ${error.message}`);
+      process.exit(1);
+    }
+  });
+