@lark-apaas/fullstack-cli 1.1.16-alpha.2 → 1.1.16-alpha.3

package/README.md

@@ -227,6 +227,26 @@ fullstack-cli capability migration --dry-run
 fullstack-cli --version
 ```
 
+### 8. 全局选项
+
+#### Canary 环境
+
+支持通过 `--canary` 选项指定 canary 环境，会在 HTTP 请求中添加 `x-tt-env` header：
+
+```bash
+# 通过命令行参数指定
+fullstack-cli --canary boe_canary action-plugin install @office/feishu-create-group
+
+# 也可以放在命令后面
+fullstack-cli action-plugin install @office/feishu-create-group --canary boe_canary
+```
+
+也支持通过环境变量设置：
+
+```bash
+FORCE_FRAMEWORK_CLI_CANARY_ENV=boe_canary fullstack-cli action-plugin install @office/feishu-create-group
+```
+
 ## package.json 配置
 
 在用户项目的 `package.json` 中添加：

package/dist/index.js

@@ -63,9 +63,18 @@ var FullstackCLI = class {
   constructor(version) {
     this.program = new Command();
     this.hooks = new HooksManager();
-    this.program.name("fullstack-cli").description("CLI tool for fullstack template management").version(version);
+    this.program.name("fullstack-cli").description("CLI tool for fullstack template management").version(version).option("--canary <env>", "Set canary environment (e.g., boe_canary)");
+    this.setupGlobalOptions();
     this.setupDefaultHooks();
   }
+  setupGlobalOptions() {
+    this.program.hook("preAction", (thisCommand) => {
+      const opts = thisCommand.opts();
+      if (opts.canary) {
+        process.env.FORCE_FRAMEWORK_CLI_CANARY_ENV = opts.canary;
+      }
+    });
+  }
   setupDefaultHooks() {
     this.hooks.afterRun((ctx, error) => {
       if (error) {
@@ -232,6 +241,20 @@ function sanitizeIdentifier(name) {
   }
   return sanitized;
 }
+function getUniqueIdentifier(name, usedIdentifiers) {
+  const base = sanitizeIdentifier(name);
+  if (!usedIdentifiers.has(base)) {
+    usedIdentifiers.add(base);
+    return base;
+  }
+  let suffix = 2;
+  while (usedIdentifiers.has(`${base}${suffix}`)) {
+    suffix++;
+  }
+  const unique = `${base}${suffix}`;
+  usedIdentifiers.add(unique);
+  return unique;
+}
 
 // src/commands/db/gen-dbschema/transforms/ast/rename-identifiers.ts
 var PG_FACTORIES = [
@@ -282,10 +305,27 @@ function getCurrentName(decl) {
   const name = decl.getName();
   return name.replace(/^"|"$/g, "");
 }
+function collectExistingIdentifiers(ctx) {
+  const { sourceFile } = ctx;
+  const identifiers = /* @__PURE__ */ new Set();
+  for (const statement of sourceFile.getStatements()) {
+    if (!Node.isVariableStatement(statement)) {
+      continue;
+    }
+    for (const decl of statement.getDeclarations()) {
+      const name = getCurrentName(decl);
+      if (name) {
+        identifiers.add(name);
+      }
+    }
+  }
+  return identifiers;
+}
 var renameIdentifiersTransform = {
   name: "rename-identifiers",
   transform(ctx) {
     const { sourceFile, stats } = ctx;
+    const usedIdentifiers = collectExistingIdentifiers(ctx);
     const renames = [];
     for (const statement of sourceFile.getStatements()) {
       if (!Node.isVariableStatement(statement)) {
@@ -307,10 +347,13 @@ var renameIdentifiersTransform = {
           continue;
         }
         const currentName = getCurrentName(decl);
-        const sanitized = sanitizeIdentifier(tableName);
-        if (sanitized !== currentName) {
-          renames.push({ decl, from: currentName, to: sanitized });
+        const baseSanitized = sanitizeIdentifier(tableName);
+        if (baseSanitized === currentName) {
+          continue;
         }
+        usedIdentifiers.delete(currentName);
+        const sanitized = getUniqueIdentifier(tableName, usedIdentifiers);
+        renames.push({ decl, from: currentName, to: sanitized });
       }
     }
     for (const { decl, from, to } of renames.reverse()) {
@@ -760,17 +803,27 @@ var defaultTransforms = [
 ];
 
 // src/commands/db/gen-dbschema/transforms/text/patch-defects.ts
+function collectExistingIdentifiers2(source) {
+  const identifiers = /* @__PURE__ */ new Set();
+  const exportPattern = /export\s+const\s+([a-zA-Z_$][a-zA-Z0-9_$]*)\s*=/g;
+  let match;
+  while ((match = exportPattern.exec(source)) !== null) {
+    identifiers.add(match[1]);
+  }
+  return identifiers;
+}
 function patchDefects(source) {
   let fixed = 0;
   const renamedQuotedExports = [];
   let text = source;
+  const usedIdentifiers = collectExistingIdentifiers2(source);
   text = text.replace(/\.default\('\)/g, () => {
     fixed += 1;
     return `.default('')`;
   });
   const quotedExportPattern = /export const\s+"([^"]+)"\s*=/g;
-  text = text.replace(quotedExportPattern, (match, quotedName) => {
-    const sanitized = sanitizeIdentifier(quotedName);
+  text = text.replace(quotedExportPattern, (_match, quotedName) => {
+    const sanitized = getUniqueIdentifier(quotedName, usedIdentifiers);
     renamedQuotedExports.push({ from: quotedName, to: sanitized });
     fixed += 1;
     return `export const ${sanitized} =`;
@@ -899,8 +952,11 @@ function ensureImportIdentifier(source, packageName, identifier) {
 }
 function resolveTemplateTypesPath() {
   const candidates = [
+    // Source code paths (relative to transforms/text/)
     new URL("../../template/types.ts", import.meta.url),
-    new URL("../template/types.ts", import.meta.url)
+    new URL("../template/types.ts", import.meta.url),
+    // Bundled path (relative to dist/index.js)
+    new URL("./gen-dbschema-template/types.ts", import.meta.url)
   ];
   for (const url of candidates) {
     const p = fileURLToPath(url);
@@ -3550,17 +3606,17 @@ function analyzeImports(sourceFile) {
 }
 
 // src/commands/migration/versions/v001_capability/code-migrator/analyzers/call-site-analyzer.ts
-import { SyntaxKind as SyntaxKind6 } 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(SyntaxKind6.CallExpression);
+  const callExpressions = sourceFile.getDescendantsOfKind(SyntaxKind5.CallExpression);
   for (const callExpr of callExpressions) {
     const expression = callExpr.getExpression();
-    if (expression.getKind() === SyntaxKind6.Identifier) {
+    if (expression.getKind() === SyntaxKind5.Identifier) {
       const functionName = expression.getText();
       const capabilityId = importMap.get(functionName);
       if (capabilityId) {
@@ -3573,11 +3629,11 @@ function analyzeCallSites(sourceFile, imports) {
           text: callExpr.getText()
         });
       }
-    } else if (expression.getKind() === SyntaxKind6.PropertyAccessExpression) {
-      const propAccess = expression.asKind(SyntaxKind6.PropertyAccessExpression);
+    } else if (expression.getKind() === SyntaxKind5.PropertyAccessExpression) {
+      const propAccess = expression.asKind(SyntaxKind5.PropertyAccessExpression);
       if (propAccess) {
         const objectExpr = propAccess.getExpression();
-        if (objectExpr.getKind() === SyntaxKind6.Identifier) {
+        if (objectExpr.getKind() === SyntaxKind5.Identifier) {
           const objectName = objectExpr.getText();
           const capabilityId = importMap.get(objectName);
           if (capabilityId) {
@@ -3806,7 +3862,7 @@ function addInjection(sourceFile) {
 }
 
 // src/commands/migration/versions/v001_capability/code-migrator/transformers/call-site-transformer.ts
-import { SyntaxKind as SyntaxKind7 } from "ts-morph";
+import { SyntaxKind as SyntaxKind6 } from "ts-morph";
 var DEFAULT_ACTION_NAME = "run";
 function generateNewCallText(capabilityId, actionName, args) {
   const argsText = args.trim() || "{}";
@@ -3821,19 +3877,19 @@ function transformCallSites(sourceFile, imports) {
     });
   }
   let replacedCount = 0;
-  const callExpressions = sourceFile.getDescendantsOfKind(SyntaxKind7.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() === SyntaxKind7.Identifier) {
+    if (expression.getKind() === SyntaxKind6.Identifier) {
       const functionName = expression.getText();
       importInfo = importMap.get(functionName);
-    } else if (expression.getKind() === SyntaxKind7.PropertyAccessExpression) {
-      const propAccess = expression.asKind(SyntaxKind7.PropertyAccessExpression);
+    } else if (expression.getKind() === SyntaxKind6.PropertyAccessExpression) {
+      const propAccess = expression.asKind(SyntaxKind6.PropertyAccessExpression);
       if (propAccess) {
         const objectExpr = propAccess.getExpression();
-        if (objectExpr.getKind() === SyntaxKind7.Identifier) {
+        if (objectExpr.getKind() === SyntaxKind6.Identifier) {
           const objectName = objectExpr.getText();
           importInfo = importMap.get(objectName);
         }

package/package.json

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