@saws/cli 2.0.0-beta.0 → 2.0.0-beta.11

package/dist/commands/host/index.js

@@ -1,10 +1,32 @@
 import { Command } from "commander";
 import { configureHostCommand } from "./command.js";
+import { createHostCommand } from "./create.js";
+import { importHostKeyCommand } from "./import-key.js";
 export const createCommand = () => new Command("host")
     .description("configure deployment hosts")
+    .addCommand(new Command("create")
+    .description("create a global deployment host")
+    .argument("<name>", "global host name")
+    .requiredOption("--address <address>", "host name or IP address")
+    .requiredOption("--user <deployment-user>", "persistent deployment account")
+    .option("--ssh-port <port>", "SSH port")
+    .option("--platform <platform>", 'Docker platform such as "linux/amd64"')
+    .option("--exposure <mode>", 'network exposure policy: "tunnel" or "public"')
+    .option("--allowed-tcp-port <port...>", "public TCP ports allowed by the host firewall")
+    .action(createHostCommand))
+    .addCommand(new Command("key")
+    .description("manage global host deployment keys")
+    .addCommand(new Command("import")
+    .description("import an existing private key into encrypted global storage")
+    .argument("<name>", "global host name")
+    .requiredOption("--file <path>", "path to an SSH private key")
+    .option("--force", "replace an existing deployment key")
+    .action(importHostKeyCommand)))
     .addCommand(new Command("configure")
-    .description("install Docker and apply the configured security policy")
+    .description("bootstrap a deployment user and apply host security policy")
     .argument("[name]", "host name; optional when exactly one host exists")
-    .option("--config <string>", "path to service definition")
-    .option("--dry-run", "print the remote configuration command")
+    .requiredOption("--user <bootstrap-user>", "existing SSH account used for initial configuration")
+    .option("--config <path>", "path to saws.ts")
+    .option("--global", "configure a host from the global host registry")
+    .option("--dry-run", "describe configuration without making changes")
     .action(configureHostCommand));

package/dist/commands/init/command.d.ts

@@ -1,7 +1 @@
-export interface InitCommandOptions {
-    rootDir?: string;
-    config?: string;
-    dryRun?: boolean;
-}
-export declare function initCommand(serviceName: string, path: string | undefined, options: InitCommandOptions): Promise<void>;
-//# sourceMappingURL=command.d.ts.map
+export declare const initCommand: (serviceName?: string, configPath?: string) => Promise<void>;

package/dist/commands/init/command.js

@@ -1,15 +1,24 @@
-import { findServiceDefinition, getSawsConfig, InitContext, } from "@saws/core";
-export async function initCommand(serviceName, path, options) {
-    const rootDir = options.rootDir ?? process.cwd();
-    const rootService = await getSawsConfig(options.config ?? path);
-    const service = findServiceDefinition(rootService, serviceName);
-    await service.init(new InitContext({
-        stage: "local",
-        rootDir,
-        dryRun: options.dryRun ?? false,
-        env: process.env,
-        logSink: ({ stream, chunk }) => {
-            (stream === "stderr" ? process.stderr : process.stdout).write(chunk);
-        },
-    }));
-}
+import path from "node:path";
+import fs from "node:fs/promises";
+import { findServiceDefinition, getSawsConfig } from "@saws/core";
+import { installDependencies } from "@saws/core/utils/dependency-management";
+import { createFileIfNotExists } from "@saws/core/utils/create-file-if-not-exists";
+import { sawsTsTemplate } from "./templates/saws-ts.template.js";
+import { tsconfigJsonTemplate } from "./templates/tsconfig-json.template.js";
+import { gitignoreTemplate } from "./templates/gitignore.template.js";
+export const initCommand = async (serviceName, configPath) => {
+    if (serviceName != null) {
+        const serviceDefinition = await getSawsConfig(configPath);
+        await findServiceDefinition(serviceDefinition, serviceName).init();
+        return;
+    }
+    const name = path.parse(path.resolve(".")).name;
+    // not used for now
+    await installDependencies([]);
+    await installDependencies(["@saws/core", "typescript", "@tsconfig/node26"], {
+        development: true,
+    });
+    await fs.writeFile("./tsconfig.json", tsconfigJsonTemplate(), {});
+    await createFileIfNotExists("./saws.ts", sawsTsTemplate({ name }));
+    await createFileIfNotExists("./.gitignore", gitignoreTemplate());
+};

