joist-core 2.3.0 → 2.4.0-next.2

package/build/batchloaders/recursiveParentsBatchLoader.d.cts.map

@@ -0,0 +1 @@
+{"version":3,"file":"recursiveParentsBatchLoader.d.cts","names":[],"sources":["../../src/batchloaders/recursiveParentsBatchLoader.ts"],"mappings":";;;;;cAea;iBAEG,4BAA4B,UAAU,QAAQ,UAAU,QACtE,IAAI,eACJ,YAAY,+BAA+B,GAAG,KAC7C,YAAY"}

package/build/batchloaders/recursiveParentsBatchLoader.d.mts

@@ -0,0 +1,10 @@
+import { BatchLoader } from "./BatchLoader.mjs";
+import { RecursiveParentsCollectionImpl } from "../relations/RecursiveCollection.mjs";
+import { EntityManager } from "../EntityManager.mjs";
+import { Entity } from "../Entity.mjs";
+//#region src/batchloaders/recursiveParentsBatchLoader.d.ts
+declare const recursiveParentsOperation = "m2o-recursive";
+declare function recursiveParentsBatchLoader<T extends Entity, U extends Entity>(em: EntityManager, collection: RecursiveParentsCollectionImpl<T, U>): BatchLoader<Entity>;
+//#endregion
+export { recursiveParentsBatchLoader, recursiveParentsOperation };
+//# sourceMappingURL=recursiveParentsBatchLoader.d.mts.map

package/build/batchloaders/recursiveParentsBatchLoader.d.mts.map

@@ -0,0 +1 @@
+{"version":3,"file":"recursiveParentsBatchLoader.d.mts","names":[],"sources":["../../src/batchloaders/recursiveParentsBatchLoader.ts"],"mappings":";;;;;cAea;iBAEG,4BAA4B,UAAU,QAAQ,UAAU,QACtE,IAAI,eACJ,YAAY,+BAA+B,GAAG,KAC7C,YAAY"}

package/build/batchloaders/recursiveParentsBatchLoader.js

