@memberjunction/codegen-lib 6.1.0-edge.4 → 6.1.0-edge.6

package/dist/Misc/runCommand.js

@@ -3,6 +3,25 @@ import { spawn } from 'child_process';
 import { logError, logStatus } from './status_logging.js';
 import path from 'path';
 import treeKill from 'tree-kill';
+const FAILURE_OUTPUT_TAIL_LINES = 40;
+/**
+ * Combine the exit-code message with a tail of captured stdout/stderr so AFTER
+ * failures show the actual tsc/pnpm diagnostic instead of just "exited with code N".
+ */
+export function formatCommandFailureDetail(result, tailLines = FAILURE_OUTPUT_TAIL_LINES) {
+    const parts = [];
+    const errorText = (result.error || '').trim();
+    if (errorText) {
+        parts.push(errorText);
+    }
+    const output = (result.output || '').trim();
+    if (output) {
+        const lines = output.split(/\r?\n/);
+        const kept = lines.length > tailLines ? ['…', ...lines.slice(-tailLines)] : lines;
+        parts.push(kept.join('\n'));
+    }
+    return parts.join('\n');
+}
 /**
  * Base class that handles the process of running commands which can be done executed from any other area of the system, typically done by the main runMemberJunctionCodeGen process
  */
@@ -37,7 +56,6 @@ export class RunCommandsBase {
         try {
             let output = '';
             let startTime = new Date();
-            let bErrors = false;
             const commandName = command.command;
             const absPath = path.resolve(currentWorkingDirectory, command.workingDirectory);
             logStatus(`STARTING COMMAND: "${command.command}" in location "${absPath}" with args "${command.args.join(' ')}"`);
@@ -57,13 +75,10 @@ export class RunCommandsBase {
                     output += data.toString();
                 });
                 cp.stderr?.on('data', (data) => {
-                    const elapsedTime = new Date().getTime() - startTime.getTime();
-                    const message = data.toString();
-                    output += message;
-                    if (message.toUpperCase().indexOf('ERROR') >= 0) {
-                        console.error(`COMMAND: "${command.command}" FAILED: ${elapsedTime / 1000} seconds`);
-                        bErrors = true;
-                    }
+                    // tsc / npm / pnpm write the word "error" to stderr on successful
+                    // builds (TS diagnostics that were not emitted, deprecation banners,
+                    // progress). Exit code is the only honest success signal.
+                    output += data.toString();
                 });
                 cp.on('error', (error) => {
                     const elapsedTime = new Date().getTime() - startTime.getTime();
@@ -73,17 +88,28 @@ export class RunCommandsBase {
                     reject(error);
                 });
                 cp.on('close', (code) => {
+                    const elapsedTime = new Date().getTime() - startTime.getTime();
                     if (code === 0) {
-                        const elapsedTime = new Date().getTime() - startTime.getTime();
                         logStatus(`COMMAND: "${command.command}" COMPLETED SUCCESSFULLY: ${elapsedTime / 1000} seconds`);
-                        resolve({ output: output,
+                        resolve({
+                            output,
                             error: null,
-                            success: !bErrors,
-                            elapsedTime: elapsedTime });
-                    }
-                    else {
-                        reject(new Error(`Process exited with code ${code}`));
+                            success: true,
+                            elapsedTime,
+                        });
+                        return;
                     }
+                    // Resolve (do not reject) so callers keep stdout/stderr. The previous
+                    // reject-on-nonzero path dropped the captured output and left AFTER
+                    // failures looking like a bare "Process exited with code N".
+                    const message = `Process exited with code ${code}`;
+                    console.error(`COMMAND: "${command.command}" FAILED: ${elapsedTime / 1000} seconds (${message})`);
+                    resolve({
+                        output,
+                        error: message,
+                        success: false,
+                        elapsedTime,
+                    });
                 });
             });
             if (command.timeout && command.timeout > 0) {
@@ -93,13 +119,13 @@ export class RunCommandsBase {
                         const elapsedTime = new Date().getTime() - startTime.getTime();
                         if (!cp.killed) {
                             treeKill(cp.pid);
-                            console.error(`COMMAND: "${command.command}" COMPLETED ${bErrors ? ' - FAILED' : ' - SUCCESS'} IN ${elapsedTime / 1000} seconds`);
+                            console.error(`COMMAND: "${command.command}" TIMED OUT after ${elapsedTime / 1000} seconds`);
                             output += `Process killed after ${timeout} ms`;
                         }
                         resolve({
                             output: output,
                             error: null,
-                            success: !bErrors,
+                            success: false,
                             elapsedTime: elapsedTime,
                         });
                     }, timeout);

