@lark-apaas/fullstack-cli 1.1.16-alpha.5 → 1.1.16-alpha.6

package/dist/index.js

@@ -631,7 +631,41 @@ var SYSTEM_TO_BUSINESS = {
   _updated_at: ["updated_at", "updatedAt"],
   _updated_by: ["updated_by", "updatedBy"]
 };
+var SYSTEM_FIELD_COLUMNS = new Set(Object.keys(SYSTEM_TO_BUSINESS));
 var TABLE_FACTORIES = ["pgTable", "pgView", "pgMaterializedView", "table", "view", "materializedView"];
+function extractColumnName(prop) {
+  const initializer = prop.getInitializer();
+  if (!initializer) return void 0;
+  let callExpr = initializer;
+  while (Node8.isCallExpression(callExpr)) {
+    const expr = callExpr.getExpression();
+    if (Node8.isPropertyAccessExpression(expr)) {
+      const baseExpr = expr.getExpression();
+      if (Node8.isCallExpression(baseExpr)) {
+        callExpr = baseExpr;
+        continue;
+      }
+    }
+    break;
+  }
+  if (!Node8.isCallExpression(callExpr)) return void 0;
+  const args = callExpr.getArguments();
+  if (args.length === 0) return void 0;
+  const firstArg = args[0];
+  if (Node8.isStringLiteral(firstArg)) {
+    return firstArg.getLiteralText();
+  }
+  return void 0;
+}
+function getPropertyName(prop) {
+  const nameNode = prop.getNameNode();
+  if (Node8.isStringLiteral(nameNode)) {
+    return nameNode.getLiteralText();
+  } else if (Node8.isIdentifier(nameNode)) {
+    return nameNode.getText();
+  }
+  return "";
+}
 var removeSystemFieldsTransform = {
   name: "remove-system-fields",
   transform(ctx) {
@@ -658,21 +692,20 @@ var removeSystemFieldsTransform = {
       if (!Node8.isObjectLiteralExpression(columnsArg)) {
         return;
       }
-      const fieldNames = /* @__PURE__ */ new Set();
       const properties = columnsArg.getProperties();
+      const allPropertyNames = /* @__PURE__ */ new Set();
+      const allColumnNames = /* @__PURE__ */ new Set();
       for (const prop of properties) {
         if (!Node8.isPropertyAssignment(prop)) {
           continue;
         }
-        const nameNode = prop.getNameNode();
-        let fieldName = "";
-        if (Node8.isStringLiteral(nameNode)) {
-          fieldName = nameNode.getLiteralText();
-        } else if (Node8.isIdentifier(nameNode)) {
-          fieldName = nameNode.getText();
+        const propName = getPropertyName(prop);
+        if (propName) {
+          allPropertyNames.add(propName);
         }
-        if (fieldName) {
-          fieldNames.add(fieldName);
+        const columnName = extractColumnName(prop);
+        if (columnName) {
+          allColumnNames.add(columnName);
         }
       }
       const propsToRemove = [];
@@ -680,25 +713,24 @@ var removeSystemFieldsTransform = {
         if (!Node8.isPropertyAssignment(prop)) {
           continue;
         }
-        const nameNode = prop.getNameNode();
-        let fieldName = "";
-        if (Node8.isStringLiteral(nameNode)) {
-          fieldName = nameNode.getLiteralText();
-        } else if (Node8.isIdentifier(nameNode)) {
-          fieldName = nameNode.getText();
+        const propName = getPropertyName(prop);
+        const columnName = extractColumnName(prop);
+        const systemFieldKey = SYSTEM_FIELD_COLUMNS.has(propName) ? propName : columnName && SYSTEM_FIELD_COLUMNS.has(columnName) ? columnName : null;
+        if (!systemFieldKey) {
+          continue;
+        }
+        const businessFields = SYSTEM_TO_BUSINESS[systemFieldKey];
+        if (!businessFields) {
+          continue;
         }
-        const businessFields = SYSTEM_TO_BUSINESS[fieldName];
-        if (businessFields && businessFields.some((bf) => fieldNames.has(bf))) {
+        const hasBusinessField = businessFields.some(
+          (bf) => allPropertyNames.has(bf) || allColumnNames.has(bf)
+        );
+        if (hasBusinessField) {
           propsToRemove.push(prop);
         }
       }
       for (const prop of propsToRemove) {
-        const leadingCommentRanges = prop.getLeadingCommentRanges();
-        for (const comment of leadingCommentRanges) {
-          const commentText = comment.getText();
-          if (commentText.includes("System field:")) {
-          }
-        }
         prop.remove();
         stats.removedSystemFields++;
       }
@@ -3606,17 +3638,17 @@ function analyzeImports(sourceFile) {
 }
 
 // src/commands/migration/versions/v001_capability/code-migrator/analyzers/call-site-analyzer.ts
-import { SyntaxKind as SyntaxKind5 } from "ts-morph";
+import { SyntaxKind as SyntaxKind4 } 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(SyntaxKind5.CallExpression);
+  const callExpressions = sourceFile.getDescendantsOfKind(SyntaxKind4.CallExpression);
   for (const callExpr of callExpressions) {
     const expression = callExpr.getExpression();
-    if (expression.getKind() === SyntaxKind5.Identifier) {
+    if (expression.getKind() === SyntaxKind4.Identifier) {
       const functionName = expression.getText();
       const capabilityId = importMap.get(functionName);
       if (capabilityId) {
@@ -3629,11 +3661,11 @@ function analyzeCallSites(sourceFile, imports) {
           text: callExpr.getText()
         });
       }
-    } else if (expression.getKind() === SyntaxKind5.PropertyAccessExpression) {
-      const propAccess = expression.asKind(SyntaxKind5.PropertyAccessExpression);
+    } else if (expression.getKind() === SyntaxKind4.PropertyAccessExpression) {
+      const propAccess = expression.asKind(SyntaxKind4.PropertyAccessExpression);
       if (propAccess) {
         const objectExpr = propAccess.getExpression();
-        if (objectExpr.getKind() === SyntaxKind5.Identifier) {
+        if (objectExpr.getKind() === SyntaxKind4.Identifier) {
           const objectName = objectExpr.getText();
           const capabilityId = importMap.get(objectName);
           if (capabilityId) {
@@ -3862,7 +3894,7 @@ function addInjection(sourceFile) {
 }
 
 // src/commands/migration/versions/v001_capability/code-migrator/transformers/call-site-transformer.ts
-import { SyntaxKind as SyntaxKind6 } from "ts-morph";
+import { SyntaxKind as SyntaxKind5 } from "ts-morph";
 var DEFAULT_ACTION_NAME = "run";
 function generateNewCallText(capabilityId, actionName, args) {
   const argsText = args.trim() || "{}";
@@ -3877,19 +3909,19 @@ function transformCallSites(sourceFile, imports) {
     });
   }
   let replacedCount = 0;
-  const callExpressions = sourceFile.getDescendantsOfKind(SyntaxKind6.CallExpression);
+  const callExpressions = sourceFile.getDescendantsOfKind(SyntaxKind5.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() === SyntaxKind6.Identifier) {
+    if (expression.getKind() === SyntaxKind5.Identifier) {
       const functionName = expression.getText();
       importInfo = importMap.get(functionName);
-    } 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();
           importInfo = importMap.get(objectName);
         }

package/package.json

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