@happyvertical/smrt-core 0.54.1 → 0.54.3

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;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"}
+{"version":3,"file":"class-registration.d.ts","sourceRoot":"","sources":["../../src/registry/class-registration.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAwBH,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AACvC,OAAO,KAAK,EAKV,qBAAqB,EAGtB,MAAM,qBAAqB,CAAC;AAsD7B,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;AAstBD;;;;GAIG;AACH,wBAAgB,QAAQ,CACtB,IAAI,EAAE,OAAO,UAAU,EACvB,MAAM,GAAE,iBAAsB,GAC7B,IAAI,CASN;AA8nCD,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;AA0LD,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,qBAAqB,EAChC,mBAAmB,CAAC,EAAE,MAAM,GAC3B,IAAI,CAUN"}

package/dist/registry/class-registration.js

@@ -1,16 +1,16 @@
 import { ConfigurationError } from "../errors.js";
 import { toSnakeCase } from "../utils/naming.js";
 import { declareChangeFeedSensitiveTable, setChangeFeedSensitiveClassResolver } from "../change-feed-sensitivity.js";
+import { tableNameFromClass } from "../utils.js";
 import { bumpRegistryGeneration } from "./generation.js";
 import { createQualifiedName, isQualifiedName, parseQualifiedName } from "../utils/qualified-names.js";
-import { getClasses, getCollections, getConstructorFieldDecorators, getConstructorIndex, getConstructorTenantScopedDeclarations, getInheritanceCache, getLegacyFieldDecorators, getSourceFileFromStack, getStiSiblingsLoaded, verboseLog } from "./shared-state.js";
-import { cloneManifestSchemaColumns, findWorkspaceRootSync, getLocalTestManifestCache, getManifestCache, getNodeBuiltins, getStaticManifestCache, getTestManifestCache } from "../manifest/store.js";
+import { getClasses, getCollections, getConstructorFieldDecorators, getConstructorIndex, getConstructorTenantScopedDeclarations, getInheritanceCache, getLegacyFieldDecorators, getSourceFileFromStack, getStampedPackageName, getStiSiblingsLoaded, verboseLog } from "./shared-state.js";
+import { cloneManifestSchemaColumns, findWorkspaceRootSync, getLocalTestManifestCache, getManifestCache, getNodeBuiltins, getStaticManifestCache, getTestManifestCache, packageStampsConstructors } from "../manifest/store.js";
 import { discoverManifestSync, discoverSTISiblingsSync, getPackageName, lookupInManifest, readProjectManifestSync } from "../manifest/manifest-loader.js";
 import { assertQualifiedNameAliasesAvailable } from "./qualified-name-aliases.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";
 import { decideCollisionPolicy } from "./collision-policy.js";
 import { isFrameworkBaseClass } from "./framework-base-classes.js";
@@ -199,7 +199,8 @@ function buildDecoratorCollisionInputs(args) {
 		hasManifestContent: false,
 		registrationKeyDiffersFromExistingKey: false,
 		existingHasNoPackage: !existing.packageName,
-		declaresDifferentTable: !!newDeclaredTableName && !!existingTableName && newDeclaredTableName !== existingTableName
+		declaresDifferentTable: !!newDeclaredTableName && !!existingTableName && newDeclaredTableName !== existingTableName,
+		existingPackageStampsConstructors: !!existing.packageName && packageStampsConstructors(existing.packageName)
 	};
 }
 /**
@@ -270,7 +271,8 @@ function buildManifestCollisionInputs(args) {
 		hasManifestContent: !!(objectDef.fields || objectDef.methods || objectDef.schema || objectDef.decoratorConfig),
 		registrationKeyDiffersFromExistingKey: registrationKey !== existingKey,
 		existingHasNoPackage: !existing.packageName,
-		declaresDifferentTable: false
+		declaresDifferentTable: false,
+		existingPackageStampsConstructors: false
 	};
 }
 /**
@@ -378,6 +380,55 @@ function validateIsolatedRegistrationManifest(manifest, manifestKey, name, packa
 function anySensitive(...configs) {
 	return configs.some((config) => config?.sensitive === true);
 }
+/** Validate ancestry too: a raw child manifest may not carry an inherited table name. */
+function assertStiSensitivity(config, qualifiedName, extendsName, schemaTableName) {
+	if (config.tableStrategy === "cti") return;
+	const incoming = {
+		config,
+		qualifiedName,
+		extends: extendsName,
+		schema: schemaTableName ? { tableName: schemaTableName } : void 0
+	};
+	const resolve = (name) => {
+		if (name === qualifiedName) return incoming;
+		const existing = findClass(name);
+		if (existing?.qualifiedName === qualifiedName) return incoming;
+		if (existing) return existing;
+		return name === qualifiedName.split(":").at(-1) ? incoming : void 0;
+	};
+	const rootOf = (node) => {
+		let root;
+		const visited = /* @__PURE__ */ new Set();
+		let current = node;
+		while (current && !visited.has(current.qualifiedName ?? "")) {
+			visited.add(current.qualifiedName ?? "");
+			if (current.config.tableStrategy === "cti") return void 0;
+			if (current.config.tableStrategy === "sti") root = current;
+			current = current.extends ? resolve(current.extends) : void 0;
+		}
+		return root;
+	};
+	const incomingRoot = rootOf(incoming);
+	if (!incomingRoot) return;
+	const canonicalName = (node) => node.qualifiedName ?? ("name" in node ? node.name : qualifiedName);
+	const rootName = canonicalName(incomingRoot);
+	const belongsToHierarchy = (node) => {
+		const root = rootOf(node);
+		return root !== void 0 && canonicalName(root) === rootName;
+	};
+	for (const existing of getClasses().values()) {
+		const root = rootOf(existing);
+		if (!root || !belongsToHierarchy(existing)) continue;
+		if (canonicalName(existing) === canonicalName(incoming)) continue;
+		if (existing.config.sensitive === true !== (config.sensitive === true)) {
+			for (const member of [incoming, ...getClasses().values()]) {
+				if (!belongsToHierarchy(member)) continue;
+				for (const table of [member.schema?.tableName, member.config.tableName]) if (table) declareChangeFeedSensitiveTable(table);
+			}
+			throw new ConfigurationError(`STI hierarchy ${root.qualifiedName} has mixed sensitivity; mark every class sensitive or use separate tables.`, "CONFIG_STI_MIXED_SENSITIVITY");
+		}
+	}
+}
 function declareSensitiveTable(config, ...tableNames) {
 	if (config.sensitive !== true) return;
 	for (const tableName of tableNames) if (tableName) declareChangeFeedSensitiveTable(tableName);
@@ -438,7 +489,7 @@ function register(ctor, config = {}) {
 }
 function registerUntracked(ctor, config = {}) {
 	const name = config.name || ctor.name;
-	const explicitPackageName = config.packageName;
+	const explicitPackageName = config.packageName ?? getStampedPackageName(ctor);
 	let promotedCollectionConstructor;
 	let promotedRuntimeConfig;
 	let promotedReplacementAncestry;
@@ -452,6 +503,11 @@ function registerUntracked(ctor, config = {}) {
 	function upsertExistingEntry(existingKey, existing) {
 		const nextPackageName = explicitPackageName || existing.packageName;
 		const nextKey = nextPackageName ? createQualifiedName(nextPackageName, name) : name;
+		assertStiSensitivity({
+			...existing.config,
+			...config,
+			...anySensitive(existing.config, config) ? { sensitive: true } : {}
+		}, nextKey, existing.extends, existing.schema?.tableName);
 		const previousIdentity = {
 			name: existing.name,
 			qualifiedName: existing.qualifiedName
@@ -482,6 +538,7 @@ function registerUntracked(ctor, config = {}) {
 			tableName: nextTableName,
 			...anySensitive(existing.config, config) ? { sensitive: true } : {}
 		};
+		existing.collection = existing.config.collection ?? existing.collection;
 		if (!existing.schema) existing.schema = {
 			ddl: "",
 			indexes: [],
@@ -620,6 +677,7 @@ function registerUntracked(ctor, config = {}) {
 		if (findClassesByName(name).some((candidate) => !!candidate.packageName && candidate.packageName !== newPackageName)) return;
 		const entry = discoverManifestSync(name);
 		if (!(!!entry?.packageName && entry.packageName !== newPackageName)) return entry;
+		if (entry?.packageName && packageStampsConstructors(entry.packageName)) return;
 		if (isSameSourcePath(newSourceFile, entry?.filePath)) return entry;
 		if (ownPackageDeclaresClass) return void 0;
 		const entryTable = entry?.schema?.tableName || entry?.decoratorConfig?.tableName;
@@ -813,6 +871,7 @@ function registerUntracked(ctor, config = {}) {
 		tableName,
 		...anySensitive(promotedRuntimeConfig, manifestEntry?.decoratorConfig, config) ? { sensitive: true } : {}
 	};
+	assertStiSensitivity(mergedConfig, packageName ? `${packageName}:${name}` : name, getConstructorIndex().get(Object.getPrototypeOf(ctor)) ?? extendsClass, schema?.tableName);
 	declareSensitiveTable(mergedConfig, tableName, schema?.tableName, manifestEntry?.schema?.tableName);
 	const qualifiedName = packageName ? createQualifiedName(packageName, name) : void 0;
 	const visibility = config.visibility || manifestEntry?.visibility || "public";
@@ -828,7 +887,7 @@ function registerUntracked(ctor, config = {}) {
 		validators,
 		validationRules,
 		tools: manifestEntry?.tools,
-		collection: manifestEntry?.collection ?? inheritedStiCollection(ctor) ?? pluralizeCollection(name),
+		collection: config.collection ?? manifestEntry?.collection ?? inheritedStiCollection(ctor) ?? pluralizeCollection(name),
 		collectionConstructor: promotedCollectionConstructor,
 		replacedQualifiedNames: promotedReplacementAncestry,
 		packageName,
@@ -1032,12 +1091,14 @@ function mergeManifestIntoExistingRegistration(existing, objectDef, packageName)
 	const runtimeTenantScopedDeclaration = getConstructorTenantScopedDeclarations().get(existing.constructor);
 	if (existing.tenantScopedConfigSource !== "explicit" && normalizeTenantScopedConfig(manifestConfig.tenantScoped) === void 0 && runtimeTenantScopedDeclaration) throw new ConfigurationError(`Manifest for '${existing.qualifiedName || existing.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 manifestTableName = objectDef.schema?.tableName || manifestConfig.tableName || existing.schema?.tableName || existing.config.tableName || tableNameFromClass(existing.constructor);
-	existing.config = {
+	const nextConfig = {
 		...manifestConfig,
 		...existing.config,
 		tableName: manifestTableName,
 		...anySensitive(manifestConfig, existing.config) ? { sensitive: true } : {}
 	};
+	assertStiSensitivity(nextConfig, existing.qualifiedName || existing.name, objectDef.extendsQualified ?? existing.extends ?? objectDef.extends, objectDef.schema?.tableName ?? existing.schema?.tableName);
+	existing.config = nextConfig;
 	declareSensitiveTable(existing.config, manifestTableName, objectDef.schema?.tableName, existing.schema?.tableName);
 	if (objectDef.fields) for (const [fieldName, fd] of Object.entries(objectDef.fields)) {
 		if (!existing.fields.has(fieldName)) {
@@ -1114,7 +1175,7 @@ function mergeManifestIntoExistingRegistration(existing, objectDef, packageName)
 	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;
+	if (objectDef.collection) existing.collection = existing.config.collection ?? objectDef.collection;
 	existing.visibility = objectDef.visibility || manifestConfig.visibility || existing.visibility;
 	invalidateInheritanceEntries(existing);
 }
@@ -1178,6 +1239,10 @@ function registerFromManifestUntracked(name, objectDef, manifestPackageName) {
 	if (objectDef.methods) for (const [methodName, methodDef] of Object.entries(objectDef.methods)) methods.set(methodName, methodDef);
 	const config = objectDef.decoratorConfig || {};
 	const tableName = config.tableName || tableNameFromClass(stubConstructor);
+	assertStiSensitivity({
+		...config,
+		tableName
+	}, qualifiedNameEarly || name, objectDef.extendsQualified ?? objectDef.extends, objectDef.schema?.tableName);
 	declareSensitiveTable(config, tableName, objectDef.schema?.tableName);
 	let schema;
 	if (objectDef.schema) {
@@ -1235,7 +1300,7 @@ function registerFromManifestUntracked(name, objectDef, manifestPackageName) {
 		validators,
 		validationRules,
 		tools: objectDef.tools,
-		collection: objectDef.collection ?? pluralizeCollection(simpleClassName),
+		collection: config.collection ?? objectDef.collection ?? pluralizeCollection(simpleClassName),
 		packageName,
 		sourceFilePath: objectDef.filePath,
 		replacedQualifiedNames: [...replacedQualifiedNames],