@happyvertical/smrt-core 0.51.23 → 0.51.25

package/dist/registry.js

@@ -2,18 +2,19 @@ import { ConfigurationError } from "./errors.js";
 import { classnameToTablename, toSnakeCase } from "./utils/naming.js";
 import { applyOneToManyChildAccessors } from "./child-accessors.js";
 import { applyPendingDecoratorRegistrations } from "./decorators/compatibility.js";
-import { clearRegistryDiagnostics, flushRegistryDiagnostics, getRegistryDiagnostics, recordRegistryDiagnostic } from "./registry/diagnostics.js";
 import { bumpRegistryGeneration, getRegistryGeneration } from "./registry/generation.js";
 import { createQualifiedName, isQualifiedName, parseQualifiedName } from "./utils/qualified-names.js";
+import { LRUCache } from "./utils/lru-cache.js";
+import { getClasses, getCollectionCache, getCollectionTableNames, getCollections, getConstructorFieldDecorators, getConstructorTenantScopedDeclarations, getDbInstanceIds, getDiscoveryAttemptCache, getFieldDecorators, getInheritanceCache, getLegacyFieldDecorators, getMethodDecorators, getNextDbId, getStiSiblingsLoaded, setNextDbId, verboseLog } from "./registry/shared-state.js";
+import { defaultConflictColumns, resolveTenantColumn } from "./schema/conflict-target.js";
+import { clearRegistryDiagnostics, flushRegistryDiagnostics, getRegistryDiagnostics, recordRegistryDiagnostic } from "./registry/diagnostics.js";
 import { cloneManifestSchemaColumns, discoverCachedManifestSync, getManifestCache, getNodeBuiltins, loadExternalManifestSyncWithNode } from "./manifest/store.js";
 import { getDefaultCompositeSource } from "./manifest/sources/composite.js";
+import { getPackageName } from "./manifest/manifest-loader.js";
 import { ExplicitPathsManifestSource } from "./manifest/sources/explicit-paths.js";
-import { LRUCache } from "./utils/lru-cache.js";
-import { getClasses, getCollectionCache, getCollectionTableNames, getCollections, getConstructorFieldDecorators, getConstructorTenantScopedDeclarations, getDbInstanceIds, getDiscoveryAttemptCache, getFieldDecorators, getInheritanceCache, getLegacyFieldDecorators, getMethodDecorators, getNextDbId, getStiSiblingsLoaded, setNextDbId, verboseLog } from "./registry/shared-state.js";
 import { findClass, findClassesByName, getAllClasses, getCanonicalClassName, getClass, getClassByConstructor, getClassByQualifiedName, getClassInPackage, getClassNames, getClassesByPackage, getClassesByVisibility, getPublicClasses, getQualifiedClassNames, hasClass, hasClassCaseInsensitive, resolveType } from "./registry/name-resolver.js";
 import { getAllFields, getAllMethods, getInheritanceChain, mergeFieldConfigs } from "./registry/inheritance-resolver.js";
 import { resolveCollectionCacheConfig } from "./registry/cache-config.js";
-import { defaultConflictColumns, resolveTenantColumn } from "./schema/conflict-target.js";
 import { compileValidators } from "./registry/validator.js";
 import "./utils.js";
 import { isFrameworkBaseClass } from "./registry/framework-base-classes.js";
@@ -2450,11 +2451,12 @@ function smrt(config = {}) {
 					} else if (ObjectRegistry.getTableStrategy(itemQualified) === "sti") tableName = classnameToTablename(itemClassName);
 					else tableName = classnameToTablename(itemClassName);
 				}
+				const itemTableName = config.tableName ? tableName : ObjectRegistry.getClassByConstructor(itemClass)?.schema?.tableName || tableName;
 				ObjectRegistry.register(itemClass, {
 					...config,
-					tableName
+					tableName: itemTableName
 				});
-				const registeredItemClass = ObjectRegistry.getClass(itemClass.name);
+				const registeredItemClass = ObjectRegistry.getClassByConstructor(itemClass);
 				const collectionCtor = ctor;
 				ObjectRegistry.registerCollection(itemClass.name, collectionCtor);
 				if (registeredItemClass?.qualifiedName) ObjectRegistry.registerCollection(registeredItemClass.qualifiedName, collectionCtor);
@@ -2464,7 +2466,9 @@ function smrt(config = {}) {
 		} else {
 			let tableName = config.tableName;
 			if (!tableName) {
-				const manifestEntry = discoverCachedManifestSync(ctor.name);
+				const ownPackage = config.packageName ?? getPackageName(ctor, true) ?? void 0;
+				const ownQualifiedKey = ownPackage ? createQualifiedName(ownPackage, ctor.name) : void 0;
+				const manifestEntry = discoverCachedManifestSync(ownQualifiedKey && getClasses().has(ownQualifiedKey) ? ownQualifiedKey : ctor.name);
 				if (manifestEntry?.decoratorConfig?.tableName) tableName = manifestEntry.decoratorConfig.tableName;
 				else if (config.tableStrategy === "sti") {
 					let proto = Object.getPrototypeOf(ctor);