package/dist/commands/init/index.d.ts

@@ -1,3 +1,2 @@
 import { Command } from "commander";
 export declare const createCommand: () => Command;
-//# sourceMappingURL=index.d.ts.map

package/dist/commands/init/index.js

@@ -1,10 +1,6 @@
 import { Command } from "commander";
 import { initCommand } from "./command.js";
 export const createCommand = () => new Command("init")
-    .description("bootstrap one configured service and its dependencies")
-    .argument("<service>", "name of the service to initialize")
+    .argument("[service]", "name of the service to initialize")
     .argument("[config]", "path to service definition")
-    .option("--root-dir <string>", "project root used for generated files")
-    .option("--config <string>", "path to service definition")
-    .option("--dry-run", "allow service initializers to preview their changes")
     .action(initCommand);

package/dist/commands/init/templates/gitignore.template.d.ts

@@ -0,0 +1 @@
+export declare const gitignoreTemplate: () => string;

package/dist/commands/init/templates/gitignore.template.js

@@ -0,0 +1,4 @@
+export const gitignoreTemplate = () => `node_modules
+.saws/saws-*-local-output.json
+.saws/.secrets
+.DS_Store`;

package/dist/commands/init/templates/saws-ts.template.d.ts

@@ -0,0 +1,3 @@
+export declare const sawsTsTemplate: ({ name }: {
+    name: string;
+}) => string;

package/dist/commands/init/templates/saws-ts.template.js

@@ -0,0 +1,7 @@
+export const sawsTsTemplate = ({ name }) => `import { ServiceDefinition } from "@saws/core";
+
+export default new ServiceDefinition({
+  name: "${name}",
+  dependencies: [],
+});
+`;

package/dist/commands/init/templates/tsconfig-json.template.d.ts

@@ -0,0 +1 @@
+export declare const tsconfigJsonTemplate: () => string;

package/dist/commands/init/templates/tsconfig-json.template.js

@@ -0,0 +1,4 @@
+export const tsconfigJsonTemplate = () => /* json */ `{
+  "extends": "@tsconfig/node26/tsconfig.json",
+  "files": []
+}`;

package/dist/commands/logs/command.d.ts

@@ -0,0 +1,5 @@
+export interface LogsCommandOptions {
+    config?: string;
+    stage: string;
+}
+export declare const logsCommand: (serviceName: string | undefined, options: LogsCommandOptions) => Promise<void>;

package/dist/commands/logs/command.js

@@ -0,0 +1,19 @@
+import { findServiceDefinition, getSawsConfig } from "@saws/core";
+export const logsCommand = async (serviceName, options) => {
+    const { config, stage } = options;
+    if (stage == null || stage.length === 0) {
+        throw new Error("logs requires --stage <string>");
+    }
+    if (stage === "local")
+        return;
+    process.env.STAGE = stage;
+    const serviceDefinition = await getSawsConfig(config);
+    if (serviceName != null) {
+        await findServiceDefinition(serviceDefinition, serviceName).logs(stage);
+        return;
+    }
+    await Promise.all(collectServices(serviceDefinition).map((service) => service.logs(stage)));
+};
+function collectServices(root) {
+    return [...new Set(root.getAllDependencies())];
+}

package/dist/commands/logs/index.d.ts

@@ -0,0 +1,2 @@
+import { Command } from "commander";
+export declare const createCommand: () => Command;

package/dist/commands/logs/index.js

