@lark-apaas/fullstack-cli 1.1.59-alpha.3 → 1.1.59-beta.0

package/dist/index.js

@@ -847,6 +847,117 @@ var tweakImportsTransform = {
   }
 };
 
+// src/commands/db/gen-dbschema/transforms/ast/fix-opclass.ts
+import { Node as Node9 } from "ts-morph";
+var TYPE_TO_OPCLASS = {
+  uuid: "uuid_ops",
+  date: "date_ops",
+  varchar: "text_ops",
+  text: "text_ops",
+  boolean: "bool_ops",
+  integer: "int4_ops",
+  serial: "int4_ops",
+  numeric: "numeric_ops",
+  jsonb: "jsonb_ops",
+  customTimestamptz: "timestamptz_ops",
+  bigint: "int8_ops",
+  smallint: "int2_ops",
+  real: "float4_ops",
+  doublePrecision: "float8_ops"
+};
+var fixOpclassTransform = {
+  name: "fix-opclass",
+  transform(ctx) {
+    const { sourceFile } = ctx;
+    sourceFile.forEachDescendant((node) => {
+      if (!Node9.isCallExpression(node)) return;
+      const expr = node.getExpression();
+      if (!Node9.isIdentifier(expr)) return;
+      const fnName = expr.getText();
+      if (fnName !== "pgTable") return;
+      const args = node.getArguments();
+      if (args.length < 3) return;
+      const tableColumns = collectTableColumns(args[1]);
+      if (!tableColumns.size) return;
+      const indexFn = args[2];
+      if (!Node9.isArrowFunction(indexFn)) return;
+      fixOpclassInIndexes(indexFn, tableColumns);
+    });
+  }
+};
+function collectTableColumns(columnsArg) {
+  const columns = /* @__PURE__ */ new Map();
+  if (!Node9.isObjectLiteralExpression(columnsArg)) return columns;
+  for (const prop of columnsArg.getProperties()) {
+    if (!Node9.isPropertyAssignment(prop)) continue;
+    const colName = prop.getName();
+    const initializer = prop.getInitializer();
+    if (!initializer) continue;
+    const colType = extractColumnType(initializer);
+    if (colType) {
+      columns.set(colName, colType);
+    }
+  }
+  return columns;
+}
+function extractColumnType(node) {
+  const text = node.getText();
+  for (const typeName of Object.keys(TYPE_TO_OPCLASS)) {
+    const pattern = new RegExp(`\\b${typeName}\\s*\\(`);
+    if (pattern.test(text)) {
+      return typeName;
+    }
+  }
+  return void 0;
+}
+function fixOpclassInIndexes(indexFn, tableColumns) {
+  const paramName = getArrowParam(indexFn);
+  if (!paramName) return;
+  indexFn.forEachDescendant((node) => {
+    if (!Node9.isCallExpression(node)) return;
+    const expr = node.getExpression();
+    if (!Node9.isPropertyAccessExpression(expr)) return;
+    if (expr.getName() !== "op") return;
+    const opArgs = node.getArguments();
+    if (opArgs.length !== 1) return;
+    const currentOp = opArgs[0];
+    if (!Node9.isStringLiteral(currentOp)) return;
+    const colName = resolveColumnName(expr.getExpression(), paramName);
+    if (!colName) return;
+    const colType = tableColumns.get(colName);
+    if (!colType) return;
+    const correctOp = TYPE_TO_OPCLASS[colType];
+    if (!correctOp) return;
+    const currentValue = currentOp.getLiteralValue();
+    if (currentValue !== correctOp) {
+      currentOp.setLiteralValue(correctOp);
+    }
+  });
+}
+function getArrowParam(node) {
+  if (!Node9.isArrowFunction(node)) return void 0;
+  const params = node.getParameters();
+  if (params.length !== 1) return void 0;
+  return params[0].getName();
+}
+function resolveColumnName(node, tableParam) {
+  if (Node9.isPropertyAccessExpression(node)) {
+    const obj = node.getExpression();
+    const propName = node.getName();
+    if (Node9.isIdentifier(obj) && obj.getText() === tableParam) {
+      return propName;
+    }
+    return resolveColumnName(obj, tableParam);
+  }
+  if (Node9.isCallExpression(node)) {
+    const callExpr = node.getExpression();
+    if (Node9.isPropertyAccessExpression(callExpr)) {
+      return resolveColumnName(callExpr.getExpression(), tableParam);
+    }
+  }
+  return void 0;
+}
+
 // src/commands/db/gen-dbschema/transforms/ast/index.ts
 var defaultTransforms = [
   patchDefectsTransform,
@@ -865,6 +976,8 @@ var defaultTransforms = [
   // #9 Replace .defaultNow()
   removeSystemFieldsTransform,
   // #10 Remove conflicting system fields
+  fixOpclassTransform,
+  // #11 Fix multi-column index opclass mapping
   tweakImportsTransform
   // #12 Adjust imports
 ];
@@ -1901,7 +2014,7 @@ export class ${className}Module {}
 }
 
 // src/commands/db/gen-nest-resource/schema-parser.ts
