@zenstackhq/cli 3.6.4 → 3.7.0

package/dist/index.mjs

@@ -3,7 +3,7 @@ import { ZModelCodeGenerator, ZModelLanguageMetaData, formatDocument, loadDocume
 import colors from "colors";
 import { Command, CommanderError, Option } from "commander";
 import "dotenv/config";
-import { DataModel, Enum, isDataSource, isEnum, isInvocationExpr, isLiteralExpr, isPlugin } from "@zenstackhq/language/ast";
+import { DataModel, Enum, isDataField, isDataSource, isEnum, isInvocationExpr, isLiteralExpr, isPlugin } from "@zenstackhq/language/ast";
 import path from "node:path";
 import { invariant, lowerCaseFirst, singleDebounce } from "@zenstackhq/common-helpers";
 import { PrismaSchemaGenerator, TsSchemaGenerator } from "@zenstackhq/sdk";
@@ -18,7 +18,7 @@ import { execSync } from "child_process";
 import { fileURLToPath as fileURLToPath$1 } from "url";
 import { DataFieldAttributeFactory, DataFieldFactory, DataModelFactory, EnumFactory } from "@zenstackhq/language/factory";
 import { AstUtils } from "langium";
-import { getLiteral, getLiteralArray, getStringLiteral } from "@zenstackhq/language/utils";
+import { getAttributeArgLiteral, getLiteral, getLiteralArray, getStringLiteral } from "@zenstackhq/language/utils";
 import { watch } from "chokidar";
 import semver from "semver";
 import { detect, resolveCommand } from "package-manager-detector";
@@ -400,6 +400,18 @@ function getRelationFkName(decl) {
 	return ((decl?.attributes.find((a) => a.decl.ref?.name === "@relation"))?.args.find((a) => a.name === "map")?.value)?.value;
 }
 /**
+* Gets the relation name from the @relation attribute's `name` argument.
+* e.g., @relation('myRelation', fields: [...], references: [...]) -> "myRelation"
+* e.g., @relation(name: 'myRelation', fields: [...], references: [...]) -> "myRelation"
+* e.g., @relation(fields: [...], references: [...]) -> undefined
+* e.g., @relation('backRef') -> "backRef"
+*/
+function getRelationName(decl) {
+	const relationAttr = decl?.attributes?.find((a) => a.decl?.ref?.name === "@relation");
+	if (!relationAttr) return void 0;
+	return getAttributeArgLiteral(relationAttr, "name");
+}
+/**
 * Gets the FK field names from the @relation attribute's `fields` argument.
 * Returns a sorted, comma-separated string of field names for comparison.
 * e.g., @relation(fields: [userId], references: [id]) -> "userId"
@@ -2146,6 +2158,16 @@ const providers = {
 };
 //#endregion
 //#region src/actions/db.ts
+function hasRelationFieldsArg(field) {
+	return !!field.attributes.find((a) => a.decl.ref?.name === "@relation")?.args.some((a) => a.name === "fields");
+}
+function getReferencedModelName(field) {
+	return field.type.reference?.ref ? getDbName(field.type.reference.ref) : void 0;
+}
+function matchesRelationNameFallback(field, relationName, candidate) {
+	const referencedModelName = getReferencedModelName(field);
+	return !!referencedModelName && getRelationName(candidate) === relationName && hasRelationFieldsArg(candidate) === hasRelationFieldsArg(field) && getReferencedModelName(candidate) === referencedModelName;
+}
 /**
 * CLI action for db related commands
 */
@@ -2305,16 +2327,21 @@ async function runPull(options) {
 			}
 			newDataModel.fields.forEach((f) => {
 				let originalFields = originalDataModel.fields.filter((d) => getDbName(d) === getDbName(f));
-				const isRelationField = f.$type === "DataField" && !!f.attributes?.some((a) => a?.decl?.ref?.name === "@relation");
-				if (originalFields.length === 0 && isRelationField && !getRelationFieldsKey(f)) return;
 				if (originalFields.length === 0) {
-					const newFieldsKey = getRelationFieldsKey(f);
-					if (newFieldsKey) originalFields = originalDataModel.fields.filter((d) => getRelationFieldsKey(d) === newFieldsKey);
+					const newFieldsKey = isDataField(f) ? getRelationFieldsKey(f) : void 0;
+					if (newFieldsKey) originalFields = originalDataModel.fields.filter((d) => isDataField(d) && getRelationFieldsKey(d) === newFieldsKey);
 				}
-				if (originalFields.length === 0) originalFields = originalDataModel.fields.filter((d) => getRelationFkName(d) === getRelationFkName(f) && !!getRelationFkName(d) && !!getRelationFkName(f));
-				if (originalFields.length === 0) originalFields = originalDataModel.fields.filter((d) => f.$type === "DataField" && d.$type === "DataField" && f.type.reference?.ref && d.type.reference?.ref && getDbName(f.type.reference.ref) === getDbName(d.type.reference.ref));
+				if (originalFields.length === 0) {
+					const newFkName = isDataField(f) ? getRelationFkName(f) : void 0;
+					if (newFkName) originalFields = originalDataModel.fields.filter((d) => isDataField(d) && getRelationFkName(d) === newFkName);
+				}
+				if (originalFields.length === 0) {
+					const newRelName = isDataField(f) ? getRelationName(f) : void 0;
+					if (newRelName) originalFields = originalDataModel.fields.filter((d) => isDataField(d) && isDataField(f) && matchesRelationNameFallback(f, newRelName, d));
+				}
+				if (originalFields.length === 0) originalFields = originalDataModel.fields.filter((d) => isDataField(f) && isDataField(d) && f.type.reference?.ref && d.type.reference?.ref && getDbName(f.type.reference.ref) === getDbName(d.type.reference.ref));
 				if (originalFields.length > 1) {
-					if (!!getRelationFieldsKey(f)) console.warn(colors.yellow(`Found more original fields, need to tweak the search algorithm. ${originalDataModel.name}->[${originalFields.map((of) => of.name).join(", ")}](${f.name})`));
+					if (!(isDataField(f) && !getRelationFieldsKey(f))) console.warn(colors.yellow(`Found more original fields, need to tweak the search algorithm. ${originalDataModel.name}->[${originalFields.map((of) => of.name).join(", ")}](${f.name})`));
 					return;
 				}
 				const originalField = originalFields.at(0);
@@ -2409,12 +2436,19 @@ async function runPull(options) {
 			});
 			originalDataModel.fields.filter((f) => {
 				if (newDataModel.fields.find((d) => getDbName(d) === getDbName(f))) return false;
-				const originalFieldsKey = getRelationFieldsKey(f);
+				const originalFieldsKey = isDataField(f) ? getRelationFieldsKey(f) : void 0;
 				if (originalFieldsKey) {
-					if (newDataModel.fields.find((d) => getRelationFieldsKey(d) === originalFieldsKey)) return false;
+					if (newDataModel.fields.find((d) => isDataField(d) && getRelationFieldsKey(d) === originalFieldsKey)) return false;
+				}
+				const originalFkName = isDataField(f) ? getRelationFkName(f) : void 0;
+				if (originalFkName) {
+					if (newDataModel.fields.find((d) => isDataField(d) && getRelationFkName(d) === originalFkName)) return false;
+				}
+				const originalRelName = isDataField(f) ? getRelationName(f) : void 0;
+				if (originalRelName) {
+					if (newDataModel.fields.find((d) => isDataField(d) && isDataField(f) && matchesRelationNameFallback(f, originalRelName, d))) return false;
 				}
-				if (newDataModel.fields.find((d) => getRelationFkName(d) === getRelationFkName(f) && !!getRelationFkName(d) && !!getRelationFkName(f))) return false;
-				return !newDataModel.fields.find((d) => f.$type === "DataField" && d.$type === "DataField" && f.type.reference?.ref && d.type.reference?.ref && getDbName(f.type.reference.ref) === getDbName(d.type.reference.ref));
+				return !newDataModel.fields.find((d) => isDataField(f) && isDataField(d) && f.type.reference?.ref && d.type.reference?.ref && getDbName(f.type.reference.ref) === getDbName(d.type.reference.ref));
 			}).forEach((f) => {
 				const _model = f.$container;
 				const index = _model.fields.findIndex((d) => d === f);