@coze-arch/cli 0.0.6-alpha.43776c → 0.0.6-alpha.dd6b66

package/lib/__templates__/taro/eslint.config.mjs

@@ -123,14 +123,64 @@ export default [
     },
   },
   {
-    files: ['src/pages/intro/index.tsx'],
+    files: ['src/pages/index/index.tsx'],
     rules: {
       'no-restricted-syntax': [
         'error',
         {
           selector: 'JSXText[value=/应用开发中/]',
           message:
-            '工程规范：检测到首页 (src/pages/intro/index) 仍为默认占位页面，这会导致用户无法进入新增页面，请根据用户需求开发实际的首页功能 and 界面。如果已经开发了新的首页，也需要删除旧首页，并更新 src/app.config.ts 文件',
+            '工程规范：检测到首页 (src/pages/index/index.tsx) 仍为默认占位页面，这会导致用户无法进入新增页面，请根据用户需求开发实际的首页功能 and 界面。如果已经开发了新的首页，也需要删除旧首页，并更新 src/app.config.ts 文件',
+        },
+      ],
+    },
+  },
+  {
+    files: ['src/pages/**/*.tsx'],
+    rules: {
+      'no-restricted-syntax': [
+        'error',
+        {
+          selector:
+            "ImportDeclaration[source.value='@tarojs/components'] ImportSpecifier[imported.name='Button']",
+          message:
+            "组件规范：Button 优先使用 '@/components/ui/button'，不要在页面中直接使用 '@tarojs/components' 的 Button。",
+        },
+        {
+          selector:
+            "ImportDeclaration[source.value='@tarojs/components'] ImportSpecifier[imported.name='Input']",
+          message:
+            "组件规范：Input 优先使用 '@/components/ui/input'，不要在页面中直接使用 '@tarojs/components' 的 Input。",
+        },
+        {
+          selector:
+            "ImportDeclaration[source.value='@tarojs/components'] ImportSpecifier[imported.name='Textarea']",
+          message:
+            "组件规范：Textarea 优先使用 '@/components/ui/textarea'，不要在页面中直接使用 '@tarojs/components' 的 Textarea。",
+        },
+        {
+          selector:
+            "ImportDeclaration[source.value='@tarojs/components'] ImportSpecifier[imported.name='Label']",
+          message:
+            "组件规范：Label 优先使用 '@/components/ui/label'，不要在页面中直接使用 '@tarojs/components' 的 Label。",
+        },
+        {
+          selector:
+            "ImportDeclaration[source.value='@tarojs/components'] ImportSpecifier[imported.name='Switch']",
+          message:
+            "组件规范：Switch 优先使用 '@/components/ui/switch'，不要在页面中直接使用 '@tarojs/components' 的 Switch。",
+        },
+        {
+          selector:
+            "ImportDeclaration[source.value='@tarojs/components'] ImportSpecifier[imported.name='Slider']",
+          message:
+            "组件规范：Slider 优先使用 '@/components/ui/slider'，不要在页面中直接使用 '@tarojs/components' 的 Slider。",
+        },
+        {
+          selector:
+            "ImportDeclaration[source.value='@tarojs/components'] ImportSpecifier[imported.name='Progress']",
+          message:
+            "组件规范：Progress 优先使用 '@/components/ui/progress'，不要在页面中直接使用 '@tarojs/components' 的 Progress。",
         },
       ],
     },

package/lib/cli.js

@@ -2106,7 +2106,7 @@ const EventBuilder = {
 };
 
 var name = "@coze-arch/cli";
-var version = "0.0.6-alpha.43776c";
+var version = "0.0.6-alpha.dd6b66";
 var description = "coze coding devtools cli";
 var license = "MIT";
 var author = "fanwenjie.fe@bytedance.com";
@@ -3946,9 +3946,10 @@ const log$4 = debug('coze:routes:nuxt');
 /**
  * Convert Nuxt file path to route path
  * Examples:
- * - app/pages/index.vue -> /
  * - pages/index.vue -> /
- * - app/pages/blog/index.vue -> /blog
+ * - app/pages/index.vue -> /
+ * - src/pages/index.vue -> /
+ * - src/app/pages/index.vue -> /
  * - pages/blog/[id].vue -> /blog/[id]
  * - server/api/users.ts -> /api/users
  * - server/routes/webhook.ts -> /webhook
@@ -3960,10 +3961,12 @@ const nuxtFilePathToRoute = (
   let route;
 
   if (type === 'page') {
-    // Remove pages prefix (supports both app/pages/ and pages/) and .vue extension
+    // Remove pages prefix (supports all variations) and .vue extension
     route = filePath
-      .replace(/^app\/pages\//, '')
-      .replace(/^pages\//, '')
+      .replace(/^src\/app\/pages\//, '') // src/app/pages/
+      .replace(/^src\/pages\//, '') // src/pages/
+      .replace(/^app\/pages\//, '') // app/pages/
+      .replace(/^pages\//, '') // pages/
       .replace(/\.vue$/, '')
       .replace(/\/index$/, ''); // Remove trailing /index
 
@@ -3972,14 +3975,16 @@ const nuxtFilePathToRoute = (
       return '/';
     }
   } else {
-    // API routes
-    if (filePath.startsWith('server/api/')) {
+    // API routes - support both server/ and src/server/
+    if (filePath.includes('/api/')) {
       route = `/api/${filePath
+        .replace(/^src\/server\/api\//, '')
         .replace(/^server\/api\//, '')
         .replace(/\.(ts|js)$/, '')}`;
     } else {
-      // server/routes
+      // server/routes - support both server/ and src/server/
       route = `/${filePath
+        .replace(/^src\/server\/routes\//, '')
         .replace(/^server\/routes\//, '')
         .replace(/\.(ts|js)$/, '')}`;
     }
@@ -4031,13 +4036,23 @@ const extractParams$1 = (routePath) => {
 /**
  * Scan Nuxt routes from pages and server directories
  *
- * Scans for:
- * - app/pages/**\/*.vue OR pages/**\/*.vue - Page routes (both structures supported)
- * - server/api/**\/*.{ts,js} - API routes
- * - server/routes/**\/*.{ts,js} - Server routes
+ * Supports multiple directory structures:
+ * - **Page routes**:
+ *   - pages/**\/*.vue (default)
+ *   - app/pages/**\/*.vue (Nuxt 3 app directory)
+ *   - src/pages/**\/*.vue (srcDir: 'src/')
+ *   - src/app/pages/**\/*.vue (srcDir: 'src/' + app directory)
+ *
+ * - **API routes**:
+ *   - server/api/**\/*.{ts,js} (default)
+ *   - src/server/api/**\/*.{ts,js} (srcDir: 'src/')
+ *
+ * - **Server routes**:
+ *   - server/routes/**\/*.{ts,js} (default)
+ *   - src/server/routes/**\/*.{ts,js} (srcDir: 'src/')
  *
  * Excludes:
- * - app/layouts/, layouts/ - Layout components (NOT routes)
+ * - layouts/ directories - Layout components (NOT routes)
  * - app.vue, error.vue - Special files (NOT regular routes)
  *
  * @param cwd - Current working directory
@@ -4047,24 +4062,35 @@ const scanNuxtRoutes = async (cwd) => {
   log$4('Scanning Nuxt routes in:', cwd);
   const routes = [];
 
-  // Scan page routes - support both app/pages/ and pages/ directories
-  const pageFiles = await fastGlob.glob(['{app/,}pages/**/*.vue'], {
-    cwd,
-    ignore: [
-      '**/node_modules/**',
-      '**/.nuxt/**',
-      '**/dist/**',
-      '**/.output/**',
-      // Exclude layouts directory (not routes)
-      '**/layouts/**',
-      'app/layouts/**',
-      // Exclude special files
-      'app.vue',
-      'error.vue',
-    ],
-    onlyFiles: true,
-    followSymbolicLinks: false,
-  });
+  // Scan page routes - support multiple directory structures:
+  // - pages/ (default)
+  // - app/pages/ (Nuxt 3 app directory)
+  // - src/pages/ (srcDir: 'src/')
+  // - src/app/pages/ (srcDir: 'src/' + app directory)
+  const pageFiles = await fastGlob.glob(
+    ['{pages,app/pages,src/pages,src/app/pages}/**/*.vue'],
+    {
+      cwd,
+      ignore: [
+        '**/node_modules/**',
+        '**/.nuxt/**',
+        '**/dist/**',
+        '**/.output/**',
+        // Exclude layouts directory (not routes)
+        '**/layouts/**',
+        'app/layouts/**',
+        'src/layouts/**',
+        'src/app/layouts/**',
+        // Exclude special files
+        'app.vue',
+        'error.vue',
+        'src/app.vue',
+        'src/error.vue',
+      ],
+      onlyFiles: true,
+      followSymbolicLinks: false,
+    },
+  );
 
   log$4('Found %d page files', pageFiles.length);
 
