@happyvertical/smrt-core 0.48.0 → 0.49.1

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

@@ -1,8 +1,9 @@
 import { SmrtObject } from '../object';
 import { SmartObjectDefinition } from '../scanner/types.js';
-import { RegisteredClass, SmartObjectConfig } from './types.js';
+import { RegisteredClass, RegisteredField, SmartObjectConfig } from './types.js';
 export declare function register(ctor: typeof SmrtObject, config?: SmartObjectConfig): void;
 export declare function registerCollection(objectName: string, collectionConstructor: NonNullable<RegisteredClass['collectionConstructor']>): void;
+export declare function ensureTenantScopedField(fields: Map<string, RegisteredField>, tenantScopedConfig: RegisteredClass['tenantScopedConfig'] | undefined): void;
 /**
  * Invalidate cached inheritance state (chain + inheritedFields +
  * inheritedMethods) on `existing` AND every descendant whose `extends` or

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;AAUH,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AACvC,OAAO,KAAK,EAKV,qBAAqB,EAGtB,MAAM,qBAAqB,CAAC;AAsC7B,OAAO,KAAK,EACV,eAAe,EAEf,iBAAiB,EAElB,MAAM,YAAY,CAAC;AA0dpB,wBAAgB,QAAQ,CACtB,IAAI,EAAE,OAAO,UAAU,EACvB,MAAM,GAAE,iBAAsB,GAC7B,IAAI,CAqwBN;AAED,wBAAgB,kBAAkB,CAChC,UAAU,EAAE,MAAM,EAMlB,qBAAqB,EAAE,WAAW,CAAC,eAAe,CAAC,uBAAuB,CAAC,CAAC,GAC3E,IAAI,CAeN;AA6LD;;;;;;;;;;;;;;;;;;;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,CA2CN;AA0ID,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,qBAAqB,EAChC,WAAW,CAAC,EAAE,MAAM,GACnB,IAAI,CA4QN"}
+{"version":3,"file":"class-registration.d.ts","sourceRoot":"","sources":["../../src/registry/class-registration.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAUH,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AACvC,OAAO,KAAK,EAKV,qBAAqB,EAGtB,MAAM,qBAAqB,CAAC;AAwC7B,OAAO,KAAK,EACV,eAAe,EACf,eAAe,EACf,iBAAiB,EAElB,MAAM,YAAY,CAAC;AA0dpB,wBAAgB,QAAQ,CACtB,IAAI,EAAE,OAAO,UAAU,EACvB,MAAM,GAAE,iBAAsB,GAC7B,IAAI,CA6zBN;AAyCD,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,CAuCN;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,CA2CN;AA4JD,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,qBAAqB,EAChC,WAAW,CAAC,EAAE,MAAM,GACnB,IAAI,CA4QN"}

package/dist/registry/class-registration.js

@@ -2,7 +2,7 @@ import { ConfigurationError } from "../errors.js";
 import { toSnakeCase } from "../utils/naming.js";
 import { createQualifiedName, isQualifiedName } from "../utils/qualified-names.js";
 import { cloneManifestSchemaColumns } from "../manifest/store.js";
-import { getClasses, getCollections, getConstructorIndex, getFieldDecorators, getInheritanceCache, getSourceFileFromStack, getStiSiblingsLoaded, verboseLog } from "./shared-state.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 { discoverManifestSync, discoverSTISiblingsSync, getPackageName, lookupInManifest } from "../manifest/manifest-loader.js";
@@ -253,6 +253,7 @@ function register(ctor, config = {}) {
 	if (config._manifestKey) {
 		if (!explicitPackageName || !config._manifest) throw new ConfigurationError("Generated isolated manifest registration requires packageName and _manifest.", "CONFIG_INVALID_ISOLATED_MANIFEST");
 		isolatedManifestEntry = validateIsolatedRegistrationManifest(config._manifest, config._manifestKey, name, explicitPackageName);
+		if (config.tenantScoped === void 0 && normalizeTenantScopedConfig(isolatedManifestEntry.decoratorConfig?.tenantScoped) === void 0 && getConstructorTenantScopedDeclarations().get(ctor)) 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");
 	}
 	function upsertExistingEntry(existingKey, existing) {
 		const nextPackageName = explicitPackageName || existing.packageName;
@@ -367,6 +368,8 @@ function register(ctor, config = {}) {
 	let manifestEntry;
 	if (config._manifest) manifestEntry = lookupRegistrationManifest(config._manifest, name, explicitPackageName, config._manifestKey);
 	if (!manifestEntry) manifestEntry = 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();
 	const methods = /* @__PURE__ */ new Map();
 	let packageName;
