@cap-js/change-tracking 2.0.0-beta.4 → 2.0.0-beta.6

package/lib/utils/change-tracking.js

@@ -166,6 +166,12 @@ function extractTrackedColumns(entity, model = cds.context?.model ?? cds.model,
 		const entry = { name: name, type: col.type };
 
 		if (isAssociation) {
+			// Check if association target has a table
+			const targetEntity = model.definitions[col.target];
+			if (!targetEntity || targetEntity['@cds.persistence.skip'] === true) {
+				LOG.warn(`Skipped @changelog for ${name} on entity ${entity.name}: Association target "${col.target}" is annotated with @cds.persistence.skip!`);
+				continue;
+			}
 			entry.target = col.target;
 			// Use the resolved changelog annotation (which could be from override)
 			if (Array.isArray(changelogAnnotation) && changelogAnnotation.length > 0) {
@@ -173,7 +179,9 @@ function extractTrackedColumns(entity, model = cds.context?.model ?? cds.model,
 				const changelogPaths = changelogAnnotation.map((c) => c['=']);
 				for (const path of changelogPaths) {
 					const p = validateChangelogPath(entity, path, model);
-					if (p) alt.push(p);
+					if (!p) continue;
+					if (p.includes('.')) alt.push({ path: p, source: 'assoc' });
+					else alt.push({ path: p, source: 'local' });
 				}
 				if (alt.length > 0) entry.alt = alt;
 			}
@@ -352,6 +360,7 @@ function getCompositionParentBinding(targetEntity, rootEntity) {
 }
 
 function getLocalizedLookupInfo(targetEntityName, altFields, model = cds.context?.model ?? cds.model) {
+	if (!altFields || altFields.length === 0) return null;
 	const targetEntity = model.definitions[targetEntityName];
 	if (!targetEntity) return null;
 

package/lib/utils/entity-collector.js

@@ -227,6 +227,25 @@ function getBaseEntity(entity, model) {
 	}
 }
 
+function getBaseElement(element, entity, model) {
+	const cqn = entity.projection ?? entity.query?.SELECT;
+	if (!cqn) return null;
+	element = cqn.columns?.find((c) => c.as === element && c.ref)?.ref?.[0] ?? element;
+
+	const baseRef = cqn.from?.ref?.[0];
+	if (!baseRef || !model) return null;
+
+	const baseEntity = model.definitions[baseRef];
+	if (!baseEntity) return null;
+	const baseCQN = baseEntity.projection ?? baseEntity.query?.SELECT ?? baseEntity.query?.SET;
+	// If base entity is also a projection, recurse
+	if (baseCQN) {
+		return getBaseElement(element, baseEntity, model);
+	} else {
+		return { baseRef, baseElement: element };
+	}
+}
+
 // Analyze composition hierarchy in CSN
 function analyzeCompositions(csn) {
 	// First pass: build child -> { parent, compositionField } map
@@ -318,5 +337,6 @@ module.exports = {
 	getBaseEntity,
 	analyzeCompositions,
 	getService,
-	collectEntities
+	collectEntities,
+	getBaseElement
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@cap-js/change-tracking",
-	"version": "2.0.0-beta.4",
+	"version": "2.0.0-beta.6",
 	"publishConfig": {
 		"access": "public",
 		"tag": "beta"
@@ -45,7 +45,8 @@
 			"change-tracking": {
 				"model": "@cap-js/change-tracking",
 				"maxDisplayHierarchyDepth": 3,
-				"preserveDeletes": false
+				"preserveDeletes": false,
+				"procedureForRestoringBacklinks": true
 			}
 		}
 	},