@happyvertical/smrt-core 0.51.24 → 0.51.25

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;AAcH,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AACvC,OAAO,KAAK,EAKV,qBAAqB,EAGtB,MAAM,qBAAqB,CAAC;AAyC7B,OAAO,KAAK,EACV,eAAe,EACf,eAAe,EACf,iBAAiB,EAElB,MAAM,YAAY,CAAC;AA2gBpB;;;;GAIG;AACH,wBAAgB,QAAQ,CACtB,IAAI,EAAE,OAAO,UAAU,EACvB,MAAM,GAAE,iBAAsB,GAC7B,IAAI,CAON;AA+4BD,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;AA2KD,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;AAcH,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AACvC,OAAO,KAAK,EAKV,qBAAqB,EAGtB,MAAM,qBAAqB,CAAC;AA0C7B,OAAO,KAAK,EACV,eAAe,EACf,eAAe,EACf,iBAAiB,EAElB,MAAM,YAAY,CAAC;AAqiBpB;;;;GAIG;AACH,wBAAgB,QAAQ,CACtB,IAAI,EAAE,OAAO,UAAU,EACvB,MAAM,GAAE,iBAAsB,GAC7B,IAAI,CAON;AAy7BD,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;AA2KD,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,qBAAqB,EAChC,mBAAmB,CAAC,EAAE,MAAM,GAC3B,IAAI,CAQN"}

package/dist/registry/class-registration.js

@@ -3,11 +3,11 @@ import { toSnakeCase } from "../utils/naming.js";
 import { declareChangeFeedSensitiveTable, setChangeFeedSensitiveClassResolver } from "../change-feed-sensitivity.js";
 import { bumpRegistryGeneration } from "./generation.js";
 import { createQualifiedName, isQualifiedName } from "../utils/qualified-names.js";
-import { cloneManifestSchemaColumns } from "../manifest/store.js";
 import { getClasses, getCollections, getConstructorFieldDecorators, getConstructorIndex, getConstructorTenantScopedDeclarations, getInheritanceCache, getLegacyFieldDecorators, getSourceFileFromStack, getStiSiblingsLoaded, verboseLog } from "./shared-state.js";
-import { findClass, getCanonicalClassName, hasClassCaseInsensitive, qualifyExtendsName } from "./name-resolver.js";
-import { buildInheritanceChain } from "./inheritance-resolver.js";
+import { cloneManifestSchemaColumns } from "../manifest/store.js";
 import { discoverManifestSync, discoverSTISiblingsSync, getPackageName, lookupInManifest } from "../manifest/manifest-loader.js";
+import { findClass, findClassesByName, getCanonicalClassName, hasClassCaseInsensitive, qualifyExtendsName } from "./name-resolver.js";
+import { buildInheritanceChain } from "./inheritance-resolver.js";
 import { compileValidators } from "./validator.js";
 import { tableNameFromClass } from "../utils.js";
 import { SmrtObject } from "../object.js";
@@ -194,9 +194,22 @@ function applyManifestCollisionPolicy(args) {
 	}
 }
 function resolveTableName(ctor, name, config) {
-	const manifestEntry = config._manifest ? lookupRegistrationManifest(config._manifest, name, config.packageName, config._manifestKey) : discoverManifestSync(name);
+	const manifestEntry = config._manifest ? lookupRegistrationManifest(config._manifest, name, config.packageName, config._manifestKey) : discoverManifestSync(config.packageName ? createQualifiedName(config.packageName, name) : name);
 	return manifestEntry?.schema?.tableName || manifestEntry?.decoratorConfig?.tableName || config.tableName || tableNameFromClass(ctor);
 }