@@ -399,7 +402,14 @@ function register(ctor, config = {}) {
 		verboseLog(`[registry] ⚠️  No manifest entry for ${name} - fields will be loaded later`);
 		packageName = packageNameFromStack;
 	}
-	const decorators = getFieldDecorators().get(isolatedManifestEntry ? ctor.name : name);
+	const decoratorKey = isolatedManifestEntry ? ctor.name : name;
+	const simpleDecorators = getLegacyFieldDecorators().get(decoratorKey);
+	const constructorDecorators = getConstructorFieldDecorators().get(ctor);
+	const decorators = new Map(simpleDecorators);
+	for (const [fieldName, options] of constructorDecorators ?? []) decorators.set(fieldName, {
+		...decorators.get(fieldName),
+		...options
+	});
 	if (decorators && decorators.size > 0) {
 		verboseLog(`[registry] Applying ${decorators.size} field decorators for ${name}`);
 		for (const [fieldName, decoratorOptions] of decorators) {
@@ -458,16 +468,13 @@ function register(ctor, config = {}) {
 		}
 	}
 	let tenantScopedConfig;
-	const effectiveTenantScoped = config.tenantScoped ?? manifestEntry?.decoratorConfig?.tenantScoped;
+	const constructorTenantScopedDeclaration = manifestEntry ? void 0 : runtimeTenantScopedDeclaration;
+	const fieldTenantScopedConfig = tenantScopedConfigFromFieldMetadata(fields);
+	const tenantScopedConfigSource = config.tenantScoped !== void 0 ? "explicit" : manifestEntry?.decoratorConfig?.tenantScoped !== void 0 ? "manifest" : manifestEntry ? "manifest" : constructorTenantScopedDeclaration ? "tenant-decorator" : fieldTenantScopedConfig ? "field-fallback" : void 0;
+	const effectiveTenantScoped = config.tenantScoped ?? manifestEntry?.decoratorConfig?.tenantScoped ?? (manifestEntry ? void 0 : constructorTenantScopedDeclaration ?? fieldTenantScopedConfig);
 	if (effectiveTenantScoped) {
-		const tenantOpts = typeof effectiveTenantScoped === "boolean" ? {} : effectiveTenantScoped;
-		tenantScopedConfig = {
-			mode: tenantOpts.mode ?? "required",
-			field: tenantOpts.field ?? "tenantId",
-			autoFilter: tenantOpts.autoFilter ?? true,
-			autoPopulate: tenantOpts.autoPopulate ?? true,
-			allowSuperAdminBypass: tenantOpts.allowSuperAdminBypass ?? false
-		};
+		tenantScopedConfig = normalizeTenantScopedConfig(effectiveTenantScoped);
+		if (!tenantScopedConfig) return;
 		const fieldName = tenantScopedConfig.field;
 		const hadTenantField = fields.has(fieldName);
 		ensureTenantScopedField(fields, tenantScopedConfig);
@@ -564,6 +571,7 @@ function register(ctor, config = {}) {
 		extends: extendsClass,
 		extendsTypeArg: manifestEntry?.extendsTypeArg,
 		tenantScopedConfig,
+		tenantScopedConfigSource,
 		visibility
 	});
 	getConstructorIndex().set(ctor, registrationKey);
@@ -584,6 +592,26 @@ function register(ctor, config = {}) {
 		}
 	}
 }
