datasette-ts 0.0.16 → 0.0.18

package/README.md

@@ -24,31 +24,22 @@ Open `http://127.0.0.1:8001`.
 datasette-ts inspect ./my.db --inspect-file inspect-data.json
 ```
 
-## Deploy to Cloudflare (Alchemy)
+## Deploy to Cloudflare
 
-Prereqs:
-- `sqlite3` available on your PATH
-- Alchemy configured and logged in (`alchemy configure`, `alchemy login`)
-
-Basic deploy (worker/D1 names default to the SQLite basename):
+Prereqs: Alchemy configured (`npx alchemy login`)
 
 ```bash
+# Deploy with name derived from filename
 datasette-ts deploy cloudflare ./my.db
-```
 
-Explicit names + profile:
+# Deploy with explicit name
+datasette-ts deploy cloudflare ./my.db --name my-app
 
-```bash
-datasette-ts deploy cloudflare ./my.db \
-  --worker my-datasette \
-  --d1 my-datasette-db \
-  --db-name mydb \
-  --profile prod
+# Deploy with specific Cloudflare profile
+datasette-ts deploy cloudflare ./my.db --name my-app --profile prod
 ```
 
-Notes:
-- The CLI generates a D1 import SQL file at `.datasette-ts/imports/<db-name>.sql`.
-- Use `--no-precompute-inspect` if you want to skip inspect metadata generation.
+This creates a Cloudflare Worker and D1 database with your data.
 
 ## CLI help
 

package/dist/cli.js

@@ -23686,12 +23686,13 @@ var init_node4 = __esm({
 });
 
 // src/cli.ts
-import { parseArgs as parseArgs2 } from "node:util";
+import { parseArgs as parseArgs3 } from "node:util";
 
 // src/cli/deploy-cloudflare.ts
 import { mkdir as mkdir2, stat as stat2, writeFile as writeFile2 } from "node:fs/promises";
 import { dirname, extname, join, relative, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
+import { parseArgs } from "node:util";
 import alchemy from "alchemy";
 import { Assets, D1Database, Worker } from "alchemy/cloudflare";
 
@@ -23783,6 +23784,9 @@ function escapeSqlValue(value) {
   if (value === null || value === void 0) {
     return "NULL";
   }
+  if (typeof value === "bigint") {
+    return String(value);
+  }
   if (typeof value === "number") {
     return Number.isFinite(value) ? String(value) : "NULL";
   }
@@ -23927,7 +23931,11 @@ async function countTables(dbFile) {
   }
 }
 function createReadonlyClient(dbFile) {
-  return createClient({ url: pathToFileURL(dbFile).toString() });
+  return createClient({
+    url: pathToFileURL(dbFile).toString(),
+    intMode: "bigint"
+    // Handle integers > MAX_SAFE_INTEGER
+  });
 }
 async function executeRows(db, sql2, args = []) {
   const result = await db.execute({ sql: sql2, args });
@@ -24058,138 +24066,48 @@ async function runCloudflareDeploy(args) {
   logStep(`Done in ${formatDuration(Date.now() - startedAt)}`);
 }
 function parseDeployArgs(args) {
-  const positional = [];
-  let dbFile;
-  let dbName;
-  let workerName;
-  let d1Name;
-  let profile;
-  let precomputeInspect = true;
-  let importsDir;
-  for (let index = 0; index < args.length; index += 1) {
-    const arg = args[index];
-    if (!arg) {
-      continue;
-    }
-    if (arg === "--precompute-inspect") {
-      precomputeInspect = true;
-      continue;
-    }
-    if (arg === "--no-precompute-inspect") {
-      precomputeInspect = false;
-      continue;
-    }
-    const parsedArg = parseNamedArg(arg, args[index + 1]);
-    if (!parsedArg) {
-      positional.push(arg);
-      continue;
-    }
-    const { key, value } = parsedArg;
-    switch (key) {
-      case "db":
-      case "db-file":
-        dbFile = value ?? dbFile;
-        if (!arg.includes("=")) {
-          index += 1;
-        }
-        break;
-      case "db-name":
-        dbName = value ?? dbName;
-        if (!arg.includes("=")) {
-          index += 1;
-        }
-        break;
-      case "worker":
-        workerName = value ?? workerName;
-        if (!arg.includes("=")) {
-          index += 1;
-        }
-        break;
-      case "d1":
-        d1Name = value ?? d1Name;
-        if (!arg.includes("=")) {
-          index += 1;
-        }
-        break;
-      case "profile":
-        profile = value ?? profile;
-        if (!arg.includes("=")) {
-          index += 1;
-        }
-        break;
-      case "imports-dir":
-        importsDir = value ?? importsDir;
-        if (!arg.includes("=")) {
-          index += 1;
-        }
-        break;
-      case "precompute-inspect":
-        precomputeInspect = parseBooleanFlag(value, true);
-        if (!arg.includes("=")) {
-          index += 1;
-        }
-        break;
-      default:
-        break;
+  const { values, positionals } = parseArgs({
+    args,
+    allowPositionals: true,
+    strict: false,
+    options: {
+      name: { type: "string", short: "n" },
+      worker: { type: "string" },
+      d1: { type: "string" },
+      "db-name": { type: "string" },
+      profile: { type: "string", short: "p" },
+      "imports-dir": { type: "string" },
+      "precompute-inspect": { type: "boolean", default: true },
+      "no-precompute-inspect": { type: "boolean" }
     }
-  }
-  if (!dbFile && positional.length > 0) {
-    dbFile = positional[0];
-  }
+  });
+  const dbFile = positionals[0];
   if (!dbFile) {
-    throw new Error("Missing SQLite database path.");
+    throw new Error("Missing SQLite database path.\n\nUsage: datasette-ts deploy cloudflare <db-file> [--name <name>]");
   }
   const resolvedDbFile = resolve(dbFile);
-  const derivedDbName = deriveName(resolvedDbFile);
-  const derivedResourceName = normalizeResourceName(derivedDbName);
-  const resolvedImportsDir = resolve(importsDir ?? DEFAULT_IMPORTS_DIR);
+  const derivedName = deriveNameFromPath(resolvedDbFile);
+  const normalizedName = normalizeResourceName(values.name ?? derivedName);
+  const precomputeInspect = values["no-precompute-inspect"] ? false : values["precompute-inspect"] !== false;
   return {
     dbFile: resolvedDbFile,
-    dbName: dbName ?? derivedDbName,
-    workerName: workerName ?? derivedResourceName,
-    d1Name: d1Name ?? derivedResourceName,
-    profile,
+    dbName: values["db-name"] ?? values.name ?? derivedName,
+    workerName: values.worker ?? normalizedName,
+    d1Name: values.d1 ?? normalizedName,
+    profile: values.profile,
     precomputeInspect,
-    importsDir: resolvedImportsDir
+    importsDir: resolve(values["imports-dir"] ?? DEFAULT_IMPORTS_DIR)
   };
 }
-function deriveName(path7) {
-  const base = path7.split(/[\\/]/).pop() ?? path7;
-  const name = base.replace(new RegExp(`${escapeRegex(extname(base))}$`), "");
-  return name === "" ? "db" : name;
+function deriveNameFromPath(filePath) {
+  const base = filePath.split(/[\\/]/).pop() ?? filePath;
+  const ext = extname(base);
+  const name = ext ? base.slice(0, -ext.length) : base;
+  return name || "db";
 }
 function normalizeResourceName(name) {
   const normalized = name.trim().toLowerCase().replace(/[^a-z0-9-]+/g, "-").replace(/-+/g, "-").replace(/^-|-$/g, "");
-  return normalized === "" ? "db" : normalized;
-}
-function escapeRegex(value) {
-  return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-}
-function parseNamedArg(arg, nextValue) {
-  if (!arg.startsWith("--")) {
-    return null;
-  }
-  const [key, value] = arg.slice(2).split("=");
-  if (!key) {
-    return null;
-  }
-  if (value !== void 0) {
-    return { key, value };
-  }
-  return { key, value: nextValue };
-}
-function parseBooleanFlag(value, defaultValue) {
-  if (value == null) {
-    return defaultValue;
-  }
-  const normalized = value.trim().toLowerCase();
-  if (["0", "false", "no", "off"].includes(normalized)) {
-    return false;
-  }
-  if (["1", "true", "yes", "on"].includes(normalized)) {
-    return true;
-  }
-  return defaultValue;
+  return normalized || "db";
 }
 async function resolvePackageRoot() {
   let current = dirname(fileURLToPath(import.meta.url));
@@ -24314,7 +24232,7 @@ async function loadInspectData(inspectFile) {
 async function inspectDatabases(databasePaths) {
   const results = {};
   for (const filename of databasePaths) {
-    const name = deriveName2(filename);
+    const name = deriveName(filename);
     results[name] = await inspectDatabase(filename);
   }
   return results;
@@ -24370,7 +24288,7 @@ function escapeIdentifier3(name) {
   const escaped = name.replace(/"/g, '""');
   return `"${escaped}"`;
 }
-function deriveName2(path7) {
+function deriveName(path7) {
   const parts = path7.split(/[\\/]/);
   const last = parts[parts.length - 1] ?? path7;
   const name = last.replace(/\.[^/.]+$/, "");
@@ -24413,7 +24331,7 @@ async function startServer(options) {
 // src/cli/serve.ts
 var DEFAULT_DB = "data.db";
 async function runServeCommand(args) {
-  const options = await parseArgs(args);
+  const options = await parseArgs2(args);
   const registry = new DatabaseRegistry(
     options.databases,
     options.metadata ?? null,
@@ -24450,7 +24368,7 @@ async function runInspectCommand(args) {
     if (!arg) {
       continue;
     }
-    const parsedArg = parseNamedArg2(arg, args[index + 1]);
+    const parsedArg = parseNamedArg(arg, args[index + 1]);
     if (parsedArg?.key === "inspect-file") {
       if (parsedArg.value) {
         inspectFile = parsedArg.value;
@@ -24474,7 +24392,7 @@ async function runInspectCommand(args) {
   process.stdout.write(`${json}
 `);
 }
-async function parseArgs(args) {
+async function parseArgs2(args) {
   const databasePaths = [];
   let port;
   let hostname;
@@ -24487,7 +24405,7 @@ async function parseArgs(args) {
     if (!arg) {
       continue;
     }
-    const parsedArg = parseNamedArg2(arg, args[index + 1]);
+    const parsedArg = parseNamedArg(arg, args[index + 1]);
     if (parsedArg?.key === "port") {
       if (parsedArg.value) {
         port = Number(parsedArg.value);
@@ -24542,7 +24460,7 @@ async function parseArgs(args) {
     databasePaths.push(DEFAULT_DB);
   }
   const databases = databasePaths.map((filename) => ({
-    name: deriveName3(filename),
+    name: deriveName2(filename),
     filename,
     mutable
   }));
@@ -24572,13 +24490,13 @@ async function parseArgs(args) {
   }
   return result;
 }
-function deriveName3(path7) {
+function deriveName2(path7) {
   const parts = path7.split(/[\\/]/);
   const last = parts[parts.length - 1] ?? path7;
   const name = last.replace(/\.[^/.]+$/, "");
   return name === "" ? "db" : name;
 }
-function parseNamedArg2(arg, nextValue) {
+function parseNamedArg(arg, nextValue) {
   if (!arg.startsWith("--")) {
     return null;
   }
@@ -24600,7 +24518,7 @@ mainPromise.catch((error) => {
 });
 async function main() {
   const args = process.argv.slice(2);
-  const parsed = parseArgs2({
+  const parsed = parseArgs3({
     args,
     allowPositionals: true,
     strict: false,
@@ -24674,7 +24592,7 @@ function dropPositionals(args, positionalIndices, count) {
   return args.filter((_, index) => !remove.has(index));
 }
 function hasHelpFlag(args) {
-  const parsed = parseArgs2({
+  const parsed = parseArgs3({
     args,
     allowPositionals: true,
     strict: false,
@@ -24715,14 +24633,18 @@ Options:
 function printDeployHelp() {
   console.log(`datasette-ts deploy cloudflare <db-file> [options]
 
+Examples:
+  datasette-ts deploy cloudflare ./data.db
+  datasette-ts deploy cloudflare ./data.db --name my-app
+
 Options:
-  --db, --db-file <file>  SQLite database file (positional works too)
-  --db-name <name>        Datasette database name (default: sqlite basename)
-  --worker <name>         Worker name (default: sqlite basename)
-  --d1 <name>             D1 database name (default: sqlite basename)
-  --profile <name>        Alchemy/Cloudflare profile to use
-  --imports-dir <dir>     Output directory for D1 import SQL
-  --precompute-inspect    Precompute inspect data (default)
-  --no-precompute-inspect Disable inspect precompute`);
+  -n, --name <name>       Name for worker and D1 database (default: db filename)
+  -p, --profile <name>    Cloudflare profile to use
+
+Advanced:
+  --worker <name>         Override worker name
+  --d1 <name>             Override D1 database name
+  --db-name <name>        Override Datasette display name
+  --no-precompute-inspect Skip precomputing inspect data`);
 }
 //# sourceMappingURL=cli.js.map