package/dist/Misc/runCommand.js.map

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

package/dist/Misc/schema-emit.d.ts

@@ -0,0 +1,123 @@
+/**
+ * Schema is the incremental unit for CodeGen file emit.
+ *
+ * A 2,000-entity database is almost never one schema with 2,000 tables. It is
+ * two-to-three dozen schemas of 100–150 tables each. Entity identity stays the
+ * entity (names, FKs, metadata rows). Everything that can be incremental —
+ * emit, dirty regen, parallelism, output-directory routing, agent context —
+ * keys off the schema.
+ */
+export type DirtySchemaSet = Set<string> | 'all';
+export interface SchemaEmitOptions {
+    /**
+     * When true (the default), emit one TypeScript file per schema plus a thin
+     * barrel. When false, emit the historical single monolith.
+     */
+    perSchema?: boolean;
+    /**
+     * Schemas whose files must be rebuilt. `'all'` rebuilds every schema
+     * (used by `--skipdb` file-only runs). A Set rebuilds only those schemas
+     * plus any schema whose file is missing. An omitted / empty set with
+     * existing files is the fast path: skip the string-build entirely.
+     */
+    dirtySchemas?: DirtySchemaSet;
+    /** Assemble independent schema files in parallel. Defaults to true. */
+    parallel?: boolean;
+    /** Max schemas to assemble in parallel. Defaults to 8. */
+    concurrency?: number;
+    /** Skip the disk write when bytes are identical. Defaults to true. */
+    writeIfChanged?: boolean;
+}
+export interface SchemaNamed {
+    Name: string;
+    SchemaName: string;
+}
+/**
+ * Case-insensitive schema match. `%` is the only wildcard (SQL `_` is a
+ * literal — schema names like `bsd_crm` are common and must not glob).
+ */
+/** Case-insensitive schema/entity key. Null/undefined become ''. */
+export declare function schemaKey(name: string | null | undefined): string;
+export declare function schemaNameMatches(pattern: string, schemaName: string | null | undefined): boolean;
+/**
+ * Turn a SQL schema name into a safe TypeScript file stem.
+ * `__mj` stays `__mj`; `bsd_crm` stays `bsd_crm`; `Sales.Analytics` becomes `Sales_Analytics`.
+ */
+export declare function sanitizeSchemaFileName(schemaName: string | null | undefined): string;
+/**
+ * Group entities by their raw `SchemaName` (trimmed, original casing of the
+ * first occurrence). Order inside each group is the input order.
+ */
+export declare function groupEntitiesBySchema<T extends {
+    SchemaName: string;
+}>(entities: readonly T[]): Map<string, T[]>;
+/**
+ * Map dirty entity names (from `newEntityList` ∪ `modifiedEntityList`) back to
+ * the schemas those entities live in. Comparison is case-insensitive.
+ */
+/**
+ * Resolve which schemas a file-emit pass should rebuild.
+ * `--skipdb` and `dirtySchemaOnly === false` rebuild every schema (write-if-changed
+ * still keeps mtimes stable). Otherwise only schemas that contain a new/modified
+ * entity are dirty — missing files are added later by {@link schemasToEmit}.
+ */
+export declare function resolveDirtySchemasForEmit(entities: readonly SchemaNamed[], dirtyEntityNames: Iterable<string>, skipDB: boolean, dirtySchemaOnly: boolean, deletedEntitySchemas?: Iterable<string>): DirtySchemaSet;
+export declare function collectDirtySchemas(entities: readonly SchemaNamed[], dirtyEntityNames: Iterable<string>): Set<string>;
+/**
+ * Decide which schema files to rebuild. Missing files are always rebuilt so a
+ * fresh clone / first run is complete. When `dirty` is `'all'` every schema is
+ * rebuilt (callers still use write-if-changed to keep mtimes stable).
+ */
+export declare function schemasToEmit(allSchemas: readonly string[], dirty: DirtySchemaSet | undefined, fileExists: (schemaName: string) => boolean): string[];
+/**
+ * Bounded parallel map. Order of results matches `items`. A limit of 1 is serial.
+ */
+export declare function mapLimit<T, R>(items: readonly T[], limit: number, mapper: (item: T, index: number) => Promise<R>): Promise<R[]>;
+/**
+ * Barrel that re-exports every per-schema file. Uses `.js` specifiers so the
+ * file is valid in `"type": "module"` packages (MJCoreEntities, MJServer).
+ */
+export declare function buildSchemaBarrel(schemas: readonly string[], relativeDir: string, extraHeader: string): string;
+/**
+ * Names of files in a per-schema emit directory that no live schema claims.
+ *
+ * Kept pure and separate from the deletion so the decision is testable without a
+ * filesystem. `fileNames` is a plain directory listing; `schemas` is every schema in the
+ * run, not just the dirty subset.
+ */
+export declare function selectOrphanedSchemaFiles(fileNames: readonly string[], schemas: readonly string[]): string[];
+/**
+ * Delete per-schema files that no live schema claims, returning what was removed.
+ *
+ * A schema that empties out — its last table dropped — leaves its file on disk. The barrel
+ * stops exporting it, which is not enough: `tsc` still compiles it through `include`, the
+ * class-registration manifest still globs it into the registry, and the CodeGen-tail guard
+ * reads every `.ts` in the directory regardless of what the barrel names. So a deleted
+ * entity keeps a live `@RegisterClass` registration and inflates the roster the guard
+ * compares. The old monolith could not drift this way; it was rewritten in full every run.
+ *
+ * Safe under dirty-schema regen: `schemas` is the full set for the run, so a schema that
+ * simply was not dirty this time is still live and is never pruned.
+ */
+export declare function pruneOrphanedSchemaFiles(directory: string, schemas: readonly string[]): string[];
+/**
+ * Fill in a partial {@link SchemaEmitOptions} from config defaults.
+ *
+ * Shared by both generators so the defaults cannot drift between entity subclasses and
+ * GraphQL resolvers — they must agree, or one emits per-schema while the other emits a
+ * monolith and the two rosters stop lining up.
+ *
+ * `parallel` / `concurrency` are resolved for every caller even though only the entity
+ * generator uses them: its per-schema assembly is async (each file awaits its entities),
+ * while GraphQL assembly is synchronous, so there is nothing to overlap there.
+ */
+export declare function resolveSchemaEmitOptions(options: SchemaEmitOptions | undefined, defaults: SchemaEmitOptions | undefined): Required<SchemaEmitOptions>;
+/**
+ * Write one emitted file, honouring the write-if-changed setting.
+ *
+ * Shared for the same reason as {@link resolveSchemaEmitOptions}: both generators must treat
+ * an unchanged file identically, or one leaves mtimes alone while the other churns them and
+ * downstream incremental builds see phantom work.
+ */
+export declare function emitSchemaFile(filePath: string, content: string, useWriteIfChanged: boolean): void;
+//# sourceMappingURL=schema-emit.d.ts.map

