@lark-apaas/fullstack-cli 1.1.22-alpha.24 → 1.1.22-alpha.26

package/dist/gen-dbschema-template/types.ts

@@ -120,100 +120,4 @@ export const customTimestamptz = customType<{
     if(value instanceof Date) return value;
     return new Date(value);
   },
-});
-
-/**
- * User type marker for user_profile_domain
- * Simple marker type, no conversion needed - passes through as string
- */
-export const userType = customType<{
-  data: string;
-  driverData: string;
-}>({
-  dataType() {
-    return 'user_profile_domain';
-  },
-  toDriver(value: string) {
-    return value;
-  },
-  fromDriver(value: string) {
-    return value;
-  },
-});
-
-/**
- * File type marker for file_attachment_domain
- * Simple marker type, no conversion needed - passes through as string
- */
-export const fileType = customType<{
-  data: string;
-  driverData: string;
-}>({
-  dataType() {
-    return 'file_attachment_domain';
-  },
-  toDriver(value: string) {
-    return value;
-  },
-  fromDriver(value: string) {
-    return value;
-  },
-});
-
-/**
- * User type array for user_profile_domain[]
- */
-export const userTypeArray = customType<{
-  data: string[];
-  driverData: string;
-}>({
-  dataType() {
-    return 'user_profile_domain[]';
-  },
-  toDriver(value: string[]) {
-    return sql`${value}`;
-  },
-  fromDriver(value: string): string[] {
-    if (!value || value === '{}') return [];
-    // Parse PostgreSQL array format: {"item1","item2"}
-    const inner = value.slice(1, -1);
-    if (!inner) return [];
-    return inner.split(',').map(item => {
-      // Handle quoted strings
-      const trimmed = item.trim();
-      if (trimmed.startsWith('"') && trimmed.endsWith('"')) {
-        return trimmed.slice(1, -1).replace(/\\"/g, '"');
-      }
-      return trimmed;
-    });
-  },
-});
-
-/**
- * File type array for file_attachment_domain[]
- */
-export const fileTypeArray = customType<{
-  data: string[];
-  driverData: string;
-}>({
-  dataType() {
-    return 'file_attachment_domain[]';
-  },
-  toDriver(value: string[]) {
-    return sql`${value}`;
-  },
-  fromDriver(value: string): string[] {
-    if (!value || value === '{}') return [];
-    // Parse PostgreSQL array format: {"item1","item2"}
-    const inner = value.slice(1, -1);
-    if (!inner) return [];
-    return inner.split(',').map(item => {
-      // Handle quoted strings
-      const trimmed = item.trim();
-      if (trimmed.startsWith('"') && trimmed.endsWith('"')) {
-        return trimmed.slice(1, -1).replace(/\\"/g, '"');
-      }
-      return trimmed;
-    });
-  },
 });

package/dist/index.js

@@ -1,6 +1,6 @@
 // src/index.ts
-import fs25 from "fs";
-import path21 from "path";
+import fs26 from "fs";
+import path22 from "path";
 import { fileURLToPath as fileURLToPath5 } from "url";
 import { config as dotenvConfig } from "dotenv";
 
@@ -469,18 +469,8 @@ var patchDefectsTransform = {
 // src/commands/db/gen-dbschema/transforms/ast/replace-unknown.ts
 import { Node as Node5 } from "ts-morph";
 var KNOWN_TYPE_FACTORIES = {
-  // Domain types (new)
-  user_profile_domain: "userType",
-  file_attachment_domain: "fileType",
-  // Domain array types (new)
-  "user_profile_domain[]": "userTypeArray",
-  "file_attachment_domain[]": "fileTypeArray",
-  // Legacy composite types (deprecated but kept for compatibility)
   user_profile: "userProfile",
-  file_attachment: "fileAttachment",
-  // Legacy array types
-  "user_profile[]": "userProfile",
-  "file_attachment[]": "fileAttachment"
+  file_attachment: "fileAttachment"
 };
 var KNOWN_ARRAY_TYPE_FACTORIES = {
   user_profile: "userProfileArray",
@@ -510,11 +500,10 @@ var replaceUnknownTransform = {
         const line = lines[i];
         const todoMatch = line.match(/\/\/ TODO: failed to parse database type '(?:\w+\.)?([\w_]+)(\[\])?'/);
         if (todoMatch) {
-          const baseTypeName = todoMatch[1];
+          const typeName = todoMatch[1];
           isArrayType = todoMatch[2] === "[]";
-          const typeName = baseTypeName + (todoMatch[2] || "");
-          if (isArrayType && KNOWN_ARRAY_TYPE_FACTORIES[baseTypeName]) {
-            factoryName = KNOWN_ARRAY_TYPE_FACTORIES[baseTypeName];
+          if (isArrayType && KNOWN_ARRAY_TYPE_FACTORIES[typeName]) {
+            factoryName = KNOWN_ARRAY_TYPE_FACTORIES[typeName];
             foundKnownType = true;
           } else if (KNOWN_TYPE_FACTORIES[typeName]) {
             factoryName = KNOWN_TYPE_FACTORIES[typeName];
@@ -4296,7 +4285,7 @@ var PROMPT_PATTERNS = [
   { pattern: /proceed\?/i, answer: "y\n" }
 ];
 async function executeShadcnAdd(registryItemPath) {
-  return new Promise((resolve) => {
+  return new Promise((resolve2) => {
     let output = "";
     const args = ["--yes", "shadcn@3.8.2", "add", registryItemPath];
     const ptyProcess = pty.spawn("npx", args, {
@@ -4322,7 +4311,7 @@ async function executeShadcnAdd(registryItemPath) {
     });
     const timeoutId = setTimeout(() => {
       ptyProcess.kill();
-      resolve({
+      resolve2({
         success: false,
         files: [],
         error: "\u6267\u884C\u8D85\u65F6"
@@ -4333,7 +4322,7 @@ async function executeShadcnAdd(registryItemPath) {
       const success = exitCode === 0;
       const filePaths = parseOutput(output);
       const files = filePaths.map(toFileInfo);
-      resolve({
+      resolve2({
         success,
         files,
         error: success ? void 0 : output || `Process exited with code ${exitCode}`
@@ -4344,12 +4333,12 @@ async function executeShadcnAdd(registryItemPath) {
 
 // src/commands/component/add.handler.ts
 function runActionPluginInit() {
-  return new Promise((resolve) => {
+  return new Promise((resolve2) => {
     execFile("fullstack-cli", ["action-plugin", "init"], { cwd: process.cwd(), stdio: "ignore" }, (error) => {
       if (error) {
         debug("action-plugin init \u5931\u8D25: %s", error.message);
       }
-      resolve();
+      resolve2();
     });
   });
 }
@@ -7185,7 +7174,45 @@ async function genArtifactUploadCredential(appId, body) {
   const response = await client.post(url, body);
   if (!response.ok || response.status !== 200) {
     throw new Error(
-      `API request failed: ${response.status} ${response.statusText}`
+      `gen_artifact_upload_credential \u8BF7\u6C42\u5931\u8D25: ${response.status} ${response.statusText}`
+    );
+  }
+  return response.json();
+}
+async function getDefaultBucketId(appId) {
+  const client = getHttpClient();
+  const url = `/b/${appId}/get_published_v2`;
+  const response = await client.get(url);
+  if (!response.ok || response.status !== 200) {
+    throw new Error(
+      `get_published_v2 \u8BF7\u6C42\u5931\u8D25: ${response.status} ${response.statusText}`
+    );
+  }
+  const data = await response.json();
+  const bucketId = data?.data?.app_runtime_extra?.bucket?.default_bucket_id;
+  if (!bucketId) {
+    throw new Error(`\u672A\u627E\u5230\u5E94\u7528 ${appId} \u7684\u9ED8\u8BA4\u5B58\u50A8\u6876`);
+  }
+  return bucketId;
+}
+async function preUploadStaticAttachment(appId, bucketId) {
+  const client = getHttpClient();
+  const url = `/v1/app/${appId}/storage/bucket/${bucketId}/preUploadStatic`;
+  const response = await client.post(url, {});
+  if (!response.ok || response.status !== 200) {
+    throw new Error(
+      `preUploadStatic \u8BF7\u6C42\u5931\u8D25: ${response.status} ${response.statusText}`
+    );
+  }
+  return response.json();
+}
+async function uploadStaticAttachmentCallback(appId, bucketId, body) {
+  const client = getHttpClient();
+  const url = `/v1/app/${appId}/storage/bucket/${bucketId}/object/callbackStatic`;
+  const response = await client.post(url, body);
+  if (!response.ok || response.status !== 200) {
+    throw new Error(
+      `callbackStatic \u8BF7\u6C42\u5931\u8D25: ${response.status} ${response.statusText}`
     );
   }
   return response.json();
@@ -7223,6 +7250,133 @@ function camelToKebab(str) {
   return str.replace(/([a-z])([A-Z])/g, "$1-$2").toLowerCase();
 }
 
+// src/commands/build/upload-static.handler.ts
+import * as fs25 from "fs";
+import * as path21 from "path";
+import { execSync as execSync3 } from "child_process";
+var LOG_PREFIX = "[upload-static]";
+async function uploadStatic(options) {
+  try {
+    const {
+      appId,
+      staticDir = "shared/static",
+      tosutilPath = "/workspace/tosutil",
+      tosutilUrl,
+      endpoint = "tos-cn-beijing.volces.com",
+      region = "cn-beijing"
+    } = options;
+    const resolvedStaticDir = path21.resolve(staticDir);
+    if (!fs25.existsSync(resolvedStaticDir)) {
+      console.error(`${LOG_PREFIX} \u76EE\u5F55\u4E0D\u5B58\u5728: ${resolvedStaticDir}\uFF0C\u8DF3\u8FC7\u4E0A\u4F20`);
+      return;
+    }
+    if (isDirEmpty(resolvedStaticDir)) {
+      console.error(`${LOG_PREFIX} \u76EE\u5F55\u4E3A\u7A7A: ${resolvedStaticDir}\uFF0C\u8DF3\u8FC7\u4E0A\u4F20`);
+      return;
+    }
+    const resolvedTosutilPath = ensureTosutil(tosutilPath, tosutilUrl);
+    const bucketId = await resolveBucketId(appId);
+    console.error(`${LOG_PREFIX} \u8C03\u7528 preUploadStatic...`);
+    const preUploadResp = await fetchPreUpload(appId, bucketId);
+    const { uploadPrefix, uploadID, uploadCredential } = preUploadResp.data;
+    console.error(`${LOG_PREFIX} \u4E0A\u4F20\u76EE\u6807: ${uploadPrefix}`);
+    console.error(`${LOG_PREFIX} \u914D\u7F6E tosutil...`);
+    configureTosutil(resolvedTosutilPath, {
+      endpoint,
+      region,
+      accessKeyID: uploadCredential.accessKeyID,
+      secretAccessKey: uploadCredential.secretAccessKey,
+      sessionToken: uploadCredential.sessionToken
+    });
+    console.error(`${LOG_PREFIX} \u4E0A\u4F20 ${resolvedStaticDir} -> ${uploadPrefix}`);
+    uploadToTos(resolvedTosutilPath, resolvedStaticDir, uploadPrefix);
+    console.error(`${LOG_PREFIX} tosutil \u4E0A\u4F20\u5B8C\u6210`);
+    console.error(`${LOG_PREFIX} \u8C03\u7528 callbackStatic (uploadID: ${uploadID})...`);
+    const callbackResp = await uploadStaticAttachmentCallback(appId, bucketId, { uploadID });
+    if (callbackResp.status_code !== "0") {
+      throw new Error(`callbackStatic \u8FD4\u56DE\u5F02\u5E38, status_code: ${callbackResp.status_code}`);
+    }
+    const attachments = callbackResp.data?.attachments || [];
+    console.error(`${LOG_PREFIX} \u4E0A\u4F20\u5B8C\u6210\uFF0C\u5171 ${attachments.length} \u4E2A\u6587\u4EF6`);
+    console.log(JSON.stringify(callbackResp));
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    console.error(`${LOG_PREFIX} Error: ${message}`);
+    process.exit(1);
+  }
+}
+async function fetchPreUpload(appId, bucketId) {
+  const response = await preUploadStaticAttachment(appId, bucketId);
+  if (response.status_code !== "0") {
+    throw new Error(`preUploadStatic \u8FD4\u56DE\u5F02\u5E38, status_code: ${response.status_code}`);
+  }
+  const { uploadPrefix, uploadID, uploadCredential } = response.data || {};
+  if (!uploadPrefix || !uploadID) {
+    throw new Error("preUploadStatic \u8FD4\u56DE\u6570\u636E\u4E0D\u5B8C\u6574\uFF0C\u7F3A\u5C11 uploadPrefix \u6216 uploadID");
+  }
+  if (!uploadCredential?.accessKeyID || !uploadCredential?.secretAccessKey || !uploadCredential?.sessionToken) {
+    throw new Error("preUploadStatic \u8FD4\u56DE\u7684\u51ED\u8BC1\u5B57\u6BB5\u4E0D\u5B8C\u6574");
+  }
+  return response;
+}
+function ensureTosutil(tosutilPath, tosutilUrl) {
+  if (isTosutilAvailable(tosutilPath)) {
+    console.error(`${LOG_PREFIX} tosutil \u5DF2\u5C31\u7EEA: ${tosutilPath}`);
+    return tosutilPath;
+  }
+  if (!tosutilUrl) {
+    throw new Error(
+      `tosutil \u4E0D\u53EF\u7528 (\u8DEF\u5F84: ${tosutilPath})\uFF0C\u4E14\u672A\u63D0\u4F9B --tosutil-url \u4E0B\u8F7D\u5730\u5740\u3002\u8BF7\u786E\u4FDD tosutil \u5DF2\u5B58\u5728\uFF0C\u6216\u901A\u8FC7 --tosutil-url \u6307\u5B9A\u4E0B\u8F7D\u5730\u5740\u3002`
+    );
+  }
+  console.error(`${LOG_PREFIX} tosutil \u4E0D\u5B58\u5728\uFF0C\u4ECE ${tosutilUrl} \u4E0B\u8F7D...`);
+  downloadTosutil(tosutilUrl, tosutilPath);
+  if (!isTosutilAvailable(tosutilPath)) {
+    throw new Error(`tosutil \u4E0B\u8F7D\u540E\u4ECD\u4E0D\u53EF\u7528 (\u8DEF\u5F84: ${tosutilPath})`);
+  }
+  console.error(`${LOG_PREFIX} tosutil \u4E0B\u8F7D\u5B8C\u6210: ${tosutilPath}`);
+  return tosutilPath;
+}
+function isTosutilAvailable(tosutilPath) {
+  try {
+    execSync3(`${tosutilPath} --version`, { stdio: "pipe" });
+    return true;
+  } catch {
+    return false;
+  }
+}
+function downloadTosutil(url, destPath) {
+  const destDir = path21.dirname(destPath);
+  if (!fs25.existsSync(destDir)) {
+    fs25.mkdirSync(destDir, { recursive: true });
+  }
+  execSync3(`curl -L --fail -o "${destPath}" "${url}"`, { stdio: "pipe" });
+  execSync3(`chmod +x "${destPath}"`, { stdio: "pipe" });
+}
+function configureTosutil(tosutilPath, config) {
+  const { endpoint, region, accessKeyID, secretAccessKey, sessionToken } = config;
+  execSync3(
+    `${tosutilPath} config -e ${endpoint} -i ${accessKeyID} -k ${secretAccessKey} -t ${sessionToken} -re ${region}`,
+    { stdio: "pipe" }
+  );
+}
+function uploadToTos(tosutilPath, sourceDir, destUrl) {
+  execSync3(
+    `${tosutilPath} cp "${sourceDir}" "${destUrl}" -r -flat -j 5 -p 3 -ps 10485760 -f`,
+    { stdio: "inherit" }
+  );
+}
+async function resolveBucketId(appId) {
+  console.error(`${LOG_PREFIX} \u83B7\u53D6\u9ED8\u8BA4\u5B58\u50A8\u6876...`);
+  const bucketId = await getDefaultBucketId(appId);
+  console.error(`${LOG_PREFIX} \u9ED8\u8BA4\u5B58\u50A8\u6876: ${bucketId}`);
+  return bucketId;
+}
+function isDirEmpty(dirPath) {
+  const entries = fs25.readdirSync(dirPath);
+  return entries.length === 0;
+}
+
 // src/commands/build/index.ts
 var getTokenCommand = {
   name: "get-token",
@@ -7233,10 +7387,19 @@ var getTokenCommand = {
     });
   }
 };
+var uploadStaticCommand = {
+  name: "upload-static",
+  description: "Upload shared/static files to TOS",
+  register(program) {
+    program.command(this.name).description(this.description).requiredOption("--app-id <id>", "Application ID").option("--static-dir <dir>", "Static files directory", "shared/static").option("--tosutil-path <path>", "Path to tosutil binary", "/workspace/tosutil").option("--tosutil-url <url>", "URL to download tosutil if not present").option("--endpoint <endpoint>", "TOS endpoint", "tos-cn-beijing.volces.com").option("--region <region>", "TOS region", "cn-beijing").action(async (options) => {
+      await uploadStatic(options);
+    });
+  }
+};
 var buildCommandGroup = {
   name: "build",
   description: "Build related commands",
-  commands: [getTokenCommand]
+  commands: [getTokenCommand, uploadStaticCommand]
 };
 
 // src/commands/index.ts
@@ -7253,12 +7416,12 @@ var commands = [
 ];
 
 // src/index.ts
-var envPath = path21.join(process.cwd(), ".env");
-if (fs25.existsSync(envPath)) {
+var envPath = path22.join(process.cwd(), ".env");
+if (fs26.existsSync(envPath)) {
   dotenvConfig({ path: envPath });
 }
-var __dirname = path21.dirname(fileURLToPath5(import.meta.url));
-var pkg = JSON.parse(fs25.readFileSync(path21.join(__dirname, "../package.json"), "utf-8"));
+var __dirname = path22.dirname(fileURLToPath5(import.meta.url));
+var pkg = JSON.parse(fs26.readFileSync(path22.join(__dirname, "../package.json"), "utf-8"));
 var cli = new FullstackCLI(pkg.version);
 cli.useAll(commands);
 cli.run();

package/package.json

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

package/templates/nest-cli.json

@@ -3,7 +3,7 @@
   "collection": "@nestjs/schematics",
   "sourceRoot": "server",
   "compilerOptions": {
-    "deleteOutDir": true,
+    "deleteOutDir": false,
     "tsConfigPath": "tsconfig.node.json",
     "assets": [
       {

package/templates/scripts/build.sh

@@ -19,28 +19,28 @@ print_time() {
 }
 
 # ==================== 步骤 0 ====================
-echo "🗑️  [0/5] 安装插件"
+echo "🗑️  [0/6] 安装插件"
 STEP_START=$(node -e "console.log(Date.now())")
 npx fullstack-cli action-plugin init
 print_time $STEP_START
 echo ""
 
 # ==================== 步骤 1 ====================
-echo "📝 [1/5] 更新 openapi 代码"
+echo "📝 [1/6] 更新 openapi 代码"
 STEP_START=$(node -e "console.log(Date.now())")
 npm run gen:openapi
 print_time $STEP_START
 echo ""
 
 # ==================== 步骤 2 ====================
-echo "🗑️  [2/5] 清理 dist 目录"
+echo "🗑️  [2/6] 清理 dist 目录"
 STEP_START=$(node -e "console.log(Date.now())")
 rm -rf "$ROOT_DIR/dist"
 print_time $STEP_START
 echo ""
 
 # ==================== 步骤 3 ====================
-echo "🔨 [3/5] 并行构建 server 和 client"
+echo "🔨 [3/6] 并行构建 server 和 client"
 STEP_START=$(node -e "console.log(Date.now())")
 
 # 并行构建
@@ -78,7 +78,7 @@ print_time $STEP_START
 echo ""
 
 # ==================== 步骤 4 ====================
-echo "📦 [4/5] 准备 server 依赖产物"
+echo "📦 [4/6] 准备 server 依赖产物"
 STEP_START=$(node -e "console.log(Date.now())")
 
 mkdir -p "$OUT_DIR/dist/client"
@@ -97,7 +97,7 @@ print_time $STEP_START
 echo ""
 
 # ==================== 步骤 5 ====================
-echo "✂️  [5/5] 智能依赖裁剪"
+echo "✂️  [5/6] 智能依赖裁剪"
 STEP_START=$(node -e "console.log(Date.now())")
 
 # 分析实际依赖、复制并裁剪 node_modules、生成精简的 package.json
@@ -106,6 +106,25 @@ node "$ROOT_DIR/scripts/prune-smart.js"
 print_time $STEP_START
 echo ""
 
+# ==================== 步骤 6 ====================
+echo "☁️  [6/6] 上传静态资源到 TOS"
+STEP_START=$(node -e "console.log(Date.now())")
+
+# 环境变量（与产物上传脚本共享同一 CI 环境）：
+#   app_id      - 应用 ID
+#   tosutil_url - tosutil 下载地址
+# bucket_id 由 CLI 自动通过 get_published_v2 获取，也可通过 --bucket-id 显式指定
+if [ -d "$ROOT_DIR/shared/static" ] && [ "$(ls -A "$ROOT_DIR/shared/static" 2>/dev/null)" ]; then
+  npx fullstack-cli build upload-static \
+    --app-id "${app_id}" \
+    --tosutil-url "${tosutil_url}"
+else
+  echo "   ⏭️  shared/static 目录为空或不存在，跳过上传"
+fi
+
+print_time $STEP_START
+echo ""
+
 # 总耗时
 echo "构建完成"
 print_time $TOTAL_START