@happyvertical/smrt-core 0.53.1 → 0.53.2

package/dist/registry/class-registration.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"class-registration.d.ts","sourceRoot":"","sources":["../../src/registry/class-registration.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAuBH,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AACvC,OAAO,KAAK,EAKV,qBAAqB,EAGtB,MAAM,qBAAqB,CAAC;AA4C7B,OAAO,KAAK,EACV,eAAe,EACf,eAAe,EACf,iBAAiB,EAElB,MAAM,YAAY,CAAC;AAkDpB;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAS3E;AA4BD;;;;;;;GAOG;AACH,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,KAAK,EAAE,MAAM,GAAG,SAAS,GACxB,OAAO,CAeT;AA4nBD;;;;GAIG;AACH,wBAAgB,QAAQ,CACtB,IAAI,EAAE,OAAO,UAAU,EACvB,MAAM,GAAE,iBAAsB,GAC7B,IAAI,CAON;AAmiCD,wBAAgB,kBAAkB,CAChC,UAAU,EAAE,MAAM,EAMlB,qBAAqB,EAAE,WAAW,CAAC,eAAe,CAAC,uBAAuB,CAAC,CAAC,GAC3E,IAAI,CAeN;AA+BD,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,eAAe,CAAC,EACpC,kBAAkB,EAAE,eAAe,CAAC,oBAAoB,CAAC,GAAG,SAAS,GACpE,IAAI,CAyCN;AAoHD;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,4BAA4B,CAC1C,QAAQ,EAAE,eAAe,EACzB,gBAAgB,CAAC,EAAE;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,GACA,IAAI,CA4CN;AAkLD,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,qBAAqB,EAChC,mBAAmB,CAAC,EAAE,MAAM,GAC3B,IAAI,CAQN"}
+{"version":3,"file":"class-registration.d.ts","sourceRoot":"","sources":["../../src/registry/class-registration.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAuBH,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AACvC,OAAO,KAAK,EAKV,qBAAqB,EAGtB,MAAM,qBAAqB,CAAC;AAqD7B,OAAO,KAAK,EACV,eAAe,EACf,eAAe,EACf,iBAAiB,EAElB,MAAM,YAAY,CAAC;AAkDpB;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAS3E;AA4BD;;;;;;;GAOG;AACH,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,KAAK,EAAE,MAAM,GAAG,SAAS,GACxB,OAAO,CAeT;AA2oBD;;;;GAIG;AACH,wBAAgB,QAAQ,CACtB,IAAI,EAAE,OAAO,UAAU,EACvB,MAAM,GAAE,iBAAsB,GAC7B,IAAI,CASN;AAomCD,wBAAgB,kBAAkB,CAChC,UAAU,EAAE,MAAM,EAMlB,qBAAqB,EAAE,WAAW,CAAC,eAAe,CAAC,uBAAuB,CAAC,CAAC,GAC3E,IAAI,CAeN;AA+BD,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,eAAe,CAAC,EACpC,kBAAkB,EAAE,eAAe,CAAC,oBAAoB,CAAC,GAAG,SAAS,GACpE,IAAI,CAyCN;AAoHD;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,4BAA4B,CAC1C,QAAQ,EAAE,eAAe,EACzB,gBAAgB,CAAC,EAAE;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,GACA,IAAI,CA4CN;AAmLD,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,qBAAqB,EAChC,mBAAmB,CAAC,EAAE,MAAM,GAC3B,IAAI,CAUN"}

package/dist/registry/class-registration.js

@@ -15,6 +15,8 @@ import { SmrtObject } from "../object.js";
 import { decideCollisionPolicy } from "./collision-policy.js";
 import { isFrameworkBaseClass } from "./framework-base-classes.js";
 import { createFieldFromManifest, mergeManifestField } from "./manifest-field-merge.js";
+import { applyRuntimeOverrides, transferRuntimeOverride } from "./runtime-overrides.js";
+import { isSubtypeOf, reconcileSubtypeLineage, recordSubtypeParent } from "./subtype-lineage.js";
 //#region src/registry/class-registration.ts
 /**
 * Class registration module for the SMRT ObjectRegistry.
@@ -240,9 +242,10 @@ function applyRegisterCollisionPolicy(args) {
 function buildManifestCollisionInputs(args) {
 	const { name, objectDef, packageName, existing, existingKey, registrationKey, matchKind } = args;
 	const newClassName = objectDef.className || name;
-	const newExtends = objectDef.extends;
-	const newExtendsExisting = !!(newExtends && (newExtends === existing.name || newExtends === existingKey || newExtends.toLowerCase() === existing.name.toLowerCase()));
-	const existingExtendsNew = !!(existing.extends && (existing.extends === newClassName || existing.extends === name || existing.extends === registrationKey || existing.extends.toLowerCase() === newClassName.toLowerCase()));
+	const newExtends = objectDef.extendsQualified ?? objectDef.extends;
+	const knownAncestor = existing.replacedQualifiedNames?.includes(registrationKey) === true || isSubtypeOf(existingKey, registrationKey);
+	const newExtendsExisting = !knownAncestor && (isSubtypeOf(registrationKey, existingKey) || !!(newExtends && (newExtends === existing.name || newExtends === existingKey || newExtends.toLowerCase() === existing.name.toLowerCase())));
+	const existingExtendsNew = knownAncestor || !newExtendsExisting && !!(existing.extends && (existing.extends === newClassName || existing.extends === name || existing.extends === registrationKey || existing.extends.toLowerCase() === newClassName.toLowerCase()));
 	const newSourceFile = objectDef.filePath;
 	const bothSourceFilesKnown = !!(newSourceFile && existing.sourceFilePath);
 	const sameSourceFile = bothSourceFilesKnown && newSourceFile === existing.sourceFilePath;
@@ -290,6 +293,9 @@ function applyManifestCollisionPolicy(args) {
 			verboseLog(`[registry] ${decision.scenario}: skipping manifest '${args.name}' (${decision.reason})`);
 			return "return";
 		case "replace":
+			args.replacedQualifiedNames.add(args.existingKey);
+			for (const ancestor of args.existing.replacedQualifiedNames ?? []) args.replacedQualifiedNames.add(ancestor);
+			transferRuntimeOverride(args.existingKey, args.registrationKey);
 			getClasses().delete(args.existingKey);
 			verboseLog(`[registry] ${decision.scenario}: '${args.name}' replaces '${args.existingKey}' (${decision.reason})`);
 			return "continue";
@@ -425,6 +431,8 @@ function register(ctor, config = {}) {
 	try {
 		registerUntracked(ctor, config);
 	} finally {
+		reconcileSubtypeLineage();
+		applyRuntimeOverrides();
 		bumpRegistryGeneration();
 	}
 }
@@ -433,6 +441,8 @@ function registerUntracked(ctor, config = {}) {
 	const explicitPackageName = config.packageName;
 	let promotedCollectionConstructor;
 	let promotedRuntimeConfig;
+	let promotedReplacementAncestry;
+	let isolatedSubtypeParent;
 	let isolatedManifestEntry;
 	if (config._manifestKey) {
 		if (!explicitPackageName || !config._manifest) throw new ConfigurationError("Generated isolated manifest registration requires packageName and _manifest.", "CONFIG_INVALID_ISOLATED_MANIFEST");
@@ -484,6 +494,14 @@ function registerUntracked(ctor, config = {}) {
 		};
 		existing.schema.tableName = nextTableName;
 		if (existing.constructor._isManifestStub === true && newSourceFile) existing.sourceFilePath = newSourceFile;
+		if (ctor !== existing.constructor && ctor.prototype instanceof existing.constructor) {
+			existing.replacedQualifiedNames = [.../* @__PURE__ */ new Set([...existing.replacedQualifiedNames ?? [], existingKey])];
+			const ownTenancy = normalizeTenantScopedConfig(config.tenantScoped);
+			if (ownTenancy) {
+				existing.tenantScopedConfig = ownTenancy;
+				existing.tenantScopedConfigSource = "explicit";
+			}
+		}
 		existing.constructor = ctor;
 		setSmrtTableName(ctor, nextTableName);
 		declareSensitiveTable(existing.config, nextTableName, existing.schema?.tableName);