+/**
+* Resolve the core-visible tenancy contract from a `@tenantId()` field when a
+* runtime registration has no manifest entry. `@TenantScoped()` lives in the
+* tenancy package, so core cannot import its registry without a cycle; the
+* field decorator runs before `@smrt()`. A nullable tenant identifier is the
+* runtime representation of optional tenancy used by that decorator.
+*/
+function tenantScopedConfigFromFieldMetadata(fields) {
+	for (const [fieldName, field] of fields) {
+		const tenancy = field._meta?.__tenancy;
+		if (tenancy?.isTenantIdField !== true) continue;
+		return {
+			mode: tenancy.mode === "required" ? "required" : tenancy.mode === "optional" || field._meta?.nullable === true ? "optional" : "required",
+			field: typeof tenancy.field === "string" ? tenancy.field : fieldName,
+			autoFilter: tenancy.autoFilter !== false,
+			autoPopulate: tenancy.autoPopulate !== false,
+			allowSuperAdminBypass: tenancy.allowSuperAdminBypass === true
+		};
+	}
+}
 function registerCollection(objectName, collectionConstructor) {
 	const registered = findClass(objectName);
 	if (registered) registered.collectionConstructor = collectionConstructor;
@@ -717,6 +745,8 @@ function invalidateInheritanceEntries(existing, previousIdentity) {
 }
 function mergeManifestIntoExistingRegistration(existing, objectDef, packageName) {
 	const manifestConfig = objectDef.decoratorConfig || {};
+	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 = {
 		...manifestConfig,
@@ -732,10 +762,11 @@ function mergeManifestIntoExistingRegistration(existing, objectDef, packageName)
 		if (!existingField) continue;
 		existing.fields.set(fieldName, mergeManifestField(existingField, fd));
 	}
-	const tenantScopedConfig = normalizeTenantScopedConfig(existing.config.tenantScoped);
-	if (tenantScopedConfig) {
+	if (existing.tenantScopedConfigSource !== "explicit") {
+		const tenantScopedConfig = normalizeTenantScopedConfig(manifestConfig.tenantScoped);
 		existing.tenantScopedConfig = tenantScopedConfig;
-		ensureTenantScopedField(existing.fields, tenantScopedConfig);
+		existing.tenantScopedConfigSource = "manifest";
+		if (tenantScopedConfig) ensureTenantScopedField(existing.fields, tenantScopedConfig);
 	}
 	if (objectDef.methods) for (const [methodName, methodDef] of Object.entries(objectDef.methods)) existing.methods.set(methodName, methodDef);
 	if (objectDef.schema) {
@@ -836,7 +867,7 @@ function registerFromManifest(name, objectDef, packageName) {
 	};
 	Object.defineProperty(stubConstructor, "name", { value: simpleClassName });
 	const fields = /* @__PURE__ */ new Map();
-	const decorators = getFieldDecorators().get(simpleClassName);
+	const decorators = getLegacyFieldDecorators().get(simpleClassName);
 	if (objectDef.fields) for (const [fieldName, fd] of Object.entries(objectDef.fields)) fields.set(fieldName, createFieldFromManifest(fd));
 	const methods = /* @__PURE__ */ new Map();
 	if (objectDef.methods) for (const [methodName, methodDef] of Object.entries(objectDef.methods)) methods.set(methodName, methodDef);
@@ -922,6 +953,6 @@ function registerFromManifest(name, objectDef, packageName) {
 	}
 }
 //#endregion
-export { invalidateInheritanceEntries, register, registerCollection, registerFromManifest };
+export { ensureTenantScopedField, invalidateInheritanceEntries, register, registerCollection, registerFromManifest };
 
 //# sourceMappingURL=class-registration.js.map