@stardeck-customer-apps/data-store-sdk 0.3.3 → 0.5.0

package/dist/cli/generate-types.d.mts

@@ -1 +1,50 @@
 #!/usr/bin/env node
+declare function toPascalCase(name: string): string;
+
+interface ColumnInfo {
+    table_name: string;
+    column_name: string;
+    data_type: string;
+    is_nullable: string;
+    column_default: string | null;
+}
+declare const PG_TYPE_MAP: Record<string, string>;
+declare function pgTypeToTs(pgType: string): string;
+
+type ParsedCliArgs = {
+    connectionString: string | undefined;
+    outputPath: string;
+    schemaOutputPath: string | undefined;
+    emitSchema: boolean;
+    modulesDir: string;
+    noModules: boolean;
+    help: boolean;
+};
+/**
+ * Pure argv parser for generate-types flags. Exported for unit tests.
+ */
+declare function parseCliArgs(argv: string[], options?: {
+    cwd?: string;
+    env?: NodeJS.ProcessEnv;
+}): ParsedCliArgs;
+declare function introspectSchema(connectionString: string): Promise<Map<string, ColumnInfo[]>>;
+declare function generateTypeScript(tables: Map<string, ColumnInfo[]>, moduleSlices?: string): string;
+type RunGenerateTypesOptions = {
+    connectionString: string;
+    outputPath: string;
+    schemaOutputPath?: string;
+    emitSchema?: boolean;
+    modulesDir: string;
+    noModules: boolean;
+    /** Injectable for tests — defaults to live Postgres introspection. */
+    introspect?: (connectionString: string) => Promise<Map<string, ColumnInfo[]>>;
+    warn?: (message: string) => void;
+};
+/**
+ * Flag → discovery → emitter orchestration. Accepts an injectable introspect
+ * so tests can stub the pool without a live database.
+ */
+declare function runGenerateTypes(options: RunGenerateTypesOptions): Promise<void>;
+declare function main(argv?: string[]): Promise<void>;
+
+export { type ColumnInfo, PG_TYPE_MAP, type ParsedCliArgs, type RunGenerateTypesOptions, generateTypeScript, introspectSchema, main, parseCliArgs, pgTypeToTs, runGenerateTypes, toPascalCase };

package/dist/cli/generate-types.d.ts

@@ -1 +1,50 @@
 #!/usr/bin/env node
+declare function toPascalCase(name: string): string;
+
+interface ColumnInfo {
+    table_name: string;
+    column_name: string;
+    data_type: string;
+    is_nullable: string;
+    column_default: string | null;
+}
+declare const PG_TYPE_MAP: Record<string, string>;
+declare function pgTypeToTs(pgType: string): string;
+
+type ParsedCliArgs = {
+    connectionString: string | undefined;
+    outputPath: string;
+    schemaOutputPath: string | undefined;
+    emitSchema: boolean;
+    modulesDir: string;
+    noModules: boolean;
+    help: boolean;
+};
+/**
+ * Pure argv parser for generate-types flags. Exported for unit tests.
+ */
+declare function parseCliArgs(argv: string[], options?: {
+    cwd?: string;
+    env?: NodeJS.ProcessEnv;
+}): ParsedCliArgs;
+declare function introspectSchema(connectionString: string): Promise<Map<string, ColumnInfo[]>>;
+declare function generateTypeScript(tables: Map<string, ColumnInfo[]>, moduleSlices?: string): string;
+type RunGenerateTypesOptions = {
+    connectionString: string;
+    outputPath: string;
+    schemaOutputPath?: string;
+    emitSchema?: boolean;
+    modulesDir: string;
+    noModules: boolean;
+    /** Injectable for tests — defaults to live Postgres introspection. */
+    introspect?: (connectionString: string) => Promise<Map<string, ColumnInfo[]>>;
+    warn?: (message: string) => void;
+};
+/**
+ * Flag → discovery → emitter orchestration. Accepts an injectable introspect
+ * so tests can stub the pool without a live database.
+ */
+declare function runGenerateTypes(options: RunGenerateTypesOptions): Promise<void>;
+declare function main(argv?: string[]): Promise<void>;
+
+export { type ColumnInfo, PG_TYPE_MAP, type ParsedCliArgs, type RunGenerateTypesOptions, generateTypeScript, introspectSchema, main, parseCliArgs, pgTypeToTs, runGenerateTypes, toPascalCase };

package/dist/cli/generate-types.js

