datasette-ts 0.0.14 → 0.0.15

package/dist/cli.js

@@ -23685,6 +23685,9 @@ var init_node4 = __esm({
   }
 });
 
+// src/cli.ts
+import { parseArgs as parseArgs2 } from "node:util";
+
 // src/cli/deploy-cloudflare.ts
 import { mkdir as mkdir2, stat as stat2, writeFile } from "node:fs/promises";
 import { dirname, extname, join, relative, resolve } from "node:path";
@@ -24695,29 +24698,39 @@ function parseNamedArg2(arg, nextValue) {
 }
 
 // src/cli.ts
-var keepAlive = setInterval(() => {
-}, 1e3);
 var mainPromise = main();
 mainPromise.catch((error) => {
   console.error(error);
   process.exitCode = 1;
 });
-mainPromise.finally(() => {
-  clearInterval(keepAlive);
-});
 async function main() {
   const args = process.argv.slice(2);
-  const [command, subcommand] = args;
-  const helpFlag = args.includes("--help") || args.includes("-h");
-  if (!command || command === "serve" || command.startsWith("-")) {
-    if (!command || command.startsWith("-")) {
-      if (helpFlag) {
-        printHelp();
-        return;
-      }
+  const parsed = parseArgs2({
+    args,
+    allowPositionals: true,
+    strict: false,
+    options: {
+      help: { type: "boolean", short: "h" }
+    },
+    tokens: true
+  });
+  const [command, subcommand] = parsed.positionals;
+  const positionalIndices = (parsed.tokens ?? []).filter((token) => token.kind === "positional").map((token) => token.index).sort((a, b) => a - b);
+  if (!command) {
+    if (parsed.values.help) {
+      printHelp();
+      return;
     }
-    const serveArgs = command === "serve" ? args.slice(1) : args;
-    if (serveArgs.includes("--help") || serveArgs.includes("-h")) {
+    if (hasHelpFlag(args)) {
+      printServeHelp();
+      return;
+    }
+    await runServeCommand(args);
+    return;
+  }
+  if (command === "serve") {
+    const serveArgs = dropPositionals(args, positionalIndices, 1);
+    if (hasHelpFlag(serveArgs)) {
       printServeHelp();
       return;
     }
@@ -24725,8 +24738,8 @@ async function main() {
     return;
   }
   if (command === "inspect") {
-    const inspectArgs = args.slice(1);
-    if (inspectArgs.includes("--help") || inspectArgs.includes("-h")) {
+    const inspectArgs = dropPositionals(args, positionalIndices, 1);
+    if (hasHelpFlag(inspectArgs)) {
       printInspectHelp();
       return;
     }
@@ -24739,15 +24752,15 @@ async function main() {
       process.exitCode = 1;
       return;
     }
-    const deployArgs = args.slice(2);
-    if (deployArgs.includes("--help") || deployArgs.includes("-h")) {
+    const deployArgs = dropPositionals(args, positionalIndices, 2);
+    if (hasHelpFlag(deployArgs)) {
       printDeployHelp();
       return;
     }
     await runCloudflareDeploy(deployArgs);
     return;
   }
-  if (command === "help" || command === "--help" || command === "-h") {
+  if (command === "help") {
     printHelp();
     return;
   }
@@ -24755,6 +24768,27 @@ async function main() {
   printHelp();
   process.exitCode = 1;
 }
+function dropPositionals(args, positionalIndices, count) {
+  if (count <= 0) {
+    return args.slice();
+  }
+  const remove = new Set(positionalIndices.slice(0, count));
+  if (remove.size === 0) {
+    return args.slice();
+  }
+  return args.filter((_, index) => !remove.has(index));
+}
+function hasHelpFlag(args) {
+  const parsed = parseArgs2({
+    args,
+    allowPositionals: true,
+    strict: false,
+    options: {
+      help: { type: "boolean", short: "h" }
+    }
+  });
+  return parsed.values.help === true;
+}
 function printHelp() {
   console.log(`datasette-ts