@@ -1,60 +1,63 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.recursiveParentsOperation = void 0;
-exports.recursiveParentsBatchLoader = recursiveParentsBatchLoader;
-const configure_1 = require("../configure");
-const index_1 = require("../index");
-const utils_1 = require("../utils");
-exports.recursiveParentsOperation = "m2o-recursive";
+import "./BatchLoader.js";
+import "../relations/RecursiveCollection.js";
+import { getField } from "../fields.js";
+import { deTagIds } from "../keys.js";
+import { kq } from "../queries/sql/keywords.js";
+import { addTablePerClassJoinsAndClassTag } from "../queries/find/QueryParser.js";
+import { abbreviation } from "../utils.js";
+import { getMetadataForType } from "../configure.js";
+import "../index.js";
+import "../EntityManager.js";
+import "../Entity.js";
+//#region src/batchloaders/recursiveParentsBatchLoader.ts
+const recursiveParentsOperation = "m2o-recursive";
 function recursiveParentsBatchLoader(em, collection) {
-    let { meta, fieldName } = collection;
-    // This could be called from subtypes to get relations defined on the parent. So we need to make sure we are using the
-    // correct meta by walking the inheritance tree until we find the meta that actually has the root m2o field
-    // We intentionally don't use getMetadataForField here because CTI-specialized fields stay on the subtype metadata,
-    // while these raw recursive CTEs need the metadata/table that physically owns the FK column.
-    while (!(collection.m2oFieldName in meta.fields) && meta.baseType)
-        meta = (0, configure_1.getMetadataForType)(meta.baseType);
-    const batchKey = `${meta.tableName}-${fieldName}`;
-    return em.getBatchLoader(exports.recursiveParentsOperation, batchKey, async (children) => {
-        const m2o = meta.allFields[collection.m2oFieldName];
-        // ...can `getField` return a new entity? In theory, we shouldn't see new entities because
-        // RecursiveParentsCollectionImpl.load/isLoaded will see the `ManyToOneReferenceImpl` as loaded.
-        const immediateParentIds = children.map((c) => (0, index_1.getField)(c, m2o.fieldName)).filter((id) => id !== undefined);
-        const { columnName } = m2o.serde.columns[0];
-        const alias = (0, utils_1.abbreviation)(meta.tableName);
-        const query = {
-            selects: [`"${alias}".*`],
-            tables: [
-                // We still select directly from our table, and join into the CTE so that we
-                // can use `addTablePerClassJoinsAndClassTag` to get inheritance added for free.
-                { alias, join: "primary", table: meta.tableName },
-                { alias: `${alias}_cte`, join: "inner", table: `${alias}_cte`, col1: `${alias}.id`, col2: `${alias}_cte.id` },
-            ],
-            orderBys: [{ alias, column: "id", order: "ASC" }],
-            ctes: [
-                {
-                    alias: `${alias}_cte`,
-                    query: {
-                        kind: "raw",
-                        // b is our base case, which is the immediate parents of the children we're loading,
-                        // and r is the recursive case of finding their parents.
-                        sql: `
-              SELECT b.id, b.${columnName} FROM ${(0, index_1.kq)(meta.tableName)} b WHERE b.id = ANY(?)
+	let { meta, fieldName } = collection;
+	while (!(collection.m2oFieldName in meta.fields) && meta.baseType) meta = getMetadataForType(meta.baseType);
+	const batchKey = `${meta.tableName}-${fieldName}`;
+	return em.getBatchLoader(recursiveParentsOperation, batchKey, async (children) => {
+		const m2o = meta.allFields[collection.m2oFieldName];
+		const immediateParentIds = children.map((c) => getField(c, m2o.fieldName)).filter((id) => id !== void 0);
+		const { columnName } = m2o.serde.columns[0];
+		const alias = abbreviation(meta.tableName);
+		const query = {
+			selects: [`"${alias}".*`],
+			tables: [{
+				alias,
+				join: "primary",
+				table: meta.tableName
+			}, {
+				alias: `${alias}_cte`,
+				join: "inner",
+				table: `${alias}_cte`,
+				col1: `${alias}.id`,
+				col2: `${alias}_cte.id`
+			}],
+			orderBys: [{
+				alias,
+				column: "id",
+				order: "ASC"
+			}],
+			ctes: [{
+				alias: `${alias}_cte`,
+				query: {
+					kind: "raw",
+					sql: `
+              SELECT b.id, b.${columnName} FROM ${kq(meta.tableName)} b WHERE b.id = ANY(?)
               UNION
-              SELECT r.id, r.${columnName} FROM ${(0, index_1.kq)(meta.tableName)} r JOIN ${alias}_cte ON r.id = ${alias}_cte.${columnName}
+              SELECT r.id, r.${columnName} FROM ${kq(meta.tableName)} r JOIN ${alias}_cte ON r.id = ${alias}_cte.${columnName}
             `,
-                        bindings: [(0, index_1.unsafeDeTagIds)(immediateParentIds)],
-                    },
-                    recursive: true,
-                },
-            ],
-        };
-        (0, index_1.addTablePerClassJoinsAndClassTag)(query, meta, alias, true);
-        const rows = await em["executeFind"](meta, exports.recursiveParentsOperation, query, {});
-        // Since we're preloading m2os up the tree, merely having the entities in the EM is enough
-        // for the ManyToOneReferenceImpl to find them, so we don't need to map them back to the
-        // keys, or push them into the preloader cache.
-        em.hydrate(meta.cstr, rows);
-    });
+					bindings: [deTagIds(meta, immediateParentIds)]
+				},
+				recursive: true
+			}]
+		};
+		addTablePerClassJoinsAndClassTag(query, meta, alias, true);
+		const rowData = await em["executeFindRowData"](meta, recursiveParentsOperation, query, {});
+		em["hydrateAndFinalize"](meta.cstr, rowData);
+	});
 }
+//#endregion
+export { recursiveParentsBatchLoader, recursiveParentsOperation };
+
 //# sourceMappingURL=recursiveParentsBatchLoader.js.map

package/build/batchloaders/recursiveParentsBatchLoader.js.map

@@ -1 +1 @@
-{"version":3,"file":"recursiveParentsBatchLoader.js","sourceRoot":"","sources":["../../src/batchloaders/recursiveParentsBatchLoader.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"recursiveParentsBatchLoader.js","names":[],"sources":["../../src/batchloaders/recursiveParentsBatchLoader.ts"],"sourcesContent":["import { type BatchLoader } from \"src/batchloaders/BatchLoader.ts\";\nimport { getMetadataForType } from \"src/configure.ts\";\nimport { type Entity } from \"src/Entity.ts\";\nimport { type EntityManager } from \"src/EntityManager.ts\";\nimport {\n  type ManyToOneField,\n  type ParsedFindQuery,\n  addTablePerClassJoinsAndClassTag,\n  deTagIds,\n  getField,\n  kq,\n} from \"src/index.ts\";\nimport { type RecursiveParentsCollectionImpl } from \"src/relations/RecursiveCollection.ts\";\nimport { abbreviation } from \"src/utils.ts\";\n\nexport const recursiveParentsOperation = \"m2o-recursive\";\n\nexport function recursiveParentsBatchLoader<T extends Entity, U extends Entity>(\n  em: EntityManager,\n  collection: RecursiveParentsCollectionImpl<T, U>,\n): BatchLoader<Entity> {\n  let { meta, fieldName } = collection;\n  // This could be called from subtypes to get relations defined on the parent. So we need to make sure we are using the\n  // correct meta by walking the inheritance tree until we find the meta that actually has the root m2o field\n  // We intentionally don't use getMetadataForField here because CTI-specialized fields stay on the subtype metadata,\n  // while these raw recursive CTEs need the metadata/table that physically owns the FK column.\n  while (!(collection.m2oFieldName in meta.fields) && meta.baseType) meta = getMetadataForType(meta.baseType);\n  const batchKey = `${meta.tableName}-${fieldName}`;\n  return em.getBatchLoader(recursiveParentsOperation, batchKey, async (children) => {\n    const m2o = meta.allFields[collection.m2oFieldName] as ManyToOneField;\n    // ...can `getField` return a new entity? In theory, we shouldn't see new entities because\n    // RecursiveParentsCollectionImpl.load/isLoaded will see the `ManyToOneReferenceImpl` as loaded.\n    const immediateParentIds = children.map((c) => getField(c, m2o.fieldName)).filter((id: any) => id !== undefined);\n    const { columnName } = m2o.serde.columns[0];\n\n    const alias = abbreviation(meta.tableName);\n    const query: ParsedFindQuery = {\n      selects: [`\"${alias}\".*`],\n      tables: [\n        // We still select directly from our table, and join into the CTE so that we\n        // can use `addTablePerClassJoinsAndClassTag` to get inheritance added for free.\n        { alias, join: \"primary\", table: meta.tableName },\n        { alias: `${alias}_cte`, join: \"inner\", table: `${alias}_cte`, col1: `${alias}.id`, col2: `${alias}_cte.id` },\n      ],\n      orderBys: [{ alias, column: \"id\", order: \"ASC\" }],\n      ctes: [\n        {\n          alias: `${alias}_cte`,\n          query: {\n            kind: \"raw\",\n            // b is our base case, which is the immediate parents of the children we're loading,\n            // and r is the recursive case of finding their parents.\n            sql: `\n              SELECT b.id, b.${columnName} FROM ${kq(meta.tableName)} b WHERE b.id = ANY(?)\n              UNION\n              SELECT r.id, r.${columnName} FROM ${kq(meta.tableName)} r JOIN ${alias}_cte ON r.id = ${alias}_cte.${columnName}\n            `,\n            bindings: [deTagIds(meta, immediateParentIds)],\n          },\n          recursive: true,\n        },\n      ],\n    };\n\n    addTablePerClassJoinsAndClassTag(query, meta, alias, true);\n\n    const rowData = await em[\"executeFindRowData\"](meta, recursiveParentsOperation, query, {});\n\n    // Since we're preloading m2os up the tree, merely having the entities in the EM is enough\n    // for the ManyToOneReferenceImpl to find them, so we don't need to map them back to the\n    // keys, or push them into the preloader cache.\n    em[\"hydrateAndFinalize\"](meta.cstr, rowData);\n  });\n}\n"],"mappings":";;;;;;;;;;;;AAeA,MAAa,4BAA4B;AAEzC,SAAgB,4BACd,IACA,YACqB;CACrB,IAAI,EAAE,MAAM,cAAc;CAK1B,OAAO,EAAE,WAAW,gBAAgB,KAAK,WAAW,KAAK,UAAU,OAAO,mBAAmB,KAAK,QAAQ;CAC1G,MAAM,WAAW,GAAG,KAAK,UAAU,GAAG;CACtC,OAAO,GAAG,eAAe,2BAA2B,UAAU,OAAO,aAAa;EAChF,MAAM,MAAM,KAAK,UAAU,WAAW;EAGtC,MAAM,qBAAqB,SAAS,KAAK,MAAM,SAAS,GAAG,IAAI,SAAS,CAAC,CAAC,CAAC,QAAQ,OAAY,OAAO,KAAA,CAAS;EAC/G,MAAM,EAAE,eAAe,IAAI,MAAM,QAAQ;EAEzC,MAAM,QAAQ,aAAa,KAAK,SAAS;EACzC,MAAM,QAAyB;GAC7B,SAAS,CAAC,IAAI,MAAM,IAAI;GACxB,QAAQ,CAGN;IAAE;IAAO,MAAM;IAAW,OAAO,KAAK;GAAU,GAChD;IAAE,OAAO,GAAG,MAAM;IAAO,MAAM;IAAS,OAAO,GAAG,MAAM;IAAO,MAAM,GAAG,MAAM;IAAM,MAAM,GAAG,MAAM;GAAS,CAC9G;GACA,UAAU,CAAC;IAAE;IAAO,QAAQ;IAAM,OAAO;GAAM,CAAC;GAChD,MAAM,CACJ;IACE,OAAO,GAAG,MAAM;IAChB,OAAO;KACL,MAAM;KAGN,KAAK;+BACc,WAAW,QAAQ,GAAG,KAAK,SAAS,EAAE;;+BAEtC,WAAW,QAAQ,GAAG,KAAK,SAAS,EAAE,UAAU,MAAM,iBAAiB,MAAM,OAAO,WAAW;;KAElH,UAAU,CAAC,SAAS,MAAM,kBAAkB,CAAC;IAC/C;IACA,WAAW;GACb,CACF;EACF;EAEA,iCAAiC,OAAO,MAAM,OAAO,IAAI;EAEzD,MAAM,UAAU,MAAM,GAAG,qBAAqB,CAAC,MAAM,2BAA2B,OAAO,CAAC,CAAC;EAKzF,GAAG,qBAAqB,CAAC,KAAK,MAAM,OAAO;CAC7C,CAAC;AACH"}

package/build/changes.cjs

@@ -0,0 +1,221 @@
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+require("./relations/EnumCollection.cjs");
+const require_fields = require("./fields.cjs");
+const require_relations_LazyField = require("./relations/LazyField.cjs");
+const require_utils = require("./utils.cjs");
+require("./typeMap.cjs");
+const require_EntityMetadata = require("./EntityMetadata.cjs");
+require("./index.cjs");
+const require_EntityManager = require("./EntityManager.cjs");
+const require_Entity = require("./Entity.cjs");
+const require_BaseEntity = require("./BaseEntity.cjs");
+//#region src/changes.ts
+/**
+* Provides a base class for field/primitive & m2o status impls.
+*
+* We use a separate base class so that the primitive & m2o subtypes can have their own
+* `kind: ...` consts, that if the m2o just subtyped the primitive directly, wouldn't be
+* allowed.
+*/
+var BaseFieldStatusImpl = class {
+	entity;
+	fieldName;
+	constructor(entity, fieldName) {
+		this.entity = entity;
+		this.fieldName = fieldName;
+	}
+	get originalValue() {
+		const { originalData, data } = require_BaseEntity.getInstanceData(this.entity);
+		const value = this.fieldName in originalData ? originalData[this.fieldName] : require_fields.getField(this.entity, this.fieldName);
+		return value === require_relations_LazyField.notLoadedValue ? void 0 : value;
+	}
+	get hasChanged() {
+		const { originalData, data } = require_BaseEntity.getInstanceData(this.entity);
+		return this.entity.isNewEntity ? data[this.fieldName] !== void 0 : this.fieldName in originalData;
+	}
+	get hasUpdated() {
+		const { originalData } = require_BaseEntity.getInstanceData(this.entity);
+		return !this.entity.isNewEntity && this.fieldName in originalData;
+	}
+};
+/** Implements the primitive field status, by extend base & just adding our `kind` const. */
+var PrimitiveFieldStatusImpl = class extends BaseFieldStatusImpl {
+	kind = "field";
+};
+/** Implements the m2o field status, by extend base, & adding `originalEntity`. */
+var ManyToOneFieldStatusImpl = class extends BaseFieldStatusImpl {
+	kind = "m2o";
+	/**
+	* Returns our original entity's `id`.
+	*
+	* We can know `originalValue` has an `id` available (i.e. is not new), b/c original values defacto
+	* came from the database.
+	*
+	* We also return the id so that `entity.changes.m2oField.originalValue` has a consistent API,
+	* regardless of whether the `entity.m2oField` itself is loaded or unloaded.
+	*/
+	get originalValue() {
+		const originalValue = super.originalValue;
+		return require_Entity.isEntity(originalValue) ? originalValue.id : originalValue;
+	}
+	/** Returns the original entity instance, which may not be loaded into memory yet, or undefined. */
+	get originalEntity() {
+		const originalValue = this.originalValue;
+		if (require_EntityManager.isId(originalValue)) return this.entity.em.load(originalValue);
+		else return Promise.resolve(void 0);
+	}
+};
+var ManyToManyFieldStatusImpl = class {
+	kind = "m2m";
+	#entity;
+	#m2m;
+	#joinRows;
+	constructor(entity, fieldName) {
+		this.#entity = entity;
+		this.#m2m = entity[fieldName];
+		this.#joinRows = require_EntityManager.getEmInternalApi(entity.em).joinRows(this.#m2m);
+	}
+	get added() {
+		return this.#added.sort(entityCompare);
+	}
+	get removed() {
+		return this.#removed.sort(entityCompare);
+	}
+	get changed() {
+		return [...this.#added, ...this.#removed].sort(entityCompare);
+	}
+	get hasChanged() {
+		return this.#added.length > 0 || this.#removed.length > 0;
+	}
+	get hasUpdated() {
+		return !this.#entity.isNewEntity && this.hasChanged;
+	}
+	get originalEntities() {
+		return this.#m2m.load().then((list) => {
+			const set = new Set(this.added);
+			const copy = list.filter((e) => !set.has(e));
+			copy.push(...this.removed);
+			return copy.sort(entityCompare);
+		});
+	}
+	get #added() {
+		return this.#joinRows.addedFor(this.#m2m, this.#entity);
+	}
+	get #removed() {
+		return this.#joinRows.removedFor(this.#m2m, this.#entity);
+	}
+};
+var EnumCollectionFieldStatusImpl = class {
+	kind = "m2mEnum";
+	#entity;
+	#collection;
+	#joinRows;
+	constructor(entity, fieldName) {
+		this.#entity = entity;
+		this.#collection = entity[fieldName];
+		this.#joinRows = require_EntityManager.getEmInternalApi(entity.em).joinRows(this.#collection);
+	}
+	get added() {
+		return this.#toCodes(this.#joinRows.addedFor(this.#collection, this.#entity));
+	}
+	get removed() {
+		return this.#toCodes(this.#joinRows.removedFor(this.#collection, this.#entity));
+	}
+	get changed() {
+		return [...this.added, ...this.removed];
+	}
+	get hasChanged() {
+		return this.added.length > 0 || this.removed.length > 0;
+	}
+	get hasUpdated() {
+		return !this.#entity.isNewEntity && this.hasChanged;
+	}
+	get originalValues() {
+		return this.#collection.load().then((codes) => {
+			const added = new Set(this.added);
+			const enumDetail = this.#collection.otherEnum;
+			return [...codes.filter((c) => !added.has(c)), ...this.removed].sort((a, b) => enumDetail.getByCode(a).id - enumDetail.getByCode(b).id);
+		});
+	}
+	/** Maps the join rows' enum ids to codes, sorted by enum id for a stable order. */
+	#toCodes(ids) {
+		const enumDetail = this.#collection.otherEnum;
+		return ids.sort((a, b) => a - b).map((id) => enumDetail.findById(id).code);
+	}
+};
+/** Provides access to an o2m relation's added/removed/changed entities. */
+var OneToManyFieldStatusImpl = class {
+	kind = "o2m";
+	#entity;
+	#o2m;
+	constructor(entity, fieldName) {
+		this.#entity = entity;
+		this.#o2m = entity[fieldName];
+	}
+	get added() {
+		return this.#added.sort(entityCompare);
+	}
+	get removed() {
+		return this.#removed.sort(entityCompare);
+	}
+	get changed() {
+		return [...this.added, ...this.removed].sort(entityCompare);
+	}
+	get hasChanged() {
+		return this.#added.length > 0 || this.#removed.length > 0;
+	}
+	get hasUpdated() {
+		return !this.#entity.isNewEntity && this.hasChanged;
+	}
+	get originalEntities() {
+		return this.#o2m.load().then((list) => {
+			const set = new Set(this.added);
+			const copy = list.filter((e) => !set.has(e));
+			copy.push(...this.removed);
+			return copy.sort(entityCompare);
+		});
+	}
+	get #added() {
+		return [...this.#o2m.added(), ...this.#entity.isNewEntity ? [] : require_EntityManager.getEmInternalApi(this.#entity.em).pendingPercolate.get(this.#entity.idTagged)?.get(this.#o2m.fieldName)?.adds ?? []];
+	}
+	get #removed() {
+		return [...this.#o2m.removed(), ...this.#entity.isNewEntity ? [] : require_EntityManager.getEmInternalApi(this.#entity.em).pendingPercolate.get(this.#entity.idTagged)?.get(this.#o2m.fieldName)?.removes ?? []];
+	}
+};
+function newChangesProxy(entity) {
+	return new Proxy(entity, { get(target, p) {
+		if (p === "fields") return getChangedFieldNames(entity, true);
+		else if (p === "fieldsWithoutRelations") return getChangedFieldNames(entity, false);
+		else if (typeof p === "symbol") throw new Error(`Unsupported call to ${String(p)}`);
+		const kind = require_EntityMetadata.getMetadata(entity).allFields[p]?.kind;
+		if (kind === "m2m") return new ManyToManyFieldStatusImpl(entity, p);
+		else if (kind === "m2mEnum") return new EnumCollectionFieldStatusImpl(entity, p);
+		else if (kind === "o2m") return new OneToManyFieldStatusImpl(entity, p);
+		else if (!require_fields.isChangeableField(entity, p)) throw new Error(`Invalid changes field ${p}`);
+		else if (kind === "m2o" || kind === "poly") return new ManyToOneFieldStatusImpl(entity, p);
+		else if (kind === "enum" || kind === "primitive" || kind === "primaryKey") return new PrimitiveFieldStatusImpl(entity, p);
+		else if (kind === "lo2m" || kind === "o2o") throw new Error(`changes are not supported for ${kind} ${p}`);
+		else return require_utils.assertNever(kind);
+	} });
+}
+/** Scans `entity` for changes primitive + m2m/o2m fields. */
+function getChangedFieldNames(entity, includeRelations) {
+	const fieldsChanged = entity.isNewEntity ? Object.entries(require_BaseEntity.getInstanceData(entity).data).filter(([, value]) => value !== void 0).map(([key]) => key) : Object.keys(require_BaseEntity.getInstanceData(entity).originalData);
+	if (includeRelations) {
+		for (const field of Object.values(require_EntityMetadata.getMetadata(entity).allFields)) if (field.kind === "m2m") {
+			if (new ManyToManyFieldStatusImpl(entity, field.fieldName).hasChanged) fieldsChanged.push(field.fieldName);
+		} else if (field.kind === "o2m") {
+			if (new OneToManyFieldStatusImpl(entity, field.fieldName).hasChanged) fieldsChanged.push(field.fieldName);
+		} else if (field.kind === "m2mEnum") {
+			if (new EnumCollectionFieldStatusImpl(entity, field.fieldName).hasChanged) fieldsChanged.push(field.fieldName);
+		}
+	}
+	return fieldsChanged;
+}
+const entityCompare = (a, b) => {
+	return a.toString().localeCompare(b.toString());
+};
+//#endregion
+exports.newChangesProxy = newChangesProxy;
+
+//# sourceMappingURL=changes.cjs.map

