@intentius/chant-lexicon-sql 0.118.0 → 0.118.1

package/dist/files/build-root.d.ts

@@ -8,7 +8,11 @@
  * git-ignored paths, child projects and the project's `exclude` globs are
  * left out. A file whose first lines carry `-- chant-discovery-skip` (or the
  * `/* chant-discovery-skip *\/` form) is not read, for SQL that is not schema:
- * seed data, a migration, a query.
+ * seed data, a migration, a query. Nor is a file under a `migrations`
+ * directory (#3713): versioned migrations and an ORM's generated migrations
+ * are `ALTER`s and repeated `CREATE`s of objects declared elsewhere, and a
+ * build of the project root, as `chant lifecycle diff` and an ApplyOp's plan
+ * run with no `sourceDir`, walks into them.
  *
  * The dialect is the declarations': a project whose templates are Postgres
  * reads its files as Postgres. With no templates it is `sql.dialect`, and
@@ -19,6 +23,10 @@ import type { BuildRootContext, BuildRootContribution } from "@intentius/chant/l
 import { type SqlDialect } from "../dialects.js";
 /** Whether a file is a `.sql` file to read: the name, and no skip or generated marker. */
 export declare function isSqlSourceFile(name: string, full: string): boolean;
+/** A directory whose `.sql` files are migrations, never declarations. */
+export declare const MIGRATIONS_DIR = "migrations";
+/** Whether `file` sits under a {@link MIGRATIONS_DIR} directory below `sourceDir`. */
+export declare function inMigrationsDir(sourceDir: string, file: string): boolean;
 /** The dialect the project's `.sql` files are read as. */
 export declare function filesDialect(entities: ReadonlyMap<string, Declarable> | undefined, config: Record<string, unknown>): SqlDialect;
 /** The `buildRoots` contribution: every `.sql` file's declarations, or nothing when the source directory holds none. */

package/dist/files/build-root.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"build-root.d.ts","sourceRoot":"","sources":["../../src/files/build-root.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAIH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,KAAK,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AAGxF,OAAO,EAAgB,KAAK,UAAU,EAAE,MAAM,aAAa,CAAC;AAQ5D,0FAA0F;AAC1F,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAInE;AAED,0DAA0D;AAC1D,wBAAgB,YAAY,CAAC,QAAQ,EAAE,WAAW,CAAC,MAAM,EAAE,UAAU,CAAC,GAAG,SAAS,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,UAAU,CAY/H;AAED,wHAAwH;AACxH,wBAAsB,iBAAiB,CAAC,GAAG,EAAE,gBAAgB,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAO7F"}
+{"version":3,"file":"build-root.d.ts","sourceRoot":"","sources":["../../src/files/build-root.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAIH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,KAAK,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AAGxF,OAAO,EAAgB,KAAK,UAAU,EAAE,MAAM,aAAa,CAAC;AAQ5D,0FAA0F;AAC1F,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAInE;AAED,yEAAyE;AACzE,eAAO,MAAM,cAAc,eAAe,CAAC;AAE3C,sFAAsF;AACtF,wBAAgB,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAExE;AAED,0DAA0D;AAC1D,wBAAgB,YAAY,CAAC,QAAQ,EAAE,WAAW,CAAC,MAAM,EAAE,UAAU,CAAC,GAAG,SAAS,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,UAAU,CAY/H;AAED,wHAAwH;AACxH,wBAAsB,iBAAiB,CAAC,GAAG,EAAE,gBAAgB,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAO7F"}

package/dist/integrity.json

@@ -1,7 +1,7 @@
 {
   "algorithm": "sha256",
   "artifacts": {
-    "manifest.json": "e2bf7028a41757883dc8f527812bce692e5d90dc5f84c1ab2a593f76735f3a91",
+    "manifest.json": "dee03b1b2c3883aa14ff3fb1868f4d6f28e6771cd19654ab48cc4b2e92530520",
     "meta.json": "44b1dcfa5b5e5be2239fdc9614ab6c11d3f1461d64e61d572e3658af6c96aa68",
     "types/index.d.ts": "0286ebb367773e84c76818b0f69cb14cff8328fd2f8c65ed87563c8d5815458c",
     "rules/postgres-templates.ts": "da6e305bc2ff3d0d64a20925fe588e051c2a4b556b37f2581c61c314ef7c580d",
@@ -57,5 +57,5 @@
     "rules/sqlpg117.ts": "3d5c2d57ccdee3cf91c3ba3cb6363750787a850df8ebd75e9cc3f33113303827",
     "rules/sqlpg118.ts": "e2a40a88a9374c4d99d02118ca4c60877ba0c6eb1ce603a93b24f5fd23d81dde"
   },
-  "composite": "bd178b112dd161bc7445a81be2f7471b080eff8ad34e48ce2b7601d32f11823e"
+  "composite": "870e87be62c02d9d259b98eb5c9f9928db21950ffd6a569e0f1df10268cea4e3"
 }

package/dist/manifest.json

@@ -1,6 +1,6 @@
 {
   "name": "sql",
-  "version": "0.118.0",
+  "version": "0.118.1",
   "chantVersion": ">=0.1.0",
   "namespace": "SQL",
   "intrinsics": [],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@intentius/chant-lexicon-sql",
-  "version": "0.118.0",
+  "version": "0.118.1",
   "description": "SQL lexicon for chant — database schema as typed declarations, one dialect at a time; ClickHouse first, with types read from a pinned server's catalog",
   "license": "Apache-2.0",
   "homepage": "https://intentius.io/chant",
@@ -70,7 +70,7 @@
     "typescript": "^5.9.3"
   },
   "peerDependencies": {
-    "@intentius/chant": "^0.118.0",
+    "@intentius/chant": "^0.118.1",
     "typescript": "^5.9.3"
   }
 }

package/src/files/build-root.ts

@@ -8,7 +8,11 @@
  * git-ignored paths, child projects and the project's `exclude` globs are
  * left out. A file whose first lines carry `-- chant-discovery-skip` (or the
  * `/* chant-discovery-skip *\/` form) is not read, for SQL that is not schema:
- * seed data, a migration, a query.
+ * seed data, a migration, a query. Nor is a file under a `migrations`
+ * directory (#3713): versioned migrations and an ORM's generated migrations
+ * are `ALTER`s and repeated `CREATE`s of objects declared elsewhere, and a
+ * build of the project root, as `chant lifecycle diff` and an ApplyOp's plan
+ * run with no `sourceDir`, walks into them.
  *
  * The dialect is the declarations': a project whose templates are Postgres
  * reads its files as Postgres. With no templates it is `sql.dialect`, and
@@ -16,7 +20,7 @@
  */
 
 import { readFileSync } from "node:fs";
-import { relative, resolve } from "node:path";
+import { relative, resolve, sep } from "node:path";
 import type { Declarable } from "@intentius/chant/declarable";
 import type { BuildRootContext, BuildRootContribution } from "@intentius/chant/lexicon";
 import { findSourceFiles, hasDiscoveryMarkerSync } from "@intentius/chant/discovery/files";
@@ -36,6 +40,14 @@ export function isSqlSourceFile(name: string, full: string): boolean {
   return !SQL_SKIP_MARKER.test(readHead(full, 1024));
 }
 
+/** A directory whose `.sql` files are migrations, never declarations. */
+export const MIGRATIONS_DIR = "migrations";
+
+/** Whether `file` sits under a {@link MIGRATIONS_DIR} directory below `sourceDir`. */
+export function inMigrationsDir(sourceDir: string, file: string): boolean {
+  return relative(sourceDir, file).split(sep).slice(0, -1).includes(MIGRATIONS_DIR);
+}
+
 /** The dialect the project's `.sql` files are read as. */
 export function filesDialect(entities: ReadonlyMap<string, Declarable> | undefined, config: Record<string, unknown>): SqlDialect {
   for (const e of entities?.values() ?? []) {
@@ -54,7 +66,7 @@ export function filesDialect(entities: ReadonlyMap<string, Declarable> | undefin
 /** The `buildRoots` contribution: every `.sql` file's declarations, or nothing when the source directory holds none. */
 export async function sqlFilesBuildRoot(ctx: BuildRootContext): Promise<BuildRootContribution> {
   const sourceDir = ctx.sourceDir ?? resolve(ctx.projectRoot, typeof ctx.config.sourceDir === "string" ? ctx.config.sourceDir : ".");
-  const files = (await findSourceFiles(sourceDir, isSqlSourceFile)).sort();
+  const files = (await findSourceFiles(sourceDir, isSqlSourceFile)).filter((f) => !inMigrationsDir(sourceDir, f)).sort();
   if (files.length === 0) return { entities: new Map() };
   const dialect = filesDialect(ctx.entities, ctx.config);
   const sources = files.map((f) => ({ origin: relative(ctx.projectRoot, f) || f, ddl: readFileSync(f, "utf8") }));

package/src/sql-files.test.ts

@@ -174,6 +174,38 @@ export const activeUsers = view\`CREATE VIEW app.active_users AS SELECT id FROM
   });
 });
 
+describe("SQL that is not schema, in a build of the project root (#3713)", () => {
+  const dirs: string[] = [];
+  afterAll(async () => {
+    for (const d of dirs) await rm(d, { recursive: true, force: true });
+  });
+
+  test("a .sql file under a migrations directory, at any depth, is not read", async () => {
+    const dir = await project("migrations", {
+      "app.ts": `import { schema, table } from "@intentius/chant-lexicon-sql/postgres";\nexport const app = schema\`CREATE SCHEMA app\`;\nexport const users = table\`CREATE TABLE app.users (id bigint)\`;\n`,
+    });
+    dirs.push(dir);
+    await mkdir(join(dir, "src", "migrations", "20261010T0000-add-email"), { recursive: true });
+    await writeFile(join(dir, "src", "migrations", "20261010T0000-add-email", "migration.sql"), "ALTER TABLE app.users ADD COLUMN email text;\n");
+    await mkdir(join(dir, "src", "prisma", "migrations", "0001_init"), { recursive: true });
+    await writeFile(join(dir, "src", "prisma", "migrations", "0001_init", "migration.sql"), "CREATE TABLE app.users (id bigint);\n");
+    const { errors, doc } = await buildProject(dir);
+    expect(errors).toEqual([]);
+    expect(doc!.applyOrder).toEqual(["app", "users"]);
+  });
+
+  test("a file named migrations.sql, or in a directory that only starts with the word, is still read", async () => {
+    const dir = await project("not-migrations", { "app.ts": `import { schema } from "@intentius/chant-lexicon-sql/postgres";\nexport const app = schema\`CREATE SCHEMA app\`;\n` });
+    dirs.push(dir);
+    await writeFile(join(dir, "src", "migrations.sql"), "CREATE TABLE app.a (id bigint);\n");
+    await mkdir(join(dir, "src", "migrations-old"), { recursive: true });
+    await writeFile(join(dir, "src", "migrations-old", "b.sql"), "CREATE TABLE app.b (id bigint);\n");
+    const { errors, doc } = await buildProject(dir);
+    expect(errors).toEqual([]);
+    expect([...doc!.applyOrder].sort()).toEqual(["a", "app", "b"]);
+  });
+});
+
 describe("references between a file's objects", () => {
   test("a bare name where SQL names an object is a reference, and a cycle is an error", async () => {
     const { sqlFileEntities } = await import("./sql-files");