airfoil 0.1.1 → 0.3.0

package/src/commands/sql.ts

@@ -1,33 +1,33 @@
 import { readFileSync } from "node:fs";
-import { ArrowFlightSqlClient } from "@airfoil/flight";
 import * as p from "@clack/prompts";
-import { Args, Command, Options } from "@effect/cli";
+import { ArrowFlightSqlClient } from "@useairfoil/flight";
 import { printTable } from "console-table-printer";
 import { Effect, Option } from "effect";
+import { Argument, Command, Flag } from "effect/unstable/cli";
 import { Metadata } from "nice-grpc-common";
 import { handleCliError } from "../utils/effect.js";
 import { hostOption, portOption } from "../utils/options.js";
 
-const queryArg = Args.text({ name: "query" }).pipe(
-  Args.withDescription("SQL query to execute"),
-  Args.optional,
+const queryArg = Argument.string("query").pipe(
+  Argument.withDescription("SQL query to execute"),
+  Argument.optional,
 );
 
-const fileOption = Options.text("file").pipe(
-  Options.withAlias("f"),
-  Options.withDescription("Execute SQL from file"),
-  Options.optional,
+const fileOption = Flag.string("file").pipe(
+  Flag.withAlias("f"),
+  Flag.withDescription("Execute SQL from file"),
+  Flag.optional,
 );
 
-const namespaceOption = Options.text("namespace").pipe(
-  Options.withAlias("n"),
-  Options.withDescription("Wings namespace"),
-  Options.withDefault("tenants/default/namespaces/default"),
+const namespaceOption = Flag.string("namespace").pipe(
+  Flag.withAlias("n"),
+  Flag.withDescription("Wings namespace"),
+  Flag.withDefault("tenants/default/namespaces/default"),
 );
 
-const jsonOption = Options.boolean("json").pipe(
-  Options.withDescription("Output results as JSON"),
-  Options.withDefault(false),
+const jsonOption = Flag.boolean("json").pipe(
+  Flag.withDescription("Output results as JSON"),
+  Flag.withDefault(false),
 );
 
 export const sqlCommand = Command.make(
@@ -117,5 +117,5 @@ export const sqlCommand = Command.make(
         }
         p.outro("✓ Done");
       });
-    }).pipe(Effect.catchAll(handleCliError("Command failed"))),
+    }).pipe(Effect.catch(handleCliError("Command failed"))),
 ).pipe(Command.withDescription("Execute SQL queries using Arrow Flight SQL"));

package/src/index.ts

@@ -1,18 +1,20 @@
 #!/usr/bin/env bun
-import { Command } from "@effect/cli";
-import { NodeContext, NodeRuntime } from "@effect/platform-node";
+import { NodeRuntime, NodeServices } from "@effect/platform-node";
 import { Effect } from "effect";
+import { Command } from "effect/unstable/cli";
+import packageJson from "../package.json";
 import { clusterCommand } from "./commands/cluster/index.js";
 import { devCommand } from "./commands/dev.js";
 import { sqlCommand } from "./commands/sql.js";
 
+const version = packageJson.version;
+
 const program = Command.make("airfoil", {}, () => Effect.void).pipe(
   Command.withSubcommands([devCommand, sqlCommand, clusterCommand]),
 );
 
 const cli = Command.run(program, {
-  name: "Airfoil CLI - Manage your Wings deployments",
-  version: "0.1.0",
+  version,
 });
 
-cli(process.argv).pipe(Effect.provide(NodeContext.layer), NodeRuntime.runMain);
+cli.pipe(Effect.provide(NodeServices.layer), NodeRuntime.runMain);

package/src/utils/client.ts

@@ -1,4 +1,4 @@
-import { WingsClusterMetadata } from "@airfoil/wings";
+import { WingsClusterMetadata } from "@useairfoil/wings";
 
 export const makeClusterMetadataLayer = (host: string, port: number) =>
   WingsClusterMetadata.layer({

package/src/utils/options.ts

@@ -1,36 +1,37 @@
-import { Options } from "@effect/cli";
+import { Flag } from "effect/unstable/cli";
 
 /**
  * Common server connection options
  */
-export const hostOption = Options.text("host").pipe(
-  Options.withDescription("Server host"),
-  Options.withDefault("localhost"),
+export const hostOption = Flag.string("host").pipe(
+  Flag.withDescription("Server host"),
+  Flag.withDefault("localhost"),
 );
 
-export const portOption = Options.integer("port").pipe(
-  Options.withDescription("Server port"),
-  Options.withAlias("p"),
-  Options.withDefault(7777),
+export const portOption = Flag.integer("port").pipe(
+  Flag.withDescription("Server port"),
+  Flag.withAlias("p"),
+  Flag.withDefault(7777),
 );
 
 /**
  * Common pagination options
  */
-export const pageSizeOption = Options.integer("page-size").pipe(
-  Options.withDescription("Number of items to return (max: 1000)"),
-  Options.withDefault(100),
+export const pageSizeOption = Flag.integer("page-size").pipe(
+  Flag.withDescription("Number of items to return (max: 1000)"),
+  Flag.withDefault(100),
 );
 
-export const pageTokenOption = Options.text("page-token").pipe(
-  Options.withDescription("Continuation token for pagination"),
-  Options.optional,
+export const pageTokenOption = Flag.optional(
+  Flag.string("page-token").pipe(
+    Flag.withDescription("Continuation token for pagination"),
+  ),
 );
 
 /**
  * Force flag for destructive operations
  */
-export const forceOption = Options.boolean("force").pipe(
-  Options.withDescription("Skip confirmation prompt"),
-  Options.withDefault(false),
+export const forceOption = Flag.boolean("force").pipe(
+  Flag.withDescription("Skip confirmation prompt"),
+  Flag.withDefault(false),
 );