@deterministic-code/datasources-cli 0.1.13 → 0.1.15

package/node_modules/@deterministic-code/deterministic-specifications-typescript/typescript/parser/version-snapshot.ts

@@ -0,0 +1,154 @@
+import { readdir, readFile } from "node:fs/promises";
+import { join } from "node:path";
+import { parse, stringify } from "yaml";
+import type { YamlMap, YamlValue } from "./yaml-node.ts";
+
+const versionDir = /^version-\d{8}T\d{6}Z-\d{3}$/;
+const own = (obj: object, key: string) => Object.prototype.hasOwnProperty.call(obj, key);
+
+export class VersionSnapshot {
+  readonly documents: Readonly<Record<string, YamlValue | undefined>>;
+
+  private constructor(diffsInOrder: Array<YamlValue | null | undefined>) {
+    const docs: Record<string, YamlValue | undefined> = {};
+    for (const diff of diffsInOrder) {
+      if (diff == null) continue;
+      if (!this.isMap(diff)) throw new Error("expected a mapping");
+      for (const [path, envelope] of Object.entries(diff)) {
+        const next = this.applyFile(docs[path], envelope);
+        if (this.isNull(next)) delete docs[path];
+        else docs[path] = next;
+      }
+    }
+    this.documents = docs;
+  }
+
+  static combine(diffsInOrder: Array<YamlValue | null | undefined>): VersionSnapshot {
+    return new VersionSnapshot(diffsInOrder);
+  }
+
+  static async read(deterministicRoot: string): Promise<VersionSnapshot> {
+    const names = (await readdir(deterministicRoot, { withFileTypes: true }))
+      .filter((entry) => entry.isDirectory() && versionDir.test(entry.name))
+      .map((entry) => entry.name)
+      .sort();
+    const snapshot = new VersionSnapshot([]);
+    return VersionSnapshot.combine(await Promise.all(names.map((name) => snapshot.diffOf(deterministicRoot, name))));
+  }
+
+  yaml(path: string): string {
+    if (!own(this.documents, path)) throw new Error(`missing ${path}`);
+    return stringify(this.documents[path]);
+  }
+
+  private async diffOf(root: string, name: string): Promise<YamlValue | undefined> {
+    let text: string;
+    try {
+      text = await readFile(join(root, name, "diff.yaml"), "utf8");
+    } catch {
+      return undefined;
+    }
+    if (text === "") return undefined;
+    let rootValue: YamlValue;
+    try {
+      rootValue = parse(text) as YamlValue;
+    } catch (error) {
+      throw new Error(`${name}/diff.yaml: ${String(error)}`);
+    }
+    if (!this.isMap(rootValue)) throw new Error(`${name}/diff.yaml: expected a mapping`);
+    return rootValue;
+  }
+
+  private applyFile(before: YamlValue | undefined, envelope: YamlValue | undefined): YamlValue | undefined {
+    if (this.isNull(envelope)) return before;
+    if (this.isMap(envelope) && this.isTrue(envelope, "removed") && Object.keys(envelope).length === 1)
+      return undefined;
+    if (this.isMap(envelope) && this.isTrue(envelope, "added")) return envelope.content;
+    return this.apply(before, envelope);
+  }
+
+  private apply(before: YamlValue | undefined, next: YamlValue | undefined): YamlValue | undefined {
+    if (this.isNull(next)) return before;
+    if (this.isKeyed(before) && this.isMap(next) && this.isSplit(next)) return this.applyKeyed(before, next);
+    if (this.isMap(before) && this.isMap(next)) return this.applyObject(before, next);
+    return next;
+  }
+
+  private applyKeyed(beforeVal: YamlMap[], split: YamlMap): YamlValue {
+    const removed = new Set(this.strings(split, "removed"));
+    const changed = new Map(
+      this.seq(split.changed).flatMap((entry) => {
+        const pair = this.firstPair(entry);
+        return pair ? [[pair.key, pair.value] as const] : [];
+      }),
+    );
+    return [
+      ...this.seq(split.added),
+      ...beforeVal.flatMap((entry) => {
+        const pair = this.firstPair(entry);
+        if (!pair || removed.has(pair.key)) return [];
+        return [
+          changed.has(pair.key)
+            ? { [pair.key]: this.apply(pair.value, changed.get(pair.key)) as YamlValue }
+            : entry,
+        ];
+      }),
+    ];
+  }
+
+  private applyObject(beforeVal: YamlMap, next: YamlMap): YamlMap {
+    const removed = new Set(this.strings(next, "removed"));
+    const output: Record<string, YamlValue> = {};
+    for (const [key, value] of Object.entries(beforeVal)) {
+      if (removed.has(key)) continue;
+      output[key] = (own(next, key) ? this.apply(value, next[key]) : value) as YamlValue;
+    }
+    for (const [key, value] of Object.entries(next)) {
+      if (key === "removed" && Array.isArray(value)) continue;
+      if (!own(beforeVal, key)) output[key] = value;
+    }
+    return output;
+  }
+
+  private isSplit(map: YamlMap) {
+    return Object.keys(map).every((key) => key === "added" || key === "changed" || key === "removed");
+  }
+
+  private isKeyed(value: YamlValue | undefined): value is YamlMap[] {
+    return (
+      Array.isArray(value) &&
+      value.length > 0 &&
+      value.every((item) => this.isMap(item) && Object.keys(item).length === 1)
+    );
+  }
+
+  private seq(value: YamlValue | undefined): YamlValue[] {
+    return Array.isArray(value) ? value : [];
+  }
+
+  private strings(map: YamlMap, key: string) {
+    return this.seq(map[key]).map((item) => (this.isScalar(item) ? String(item ?? "") : ""));
+  }
+
+  private firstPair(entry: YamlValue | undefined) {
+    if (!this.isMap(entry)) return undefined;
+    const key = Object.keys(entry)[0];
+    return key === undefined ? undefined : { key, value: entry[key] };
+  }
+
+  private isMap(value: YamlValue | undefined | null): value is YamlMap {
+    return typeof value === "object" && value !== null && !Array.isArray(value);
+  }
+
+  private isTrue(map: YamlMap, key: string) {
+    return map[key] === true || map[key] === "true" || map[key] === "True";
+  }
+
+  private isNull(value: YamlValue | undefined | null) {
+    return value == null;
+  }
+
+  private isScalar(value: YamlValue | undefined) {
+    return value == null || typeof value === "string" || typeof value === "number" || typeof value === "boolean";
+  }
+}

