@deterministic-code/datasources-cli 0.1.13 → 0.1.14

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;

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

@@ -27,7 +27,7 @@ class TypeScriptImportGenerator {
     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.casing.convertTypes(entity);
@@ -39,19 +39,19 @@ class TypeScriptImportGenerator {
   }
   datasourceValidatorRel(entity) {
     return this.rel(
-      "types/generated/datasource/validators",
+      this.layered("types/generated/datasource/validators"),
       this.datasourceValidator(entity)
     );
   }
   datasourceTestRel(entity) {
     return this.rel(
-      "types/generated/datasource",
+      this.layered("types/generated/datasource"),
       this.test(this.datasource(entity), entity)
     );
   }
   datasourceValidatorTestRel(entity) {
     return this.rel(
-      "types/generated/datasource/validators",
+      this.layered("types/generated/datasource/validators"),
       this.test(this.datasourceValidator(entity), entity)
     );
   }
@@ -59,7 +59,7 @@ class TypeScriptImportGenerator {
     return this.underBase(this.viewLike(entity, ""));
   }
   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.casing.convertTypes(entity);
@@ -69,16 +69,16 @@ class TypeScriptImportGenerator {
   }
   viewValidatorRel(entity) {
     return this.rel(
-      "types/generated/views/validators",
+      this.layered("types/generated/views/validators"),
       this.viewValidator(entity)
     );
   }
   viewTestRel(entity) {
-    return this.rel("types/generated/views", this.test(this.view(entity), entity));
+    return this.rel(this.layered("types/generated/views"), this.test(this.view(entity), entity));
   }
   viewValidatorTestRel(entity) {
     return this.rel(
-      "types/generated/views/validators",
+      this.layered("types/generated/views/validators"),
       this.test(this.viewValidator(entity), entity)
     );
   }
@@ -91,29 +91,29 @@ class TypeScriptImportGenerator {
     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)}.ts`;
-    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) {
     const file = `${this.serviceStem(entity)}.test.ts`;
-    const path = this.organizeByFeature ? `features/${this.casing.directory(entity)}/__tests__/${file}` : file;
+    const path = this.organizeByFeature ? `${this.featuresDir(entity)}/__tests__/${file}` : file;
     return this.underBase(path);
   }
   serviceTestRel(entity) {
-    return this.rel("services/generated/__tests__", this.serviceTest(entity));
+    return this.rel(this.layered("services/generated/__tests__"), this.serviceTest(entity));
   }
   serviceIntegrationTest(entity) {
     return this.serviceTest(entity).replace(/\.test\.ts$/, ".integration.test.js");
   }
   serviceIntegrationTestRel(entity) {
     return this.rel(
-      "services/generated/__tests__",
+      this.layered("services/generated/__tests__"),
       this.serviceIntegrationTest(entity)
     );
   }
@@ -126,18 +126,18 @@ class TypeScriptImportGenerator {
     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");
   }
   routeTest(entity) {
     const file = `${this.casing.fileBase(entity)}.integration.test.ts`;
-    const path = this.organizeByFeature ? `features/${this.casing.directory(entity)}/__tests__/${file}` : file;
+    const path = this.organizeByFeature ? `${this.featuresDir(entity)}/__tests__/${file}` : file;
     return this.underBase(path);
   }
   routeTestRel(entity) {
-    return this.rel("routes/generated/__tests__", this.routeTest(entity));
+    return this.rel(this.layered("routes/generated/__tests__"), this.routeTest(entity));
   }
   enrichment(_targetTable) {
     return "";
@@ -187,8 +187,8 @@ class TypeScriptImportGenerator {
   /** Layered types/services/routes globs, or features when by-feature. Empty when flat. */
   tsconfigIncludes() {
     if (this.flat) return [];
-    if (this.organizeByFeature) return ["features/**/*.ts"];
-    return ["types/**/*.ts", "services/**/*.ts", "routes/**/*.ts"];
+    if (this.organizeByFeature) return [`${this.casing.convertDirectories("features")}/**/*.ts`];
+    return ["types", "services", "routes"].map((layer) => `${this.casing.convertDirectories(layer)}/**/*.ts`);
   }
   rel(prefix, file) {
     if (this.organizeByFeature || this.flat) return file;
@@ -197,8 +197,16 @@ class TypeScriptImportGenerator {
   tsFile(stem) {
     return `${this.casing.fileBase(stem)}.ts`;
   }
+  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`);
@@ -209,13 +217,13 @@ class TypeScriptImportGenerator {
   }
   viewLike(entity, featureExt) {
     const file = `${this.casing.fileBase(entity)}${this.organizeByFeature ? featureExt : ""}.ts`;
-    return this.organizeByFeature ? `features/${this.casing.directory(entity)}/${file}` : file;
+    return this.organizeByFeature ? `${this.featuresDir(entity)}/${file}` : file;
   }
   resolveCustom(name, mod, layer) {
     const kind = layer === "services" ? "service" : "route";
     const stubFn = layer === "services" ? "generateCustomServiceStub" : "generateCustomRouteStub";
     const file = layer === "services" ? this.tsFile(name) : `${this.casing.fileBase(`${name}_route`)}.ts`;
-    const defaultStub = this.organizeByFeature ? `features/${this.casing.directory(name)}/custom/${file}` : `../custom/${file}`;
+    const defaultStub = this.organizeByFeature ? `${this.featuresDir(name)}/custom/${file}` : `../custom/${file}`;
     if (this.organizeByFeature) {
       if (typeof mod !== "string" || !mod.startsWith(".") || mod.startsWith("./services/") || mod.startsWith("./routes/")) {
         return defaultStub;

package/node_modules/@deterministic-code/typescript-generators/src/emit.ts

@@ -37,11 +37,8 @@ export const bag = (attrs: {
   return out;
 };
 
-/** Map `../….ts` emit paths to project-relative Rel keys (`services/….ts`). */
-export const customRelKey = (
-  emitPath: string,
-  layer: "services" | "routes",
-): string =>
+/** Map `../….ts` emit paths to project-relative Rel keys using the cased layer directory. */
+export const customRelKey = (emitPath: string, layer: string): string =>
   emitPath.startsWith("../") ? `${layer}/${emitPath.slice(3)}` : emitPath;
 
 /** Settings plus pack import generators created once; lanes use `this.imports`. */

package/node_modules/@deterministic-code/typescript-generators/src/generate-frontend-types.ts

@@ -1,10 +1,16 @@
 import type { GenerateContext } from "@deterministic-code/generators-common/generate-context";
 import type { GenerateEntry } from "@deterministic-code/generators-common/generate-entry";
 import { verifyEntries } from "@deterministic-code/generators-common/reference-verifier";
+import { createCasing } from "./common/default-casing.ts";
 import { Emit } from "./emit.ts";
 import { generateViewTypes } from "./emit-shaped-types.ts";
 import { referencesBackend } from "./inline-inherited.ts";
 
+const layered = (settings: Record<string, string>, path: string): string => {
+  const casing = createCasing(settings);
+  return path.split("/").map((segment) => casing.convertDirectories(segment)).join("/");
+};
+
 /** Self-checks when the lane is closed; backend-type refs need host `finalizeEntries`. */
 export const generate = async (
   ctx: GenerateContext,
@@ -15,7 +21,7 @@ export const generate = async (
     referenceBackendType,
     basePath: views,
     datasourceBasePath: referenceBackendType
-      ? "types/generated/datasource"
+      ? layered(ctx.settings, "types/generated/datasource")
       : views,
   });
   if (!referenceBackendType) verifyEntries(entries);

package/node_modules/@deterministic-code/typescript-generators/src/generate-frontend-validators.ts

@@ -1,7 +1,13 @@
 import type { GenerateContext } from "@deterministic-code/generators-common/generate-context";
 import type { GenerateEntry } from "@deterministic-code/generators-common/generate-entry";
 import { verifyEntries } from "@deterministic-code/generators-common/reference-verifier";
+import { createCasing } from "./common/default-casing.ts";
 import { Emit } from "./emit.ts";
+
+const layered = (settings: Record<string, string>, path: string): string => {
+  const casing = createCasing(settings);
+  return path.split("/").map((segment) => casing.convertDirectories(segment)).join("/");
+};
 import { generate as generateViewTypeValidators } from "./generate-view-type-validators.ts";
 import { referencesBackend } from "./inline-inherited.ts";
 import {
@@ -31,7 +37,7 @@ export const generate = async (
     },
     basePath: validators,
     datasourceBasePath: referenceBackendType
-      ? "types/generated/datasource/validators"
+      ? layered(ctx.settings, "types/generated/datasource/validators")
       : validators,
   });
   if (!referenceBackendType) verifyEntries(entries);

package/node_modules/@deterministic-code/typescript-generators/src/generate-routes.ts

@@ -54,7 +54,7 @@ class Generator extends Emit {
   }
 
   private customModuleKey(emitPath: string): string {
-    return customRelKey(emitPath, "routes");
+    return customRelKey(emitPath, this.casing.convertDirectories("routes"));
   }
 
   private entityRouter(candidate: RouteCandidate): GenerateEntry {

package/node_modules/@deterministic-code/typescript-generators/src/generate-services.ts

@@ -165,7 +165,7 @@ class Generator extends Emit {
 
   /** Map emit paths like `../custom/foo.ts` to Rel keys `services/custom/foo.ts`. */
   private customModuleKey(emitPath: string): string {
-    return customRelKey(emitPath, "services");
+    return customRelKey(emitPath, this.casing.convertDirectories("services"));
   }
 
   private custom(entry: CustomServiceEntry): GenerateEntry {

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

@@ -73,6 +73,22 @@ describe("TypeScriptImportGenerator layered (organize_by_feature unset)", () =>
       "services/generated/__tests__/userService.integration.test.ts",
     );
     assert.equal(imports.serviceCustomRel("user"), "services/custom/userService.ts");
+    const pascalDirs = createImportGenerator(".", {
+      "languages.typescript.casing.directories": "Pascal",
+    });
+    assert.equal(
+      pascalDirs.datasourceRel("user"),
+      "Types/Generated/Datasource/user.ts",
+    );
+    assert.equal(
+      pascalDirs.serviceRel("user"),
+      "Services/Generated/userService.ts",
+    );
+    assert.deepEqual(pascalDirs.tsconfigIncludes(), [
+      "Types/**/*.ts",
+      "Services/**/*.ts",
+      "Routes/**/*.ts",
+    ]);
     assert.equal(imports.route("user"), "user.ts");
     assert.equal(imports.routeRel("user"), "routes/generated/user.ts");
     assert.equal(imports.routeTest("user"), "user.integration.test.ts");

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

@@ -39,7 +39,7 @@ export class TypeScriptImportGenerator 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 {
@@ -58,21 +58,21 @@ export class TypeScriptImportGenerator implements IImportGenerator {
 
   datasourceValidatorRel(entity: string): string {
     return this.rel(
-      "types/generated/datasource/validators",
+      this.layered("types/generated/datasource/validators"),
       this.datasourceValidator(entity),
     );
   }
 
   datasourceTestRel(entity: string): string {
     return this.rel(
-      "types/generated/datasource",
+      this.layered("types/generated/datasource"),
       this.test(this.datasource(entity), entity),
     );
   }
 
   datasourceValidatorTestRel(entity: string): string {
     return this.rel(
-      "types/generated/datasource/validators",
+      this.layered("types/generated/datasource/validators"),
       this.test(this.datasourceValidator(entity), entity),
     );
   }
@@ -82,7 +82,7 @@ export class TypeScriptImportGenerator 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 {
@@ -95,18 +95,18 @@ export class TypeScriptImportGenerator implements IImportGenerator {
 
   viewValidatorRel(entity: string): string {
     return this.rel(
-      "types/generated/views/validators",
+      this.layered("types/generated/views/validators"),
       this.viewValidator(entity),
     );
   }
 
   viewTestRel(entity: string): string {
-    return this.rel("types/generated/views", this.test(this.view(entity), entity));
+    return this.rel(this.layered("types/generated/views"), this.test(this.view(entity), entity));
   }
 
   viewValidatorTestRel(entity: string): string {
     return this.rel(
-      "types/generated/views/validators",
+      this.layered("types/generated/views/validators"),
       this.test(this.viewValidator(entity), entity),
     );
   }
@@ -126,7 +126,7 @@ export class TypeScriptImportGenerator 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 {
@@ -136,20 +136,20 @@ export class TypeScriptImportGenerator implements IImportGenerator {
   serviceCustomRel(entity: string): string {
     const file = `${this.serviceStem(entity)}.ts`;
     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 {
     const file = `${this.serviceStem(entity)}.test.ts`;
     const path = this.organizeByFeature
-      ? `features/${this.casing.directory(entity)}/__tests__/${file}`
+      ? `${this.featuresDir(entity)}/__tests__/${file}`
       : file;
     return this.underBase(path);
   }
 
   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 {
@@ -158,7 +158,7 @@ export class TypeScriptImportGenerator implements IImportGenerator {
 
   serviceIntegrationTestRel(entity: string): string {
     return this.rel(
-      "services/generated/__tests__",
+      this.layered("services/generated/__tests__"),
       this.serviceIntegrationTest(entity),
     );
   }
@@ -178,7 +178,7 @@ export class TypeScriptImportGenerator 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 {
@@ -188,13 +188,13 @@ export class TypeScriptImportGenerator implements IImportGenerator {
   routeTest(entity: string): string {
     const file = `${this.casing.fileBase(entity)}.integration.test.ts`;
     const path = this.organizeByFeature
-      ? `features/${this.casing.directory(entity)}/__tests__/${file}`
+      ? `${this.featuresDir(entity)}/__tests__/${file}`
       : file;
     return this.underBase(path);
   }
 
   routeTestRel(entity: string): string {
-    return this.rel("routes/generated/__tests__", this.routeTest(entity));
+    return this.rel(this.layered("routes/generated/__tests__"), this.routeTest(entity));
   }
 
   enrichment(_targetTable: string): string {
@@ -262,8 +262,8 @@ export class TypeScriptImportGenerator implements IImportGenerator {
   /** Layered types/services/routes globs, or features when by-feature. Empty when flat. */
   tsconfigIncludes(): string[] {
     if (this.flat) return [];
-    if (this.organizeByFeature) return ["features/**/*.ts"];
-    return ["types/**/*.ts", "services/**/*.ts", "routes/**/*.ts"];
+    if (this.organizeByFeature) return [`${this.casing.convertDirectories("features")}/**/*.ts`];
+    return ["types", "services", "routes"].map((layer) => `${this.casing.convertDirectories(layer)}/**/*.ts`);
   }
 
   private rel(prefix: string, file: string): string {
@@ -275,8 +275,23 @@ export class TypeScriptImportGenerator implements IImportGenerator {
     return `${this.casing.fileBase(stem)}.ts`;
   }
 
+  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 {
@@ -291,7 +306,7 @@ export class TypeScriptImportGenerator implements IImportGenerator {
   private viewLike(entity: string, featureExt: string): string {
     const file = `${this.casing.fileBase(entity)}${this.organizeByFeature ? featureExt : ""}.ts`;
     return this.organizeByFeature
-      ? `features/${this.casing.directory(entity)}/${file}`
+      ? `${this.featuresDir(entity)}/${file}`
       : file;
   }
 
@@ -310,7 +325,7 @@ export class TypeScriptImportGenerator implements IImportGenerator {
         ? this.tsFile(name)
         : `${this.casing.fileBase(`${name}_route`)}.ts`;
     const defaultStub = this.organizeByFeature
-      ? `features/${this.casing.directory(name)}/custom/${file}`
+      ? `${this.featuresDir(name)}/custom/${file}`
       : `../custom/${file}`;
     if (this.organizeByFeature) {
       if (

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deterministic-code/datasources-cli",
-  "version": "0.1.13",
+  "version": "0.1.14",
   "type": "module",
   "bin": {
     "datasources": "./bin/datasources.mjs"
@@ -13,7 +13,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@deterministic-code/datasources-code-generators": "0.1.2",
+    "@deterministic-code/datasources-code-generators": "0.1.14",
     "@deterministic-code/generators-common": "0.0.1",
     "@deterministic-code/deterministic-generators-common": "0.1.0",
     "@deterministic-code/typescript-generators": "0.0.1",