package/dist/Misc/schema-emit.d.ts.map

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

package/dist/Misc/schema-emit.js

@@ -0,0 +1,221 @@
+/**
+ * Schema is the incremental unit for CodeGen file emit.
+ *
+ * A 2,000-entity database is almost never one schema with 2,000 tables. It is
+ * two-to-three dozen schemas of 100–150 tables each. Entity identity stays the
+ * entity (names, FKs, metadata rows). Everything that can be incremental —
+ * emit, dirty regen, parallelism, output-directory routing, agent context —
+ * keys off the schema.
+ */
+import fs from 'fs';
+import path from 'path';
+import { ordinalCompare } from '@memberjunction/global';
+import { writeFileIfChanged } from './file-write.js';
+/**
+ * Case-insensitive schema match. `%` is the only wildcard (SQL `_` is a
+ * literal — schema names like `bsd_crm` are common and must not glob).
+ */
+/** Case-insensitive schema/entity key. Null/undefined become ''. */
+export function schemaKey(name) {
+    return (name ?? '').trim().toLowerCase();
+}
+export function schemaNameMatches(pattern, schemaName) {
+    const p = schemaKey(pattern);
+    const s = schemaKey(schemaName);
+    if (!p.includes('%')) {
+        return p === s;
+    }
+    const escaped = p.replace(/[.+^${}()|[\]\\]/g, '\\$&').replace(/%/g, '.*');
+    return new RegExp(`^${escaped}$`).test(s);
+}
+/**
+ * Turn a SQL schema name into a safe TypeScript file stem.
+ * `__mj` stays `__mj`; `bsd_crm` stays `bsd_crm`; `Sales.Analytics` becomes `Sales_Analytics`.
+ */
+export function sanitizeSchemaFileName(schemaName) {
+    // Keep leading underscores — `__mj` is a real schema name and a valid file stem.
+    const cleaned = (schemaName ?? '').trim().replace(/[^A-Za-z0-9_]+/g, '_').replace(/_+$/g, '');
+    return cleaned.length > 0 ? cleaned : 'schema';
+}
+/**
+ * Group entities by their raw `SchemaName` (trimmed, original casing of the
+ * first occurrence). Order inside each group is the input order.
+ */
+export function groupEntitiesBySchema(entities) {
+    const map = new Map();
+    for (const entity of entities) {
+        const key = (entity.SchemaName ?? '').trim() || 'unknown';
+        const list = map.get(key);
+        if (list) {
+            list.push(entity);
+        }
+        else {
+            map.set(key, [entity]);
+        }
+    }
+    return map;
+}
+/**
+ * Map dirty entity names (from `newEntityList` ∪ `modifiedEntityList`) back to
+ * the schemas those entities live in. Comparison is case-insensitive.
+ */
+/**
+ * Resolve which schemas a file-emit pass should rebuild.
+ * `--skipdb` and `dirtySchemaOnly === false` rebuild every schema (write-if-changed
+ * still keeps mtimes stable). Otherwise only schemas that contain a new/modified
+ * entity are dirty — missing files are added later by {@link schemasToEmit}.
+ */
+export function resolveDirtySchemasForEmit(entities, dirtyEntityNames, skipDB, dirtySchemaOnly, deletedEntitySchemas = []) {
+    if (skipDB || !dirtySchemaOnly) {
+        return 'all';
+    }
+    const schemas = collectDirtySchemas(entities, dirtyEntityNames);
+    // Deletion arrives as a schema, not an entity name: by the time this runs the entity is gone
+    // from `entities`, so `collectDirtySchemas` could never resolve it. Union it in directly, or
+    // the schema is not rebuilt and the dead class survives on disk.
+    for (const schema of deletedEntitySchemas) {
+        const trimmed = (schema ?? '').trim();
+        if (trimmed.length > 0) {
+            schemas.add(trimmed);
+        }
+    }
+    return schemas;
+}
+export function collectDirtySchemas(entities, dirtyEntityNames) {
+    const dirty = new Set();
+    for (const name of dirtyEntityNames) {
+        const key = schemaKey(name);
+        if (key.length > 0) {
+            dirty.add(key);
+        }
+    }
+    const schemas = new Set();
+    if (dirty.size === 0) {
+        return schemas;
+    }
+    for (const entity of entities) {
+        if (dirty.has(schemaKey(entity.Name))) {
+            const schema = (entity.SchemaName ?? '').trim();
+            if (schema.length > 0) {
+                schemas.add(schema);
+            }
+        }
+    }
+    return schemas;
+}
+/**
+ * Decide which schema files to rebuild. Missing files are always rebuilt so a
+ * fresh clone / first run is complete. When `dirty` is `'all'` every schema is
+ * rebuilt (callers still use write-if-changed to keep mtimes stable).
+ */
+export function schemasToEmit(allSchemas, dirty, fileExists) {
+    if (dirty === 'all' || dirty == null) {
+        return [...allSchemas];
+    }
+    const dirtyLower = new Set([...dirty].map((s) => s.trim().toLowerCase()));
+    return allSchemas.filter((schema) => {
+        if (!fileExists(schema)) {
+            return true;
+        }
+        return dirtyLower.has(schema.trim().toLowerCase());
+    });
+}
+/**
+ * Bounded parallel map. Order of results matches `items`. A limit of 1 is serial.
+ */
+export async function mapLimit(items, limit, mapper) {
+    const concurrency = Math.max(1, Math.floor(limit));
+    const results = new Array(items.length);
+    let next = 0;
+    const workers = Array.from({ length: Math.min(concurrency, items.length) }, async () => {
+        while (next < items.length) {
+            const index = next;
+            next += 1;
+            results[index] = await mapper(items[index], index);
+        }
+    });
+    await Promise.all(workers);
+    return results;
+}
+/**
+ * Barrel that re-exports every per-schema file. Uses `.js` specifiers so the
+ * file is valid in `"type": "module"` packages (MJCoreEntities, MJServer).
+ */
+export function buildSchemaBarrel(schemas, relativeDir, extraHeader) {
+    const dir = relativeDir.replace(/\\/g, '/').replace(/\/+$/, '');
+    const exports = [...schemas]
+        .sort((a, b) => ordinalCompare(a, b))
+        .map((schema) => `export * from './${dir}/${sanitizeSchemaFileName(schema)}.js';`)
+        .join('\n');
+    return `${extraHeader}${exports}\n`;
+}
+/**
+ * Names of files in a per-schema emit directory that no live schema claims.
+ *
+ * Kept pure and separate from the deletion so the decision is testable without a
+ * filesystem. `fileNames` is a plain directory listing; `schemas` is every schema in the
+ * run, not just the dirty subset.
+ */
+export function selectOrphanedSchemaFiles(fileNames, schemas) {
+    const live = new Set(schemas.map((schema) => `${sanitizeSchemaFileName(schema)}.ts`));
+    return fileNames.filter((name) => name.endsWith('.ts') && !live.has(name)).sort();
+}
+/**
+ * Delete per-schema files that no live schema claims, returning what was removed.
+ *
+ * A schema that empties out — its last table dropped — leaves its file on disk. The barrel
+ * stops exporting it, which is not enough: `tsc` still compiles it through `include`, the
+ * class-registration manifest still globs it into the registry, and the CodeGen-tail guard
+ * reads every `.ts` in the directory regardless of what the barrel names. So a deleted
+ * entity keeps a live `@RegisterClass` registration and inflates the roster the guard
+ * compares. The old monolith could not drift this way; it was rewritten in full every run.
+ *
+ * Safe under dirty-schema regen: `schemas` is the full set for the run, so a schema that
+ * simply was not dirty this time is still live and is never pruned.
+ */
+export function pruneOrphanedSchemaFiles(directory, schemas) {
+    if (!fs.existsSync(directory)) {
+        return [];
+    }
+    const orphans = selectOrphanedSchemaFiles(fs.readdirSync(directory), schemas);
+    for (const name of orphans) {
+        fs.unlinkSync(path.join(directory, name));
+    }
+    return orphans;
+}
+/**
+ * Fill in a partial {@link SchemaEmitOptions} from config defaults.
+ *
+ * Shared by both generators so the defaults cannot drift between entity subclasses and
+ * GraphQL resolvers — they must agree, or one emits per-schema while the other emits a
+ * monolith and the two rosters stop lining up.
+ *
+ * `parallel` / `concurrency` are resolved for every caller even though only the entity
+ * generator uses them: its per-schema assembly is async (each file awaits its entities),
+ * while GraphQL assembly is synchronous, so there is nothing to overlap there.
+ */
+export function resolveSchemaEmitOptions(options, defaults) {
+    return {
+        perSchema: options?.perSchema ?? defaults?.perSchema ?? true,
+        dirtySchemas: options?.dirtySchemas ?? 'all',
+        parallel: options?.parallel ?? defaults?.parallel ?? true,
+        concurrency: options?.concurrency ?? defaults?.concurrency ?? 8,
+        writeIfChanged: options?.writeIfChanged ?? defaults?.writeIfChanged ?? true,
+    };
+}
+/**
+ * Write one emitted file, honouring the write-if-changed setting.
+ *
+ * Shared for the same reason as {@link resolveSchemaEmitOptions}: both generators must treat
+ * an unchanged file identically, or one leaves mtimes alone while the other churns them and
+ * downstream incremental builds see phantom work.
+ */
+export function emitSchemaFile(filePath, content, useWriteIfChanged) {
+    if (useWriteIfChanged) {
+        writeFileIfChanged(filePath, content);
+        return;
+    }
+    fs.mkdirSync(path.dirname(filePath), { recursive: true });
+    fs.writeFileSync(filePath, content);
+}
+//# sourceMappingURL=schema-emit.js.map