package/node_modules/@deterministic-code/deterministic-specifications-typescript/typescript/parser/yaml-node.ts

@@ -1,8 +1,8 @@
 import { parse } from "yaml";
 
 type YamlLiteral = string | number | boolean | null;
-type YamlMap = { readonly [key: string]: YamlValue };
-type YamlValue = YamlLiteral | YamlValue[] | YamlMap;
+export type YamlMap = { readonly [key: string]: YamlValue };
+export type YamlValue = YamlLiteral | YamlValue[] | YamlMap;
 type FieldDefault = YamlLiteral | YamlValue[] | YamlMap;
 type Named = { name: string; node: YamlNode };
 

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

@@ -45,7 +45,7 @@ class RustImportGenerator {
     return this.underBase(path);
   }
   datasourceRel(entity) {
-    return this.rel("types/generated/datasource", this.datasource(entity));
+    return this.rel(this.layered("types/generated/datasource"), this.datasource(entity));
   }
   datasourceQual(entity) {
     return this.typeQual(
@@ -63,7 +63,7 @@ class RustImportGenerator {
   }
   datasourceValidatorRel(entity) {
     return this.rel(
-      "types/generated/datasource/validators",
+      this.layered("types/generated/datasource/validators"),
       this.datasourceValidator(entity)
     );
   }
@@ -73,7 +73,7 @@ class RustImportGenerator {
     return this.underBase(path);
   }
   viewRel(entity) {
-    return this.rel("types/generated/views", this.view(entity));
+    return this.rel(this.layered("types/generated/views"), this.view(entity));
   }
   viewQual(entity) {
     return this.typeQual(this.viewRel(entity), this.casing.convertTypes(entity));
@@ -87,7 +87,7 @@ class RustImportGenerator {
   }
   viewValidatorRel(entity) {
     return this.rel(
-      "types/generated/views/validators",
+      this.layered("types/generated/views/validators"),
       this.viewValidator(entity)
     );
   }
@@ -97,31 +97,31 @@ class RustImportGenerator {
     return this.underBase(path);
   }
   serviceRel(entity) {
-    return this.rel("services/generated", this.service(entity));
+    return this.rel(this.layered("services/generated"), this.service(entity));
   }
   serviceCustom(name, module) {
     return this.resolveCustom(name, module, "services");
   }
   serviceCustomRel(entity) {
     const file = `${this.serviceStem(entity)}.rs`;
-    return this.organizeByFeature ? `features/${this.casing.directory(entity)}/custom/${file}` : `services/custom/${file}`;
+    return this.organizeByFeature ? `${this.featuresDir(entity)}/custom/${file}` : `${this.layered("services")}/custom/${file}`;
   }
   serviceTest(entity) {
     return this.test(this.service(entity), `${entity}_service`);
   }
   serviceTestRel(entity) {
-    return this.rel("services/generated/__tests__", this.serviceTest(entity));
+    return this.rel(this.layered("services/generated/__tests__"), this.serviceTest(entity));
   }
   serviceIntegrationTest(entity) {
     const file = this.rsFile(`${entity}_service_integration_tests`);
     if (this.organizeByFeature) {
-      return `features/${this.casing.directory(entity)}/__tests__/${file}`;
+      return `${this.featuresDir(entity)}/__tests__/${file}`;
     }
     return file;
   }
   serviceIntegrationTestRel(entity) {
     return this.rel(
-      "services/generated/__tests__",
+      this.layered("services/generated/__tests__"),
       this.serviceIntegrationTest(entity)
     );
   }
@@ -134,7 +134,7 @@ class RustImportGenerator {
     return this.underBase(path);
   }
   routeRel(entity) {
-    return this.rel("routes/generated", this.route(entity));
+    return this.rel(this.layered("routes/generated"), this.route(entity));
   }
   routeCustom(name, module) {
     return this.resolveCustom(name, module, "routes");
@@ -166,15 +166,17 @@ class RustImportGenerator {
     return this.routeStem(entity);
   }
   appWiring() {
-    return this.organizeByFeature ? "features/app_wiring.rs" : "app_wiring.rs";
+    return this.organizeByFeature ? `${this.casing.convertDirectories("features")}/app_wiring.rs` : "app_wiring.rs";
   }
   validatorFn(kind, entity, fn) {
     if (this.organizeByFeature) {
       const file = kind === "datasource" ? this.datasourceValidator(entity) : this.viewValidator(entity);
       return `${this.spec("", file)}::${fn}`;
     }
-    const ns = kind === "datasource" ? "crate::types::generated::datasource::validators" : "crate::types::generated::views::validators";
-    return `${ns}::${fn}`;
+    const ns = this.layered(
+      kind === "datasource" ? "types/generated/datasource/validators" : "types/generated/views/validators"
+    ).replaceAll("/", "::");
+    return `crate::${ns}::${fn}`;
   }
   apiPath(entity) {
     return pluralSnake(entity).replace(/_/g, "-");
@@ -196,8 +198,16 @@ class RustImportGenerator {
   rsFile(stem) {
     return `${this.casing.fileBase(stem)}.rs`;
   }
+  layered(path) {
+    return path.split("/").map(
+      (segment) => segment === "custom" || segment === "__tests__" ? segment : this.casing.convertDirectories(segment)
+    ).join("/");
+  }
+  featuresDir(entity) {
+    return `${this.casing.convertDirectories("features")}/${this.casing.directory(entity)}`;
+  }
   featurePath(entity, file) {
-    return `features/${this.casing.directory(entity)}/${file}`;
+    return `${this.featuresDir(entity)}/${file}`;
   }
   serviceStem(entity) {
     return this.casing.fileBase(`${entity}_service`);
@@ -217,7 +227,7 @@ class RustImportGenerator {
     const stubFn = layer === "services" ? "generateCustomServiceStub" : "generateCustomRouteStub";
     const file = this.rsFile(name);
     const entity = (featureEntityFromClass(name) || "shared").replace(/-/g, "_");
-    const defaultStub = this.organizeByFeature ? `features/${this.casing.directory(entity)}/custom/${file}` : `../custom/${file}`;
+    const defaultStub = this.organizeByFeature ? `${this.featuresDir(entity)}/custom/${file}` : `../custom/${file}`;
     if (this.organizeByFeature) {
       if (!mod || !mod.startsWith(".") || mod.startsWith("./services/") || mod.startsWith("./routes/")) {
         return defaultStub;

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

@@ -95,6 +95,17 @@ describe("RustImportGenerator layered (organize_by_feature unset)", () => {
       imports.validatorFn("view", "user", "validate_user"),
       "crate::types::generated::views::validators::validate_user",
     );
+    const pascalDirs = createImportGenerator(".", {
+      "languages.rust.casing.directories": "Pascal",
+    });
+    assert.equal(
+      pascalDirs.datasourceRel("user"),
+      "Types/Generated/Datasource/user.rs",
+    );
+    assert.equal(
+      pascalDirs.validatorFn("datasource", "user", "validate_datasource_user"),
+      "crate::Types::Generated::Datasource::Validators::validate_datasource_user",
+    );
     assert.equal(imports.apiPath("card_payment"), "card-payments");
     assert.equal(imports.apiPath("user"), "users");
     assert.equal(imports.frontend("src/main.rs"), "frontend/src/main.rs");

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

@@ -67,7 +67,7 @@ export class RustImportGenerator implements IImportGenerator {
   }
 
   datasourceRel(entity: string): string {
-    return this.rel("types/generated/datasource", this.datasource(entity));
+    return this.rel(this.layered("types/generated/datasource"), this.datasource(entity));
   }
 
   datasourceQual(entity: string): string {
@@ -88,7 +88,7 @@ export class RustImportGenerator implements IImportGenerator {
 
   datasourceValidatorRel(entity: string): string {
     return this.rel(
-      "types/generated/datasource/validators",
+      this.layered("types/generated/datasource/validators"),
       this.datasourceValidator(entity),
     );
   }
@@ -102,7 +102,7 @@ export class RustImportGenerator implements IImportGenerator {
   }
 
   viewRel(entity: string): string {
-    return this.rel("types/generated/views", this.view(entity));
+    return this.rel(this.layered("types/generated/views"), this.view(entity));
   }
 
   viewQual(entity: string): string {
@@ -119,7 +119,7 @@ export class RustImportGenerator implements IImportGenerator {
 
   viewValidatorRel(entity: string): string {
     return this.rel(
-      "types/generated/views/validators",
+      this.layered("types/generated/views/validators"),
       this.viewValidator(entity),
     );
   }
@@ -133,7 +133,7 @@ export class RustImportGenerator implements IImportGenerator {
   }
 
   serviceRel(entity: string): string {
-    return this.rel("services/generated", this.service(entity));
+    return this.rel(this.layered("services/generated"), this.service(entity));
   }
 
   serviceCustom(name: string, module?: string): string {
@@ -143,8 +143,8 @@ export class RustImportGenerator implements IImportGenerator {
   serviceCustomRel(entity: string): string {
     const file = `${this.serviceStem(entity)}.rs`;
     return this.organizeByFeature
-      ? `features/${this.casing.directory(entity)}/custom/${file}`
-      : `services/custom/${file}`;
+      ? `${this.featuresDir(entity)}/custom/${file}`
+      : `${this.layered("services")}/custom/${file}`;
   }
 
   serviceTest(entity: string): string {
@@ -152,20 +152,20 @@ export class RustImportGenerator implements IImportGenerator {
   }
 
   serviceTestRel(entity: string): string {
-    return this.rel("services/generated/__tests__", this.serviceTest(entity));
+    return this.rel(this.layered("services/generated/__tests__"), this.serviceTest(entity));
   }
 
   serviceIntegrationTest(entity: string): string {
     const file = this.rsFile(`${entity}_service_integration_tests`);
     if (this.organizeByFeature) {
-      return `features/${this.casing.directory(entity)}/__tests__/${file}`;
+      return `${this.featuresDir(entity)}/__tests__/${file}`;
     }
     return file;
   }
 
   serviceIntegrationTestRel(entity: string): string {
     return this.rel(
-      "services/generated/__tests__",
+      this.layered("services/generated/__tests__"),
       this.serviceIntegrationTest(entity),
     );
   }
@@ -183,7 +183,7 @@ export class RustImportGenerator implements IImportGenerator {
   }
 
   routeRel(entity: string): string {
-    return this.rel("routes/generated", this.route(entity));
+    return this.rel(this.layered("routes/generated"), this.route(entity));
   }
 
   routeCustom(name: string, module?: string): string {
@@ -224,7 +224,9 @@ export class RustImportGenerator implements IImportGenerator {
   }
 
   appWiring(): string {
-    return this.organizeByFeature ? "features/app_wiring.rs" : "app_wiring.rs";
+    return this.organizeByFeature
+      ? `${this.casing.convertDirectories("features")}/app_wiring.rs`
+      : "app_wiring.rs";
   }
 
   validatorFn(
@@ -239,11 +241,12 @@ export class RustImportGenerator implements IImportGenerator {
           : this.viewValidator(entity);
       return `${this.spec("", file)}::${fn}`;
     }
-    const ns =
+    const ns = this.layered(
       kind === "datasource"
-        ? "crate::types::generated::datasource::validators"
-        : "crate::types::generated::views::validators";
-    return `${ns}::${fn}`;
+        ? "types/generated/datasource/validators"
+        : "types/generated/views/validators",
+    ).replaceAll("/", "::");
+    return `crate::${ns}::${fn}`;
   }
 
   apiPath(entity: string): string {
@@ -271,8 +274,23 @@ export class RustImportGenerator implements IImportGenerator {
     return `${this.casing.fileBase(stem)}.rs`;
   }
 
+  private layered(path: string): string {
+    return path
+      .split("/")
+      .map((segment) =>
+        segment === "custom" || segment === "__tests__"
+          ? segment
+          : this.casing.convertDirectories(segment),
+      )
+      .join("/");
+  }
+
+  private featuresDir(entity: string): string {
+    return `${this.casing.convertDirectories("features")}/${this.casing.directory(entity)}`;
+  }
+
   private featurePath(entity: string, file: string): string {
-    return `features/${this.casing.directory(entity)}/${file}`;
+    return `${this.featuresDir(entity)}/${file}`;
   }
 
   private serviceStem(entity: string): string {
@@ -306,7 +324,7 @@ export class RustImportGenerator implements IImportGenerator {
       featureEntityFromClass(name) || "shared"
     ).replace(/-/g, "_");
     const defaultStub = this.organizeByFeature
-      ? `features/${this.casing.directory(entity)}/custom/${file}`
+      ? `${this.featuresDir(entity)}/custom/${file}`
       : `../custom/${file}`;
     if (this.organizeByFeature) {
       if (

package/node_modules/@deterministic-code/typescript-generators/dist/generate-frontend-types.js

@@ -1,14 +1,19 @@
 import { verifyEntries } from "@deterministic-code/generators-common/reference-verifier";
+import { createCasing } from "./common/default-casing.js";
 import { Emit } from "./emit.js";
 import { generateViewTypes } from "./emit-shaped-types.js";
 import { referencesBackend } from "./inline-inherited.js";
+const layered = (settings, path) => {
+  const casing = createCasing(settings);
+  return path.split("/").map((segment) => casing.convertDirectories(segment)).join("/");
+};
 const generate = async (ctx) => {
   const referenceBackendType = referencesBackend(ctx.settings);
   const views = new Emit(ctx.settings).imports.frontend("src/types");
   const entries = await generateViewTypes(ctx, {
     referenceBackendType,
     basePath: views,
-    datasourceBasePath: referenceBackendType ? "types/generated/datasource" : views
+    datasourceBasePath: referenceBackendType ? layered(ctx.settings, "types/generated/datasource") : views
   });
   if (!referenceBackendType) verifyEntries(entries);
   return entries;

package/node_modules/@deterministic-code/typescript-generators/dist/generate-frontend-validators.js

@@ -1,5 +1,10 @@
 import { verifyEntries } from "@deterministic-code/generators-common/reference-verifier";
+import { createCasing } from "./common/default-casing.js";
 import { Emit } from "./emit.js";
+const layered = (settings, path) => {
+  const casing = createCasing(settings);
+  return path.split("/").map((segment) => casing.convertDirectories(segment)).join("/");
+};
 import { generate as generateViewTypeValidators } from "./generate-view-type-validators.js";
 import { referencesBackend } from "./inline-inherited.js";
 import {
@@ -24,7 +29,7 @@ const generate = async (ctx) => {
       schemaInheritTmpl
     },
     basePath: validators,
-    datasourceBasePath: referenceBackendType ? "types/generated/datasource/validators" : validators
+    datasourceBasePath: referenceBackendType ? layered(ctx.settings, "types/generated/datasource/validators") : validators
   });
   if (!referenceBackendType) verifyEntries(entries);
   return entries;

package/node_modules/@deterministic-code/typescript-generators/dist/generate-routes.js

@@ -44,7 +44,7 @@ class Generator extends Emit {
     return entries;
   }
   customModuleKey(emitPath) {
-    return customRelKey(emitPath, "routes");
+    return customRelKey(emitPath, this.casing.convertDirectories("routes"));
   }
   entityRouter(candidate) {
     const { simpleDoc, descriptionDoc } = this.settings;

package/node_modules/@deterministic-code/typescript-generators/dist/generate-services.js

@@ -129,7 +129,7 @@ class Generator extends Emit {
   }
   /** Map emit paths like `../custom/foo.ts` to Rel keys `services/custom/foo.ts`. */
   customModuleKey(emitPath) {
-    return customRelKey(emitPath, "services");
+    return customRelKey(emitPath, this.casing.convertDirectories("services"));
   }
   custom(entry) {
     const { simpleDoc, descriptionDoc } = this.settings;