package/build/changes.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"changes.cjs","names":["getInstanceData","getField","notLoadedValue","isEntity","isId","#entity","#m2m","#joinRows","getEmInternalApi","#added","#removed","#collection","#toCodes","#o2m","getMetadata","isChangeableField","assertNever"],"sources":["../src/changes.ts"],"sourcesContent":["import { getInstanceData } from \"src/BaseEntity.ts\";\nimport { type Entity } from \"src/Entity.ts\";\nimport { type IdOf } from \"src/EntityManager.ts\";\nimport { getField, isChangeableField } from \"src/fields.ts\";\nimport type { JoinColumnValue, JoinRows } from \"src/flush/JoinRows.ts\";\nimport {\n  type Field,\n  type ManyToManyCollection,\n  type OneToManyCollection,\n  type RelationsOf,\n  assertNever,\n  getEmInternalApi,\n  getMetadata,\n  isEntity,\n  isId,\n} from \"src/index.ts\";\nimport { type EnumCollectionImpl } from \"src/relations/EnumCollection.ts\";\nimport { notLoadedValue } from \"src/relations/LazyField.ts\";\nimport { type FieldsOf, type OptsOf } from \"src/typeMap.ts\";\n\n/** Exposes a field's changed/original value in each entity's `this.changes` property. */\nexport interface FieldStatus<T> {\n  /** True if the field has been changed on either create or update. */\n  hasChanged: boolean;\n  /** True only if the field has been updated i.e. not on the initial create. */\n  hasUpdated: boolean;\n  /** The original value, will be `undefined` if the entity new. */\n  originalValue?: T;\n}\n\n/**\n * Provides a base class for field/primitive & m2o status impls.\n *\n * We use a separate base class so that the primitive & m2o subtypes can have their own\n * `kind: ...` consts, that if the m2o just subtyped the primitive directly, wouldn't be\n * allowed.\n */\nabstract class BaseFieldStatusImpl<T> {\n  entity: Entity;\n  fieldName: string;\n\n  constructor(entity: Entity, fieldName: string) {\n    this.entity = entity;\n    this.fieldName = fieldName;\n  }\n\n  get originalValue(): T | undefined {\n    const { originalData, data } = getInstanceData(this.entity);\n    // If `p` is in originalData, always respect that, even if it's undefined\n    const value =\n      this.fieldName in originalData ? originalData[this.fieldName] : getField(this.entity, this.fieldName as any);\n    // An unloaded lazy column's original value is unknown\n    return value === notLoadedValue ? undefined : value;\n  }\n\n  get hasChanged(): boolean {\n    const { originalData, data } = getInstanceData(this.entity);\n    // Use `__orm.data[p] !== undefined` instead of `p in entity.__orm.data` because if a new (or cloned) entity\n    // sets-then-unsets a value, it will return to `undefined` but still be present in `__orm.data`.\n    return this.entity.isNewEntity ? data[this.fieldName] !== undefined : this.fieldName in originalData;\n  }\n\n  get hasUpdated(): boolean {\n    const { originalData } = getInstanceData(this.entity);\n    return !this.entity.isNewEntity && this.fieldName in originalData;\n  }\n}\n\n/** Field status for primitive, enum, & primary key columns. */\nexport interface PrimitiveFieldStatus<T> extends FieldStatus<T> {\n  kind: \"field\";\n}\n\n/** Implements the primitive field status, by extend base & just adding our `kind` const. */\nclass PrimitiveFieldStatusImpl<T> extends BaseFieldStatusImpl<T> implements PrimitiveFieldStatus<T> {\n  kind = \"field\" as const;\n}\n\n/** Implements the m2o field status, by extend base, & adding `originalEntity`. */\nclass ManyToOneFieldStatusImpl<T extends Entity>\n  extends BaseFieldStatusImpl<IdOf<T>>\n  implements ManyToOneFieldStatus<T>\n{\n  kind = \"m2o\" as const;\n\n  /**\n   * Returns our original entity's `id`.\n   *\n   * We can know `originalValue` has an `id` available (i.e. is not new), b/c original values defacto\n   * came from the database.\n   *\n   * We also return the id so that `entity.changes.m2oField.originalValue` has a consistent API,\n   * regardless of whether the `entity.m2oField` itself is loaded or unloaded.\n   */\n  get originalValue() {\n    const originalValue = super.originalValue;\n    return isEntity(originalValue) ? (originalValue.id as IdOf<T>) : originalValue;\n  }\n\n  /** Returns the original entity instance, which may not be loaded into memory yet, or undefined. */\n  get originalEntity(): Promise<T | undefined> {\n    const originalValue = this.originalValue;\n    if (isId(originalValue)) {\n      return this.entity.em.load(originalValue) as Promise<T>;\n    } else {\n      return Promise.resolve(undefined);\n    }\n  }\n}\n\n/** Provides a m2o/reference field's changed/original value in the entity's `this.changes` property. */\nexport interface ManyToOneFieldStatus<T extends Entity> extends FieldStatus<IdOf<T>> {\n  kind: \"m2o\";\n  /** The original entity, will be `undefined` if the entity new or the m2o was `null`. */\n  originalEntity: Promise<T | undefined>;\n}\n\n/** Provides a m2m relation's added/removed/changed/original values. */\nexport interface ManyToManyFieldStatus<U extends Entity> {\n  kind: \"m2m\";\n  added: U[];\n  removed: U[];\n  changed: U[];\n  hasChanged: boolean;\n  hasUpdated: boolean;\n  originalEntities: Promise<readonly U[]>;\n}\n\nclass ManyToManyFieldStatusImpl<T extends Entity, U extends Entity> implements ManyToManyFieldStatus<U> {\n  readonly kind = \"m2m\";\n  readonly #entity: T;\n  readonly #m2m: ManyToManyCollection<T, any>;\n  readonly #joinRows: JoinRows;\n\n  constructor(entity: T, fieldName: keyof T) {\n    this.#entity = entity;\n    this.#m2m = entity[fieldName] as ManyToManyCollection<T, any>;\n    this.#joinRows = getEmInternalApi(entity.em).joinRows(this.#m2m);\n  }\n\n  // Similar to the o2m.added/removed methods, these don't have to be async because currently\n  // any m2m mutation requires having both entities in-memory anyway, i.e. we can't do id-only/unloaded\n  // mutation of m2m relations.\n  get added(): U[] {\n    return this.#added.sort(entityCompare);\n  }\n\n  get removed(): U[] {\n    return this.#removed.sort(entityCompare);\n  }\n\n  get changed(): U[] {\n    return [...this.#added, ...this.#removed].sort(entityCompare);\n  }\n\n  get hasChanged(): boolean {\n    // Calculating `changed: U[]` can be expensive if we sort, so just look at added/removed\n    return this.#added.length > 0 || this.#removed.length > 0;\n  }\n\n  get hasUpdated(): boolean {\n    return !this.#entity.isNewEntity && this.hasChanged;\n  }\n\n  get originalEntities(): Promise<readonly U[]> {\n    return this.#m2m.load().then((list) => {\n      const set = new Set(this.added);\n      const copy = list.filter((e) => !set.has(e));\n      copy.push(...this.removed);\n      return copy.sort(entityCompare);\n    });\n  }\n\n  get #added(): U[] {\n    return this.#joinRows.addedFor(this.#m2m, this.#entity) as U[];\n  }\n\n  get #removed(): U[] {\n    return this.#joinRows.removedFor(this.#m2m, this.#entity) as U[];\n  }\n}\n\n/** Provides an enum m2m's added/removed/changed/original codes (e.g. `Publisher.logoColors`). */\nexport interface EnumCollectionFieldStatus<E> {\n  kind: \"m2mEnum\";\n  added: E[];\n  removed: E[];\n  changed: E[];\n  hasChanged: boolean;\n  hasUpdated: boolean;\n  originalValues: Promise<readonly E[]>;\n}\n\nclass EnumCollectionFieldStatusImpl<T extends Entity, E> implements EnumCollectionFieldStatus<E> {\n  readonly kind = \"m2mEnum\";\n  readonly #entity: T;\n  readonly #collection: EnumCollectionImpl<T, E>;\n  readonly #joinRows: JoinRows;\n\n  constructor(entity: T, fieldName: keyof T) {\n    this.#entity = entity;\n    this.#collection = entity[fieldName] as EnumCollectionImpl<T, E>;\n    this.#joinRows = getEmInternalApi(entity.em).joinRows(this.#collection);\n  }\n\n  get added(): E[] {\n    return this.#toCodes(this.#joinRows.addedFor(this.#collection, this.#entity));\n  }\n\n  get removed(): E[] {\n    return this.#toCodes(this.#joinRows.removedFor(this.#collection, this.#entity));\n  }\n\n  get changed(): E[] {\n    return [...this.added, ...this.removed];\n  }\n\n  get hasChanged(): boolean {\n    return this.added.length > 0 || this.removed.length > 0;\n  }\n\n  get hasUpdated(): boolean {\n    return !this.#entity.isNewEntity && this.hasChanged;\n  }\n\n  get originalValues(): Promise<readonly E[]> {\n    // `load()` ensures the persisted (db) rows are in memory, then diff out our pending changes.\n    return this.#collection.load().then((codes) => {\n      const added = new Set(this.added);\n      const enumDetail = this.#collection.otherEnum;\n      return [...codes.filter((c) => !added.has(c)), ...this.removed].sort(\n        (a, b) => enumDetail.getByCode(a).id - enumDetail.getByCode(b).id,\n      );\n    });\n  }\n\n  /** Maps the join rows' enum ids to codes, sorted by enum id for a stable order. */\n  #toCodes(ids: JoinColumnValue[]): E[] {\n    const enumDetail = this.#collection.otherEnum;\n    return (ids as number[]).sort((a, b) => a - b).map((id) => enumDetail.findById(id)!.code as E);\n  }\n}\n\nexport interface OneToManyFieldStatus<U extends Entity> {\n  kind: \"o2m\";\n  added: U[];\n  removed: U[];\n  changed: U[];\n  hasChanged: boolean;\n  hasUpdated: boolean;\n  originalEntities: Promise<readonly U[]>;\n}\n\n/** Provides access to an o2m relation's added/removed/changed entities. */\nclass OneToManyFieldStatusImpl<T extends Entity, U extends Entity> implements OneToManyFieldStatus<U> {\n  readonly kind = \"o2m\";\n  readonly #entity: T;\n  readonly #o2m: OneToManyCollection<T, U>;\n\n  constructor(entity: T, fieldName: keyof T) {\n    this.#entity = entity;\n    this.#o2m = entity[fieldName] as OneToManyCollection<T, U>;\n  }\n\n  // This doesn't have to be a promise, b/c even if o2m is unloaded, to mutate\n  // the o2m (calling `add(other)` or `remove(other)` or `other.otherField = me`), all\n  // require having the \"other entity\" in memory.\n  get added(): U[] {\n    return this.#added.sort(entityCompare);\n  }\n\n  get removed(): U[] {\n    return this.#removed.sort(entityCompare);\n  }\n\n  get changed(): U[] {\n    return [...this.added, ...this.removed].sort(entityCompare);\n  }\n\n  get hasChanged(): boolean {\n    // Calculating `changed: U[]` can be expensive if we sort, so just look at added/removed\n    return this.#added.length > 0 || this.#removed.length > 0;\n  }\n\n  get hasUpdated(): boolean {\n    return !this.#entity.isNewEntity && this.hasChanged;\n  }\n\n  get originalEntities(): Promise<readonly U[]> {\n    return this.#o2m.load().then((list) => {\n      const set = new Set(this.added);\n      const copy = list.filter((e) => !set.has(e));\n      copy.push(...this.removed);\n      return copy.sort(entityCompare);\n    });\n  }\n\n  // This doesn't have to be a promise, b/c even if o2m is unloaded, to mutate\n  // the o2m (calling `add(other)` or `remove(other)` or `other.otherField = me`), all\n  // require having the \"other entity\" in memory.\n  get #added(): U[] {\n    return [\n      ...this.#o2m.added(),\n      ...(this.#entity.isNewEntity\n        ? []\n        : ((getEmInternalApi(this.#entity.em).pendingPercolate.get(this.#entity.idTagged)?.get(this.#o2m.fieldName)\n            ?.adds as U[]) ?? [])),\n    ];\n  }\n\n  get #removed(): U[] {\n    return [\n      ...this.#o2m.removed(),\n      ...(this.#entity.isNewEntity\n        ? []\n        : ((getEmInternalApi(this.#entity.em).pendingPercolate.get(this.#entity.idTagged)?.get(this.#o2m.fieldName)\n            ?.removes as U[]) ?? [])),\n    ];\n  }\n}\n\n/**\n * Creates the `this.changes.firstName` changes API for a given entity `T`.\n *\n * We use `FieldsOf` because that already excludes collection, and then also\n * convert reference fields to `ManyToOneFieldStatus` to be the id type\n * because the reference may not be loaded.\n *\n * @typeParam K The fields of the entity, or potentially the union of the entity and its subtypes,\n *    i.e. `Publisher.changes` is typed as `Changes<Publisher, keyof Publisher | keyof SmallPub | keyof LargePub>`\n * @typeParam R An optional list of restrictions, i.e for `Reacted` for to provide `changes` to its subset of fields.\n */\nexport type Changes<T extends Entity, K = keyof (FieldsOf<T> & RelationsOf<T>), R = K> = {\n  /** Array of changed field names. */\n  fields: NonNullable<K>[];\n  /** Array of changed field names w/o o2m & m2m relations (which can be expensive). */\n  fieldsWithoutRelations: NonNullable<K>[];\n} & {\n  // The o2o branch is `never`: the FK lives on the other entity, so changes never track o2o fields.\n  // (The exclusion must stay in the value position: a conditional in the `[P in ...]` clause defers on\n  // a generic `T` and collapses `keyof Changes<T>` at inference time, i.e. in `cannotBeUpdated` calls.)\n  [P in keyof FieldsOf<T> & R]: FieldsOf<T>[P] extends { kind: \"m2m\"; type: infer U extends Entity }\n    ? ManyToManyFieldStatus<U>\n    : FieldsOf<T>[P] extends { kind: \"m2mEnum\"; type: infer E }\n      ? EnumCollectionFieldStatus<E>\n      : FieldsOf<T>[P] extends { kind: \"o2m\"; type: infer U extends Entity }\n        ? OneToManyFieldStatus<U>\n        : FieldsOf<T>[P] extends { kind: \"o2o\" }\n          ? never\n          : FieldsOf<T>[P] extends { type: (infer U) | undefined }\n            ? U extends Entity\n              ? ManyToOneFieldStatus<U>\n              : PrimitiveFieldStatus<U>\n            : never;\n};\n\n// type A1 = never extends string ? 1 : 2;\n// type A2 = Book extends Entity | undefined ? 1 : 2;\n// type A2a = string extends Entity | string | undefined ? 1 : 2;\n// type A3 = Book | undefined extends Entity ? 1 : 2;\n// type A4 = Book | undefined | null extends (infer E extends Entity) | undefined | null ? E : 2;\n\n/**\n * A strongly-typed Entity with its changes field.\n *\n * Ideally this would live on `Entity` directly, but results in circular type issues.\n */\nexport interface EntityChanges<T extends Entity> {\n  changes: Changes<T>;\n}\n\nexport function newChangesProxy<T extends Entity>(entity: T): Changes<T> {\n  return new Proxy(entity, {\n    get(\n      target,\n      p: PropertyKey & string,\n    ):\n      | FieldStatus<any>\n      | ManyToOneFieldStatus<any>\n      | ManyToManyFieldStatus<any>\n      | OneToManyFieldStatus<any>\n      | (keyof OptsOf<T>)[] {\n      if (p === \"fields\") {\n        return getChangedFieldNames(entity, true);\n      } else if (p === \"fieldsWithoutRelations\") {\n        return getChangedFieldNames(entity, false);\n      } else if (typeof p === \"symbol\") {\n        throw new Error(`Unsupported call to ${String(p)}`);\n      }\n      const kind = getMetadata(entity).allFields[p]?.kind;\n      if (kind === \"m2m\") {\n        return new ManyToManyFieldStatusImpl(entity, p as keyof T);\n      } else if (kind === \"m2mEnum\") {\n        return new EnumCollectionFieldStatusImpl(entity, p as keyof T);\n      } else if (kind === \"o2m\") {\n        return new OneToManyFieldStatusImpl(entity, p as keyof T);\n      } else if (!isChangeableField(entity, p as any)) {\n        throw new Error(`Invalid changes field ${p}`);\n      } else if (kind === \"m2o\" || kind === \"poly\") {\n        return new ManyToOneFieldStatusImpl(entity, p);\n      } else if (kind === \"enum\" || kind === \"primitive\" || kind === \"primaryKey\") {\n        return new PrimitiveFieldStatusImpl(entity, p);\n      } else if (kind === \"lo2m\" || kind === \"o2o\") {\n        throw new Error(`changes are not supported for ${kind} ${p}`);\n      } else {\n        return assertNever(kind);\n      }\n    },\n  }) as any;\n}\n\nconst addOriginalEntity: Record<Field[\"kind\"], boolean> = {\n  m2o: true,\n  poly: true,\n  m2mEnum: false,\n  enum: false,\n  lo2m: false,\n  m2m: false,\n  o2m: false,\n  o2o: false,\n  primaryKey: false,\n  primitive: false,\n};\n\n/** Scans `entity` for changes primitive + m2m/o2m fields. */\nfunction getChangedFieldNames<T extends Entity>(entity: T, includeRelations: boolean): (keyof OptsOf<T>)[] {\n  const fieldsChanged = entity.isNewEntity\n    ? // Cloning sometimes leaves unset keys in data as undefined, so drop them\n      Object.entries(getInstanceData(entity).data)\n        .filter(([, value]) => value !== undefined)\n        .map(([key]) => key)\n    : Object.keys(getInstanceData(entity).originalData);\n\n  // Calling `hasChanged` on these can be expensive, and we call this in a loop during em.flush\n  if (includeRelations) {\n    for (const field of Object.values(getMetadata(entity).allFields)) {\n      if (field.kind === \"m2m\") {\n        const status = new ManyToManyFieldStatusImpl(entity, field.fieldName as keyof T);\n        if (status.hasChanged) {\n          fieldsChanged.push(field.fieldName);\n        }\n      } else if (field.kind === \"o2m\") {\n        const status = new OneToManyFieldStatusImpl(entity, field.fieldName as keyof T);\n        if (status.hasChanged) {\n          fieldsChanged.push(field.fieldName);\n        }\n      } else if (field.kind === \"m2mEnum\") {\n        const status = new EnumCollectionFieldStatusImpl(entity, field.fieldName as keyof T);\n        if (status.hasChanged) {\n          fieldsChanged.push(field.fieldName);\n        }\n      }\n    }\n  }\n\n  return fieldsChanged as any;\n}\n\nconst entityCompare: (a: Entity, b: Entity) => number = (a, b) => {\n  return a.toString().localeCompare(b.toString());\n};\n"],"mappings":"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"}