package/dist/Misc/schema-emit.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"schema-emit.js","sourceRoot":"","sources":["../../src/Misc/schema-emit.ts"],"names":[],"mappings":"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"}

package/dist/Misc/sql_logging.d.ts

@@ -1,10 +1,39 @@
 import { CodeGenConnection } from '../Database/codeGenDatabaseProvider.js';
+/**
+ * True when `folderPath` is the CodeGenLib / MJ-host default (`./migrations/v5` etc.),
+ * not an Open App `migrations/codegen` tree.
+ */
+export declare function isMjDefaultSqlOutputPath(folderPath: string): boolean;
+export type ResolveSQLOutputFolderArgs = {
+    cwd: string;
+    configuredFolderPath?: string;
+    includeSchemas?: string[];
+    coreSchema: string;
+    /** CLI `--sql-output-dir`. Wins over config when set. */
+    sqlOutputDirFlag?: string;
+    hasMjAppJson: boolean;
+    isMjMonorepo: boolean;
+};
+/**
+ * Where CodeGen writes `CodeGen_Run_*.sql` (EntityField INSERTs and other metadata SQL).
+ *
+ * Open App (`mj-app.json` in cwd): always `{cwd}/migrations/codegen` unless
+ * `--sql-output-dir` or an explicit non-MJ `SQLOutput.folderPath` is set.
+ * Never fall back to `MJ/migrations/v*` — that silently dropped Open App
+ * EntityField SQL into the host tree.
+ *
+ * MJ monorepo cwd + `includeSchemas` listing a non-core schema: throw. Run
+ * CodeGen from the app directory.
+ */
+export declare function resolveSQLOutputFolder(args: ResolveSQLOutputFolderArgs): string;
 /**
  * Utility class for logging SQL to a run file that can be fresh for each run or appended to depending on the settings in the configuration
  */
 export declare class SQLLogging {
     private static _SQLLoggingFilePath;
     private static _OmitRecurringScriptsFromLog;
+    /** CLI `--sql-output-dir`. Set before {@link initSQLLogging}. */
+    static sqlOutputDirFlag: string | undefined;
     static get SQLLoggingFilePath(): string;
     static get OmitRecurringScriptsFromLog(): boolean;
     /**
@@ -33,17 +62,35 @@ export declare class SQLLogging {
      */
     static redirectToPGMigrations(folderPath: string): string;
     static initSQLLogging(): void;
-    static finishSQLLogging(): void;
-    protected static createFileName(): string;
     /**
-     * Adds the provided SQL to the log file for the run
-     * @param contents - the executable SQL to log
-     * @param description - a description of what is being logged that will be emitted and wrapped in comments
-     * @param isRecurringScript - if set to true tells the logger that the provided SQL represents a recurring script meaning it is something that is executed, generally, for all CodeGen runs. In these cases, the Config settings can result in omitting these recurring scripts from being logged because the configuration environment may have those recurring scripts already set to run after all run-specific migrations get run.
-     * @returns
+     * The batch separator for the active platform: `GO` on SQL Server, none on PostgreSQL. Used as the
+     * default for callers that do not pass the provider's separator, so a PostgreSQL capture can never
+     * pick up a literal `GO` from a forgotten argument.
+     */
+    static defaultBatchSeparator(): string;
+    /** Test hook — SQLLogging is a process-wide singleton. */
+    static resetForTests(): void;
+    /** Test hook — sets the active capture file path for testing. */
+    static setFilePathForTesting(filePath: string): void;
+    /**
+     * Test hook — turns SQL capture off for the process: disables `SQLOutput` so
+     * {@link LogSQLAndExecute} does not refuse to run against a stub connection with no CodeGen_Run
+     * file open, and closes any capture file already open so nothing is written meanwhile. Returns a
+     * function that restores both; call it from `afterAll`.
      */
+    static suppressOutputForTests(): () => void;
+    static finishSQLLogging(): void;
+    protected static createFileName(): string;
     /**
-     * Adds the provided SQL to the log file for the run
+     * Adds the provided SQL to the log file for the run.
+     *
+     * Two rules keep the file replayable as a migration. A unit that declares a batch-scoped T-SQL
+     * variable always ends its batch: every unit is executed as its own query, so no later unit can
+     * depend on the variable, but two such units concatenated into one migration batch fail replay
+     * with "The variable name '@x' has already been declared" (see {@link declaresBatchScopedVariable}).
+     * And a unit that already ends in `GO` never receives a second separator. An empty
+     * `batchSeparator` (PostgreSQL) means none. Callers should still pass `includeBatchSeparator`
+     * explicitly: the scan does not see a declaration hidden inside a string or a mid-line statement.
      * @param contents - the executable SQL to log
      * @param description - a description of what is being logged that will be emitted and wrapped in comments
      * @param isRecurringScript - if set to true tells the logger that the provided SQL represents a recurring script meaning it is something that is executed, generally, for all CodeGen runs. In these cases, the Config settings can result in omitting these recurring scripts from being logged because the configuration environment may have those recurring scripts already set to run after all run-specific migrations get run.
@@ -63,6 +110,14 @@ export declare class SQLLogging {
     * @returns - The result of the query execution.
     */
     static LogSQLAndExecute(ds: CodeGenConnection, query: string, description?: string, isRecurringScript?: boolean, includeBatchSeparator?: boolean, batchSeparator?: string): Promise<any>;
+    /**
+     * True when the SQL text declares a batch-scoped T-SQL local variable: a `DECLARE @name ...` at the
+     * start of any line with no routine header (`CREATE|ALTER [OR ALTER] PROCEDURE|FUNCTION|TRIGGER`) before
+     * it. T-SQL variables are scoped to the batch wherever they are declared — after `SET NOCOUNT ON`,
+     * inside `IF ... BEGIN ... END` — so the match is not limited to the first statement. A declaration
+     * inside a routine body is routine-scoped and cannot collide across units, so it does not count.
+     */
+    static declaresBatchScopedVariable(sql: string): boolean;
     protected static getFileLength(filePath: string): number;
     protected static convertSQLLogToFlywaySchema(): void;
     /**

package/dist/Misc/sql_logging.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sql_logging.d.ts","sourceRoot":"","sources":["../../src/Misc/sql_logging.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,qCAAqC,CAAC;AAMxE;;GAEG;AACH,qBAAa,UAAU;IACnB,OAAO,CAAC,MAAM,CAAC,mBAAmB,CAAc;IAChD,OAAO,CAAC,MAAM,CAAC,4BAA4B,CAAkB;IAE7D,WAAkB,kBAAkB,IAAI,MAAM,CAE7C;IACD,WAAkB,2BAA2B,IAAI,OAAO,CAEvD;IAED;;;;;;;;;;;;;;;;;;;;;;;OAuBG;WACW,sBAAsB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM;WAwBlD,cAAc;WA2Cb,gBAAgB;IAa9B,SAAS,CAAC,MAAM,CAAC,cAAc,IAAI,MAAM;IAe1C;;;;;;OAMG;IACH;;;;;;;;OAQG;WACiB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,EAAE,iBAAiB,GAAE,OAAe,EAAE,qBAAqB,GAAE,OAAe,EAAE,cAAc,GAAE,MAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IA8CxM;;;;;;;;;MASE;WACkB,gBAAgB,CAAC,EAAE,EAAE,iBAAiB,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,EAAE,iBAAiB,GAAE,OAAe,EAAE,qBAAqB,GAAE,OAAe,EAAE,cAAc,GAAE,MAAa,GAAG,OAAO,CAAC,GAAG,CAAC;IAMzN,SAAS,CAAC,MAAM,CAAC,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM;IAUxD,SAAS,CAAC,MAAM,CAAC,2BAA2B,IAAI,IAAI;IAyBnD;;;;OAIG;IACH,OAAO,CAAC,MAAM,CAAC,WAAW;CAG9B"}
+{"version":3,"file":"sql_logging.d.ts","sourceRoot":"","sources":["../../src/Misc/sql_logging.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,qCAAqC,CAAC;AAQxE;;;GAGG;AACH,wBAAgB,wBAAwB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAGpE;AAED,MAAM,MAAM,0BAA0B,GAAG;IACrC,GAAG,EAAE,MAAM,CAAC;IACZ,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,UAAU,EAAE,MAAM,CAAC;IACnB,yDAAyD;IACzD,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,YAAY,EAAE,OAAO,CAAC;IACtB,YAAY,EAAE,OAAO,CAAC;CACzB,CAAC;AAEF;;;;;;;;;;GAUG;AACH,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,0BAA0B,GAAG,MAAM,CAoC/E;AAED;;GAEG;AACH,qBAAa,UAAU;IACnB,OAAO,CAAC,MAAM,CAAC,mBAAmB,CAAc;IAChD,OAAO,CAAC,MAAM,CAAC,4BAA4B,CAAiB;IAC5D,iEAAiE;IACjE,OAAc,gBAAgB,EAAE,MAAM,GAAG,SAAS,CAAC;IAEnD,WAAkB,kBAAkB,IAAI,MAAM,CAE7C;IACD,WAAkB,2BAA2B,IAAI,OAAO,CAEvD;IAED;;;;;;;;;;;;;;;;;;;;;;;OAuBG;WACW,sBAAsB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM;WAwBlD,cAAc;IA4C5B;;;;OAIG;WACW,qBAAqB,IAAI,MAAM;IAI7C,0DAA0D;WAC5C,aAAa,IAAI,IAAI;IAKnC,iEAAiE;WACnD,qBAAqB,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAI3D;;;;;OAKG;WACW,sBAAsB,IAAI,MAAM,IAAI;WAgBnC,gBAAgB;IAa9B,SAAS,CAAC,MAAM,CAAC,cAAc,IAAI,MAAM;IAe1C;;;;;;;;;;;;;;;;OAgBG;WACiB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,EAAE,iBAAiB,GAAE,OAAe,EAAE,qBAAqB,GAAE,OAAe,EAAE,cAAc,GAAE,MAA2C,GAAG,OAAO,CAAC,IAAI,CAAC;IAsDtO;;;;;;;;;MASE;WACkB,gBAAgB,CAAC,EAAE,EAAE,iBAAiB,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,EAAE,iBAAiB,GAAE,OAAe,EAAE,qBAAqB,GAAE,OAAe,EAAE,cAAc,GAAE,MAA2C,GAAG,OAAO,CAAC,GAAG,CAAC;IAYvP;;;;;;OAMG;WACW,2BAA2B,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO;IAsB/D,SAAS,CAAC,MAAM,CAAC,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM;IAUxD,SAAS,CAAC,MAAM,CAAC,2BAA2B,IAAI,IAAI;IAyBnD;;;;OAIG;IACH,OAAO,CAAC,MAAM,CAAC,WAAW;CAG9B"}