@happyvertical/smrt-core 0.40.68 → 0.40.70

package/dist/schema/generator.d.ts

@@ -1,6 +1,6 @@
 import { FieldDefinition, FieldMeta, ManifestSchema, SmartObjectDefinition, SmartObjectManifest } from '../scanner/types.js';
 import { DatabaseEngine } from './ddl/types.js';
-import { SchemaDefinition } from './types.js';
+import { DeclaredIndexDefinition, SchemaDefinition } from './types.js';
 /**
  * Structural shape of a field as read from either the build-time manifest
  * (`FieldDefinition`) or the runtime ObjectRegistry (`getAllFields()` returns
@@ -27,6 +27,15 @@ interface RegistryField {
 type SchemaGeneratorConfig = {
     conflictColumns?: string[];
     idType?: 'uuid' | 'text';
+    /**
+     * `@smrt({ indexes: [...] })` declarations (#2357).
+     *
+     * The manifest paths receive the whole `decoratorConfig`, so this arrives for
+     * free there. The runtime paths rebuild a narrow config bag by hand
+     * (`schema/utils.ts`, `testing/database.ts`) and must thread it explicitly —
+     * omitting it is what made the option unreachable at runtime.
+     */
+    indexes?: DeclaredIndexDefinition[];
     registry?: {
         getConfig?(className: string): {
             idType?: 'uuid' | 'text';
@@ -55,6 +64,56 @@ export declare class SchemaGenerator {
      * Generate column definitions
      */
     private generateColumns;
+    /**
+     * Append `@smrt({ indexes: [...] })` declarations to a generated index set
+     * (#2357).
+     *
+     * Shared by every schema path — build-time AST, runtime registry CTI/STI, and
+     * manifest CTI/STI — so one declaration behaves identically however the schema
+     * was derived. Call it *before* `ensureTenantIdIndex`: a declared composite
+     * leading with `tenant_id` is exactly what that helper's "already leading"
+     * check is meant to defer to, and appending afterwards would leave the table
+     * with a redundant standalone tenant index (#2384).
+     *
+     * Nothing is dropped quietly. A column that resolves to no column on the
+     * table, a malformed entry, and a name collision with a different index are
+     * all hard errors — a silently missing index is a production performance bug
+     * that surfaces only under load.
+     *
+     * @param indexes - Generated index set, appended in place
+     * @param declared - The object's `indexes` config, from any config source
+     * @param columns - Emitted columns, keyed by column name
+     * @param tableName - Table the indexes belong to (for error messages)
+     */
+    private appendDeclaredIndexes;
+    /** Narrow one raw `indexes[]` entry, rejecting anything unusable. */
+    private validateDeclaredIndex;
+    /**
+     * Resolve a declared index column to an emitted column name.
+     *
+     * Declarations name SMRT fields, but only the runtime/manifest paths
+     * snake_case them into columns — the build-time AST path keys columns by the
+     * field name itself. Prefer an exact column hit, then the snake_case form, and
+     * otherwise return the input unchanged so the caller reports it as unknown.
+     */
+    private resolveDeclaredIndexColumn;
+    /** Whether two index definitions describe the same database object. */
+    private sameIndexTarget;
+    /**
+     * Ensure a tenancy-injected `tenant_id` column has an index leading with it.
+     *
+     * Tenancy injects the column but nothing indexed it: the generated set covers
+     * foreign keys, unique columns, `updated_at` and the STI discriminator, and
+     * `tenant_id` is in none of those. Every tenant-scoped read filters on it, so
+     * without an index each one scans the whole multi-tenant table — measured in
+     * one production database, 164 of 212 tenant-scoped tables had no such index
+     * (#2356).
+     *
+     * "Leading with it" rather than "always add": a table that already has a
+     * composite index starting on `tenant_id` (commonly from `conflictColumns`)
+     * is already served, and a standalone duplicate would only cost writes.
+     */
+    private ensureTenantIdIndex;
     /**
      * Generate index definitions
      */
@@ -174,13 +233,19 @@ export declare class SchemaGenerator {
      */
     private toSnakeCase;
     /**
-     * Generate SQL CREATE TABLE statement from schema definition
+     * Generate the CREATE TABLE statement for a schema definition.
      *
-     * This is the single source of truth for SQL generation, consolidating
-     * logic that was previously duplicated across multiple code paths.
+     * With an `engine` this delegates to that engine's DDL strategy. Without
+     * one it renders the engine-neutral preview stored in `schema.ddl` and
+     * `manifest.json`: abstract SQL types, no indexes, no triggers. That
+     * preview is NOT an executable representation of the table (#2358) —
+     * executable paths (`db:migrate`, `MigrationGenerator`, `SchemaAggregator`,
+     * `createIsolatedTestDbFromManifest`) render `schema.columns` and
+     * `schema.indexes` through `getDDLStrategy(engine)` instead.
      *
      * @param schema - Schema definition object
-     * @returns SQL CREATE TABLE statement with indexes
+     * @param engine - Optional target engine; omit for the neutral preview
+     * @returns SQL CREATE TABLE statement (no indexes)
      */
     generateSQL(schema: SchemaDefinition, engine?: DatabaseEngine): string;
     /**

package/dist/schema/generator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generator.d.ts","sourceRoot":"","sources":["../../src/schema/generator.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,KAAK,EACV,eAAe,EACf,SAAS,EAGT,cAAc,EACd,qBAAqB,EACrB,mBAAmB,EACpB,MAAM,qBAAqB,CAAC;AAG7B,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAMrD,OAAO,KAAK,EAIV,gBAAgB,EAGjB,MAAM,YAAY,CAAC;AAEpB;;;;;;;;;;GAUG;AACH,UAAU,aAAa;IACrB,IAAI,CAAC,EAAE,eAAe,CAAC,MAAM,CAAC,CAAC;IAC/B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACzB,SAAS,CAAC,EAAE,SAAS,CAAC,WAAW,CAAC,CAAC;IACnC,KAAK,CAAC,EAAE,SAAS,CAAC;CACnB;AAED,KAAK,qBAAqB,GAAG;IAC3B,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACzB,QAAQ,CAAC,EAAE;QACT,SAAS,CAAC,CAAC,SAAS,EAAE,MAAM,GAAG;YAAE,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;SAAE,CAAC;QAC5D,cAAc,CAAC,aAAa,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;QAChD,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC,CAAC;QACrE,UAAU,CAAC,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;KAC/C,CAAC;CACH,CAAC;AAEF,qBAAa,eAAe;IAC1B;;OAEG;IACH,cAAc,CAAC,SAAS,EAAE,qBAAqB,GAAG,gBAAgB;IAyBlE;;OAEG;IACH,OAAO,CAAC,iBAAiB;IAuBzB,OAAO,CAAC,eAAe;IAIvB,OAAO,CAAC,yBAAyB;IAejC,OAAO,CAAC,gBAAgB;IAqBxB,OAAO,CAAC,iBAAiB;IAWzB,OAAO,CAAC,6BAA6B;IA4BrC,OAAO,CAAC,sCAAsC;IAgC9C;;OAEG;IACH,OAAO,CAAC,eAAe;IAyGvB;;OAEG;IACH,OAAO,CAAC,eAAe;IAwCvB;;OAEG;IACH,OAAO,CAAC,gBAAgB;IAexB;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAoB1B;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAuB3B;;OAEG;IACH,OAAO,CAAC,eAAe;IASvB;;OAEG;IACH,OAAO,CAAC,YAAY;IAIpB;;OAEG;IACH,OAAO,CAAC,oBAAoB;IAI5B;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAK1B;;;;;;;;;;OAUG;IACH,0BAA0B,CACxB,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,EAClC,MAAM,CAAC,EAAE,qBAAqB,GAC7B,gBAAgB;IA6PnB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA+BG;IACG,6BAA6B,CACjC,aAAa,EAAE,MAAM,EACrB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,EACnC,MAAM,CAAC,EAAE,qBAAqB,GAC7B,OAAO,CAAC,gBAAgB,CAAC;IAuR5B;;;;;;;;;;;;OAYG;IACH,6BAA6B,CAC3B,aAAa,EAAE,MAAM,EACrB,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,EAC5C,QAAQ,EAAE,mBAAmB,EAC7B,MAAM,CAAC,EAAE,qBAAqB,GAC7B,cAAc;IA4NjB;;;;;;;OAOG;IACH,6BAA6B,CAC3B,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,EACvC,MAAM,CAAC,EAAE,qBAAqB,GAC7B,cAAc;IAmKjB;;;;;;;;OAQG;IACH,OAAO,CAAC,yBAAyB;IAyCjC;;OAEG;IACH,OAAO,CAAC,qCAAqC;IAmB7C;;OAEG;IACH,OAAO,CAAC,WAAW;IAOnB;;;;;;;;OAQG;IACH,WAAW,CAAC,MAAM,EAAE,gBAAgB,EAAE,MAAM,CAAC,EAAE,cAAc,GAAG,MAAM;IA0CtE;;;;;;;;;OASG;IACH,OAAO,CAAC,kBAAkB;CAW3B"}
+{"version":3,"file":"generator.d.ts","sourceRoot":"","sources":["../../src/schema/generator.ts"],"names":[],"mappings":"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"}

package/dist/schema/generator.js

@@ -17,14 +17,17 @@ var SchemaGenerator = class {
 		const indexes = this.generateIndexes(objectDef, columns);
 		const triggers = this.generateTriggers(objectDef, tableName);
 		const foreignKeys = this.extractForeignKeys(columns);
+		const dependencies = this.extractDependencies(objectDef, foreignKeys);
+		const version = this.generateVersion(objectDef);
+		this.ensureTenantIdIndex(indexes, columns, tableName);
 		return {
 			tableName,
 			columns,
 			indexes,
 			triggers,
 			foreignKeys,
-			dependencies: this.extractDependencies(objectDef, foreignKeys),
-			version: this.generateVersion(objectDef),
+			dependencies,
+			version,
 			packageName: this.extractPackageName(objectDef.filePath),
 			baseClass: objectDef.extends
 		};
@@ -138,6 +141,106 @@ var SchemaGenerator = class {
 		return columns;
 	}
 	/**
+	* Append `@smrt({ indexes: [...] })` declarations to a generated index set
+	* (#2357).
+	*
+	* Shared by every schema path — build-time AST, runtime registry CTI/STI, and
+	* manifest CTI/STI — so one declaration behaves identically however the schema
+	* was derived. Call it *before* `ensureTenantIdIndex`: a declared composite
+	* leading with `tenant_id` is exactly what that helper's "already leading"
+	* check is meant to defer to, and appending afterwards would leave the table
+	* with a redundant standalone tenant index (#2384).
+	*
+	* Nothing is dropped quietly. A column that resolves to no column on the
+	* table, a malformed entry, and a name collision with a different index are
+	* all hard errors — a silently missing index is a production performance bug
+	* that surfaces only under load.
+	*
+	* @param indexes - Generated index set, appended in place
+	* @param declared - The object's `indexes` config, from any config source
+	* @param columns - Emitted columns, keyed by column name
+	* @param tableName - Table the indexes belong to (for error messages)
+	*/
+	appendDeclaredIndexes(indexes, declared, columns, tableName) {
+		if (declared === void 0 || declared === null) return;
+		if (!Array.isArray(declared)) throw new Error(`@smrt({ indexes }) on "${tableName}" must be an array of index declarations.`);
+		for (const entry of declared) {
+			const spec = this.validateDeclaredIndex(entry, tableName);
+			const mappedColumns = spec.columns.map((column) => this.resolveDeclaredIndexColumn(column, columns));
+			const unknownColumns = mappedColumns.filter((column) => !Object.hasOwn(columns, column));
+			if (unknownColumns.length > 0) throw new Error(`Declared index "${spec.name}" on "${tableName}" references unknown column(s): ${unknownColumns.join(", ")}. Declared index columns must name a field or column on the object.`);
+			const index = {
+				name: spec.name,
+				columns: mappedColumns,
+				...spec.unique === true ? { unique: true } : {},
+				...spec.where !== void 0 ? { where: spec.where } : {}
+			};
+			const existing = indexes.find((other) => other.name === index.name);
+			if (existing) {
+				if (this.sameIndexTarget(existing, index)) continue;
+				throw new Error(`Declared index "${index.name}" on "${tableName}" collides with a different index of the same name. Rename the declared index.`);
+			}
+			indexes.push(index);
+		}
+	}
+	/** Narrow one raw `indexes[]` entry, rejecting anything unusable. */
+	validateDeclaredIndex(entry, tableName) {
+		const spec = entry;
+		const describe = () => {
+			try {
+				return JSON.stringify(entry) ?? String(entry);
+			} catch {
+				return String(entry);
+			}
+		};
+		if (typeof spec !== "object" || spec === null || Array.isArray(spec)) throw new Error(`Declared index on "${tableName}" must be an object: got ${describe()}.`);
+		if (typeof spec.name !== "string" || spec.name.length === 0) throw new Error(`Declared index on "${tableName}" needs a non-empty "name": got ${describe()}.`);
+		if (!Array.isArray(spec.columns) || spec.columns.length === 0 || !spec.columns.every((column) => typeof column === "string" && column.length > 0)) throw new Error(`Declared index "${spec.name}" on "${tableName}" needs a non-empty "columns" array of field or column names.`);
+		if (spec.unique !== void 0 && typeof spec.unique !== "boolean") throw new Error(`Declared index "${spec.name}" on "${tableName}" has a non-boolean "unique": got ${describe()}.`);
+		if (spec.where !== void 0 && (typeof spec.where !== "string" || spec.where.trim().length === 0)) throw new Error(`Declared index "${spec.name}" on "${tableName}" has an empty or non-string "where" predicate.`);
+		return spec;
+	}
+	/**
+	* Resolve a declared index column to an emitted column name.
+	*
+	* Declarations name SMRT fields, but only the runtime/manifest paths
+	* snake_case them into columns — the build-time AST path keys columns by the
+	* field name itself. Prefer an exact column hit, then the snake_case form, and
+	* otherwise return the input unchanged so the caller reports it as unknown.
+	*/
+	resolveDeclaredIndexColumn(name, columns) {
+		if (Object.hasOwn(columns, name)) return name;
+		const snakeCased = this.toSnakeCase(name);
+		return Object.hasOwn(columns, snakeCased) ? snakeCased : name;
+	}
+	/** Whether two index definitions describe the same database object. */
+	sameIndexTarget(a, b) {
+		return a.columns.length === b.columns.length && a.columns.every((column, i) => column === b.columns[i]) && (a.unique ?? false) === (b.unique ?? false) && (a.where ?? null) === (b.where ?? null);
+	}
+	/**
+	* Ensure a tenancy-injected `tenant_id` column has an index leading with it.
+	*
+	* Tenancy injects the column but nothing indexed it: the generated set covers
+	* foreign keys, unique columns, `updated_at` and the STI discriminator, and
+	* `tenant_id` is in none of those. Every tenant-scoped read filters on it, so
+	* without an index each one scans the whole multi-tenant table — measured in
+	* one production database, 164 of 212 tenant-scoped tables had no such index
+	* (#2356).
+	*
+	* "Leading with it" rather than "always add": a table that already has a
+	* composite index starting on `tenant_id` (commonly from `conflictColumns`)
+	* is already served, and a standalone duplicate would only cost writes.
+	*/
+	ensureTenantIdIndex(indexes, columns, tableName) {
+		const tenantColumn = Object.entries(columns).find(([, columnDef]) => columnDef?.referenceKind === "tenantId")?.[0];
+		if (!tenantColumn) return;
+		if (indexes.some((index) => index.columns?.[0] === tenantColumn)) return;
+		indexes.push({
+			name: `${tableName}_${tenantColumn}_idx`,
+			columns: [tenantColumn]
+		});
+	}
+	/**
 	* Generate index definitions
 	*/
 	generateIndexes(objectDef, columns) {
@@ -159,6 +262,7 @@ var SchemaGenerator = class {
 			unique: true,
 			description: `Unique index for ${columnName}`
 		});
+		this.appendDeclaredIndexes(indexes, objectDef.decoratorConfig?.indexes, columns, tableName);
 		return indexes;
 	}
 	/**
@@ -362,6 +466,8 @@ var SchemaGenerator = class {
 			columns: [colName],
 			description: `Index for ${colName}`
 		});
+		this.appendDeclaredIndexes(indexes, config?.indexes, columns, tableName);
+		this.ensureTenantIdIndex(indexes, columns, tableName);
 		return {
 			tableName,
 			columns,
@@ -560,6 +666,8 @@ var SchemaGenerator = class {
 			columns: [colName],
 			description: `Index for ${colName}`
 		});
+		this.appendDeclaredIndexes(indexes, config?.indexes, columns, tableName);
+		this.ensureTenantIdIndex(indexes, columns, tableName);
 		return {
 			tableName,
 			columns,
@@ -683,6 +791,8 @@ var SchemaGenerator = class {
 			name: `${tableName}_${colName}_idx`,
 			columns: [colName]
 		});
+		this.appendDeclaredIndexes(indexes, config?.indexes, columns, tableName);
+		this.ensureTenantIdIndex(indexes, columns, tableName);
 		const schemaDefinition = {
 			tableName,
 			columns: this.convertManifestColumnsToSchemaColumns(columns),
@@ -779,6 +889,8 @@ var SchemaGenerator = class {
 			name: `${tableName}_${colName}_idx`,
 			columns: [colName]
 		});
+		this.appendDeclaredIndexes(indexes, config?.indexes, columns, tableName);
+		this.ensureTenantIdIndex(indexes, columns, tableName);
 		const schemaDefinition = {
 			tableName,
 			columns: this.convertManifestColumnsToSchemaColumns(columns),
@@ -851,13 +963,19 @@ var SchemaGenerator = class {
 		return str.replace(/([A-Z])/g, "_$1").toLowerCase().replace(/^_/, "");
 	}
 	/**
-	* Generate SQL CREATE TABLE statement from schema definition
+	* Generate the CREATE TABLE statement for a schema definition.
 	*
-	* This is the single source of truth for SQL generation, consolidating
-	* logic that was previously duplicated across multiple code paths.
+	* With an `engine` this delegates to that engine's DDL strategy. Without
+	* one it renders the engine-neutral preview stored in `schema.ddl` and
+	* `manifest.json`: abstract SQL types, no indexes, no triggers. That
+	* preview is NOT an executable representation of the table (#2358) —
+	* executable paths (`db:migrate`, `MigrationGenerator`, `SchemaAggregator`,
+	* `createIsolatedTestDbFromManifest`) render `schema.columns` and
+	* `schema.indexes` through `getDDLStrategy(engine)` instead.
 	*
 	* @param schema - Schema definition object
-	* @returns SQL CREATE TABLE statement with indexes
+	* @param engine - Optional target engine; omit for the neutral preview
+	* @returns SQL CREATE TABLE statement (no indexes)
 	*/
 	generateSQL(schema, engine) {
 		if (engine) return getDDLStrategy(engine).generateCreateTable(schema);