package/build/changes.d.cts

@@ -0,0 +1,95 @@
+import { FieldsOf, RelationsOf } from "./typeMap.cjs";
+import "./index.cjs";
+import { IdOf } from "./EntityManager.cjs";
+import { Entity } from "./Entity.cjs";
+//#region src/changes.d.ts
+/** Exposes a field's changed/original value in each entity's `this.changes` property. */
+interface FieldStatus<T> {
+  /** True if the field has been changed on either create or update. */
+  hasChanged: boolean;
+  /** True only if the field has been updated i.e. not on the initial create. */
+  hasUpdated: boolean;
+  /** The original value, will be `undefined` if the entity new. */
+  originalValue?: T;
+}
+/** Field status for primitive, enum, & primary key columns. */
+interface PrimitiveFieldStatus<T> extends FieldStatus<T> {
+  kind: "field";
+}
+/** Provides a m2o/reference field's changed/original value in the entity's `this.changes` property. */
+interface ManyToOneFieldStatus<T extends Entity> extends FieldStatus<IdOf<T>> {
+  kind: "m2o";
+  /** The original entity, will be `undefined` if the entity new or the m2o was `null`. */
+  originalEntity: Promise<T | undefined>;
+}
+/** Provides a m2m relation's added/removed/changed/original values. */
+interface ManyToManyFieldStatus<U extends Entity> {
+  kind: "m2m";
+  added: U[];
+  removed: U[];
+  changed: U[];
+  hasChanged: boolean;
+  hasUpdated: boolean;
+  originalEntities: Promise<readonly U[]>;
+}
+/** Provides an enum m2m's added/removed/changed/original codes (e.g. `Publisher.logoColors`). */
+interface EnumCollectionFieldStatus<E> {
+  kind: "m2mEnum";
+  added: E[];
+  removed: E[];
+  changed: E[];
+  hasChanged: boolean;
+  hasUpdated: boolean;
+  originalValues: Promise<readonly E[]>;
+}
+interface OneToManyFieldStatus<U extends Entity> {
+  kind: "o2m";
+  added: U[];
+  removed: U[];
+  changed: U[];
+  hasChanged: boolean;
+  hasUpdated: boolean;
+  originalEntities: Promise<readonly U[]>;
+}
+/**
+ * Creates the `this.changes.firstName` changes API for a given entity `T`.
+ *
+ * We use `FieldsOf` because that already excludes collection, and then also
+ * convert reference fields to `ManyToOneFieldStatus` to be the id type
+ * because the reference may not be loaded.
+ *
+ * @typeParam K The fields of the entity, or potentially the union of the entity and its subtypes,
+ *    i.e. `Publisher.changes` is typed as `Changes<Publisher, keyof Publisher | keyof SmallPub | keyof LargePub>`
+ * @typeParam R An optional list of restrictions, i.e for `Reacted` for to provide `changes` to its subset of fields.
+ */
+type Changes<T extends Entity, K = keyof (FieldsOf<T> & RelationsOf<T>), R = K> = {
+  /** Array of changed field names. */
+  fields: NonNullable<K>[];
+  /** Array of changed field names w/o o2m & m2m relations (which can be expensive). */
+  fieldsWithoutRelations: NonNullable<K>[];
+} & { [P in keyof FieldsOf<T> & R]: FieldsOf<T>[P] extends {
+  kind: "m2m";
+  type: infer U extends Entity;
+} ? ManyToManyFieldStatus<U> : FieldsOf<T>[P] extends {
+  kind: "m2mEnum";
+  type: infer E;
+} ? EnumCollectionFieldStatus<E> : FieldsOf<T>[P] extends {
+  kind: "o2m";
+  type: infer U extends Entity;
+} ? OneToManyFieldStatus<U> : FieldsOf<T>[P] extends {
+  kind: "o2o";
+} ? never : FieldsOf<T>[P] extends {
+  type: (infer U) | undefined;
+} ? U extends Entity ? ManyToOneFieldStatus<U> : PrimitiveFieldStatus<U> : never; };
+/**
+ * A strongly-typed Entity with its changes field.
+ *
+ * Ideally this would live on `Entity` directly, but results in circular type issues.
+ */
+interface EntityChanges<T extends Entity> {
+  changes: Changes<T>;
+}
+declare function newChangesProxy<T extends Entity>(entity: T): Changes<T>;
+//#endregion
+export { Changes, EntityChanges, EnumCollectionFieldStatus, FieldStatus, ManyToManyFieldStatus, ManyToOneFieldStatus, OneToManyFieldStatus, PrimitiveFieldStatus, newChangesProxy };
+//# sourceMappingURL=changes.d.cts.map