@@ -0,0 +1,7 @@
+import { Command } from "commander";
+import { logsCommand } from "./command.js";
+export const createCommand = () => new Command("logs")
+    .option("--stage <string>", "stage to tail logs from")
+    .option("--config <path>", "path to service definition")
+    .argument("[service]", "name of the service to tail logs from")
+    .action(logsCommand);

package/dist/commands/secrets/command.d.ts

@@ -1,8 +1,8 @@
 export interface SecretsCommandOptions {
+    config?: string;
     stage?: string;
+    global?: boolean;
     set?: string;
     get?: boolean;
-    rootDir?: string;
 }
 export declare function secretsCommand(name: string, options: SecretsCommandOptions): Promise<void>;
-//# sourceMappingURL=command.d.ts.map

package/dist/commands/secrets/command.js

@@ -1,16 +1,28 @@
-import { SecretsManager } from "@saws/secrets";
+import { getSawsConfigModule, SecretsManager } from "@saws/core";
 export async function secretsCommand(name, options) {
-    const manager = new SecretsManager({
-        stage: options.stage ?? "local",
-        rootDir: options.rootDir ?? process.cwd(),
-    });
+    const value = options.set;
+    if (options.get && value != null) {
+        throw new Error("secrets accepts only one of --get or --set <value>");
+    }
+    if (!options.get && value == null) {
+        throw new Error("secrets requires either --get or --set <value>");
+    }
+    if (!options.global) {
+        process.env.STAGE = options.stage ?? "local";
+    }
+    const config = await getSawsConfigModule(options.config);
+    const manager = config.secrets;
+    if (!(manager instanceof SecretsManager)) {
+        throw new Error('saws.ts must export a SecretsManager instance named "secrets"');
+    }
+    const secrets = options.global ? manager.global : manager;
     if (options.get) {
-        console.log(await manager.get(name));
+        console.log(await secrets.get(name));
         return;
     }
-    if (options.set == null) {
-        throw new Error("secrets requires either --get or --set <value>");
+    if (value == null) {
+        throw new Error("secrets requires --set <value>");
     }
-    await manager.set(name, options.set);
+    await secrets.set(name, value);
     console.log("Set secret");
 }

package/dist/commands/secrets/index.d.ts

@@ -1,3 +1,2 @@
 import { Command } from "commander";
 export declare const createCommand: () => Command;
-//# sourceMappingURL=index.d.ts.map

package/dist/commands/secrets/index.js

@@ -1,9 +1,11 @@
 import { Command } from "commander";
 import { secretsCommand } from "./command.js";
 export const createCommand = () => new Command("secrets")
-    .argument("<string>", "secret name")
-    .option("--stage <string>", "stage", "local")
-    .option("--set <string>", "set secret value")
-    .option("--get", "get secret value")
-    .option("--root-dir <string>", "project root used for local secrets")
+    .description("get or set encrypted project secrets")
+    .argument("<name>", "secret name")
+    .option("--stage <string>", "stage for a stage-scoped secret", "local")
+    .option("--global", "use the global secret scope")
+    .option("--set <string>", "set the secret value")
+    .option("--get", "get the secret value")
+    .option("--config <string>", "path to service definition")
     .action(secretsCommand);

package/dist/hosts.d.ts

@@ -1,4 +1,2 @@
-import { Host } from "@saws/host";
-import type { ServiceDefinition } from "@saws/core";
+import { Host, type ServiceDefinition } from "@saws/core";
 export declare function findConfiguredHosts(root: ServiceDefinition): Host[];
-//# sourceMappingURL=hosts.d.ts.map

package/dist/hosts.js

@@ -1,16 +1,17 @@
-import { Host } from "@saws/host";
+import { Host } from "@saws/core";
 export function findConfiguredHosts(root) {
     const hosts = new Set();
-    const visited = new Set();
-    const visit = (service) => {
-        if (visited.has(service))
+    const visited = new WeakSet();
+    const visit = (value) => {
+        if (value == null || typeof value !== "object" || visited.has(value))
             return;
-        visited.add(service);
-        const host = service.docker?.host;
-        if (host instanceof Host)
-            hosts.add(host);
-        for (const dependency of service.dependencies)
-            visit(dependency);
+        visited.add(value);
+        if (value instanceof Host) {
+            hosts.add(value);
+            return;
+        }
+        for (const child of Object.values(value))
+            visit(child);
     };
     visit(root);
     return [...hosts];

package/package.json

@@ -1,34 +1,24 @@
 {
   "name": "@saws/cli",
-  "version": "2.0.0-beta.0",
-  "description": "Command-line interface for SAWS",
+  "version": "2.0.0-beta.11",
+  "description": "",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/shichongrui/saws.git",
-    "directory": "packages/cli"
+    "url": "git+https://github.com/shichongrui/saws.git"
   },
-  "type": "module",
   "bin": {
-    "saws": "dist/bin/saws.js"
+    "saws": "./dist/bin/saws.js"
   },
   "files": [
-    "dist"
+    "./dist"
   ],
-  "scripts": {
-    "prebuild": "node -e \"fs.rmSync('dist', { recursive: true, force: true })\"",
-    "build": "tsc -p tsconfig.json",
-    "postbuild": "chmod +x dist/bin/saws.js",
-    "test": "npm run build && node --test dist/commands/**/*.test.js",
-    "typecheck": "tsc -p tsconfig.json --noEmit"
-  },
+  "type": "module",
   "dependencies": {
-    "@saws/core": "2.0.0-beta.0",
-    "@saws/host": "2.0.0-beta.0",
-    "@saws/secrets": "2.0.0-beta.0",
-    "commander": "^14.0.3"
+    "@saws/core": "2.0.0-beta.11",
+    "commander": "^15.0.0",
+    "find-package-json": "^1.2.0"
   },
   "devDependencies": {
-    "@types/node": "^20.11.19",
-    "typescript": "^5.3.3"
+    "@types/find-package-json": "^1.2.7"
   }
 }

package/dist/bin/saws.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"saws.d.ts","sourceRoot":"","sources":["../../src/bin/saws.ts"],"names":[],"mappings":""}

package/dist/commands/deploy/command.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../../src/commands/deploy/command.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,oBAAoB;IACnC,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,wBAAsB,aAAa,CACjC,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,OAAO,EAAE,oBAAoB,iBA2B9B"}

package/dist/commands/deploy/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/deploy/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAGpC,eAAO,MAAM,aAAa,eAOA,CAAC"}

package/dist/commands/dev/command.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../../src/commands/dev/command.ts"],"names":[],"mappings":"AAUA,MAAM,WAAW,iBAAiB;IAChC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,wBAAsB,UAAU,CAC9B,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,OAAO,EAAE,iBAAiB,iBAoD3B"}

package/dist/commands/dev/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/dev/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAGpC,eAAO,MAAM,aAAa,eAMH,CAAC"}

package/dist/commands/dev/tui/dev-tui.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"dev-tui.d.ts","sourceRoot":"","sources":["../../../../src/commands/dev/tui/dev-tui.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAmB,cAAc,EAAE,MAAM,YAAY,CAAC;AAkBlE,qBAAa,MAAM;IACjB,QAAQ,CAAC,OAAO,EAAE,cAAc,CAAiC;IAEjE,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAW;IACpC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAiC;IACtD,OAAO,CAAC,aAAa,CAAK;IAC1B,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,eAAe,CAAS;IAChC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAQ;gBAErB,QAAQ,EAAE,MAAM,EAAE;IAQ9B,KAAK;IAkBL,IAAI;IAUJ,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,GAAE,QAAQ,GAAG,QAAmB;IAStE,OAAO,CAAC,cAAc,CAqBpB;IAEF,OAAO,CAAC,MAAM;IAkBd,OAAO,CAAC,MAAM,CA6BZ;CACH"}

package/dist/commands/host/command.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../../src/commands/host/command.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAGvC,MAAM,WAAW,2BAA2B;IAC1C,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,OAAO,EAAE,2BAA2B,iBAOrC;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,IAAI,CAAC,EAAE,MAAM,QAmBtD"}

package/dist/commands/host/command.test.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=command.test.d.ts.map

package/dist/commands/host/command.test.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"command.test.d.ts","sourceRoot":"","sources":["../../../src/commands/host/command.test.ts"],"names":[],"mappings":""}

