@deterministic-code/datasources-cli 0.1.8 → 0.1.10

package/dist/generate/applyMigrations.js

@@ -6,15 +6,17 @@ import { providerByName } from "./providers.js";
 import { writeEntries } from "./writeEntries.js";
 const at = (root, path) => isAbsolute(path) ? path : join(root, path);
 const afterMigrations = (filename) => filename.replace(/^[^/]+\/migrations\//, "");
-const dialectsOf = (entries) => [
-  ...new Set(entries.map((entry) => entry.filename.split("/")[0]))
-];
 const applyMigrations = async (command, flags, deps) => {
   providerByName(command.provider);
   const loaded = await loadSpec(deps.fs, at(flags.cwd, command.input));
-  const entries = await generateSql({ reader: memoryReader(loaded.files), settings: loaded.settings });
-  if (command.migrationsPath !== void 0 && dialectsOf(entries).length > 1)
+  const listed = [
+    ...new Set(
+      loaded.settings["backend.datasources"].split(",").map((name) => name.trim()).filter((name) => name !== "")
+    )
+  ];
+  if (command.migrationsPath !== void 0 && listed.length > 1)
     throw new Error("--migrations-path requires a single SQL dialect in backend.datasources");
+  const entries = await generateSql({ reader: memoryReader(loaded.files), settings: loaded.settings });
   const remapped = command.migrationsPath === void 0 ? entries : entries.map((entry) => ({ ...entry, filename: afterMigrations(entry.filename) }));
   const root = at(flags.cwd, command.migrationsPath ?? command.migrationsRoot);
   if (flags.dryRun) {

package/dist/generate/migrateUp.js

@@ -60,19 +60,26 @@ const applyMigrateUp = async (command, flags, deps, env = process.env) => {
     throw new Error(
       `migrate-up: provider ${provider} is not in backend.datasources (${dialects.join(", ") || "none"})`
     );
-  const args = [
+  const npx = (verb, extra = []) => [
     "--yes",
     "--package",
     "@deterministic-code/migraters",
-    "migrate-up",
+    verb,
     "--provider",
     provider,
     "--connection",
     connection,
-    ...command.migrationsPath ? ["--migrations-path", command.migrationsPath] : ["--migrations-root", command.migrationsRoot]
+    ...extra
   ];
-  deps.log(`$ npx ${args.join(" ")}`);
-  if (!flags.dryRun) await deps.run("npx", args, flags.cwd);
+  const setup = npx("migrate-setup");
+  const up = npx(
+    "migrate-up",
+    command.migrationsPath ? ["--migrations-path", command.migrationsPath] : ["--migrations-root", command.migrationsRoot]
+  );
+  deps.log(`$ npx ${setup.join(" ")}`);
+  if (!flags.dryRun) await deps.run("npx", setup, flags.cwd);
+  deps.log(`$ npx ${up.join(" ")}`);
+  if (!flags.dryRun) await deps.run("npx", up, flags.cwd);
 };
 export {
   applyMigrateUp

package/dist/migrateInit.js

@@ -1,6 +1,7 @@
 const migrateProviders = ["sqlite", "postgres", "mysql", "sqlserver", "oracle"];
+const migrateLanguage = (ecosystem) => ecosystem === "ts" ? "typescript" : ecosystem;
 const sqlMigrateProviders = (names) => migrateProviders.filter((name) => names.includes(name));
-const migrateInitCommands = (dialects) => dialects.length === 0 ? [] : [
+const migrateInitCommands = (dialects, language) => dialects.length === 0 ? [] : [
   { command: "npm", args: ["install", "@deterministic-code/migraters"] },
   {
     command: "npx",
@@ -9,12 +10,15 @@ const migrateInitCommands = (dialects) => dialects.length === 0 ? [] : [
       "--package",
       "@deterministic-code/migraters",
       "migrate-init",
+      "--language",
+      language,
       ...dialects.flatMap((name) => ["--dialect", name])
     ]
   }
 ];
 export {
   migrateInitCommands,
+  migrateLanguage,
   migrateProviders,
   sqlMigrateProviders
 };

package/dist/run.js

@@ -18,7 +18,7 @@ import {
 import { applyGenerate } from "./generate/applyGenerate.js";
 import { applyMigrations } from "./generate/applyMigrations.js";
 import { applyMigrateUp } from "./generate/migrateUp.js";
-import { migrateInitCommands, sqlMigrateProviders } from "./migrateInit.js";
+import { migrateInitCommands, migrateLanguage, sqlMigrateProviders } from "./migrateInit.js";
 import { help, parseArgs } from "./parse.js";
 import { applyVersion } from "./version/applyVersion.js";
 import { envFromAnswers, promptSetup, starterTypesYaml } from "./setup.js";
@@ -82,7 +82,7 @@ const applySetup = async (flags, deps) => {
     selected
   );
   await applyMigrateInit(flags, deps, ecosystem, selected);
-  const dialect = ecosystem === "ts" ? "typescript" : ecosystem;
+  const dialect = migrateLanguage(ecosystem);
   await wireRegister(flags.cwd, "generated", dialect, flags.dryRun, deps);
   if (!answers.scaffold) return;
   if (flags.dryRun) {
@@ -130,8 +130,7 @@ const applyPackages = async (flags, deps, ecosystem, entries, add, remove, remai
   }
 };
 const applyMigrateInit = async (flags, deps, ecosystem, remaining) => {
-  if (ecosystem !== "ts") return;
-  for (const proc of migrateInitCommands(sqlMigrateProviders(remaining))) {
+  for (const proc of migrateInitCommands(sqlMigrateProviders(remaining), migrateLanguage(ecosystem))) {
     deps.log(`$ ${proc.command} ${proc.args.join(" ")}`);
     if (!flags.dryRun) await deps.run(proc.command, proc.args, flags.cwd);
   }
@@ -166,9 +165,9 @@ const optional = async (fs, path) => {
     return void 0;
   }
 };
-const pluginFileName = (cargoName) => {
+const pluginFileName = (cargoName, platform = process.platform) => {
   const stem = cargoName.replaceAll("-", "_");
-  return process.platform === "win32" ? `${stem}.dll` : process.platform === "darwin" ? `lib${stem}.dylib` : `lib${stem}.so`;
+  return platform === "win32" ? `${stem}.dll` : platform === "darwin" ? `lib${stem}.dylib` : `lib${stem}.so`;
 };
 const copyPlugin = async (cwd, cargoName) => {
   const file = pluginFileName(cargoName);
@@ -193,5 +192,6 @@ const firstFile = async (paths) => {
   return void 0;
 };
 export {
+  pluginFileName,
   run
 };

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

@@ -4,7 +4,8 @@ import { sqlStringLiteral } from "@deterministic-code/datasources";
 import { identityInsertStatementOf, seedInsertStatementOf } from "../statements.js";
 import { renderSql, sqlDefault } from "./sql-dialect.js";
 import { dialectConverter } from "./sql-dialect.js";
-import { isGeneratedIdentity, overlayOf, tableIdentity, } from "./sql-schema.js";
+import { converterFieldOf } from "./converter-field.js";
+import { isGeneratedIdentity, overlayOf, tableIdentity, usesGeneratedIdColumn, } from "./sql-schema.js";
 const SEED_UUID_NAMESPACE = "9b3a8e6c-2f1d-4a5b-8c9d-1e2f3a4b5c6d";
 const pkType = (table) => table.fields.find((f) => isPkField(f, table, overlayOf(table)))?.type ??
     "integer";
@@ -63,8 +64,10 @@ export const seedSections = (dialect, tables, seeds, mapping) => {
         if (rows.length === 0)
             continue;
         const generated = isGeneratedIdentity(table) ? tableIdentity(table) : [];
-        const t = pkType(table);
-        const identity = isGeneratedIdentity(table) && t !== "uuid" && t !== "string";
+        const pk = table.fields.find((field) => field.name === tableIdentity(table)[0]);
+        const identity = pk != null &&
+            usesGeneratedIdColumn(table, pk) &&
+            sqlDefault(dialect, converterFieldOf(pk)) == null;
         const inserts = rows.map((seed) => {
             const cols = colsForRow(table, seed.row);
             const values = cols.map((c) => {

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

@@ -7,6 +7,7 @@ export type SqlGenerateDriver = IDriver & {
     defaultValueConverter: DefaultValueConverter;
     statementRenderer: StatementTextRenderer;
 };
+export declare const register: (dialect: string, driver: IDriver) => void;
 export declare const dialectDriver: (dialect: string) => SqlGenerateDriver;
 export declare const renderSql: (dialect: string, statement: IStatement) => string;
 export declare const dialectConverter: (dialect: string) => {

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

@@ -1,16 +1,28 @@
-import { createRequire } from "node:module";
 import { DriverLoader, ProviderCatalog, } from "@deterministic-code/datasources";
-const require = createRequire(import.meta.url);
-export const dialectDriver = (dialect) => {
-    const catalog = ProviderCatalog.default[dialect];
-    if (catalog === undefined)
+const loaded = new Map();
+const named = (dialect) => ProviderCatalog.default[dialect] === undefined
+    ? (() => {
         throw new Error(`Unknown SQL dialect "${dialect}".`);
-    const driver = DriverLoader.load(new ProviderCatalog(catalog.name, require.resolve(catalog.location), catalog.module));
-    if (driver.typeConverter == null ||
-        driver.defaultValueConverter == null ||
-        driver.statementRenderer == null) {
+    })()
+    : dialect;
+const asGenerate = (dialect, driver) => driver.typeConverter == null ||
+    driver.defaultValueConverter == null ||
+    driver.statementRenderer == null
+    ? (() => {
         throw new Error(`"${dialect}" is not a SQL dialect.`);
-    }
+    })()
+    : driver;
+export const register = (dialect, driver) => {
+    loaded.set(named(dialect), asGenerate(dialect, driver));
+};
+export const dialectDriver = (dialect) => {
+    const key = named(dialect);
+    const hit = loaded.get(key);
+    if (hit !== undefined)
+        return hit;
+    const catalog = ProviderCatalog.default[key];
+    const driver = asGenerate(key, DriverLoader.load(catalog));
+    loaded.set(key, driver);
     return driver;
 };
 export const renderSql = (dialect, statement) => {

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

@@ -11,12 +11,15 @@ export const overlayOf = (table) => ({
     ...(table.mapping !== undefined ? { mapping: table.mapping } : {}),
 });
 export const fieldOverlay = (table, fieldName) => table.overlays.find((overlay) => overlay.name === fieldName);
-const GENERATED_ID_TYPES = new Set([
-    "integer",
-    "biginteger",
-    "uuid",
-    "string",
-]);
+const requireIdIsId = (spec) => {
+    for (const type of spec.types) {
+        for (const field of type.fields) {
+            if (field.name === "id" && field.isId !== true) {
+                throw new Error(`${type.name}.id must have is_id: true`);
+            }
+        }
+    }
+};
 export const tableIdentity = (table) => {
     const keys = identityColumns(table, overlayOf(table));
     if (keys.length > 1) {
@@ -38,10 +41,9 @@ export const isGeneratedIdentity = (table) => {
         return false;
     return fieldOverlay(table, keys[0])?.isFixedId !== true;
 };
-export const usesGeneratedIdColumn = (table, field) => isGeneratedIdentity(table) &&
-    field.name === tableIdentity(table)[0] &&
-    GENERATED_ID_TYPES.has(field.type);
+export const usesGeneratedIdColumn = (table, field) => field.isId === true && isGeneratedIdentity(table);
 export const sqlTablesFrom = (spec) => {
+    requireIdIsId(spec);
     const overlays = tableByName(spec);
     const byName = new Map(spec.expandedTypes.map((t) => [t.name, t]));
     return datasourceTypesOf(spec).map((type) => {

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

@@ -7,19 +7,14 @@ export const columnOf = (dialect, mapping, table, field) => {
     const overlay = fieldOverlay(table, field.name);
     const converterField = converterFieldOf(field);
     const generated = usesGeneratedIdColumn(table, field);
-    const identity = generated && field.type !== "uuid" && field.type !== "string";
     const named = mapping.constraintName(table, mapping.fieldStem(table, field.name), "default_constraint");
-    const utcNow = dialectDriver(dialect).defaultValueConverter.convert("datetime", "UtcNow");
-    const newId = dialectDriver(dialect).defaultValueConverter.convert("uuid", "NewId");
     const fromSpec = sqlDefault(dialect, converterField);
-    const defaultExpr = fromSpec ??
-        (field.name === "created" || field.name === "updated" ? utcNow : null) ??
-        (field.name === "uuid" || (generated && field.type === "uuid") ? newId : null);
+    const identity = generated && fromSpec == null;
     const keys = tableIdentity(table);
     return {
         name: q(dialect, mapping.columnName(table, field.name)),
         type: mapColumnType(dialect, converterField),
-        ...(defaultExpr ? { default: new ColumnDefault(defaultExpr, q(dialect, named)) } : {}),
+        ...(fromSpec ? { default: new ColumnDefault(fromSpec, q(dialect, named)) } : {}),
         ...(!field.isNullable || keys.includes(field.name) ? { notNull: new NotNull() } : {}),
         ...(identity ? { identity: true } : {}),
     };

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

@@ -1,21 +1,22 @@
 {
   "name": "@deterministic-code/datasources-code-generators",
-  "version": "0.1.2",
+  "version": "0.1.10",
   "type": "module",
   "exports": {
     ".": "./dist/generateSql.js",
     "./generate-sql": "./dist/generate-sql.js",
+    "./sql/generate-sql": "./dist/sql/generate-sql.js",
     "./generate-stored-procedures": "./dist/generate-stored-procedures.js",
-    "./common/sql-dialect": "./dist/sql/common/sql-dialect.js",
-    "./sql/dialect-converters": "./dist/sql/dialect-converters.js"
+    "./sql/generate-stored-procedures": "./dist/sql/generate-stored-procedures.js",
+    "./common/sql-dialect": "./dist/sql/common/sql-dialect.js"
   },
   "dependencies": {
-    "@deterministic-code/datasources": "^0.1.6",
-    "@deterministic-code/datasources-mysql": "^0.1.6",
-    "@deterministic-code/datasources-oracle": "^0.1.6",
-    "@deterministic-code/datasources-postgres": "^0.1.6",
-    "@deterministic-code/datasources-sqlite": "^0.1.6",
-    "@deterministic-code/datasources-sqlserver": "^0.1.6",
+    "@deterministic-code/datasources": "^0.1.10",
+    "@deterministic-code/datasources-mysql": "^0.1.10",
+    "@deterministic-code/datasources-oracle": "^0.1.10",
+    "@deterministic-code/datasources-postgres": "^0.1.10",
+    "@deterministic-code/datasources-sqlite": "^0.1.10",
+    "@deterministic-code/datasources-sqlserver": "^0.1.10",
     "@deterministic-code/deterministic-generators-common": "0.1.0",
     "@deterministic-code/generators-common": "0.0.1",
     "pluralize": "^8.0.0",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deterministic-code/datasources-cli",
-  "version": "0.1.8",
+  "version": "0.1.10",
   "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.10",
     "@deterministic-code/generators-common": "0.0.1",
     "@deterministic-code/deterministic-generators-common": "0.1.0",
     "@deterministic-code/typescript-generators": "0.0.1",
@@ -21,12 +21,12 @@
     "@deterministic-code/rust-generators": "0.0.1",
     "@deterministic-code/generators-openapi": "0.0.1",
     "@deterministic-code/patch-merger": "0.1.0",
-    "@deterministic-code/datasources": "^0.1.6",
-    "@deterministic-code/datasources-sqlite": "^0.1.6",
-    "@deterministic-code/datasources-mysql": "^0.1.6",
-    "@deterministic-code/datasources-postgres": "^0.1.6",
-    "@deterministic-code/datasources-sqlserver": "^0.1.6",
-    "@deterministic-code/datasources-oracle": "^0.1.6",
+    "@deterministic-code/datasources": "^0.1.10",
+    "@deterministic-code/datasources-sqlite": "^0.1.10",
+    "@deterministic-code/datasources-mysql": "^0.1.10",
+    "@deterministic-code/datasources-postgres": "^0.1.10",
+    "@deterministic-code/datasources-sqlserver": "^0.1.10",
+    "@deterministic-code/datasources-oracle": "^0.1.10",
     "@inquirer/prompts": "^7.8.0",
     "yaml": "^2.6.0",
     "mustache": "^4.2.0",