package/build/changes.d.cts.map

@@ -0,0 +1 @@
+{"version":3,"file":"changes.d.cts","names":[],"sources":["../src/changes.ts"],"mappings":";;;;;;UAqBiB,YAAY;;EAE3B;;EAEA;;EAEA,gBAAgB;;;UA0CD,qBAAqB,WAAW,YAAY;EAC3D;;;UAyCe,qBAAqB,UAAU,gBAAgB,YAAY,KAAK;EAC/E;;EAEA,gBAAgB,QAAQ;;;UAIT,sBAAsB,UAAU;EAC/C;EACA,OAAO;EACP,SAAS;EACT,SAAS;EACT;EACA;EACA,kBAAkB,iBAAiB;;;UA0DpB,0BAA0B;EACzC;EACA,OAAO;EACP,SAAS;EACT,SAAS;EACT;EACA;EACA,gBAAgB,iBAAiB;;UAqDlB,qBAAqB,UAAU;EAC9C;EACA,OAAO;EACP,SAAS;EACT,SAAS;EACT;EACA;EACA,kBAAkB,iBAAiB;;;;;;;;;;;;;KAkFzB,QAAQ,UAAU,QAAQ,WAAW,SAAS,KAAK,YAAY,KAAK,IAAI;;EAElF,QAAQ,YAAY;;EAEpB,wBAAwB,YAAY;OAKnC,WAAW,SAAS,KAAK,IAAI,SAAS,GAAG;EAAa;EAAa,YAAY,UAAU;IACtF,sBAAsB,KACtB,SAAS,GAAG;EAAa;EAAiB,YAAY;IACpD,0BAA0B,KAC1B,SAAS,GAAG;EAAa;EAAa,YAAY,UAAU;IAC1D,qBAAqB,KACrB,SAAS,GAAG;EAAa;YAEvB,SAAS,GAAG;EAAa,aAAa;IACpC,UAAU,SACR,qBAAqB,KACrB,qBAAqB;;;;;;UAepB,cAAc,UAAU;EACvC,SAAS,QAAQ;;iBAGH,gBAAgB,UAAU,QAAQ,QAAQ,IAAI,QAAQ"}