@@ -496,6 +514,7 @@ function registerUntracked(ctor, config = {}) {
 				nextKey,
 				className: name
 			});
+			transferRuntimeOverride(existingKey, nextKey);
 			classes.delete(existingKey);
 			classes.set(nextKey, existing);
 		}
@@ -519,6 +538,7 @@ function registerUntracked(ctor, config = {}) {
 		});
 		promotedCollectionConstructor = constructorEntry.collectionConstructor || targetCollectionConstructor;
 		promotedRuntimeConfig = constructorEntry.config;
+		promotedReplacementAncestry = constructorEntry.replacedQualifiedNames;
 		getClasses().delete(constructorKey);
 		getConstructorIndex().delete(ctor);
 		if (targetIsManifestStub && targetEntry) {
@@ -536,8 +556,25 @@ function registerUntracked(ctor, config = {}) {
 	const ownQualifiedKey = newPackageName ? createQualifiedName(newPackageName, name) : void 0;
 	const ownPackageDeclaresClass = !!ownQualifiedKey && (!!explicitPackageName || stackPackageDeclaresClass || !!sourceManifestPackage);
 	const belongsToAnotherPackage = (existing) => ownPackageDeclaresClass && !!existing.packageName && existing.packageName !== newPackageName;
+	for (const [key, existing] of getClasses()) {
+		if (existing.name !== name || ctor === existing.constructor) continue;
+		if (resolveTableName(ctor, name, {
+			...config,
+			...newPackageName ? { packageName: newPackageName } : {}
+		}) !== existing.schema?.tableName) continue;
+		if (ctor.prototype instanceof existing.constructor) {
+			if (isolatedManifestEntry) {
+				isolatedSubtypeParent = [key, existing];
+				promotedCollectionConstructor ??= existing.collectionConstructor;
+				break;
+			}
+			upsertExistingEntry(key, existing);
+			return;
+		}
+		if (existing.constructor.prototype instanceof ctor) return;
+	}
 	const exactExisting = getClasses().get(name);
-	if (exactExisting && !belongsToAnotherPackage(exactExisting)) {
+	if (exactExisting && exactExisting !== isolatedSubtypeParent?.[1] && !belongsToAnotherPackage(exactExisting)) {
 		const existing = exactExisting;
 		if (applyRegisterCollisionPolicy({
 			ctor,
@@ -554,6 +591,7 @@ function registerUntracked(ctor, config = {}) {
 	}
 	const lowerName = name.toLowerCase();
 	for (const [existingKey, existing] of getClasses().entries()) {
+		if (existing === isolatedSubtypeParent?.[1]) continue;
 		const keyMatches = existingKey.toLowerCase() === lowerName;
 		const nameMatches = existing.name?.toLowerCase() === lowerName;
 		if (!(keyMatches || nameMatches) || existingKey === name) continue;
@@ -763,7 +801,7 @@ function registerUntracked(ctor, config = {}) {
 	let validators;
 	if (validationRules === void 0) validators = compileValidators(name, fields);
 	else verboseLog(`[registry] Using ${validationRules.length} pre-computed validation rules for ${name}`);
-	let extendsClass = manifestEntry?.extends;
+	let extendsClass = manifestEntry?.extendsQualified ?? manifestEntry?.extends;
 	if (!extendsClass) {
 		const proto = Object.getPrototypeOf(ctor);
 		if (proto?.name && proto.name !== "SmrtObject" && proto.name !== "Object") extendsClass = proto.name;
@@ -792,6 +830,7 @@ function registerUntracked(ctor, config = {}) {
 		tools: manifestEntry?.tools,
 		collection: manifestEntry?.collection ?? inheritedStiCollection(ctor) ?? pluralizeCollection(name),
 		collectionConstructor: promotedCollectionConstructor,
+		replacedQualifiedNames: promotedReplacementAncestry,
 		packageName,
 		sourceFilePath,
 		extends: extendsClass,
@@ -801,6 +840,21 @@ function registerUntracked(ctor, config = {}) {
 		visibility
 	};
 	assertQualifiedNameAliasesAvailable(registrationKey, registration);
+	if (isolatedSubtypeParent) {
+		const [parentKey, parent] = isolatedSubtypeParent;
+		registration.replacedQualifiedNames = [.../* @__PURE__ */ new Set([
+			...registration.replacedQualifiedNames ?? [],
+			parentKey,
+			...parent.replacedQualifiedNames ?? []
+		])];
+		if (parentKey === registrationKey) registration.extends = parent.extends;
+		transferRuntimeOverride(parentKey, registrationKey);
+		getClasses().delete(parentKey);
+		invalidateInheritanceEntries(registration, {
+			name: parent.name,
+			qualifiedName: parent.qualifiedName
+		});
+	}
 	getClasses().set(registrationKey, registration);
 	getConstructorIndex().set(ctor, registrationKey);
 	setSmrtQualifiedName(ctor, qualifiedName);
@@ -1057,7 +1111,8 @@ function mergeManifestIntoExistingRegistration(existing, objectDef, packageName)
 		existing.packageName = packageName;
 		existing.qualifiedName = createQualifiedName(packageName, existing.name);
 	} else if (!existing.packageName && objectDef.packageName) existing.packageName = objectDef.packageName;
-	if (objectDef.extends) existing.extends = packageName ? qualifyExtendsName(objectDef.extends, packageName) : objectDef.extends;
+	const manifestParent = objectDef.extendsQualified ?? objectDef.extends;
+	if (manifestParent) existing.extends = packageName ? qualifyExtendsName(manifestParent, packageName) : manifestParent;
 	if (!existing.sourceFilePath && objectDef.filePath) existing.sourceFilePath = objectDef.filePath;
 	if (objectDef.collection) existing.collection = objectDef.collection;
 	existing.visibility = objectDef.visibility || manifestConfig.visibility || existing.visibility;
@@ -1068,6 +1123,8 @@ function registerFromManifest(name, objectDef, manifestPackageName) {
 	try {
 		registerFromManifestUntracked(name, objectDef, manifestPackageName);
 	} finally {
+		reconcileSubtypeLineage();
+		applyRuntimeOverrides();
 		bumpRegistryGeneration();
 	}
 }
@@ -1076,6 +1133,9 @@ function registerFromManifestUntracked(name, objectDef, manifestPackageName) {
 	const simpleClassName = objectDef.className || name;
 	const qualifiedNameEarly = packageName ? createQualifiedName(packageName, simpleClassName) : objectDef.qualifiedName;
 	const registrationKey = qualifiedNameEarly || name;
+	const replacedQualifiedNames = /* @__PURE__ */ new Set();
+	const manifestParent = objectDef.extendsQualified ?? objectDef.extends;
+	recordSubtypeParent(registrationKey, manifestParent);
 	const existingCanonical = getCanonicalClassName(simpleClassName);
 	if (existingCanonical) {
 		const existing = getClasses().get(existingCanonical);
@@ -1087,7 +1147,8 @@ function registerFromManifestUntracked(name, objectDef, manifestPackageName) {
 				existing,
 				existingKey: existingCanonical,
 				registrationKey,
-				matchKind: "canonical-name"
+				matchKind: "canonical-name",
+				replacedQualifiedNames
 			}) === "return") return;
 		}
 	}
@@ -1101,10 +1162,11 @@ function registerFromManifestUntracked(name, objectDef, manifestPackageName) {
 			existing,
 			existingKey: registrationKey,
 			registrationKey,
-			matchKind: "exact-key"
+			matchKind: "exact-key",
+			replacedQualifiedNames
 		}) === "return") return;
 	}
-	const qualifiedExtends = objectDef.extends && packageName ? qualifyExtendsName(objectDef.extends, packageName) : objectDef.extends;
+	const qualifiedExtends = manifestParent && packageName ? qualifyExtendsName(manifestParent, packageName) : manifestParent;
 	const stubConstructor = class extends SmrtObject {
 		static _isManifestStub = true;
 	};
@@ -1176,6 +1238,7 @@ function registerFromManifestUntracked(name, objectDef, manifestPackageName) {
 		collection: objectDef.collection ?? pluralizeCollection(simpleClassName),
 		packageName,
 		sourceFilePath: objectDef.filePath,
+		replacedQualifiedNames: [...replacedQualifiedNames],
 		extends: qualifiedExtends,
 		extendsTypeArg: objectDef.extendsTypeArg,
 		visibility