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

package/build/BaseEntity.d.cts

@@ -8,13 +8,13 @@ import { Entity, IdType } from "./Entity.cjs";
  *
  * This should be treated as an internal API and may change without notice.
  */
-declare function getInstanceData(entity: Entity): InstanceData;
+export declare function getInstanceData(entity: Entity): InstanceData;
 /**
  * The base class for all entities.
  *
  * Currently, this just adds the `.load(lensFn)` method for declarative reference traversal.
  */
-declare abstract class BaseEntity<EM extends EntityManager, I extends IdType = IdType> implements Entity {
+export declare abstract class BaseEntity<EM extends EntityManager, I extends IdType = IdType> implements Entity {
   static getInstanceData(entity: Entity): InstanceData;
   protected readonly __data: InstanceData;
   /** The single-arg constructor is our psuedo-public API that can only be called by the EntityManager. */
@@ -67,7 +67,6 @@ declare abstract class BaseEntity<EM extends EntityManager, I extends IdType = I
  * The constructor logic for `BaseEntity` but exposed so that `newEntity` can use it too
  * on its `Object.create`-d instances.
  */
-declare function baseEntityCstr(em: EntityManager, entity: BaseEntity<any, any>, isNew: boolean): void;
+export declare function baseEntityCstr(em: EntityManager, entity: BaseEntity<any, any>, isNew: boolean): void;
 //#endregion
-export { BaseEntity, baseEntityCstr, getInstanceData };
 //# sourceMappingURL=BaseEntity.d.cts.map

package/build/BaseEntity.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"BaseEntity.d.cts","names":[],"sources":["../src/BaseEntity.ts"],"mappings":";;;;;;;;;;iBAiBgB,gBAAgB,QAAQ,SAAS;;;;;;uBAS3B,WAAW,WAAW,eAAe,UAAU,SAAS,mBAAmB;SACjF,gBAAgB,QAAQ,SAAS;qBAI5B,QAAS;;EAG5B,YAAY,IAAI;MAaZ;;WAKK,IAAI;;eAGA,WAAW;;WAGf,UAAU;;eAGN,iBAAiB;;MAG1B;WAIK,IAAI;;;;WAKJ,WAAW;;;;WAKX,eAAe,gBAAgB;;;;;;;MAQpC;MAIA;MAIA;EAIJ;EAKA;MAKW,MAAM;;;;;;;;EAWV;GAIN,OAAO;;WAcS,iBAAiB;;;;;;iBA0BpB,eAAe,IAAI,eAAe,QAAQ,sBAAsB"}
+{"version":3,"file":"BaseEntity.d.cts","names":[],"sources":["../src/BaseEntity.ts"],"mappings":";;;;;;;;;;wBAiBgB,gBAAgB,QAAQ,SAAS;;;;;;8BAS3B,WAAW,WAAW,eAAe,UAAU,SAAS,mBAAmB;SACjF,gBAAgB,QAAQ,SAAS;qBAI5B,QAAS;;EAG5B,YAAY,IAAI;MAaZ;;WAKK,IAAI;;eAGA,WAAW;;WAGf,UAAU;;eAGN,iBAAiB;;MAG1B;WAIK,IAAI;;;;WAKJ,WAAW;;;;WAKX,eAAe,gBAAgB;;;;;;;MAQpC;MAIA;MAIA;EAIJ;EAKA;MAKW,MAAM;;;;;;;;EAWV;GAIN,OAAO;;WAcS,iBAAiB;;;;;;wBA0BpB,eAAe,IAAI,eAAe,QAAQ,sBAAsB"}

package/build/BaseEntity.d.mts

@@ -8,13 +8,13 @@ import { Entity, IdType } from "./Entity.mjs";
  *
  * This should be treated as an internal API and may change without notice.
  */
-declare function getInstanceData(entity: Entity): InstanceData;
+export declare function getInstanceData(entity: Entity): InstanceData;
 /**
  * The base class for all entities.
  *
  * Currently, this just adds the `.load(lensFn)` method for declarative reference traversal.
  */
-declare abstract class BaseEntity<EM extends EntityManager, I extends IdType = IdType> implements Entity {
+export declare abstract class BaseEntity<EM extends EntityManager, I extends IdType = IdType> implements Entity {
   static getInstanceData(entity: Entity): InstanceData;
   protected readonly __data: InstanceData;
   /** The single-arg constructor is our psuedo-public API that can only be called by the EntityManager. */
@@ -67,7 +67,6 @@ declare abstract class BaseEntity<EM extends EntityManager, I extends IdType = I
  * The constructor logic for `BaseEntity` but exposed so that `newEntity` can use it too
  * on its `Object.create`-d instances.
  */
-declare function baseEntityCstr(em: EntityManager, entity: BaseEntity<any, any>, isNew: boolean): void;
+export declare function baseEntityCstr(em: EntityManager, entity: BaseEntity<any, any>, isNew: boolean): void;
 //#endregion
-export { BaseEntity, baseEntityCstr, getInstanceData };
 //# sourceMappingURL=BaseEntity.d.mts.map

package/build/BaseEntity.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"BaseEntity.d.mts","names":[],"sources":["../src/BaseEntity.ts"],"mappings":";;;;;;;;;;iBAiBgB,gBAAgB,QAAQ,SAAS;;;;;;uBAS3B,WAAW,WAAW,eAAe,UAAU,SAAS,mBAAmB;SACjF,gBAAgB,QAAQ,SAAS;qBAI5B,QAAS;;EAG5B,YAAY,IAAI;MAaZ;;WAKK,IAAI;;eAGA,WAAW;;WAGf,UAAU;;eAGN,iBAAiB;;MAG1B;WAIK,IAAI;;;;WAKJ,WAAW;;;;WAKX,eAAe,gBAAgB;;;;;;;MAQpC;MAIA;MAIA;EAIJ;EAKA;MAKW,MAAM;;;;;;;;EAWV;GAIN,OAAO;;WAcS,iBAAiB;;;;;;iBA0BpB,eAAe,IAAI,eAAe,QAAQ,sBAAsB"}
+{"version":3,"file":"BaseEntity.d.mts","names":[],"sources":["../src/BaseEntity.ts"],"mappings":";;;;;;;;;;wBAiBgB,gBAAgB,QAAQ,SAAS;;;;;;8BAS3B,WAAW,WAAW,eAAe,UAAU,SAAS,mBAAmB;SACjF,gBAAgB,QAAQ,SAAS;qBAI5B,QAAS;;EAG5B,YAAY,IAAI;MAaZ;;WAKK,IAAI;;eAGA,WAAW;;WAGf,UAAU;;eAGN,iBAAiB;;MAG1B;WAIK,IAAI;;;;WAKJ,WAAW;;;;WAKX,eAAe,gBAAgB;;;;;;;MAQpC;MAIA;MAIA;EAIJ;EAKA;MAKW,MAAM;;;;;;;;EAWV;GAIN,OAAO;;WAcS,iBAAiB;;;;;;wBA0BpB,eAAe,IAAI,eAAe,QAAQ,sBAAsB"}

package/build/Entity.d.cts

@@ -1,10 +1,10 @@
 import { EntityManager, TaggedId } from "./EntityManager.cjs";
 //#region src/Entity.d.ts
-declare function isEntity(maybeEntity: unknown): maybeEntity is Entity;
+export declare function isEntity(maybeEntity: unknown): maybeEntity is Entity;
 /** All the types we support for entity `id` fields. */
-type IdType = number | string;
+export type IdType = number | string;
 /** A marker/base interface for all of our entity types. */
-interface Entity {
+export interface Entity {
   /** The entity id, either tagged or untagged; the per-application `Entity` will specialize appropriately. */
   id: IdType;
   idMaybe: IdType | undefined;
@@ -38,5 +38,4 @@ interface Entity {
   toTaggedString(): string;
 }
 //#endregion
-export { Entity, IdType, isEntity };
 //# sourceMappingURL=Entity.d.cts.map

package/build/Entity.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"Entity.d.cts","names":[],"sources":["../src/Entity.ts"],"mappings":";;iBAGgB,SAAS,uBAAuB,eAAe;;KAKnD;;UAGK;;EAEf,IAAI;EACJ,SAAS;;EAET,UAAU;EACV,eAAe;WACN,IAAI;WACJ;WACA;WACA;WACA,iBAAiB;EAC1B,IAAI;EACJ,WAAW;EACX,eAAe,gBAAgB;;;;;;;;;;EAU/B;;;;;;;EAOA"}
+{"version":3,"file":"Entity.d.cts","names":[],"sources":["../src/Entity.ts"],"mappings":";;wBAGgB,SAAS,uBAAuB,eAAe;;YAKnD;;iBAGK;;EAEf,IAAI;EACJ,SAAS;;EAET,UAAU;EACV,eAAe;WACN,IAAI;WACJ;WACA;WACA;WACA,iBAAiB;EAC1B,IAAI;EACJ,WAAW;EACX,eAAe,gBAAgB;;;;;;;;;;EAU/B;;;;;;;EAOA"}

package/build/Entity.d.mts

@@ -1,10 +1,10 @@
 import { EntityManager, TaggedId } from "./EntityManager.mjs";
 //#region src/Entity.d.ts
-declare function isEntity(maybeEntity: unknown): maybeEntity is Entity;
+export declare function isEntity(maybeEntity: unknown): maybeEntity is Entity;
 /** All the types we support for entity `id` fields. */
-type IdType = number | string;
+export type IdType = number | string;
 /** A marker/base interface for all of our entity types. */
-interface Entity {
+export interface Entity {
   /** The entity id, either tagged or untagged; the per-application `Entity` will specialize appropriately. */
   id: IdType;
   idMaybe: IdType | undefined;
@@ -38,5 +38,4 @@ interface Entity {
   toTaggedString(): string;
 }
 //#endregion
-export { Entity, IdType, isEntity };
 //# sourceMappingURL=Entity.d.mts.map

package/build/Entity.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"Entity.d.mts","names":[],"sources":["../src/Entity.ts"],"mappings":";;iBAGgB,SAAS,uBAAuB,eAAe;;KAKnD;;UAGK;;EAEf,IAAI;EACJ,SAAS;;EAET,UAAU;EACV,eAAe;WACN,IAAI;WACJ;WACA;WACA;WACA,iBAAiB;EAC1B,IAAI;EACJ,WAAW;EACX,eAAe,gBAAgB;;;;;;;;;;EAU/B;;;;;;;EAOA"}
+{"version":3,"file":"Entity.d.mts","names":[],"sources":["../src/Entity.ts"],"mappings":";;wBAGgB,SAAS,uBAAuB,eAAe;;YAKnD;;iBAGK;;EAEf,IAAI;EACJ,SAAS;;EAET,UAAU;EACV,eAAe;WACN,IAAI;WACJ;WACA;WACA;WACA,iBAAiB;EAC1B,IAAI;EACJ,WAAW;EACX,eAAe,gBAAgB;;;;;;;;;;EAU/B;;;;;;;EAOA"}

package/build/EntityFields.d.cts

@@ -1,7 +1,7 @@
 //#region src/EntityFields.d.ts
 /** All the fields for an entity in the `FieldsOf` / `EntityField` format. */
-type EntityFields<T> = { [K in keyof T]: EntityField; };
-type EntityField = {
+export type EntityFields<T> = { [K in keyof T]: EntityField; };
+export type EntityField = {
   kind: "primitive";
   type: unknown;
   unique: boolean;
@@ -22,7 +22,7 @@ type EntityField = {
   nullable: never | unknown;
 };
 /** The subset of primitive, enum, and m2o fields from the `F` that are settable, i.e. not derived. */
-type SettableFields<F> = { [K in keyof F]: F[K] extends {
+export type SettableFields<F> = { [K in keyof F]: F[K] extends {
   kind: "primitive";
   derived: false;
 } ? F[K] : F[K] extends {
@@ -32,5 +32,4 @@ type SettableFields<F> = { [K in keyof F]: F[K] extends {
   derived: false;
 } ? F[K] : never; };
 //#endregion
-export { EntityField, EntityFields, SettableFields };
 //# sourceMappingURL=EntityFields.d.cts.map

package/build/EntityFields.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"EntityFields.d.cts","names":[],"sources":["../src/EntityFields.ts"],"mappings":";;KACY,aAAa,QACtB,WAAW,IAAI;KAGN;EACN;EAAmB;EAAe;EAAiB;EAA6B;;EAChF;EAAc;EAAe;;EAC7B;EAAa;EAAe;EAA2B;;EACvD;EAAc;EAAe;;;KAGvB,eAAe,QACxB,WAAW,IAAI,EAAE;EAAa;EAAmB;IAC9C,EAAE,KACF,EAAE;EAAa;IACb,EAAE,KACF,EAAE;EAAa;EAAa;IAC1B,EAAE"}
+{"version":3,"file":"EntityFields.d.cts","names":[],"sources":["../src/EntityFields.ts"],"mappings":";;YACY,aAAa,QACtB,WAAW,IAAI;YAGN;EACN;EAAmB;EAAe;EAAiB;EAA6B;;EAChF;EAAc;EAAe;;EAC7B;EAAa;EAAe;EAA2B;;EACvD;EAAc;EAAe;;;YAGvB,eAAe,QACxB,WAAW,IAAI,EAAE;EAAa;EAAmB;IAC9C,EAAE,KACF,EAAE;EAAa;IACb,EAAE,KACF,EAAE;EAAa;EAAa;IAC1B,EAAE"}

package/build/EntityFields.d.mts

@@ -1,7 +1,7 @@
 //#region src/EntityFields.d.ts
 /** All the fields for an entity in the `FieldsOf` / `EntityField` format. */
-type EntityFields<T> = { [K in keyof T]: EntityField; };
-type EntityField = {
+export type EntityFields<T> = { [K in keyof T]: EntityField; };
+export type EntityField = {
   kind: "primitive";
   type: unknown;
   unique: boolean;
@@ -22,7 +22,7 @@ type EntityField = {
   nullable: never | unknown;
 };
 /** The subset of primitive, enum, and m2o fields from the `F` that are settable, i.e. not derived. */
-type SettableFields<F> = { [K in keyof F]: F[K] extends {
+export type SettableFields<F> = { [K in keyof F]: F[K] extends {
   kind: "primitive";
   derived: false;
 } ? F[K] : F[K] extends {
@@ -32,5 +32,4 @@ type SettableFields<F> = { [K in keyof F]: F[K] extends {
   derived: false;
 } ? F[K] : never; };
 //#endregion
-export { EntityField, EntityFields, SettableFields };
 //# sourceMappingURL=EntityFields.d.mts.map

package/build/EntityFields.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"EntityFields.d.mts","names":[],"sources":["../src/EntityFields.ts"],"mappings":";;KACY,aAAa,QACtB,WAAW,IAAI;KAGN;EACN;EAAmB;EAAe;EAAiB;EAA6B;;EAChF;EAAc;EAAe;;EAC7B;EAAa;EAAe;EAA2B;;EACvD;EAAc;EAAe;;;KAGvB,eAAe,QACxB,WAAW,IAAI,EAAE;EAAa;EAAmB;IAC9C,EAAE,KACF,EAAE;EAAa;IACb,EAAE,KACF,EAAE;EAAa;EAAa;IAC1B,EAAE"}
+{"version":3,"file":"EntityFields.d.mts","names":[],"sources":["../src/EntityFields.ts"],"mappings":";;YACY,aAAa,QACtB,WAAW,IAAI;YAGN;EACN;EAAmB;EAAe;EAAiB;EAA6B;;EAChF;EAAc;EAAe;;EAC7B;EAAa;EAAe;EAA2B;;EACvD;EAAc;EAAe;;;YAGvB,eAAe,QACxB,WAAW,IAAI,EAAE;EAAa;EAAmB;IAC9C,EAAE,KACF,EAAE;EAAa;IACb,EAAE,KACF,EAAE;EAAa;EAAa;IAC1B,EAAE"}

package/build/EntityManager.cjs

@@ -523,7 +523,7 @@ var EntityManager = class EntityManager {
 		return require_upsert.upsert(this, type, input);
 	}
 	async clone(entityOrArray, opts) {
-		const { deep = {}, skipIf, skip = {}, postClone } = opts ?? {};
+		const { deep = {}, skipIf, skip = {}, overrides, postClone } = opts ?? {};
 		const todo = /* @__PURE__ */ new Set();
 		const skipMap = /* @__PURE__ */ new WeakMap();
 		await crawl(todo, skipMap, Array.isArray(entityOrArray) ? entityOrArray : [entityOrArray], deep, {
@@ -531,10 +531,14 @@ var EntityManager = class EntityManager {
 			skip
 		});
 		const deferredRelations = [];
+		const overrideMap = /* @__PURE__ */ new WeakMap();
 		const clones = [...todo].map((entity) => {
 			const skip = skipMap.get(entity) ?? [];
+			const override = overrides?.(entity) ?? {};
+			overrideMap.set(entity, override);
 			const meta = require_EntityMetadata.getMetadata(entity);
 			const copy = Object.fromEntries(Object.values(meta.allFields).map((f) => {
+				if (Object.hasOwn(override, f.fieldName)) return [f.fieldName, override[f.fieldName]];
 				if (skip.includes(f.fieldName)) return void 0;
 				switch (f.kind) {
 					case "primitive": if (!f.derived && !f.protected) return [f.fieldName, require_fields.getField(entity, f.fieldName)];
@@ -564,11 +568,15 @@ var EntityManager = class EntityManager {
 					default: require_utils.assertNever(f);
 				}
 			}).filter(isDefined));
-			return [entity, this.create(require_index.asConcreteCstr(meta.cstr), copy)];
+			return [entity, this.create(require_index.asConcreteCstr(meta.cstr), {
+				...copy,
+				...override
+			})];
 		});
 		const entityToClone = new Map(clones);
-		clones.forEach(([, clone]) => {
+		clones.forEach(([original, clone]) => {
 			require_index.getRelationEntries(clone).forEach(([fieldName, value]) => {
+				if (Object.hasOwn(overrideMap.get(original), fieldName)) return;
 				if (value instanceof require_relations_ManyToOneReference.ManyToOneReferenceImpl || value instanceof require_relations_PolymorphicReference.PolymorphicReferenceImpl || value instanceof require_relations_ReactiveReference.ReactiveReferenceImpl) {
 					const existingIdOrEntity = require_fields.getField(clone, fieldName);
 					const existing = require_Entity.isEntity(existingIdOrEntity) ? existingIdOrEntity : this.getEntity(existingIdOrEntity);