-import { Project as Project2, Node as Node9 } from "ts-morph";
+import { Project as Project2, Node as Node10 } from "ts-morph";
 var DrizzleSchemaParser = class {
   constructor(projectOptions) {
     this.project = new Project2(projectOptions);
@@ -1914,7 +2027,7 @@ var DrizzleSchemaParser = class {
       const declarations = statement.getDeclarations();
       for (const declaration of declarations) {
         const initializer = declaration.getInitializer();
-        if (initializer && Node9.isCallExpression(initializer)) {
+        if (initializer && Node10.isCallExpression(initializer)) {
           const expression = initializer.getExpression();
           if (expression.getText() === "pgTable") {
             const tableInfo = this.parsePgTable(
@@ -1937,13 +2050,13 @@ var DrizzleSchemaParser = class {
     }
     const tableName = args[0].getText().replace(/['"]/g, "");
     const fieldsArg = args[1];
-    if (!Node9.isObjectLiteralExpression(fieldsArg)) {
+    if (!Node10.isObjectLiteralExpression(fieldsArg)) {
       return null;
     }
     const fields = [];
     const properties = fieldsArg.getProperties();
     for (const prop of properties) {
-      if (Node9.isPropertyAssignment(prop)) {
+      if (Node10.isPropertyAssignment(prop)) {
         const fieldName = prop.getName();
         const initializer = prop.getInitializer();
         const leadingComments = prop.getLeadingCommentRanges();
@@ -1951,7 +2064,7 @@ var DrizzleSchemaParser = class {
         if (leadingComments.length > 0) {
           comment = leadingComments.map((c) => c.getText()).join("\n").replace(/\/\//g, "").trim();
         }
-        if (initializer && Node9.isCallExpression(initializer)) {
+        if (initializer && Node10.isCallExpression(initializer)) {
           const fieldInfo = this.parseField(fieldName, initializer, comment);
           fields.push(fieldInfo);
         }
@@ -1983,10 +2096,10 @@ var DrizzleSchemaParser = class {
   parseBaseType(callExpr, fieldInfo) {
     let current = callExpr;
     let baseCall = null;
-    while (Node9.isCallExpression(current)) {
+    while (Node10.isCallExpression(current)) {
       baseCall = current;
       const expression2 = current.getExpression();
-      if (Node9.isPropertyAccessExpression(expression2)) {
+      if (Node10.isPropertyAccessExpression(expression2)) {
         current = expression2.getExpression();
       } else {
         break;
@@ -1997,7 +2110,7 @@ var DrizzleSchemaParser = class {
     }
     const expression = baseCall.getExpression();
     let typeName = "";
-    if (Node9.isPropertyAccessExpression(expression)) {
+    if (Node10.isPropertyAccessExpression(expression)) {
       typeName = expression.getName();
     } else {
       typeName = expression.getText();
@@ -2006,25 +2119,25 @@ var DrizzleSchemaParser = class {
     const args = baseCall.getArguments();
     if (args.length > 0) {
       const firstArg = args[0];
-      if (Node9.isStringLiteral(firstArg)) {
+      if (Node10.isStringLiteral(firstArg)) {
         fieldInfo.columnName = firstArg.getLiteralText();
-      } else if (Node9.isObjectLiteralExpression(firstArg)) {
+      } else if (Node10.isObjectLiteralExpression(firstArg)) {
         this.parseTypeConfig(firstArg, fieldInfo);
-      } else if (Node9.isArrayLiteralExpression(firstArg)) {
+      } else if (Node10.isArrayLiteralExpression(firstArg)) {
         fieldInfo.enumValues = firstArg.getElements().map((el) => el.getText().replace(/['"]/g, ""));
       }
     }
-    if (args.length > 1 && Node9.isObjectLiteralExpression(args[1])) {
+    if (args.length > 1 && Node10.isObjectLiteralExpression(args[1])) {
       this.parseTypeConfig(args[1], fieldInfo);
     }
   }
   parseTypeConfig(objLiteral, fieldInfo) {
-    if (!Node9.isObjectLiteralExpression(objLiteral)) {
+    if (!Node10.isObjectLiteralExpression(objLiteral)) {
       return;
     }
     const properties = objLiteral.getProperties();
     for (const prop of properties) {
-      if (Node9.isPropertyAssignment(prop)) {
+      if (Node10.isPropertyAssignment(prop)) {
         const propName = prop.getName();
         const value = prop.getInitializer()?.getText();
         switch (propName) {
@@ -2056,9 +2169,9 @@ var DrizzleSchemaParser = class {
   }
   parseCallChain(callExpr, fieldInfo) {
     let current = callExpr;
-    while (Node9.isCallExpression(current)) {
+    while (Node10.isCallExpression(current)) {
       const expression = current.getExpression();
-      if (Node9.isPropertyAccessExpression(expression)) {
+      if (Node10.isPropertyAccessExpression(expression)) {
         const methodName = expression.getName();
         const args = current.getArguments();
         switch (methodName) {
@@ -2154,9 +2267,9 @@ async function parseAndGenerateNestResourceTemplate(options) {
 var require2 = createRequire(import.meta.url);
 async function run(options = {}) {
   let exitCode = 0;
-  const envPath2 = path2.resolve(process.cwd(), ".env");
-  if (fs4.existsSync(envPath2)) {
-    loadEnv({ path: envPath2 });
+  const envPath = path2.resolve(process.cwd(), ".env");
+  if (fs4.existsSync(envPath)) {
+    loadEnv({ path: envPath });
     console.log("[gen-db-schema] \u2713 Loaded .env file");
   }
   const databaseUrl = process.env.SUDA_DATABASE_URL;
@@ -2455,6 +2568,12 @@ function buildDefaultRules(opts) {
       to: ".gitignore",
       line: ".agent/"
     },
+    // 7a. 确保 .gitignore 包含 .npm_cache 目录
+    {
+      type: "add-line",
+      to: ".gitignore",
+      line: ".npm_cache"
+    },
     // 8. 同步 .spark_project 配置文件（总是覆盖）
     {
       from: "templates/.spark_project",
@@ -2507,7 +2626,9 @@ var SYNC_PROFILES = {
   "design-stack": defaultProfile,
   "nestjs-react-fullstack": defaultProfile,
   "vite-react": viteReactProfile,
-  html: emptyProfile
+  html: emptyProfile,
+  // design-html 与 html 同语义：空 sync + 不激活 git hooks（彻底 no-op）
+  "design-html": emptyProfile
 };
 function genSyncConfig(stack, opts = {}) {
   const factory = stack && SYNC_PROFILES[stack] || defaultProfile;
@@ -5641,17 +5762,17 @@ function analyzeImports(sourceFile) {
 }
 
 // src/commands/migration/versions/v001_capability/code-migrator/analyzers/call-site-analyzer.ts
-import { SyntaxKind as SyntaxKind4 } from "ts-morph";
+import { SyntaxKind as SyntaxKind5 } from "ts-morph";
 function analyzeCallSites(sourceFile, imports) {
   const callSites = [];
   const importMap = /* @__PURE__ */ new Map();
   for (const imp of imports) {
     importMap.set(imp.importName, imp.capabilityId);
   }
-  const callExpressions = sourceFile.getDescendantsOfKind(SyntaxKind4.CallExpression);
+  const callExpressions = sourceFile.getDescendantsOfKind(SyntaxKind5.CallExpression);
   for (const callExpr of callExpressions) {
     const expression = callExpr.getExpression();
-    if (expression.getKind() === SyntaxKind4.Identifier) {
+    if (expression.getKind() === SyntaxKind5.Identifier) {
       const functionName = expression.getText();
       const capabilityId = importMap.get(functionName);
       if (capabilityId) {
@@ -5664,11 +5785,11 @@ function analyzeCallSites(sourceFile, imports) {
           text: callExpr.getText()
         });
       }
-    } else if (expression.getKind() === SyntaxKind4.PropertyAccessExpression) {
-      const propAccess = expression.asKind(SyntaxKind4.PropertyAccessExpression);
+    } else if (expression.getKind() === SyntaxKind5.PropertyAccessExpression) {
+      const propAccess = expression.asKind(SyntaxKind5.PropertyAccessExpression);
       if (propAccess) {
         const objectExpr = propAccess.getExpression();
-        if (objectExpr.getKind() === SyntaxKind4.Identifier) {
+        if (objectExpr.getKind() === SyntaxKind5.Identifier) {
           const objectName = objectExpr.getText();
           const capabilityId = importMap.get(objectName);
           if (capabilityId) {
@@ -5897,7 +6018,7 @@ function addInjection(sourceFile) {
 }
 
 // src/commands/migration/versions/v001_capability/code-migrator/transformers/call-site-transformer.ts
-import { SyntaxKind as SyntaxKind5 } from "ts-morph";
+import { SyntaxKind as SyntaxKind6 } from "ts-morph";
 var DEFAULT_ACTION_NAME = "run";
 function generateNewCallText(capabilityId, actionName, args) {
   const argsText = args.trim() || "{}";
@@ -5912,19 +6033,19 @@ function transformCallSites(sourceFile, imports) {
     });
   }
   let replacedCount = 0;
-  const callExpressions = sourceFile.getDescendantsOfKind(SyntaxKind5.CallExpression);
+  const callExpressions = sourceFile.getDescendantsOfKind(SyntaxKind6.CallExpression);
   const sortedCalls = [...callExpressions].sort((a, b) => b.getStart() - a.getStart());
   for (const callExpr of sortedCalls) {
     const expression = callExpr.getExpression();
     let importInfo;
-    if (expression.getKind() === SyntaxKind5.Identifier) {
+    if (expression.getKind() === SyntaxKind6.Identifier) {
       const functionName = expression.getText();
       importInfo = importMap.get(functionName);
-    } else if (expression.getKind() === SyntaxKind5.PropertyAccessExpression) {
-      const propAccess = expression.asKind(SyntaxKind5.PropertyAccessExpression);
+    } else if (expression.getKind() === SyntaxKind6.PropertyAccessExpression) {
+      const propAccess = expression.asKind(SyntaxKind6.PropertyAccessExpression);
       if (propAccess) {
         const objectExpr = propAccess.getExpression();
-        if (objectExpr.getKind() === SyntaxKind5.Identifier) {
+        if (objectExpr.getKind() === SyntaxKind6.Identifier) {
           const objectName = objectExpr.getText();
           importInfo = importMap.get(objectName);
         }
@@ -7577,8 +7698,10 @@ function sanitizeStructuredLog(value) {
   delete sanitized.pid;
   return sanitized;
 }
+var TRANSIENT_CONNECTION_ERROR_PATTERN = /ECONNREFUSED|ECONNRESET|ETIMEDOUT|ENETUNREACH|socket hang up|proxy error|\[Proxy\] (?:Error:\s*$|Error during|Connection error|Non-connection error|Headers already sent|Service (?:recovered|did not recover))/i;
 function hasErrorInStdLines(lines) {
-  const combined = lines.join("\n");
+  const filtered = lines.filter((line) => !TRANSIENT_CONNECTION_ERROR_PATTERN.test(line));
+  const combined = filtered.join("\n");
   if (!combined) return false;
   const strong = [
     /compiled with errors/i,
@@ -7597,7 +7720,7 @@ function hasErrorInStdLines(lines) {
     /\b0\s+errors?\b/i,
     /Server Error \d{3}/i
   ];
-  return lines.some((line) => {
+  return filtered.some((line) => {
     const text = line.trim();
     if (!text) return false;
     if (ignorePatterns.some((re) => re.test(text))) return false;
@@ -8146,9 +8269,11 @@ var commands = [
 ];
 
 // src/index.ts
-var envPath = path25.join(process.cwd(), ".env");
-if (fs29.existsSync(envPath)) {
-  dotenvConfig({ path: envPath });
+for (const filename of [".env.local", ".env"]) {
+  const envPath = path25.join(process.cwd(), filename);
+  if (fs29.existsSync(envPath)) {
+    dotenvConfig({ path: envPath });
+  }
 }
 var __dirname = path25.dirname(fileURLToPath5(import.meta.url));
 var pkg = JSON.parse(fs29.readFileSync(path25.join(__dirname, "../package.json"), "utf-8"));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/fullstack-cli",
-  "version": "1.1.59-alpha.3",
+  "version": "1.1.59-beta.0",
   "description": "CLI tool for fullstack template management",
   "type": "module",
   "main": "dist/index.js",

package/templates/.spark_project

@@ -1,5 +1,5 @@
 run = ["npm", "run", "dev"] # 默认 spark-cli dev
-hidden = [".config", ".git", "scripts", "node_modules", "dist", ".spark", ".agent", ".agents", "tmp", ".spark_project", ".playwright-cli"]
+hidden = [".config", ".git", "scripts", "node_modules", "dist", ".spark", ".agent", ".agents", ".claude", "tmp", ".spark_project", ".playwright-cli"]
 lint = ["npm", "run", "lint"]
 test = ["npm", "run", "test"]
 genDbSchema = ["npm", "run", "gen:db-schema"]
@@ -13,4 +13,4 @@ run = ["npm", "run", "start"]
 [files.restrict]
 pathPatterns = ["client/src/api/gen", "package.json", ".spark_project", ".gitignore"]
 [files.hidden]
-pathPatterns = [".config", ".git", "scripts", "node_modules", "dist", ".spark", ".agent", ".agents", "tmp", ".spark_project", ".playwright-cli"]
+pathPatterns = [".config", ".git", "scripts", "node_modules", "dist", ".spark", ".agent", ".agents", ".claude", "tmp", ".spark_project", ".playwright-cli"]

package/templates/nest-cli.json

@@ -21,9 +21,5 @@
         }
       }
     ]
-  },
-  "x-miaoda-preview": {
-    "compiler": "swc",
-    "typeCheck": "deferred"
   }
-}
+}

package/templates/scripts/dev-local.js

@@ -0,0 +1,113 @@
+#!/usr/bin/env node
+// ============================================================================
+// 本地开发启动脚本（由 miaoda app sync 维护，请勿手改）
+// Stack: nestjs-react-fullstack
+//
+// 流程:
+//   1. env pull —— 拉沙箱身份/凭证到 .env.local
+//   2. skills sync —— 同步当前 stack 的 agent skills
+//   3. dotenv 加载 .env / .env.local 到 process.env（含 SUDA_WEBUSER 适配）
+//   4. 并发起 dev:server + dev:client（子进程继承 process.env）
+//
+// 关键设计：本脚本在 spawn 子进程之前先把 .env / .env.local 加载到 process.env，
+// 然后 spawn 的 server / client 进程通过 env 继承直接拿到——SDK（fullstack-nestjs-core
+// / fullstack-vite-preset / fullstack-rspack-preset）无需自己 require('dotenv')。
+//
+// SUDA_WEBUSER 适配：沙箱 env pull 下发到 .env.local 的形态是
+// `SUDA_WEBUSER="{\"user_id\":\"...\"}"`（shell-quoted JSON），dotenv@17 剥外层引号后
+// 保留内部 `\"` 转义不还原，导致 process.env.SUDA_WEBUSER 是 `{\"user_id\":\"...\"}`
+// 这种带反斜杠串，下游 JSON.parse 直接挂。这里做一次「直接 parse 失败则 unescape
+// 后重 parse」兜底，把容错收敛在启动期单点，下游拿到干净 JSON 字符串。
+// ============================================================================
+const fs = require('node:fs');
+const path = require('node:path');
+const { execSync, spawn, spawnSync } = require('node:child_process');
+
+process.chdir(path.resolve(__dirname, '..'));
+
+function warn(msg) {
+  if (process.stderr.isTTY) process.stderr.write(`\x1b[33mWARNING: ${msg}\x1b[0m\n`);
+  else process.stderr.write(`WARNING: ${msg}\n`);
+}
+
+if (!process.env.MIAODA_APP_TYPE) process.env.MIAODA_APP_TYPE = '3';
+process.env.MIAODA_LOCAL_DEV = '1';
+
+// 1. env pull
+console.log('[dev-local] (1/4) env pull...');
+const hasLarkCli = spawnSync('command', ['-v', 'lark-cli'], { shell: true, stdio: 'ignore' }).status === 0;
+if (hasLarkCli) {
+  let appId = '';
+  try {
+    appId = JSON.parse(fs.readFileSync('.spark/meta.json', 'utf8')).app_id || '';
+  } catch {
+    /* meta.json 不存在或非法 JSON */
+  }
+  if (appId) {
+    const r = spawnSync('lark-cli', ['apps', '+env-pull', '--app-id', appId, '--as', 'user'], {
+      stdio: 'inherit',
+    });
+    if (r.status !== 0) warn('env pull 失败，继续按 .env.local 现状启动');
+  } else {
+    warn('.spark/meta.json 缺 app_id，请先跑 `miaoda app init --app-id <id>`');
+  }
+} else {
+  warn('lark-cli 未安装，跳过 env pull；请确保 .env.local 已就绪');
+}
+
+// 2. skills sync —— --local 切到 flat layout (.agents/skills + .claude/skills 软链),
+// 跟沙箱 nested layout 区分。不传 --version,handler 默认拉 coding-steering@latest,
+// 保证每次本地 npm run dev 都把 skills 升到最新。
+console.log('[dev-local] (2/4) miaoda skills sync...');
+try {
+  execSync('npx -y @lark-apaas/miaoda-cli@latest skills sync --local', { stdio: 'inherit' });
+} catch {
+  console.log('  (skills sync 失败，继续启动)');
+}
+
+// 3. 加载 .env / .env.local 到 process.env
+// dotenv 默认 override:false，先到先得 → 先 .env.local 让它优先于 .env；
+// shell env 已在 process.env，两次 config 都不会覆盖。
+console.log('[dev-local] (3/4) loading .env / .env.local...');
+const dotenv = require('dotenv');
+dotenv.config({ path: '.env.local' });
+dotenv.config({ path: '.env' });
+
+// SUDA_WEBUSER 适配（详见文件头注释）
+if (process.env.SUDA_WEBUSER) {
+  const raw = process.env.SUDA_WEBUSER;
+  try {
+    JSON.parse(raw);
+  } catch {
+    try {
+      const unescaped = raw.replace(/\\"/g, '"');
+      JSON.parse(unescaped);
+      process.env.SUDA_WEBUSER = unescaped;
+    } catch {
+      warn(`SUDA_WEBUSER 解析失败,值头部: ${raw.slice(0, 80)}...`);
+    }
+  }
+}
+
+// 4. 并发起前后端 dev server
+console.log('[dev-local] (4/4) 并发起 dev:server + dev:client');
+const child = spawn(
+  'npx',
+  [
+    '--no-install',
+    'concurrently',
+    '--names',
+    'server,client',
+    '--prefix-colors',
+    'blue,green',
+    '--kill-others-on-fail',
+    'npm run dev:server',
+    'npm run dev:client',
+  ],
+  { stdio: 'inherit', env: process.env },
+);
+child.on('exit', (code) => process.exit(code ?? 0));
+child.on('error', (err) => {
+  console.error(err);
+  process.exit(1);
+});