package/dist/commands/host/command.test.js

@@ -1,13 +0,0 @@
-import assert from "node:assert/strict";
-import test from "node:test";
-import { Host } from "@saws/host";
-import { selectHost } from "./command.js";
-const first = new Host({ name: "first", address: "first.example.test" });
-const second = new Host({ name: "second", address: "second.example.test" });
-test("selects the only configured host when its name is omitted", () => {
-    assert.equal(selectHost([first]), first);
-});
-test("requires a valid name when several hosts are configured", () => {
-    assert.throws(() => selectHost([second, first]), /Host name is required\. Available hosts: first, second/);
-    assert.throws(() => selectHost([first, second], "missing"), /Host "missing" was not found\. Available hosts: first, second/);
-});

package/dist/commands/host/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/host/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAGpC,eAAO,MAAM,aAAa,eAUrB,CAAC"}

package/dist/commands/init/command.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../../src/commands/init/command.ts"],"names":[],"mappings":"AAMA,MAAM,WAAW,kBAAkB;IACjC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,wBAAsB,WAAW,CAC/B,WAAW,EAAE,MAAM,EACnB,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,OAAO,EAAE,kBAAkB,iBAiB5B"}

package/dist/commands/init/command.test.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=command.test.d.ts.map

package/dist/commands/init/command.test.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"command.test.d.ts","sourceRoot":"","sources":["../../../src/commands/init/command.test.ts"],"names":[],"mappings":""}

