@deterministic-code/datasources-cli 0.1.13 → 0.1.14

package/dist/wireRegister.js

@@ -1,16 +1,27 @@
 import { dirname, isAbsolute, join, relative, sep } from "node:path";
+import { createCasingStrategy } from "@deterministic-code/generators-common/casing-strategy";
 import { csharpTarget } from "./detect.js";
+import { repositoriesPrefix } from "./generate/casing.js";
+import { rustIdent } from "./generate/RepositoryModel.js";
 const posix = (path) => path.split(sep).join("/");
 const specFrom = (from, to) => {
   const rel = posix(relative(dirname(from), to));
   return rel.startsWith(".") ? rel : `./${rel}`;
 };
 const hookPath = (cwd, dialect, src) => join(cwd, src ? "src" : ".", dialect === "typescript" ? "datasources-register.ts" : "datasources_register.rs");
-const hookContents = (dialect, hook, output) => dialect === "typescript" ? `import "${specFrom(hook, join(output, "typescript/repositories/repository-registry.ts"))}";
-` : `#[path = "${specFrom(hook, join(output, "rust/repositories/mod.rs"))}"]
+const registryRel = (dialect, settings) => {
+  const casing = createCasingStrategy(dialect, settings);
+  const dir = repositoriesPrefix(dialect, casing);
+  return dialect === "typescript" ? `${dir}/${casing.convertFileName("repository_registry")}.ts` : `${dir}/mod.rs`;
+};
+const hookContents = (dialect, hook, output, settings = {}) => {
+  const casing = createCasingStrategy(dialect, settings);
+  return dialect === "typescript" ? `import "${specFrom(hook, join(output, registryRel(dialect, settings)))}";
+` : `#[path = "${specFrom(hook, join(output, registryRel(dialect, settings)))}"]
 pub mod repositories;
-pub use repositories::repository_registry::Repositories;
+pub use repositories::${rustIdent(casing.convertFileName("repository_registry"))}::Repositories;
 `;
+};
 const cargoWithCtor = (cargo) => /^\s*ctor\s*=/m.test(cargo) ? void 0 : cargo.includes("[dependencies]") ? cargo.replace("[dependencies]", `[dependencies]
 ctor = "0.4"`) : `${cargo.trimEnd()}
 
@@ -30,7 +41,7 @@ const optional = async (fs, path) => {
   }
 };
 const outputRoot = (cwd, output) => isAbsolute(output) ? output : join(cwd, output);
