@happyvertical/smrt-core 0.40.69 → 0.41.0

package/dist/scanner/manifest-generator.d.ts

@@ -27,6 +27,23 @@ export declare class ManifestGenerator {
         smrtDependencies?: string[];
         includeVisibility?: SmrtVisibility[];
     }): SmartObjectManifest;
+    /**
+     * Run every manifest generation pass, in order, on a manifest whose
+     * `objects` have been collected. This is THE pass sequence: the OXC vite
+     * plugin (`vite-plugin/index.ts`) and `ManifestBuilder.buildManifest()`
+     * call it too, so the three producers cannot drift — before #2360
+     * `ManifestBuilder` skipped the report passes and its manifests carried
+     * `(slug, context)` conflict indexes for `@report` classes while the
+     * runtime upserted on the report's group columns.
+     *
+     * @param manifest - manifest with `objects` populated (and
+     *   `smrtDependencies` set, so external STI bases resolve)
+     * @param options - package metadata for the agent-manifest pass
+     */
+    applyGenerationPasses(manifest: SmartObjectManifest, options?: {
+        packageName?: string;
+        packageJson?: PackageJsonLike;
+    }): void;
     /**
      * Materialize tenantScoped schema fields.
      *
@@ -68,6 +85,27 @@ export declare class ManifestGenerator {
     generateSchemas(manifest: SmartObjectManifest): void;
     normalizeReportObjects(manifest: SmartObjectManifest): void;
     normalizeReportTenantScope(manifest: SmartObjectManifest): void;
+    /**
+     * Materialize the tenant-aware default conflict target (#2360).
+     *
+     * A tenant-scoped class that declares no `@smrt({ conflictColumns })` keys
+     * on `[tenant column, ...natural key]` — `(tenant_id, slug, context)` for
+     * a class-per-table object, `(tenant_id, slug, context, _meta_type)` for a
+     * single-table hierarchy — so two tenants can each own the same slug and
+     * neither `save()` adopts the other's row. Writing the resolved key into
+     * `decoratorConfig.conflictColumns` (mirroring `normalizeReportObjects`)
+     * makes the manifest, the generated schema, the knowledge artifact and
+     * `ObjectRegistry.getConflictColumns()` read one value.
+     *
+     * Only schema owners are normalized: an STI child inherits the table (and
+     * therefore the key) from its root, and `getConflictColumns()` resolves a
+     * child through its root at runtime. Explicit `conflictColumns` and
+     * `@report` classes (keyed by `normalizeReportObjects`) are left alone.
+     * Runs after `injectTenantScopedFields()` and `mergeInheritedFields()` so
+     * the tenant field and the inherited `tableStrategy` are in place, and
+     * before `generateSchemas()`.
+     */
+    normalizeConflictColumns(manifest: SmartObjectManifest): void;
     private resolveSamePackageForeignKeyColumnTypes;
     private findForeignKeyTargetSchema;
     private getObjectTableName;
