@lark-apaas/fullstack-cli 1.1.54 → 1.1.55-alpha.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) {
@@ -5647,17 +5760,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) {
@@ -5670,11 +5783,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) {
@@ -5903,7 +6016,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() || "{}";
@@ -5918,19 +6031,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);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/fullstack-cli",
-  "version": "1.1.54",
+  "version": "1.1.55-alpha.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", ".claude", "tmp", ".spark_project", ".playwright-cli"]
+hidden = [".config", ".git", "scripts", "node_modules", "dist", ".spark", ".agent", ".agents", "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", ".claude", "tmp", ".spark_project", ".playwright-cli"]
+pathPatterns = [".config", ".git", "scripts", "node_modules", "dist", ".spark", ".agent", ".agents", "tmp", ".spark_project", ".playwright-cli"]