@@ -6,6 +6,10 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
 var __copyProps = (to, from, except, desc) => {
   if (from && typeof from === "object" || typeof from === "function") {
     for (let key of __getOwnPropNames(from))
@@ -22,11 +26,132 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/cli/generate-types.ts
-var import_fs = require("fs");
+var generate_types_exports = {};
+__export(generate_types_exports, {
+  PG_TYPE_MAP: () => PG_TYPE_MAP,
+  generateTypeScript: () => generateTypeScript,
+  introspectSchema: () => introspectSchema,
+  main: () => main,
+  parseCliArgs: () => parseCliArgs,
+  pgTypeToTs: () => pgTypeToTs,
+  runGenerateTypes: () => runGenerateTypes,
+  toPascalCase: () => toPascalCase
+});
+module.exports = __toCommonJS(generate_types_exports);
+var import_fs2 = require("fs");
+var import_path2 = require("path");
+var import_url = require("url");
 var import_serverless = require("@neondatabase/serverless");
 
+// src/cli/module-type-slices.ts
+var import_fs = require("fs");
+var import_path = require("path");
+function toPascalCase(name) {
+  return name.split(/[_-]/).map((w) => w.charAt(0).toUpperCase() + w.slice(1)).join("");
+}
+function parseModuleManifestSlice(content, sourceLabel, warn) {
+  let parsed;
+  try {
+    parsed = JSON.parse(content);
+  } catch {
+    warn(`Skipping malformed module manifest at ${sourceLabel}`);
+    return null;
+  }
+  if (typeof parsed !== "object" || parsed === null) {
+    warn(`Skipping malformed module manifest at ${sourceLabel}`);
+    return null;
+  }
+  const record = parsed;
+  const name = record.name;
+  const tables = record.tables;
+  if (typeof name !== "string" || name.length === 0) {
+    warn(`Skipping module manifest at ${sourceLabel}: missing or invalid "name"`);
+    return null;
+  }
+  if (!Array.isArray(tables) || tables.length === 0) {
+    return null;
+  }
+  const tableNames = [];
+  for (const entry of tables) {
+    if (typeof entry !== "string" || entry.length === 0) {
+      warn(`Skipping module manifest at ${sourceLabel}: invalid "tables" entry`);
+      return null;
+    }
+    tableNames.push(entry);
+  }
+  return { name, tables: tableNames };
+}
+function discoverModuleManifests(modulesDir, warn) {
+  if (!(0, import_fs.existsSync)(modulesDir)) {
+    return [];
+  }
+  let entries;
+  try {
+    entries = (0, import_fs.readdirSync)(modulesDir, { withFileTypes: true }).filter((d) => d.isDirectory()).map((d) => d.name);
+  } catch {
+    warn(`Could not read modules directory: ${modulesDir}`);
+    return [];
+  }
+  const manifests = [];
+  for (const dirName of entries) {
+    const manifestPath = (0, import_path.join)(modulesDir, dirName, "module.json");
+    if (!(0, import_fs.existsSync)(manifestPath)) {
+      continue;
+    }
+    let content;
+    try {
+      content = (0, import_fs.readFileSync)(manifestPath, "utf-8");
+    } catch {
+      warn(`Skipping unreadable module manifest at ${manifestPath}`);
+      continue;
+    }
+    const slice = parseModuleManifestSlice(content, manifestPath, warn);
+    if (slice) {
+      manifests.push(slice);
+    }
+  }
+  return manifests.sort((a, b) => a.name.localeCompare(b.name));
+}
+function shouldLoadModuleManifests(noModules) {
+  return !noModules;
+}
+function emitModuleDbSlices(schemaTableNames, manifests, warn) {
+  const lines = [];
+  const moduleMapEntries = [];
+  for (const manifest of manifests) {
+    const presentTables = manifest.tables.filter((t) => schemaTableNames.has(t));
+    const absentTables = manifest.tables.filter((t) => !schemaTableNames.has(t));
+    if (absentTables.length > 0) {
+      warn(`Module "${manifest.name}": table(s) not in database: ${absentTables.join(", ")}`);
+    }
+    if (presentTables.length === 0) {
+      continue;
+    }
+    const interfaceName = `${toPascalCase(manifest.name)}ModuleDB`;
+    lines.push(`export interface ${interfaceName} {`);
+    for (const tableName of presentTables) {
+      const tableTypeName = `${toPascalCase(tableName)}Table`;
+      lines.push(`  ${tableName}: ${tableTypeName};`);
+    }
+    lines.push("}");
+    lines.push("");
+    moduleMapEntries.push({ name: manifest.name, interfaceName });
+  }
+  if (moduleMapEntries.length === 0) {
+    return "";
+  }
+  lines.push("export interface ModuleDBs {");
+  for (const { name, interfaceName } of moduleMapEntries) {
+    lines.push(`  "${name}": ${interfaceName};`);
+  }
+  lines.push("}");
+  lines.push("");
+  return lines.join("\n");
+}
+
 // src/cli/schema-ddl.ts
 function quoteIdent(name) {
   return `"${name.replace(/"/g, '""')}"`;
@@ -283,6 +408,7 @@ function generateSchemaSql(snapshot) {
 }
 
 // src/cli/generate-types.ts
+var import_meta = {};
 var PG_TYPE_MAP = {
   text: "string",
   varchar: "string",
@@ -315,8 +441,42 @@ var PG_TYPE_MAP = {
 function pgTypeToTs(pgType) {
   return PG_TYPE_MAP[pgType] ?? "unknown";
 }
-function toPascalCase(name) {
-  return name.split("_").map((w) => w.charAt(0).toUpperCase() + w.slice(1)).join("");
+function parseCliArgs(argv, options = {}) {
+  const cwd = options.cwd ?? process.cwd();
+  const env = options.env ?? process.env;
+  let connectionString = env.DATA_STORE_URL;
+  let outputPath = "./src/generated/data-store-types.ts";
+  let schemaOutputPath;
+  let emitSchema = true;
+  let modulesDir = (0, import_path2.resolve)(cwd, "./src/modules");
+  let noModules = false;
+  let help = false;
+  for (let i = 0; i < argv.length; i++) {
+    if (argv[i] === "--connection-string" && argv[i + 1]) {
+      connectionString = argv[++i];
+    } else if (argv[i] === "--output" && argv[i + 1]) {
+      outputPath = argv[++i];
+    } else if (argv[i] === "--schema-output" && argv[i + 1]) {
+      schemaOutputPath = argv[++i];
+    } else if (argv[i] === "--no-schema") {
+      emitSchema = false;
+    } else if (argv[i] === "--modules-dir" && argv[i + 1]) {
+      modulesDir = (0, import_path2.resolve)(cwd, argv[++i]);
+    } else if (argv[i] === "--no-modules") {
+      noModules = true;
+    } else if (argv[i] === "--help") {
+      help = true;
+    }
+  }
+  return {
+    connectionString,
+    outputPath,
+    schemaOutputPath,
+    emitSchema,
+    modulesDir,
+    noModules,
+    help
+  };
 }
 async function introspectSchema(connectionString) {
   const pool = new import_serverless.Pool({ connectionString });
@@ -348,7 +508,7 @@ async function introspectSchema(connectionString) {
     await pool.end();
   }
 }
-function generateTypeScript(tables) {
+function generateTypeScript(tables, moduleSlices) {
   const lines = [
     "// AUTO-GENERATED by @stardeck-customer-apps/data-store-sdk \u2014 DO NOT EDIT.",
     "// This file is overwritten in full on every run of:",
@@ -356,6 +516,8 @@ function generateTypeScript(tables) {
     "// Anything you add here (hand-written or derived types) WILL BE LOST on the next",
     "// regeneration. Put those in a separate file that imports from this one, e.g.",
     "// src/lib/<domain>-types.ts importing the table types or DB from this file.",
+    "// When module manifests are discoverable, per-module DB slices and ModuleDBs are",
+    "// appended below the flat DB interface.",
     "",
     'import type { Generated } from "kysely";',
     ""
@@ -386,69 +548,113 @@ function generateTypeScript(tables) {
   }
   lines.push("}");
   lines.push("");
-  return lines.join("\n");
-}
-async function main() {
-  const args = process.argv.slice(2);
-  let connectionString = process.env.DATA_STORE_URL;
-  let outputPath = "./src/generated/data-store-types.ts";
-  let schemaOutputPath;
-  let emitSchema = true;
-  for (let i = 0; i < args.length; i++) {
-    if (args[i] === "--connection-string" && args[i + 1]) {
-      connectionString = args[++i];
-    } else if (args[i] === "--output" && args[i + 1]) {
-      outputPath = args[++i];
-    } else if (args[i] === "--schema-output" && args[i + 1]) {
-      schemaOutputPath = args[++i];
-    } else if (args[i] === "--no-schema") {
-      emitSchema = false;
-    } else if (args[i] === "--help") {
-      console.log(`Usage: stardeck-data-store generate-types [options]
-
-Options:
-  --connection-string <url>  Postgres connection string (default: DATA_STORE_URL env var)
-  --output <path>            Output file path (default: ./src/generated/data-store-types.ts)
-  --schema-output <path>     DDL snapshot path (default: data-store-schema.sql next to --output)
-  --no-schema                Skip the DDL snapshot used by the test harness
-  --help                     Show this help message`);
-      process.exit(0);
+  if (moduleSlices) {
+    const trimmed = moduleSlices.trimEnd();
+    if (trimmed.length > 0) {
+      lines.push(trimmed);
+      lines.push("");
     }
   }
-  if (!connectionString) {
-    console.error(
-      "Error: No connection string provided. Set DATA_STORE_URL or use --connection-string."
-    );
-    process.exit(1);
-  }
+  return lines.join("\n");
+}
+async function runGenerateTypes(options) {
+  const {
+    connectionString,
+    outputPath,
+    schemaOutputPath,
+    emitSchema = true,
+    modulesDir,
+    noModules,
+    introspect = introspectSchema,
+    warn = (message) => console.warn(message)
+  } = options;
   console.log("Introspecting database schema...");
-  const tables = await introspectSchema(connectionString);
+  const tables = await introspect(connectionString);
   if (tables.size === 0) {
     console.log("No tables found in database.");
     return;
   }
   console.log(`Found ${tables.size} table(s): ${Array.from(tables.keys()).join(", ")}`);
-  const typeScript = generateTypeScript(tables);
+  let moduleSlices = "";
+  if (shouldLoadModuleManifests(noModules)) {
+    const manifests = discoverModuleManifests(modulesDir, warn);
+    if (manifests.length > 0) {
+      moduleSlices = emitModuleDbSlices(new Set(tables.keys()), manifests, warn);
+    }
+  }
+  const typeScript = generateTypeScript(tables, moduleSlices || void 0);
   const dir = outputPath.substring(0, outputPath.lastIndexOf("/"));
   if (dir) {
     const { mkdirSync } = await import("fs");
     mkdirSync(dir, { recursive: true });
   }
-  (0, import_fs.writeFileSync)(outputPath, typeScript, "utf-8");
+  (0, import_fs2.writeFileSync)(outputPath, typeScript, "utf-8");
   console.log(`Types written to ${outputPath}`);
   if (emitSchema) {
     const schemaPath = schemaOutputPath ?? `${dir ? `${dir}/` : ""}data-store-schema.sql`;
     const pool = new import_serverless.Pool({ connectionString });
     try {
       const snapshot = await introspectSchemaSnapshot(pool);
-      (0, import_fs.writeFileSync)(schemaPath, generateSchemaSql(snapshot), "utf-8");
+      (0, import_fs2.writeFileSync)(schemaPath, generateSchemaSql(snapshot), "utf-8");
       console.log(`Schema snapshot written to ${schemaPath} (used by the test harness)`);
     } finally {
       await pool.end();
     }
   }
 }
-main().catch((error) => {
-  console.error("Failed to generate types:", error);
-  process.exit(1);
+async function main(argv = process.argv.slice(2)) {
+  const parsed = parseCliArgs(argv);
+  if (parsed.help) {
+    console.log(`Usage: stardeck-data-store generate-types [options]
+
+Options:
+  --connection-string <url>  Postgres connection string (default: DATA_STORE_URL env var)
+  --output <path>            Output file path (default: ./src/generated/data-store-types.ts)
+  --schema-output <path>     DDL snapshot path (default: data-store-schema.sql next to --output)
+  --no-schema                Skip the DDL snapshot used by the test harness
+  --modules-dir <path>       Directory containing module folders (default: ./src/modules)
+  --no-modules               Skip per-module DB slice generation
+  --help                     Show this help message`);
+    process.exit(0);
+  }
+  if (!parsed.connectionString) {
+    console.error(
+      "Error: No connection string provided. Set DATA_STORE_URL or use --connection-string."
+    );
+    process.exit(1);
+  }
+  await runGenerateTypes({
+    connectionString: parsed.connectionString,
+    outputPath: parsed.outputPath,
+    schemaOutputPath: parsed.schemaOutputPath,
+    emitSchema: parsed.emitSchema,
+    modulesDir: parsed.modulesDir,
+    noModules: parsed.noModules
+  });
+}
+function isDirectCliRun() {
+  const entry = process.argv[1];
+  if (!entry) return false;
+  try {
+    return import_meta.url === (0, import_url.pathToFileURL)((0, import_path2.resolve)(entry)).href;
+  } catch {
+    return false;
+  }
+}
+if (isDirectCliRun()) {
+  main().catch((error) => {
+    console.error("Failed to generate types:", error);
+    process.exit(1);
+  });
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  PG_TYPE_MAP,
+  generateTypeScript,
+  introspectSchema,
+  main,
+  parseCliArgs,
+  pgTypeToTs,
+  runGenerateTypes,
+  toPascalCase
 });

package/dist/cli/generate-types.mjs

@@ -2,8 +2,116 @@
 
 // src/cli/generate-types.ts
 import { writeFileSync } from "fs";
+import { resolve } from "path";
+import { pathToFileURL } from "url";
 import { Pool } from "@neondatabase/serverless";
 
+// src/cli/module-type-slices.ts
+import { existsSync, readdirSync, readFileSync } from "fs";
+import { join } from "path";
+function toPascalCase(name) {
+  return name.split(/[_-]/).map((w) => w.charAt(0).toUpperCase() + w.slice(1)).join("");
+}
+function parseModuleManifestSlice(content, sourceLabel, warn) {
+  let parsed;
+  try {
+    parsed = JSON.parse(content);
+  } catch {
+    warn(`Skipping malformed module manifest at ${sourceLabel}`);
+    return null;
+  }
+  if (typeof parsed !== "object" || parsed === null) {
+    warn(`Skipping malformed module manifest at ${sourceLabel}`);
+    return null;
+  }
+  const record = parsed;
+  const name = record.name;
+  const tables = record.tables;
+  if (typeof name !== "string" || name.length === 0) {
+    warn(`Skipping module manifest at ${sourceLabel}: missing or invalid "name"`);
+    return null;
+  }
+  if (!Array.isArray(tables) || tables.length === 0) {
+    return null;
+  }
+  const tableNames = [];
+  for (const entry of tables) {
+    if (typeof entry !== "string" || entry.length === 0) {
+      warn(`Skipping module manifest at ${sourceLabel}: invalid "tables" entry`);
+      return null;
+    }
+    tableNames.push(entry);
+  }
+  return { name, tables: tableNames };
+}
+function discoverModuleManifests(modulesDir, warn) {
+  if (!existsSync(modulesDir)) {
+    return [];
+  }
+  let entries;
+  try {
+    entries = readdirSync(modulesDir, { withFileTypes: true }).filter((d) => d.isDirectory()).map((d) => d.name);
+  } catch {
+    warn(`Could not read modules directory: ${modulesDir}`);
+    return [];
+  }
+  const manifests = [];
+  for (const dirName of entries) {
+    const manifestPath = join(modulesDir, dirName, "module.json");
+    if (!existsSync(manifestPath)) {
+      continue;
+    }
+    let content;
+    try {
+      content = readFileSync(manifestPath, "utf-8");
+    } catch {
+      warn(`Skipping unreadable module manifest at ${manifestPath}`);
+      continue;
+    }
+    const slice = parseModuleManifestSlice(content, manifestPath, warn);
+    if (slice) {
+      manifests.push(slice);
+    }
+  }
+  return manifests.sort((a, b) => a.name.localeCompare(b.name));
+}
+function shouldLoadModuleManifests(noModules) {
+  return !noModules;
+}
+function emitModuleDbSlices(schemaTableNames, manifests, warn) {
+  const lines = [];
+  const moduleMapEntries = [];
+  for (const manifest of manifests) {
+    const presentTables = manifest.tables.filter((t) => schemaTableNames.has(t));
+    const absentTables = manifest.tables.filter((t) => !schemaTableNames.has(t));
+    if (absentTables.length > 0) {
+      warn(`Module "${manifest.name}": table(s) not in database: ${absentTables.join(", ")}`);
+    }
+    if (presentTables.length === 0) {
+      continue;
+    }
+    const interfaceName = `${toPascalCase(manifest.name)}ModuleDB`;
+    lines.push(`export interface ${interfaceName} {`);
+    for (const tableName of presentTables) {
+      const tableTypeName = `${toPascalCase(tableName)}Table`;
+      lines.push(`  ${tableName}: ${tableTypeName};`);
+    }
+    lines.push("}");
+    lines.push("");
+    moduleMapEntries.push({ name: manifest.name, interfaceName });
+  }
+  if (moduleMapEntries.length === 0) {
+    return "";
+  }
+  lines.push("export interface ModuleDBs {");
+  for (const { name, interfaceName } of moduleMapEntries) {
+    lines.push(`  "${name}": ${interfaceName};`);
+  }
+  lines.push("}");
+  lines.push("");
+  return lines.join("\n");
+}
+
 // src/cli/schema-ddl.ts
 function quoteIdent(name) {
   return `"${name.replace(/"/g, '""')}"`;
@@ -292,8 +400,42 @@ var PG_TYPE_MAP = {
 function pgTypeToTs(pgType) {
   return PG_TYPE_MAP[pgType] ?? "unknown";
 }
-function toPascalCase(name) {
-  return name.split("_").map((w) => w.charAt(0).toUpperCase() + w.slice(1)).join("");
+function parseCliArgs(argv, options = {}) {
+  const cwd = options.cwd ?? process.cwd();
+  const env = options.env ?? process.env;
+  let connectionString = env.DATA_STORE_URL;
+  let outputPath = "./src/generated/data-store-types.ts";
+  let schemaOutputPath;
+  let emitSchema = true;
+  let modulesDir = resolve(cwd, "./src/modules");
+  let noModules = false;
+  let help = false;
+  for (let i = 0; i < argv.length; i++) {
+    if (argv[i] === "--connection-string" && argv[i + 1]) {
+      connectionString = argv[++i];
+    } else if (argv[i] === "--output" && argv[i + 1]) {
+      outputPath = argv[++i];
+    } else if (argv[i] === "--schema-output" && argv[i + 1]) {
+      schemaOutputPath = argv[++i];
+    } else if (argv[i] === "--no-schema") {
+      emitSchema = false;
+    } else if (argv[i] === "--modules-dir" && argv[i + 1]) {
+      modulesDir = resolve(cwd, argv[++i]);
+    } else if (argv[i] === "--no-modules") {
+      noModules = true;
+    } else if (argv[i] === "--help") {
+      help = true;
+    }
+  }
+  return {
+    connectionString,
+    outputPath,
+    schemaOutputPath,
+    emitSchema,
+    modulesDir,
+    noModules,
+    help
+  };
 }
 async function introspectSchema(connectionString) {
   const pool = new Pool({ connectionString });
@@ -325,7 +467,7 @@ async function introspectSchema(connectionString) {
     await pool.end();
   }
 }
-function generateTypeScript(tables) {
+function generateTypeScript(tables, moduleSlices) {
   const lines = [
     "// AUTO-GENERATED by @stardeck-customer-apps/data-store-sdk \u2014 DO NOT EDIT.",
     "// This file is overwritten in full on every run of:",
@@ -333,6 +475,8 @@ function generateTypeScript(tables) {
     "// Anything you add here (hand-written or derived types) WILL BE LOST on the next",
     "// regeneration. Put those in a separate file that imports from this one, e.g.",
     "// src/lib/<domain>-types.ts importing the table types or DB from this file.",
+    "// When module manifests are discoverable, per-module DB slices and ModuleDBs are",
+    "// appended below the flat DB interface.",
     "",
     'import type { Generated } from "kysely";',
     ""
@@ -363,49 +507,41 @@ function generateTypeScript(tables) {
   }
   lines.push("}");
   lines.push("");
-  return lines.join("\n");
-}
-async function main() {
-  const args = process.argv.slice(2);
-  let connectionString = process.env.DATA_STORE_URL;
-  let outputPath = "./src/generated/data-store-types.ts";
-  let schemaOutputPath;
-  let emitSchema = true;
-  for (let i = 0; i < args.length; i++) {
-    if (args[i] === "--connection-string" && args[i + 1]) {
-      connectionString = args[++i];
-    } else if (args[i] === "--output" && args[i + 1]) {
-      outputPath = args[++i];
-    } else if (args[i] === "--schema-output" && args[i + 1]) {
-      schemaOutputPath = args[++i];
-    } else if (args[i] === "--no-schema") {
-      emitSchema = false;
-    } else if (args[i] === "--help") {
-      console.log(`Usage: stardeck-data-store generate-types [options]
-
-Options:
-  --connection-string <url>  Postgres connection string (default: DATA_STORE_URL env var)
-  --output <path>            Output file path (default: ./src/generated/data-store-types.ts)
-  --schema-output <path>     DDL snapshot path (default: data-store-schema.sql next to --output)
-  --no-schema                Skip the DDL snapshot used by the test harness
-  --help                     Show this help message`);
-      process.exit(0);
+  if (moduleSlices) {
+    const trimmed = moduleSlices.trimEnd();
+    if (trimmed.length > 0) {
+      lines.push(trimmed);
+      lines.push("");
     }
   }
-  if (!connectionString) {
-    console.error(
-      "Error: No connection string provided. Set DATA_STORE_URL or use --connection-string."
-    );
-    process.exit(1);
-  }
+  return lines.join("\n");
+}
+async function runGenerateTypes(options) {
+  const {
+    connectionString,
+    outputPath,
+    schemaOutputPath,
+    emitSchema = true,
+    modulesDir,
+    noModules,
+    introspect = introspectSchema,
+    warn = (message) => console.warn(message)
+  } = options;
   console.log("Introspecting database schema...");
-  const tables = await introspectSchema(connectionString);
+  const tables = await introspect(connectionString);
   if (tables.size === 0) {
     console.log("No tables found in database.");
     return;
   }
   console.log(`Found ${tables.size} table(s): ${Array.from(tables.keys()).join(", ")}`);
-  const typeScript = generateTypeScript(tables);
+  let moduleSlices = "";
+  if (shouldLoadModuleManifests(noModules)) {
+    const manifests = discoverModuleManifests(modulesDir, warn);
+    if (manifests.length > 0) {
+      moduleSlices = emitModuleDbSlices(new Set(tables.keys()), manifests, warn);
+    }
+  }
+  const typeScript = generateTypeScript(tables, moduleSlices || void 0);
   const dir = outputPath.substring(0, outputPath.lastIndexOf("/"));
   if (dir) {
     const { mkdirSync } = await import("fs");
@@ -425,7 +561,58 @@ Options:
     }
   }
 }
-main().catch((error) => {
-  console.error("Failed to generate types:", error);
-  process.exit(1);
-});
+async function main(argv = process.argv.slice(2)) {
+  const parsed = parseCliArgs(argv);
+  if (parsed.help) {
+    console.log(`Usage: stardeck-data-store generate-types [options]
+
+Options:
+  --connection-string <url>  Postgres connection string (default: DATA_STORE_URL env var)
+  --output <path>            Output file path (default: ./src/generated/data-store-types.ts)
+  --schema-output <path>     DDL snapshot path (default: data-store-schema.sql next to --output)
+  --no-schema                Skip the DDL snapshot used by the test harness
+  --modules-dir <path>       Directory containing module folders (default: ./src/modules)
+  --no-modules               Skip per-module DB slice generation
+  --help                     Show this help message`);
+    process.exit(0);
+  }
+  if (!parsed.connectionString) {
+    console.error(
+      "Error: No connection string provided. Set DATA_STORE_URL or use --connection-string."
+    );
+    process.exit(1);
+  }
+  await runGenerateTypes({
+    connectionString: parsed.connectionString,
+    outputPath: parsed.outputPath,
+    schemaOutputPath: parsed.schemaOutputPath,
+    emitSchema: parsed.emitSchema,
+    modulesDir: parsed.modulesDir,
+    noModules: parsed.noModules
+  });
+}
+function isDirectCliRun() {
+  const entry = process.argv[1];
+  if (!entry) return false;
+  try {
+    return import.meta.url === pathToFileURL(resolve(entry)).href;
+  } catch {
+    return false;
+  }
+}
+if (isDirectCliRun()) {
+  main().catch((error) => {
+    console.error("Failed to generate types:", error);
+    process.exit(1);
+  });
+}
+export {
+  PG_TYPE_MAP,
+  generateTypeScript,
+  introspectSchema,
+  main,
+  parseCliArgs,
+  pgTypeToTs,
+  runGenerateTypes,
+  toPascalCase
+};

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-export { C as ColumnDefinition, D as DataStoreClientConfig, F as FilterOperator, L as ListObjectsResult, Q as QueryFilter, b as QueryOptions, c as QueryResult, S as StorageObject, T as TableColumn, a as TableSchema } from './types-D2D9kZNF.mjs';
+export { C as ColumnDefinition, D as DataStoreClientConfig, F as FilterOperator, L as ListObjectsResult, Q as QueryFilter, a as QueryOptions, b as QueryResult, S as StorageObject, T as TableColumn, c as TableSchema } from './types-P3VlojJ9.mjs';
 
 declare class DataStoreError extends Error {
     code: string;

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-export { C as ColumnDefinition, D as DataStoreClientConfig, F as FilterOperator, L as ListObjectsResult, Q as QueryFilter, b as QueryOptions, c as QueryResult, S as StorageObject, T as TableColumn, a as TableSchema } from './types-D2D9kZNF.js';
+export { C as ColumnDefinition, D as DataStoreClientConfig, F as FilterOperator, L as ListObjectsResult, Q as QueryFilter, a as QueryOptions, b as QueryResult, S as StorageObject, T as TableColumn, c as TableSchema } from './types-P3VlojJ9.js';
 
 declare class DataStoreError extends Error {
     code: string;

package/dist/server/index.d.mts

@@ -1,4 +1,4 @@
-import { D as DataStoreClientConfig, a as TableSchema, C as ColumnDefinition, b as QueryOptions, c as QueryResult, L as ListObjectsResult } from '../types-D2D9kZNF.mjs';
+import { D as DataStoreClientConfig, c as TableSchema, C as ColumnDefinition, a as QueryOptions, b as QueryResult, L as ListObjectsResult } from '../types-P3VlojJ9.mjs';
 import { KyselyConfig, Kysely } from 'kysely';
 
 /**
@@ -140,7 +140,19 @@ interface DataStoreManifestEntry {
     id: string;
     name: string;
     slug: string;
-    url: string;
+    /**
+     * App-local handle for this project's connection. When present, the resolver
+     * matches it before the org-global slug/name.
+     */
+    bindingKey?: string;
+    /**
+     * Store kind. `database` stores carry a `url`; `storage` stores do not (access
+     * is API-mediated by store id). Absent on manifests emitted before this field
+     * existed — treat absent as `database`.
+     */
+    storeType?: "database" | "storage";
+    /** Connection string. Present for `database` stores only. */
+    url?: string;
     accessLevel: "read" | "write" | "admin";
 }
 /**

package/dist/server/index.d.ts

@@ -1,4 +1,4 @@
-import { D as DataStoreClientConfig, a as TableSchema, C as ColumnDefinition, b as QueryOptions, c as QueryResult, L as ListObjectsResult } from '../types-D2D9kZNF.js';
+import { D as DataStoreClientConfig, c as TableSchema, C as ColumnDefinition, a as QueryOptions, b as QueryResult, L as ListObjectsResult } from '../types-P3VlojJ9.js';
 import { KyselyConfig, Kysely } from 'kysely';
 
 /**
@@ -140,7 +140,19 @@ interface DataStoreManifestEntry {
     id: string;
     name: string;
     slug: string;
-    url: string;
+    /**
+     * App-local handle for this project's connection. When present, the resolver
+     * matches it before the org-global slug/name.
+     */
+    bindingKey?: string;
+    /**
+     * Store kind. `database` stores carry a `url`; `storage` stores do not (access
+     * is API-mediated by store id). Absent on manifests emitted before this field
+     * existed — treat absent as `database`.
+     */
+    storeType?: "database" | "storage";
+    /** Connection string. Present for `database` stores only. */
+    url?: string;
     accessLevel: "read" | "write" | "admin";
 }
 /**

package/dist/server/index.js

@@ -94,9 +94,14 @@ function readDataStoreManifest() {
   try {
     const parsed = JSON.parse(raw);
     if (!Array.isArray(parsed)) return [];
-    return parsed.filter(
-      (e) => typeof e === "object" && e !== null && typeof e.id === "string" && typeof e.name === "string" && typeof e.slug === "string" && typeof e.url === "string"
-    );
+    return parsed.filter((e) => {
+      if (typeof e !== "object" || e === null) return false;
+      const entry = e;
+      if (typeof entry.id !== "string" || typeof entry.name !== "string" || typeof entry.slug !== "string") {
+        return false;
+      }
+      return entry.storeType === "storage" || typeof entry.url === "string";
+    });
   } catch {
     return [];
   }
@@ -111,9 +116,13 @@ function resolveManifestEntry(entries, ref) {
   }
   if (ref.storeName) {
     const target = ref.storeName;
+    const byBindingKey = entries.find((e) => e.bindingKey === target);
+    if (byBindingKey) return byBindingKey;
     const exact = entries.find((e) => e.slug === target || e.id === target || e.name === target);
     if (exact) return exact;
     const norm = dataStoreSlug(target);
+    const byBindingKeyNorm = entries.find((e) => e.bindingKey === norm);
+    if (byBindingKeyNorm) return byBindingKeyNorm;
     return entries.find(
       (e) => e.slug === norm || typeof e.name === "string" && dataStoreSlug(e.name) === norm
     );
@@ -324,6 +333,12 @@ async function createDataStore(options) {
   if (!connectionString) {
     const name = options?.storeName ?? options?.storeId;
     const ref = name ? `data store "${name}"` : "a data store";
+    const resolved = options?.storeId || options?.storeName ? resolveDataStore({ storeId: options?.storeId, storeName: options?.storeName }) : void 0;
+    if (resolved?.storeType === "storage") {
+      throw new Error(
+        `${ref} is a storage store and has no SQL connection. Use DataStoreClient for storage operations (upload/download/list) instead of createDataStore.`
+      );
+    }
     throw new Error(
       `Could not resolve a connection string for ${ref}. Checked the STARDECK_DATA_STORES manifest, the legacy DATA_STORE_*_URL env var, and DATA_STORE_URL. Confirm the store is connected to this project, or pass connectionString in options.`
     );

package/dist/server/index.mjs

@@ -41,9 +41,14 @@ function readDataStoreManifest() {
   try {
     const parsed = JSON.parse(raw);
     if (!Array.isArray(parsed)) return [];
-    return parsed.filter(
-      (e) => typeof e === "object" && e !== null && typeof e.id === "string" && typeof e.name === "string" && typeof e.slug === "string" && typeof e.url === "string"
-    );
+    return parsed.filter((e) => {
+      if (typeof e !== "object" || e === null) return false;
+      const entry = e;
+      if (typeof entry.id !== "string" || typeof entry.name !== "string" || typeof entry.slug !== "string") {
+        return false;
+      }
+      return entry.storeType === "storage" || typeof entry.url === "string";
+    });
   } catch {
     return [];
   }
@@ -58,9 +63,13 @@ function resolveManifestEntry(entries, ref) {
   }
   if (ref.storeName) {
     const target = ref.storeName;
+    const byBindingKey = entries.find((e) => e.bindingKey === target);
+    if (byBindingKey) return byBindingKey;
     const exact = entries.find((e) => e.slug === target || e.id === target || e.name === target);
     if (exact) return exact;
     const norm = dataStoreSlug(target);
+    const byBindingKeyNorm = entries.find((e) => e.bindingKey === norm);
+    if (byBindingKeyNorm) return byBindingKeyNorm;
     return entries.find(
       (e) => e.slug === norm || typeof e.name === "string" && dataStoreSlug(e.name) === norm
     );
@@ -271,6 +280,12 @@ async function createDataStore(options) {
   if (!connectionString) {
     const name = options?.storeName ?? options?.storeId;
     const ref = name ? `data store "${name}"` : "a data store";
+    const resolved = options?.storeId || options?.storeName ? resolveDataStore({ storeId: options?.storeId, storeName: options?.storeName }) : void 0;
+    if (resolved?.storeType === "storage") {
+      throw new Error(
+        `${ref} is a storage store and has no SQL connection. Use DataStoreClient for storage operations (upload/download/list) instead of createDataStore.`
+      );
+    }
     throw new Error(
       `Could not resolve a connection string for ${ref}. Checked the STARDECK_DATA_STORES manifest, the legacy DATA_STORE_*_URL env var, and DATA_STORE_URL. Confirm the store is connected to this project, or pass connectionString in options.`
     );

package/dist/{types-D2D9kZNF.d.mts → types-P3VlojJ9.d.mts}

@@ -82,4 +82,4 @@ interface ListObjectsResult {
     hasMore: boolean;
 }
 
-export type { ColumnDefinition as C, DataStoreClientConfig as D, FilterOperator as F, ListObjectsResult as L, QueryFilter as Q, StorageObject as S, TableColumn as T, TableSchema as a, QueryOptions as b, QueryResult as c };
+export type { ColumnDefinition as C, DataStoreClientConfig as D, FilterOperator as F, ListObjectsResult as L, QueryFilter as Q, StorageObject as S, TableColumn as T, QueryOptions as a, QueryResult as b, TableSchema as c };

package/dist/{types-D2D9kZNF.d.ts → types-P3VlojJ9.d.ts}

@@ -82,4 +82,4 @@ interface ListObjectsResult {
     hasMore: boolean;
 }
 
-export type { ColumnDefinition as C, DataStoreClientConfig as D, FilterOperator as F, ListObjectsResult as L, QueryFilter as Q, StorageObject as S, TableColumn as T, TableSchema as a, QueryOptions as b, QueryResult as c };
+export type { ColumnDefinition as C, DataStoreClientConfig as D, FilterOperator as F, ListObjectsResult as L, QueryFilter as Q, StorageObject as S, TableColumn as T, QueryOptions as a, QueryResult as b, TableSchema as c };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stardeck-customer-apps/data-store-sdk",
-  "version": "0.3.3",
+  "version": "0.5.0",
   "description": "SDK for accessing Stardeck data stores from deployed projects",
   "main": "dist/index.js",
   "module": "dist/index.mjs",