@@ -109,6 +147,13 @@ export declare class ManifestGenerator {
      * inheritance-resolver.ts`). Keep the two lists in sync.
      */
     private extendsFrameworkAbstractBase;
+    /**
+     * Resolve a class name (simple `Content` or qualified `@pkg:Content`) to
+     * the key it is stored under in `manifest.objects`, or `undefined` when the
+     * manifest does not carry it. Manifest keys are qualified names; `extends`
+     * and {@link findSTIBaseInfo} report simple names.
+     */
+    private resolveManifestKey;
     /**
      * Find full STI base class info (className + tableName)
      *

package/dist/scanner/manifest-generator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"manifest-generator.d.ts","sourceRoot":"","sources":["../../src/scanner/manifest-generator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"manifest-generator.d.ts","sourceRoot":"","sources":["../../src/scanner/manifest-generator.ts"],"names":[],"mappings":"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"}

package/dist/scanner/manifest-generator.js

@@ -1,8 +1,9 @@
+import { classnameToTablename, toSnakeCase } from "../utils/naming.js";
 import "./types.js";
 import { createQualifiedName } from "../utils/qualified-names.js";
 import { generateToolManifest } from "../tools/tool-generator.js";
 import { resolveCustomActionMetadata } from "../generators/custom-action.js";
-import { classnameToTablename, toSnakeCase } from "../utils/naming.js";
+import { defaultConflictColumns, resolveTenantColumn } from "../schema/conflict-target.js";
 import { SchemaGenerator } from "../schema/generator.js";
 import { isTestFile } from "./test-file-patterns.js";
 import { loadExternalManifestSync, lookupInManifest } from "../manifest/manifest-loader.js";
@@ -100,15 +101,35 @@ var ManifestGenerator = class {
 			}
 			manifest.objects[manifestKey] = objectDef;
 		}
+		this.applyGenerationPasses(manifest, {
+			packageName: options?.packageName,
+			packageJson: options?.packageJson
+		});
+		return manifest;
+	}
+	/**
+	* Run every manifest generation pass, in order, on a manifest whose
+	* `objects` have been collected. This is THE pass sequence: the OXC vite
+	* plugin (`vite-plugin/index.ts`) and `ManifestBuilder.buildManifest()`
+	* call it too, so the three producers cannot drift — before #2360
+	* `ManifestBuilder` skipped the report passes and its manifests carried
+	* `(slug, context)` conflict indexes for `@report` classes while the
+	* runtime upserted on the report's group columns.
+	*
+	* @param manifest - manifest with `objects` populated (and
+	*   `smrtDependencies` set, so external STI bases resolve)
+	* @param options - package metadata for the agent-manifest pass
+	*/
+	applyGenerationPasses(manifest, options) {
 		this.normalizeReportTenantScope(manifest);
 		this.injectTenantScopedFields(manifest);
 		this.mergeInheritedFields(manifest);
 		this.normalizeReportObjects(manifest);
+		this.normalizeConflictColumns(manifest);
 		this.generateValidationRules(manifest);
 		this.generateSchemas(manifest);
 		this.assertTenantScopedSchemaContract(manifest);
 		this.generateAgentManifests(manifest, options?.packageName, options?.packageJson);
-		return manifest;
 	}
 	/**
 	* Materialize tenantScoped schema fields.
@@ -285,26 +306,17 @@ var ManifestGenerator = class {
 	generateSchemas(manifest) {
 		const generator = new SchemaGenerator();
 		const aggregatedManifest = this.createAggregatedManifest(manifest);
-		const processedSTIBases = /* @__PURE__ */ new Set();
-		const localObjects = new Set(Object.values(manifest.objects).map((o) => o.className));
 		for (const [name, obj] of Object.entries(manifest.objects)) {
 			if (FRAMEWORK_ABSTRACT_BASE_NAMES.has(obj.className)) continue;
 			const tableName = obj.decoratorConfig?.tableName || this.classNameToTableName(obj.className);
-			if (obj.decoratorConfig?.tableStrategy === "sti") {
-				if (processedSTIBases.has(name)) continue;
-				processedSTIBases.add(name);
-				logger.info(`[manifest-generator] Generating STI schema for ${name} (table: ${tableName})`);
-				obj.schema = generator.generateSTISchemaFromManifest(name, tableName, obj.fields, aggregatedManifest, obj.decoratorConfig);
+			if (obj.decoratorConfig?.tableStrategy === "sti" || this.isSTIChildClass(obj, manifest)) {
+				const stiRoot = this.findSTIBaseInfo(obj, manifest);
+				const rootKey = stiRoot ? this.resolveManifestKey(stiRoot.className, aggregatedManifest) ?? stiRoot.className : name;
+				const rootTableName = stiRoot?.tableName || tableName;
+				const rootConfig = aggregatedManifest.objects[rootKey]?.decoratorConfig ?? obj.decoratorConfig;
+				logger.info(`[manifest-generator] Generating STI schema for ${name} (root: ${rootKey}, table: ${rootTableName})`);
+				obj.schema = generator.generateSTISchemaFromManifest(rootKey, rootTableName, obj.fields, aggregatedManifest, rootConfig);
 				this.applySqlTypeOverrides(obj);
-			} else if (this.isSTIChildClass(obj, manifest)) {
-				const stiBase = this.findSTIBaseInfo(obj, manifest);
-				if (stiBase && localObjects.has(stiBase.className)) logger.info(`[manifest-generator] Skipping schema for STI child ${name} (base ${stiBase?.className} is local)`);
-				else {
-					const baseTableName = stiBase?.tableName || tableName;
-					logger.info(`[manifest-generator] Generating STI schema for ${name} (external base: ${stiBase?.className}, table: ${baseTableName})`);
-					obj.schema = generator.generateSTISchemaFromManifest(stiBase?.className || name, baseTableName, obj.fields, aggregatedManifest, obj.decoratorConfig);
-					this.applySqlTypeOverrides(obj);
-				}
 			} else {
 				logger.info(`[manifest-generator] Generating CTI schema for ${name} (table: ${tableName})`);
 				obj.schema = generator.generateCTISchemaFromManifest(name, tableName, obj.fields, obj.decoratorConfig);
@@ -335,12 +347,51 @@ var ManifestGenerator = class {
 			obj.decoratorConfig.tenantScoped ??= { mode: "optional" };
 		}
 	}
+	/**
+	* Materialize the tenant-aware default conflict target (#2360).
+	*
+	* A tenant-scoped class that declares no `@smrt({ conflictColumns })` keys
+	* on `[tenant column, ...natural key]` — `(tenant_id, slug, context)` for
+	* a class-per-table object, `(tenant_id, slug, context, _meta_type)` for a
+	* single-table hierarchy — so two tenants can each own the same slug and
+	* neither `save()` adopts the other's row. Writing the resolved key into
+	* `decoratorConfig.conflictColumns` (mirroring `normalizeReportObjects`)
+	* makes the manifest, the generated schema, the knowledge artifact and
+	* `ObjectRegistry.getConflictColumns()` read one value.
+	*
+	* Only schema owners are normalized: an STI child inherits the table (and
+	* therefore the key) from its root, and `getConflictColumns()` resolves a
+	* child through its root at runtime. Explicit `conflictColumns` and
+	* `@report` classes (keyed by `normalizeReportObjects`) are left alone.
+	* Runs after `injectTenantScopedFields()` and `mergeInheritedFields()` so
+	* the tenant field and the inherited `tableStrategy` are in place, and
+	* before `generateSchemas()`.
+	*/
+	normalizeConflictColumns(manifest) {
+		for (const obj of Object.values(manifest.objects)) {
+			if (!obj.decoratorConfig) continue;
+			if (FRAMEWORK_ABSTRACT_BASE_NAMES.has(obj.className)) continue;
+			if (obj.decoratorConfig.conflictColumns) continue;
+			if (obj.decoratorConfig.report) continue;
+			if (this.isSTIChildClass(obj, manifest)) continue;
+			const tenantScoped = obj.decoratorConfig.tenantScoped;
+			if (!tenantScoped) continue;
+			const { tenantConfig } = this.normalizeTenantScopedConfig(tenantScoped);
+			const tenantColumn = resolveTenantColumn(tenantConfig.field, (fieldName) => Boolean(obj.fields[fieldName]), toSnakeCase);
+			if (!tenantColumn) continue;
+			obj.decoratorConfig.conflictColumns = defaultConflictColumns(obj.decoratorConfig.tableStrategy === "sti" ? "sti" : "cti", tenantColumn);
+		}
+	}
 	resolveSamePackageForeignKeyColumnTypes(manifest, generator) {
 		const schemaByTable = /* @__PURE__ */ new Map();
+		const schemasByTable = /* @__PURE__ */ new Map();
 		const ownerBySchema = /* @__PURE__ */ new Map();
 		const changedSchemas = /* @__PURE__ */ new Set();
 		for (const [name, obj] of Object.entries(manifest.objects)) if (obj.schema?.tableName) {
 			schemaByTable.set(obj.schema.tableName, obj.schema);
+			const siblings = schemasByTable.get(obj.schema.tableName) ?? [];
+			siblings.push(obj.schema);
+			schemasByTable.set(obj.schema.tableName, siblings);
 			ownerBySchema.set(obj.schema, {
 				name,
 				obj
@@ -349,20 +400,22 @@ var ManifestGenerator = class {
 		for (const obj of Object.values(manifest.objects)) {
 			const sourceTable = this.getObjectTableName(obj);
 			if (!sourceTable) continue;
-			const sourceSchema = schemaByTable.get(sourceTable);
-			if (!sourceSchema) continue;
+			const sourceSchemas = schemasByTable.get(sourceTable);
+			if (!sourceSchemas || sourceSchemas.length === 0) continue;
 			for (const [fieldName, field] of Object.entries(obj.fields || {})) {
 				if (field.type !== "foreignKey" || !field.related || field._meta?.sqlType) continue;
 				const columnName = toSnakeCase(fieldName);
-				const sourceColumn = sourceSchema.columns[columnName];
-				if (!sourceColumn) continue;
 				const targetIdType = this.findForeignKeyTargetSchema(field.related, manifest, schemaByTable)?.columns.id?.type;
-				if (!targetIdType || sourceColumn.type === targetIdType) continue;
-				sourceSchema.columns[columnName] = {
-					...sourceColumn,
-					type: targetIdType
-				};
-				changedSchemas.add(sourceSchema);
+				if (!targetIdType) continue;
+				for (const sourceSchema of sourceSchemas) {
+					const sourceColumn = sourceSchema.columns[columnName];
+					if (!sourceColumn || sourceColumn.type === targetIdType) continue;
+					sourceSchema.columns[columnName] = {
+						...sourceColumn,
+						type: targetIdType
+					};
+					changedSchemas.add(sourceSchema);
+				}
 			}
 		}
 		for (const schema of changedSchemas) this.refreshManifestSchemaDDL(schema, generator, ownerBySchema.get(schema), manifest);
@@ -536,6 +589,17 @@ var ManifestGenerator = class {
 		return false;
 	}
 	/**
+	* Resolve a class name (simple `Content` or qualified `@pkg:Content`) to
+	* the key it is stored under in `manifest.objects`, or `undefined` when the
+	* manifest does not carry it. Manifest keys are qualified names; `extends`
+	* and {@link findSTIBaseInfo} report simple names.
+	*/
+	resolveManifestKey(className, manifest) {
+		if (manifest.objects[className]) return className;
+		const simpleName = className.includes(":") ? className.slice(className.lastIndexOf(":") + 1) : className;
+		for (const [key, obj] of Object.entries(manifest.objects)) if (obj.qualifiedName === className || obj.className === simpleName) return key;
+	}
+	/**
 	* Find full STI base class info (className + tableName)
 	*
 	* Walks up the inheritance chain to find the STI base class and returns