package/dist/commands/init/command.test.js

@@ -1,40 +0,0 @@
-import assert from "node:assert/strict";
-import { mkdtemp, readFile, writeFile } from "node:fs/promises";
-import os from "node:os";
-import path from "node:path";
-import test from "node:test";
-import { pathToFileURL } from "node:url";
-import { initCommand } from "./command.js";
-test("initializes only the selected service branch in dependency order", async () => {
-    const directory = await mkdtemp(path.join(os.tmpdir(), "saws-init-"));
-    const configPath = path.join(directory, "saws.mjs");
-    const packageUrl = pathToFileURL(path.resolve("../core/dist/index.js")).href;
-    await writeFile(configPath, `
-      import { appendFile } from "node:fs/promises";
-      import path from "node:path";
-      import { ServiceDefinition } from ${JSON.stringify(packageUrl)};
-
-      class InitializableService extends ServiceDefinition {
-        async onInit(context) {
-          await appendFile(path.join(context.rootDir, "initialized.txt"), this.name + "\\n");
-        }
-      }
-
-      const shared = new InitializableService({ name: "shared" });
-      const api = new InitializableService({
-        name: "api",
-        dependencies: [shared],
-      });
-      const worker = new InitializableService({ name: "worker" });
-
-      export default new InitializableService({
-        name: "app",
-        dependencies: [api, worker],
-      });
-    `);
-    await initCommand("api", undefined, {
-        config: configPath,
-        rootDir: directory,
-    });
-    assert.equal(await readFile(path.join(directory, "initialized.txt"), "utf8"), "shared\napi\n");
-});

package/dist/commands/init/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/init/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAGpC,eAAO,MAAM,aAAa,eAQF,CAAC"}

package/dist/commands/secrets/command.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../../src/commands/secrets/command.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,qBAAqB;IACpC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,wBAAsB,cAAc,CAClC,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,qBAAqB,iBAkB/B"}

package/dist/commands/secrets/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/secrets/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAGpC,eAAO,MAAM,aAAa,eAOC,CAAC"}

package/dist/hosts.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"hosts.d.ts","sourceRoot":"","sources":["../src/hosts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAClC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAEpD,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,iBAAiB,UAkB1D"}