+/**
+* Whether `packageName` itself declares the class `qualifiedKey` names: it is
+* registered under that key (a manifest stub or an earlier registration), or
+* a manifest owned by that package describes it. A stack-derived package is
+* only trusted as a class's identity on this evidence — a consumer bundle
+* that inlined a dependency reports the consumer's package, whose manifest
+* describes the dependency's classes under the dependency's name (#3098).
+*/
+function packageDeclaresClass(packageName, qualifiedKey) {
+	if (getClasses().has(qualifiedKey)) return true;
+	const entry = discoverManifestSync(qualifiedKey);
+	return !!entry && (entry.packageName === void 0 || entry.packageName === packageName);
+}
 function lookupRegistrationManifest(manifest, name, _packageName, manifestKey) {
 	if (manifestKey) return manifest.objects[manifestKey];
 	return lookupInManifest(manifest, name);
@@ -320,7 +333,8 @@ function registerUntracked(ctor, config = {}) {
 		existing.qualifiedName = nextPackageName ? createQualifiedName(nextPackageName, name) : void 0;
 		const nextTableName = resolveTableName(ctor, name, {
 			...existing.config,
-			...config
+			...config,
+			...nextPackageName ? { packageName: nextPackageName } : {}
 		});
 		existing.config = {
 			...existing.config,
@@ -385,16 +399,18 @@ function registerUntracked(ctor, config = {}) {
 		upsertExistingEntry(constructorKey, constructorEntry);
 		return;
 	}
-	if (getClasses().has(name)) {
-		const existing = getClasses().get(name);
-		if (!existing) throw new Error(`Registry inconsistency: ${name} exists in classes Map but get() returned undefined`);
+	const ownQualifiedKey = newPackageName ? createQualifiedName(newPackageName, name) : void 0;
+	const ownPackageDeclaresClass = !!ownQualifiedKey && !!newPackageName && (!!explicitPackageName || packageDeclaresClass(newPackageName, ownQualifiedKey));
+	const belongsToAnotherPackage = (existing) => ownPackageDeclaresClass && !!existing.packageName && existing.packageName !== newPackageName;
+	const exactExisting = getClasses().get(name);
+	if (exactExisting && !belongsToAnotherPackage(exactExisting)) {
 		if (applyRegisterCollisionPolicy({
 			ctor,
 			name,
 			newPackageName,
 			newSourceFile,
 			newInBundledContext,
-			existing,
+			existing: exactExisting,
 			existingKey: name,
 			matchKind: "exact-key",
 			upsertExistingEntry
@@ -406,6 +422,7 @@ function registerUntracked(ctor, config = {}) {
 		const nameMatches = existing.name?.toLowerCase() === lowerName;
 		if (!(keyMatches || nameMatches) || existingKey === name) continue;
 		if (explicitPackageName && existing.packageName && explicitPackageName !== existing.packageName && isQualifiedName(existingKey)) continue;
+		if (belongsToAnotherPackage(existing)) continue;
 		if (applyRegisterCollisionPolicy({
 			ctor,
 			name,
@@ -422,7 +439,7 @@ function registerUntracked(ctor, config = {}) {
 	const sourceFilePath = getSourceFileFromStack();
 	let manifestEntry;
 	if (config._manifest) manifestEntry = lookupRegistrationManifest(config._manifest, name, explicitPackageName, config._manifestKey);
-	if (!manifestEntry) manifestEntry = discoverManifestSync(name);
+	if (!manifestEntry) manifestEntry = ownQualifiedKey && ownPackageDeclaresClass ? discoverManifestSync(ownQualifiedKey) ?? (findClassesByName(name).some((candidate) => !!candidate.packageName && candidate.packageName !== newPackageName) ? void 0 : discoverManifestSync(name)) : discoverManifestSync(name);
 	const runtimeTenantScopedDeclaration = getConstructorTenantScopedDeclarations().get(ctor);
 	if (manifestEntry && config.tenantScoped === void 0 && normalizeTenantScopedConfig(manifestEntry.decoratorConfig?.tenantScoped) === void 0 && runtimeTenantScopedDeclaration) throw new ConfigurationError(`Manifest for '${name}' omits or disables tenantScoped but its runtime constructor is decorated with @TenantScoped(). Regenerate the manifest so tenancy schema and runtime enforcement agree.`, "CONFIG_TENANT_MANIFEST_CONFLICT");
 	const fields = /* @__PURE__ */ new Map();
@@ -552,7 +569,10 @@ function registerUntracked(ctor, config = {}) {
 			if (childStrategy !== void 0 && parentStrategy !== childStrategy) throw ConfigurationError.incompatibleStrategy(name, childStrategy, parentName, parentStrategy);
 		}
 	}
-	const tableName = resolveTableName(ctor, name, config);
+	const tableName = resolveTableName(ctor, name, {
+		...config,
+		...ownPackageDeclaresClass && newPackageName ? { packageName: newPackageName } : {}
+	});
 	setSmrtTableName(ctor, tableName);
 	let schema;
 	if (manifestEntry?.schema) {