@@ -4086,8 +4112,8 @@ const scanNuxtRoutes = async (cwd) => {
     }),
   );
 
-  // Scan API routes
-  const apiFiles = await fastGlob.glob('server/api/**/*.{ts,js}', {
+  // Scan API routes - support both server/ and src/server/
+  const apiFiles = await fastGlob.glob('{server,src/server}/api/**/*.{ts,js}', {
     cwd,
     ignore: ['**/node_modules/**', '**/dist/**', '**/.output/**'],
     onlyFiles: true,
@@ -4114,13 +4140,16 @@ const scanNuxtRoutes = async (cwd) => {
     }),
   );
 
-  // Scan server routes
-  const serverRouteFiles = await fastGlob.glob('server/routes/**/*.{ts,js}', {
-    cwd,
-    ignore: ['**/node_modules/**', '**/dist/**', '**/.output/**'],
-    onlyFiles: true,
-    followSymbolicLinks: false,
-  });
+  // Scan server routes - support both server/ and src/server/
+  const serverRouteFiles = await fastGlob.glob(
+    '{server,src/server}/routes/**/*.{ts,js}',
+    {
+      cwd,
+      ignore: ['**/node_modules/**', '**/dist/**', '**/.output/**'],
+      onlyFiles: true,
+      followSymbolicLinks: false,
+    },
+  );
 
   log$4('Found %d server route files', serverRouteFiles.length);
 
@@ -4226,22 +4255,18 @@ const getRouteType = (filePath) => {
 };
 
 /**
- * Scan Next.js routes from src/app directory
+ * Scan Next.js App Router routes from app/ or src/app/ directory
  *
  * Scans for:
  * - page.tsx/jsx/ts/js - Page routes
  * - route.ts/js - API routes
  *
  * Note: layout.tsx, loading.tsx, error.tsx are NOT routes, they are UI components
- *
- * @param cwd - Current working directory
- * @returns List of detected routes
  */
-const scanNextjsRoutes = async (cwd) => {
-  log$3('Scanning Next.js routes in:', cwd);
+const scanAppRouter = async (cwd) => {
+  log$3('Scanning App Router routes');
 
-  // Scan for page and route files only (NOT layout, loading, error, etc.)
-  const files = await fastGlob.glob('src/app/**/{page,route}.{tsx,ts,jsx,js}', {
+  const files = await fastGlob.glob('{app,src/app}/**/{page,route}.{tsx,ts,jsx,js}', {
     cwd,
     ignore: [
       '**/node_modules/**',
@@ -4254,10 +4279,9 @@ const scanNextjsRoutes = async (cwd) => {
     followSymbolicLinks: false,
   });
 
-  log$3('Found %d files', files.length);
+  log$3('Found %d App Router files', files.length);
 
   return files.map(file => {
-    log$3('Processing file:', file);
     const routePath = filePathToRoute(file);
     const isDynamic = routePath.includes('[');
     const params = extractParams(routePath);
@@ -4274,6 +4298,125 @@ const scanNextjsRoutes = async (cwd) => {
   });
 };
 
+/**
+ * Convert Pages Router file path to route path
+ * Examples:
+ * - pages/index.tsx -> /
+ * - src/pages/index.tsx -> /
+ * - pages/blog/[id].tsx -> /blog/[id]
+ * - pages/api/users.ts -> /api/users
+ */
+const pagesFilePathToRoute = (filePath) => {
+  // Remove pages prefix and file extension
+  let route = filePath
+    .replace(/^src\/pages\//, '')
+    .replace(/^pages\//, '')
+    .replace(/\.(tsx?|jsx?)$/, '')
+    .replace(/\/index$/, ''); // pages/blog/index.tsx -> /blog
+
+  // Handle root index
+  if (route === 'index' || route === '') {
+    return '/';
+  }
+
+  // Ensure leading slash
+  if (!route.startsWith('/')) {
+    route = `/${route}`;
+  }
+
+  return route;
+};
+
+/**
+ * Determine if a Pages Router file is an API route
+ */
+const isPagesApiRoute = (filePath) =>
+  filePath.includes('/api/') || !!filePath.match(/\/(pages|src\/pages)\/api\//);
+
+/**
+ * Scan Next.js Pages Router routes from pages/ or src/pages/ directory
+ *
+ * Scans for:
+ * - pages/**\/*.tsx/jsx/ts/js - Page routes
+ * - pages/api/**\/*.ts/js - API routes
+ *
+ * Note: _app.tsx, _document.tsx, _error.tsx are special files, NOT routes
+ */
+const scanPagesRouter = async (cwd) => {
+  log$3('Scanning Pages Router routes');
+
+  const files = await fastGlob.glob('{pages,src/pages}/**/*.{tsx,ts,jsx,js}', {
+    cwd,
+    ignore: [
+      '**/node_modules/**',
+      '**/.next/**',
+      '**/dist/**',
+      '**/build/**',
+      '**/.turbo/**',
+      // Exclude special Next.js files (these are NOT routes)
+      '**/_app.{tsx,ts,jsx,js}',
+      '**/_document.{tsx,ts,jsx,js}',
+      '**/_error.{tsx,ts,jsx,js}',
+      '**/middleware.{ts,js}',
+    ],
+    onlyFiles: true,
+    followSymbolicLinks: false,
+  });
+
+  log$3('Found %d Pages Router files', files.length);
+
+  return files.map(file => {
+    const routePath = pagesFilePathToRoute(file);
+    const isDynamic = routePath.includes('[');
+    const params = extractParams(routePath);
+
+    return {
+      path: normalizeRoutePath(routePath),
+      rawPath: routePath,
+      dynamic: isDynamic,
+      params,
+      type: isPagesApiRoute(file) ? 'api' : 'page',
+      file,
+      framework: 'nextjs',
+    };
+  });
+};
+
+/**
+ * Scan Next.js routes - supports both App Router and Pages Router
+ *
+ * Next.js supports two routing systems that can coexist:
+ * 1. **App Router** (Next.js 13+): app/ or src/app/
+ *    - page.tsx/jsx/ts/js - Page routes
+ *    - route.ts/js - API routes
+ *
+ * 2. **Pages Router** (Traditional): pages/ or src/pages/
+ *    - **\/*.tsx/jsx/ts/js - Page routes
+ *    - api/**\/*.ts/js - API routes
+ *
+ * @param cwd - Current working directory
+ * @returns List of detected routes from both routing systems
+ */
+const scanNextjsRoutes = async (cwd) => {
+  log$3('Scanning Next.js routes in:', cwd);
+
+  // Scan both routing systems in parallel
+  const [appRoutes, pagesRoutes] = await Promise.all([
+    scanAppRouter(cwd),
+    scanPagesRouter(cwd),
+  ]);
+
+  const totalRoutes = [...appRoutes, ...pagesRoutes];
+  log$3(
+    'Total routes found: %d (App Router: %d, Pages Router: %d)',
+    totalRoutes.length,
+    appRoutes.length,
+    pagesRoutes.length,
+  );
+
+  return totalRoutes;
+};
+
 // ABOUTME: Route manifest file writer
 // ABOUTME: Writes route data to JSON file with proper formatting and directory creation
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coze-arch/cli",
-  "version": "0.0.6-alpha.43776c",
+  "version": "0.0.6-alpha.dd6b66",
   "private": false,
   "description": "coze coding devtools cli",
   "license": "MIT",