package/build/changes.d.mts

@@ -0,0 +1,95 @@
+import { FieldsOf, RelationsOf } from "./typeMap.mjs";
+import "./index.mjs";
+import { IdOf } from "./EntityManager.mjs";
+import { Entity } from "./Entity.mjs";
+//#region src/changes.d.ts
+/** Exposes a field's changed/original value in each entity's `this.changes` property. */
+interface FieldStatus<T> {
+  /** True if the field has been changed on either create or update. */
+  hasChanged: boolean;
+  /** True only if the field has been updated i.e. not on the initial create. */
+  hasUpdated: boolean;
+  /** The original value, will be `undefined` if the entity new. */
+  originalValue?: T;
+}
+/** Field status for primitive, enum, & primary key columns. */
+interface PrimitiveFieldStatus<T> extends FieldStatus<T> {
+  kind: "field";
+}
+/** Provides a m2o/reference field's changed/original value in the entity's `this.changes` property. */
+interface ManyToOneFieldStatus<T extends Entity> extends FieldStatus<IdOf<T>> {
+  kind: "m2o";
+  /** The original entity, will be `undefined` if the entity new or the m2o was `null`. */
+  originalEntity: Promise<T | undefined>;
+}
+/** Provides a m2m relation's added/removed/changed/original values. */
+interface ManyToManyFieldStatus<U extends Entity> {
+  kind: "m2m";
+  added: U[];
+  removed: U[];
+  changed: U[];
+  hasChanged: boolean;
+  hasUpdated: boolean;
+  originalEntities: Promise<readonly U[]>;
+}
+/** Provides an enum m2m's added/removed/changed/original codes (e.g. `Publisher.logoColors`). */
+interface EnumCollectionFieldStatus<E> {
+  kind: "m2mEnum";
+  added: E[];
+  removed: E[];
+  changed: E[];
+  hasChanged: boolean;
+  hasUpdated: boolean;
+  originalValues: Promise<readonly E[]>;
+}
+interface OneToManyFieldStatus<U extends Entity> {
+  kind: "o2m";
+  added: U[];
+  removed: U[];
+  changed: U[];
+  hasChanged: boolean;
+  hasUpdated: boolean;
+  originalEntities: Promise<readonly U[]>;
+}
+/**
+ * Creates the `this.changes.firstName` changes API for a given entity `T`.
+ *
+ * We use `FieldsOf` because that already excludes collection, and then also
+ * convert reference fields to `ManyToOneFieldStatus` to be the id type
+ * because the reference may not be loaded.
+ *
+ * @typeParam K The fields of the entity, or potentially the union of the entity and its subtypes,
+ *    i.e. `Publisher.changes` is typed as `Changes<Publisher, keyof Publisher | keyof SmallPub | keyof LargePub>`
+ * @typeParam R An optional list of restrictions, i.e for `Reacted` for to provide `changes` to its subset of fields.
+ */
+type Changes<T extends Entity, K = keyof (FieldsOf<T> & RelationsOf<T>), R = K> = {
+  /** Array of changed field names. */
+  fields: NonNullable<K>[];
+  /** Array of changed field names w/o o2m & m2m relations (which can be expensive). */
+  fieldsWithoutRelations: NonNullable<K>[];
+} & { [P in keyof FieldsOf<T> & R]: FieldsOf<T>[P] extends {
+  kind: "m2m";
+  type: infer U extends Entity;
+} ? ManyToManyFieldStatus<U> : FieldsOf<T>[P] extends {
+  kind: "m2mEnum";
+  type: infer E;
+} ? EnumCollectionFieldStatus<E> : FieldsOf<T>[P] extends {
+  kind: "o2m";
+  type: infer U extends Entity;
+} ? OneToManyFieldStatus<U> : FieldsOf<T>[P] extends {
+  kind: "o2o";
+} ? never : FieldsOf<T>[P] extends {
+  type: (infer U) | undefined;
+} ? U extends Entity ? ManyToOneFieldStatus<U> : PrimitiveFieldStatus<U> : never; };
+/**
+ * A strongly-typed Entity with its changes field.
+ *
+ * Ideally this would live on `Entity` directly, but results in circular type issues.
+ */
+interface EntityChanges<T extends Entity> {
+  changes: Changes<T>;
+}
+declare function newChangesProxy<T extends Entity>(entity: T): Changes<T>;
+//#endregion
+export { Changes, EntityChanges, EnumCollectionFieldStatus, FieldStatus, ManyToManyFieldStatus, ManyToOneFieldStatus, OneToManyFieldStatus, PrimitiveFieldStatus, newChangesProxy };
+//# sourceMappingURL=changes.d.mts.map