-const registryPath = (root, dialect) => dialect === "typescript" ? join(root, "typescript/repositories/repository-registry.ts") : join(root, "rust/repositories/mod.rs");
+const registryPath = (root, dialect, settings) => join(root, registryRel(dialect, settings));
 const firstFile = async (fs, cwd, names) => {
   for (const name of names) {
     const path = join(cwd, name);
@@ -39,6 +50,7 @@ const firstFile = async (fs, cwd, names) => {
   }
   return void 0;
 };
+const excludeNodeModules = "  <PropertyGroup>\n    <DefaultItemExcludes>$(DefaultItemExcludes);node_modules/**</DefaultItemExcludes>\n  </PropertyGroup>\n";
 const wireCsharp = async (cwd, output, dryRun, deps) => {
   const entries = await deps.fs.readdir(cwd).catch(() => []);
   const target = csharpTarget(entries);
@@ -46,28 +58,34 @@ const wireCsharp = async (cwd, output, dryRun, deps) => {
   const csprojPath = join(cwd, target);
   const generated = join(outputRoot(cwd, output), "csharp");
   const rel = posix(relative(dirname(csprojPath), generated));
-  if (!rel.startsWith("..")) return;
   const include = `${rel}/**/*.cs`;
   const existing = await optional(deps.fs, csprojPath);
-  if (existing === void 0 || existing.includes(include)) return;
+  if (existing === void 0) return;
+  const needExclude = !existing.includes("node_modules/**");
+  const needInclude = rel.startsWith("..") && !existing.includes(include);
+  if (!needExclude && !needInclude) return;
   if (dryRun) {
     deps.log(csprojPath);
     return;
   }
-  await deps.fs.writeFile(csprojPath, existing.replace("</Project>", `  <ItemGroup>
+  const patched = [
+    needExclude ? excludeNodeModules : "",
+    needInclude ? `  <ItemGroup>
     <Compile Include="${include}" />
   </ItemGroup>
-</Project>`));
+` : ""
+  ].join("");
+  await deps.fs.writeFile(csprojPath, existing.replace("</Project>", `${patched}</Project>`));
   deps.log(csprojPath);
 };
-const wireRegister = async (cwd, output, dialect, dryRun, deps) => {
+const wireRegister = async (cwd, output, dialect, dryRun, deps, settings = {}) => {
   if (dialect === "csharp") return wireCsharp(cwd, output, dryRun, deps);
   const root = outputRoot(cwd, output);
   if (relative(cwd, root).startsWith("..")) return;
-  if (await optional(deps.fs, registryPath(root, dialect)) === void 0) return;
+  if (await optional(deps.fs, registryPath(root, dialect, settings)) === void 0) return;
   const entries = await deps.fs.readdir(cwd).catch(() => []);
   const hook = hookPath(cwd, dialect, entries.includes("src"));
-  const text = hookContents(dialect, hook, root);
+  const text = hookContents(dialect, hook, root, settings);
   if (dryRun) {
     deps.log(hook);
     return;

package/dist/wireRustProviders.js

@@ -0,0 +1,42 @@
+import { dirname, join } from "node:path";
+import { catalog } from "./catalog.js";
+const optional = async (fs, path) => {
+  try {
+    return await fs.readFile(path);
+  } catch {
+    return void 0;
+  }
+};
+const firstFile = async (fs, cwd, names) => {
+  for (const name of names) {
+    const path = join(cwd, name);
+    const text = await optional(fs, path);
+    if (text !== void 0) return { path, text };
+  }
+  return void 0;
+};
+const rustBindContents = (names) => names.map((name) => `use ${catalog[name].cargo.replaceAll("-", "_")} as _;
+`).join("");
+const attachedProviders = (entry) => entry.includes("datasources_providers") ? void 0 : `mod datasources_providers;
+${entry}`;
+const wireRustProviders = async (cwd, names, dryRun, deps) => {
+  const entry = await firstFile(deps.fs, cwd, ["src/lib.rs", "src/main.rs", "lib.rs", "main.rs"]);
+  const bind = join(entry ? dirname(entry.path) : cwd, "datasources_providers.rs");
+  const text = rustBindContents(names);
+  if (dryRun) {
+    deps.log(bind);
+    return;
+  }
+  await deps.fs.writeFile(bind, text);
+  deps.log(bind);
+  if (!entry) return;
+  const next = attachedProviders(entry.text);
+  if (next === void 0) return;
+  await deps.fs.writeFile(entry.path, next);
+  deps.log(entry.path);
+};
+export {
+  attachedProviders,
+  rustBindContents,
+  wireRustProviders
+};

package/node_modules/@deterministic-code/csharp-generators/dist/import-generator.js

@@ -10,10 +10,6 @@ const pluralSnake = (entity) => {
   parts[parts.length - 1] = pluralize.plural(parts[parts.length - 1]);
   return parts.join("_");
 };
-const DATASOURCE_DIR = "Types/Datasource/Generated";
-const VIEW_DIR = "Types/View/Generated";
-const DATASOURCE_VALIDATOR_DIR = `${DATASOURCE_DIR}/Validators`;
-const VIEW_VALIDATOR_DIR = `${VIEW_DIR}/Validators`;
 class CsharpImportGenerator {
   organizeByFeature;
   flat;
@@ -26,7 +22,7 @@ class CsharpImportGenerator {
     this.casing = createCasing(settings);
   }
   datasource(entity) {
-    return this.underBase(this.rel(DATASOURCE_DIR, this.casedFile(entity)));
+    return this.underBase(this.rel(this.layered("types/datasource/generated"), this.casedFile(entity)));
   }
   datasourceRel(entity) {
     return this.datasource(entity);
@@ -37,7 +33,7 @@ class CsharpImportGenerator {
   datasourceValidator(entity) {
     return this.underBase(
       this.rel(
-        DATASOURCE_VALIDATOR_DIR,
+        this.layered("types/datasource/generated/validators"),
         this.csFile(`datasource_${entity}_validator`)
       )
     );
@@ -46,7 +42,7 @@ class CsharpImportGenerator {
     return this.datasourceValidator(entity);
   }
   view(entity) {
-    return this.underBase(this.rel(VIEW_DIR, this.csFile(entity)));
+    return this.underBase(this.rel(this.layered("types/view/generated"), this.csFile(entity)));
   }
   viewRel(entity) {
     return this.view(entity);
@@ -56,7 +52,7 @@ class CsharpImportGenerator {
   }
   viewValidator(entity) {
     return this.underBase(
-      this.rel(VIEW_VALIDATOR_DIR, this.csFile(`${entity}_validator`))
+      this.rel(this.layered("types/view/generated/validators"), this.csFile(`${entity}_validator`))
     );
   }
   viewValidatorRel(entity) {
@@ -71,12 +67,12 @@ class CsharpImportGenerator {
   serviceCustom(name, _module) {
     const file = this.csFile(name);
     return this.underBase(
-      this.organizeByFeature ? `Features/${this.casing.directory(featureEntity(name))}/custom/${file}` : `../custom/${file}`
+      this.organizeByFeature ? `${this.featuresDir(featureEntity(name))}/custom/${file}` : `../custom/${file}`
     );
   }
   serviceCustomRel(entity) {
     const file = this.csFile(entity);
-    return this.organizeByFeature ? `Features/${this.casing.directory(entity)}/custom/${file}` : `../custom/${file}`;
+    return this.organizeByFeature ? `${this.featuresDir(entity)}/custom/${file}` : `../custom/${file}`;
   }
   serviceTest(entity) {
     return this.underBase(this.csFile(`${entity}_service_tests`));
@@ -102,7 +98,7 @@ class CsharpImportGenerator {
   routeCustom(name, _module) {
     const file = this.csFile(`${name}_route`);
     return this.underBase(
-      this.organizeByFeature ? `Features/${this.casing.directory(featureEntity(name))}/custom/${file}` : `../custom/${file}`
+      this.organizeByFeature ? `${this.featuresDir(featureEntity(name))}/custom/${file}` : `../custom/${file}`
     );
   }
   routeTest(entity) {
@@ -149,7 +145,15 @@ class CsharpImportGenerator {
   }
   casedFile(entity) {
     const file = this.csFile(entity);
-    return this.organizeByFeature ? `Features/${this.casing.directory(entity)}/${file}` : file;
+    return this.organizeByFeature ? `${this.featuresDir(entity)}/${file}` : file;
+  }
+  layered(path) {
+    return path.split("/").map(
+      (segment) => segment === "custom" ? segment : this.casing.convertDirectories(segment)
+    ).join("/");
+  }
+  featuresDir(entity) {
+    return `${this.casing.convertDirectories("features")}/${this.casing.directory(entity)}`;
   }
   rel(prefix, file) {
     if (this.organizeByFeature || this.flat) return file;

package/node_modules/@deterministic-code/csharp-generators/src/import-generator.test.ts

@@ -136,6 +136,17 @@ describe("CsharpImportGenerator layered (organize_by_feature unset)", () => {
       snake.datasource("notification_type"),
       "Types/Datasource/Generated/notification_type.cs",
     );
+    const kebabDirs = createImportGenerator(".", {
+      "languages.csharp.casing.directories": "Kebab",
+    });
+    assert.equal(
+      kebabDirs.datasource("user"),
+      "types/datasource/generated/User.cs",
+    );
+    assert.equal(
+      kebabDirs.view("user"),
+      "types/view/generated/User.cs",
+    );
   });
 
   it("cases type quals from settings independently of files", () => {
@@ -173,11 +184,11 @@ describe("CsharpImportGenerator by-feature", () => {
     });
     assert.equal(
       imports.datasource("notification_type"),
-      "Features/notification-type/NotificationType.cs",
+      "features/notification-type/NotificationType.cs",
     );
     assert.equal(
       imports.datasourceRel("notification_type"),
-      "Features/notification-type/NotificationType.cs",
+      "features/notification-type/NotificationType.cs",
     );
     assert.equal(imports.view("user"), "User.cs");
     assert.equal(imports.viewRel("user"), "User.cs");
@@ -200,31 +211,31 @@ describe("CsharpImportGenerator by-feature", () => {
     });
     assert.equal(
       imports.serviceCustom("user"),
-      "Features/user/custom/User.cs",
+      "features/user/custom/User.cs",
     );
     assert.equal(
       imports.serviceCustom("create_card_payment"),
-      "Features/card-payment/custom/CreateCardPayment.cs",
+      "features/card-payment/custom/CreateCardPayment.cs",
     );
     assert.equal(
       imports.serviceCustom("update_card_payment"),
-      "Features/card-payment/custom/UpdateCardPayment.cs",
+      "features/card-payment/custom/UpdateCardPayment.cs",
     );
     assert.equal(
       imports.serviceCustomRel("notification_type"),
-      "Features/notification-type/custom/NotificationType.cs",
+      "features/notification-type/custom/NotificationType.cs",
     );
     assert.equal(
       imports.routeCustom("get_health"),
-      "Features/get-health/custom/GetHealthRoute.cs",
+      "features/get-health/custom/GetHealthRoute.cs",
     );
     assert.equal(
       imports.routeCustom("create_card_payment"),
-      "Features/card-payment/custom/CreateCardPaymentRoute.cs",
+      "features/card-payment/custom/CreateCardPaymentRoute.cs",
     );
     assert.equal(
       imports.serviceCustom("user", "./ignored/module"),
-      "Features/user/custom/User.cs",
+      "features/user/custom/User.cs",
     );
   });
 
@@ -235,11 +246,11 @@ describe("CsharpImportGenerator by-feature", () => {
     });
     assert.equal(
       imports.datasource("notification_type"),
-      "Features/notification_type/NotificationType.cs",
+      "features/notification_type/NotificationType.cs",
     );
     assert.equal(
       imports.serviceCustomRel("notification_type"),
-      "Features/notification_type/custom/NotificationType.cs",
+      "features/notification_type/custom/NotificationType.cs",
     );
   });
 });

package/node_modules/@deterministic-code/csharp-generators/src/import-generator.ts

@@ -15,11 +15,6 @@ const pluralSnake = (entity: string): string => {
   return parts.join("_");
 };
 
-const DATASOURCE_DIR = "Types/Datasource/Generated";
-const VIEW_DIR = "Types/View/Generated";
-const DATASOURCE_VALIDATOR_DIR = `${DATASOURCE_DIR}/Validators`;
-const VIEW_VALIDATOR_DIR = `${VIEW_DIR}/Validators`;
-
 export class CsharpImportGenerator implements IImportGenerator {
   private readonly organizeByFeature: boolean;
   private readonly flat: boolean;
@@ -35,7 +30,7 @@ export class CsharpImportGenerator implements IImportGenerator {
   }
 
   datasource(entity: string): string {
-    return this.underBase(this.rel(DATASOURCE_DIR, this.casedFile(entity)));
+    return this.underBase(this.rel(this.layered("types/datasource/generated"), this.casedFile(entity)));
   }
 
   datasourceRel(entity: string): string {
@@ -49,7 +44,7 @@ export class CsharpImportGenerator implements IImportGenerator {
   datasourceValidator(entity: string): string {
     return this.underBase(
       this.rel(
-        DATASOURCE_VALIDATOR_DIR,
+        this.layered("types/datasource/generated/validators"),
         this.csFile(`datasource_${entity}_validator`),
       ),
     );
@@ -60,7 +55,7 @@ export class CsharpImportGenerator implements IImportGenerator {
   }
 
   view(entity: string): string {
-    return this.underBase(this.rel(VIEW_DIR, this.csFile(entity)));
+    return this.underBase(this.rel(this.layered("types/view/generated"), this.csFile(entity)));
   }
 
   viewRel(entity: string): string {
@@ -73,7 +68,7 @@ export class CsharpImportGenerator implements IImportGenerator {
 
   viewValidator(entity: string): string {
     return this.underBase(
-      this.rel(VIEW_VALIDATOR_DIR, this.csFile(`${entity}_validator`)),
+      this.rel(this.layered("types/view/generated/validators"), this.csFile(`${entity}_validator`)),
     );
   }
 
@@ -93,7 +88,7 @@ export class CsharpImportGenerator implements IImportGenerator {
     const file = this.csFile(name);
     return this.underBase(
       this.organizeByFeature
-        ? `Features/${this.casing.directory(featureEntity(name))}/custom/${file}`
+        ? `${this.featuresDir(featureEntity(name))}/custom/${file}`
         : `../custom/${file}`,
     );
   }
@@ -101,7 +96,7 @@ export class CsharpImportGenerator implements IImportGenerator {
   serviceCustomRel(entity: string): string {
     const file = this.csFile(entity);
     return this.organizeByFeature
-      ? `Features/${this.casing.directory(entity)}/custom/${file}`
+      ? `${this.featuresDir(entity)}/custom/${file}`
       : `../custom/${file}`;
   }
 
@@ -137,7 +132,7 @@ export class CsharpImportGenerator implements IImportGenerator {
     const file = this.csFile(`${name}_route`);
     return this.underBase(
       this.organizeByFeature
-        ? `Features/${this.casing.directory(featureEntity(name))}/custom/${file}`
+        ? `${this.featuresDir(featureEntity(name))}/custom/${file}`
         : `../custom/${file}`,
     );
   }
@@ -205,10 +200,23 @@ export class CsharpImportGenerator implements IImportGenerator {
   private casedFile(entity: string): string {
     const file = this.csFile(entity);
     return this.organizeByFeature
-      ? `Features/${this.casing.directory(entity)}/${file}`
+      ? `${this.featuresDir(entity)}/${file}`
       : file;
   }
 
+  private layered(path: string): string {
+    return path
+      .split("/")
+      .map((segment) =>
+        segment === "custom" ? segment : this.casing.convertDirectories(segment),
+      )
+      .join("/");
+  }
+
+  private featuresDir(entity: string): string {
+    return `${this.casing.convertDirectories("features")}/${this.casing.directory(entity)}`;
+  }
+
   private rel(prefix: string, file: string): string {
     if (this.organizeByFeature || this.flat) return file;
     return `${prefix}/${file}`;

package/node_modules/@deterministic-code/datasources-code-generators/dist/nestedSelectTypes.js

@@ -1,3 +1,4 @@
+import { referenceTarget } from "./sql/common/reference-target.js";
 import { ChangeCasingMapper, NestedSelectBuilder, PluralizerMapper } from "@deterministic-code/datasources";
 const pascal = new ChangeCasingMapper("snakeCase", "pascalCase");
 const plural = new PluralizerMapper();
@@ -51,12 +52,7 @@ const build = (type, catalog, ancestors) => {
     });
     return { name: entity(type.name), key, properties, relations: [...objects, ...lists] };
 };
-const target = (field) => {
-    if (Array.isArray(field.references) && field.references.length === 2)
-        return [field.references[0] ?? "", field.references[1] ?? ""];
-    const [table, column] = String(field.references ?? "").split(".");
-    return [table ?? "", column ?? ""];
-};
+const target = (field) => field.references === undefined ? ["", ""] : referenceTarget(field.references);
 const relationName = (field, table) => {
     const name = entity(field);
     return name.endsWith("Id") && name.length > 2 ? name.slice(0, -2) : entity(table);

package/node_modules/@deterministic-code/datasources-code-generators/dist/sql/common/infer-reference-types.d.ts

@@ -0,0 +1,2 @@
+import type { Type } from "@deterministic-code/deterministic-generators-common/parser";
+export declare const inferReferenceFieldTypes: (types: Type[]) => Type[];

package/node_modules/@deterministic-code/datasources-code-generators/dist/sql/common/infer-reference-types.js

@@ -0,0 +1,37 @@
+import { referenceTarget } from "./reference-target.js";
+const needsType = (field) => !field.isArray &&
+    !field.isMap &&
+    field.references !== undefined &&
+    field.type === "string" &&
+    field.size === undefined;
+const ready = (field) => field.type !== "string" || field.size !== undefined;
+const lookup = (types, field) => {
+    const [table, column] = referenceTarget(field.references);
+    return types.find((type) => type.name === table)?.fields.find((item) => item.name === column);
+};
+export const inferReferenceFieldTypes = (types) => {
+    const working = types.map((type) => ({ ...type, fields: type.fields.map((field) => ({ ...field })) }));
+    for (let pass = 0; pass < working.length; pass++) {
+        let changed = false;
+        for (const type of working) {
+            type.fields = type.fields.map((field) => {
+                if (!needsType(field))
+                    return field;
+                const parent = lookup(working, field);
+                if (parent === undefined || !ready(parent))
+                    return field;
+                changed = true;
+                return {
+                    ...field,
+                    type: parent.type,
+                    kind: parent.kind,
+                    base: parent.base,
+                    ...(parent.size !== undefined ? { size: parent.size } : {}),
+                };
+            });
+        }
+        if (!changed)
+            break;
+    }
+    return working;
+};

package/node_modules/@deterministic-code/datasources-code-generators/dist/sql/common/reference-target.d.ts

@@ -0,0 +1,2 @@
+import type { TypeField } from "@deterministic-code/deterministic-generators-common/parser";
+export declare const referenceTarget: (references: NonNullable<TypeField["references"]>) => [string, string];

package/node_modules/@deterministic-code/datasources-code-generators/dist/sql/common/reference-target.js

@@ -0,0 +1,6 @@
+export const referenceTarget = (references) => {
+    if (Array.isArray(references))
+        return [references[0], references[1]];
+    const [table, col] = references.split(".");
+    return [table ?? "", col ?? ""];
+};

package/node_modules/@deterministic-code/datasources-code-generators/dist/sql/common/sql-schema.d.ts

@@ -1,4 +1,5 @@
 import type { DatasourceFieldOverlay, DatasourceIndex, DatasourceTable, IDeterministic, Type, TypeField } from "@deterministic-code/deterministic-generators-common/parser";
+export { referenceTarget } from "./reference-target.js";
 /** Flattened `datasource.*` flags. Stored procedures are opt-in `"true"`. */
 export declare const datasourceSettings: (settings: Record<string, string>) => {
     useStoredProcedures: boolean;
@@ -28,7 +29,6 @@ export type SqlFile = {
     path: string;
     content: string;
 };
-export declare const referenceTarget: (references: NonNullable<TypeField["references"]>) => [string, string];
 /** Attach physical names and order parent tables before children. */
 export declare const buildLiveTables: (types: SqlTable[], mapping: {
     tableName: (table: SqlTable) => string;

package/node_modules/@deterministic-code/datasources-code-generators/dist/sql/common/sql-schema.js

@@ -1,4 +1,6 @@
 import { datasourceTypesOf, dictionaryUniqueColumns, identityColumns, persistedColumnFields, tableByName, } from "@deterministic-code/generators-common/spec-types";
+import { inferReferenceFieldTypes } from "./infer-reference-types.js";
+export { referenceTarget } from "./reference-target.js";
 /** Flattened `datasource.*` flags. Stored procedures are opt-in `"true"`. */
 export const datasourceSettings = (settings) => ({
     useStoredProcedures: String(settings["datasource.use_stored_procedures"]) === "true",
@@ -44,6 +46,7 @@ export const isGeneratedIdentity = (table) => {
 export const usesGeneratedIdColumn = (table, field) => field.isId === true && isGeneratedIdentity(table);
 export const sqlTablesFrom = (spec) => {
     requireIdIsId(spec);
+    spec = { ...spec, expandedTypes: inferReferenceFieldTypes(spec.expandedTypes) };
     const overlays = tableByName(spec);
     const byName = new Map(spec.expandedTypes.map((t) => [t.name, t]));
     return datasourceTypesOf(spec).map((type) => {
@@ -80,12 +83,6 @@ const referenceParents = (references) => {
         return [references[0]];
     return [references.split(".")[0]];
 };
-export const referenceTarget = (references) => {
-    if (Array.isArray(references))
-        return [references[0], references[1]];
-    const [table, col] = references.split(".");
-    return [table ?? "", col ?? ""];
-};
 const topoSort = (tables) => {
     const names = new Set(tables.map((t) => t.name));
     const deps = new Map(tables.map((t) => [

package/node_modules/@deterministic-code/datasources-code-generators/dist/sql/common/version-migrations.js

@@ -1,8 +1,7 @@
-import { parse, stringify } from "yaml";
+import { parse } from "yaml";
 import { CreateTableStatement } from "@deterministic-code/datasources";
 import { memoryReader } from "@deterministic-code/generators-common/deterministic-reader";
-import { DeterministicParser } from "@deterministic-code/deterministic-generators-common/parser";
-import { applyDocument, isObject, snapshotsEqual } from "./version-apply.js";
+import { DeterministicParser, VersionSnapshot } from "@deterministic-code/deterministic-generators-common/parser";
 import { createCasing } from "./default-casing.js";
 import { SqlMapping } from "./sql-mapping.js";
 import { buildLiveTables, sqlTablesFrom } from "./sql-schema.js";
@@ -23,11 +22,26 @@ export const versionDiffPaths = (settings) => (settings["version.diffs"] ?? "")
     .split("\n")
     .map((path) => path.trim())
     .filter((path) => versionDiff.test(path));
-const asDocument = (value, source) => isObject(value) ? value : (() => { throw new Error(`${source}: expected a mapping`); })();
+const own = (obj, key) => Object.prototype.hasOwnProperty.call(obj, key);
+const parseDiff = (text, source) => {
+    const value = parse(text);
+    if (value == null || typeof value !== "object" || Array.isArray(value))
+        throw new Error(`${source}: expected a mapping`);
+    return value;
+};
+const fold = (path, text) => VersionSnapshot.combine([{ [path]: { added: true, content: parse(text) } }]).yaml(path);
+const matches = (snapshot, path, live, whenMissing) => {
+    const has = own(snapshot.documents, path);
+    const text = live === undefined || live === "" ? whenMissing : live;
+    if (text === undefined || text === "")
+        return !has;
+    const snapshotYaml = has ? snapshot.yaml(path) : whenMissing === undefined ? undefined : fold(path, whenMissing);
+    return snapshotYaml !== undefined && snapshotYaml === fold(path, text);
+};
 const filesOf = (snapshot) => {
     const files = {};
-    for (const [path, value] of Object.entries(snapshot))
-        files[path] = stringify(value);
+    for (const path of Object.keys(snapshot.documents))
+        files[path] = snapshot.yaml(path);
     files["datasource.yaml"] ??= defaultDatasourceYaml;
     return files;
 };
@@ -37,7 +51,7 @@ const compile = async (snapshot, settings) => {
     const mapping = new SqlMapping(createCasing(settings), types);
     return { tables: buildLiveTables(types, mapping), mapping, seeds: spec.datasourceSeeds };
 };
-const emptySnapshot = (settings) => compile({}, settings);
+const emptySnapshot = (settings) => compile(VersionSnapshot.combine([]), settings);
 const pad = (n) => String(n).padStart(4, "0");
 const renderAll = (dialect, statements) => statements
     .map((statement) => renderSql(dialect, statement))
@@ -48,22 +62,19 @@ export const versionMigrationFiles = async (dialect, ctx, casing, live) => {
     const paths = versionDiffPaths(ctx.settings);
     if (paths.length === 0)
         return { files: [], count: 0 };
-    let before = {};
+    const diffs = [];
     const snapshots = [];
     for (const path of paths) {
         const text = await ctx.reader.read(path);
         if (text === "")
             continue;
-        before = applyDocument(before, asDocument(parse(text), path));
-        snapshots.push(before);
+        diffs.push(parseDiff(text, path));
+        snapshots.push(VersionSnapshot.combine(diffs));
     }
     if (snapshots.length === 0)
         return { files: [], count: 0 };
     const last = snapshots[snapshots.length - 1];
-    const liveTypes = live.typesYaml === undefined ? undefined : parse(live.typesYaml);
-    const liveDatasource = parse(live.datasourceYaml ?? defaultDatasourceYaml);
-    const snapshotDatasource = last["datasource.yaml"] ?? parse(defaultDatasourceYaml);
-    if (!snapshotsEqual(last["types.yaml"], liveTypes) || !snapshotsEqual(snapshotDatasource, liveDatasource)) {
+    if (!matches(last, "types.yaml", live.typesYaml, undefined) || !matches(last, "datasource.yaml", live.datasourceYaml, defaultDatasourceYaml)) {
         throw new Error("types.yaml or datasource.yaml differs from the frozen version diffs; run datasources version first");
     }
     const files = [];

package/node_modules/@deterministic-code/datasources-code-generators/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deterministic-code/datasources-code-generators",
-  "version": "0.1.2",
+  "version": "0.1.14",
   "type": "module",
   "exports": {
     ".": "./dist/generateSql.js",
@@ -9,7 +9,9 @@
     "./generate-stored-procedures": "./dist/generate-stored-procedures.js",
     "./sql/generate-stored-procedures": "./dist/sql/generate-stored-procedures.js",
     "./common/sql-dialect": "./dist/sql/common/sql-dialect.js",
-    "./sql/common/write-inclusion": "./dist/sql/common/write-inclusion.js"
+    "./sql/common/write-inclusion": "./dist/sql/common/write-inclusion.js",
+    "./sql/common/default-casing": "./dist/sql/common/default-casing.js",
+    "./sql/common/infer-reference-types": "./dist/sql/common/infer-reference-types.js"
   },
   "dependencies": {
     "@deterministic-code/datasources": "^0.1.12",