@lark-apaas/miaoda-cli 0.1.16-alpha.ab80f52 → 0.1.16-alpha.c0b0ae2

package/dist/utils/migrate-rule.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.applyMigrateRules = applyMigrateRules;
 exports.rewriteViteConfigForFullstack = rewriteViteConfigForFullstack;
+exports.rewriteAliasSrcPaths = rewriteAliasSrcPaths;
 const node_fs_1 = __importDefault(require("node:fs"));
 const node_path_1 = __importDefault(require("node:path"));
 const sync_rule_1 = require("./sync-rule");
@@ -182,75 +183,125 @@ function applyCodemodViteConfigFullstack(rule, opts) {
         return { rule, action: 'skipped', path: rel };
     }
     const before = node_fs_1.default.readFileSync(dest, 'utf-8');
-    const { text, changed, alreadyDone } = rewriteViteConfigForFullstack(before);
-    if (alreadyDone) {
-        (0, logger_1.log)(logPrefix, `  ○ ${rel} (fullstack: true already present)`);
+    const { text, changed, alreadyDone, aliasRewriteCount } = rewriteViteConfigForFullstack(before);
+    if (alreadyDone && aliasRewriteCount === 0) {
+        (0, logger_1.log)(logPrefix, `  ○ ${rel} (fullstack: true already present, no alias to rewrite)`);
         return { rule, action: 'noop', path: rel };
     }
-    if (!changed) {
+    if (!changed && aliasRewriteCount === 0) {
         (0, logger_1.log)(logPrefix, `  ⚠ ${rel} (defineConfig call not found; please add { fullstack: true } manually)`);
         return { rule, action: 'noop', path: rel, detail: 'defineConfig call not found' };
     }
     node_fs_1.default.writeFileSync(dest, text);
-    (0, logger_1.log)(logPrefix, `  ✓ ${rel} (added { fullstack: true } to defineConfig)`);
-    return { rule, action: 'patched', path: rel };
+    const parts = [];
+    if (changed && !alreadyDone)
+        parts.push('added { fullstack: true }');
+    if (aliasRewriteCount > 0)
+        parts.push(`rewrote ${aliasRewriteCount.toString()} alias path(s) src → client/src`);
+    (0, logger_1.log)(logPrefix, `  ✓ ${rel} (${parts.join(', ')})`);
+    return { rule, action: 'patched', path: rel, detail: parts.join('; ') };
 }
 /**
- * 给 vite.config.ts 的 `defineConfig(...)` 调用加上 `{ fullstack: true }` 第二参。
+ * 给 vite.config.ts 的 `defineConfig(...)` 调用加上 `{ fullstack: true }` 第二参，
+ * 顺便把 alias 字符串里 `src` 起头的路径重写到 `client/src`。
  *
- * 支持的形态：
+ * 1) defineConfig 改写支持的形态：
  *   defineConfig({ ... })             → defineConfig({ ... }, { fullstack: true })
  *   defineConfig({ ... }, { ... })    → 已有第二参，把 fullstack: true 注入对象字面量
  *   defineConfig()                    → defineConfig({}, { fullstack: true })
+ *   跨多行 + 嵌套 arrow function / 字符串 / 模板字符串都要保留，所以用括号匹配而非正则。
+ *   已经含 `fullstack: true` 字面量则跳过（视为已迁移）。
  *
- * 跨多行 + 嵌套 arrow function / 字符串 / 模板字符串都要保留，所以用括号匹配而非正则。
- * 已经含 `fullstack: true` 字面量则跳过（视为已迁移）。
+ * 2) alias 路径重写：vite-react 时代 user 业务代码在 `src/`，迁移后搬到 `client/src/`，
+ *    vite.config 里的 alias（典型如 `'@': path.resolve(__dirname, 'src')`）必须同步改：
+ *      path.resolve(<args>, 'src')        → 'src' 替换为 'client/src'
+ *      path.resolve(<args>, 'src/<rest>') → 同上
+ *      path.join(<args>, 'src')           → 同上
+ *      './src' / './src/<rest>' 字符串    → './client/src' / './client/src/<rest>'
+ *    边界：仅匹配整段 'src' 起头（避免 'sub/src' 误改），保留单/双引号原样。
  */
 function rewriteViteConfigForFullstack(source) {
+    // ── Step 1: 先处理 alias 路径（在 defineConfig 改写之前做，避免位置串行扰乱） ──
+    const { text: afterAlias, count: aliasRewriteCount } = rewriteAliasSrcPaths(source);
+    // ── Step 2: 加 fullstack: true ──
     const callRe = /defineConfig\s*\(/g;
-    const m = callRe.exec(source);
+    const m = callRe.exec(afterAlias);
     if (m === null) {
-        return { text: source, changed: false, alreadyDone: false };
+        return { text: afterAlias, changed: false, alreadyDone: false, aliasRewriteCount };
     }
     const openIdx = m.index + m[0].length - 1; // 指向 '('
-    const closeIdx = findMatchingParen(source, openIdx);
+    const closeIdx = findMatchingParen(afterAlias, openIdx);
     if (closeIdx < 0) {
-        return { text: source, changed: false, alreadyDone: false };
+        return { text: afterAlias, changed: false, alreadyDone: false, aliasRewriteCount };
     }
-    const argsRaw = source.slice(openIdx + 1, closeIdx);
+    const argsRaw = afterAlias.slice(openIdx + 1, closeIdx);
     if (/fullstack\s*:\s*true/.test(argsRaw)) {
-        return { text: source, changed: false, alreadyDone: true };
+        return { text: afterAlias, changed: false, alreadyDone: true, aliasRewriteCount };
     }
-    const { firstArgEnd, secondArgRange } = splitFirstTwoArgs(source, openIdx + 1, closeIdx);
+    const { firstArgEnd, secondArgRange } = splitFirstTwoArgs(afterAlias, openIdx + 1, closeIdx);
     if (secondArgRange === null) {
         // 单参 / 无参：在第一参之后插 ", { fullstack: true }"
         const insertAt = firstArgEnd ?? openIdx + 1;
-        const head = source.slice(0, insertAt);
-        const tail = source.slice(insertAt, closeIdx);
+        const head = afterAlias.slice(0, insertAt);
+        const tail = afterAlias.slice(insertAt, closeIdx);
         // 第一参是否非空（去空白）
-        const arg1 = source.slice(openIdx + 1, insertAt).trim();
+        const arg1 = afterAlias.slice(openIdx + 1, insertAt).trim();
         const sep = arg1.length === 0 ? '{}, { fullstack: true }' : ', { fullstack: true }';
         return {
-            text: head + (arg1.length === 0 ? sep : sep) + tail + source.slice(closeIdx),
+            text: head + sep + tail + afterAlias.slice(closeIdx),
             changed: true,
             alreadyDone: false,
+            aliasRewriteCount,
         };
     }
     // 双参：在第二参对象 `{` 之后插 ` fullstack: true,`
-    const arg2 = source.slice(secondArgRange.start, secondArgRange.end);
+    const arg2 = afterAlias.slice(secondArgRange.start, secondArgRange.end);
     const objOpen = arg2.indexOf('{');
     if (objOpen < 0) {
         // 第二参不是对象字面量（罕见），保守跳过
-        return { text: source, changed: false, alreadyDone: false };
+        return { text: afterAlias, changed: false, alreadyDone: false, aliasRewriteCount };
     }
     const absObjOpen = secondArgRange.start + objOpen;
     const inserted = '\n  fullstack: true,';
     return {
-        text: source.slice(0, absObjOpen + 1) + inserted + source.slice(absObjOpen + 1),
+        text: afterAlias.slice(0, absObjOpen + 1) + inserted + afterAlias.slice(absObjOpen + 1),
         changed: true,
         alreadyDone: false,
+        aliasRewriteCount,
     };
 }
+/**
+ * vite.config 里 alias 路径重写：`src` 起头的路径加 `client/` 前缀。
+ *
+ * 匹配的形态（不限制在 resolve.alias 块内 —— vite.config 顶层很少出现非 alias 用的
+ * `src` 字符串，业务 import 走 `@/...`，所以全文匹配是安全的）：
+ *
+ *   path.resolve(<args>, 'src')             → path.resolve(<args>, 'client/src')
+ *   path.resolve(<args>, 'src/<rest>')      → path.resolve(<args>, 'client/src/<rest>')
+ *   path.join(<args>, 'src')                → 同上
+ *   './src' / './src/<rest>'（独立字符串）  → './client/src' / './client/src/<rest>'
+ *
+ * 已含 `client/src` 的不动（视为已迁移），`sub/src` 之类（src 不在词首）不动。
+ */
+function rewriteAliasSrcPaths(source) {
+    let count = 0;
+    // path.resolve(...) / path.join(...) 的最后一个参数是 'src' 或 'src/...' 起头
+    // 匹配 ['"]src[/'"]，保留引号
+    const pathCallRe = /(\bpath\s*\.\s*(?:resolve|join)\s*\([^)]*?,\s*)(['"`])(src)(\/[^'"`]*)?(['"`])/g;
+    let next = source.replace(pathCallRe, (_match, prefix, q1, _src, rest, q2) => {
+        count++;
+        return `${prefix}${q1}client/src${rest ?? ''}${q2}`;
+    });
+    // 独立的相对路径字符串字面量 './src' 或 './src/...'（不在 path.resolve 参数里）
+    // 注意：path.resolve / join 已被上一步处理，这里只匹配剩下的 './src...' 字面量。
+    // 这种用法在 vite.config 较少（典型是直接给 alias 字符串值），但兜底处理。
+    const relativeRe = /(['"`])\.\/(src)(\/[^'"`]*)?(['"`])/g;
+    next = next.replace(relativeRe, (_match, q1, _src, rest, q2) => {
+        count++;
+        return `${q1}./client/src${rest ?? ''}${q2}`;
+    });
+    return { text: next, count };
+}
 /**
  * 从 openIdx（指向 `(`）开始扫到匹配的 `)`，跳过 string / template / 括号嵌套。
  * 找不到匹配返回 -1。

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/miaoda-cli",
-  "version": "0.1.16-alpha.ab80f52",
+  "version": "0.1.16-alpha.c0b0ae2",
   "description": "Miaoda 平台命令行工具，面向 Agent 调用",
   "type": "commonjs",
   "bin": {