joist-core 2.4.0-next.39 → 2.4.0-next.40

package/build/EntityManager.cjs

@@ -527,14 +527,14 @@ var EntityManager = class EntityManager {
 		const todo = /* @__PURE__ */ new Set();
 		const skipMap = /* @__PURE__ */ new WeakMap();
 		await crawl(todo, skipMap, Array.isArray(entityOrArray) ? entityOrArray : [entityOrArray], deep, {
-			skipIf,
+			skipIf: (entity) => invokeCloneCallback(skipIf, entity) ?? false,
 			skip
 		});
 		const deferredRelations = [];
 		const overrideMap = /* @__PURE__ */ new WeakMap();
 		const clones = [...todo].map((entity) => {
 			const skip = skipMap.get(entity) ?? [];
-			const override = overrides?.(entity) ?? {};
+			const override = invokeCloneCallback(overrides, entity) ?? {};
 			overrideMap.set(entity, override);
 			const meta = require_EntityMetadata.getMetadata(entity);
 			const copy = Object.fromEntries(Object.values(meta.allFields).map((f) => {
@@ -587,7 +587,7 @@ var EntityManager = class EntityManager {
 		deferredRelations.forEach(([source, fieldName, target]) => {
 			entityToClone.get(source)[fieldName].set(entityToClone.get(target));
 		});
-		if (postClone) await Promise.all(clones.map(([original, clone]) => postClone(original, clone)));
+		if (postClone) await Promise.all(clones.map((pair) => invokeCloneCallback(postClone, ...pair)));
 		return Array.isArray(entityOrArray) ? entityOrArray.filter((original) => entityToClone.has(original)).map((original) => entityToClone.get(original)) : clones[0] ? clones[0][1] : require_utils.fail("no entities were cloned given the provided options");
 	}
 	/**
@@ -1775,6 +1775,18 @@ function recalcSynchronousDerivedFields(todos) {
 		}
 	}
 }
+/** Invokes only the most specific handler, falling back to a base type when no concrete-type handler exists. */
+function invokeCloneCallback(callback, ...args) {
+	if (typeof callback === "function") return callback(...args);
+	if (!callback) return void 0;
+	const handlers = callback;
+	let meta = require_EntityMetadata.getMetadata(args[0]);
+	while (meta) {
+		const handler = Object.hasOwn(handlers, meta.type) ? handlers[meta.type] : void 0;
+		if (handler) return handler(...args);
+		meta = meta.baseType ? require_configure.getMetadataForType(meta.baseType) : void 0;
+	}
+}
 /** Recursively crawls through `entity`, with the given populate `deep` hint, and adds anything found to `found`. */
 async function crawl(found, skipMap, entities, deep, opts = {}) {
 	const { skipIf = () => false } = opts ?? {};