package/build/changes.d.mts.map

@@ -0,0 +1 @@
+{"version":3,"file":"changes.d.mts","names":[],"sources":["../src/changes.ts"],"mappings":";;;;;;UAqBiB,YAAY;;EAE3B;;EAEA;;EAEA,gBAAgB;;;UA0CD,qBAAqB,WAAW,YAAY;EAC3D;;;UAyCe,qBAAqB,UAAU,gBAAgB,YAAY,KAAK;EAC/E;;EAEA,gBAAgB,QAAQ;;;UAIT,sBAAsB,UAAU;EAC/C;EACA,OAAO;EACP,SAAS;EACT,SAAS;EACT;EACA;EACA,kBAAkB,iBAAiB;;;UA0DpB,0BAA0B;EACzC;EACA,OAAO;EACP,SAAS;EACT,SAAS;EACT;EACA;EACA,gBAAgB,iBAAiB;;UAqDlB,qBAAqB,UAAU;EAC9C;EACA,OAAO;EACP,SAAS;EACT,SAAS;EACT;EACA;EACA,kBAAkB,iBAAiB;;;;;;;;;;;;;KAkFzB,QAAQ,UAAU,QAAQ,WAAW,SAAS,KAAK,YAAY,KAAK,IAAI;;EAElF,QAAQ,YAAY;;EAEpB,wBAAwB,YAAY;OAKnC,WAAW,SAAS,KAAK,IAAI,SAAS,GAAG;EAAa;EAAa,YAAY,UAAU;IACtF,sBAAsB,KACtB,SAAS,GAAG;EAAa;EAAiB,YAAY;IACpD,0BAA0B,KAC1B,SAAS,GAAG;EAAa;EAAa,YAAY,UAAU;IAC1D,qBAAqB,KACrB,SAAS,GAAG;EAAa;YAEvB,SAAS,GAAG;EAAa,aAAa;IACpC,UAAU,SACR,qBAAqB,KACrB,qBAAqB;;;;;;UAepB,cAAc,UAAU;EACvC,SAAS,QAAQ;;iBAGH,gBAAgB,UAAU,QAAQ,QAAQ,IAAI,QAAQ"}