okengine 0.10.2 → 0.11.0

package/src/cli/load-config.images.test.ts

@@ -3,12 +3,46 @@
  */
 
 import { describe, expect, test } from "bun:test";
+import { flattenImagesConfig } from "../config/index.ts";
 import {
   defaultImagesFromConfig,
   resolveImages,
   dockerDevDriverMismatches,
 } from "./load-config.ts";
 
+describe("flattenImagesConfig", () => {
+  test("flattens store/channel nesting to dotted keys; flat roles pass through", () => {
+    expect(
+      flattenImagesConfig({
+        store: {
+          sql: "postgres:18-alpine",
+          kv: "redis:8-alpine",
+          files: "rustfs/rustfs:1.0.0",
+          index: "getmeili/meilisearch:v1.37",
+        },
+        channel: { email: "axllent/mailpit:v1.22.3" },
+        ai: "ollama/ollama:0.32.6",
+        pgdog: "ghcr.io/pgdogdev/pgdog:v0.1.51",
+        proxy: "caddy:2-alpine",
+      }),
+    ).toEqual({
+      "store.sql": "postgres:18-alpine",
+      "store.kv": "redis:8-alpine",
+      "store.files": "rustfs/rustfs:1.0.0",
+      "store.index": "getmeili/meilisearch:v1.37",
+      "channel.email": "axllent/mailpit:v1.22.3",
+      ai: "ollama/ollama:0.32.6",
+      pgdog: "ghcr.io/pgdogdev/pgdog:v0.1.51",
+      proxy: "caddy:2-alpine",
+    });
+  });
+
+  test("undefined / empty input yields empty map", () => {
+    expect(flattenImagesConfig(undefined)).toEqual({});
+    expect(flattenImagesConfig({})).toEqual({});
+  });
+});
+
 describe("defaultImagesFromConfig", () => {
   test("maps postgres + redis prod drivers", () => {
     const images = defaultImagesFromConfig({
@@ -67,7 +101,7 @@ describe("defaultImagesFromConfig", () => {
     expect(defaultImagesFromConfig({})).toEqual({});
     expect(
       defaultImagesFromConfig({
-        drivers: { store: { sql: { prod: "sqlite" } } },
+        drivers: { store: { sql: { prod: "memory" } } },
       }),
     ).toEqual({});
   });
@@ -82,7 +116,7 @@ describe("resolveImages", () => {
           kv: { prod: "redis" },
         },
       },
-      images: { "store.sql": "pgvector/pgvector:pg17" },
+      images: { store: { sql: "pgvector/pgvector:pg17" } },
     });
     expect(images).toEqual({ "store.sql": "pgvector/pgvector:pg17" });
   });
@@ -102,20 +136,20 @@ describe("resolveImages", () => {
 });
 
 describe("dockerDevDriverMismatches", () => {
-  test("flags docker/prod sqlite/memory when containers are up", () => {
+  test("flags dev pglite/memory when containers are up", () => {
     const mismatches = dockerDevDriverMismatches(
       {
         drivers: {
           store: {
-            sql: { local: "sqlite", docker: "sqlite", prod: "sqlite" },
-            kv: { local: "memory", docker: "memory", prod: "memory" },
+            sql: { dev: "pglite", test: "pglite", prod: "postgres" },
+            kv: { test: "memory", dev: "memory", prod: "memory" },
           },
         },
       },
       ["store.sql", "store.kv"],
     );
     expect(mismatches).toEqual([
-      { label: "sql", using: "sqlite", container: "postgres" },
+      { label: "sql", using: "pglite", container: "postgres" },
       { label: "kv", using: "memory", container: "redis" },
     ]);
   });
@@ -125,8 +159,8 @@ describe("dockerDevDriverMismatches", () => {
       {
         drivers: {
           store: {
-            sql: { local: "sqlite", docker: "postgres", prod: "postgres" },
-            kv: { local: "memory", docker: "redis", prod: "redis" },
+            sql: { dev: "postgres", test: "pglite", prod: "postgres" },
+            kv: { dev: "redis", test: "memory", prod: "redis" },
           },
         },
       },
@@ -140,8 +174,8 @@ describe("dockerDevDriverMismatches", () => {
       {
         drivers: {
           store: {
-            sql: { local: "sqlite", prod: "postgres" },
-            kv: { local: "memory", prod: "redis" },
+            sql: { dev: "postgres", test: "pglite", prod: "postgres" },
+            kv: { dev: "redis", test: "memory", prod: "redis" },
           },
         },
       },

package/src/cli/load-config.source.test.ts

@@ -0,0 +1,50 @@
+/**
+ * CLI rejects removed env keys / drivers in oke.config source.
+ */
+
+import { describe, expect, test } from "bun:test";
+import { mkdtemp, rm, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { assertOkeConfigSource, loadOkeConfig } from "./load-config.ts";
+
+describe("assertOkeConfigSource", () => {
+  test("rejects local: env keys", () => {
+    expect(() =>
+      assertOkeConfigSource(`drivers: { store: { sql: { local: "postgres" } } }`),
+    ).toThrow(`"local" is no longer a valid environment key in oke.config.ts.`);
+  });
+
+  test('rejects "sqlite" driver pins', () => {
+    expect(() => assertOkeConfigSource(`drivers: { store: { sql: { dev: "sqlite" } } }`)).toThrow(
+      `"sqlite" is no longer a valid driver in oke.config.ts.`,
+    );
+  });
+
+  test("allows modern three-key maps", () => {
+    expect(() =>
+      assertOkeConfigSource(`sql: { dev: "postgres", test: "pglite", prod: "postgres" }`),
+    ).not.toThrow();
+  });
+
+  test("does not false-positive on localhost", () => {
+    expect(() => assertOkeConfigSource(`url: "http://localhost:5432"`)).not.toThrow();
+  });
+});
+
+describe("loadOkeConfig source gate", () => {
+  test("fails before import when local: is present", async () => {
+    const dir = await mkdtemp(join(tmpdir(), "oke-cfg-local-"));
+    try {
+      await writeFile(
+        join(dir, "oke.config.ts"),
+        `export default { drivers: { store: { sql: { local: "postgres", test: "pglite", prod: "postgres" } } } };\n`,
+      );
+      await expect(loadOkeConfig(dir)).rejects.toThrow(
+        `"local" is no longer a valid environment key in oke.config.ts.`,
+      );
+    } finally {
+      await rm(dir, { recursive: true, force: true });
+    }
+  });
+});

package/src/cli/load-config.ts

@@ -3,7 +3,13 @@
  */
 
 import { resolve } from "node:path";
-import type { DriverRef, OkeConfig } from "../config/index.ts";
+import {
+  driverRefId,
+  flattenImagesConfig,
+  normalizeEnvDriverMap,
+  type EnvDriverInput,
+  type OkeConfig,
+} from "../config/index.ts";
 import type { Manifest } from "../manifest/types.ts";
 
 /** Default image pins when `images` is omitted but prod drivers need containers. */
@@ -11,27 +17,15 @@ const DEFAULT_SQL_IMAGE = "postgres:18-alpine";
 const DEFAULT_PGVECTOR_IMAGE = "pgvector/pgvector:pg17";
 const DEFAULT_PGDOG_IMAGE = "ghcr.io/pgdogdev/pgdog:v0.1.51";
 const DEFAULT_KV_IMAGE = "redis:8-alpine";
-const DEFAULT_VAULT_IMAGE = "openbao/openbao:2.6.1";
 
 /**
- * Extract protocol id from a driver ref.
+ * Prefer `dev` then `prod` for a driver map (compose infra ≈ production).
  *
- * @param ref - String or `{ driver }` object
+ * @param map - Env driver input (normalized first)
  */
-function driverId(ref: DriverRef | undefined): string | undefined {
-  if (ref === undefined) return undefined;
-  return typeof ref === "string" ? ref : ref.driver;
-}
-
-/**
- * Prefer `docker` then `prod` for a driver map (compose infra ≈ production).
- *
- * @param map - Env driver map
- */
-function dockerOrProdId(
-  map: { readonly docker?: DriverRef; readonly prod?: DriverRef } | undefined,
-): string | undefined {
-  return driverId(map?.docker) ?? driverId(map?.prod);
+function dockerOrProdId(map: EnvDriverInput | undefined): string | undefined {
+  const normalized = normalizeEnvDriverMap(map);
+  return driverRefId(normalized?.dev) ?? driverRefId(normalized?.prod);
 }
 
 /**
@@ -75,11 +69,6 @@ export function defaultImagesFromConfig(config: OkeConfig): Readonly<Record<stri
     out["store.kv"] = DEFAULT_KV_IMAGE;
   }
 
-  const vault = dockerOrProdId(config.drivers?.vault);
-  if (vault === "openbao") {
-    out.vault = DEFAULT_VAULT_IMAGE;
-  }
-
   return out;
 }
 
@@ -89,6 +78,21 @@ export interface LoadedConfig {
   readonly path: string;
 }
 
+/**
+ * Reject removed env keys / drivers in `oke.config.*` source.
+ * Migration is documented — no soft-compat rewrite.
+ *
+ * @param source - File contents
+ */
+export function assertOkeConfigSource(source: string): void {
+  if (/(^|[^\w.])local\s*:/.test(source)) {
+    throw new Error(`"local" is no longer a valid environment key in oke.config.ts.`);
+  }
+  if (/(["'])sqlite\1/.test(source)) {
+    throw new Error(`"sqlite" is no longer a valid driver in oke.config.ts.`);
+  }
+}
+
 /**
  * Load `oke.config.ts` (or `.js` / `.mts`) from a directory.
  *
@@ -110,6 +114,8 @@ export async function loadOkeConfig(
   for (const path of candidates) {
     const file = Bun.file(path);
     if (!(await file.exists())) continue;
+    const source = await file.text();
+    assertOkeConfigSource(source);
     const mod = (await import(path)) as { default?: OkeConfig };
     if (!mod.default || typeof mod.default !== "object") {
       throw new Error(`oke: ${path} must default-export defineConfig({...})`);
@@ -145,7 +151,7 @@ export function resolveImages(
   config?: OkeConfig,
   manifest?: Manifest,
 ): Readonly<Record<string, string>> {
-  const explicit = config?.images ?? manifest?.images;
+  const explicit = config?.images ? flattenImagesConfig(config.images) : manifest?.images;
   if (explicit && Object.keys(explicit).length > 0) return explicit;
   if (config) return defaultImagesFromConfig(config);
   return {};
@@ -174,14 +180,14 @@ export function dockerDevDriverMismatches(
 ): readonly StackDriverMismatch[] {
   const roles = new Set(stackRoles);
   const out: StackDriverMismatch[] = [];
-  const sqlDocker =
-    driverId(config.drivers?.store?.sql?.docker) ?? driverId(config.drivers?.store?.sql?.prod);
-  const kvDocker =
-    driverId(config.drivers?.store?.kv?.docker) ?? driverId(config.drivers?.store?.kv?.prod);
+  const sqlMap = normalizeEnvDriverMap(config.drivers?.store?.sql);
+  const kvMap = normalizeEnvDriverMap(config.drivers?.store?.kv);
+  const sqlDocker = driverRefId(sqlMap?.dev) ?? driverRefId(sqlMap?.prod);
+  const kvDocker = driverRefId(kvMap?.dev) ?? driverRefId(kvMap?.prod);
 
   if (
     roles.has("store.sql") &&
-    (sqlDocker === "sqlite" || sqlDocker === "memory" || sqlDocker === undefined)
+    (sqlDocker === "memory" || sqlDocker === "pglite" || sqlDocker === undefined)
   ) {
     out.push({
       label: "sql",

package/src/cli/meilisearch-local.ts

@@ -5,8 +5,7 @@
  * opts into the `meilisearch` store.index driver. This module:
  *
  *  - generates the master key once and persists it under `.oke/meilisearch/`
- *    (`0700` dir / `0600` file, atomic write — same material discipline as
- *    OpenBao, minus the init/unseal ceremony: a single static key),
+ *    (`0700` dir / `0600` file, atomic write — a single static key),
  *  - resolves the `meilisearch` binary from `PATH` (a documented prerequisite,
  *    like Docker for `--docker`; we never auto-download binaries),
  *  - spawns it via `Bun.spawn` with its own data dir + port, polls `/health`,

package/src/cli/mode.ts

@@ -1,65 +1,14 @@
 /**
- * `oke mode [local|docker]` — read or set the saved `oke dev` preference.
- * Setting a mode also syncs domain schema for that env (emit + push).
+ * `oke mode` — removed. `oke dev` always uses Docker Compose.
  */
 
-import { parseDevMode, readDevMode, writeDevMode, type DevMode } from "./dev-mode.ts";
-import { sqlDialectForEnv, syncDevSchema } from "./dev-schema-sync.ts";
-import { loadOkeConfig } from "./load-config.ts";
-
 /**
- * CLI entry for `oke mode`.
+ * CLI entry for deprecated `oke mode`.
  *
- * @param args - Args after `mode`
+ * @param _args - Ignored
  */
-export async function modeCli(args: readonly string[]): Promise<number> {
-  const cwd = process.cwd();
-  for (const a of args) {
-    if (a === "--help" || a === "-h") {
-      console.log(`oke mode [local|docker]
-
-Get or set the default infrastructure mode for \`oke dev\`
-(saved in .oke/mode). Setting a mode syncs domain schema for that env:
-emits schema.generated.ts for the active dialect, then runs \`oke db push\`.
-Data planes stay isolated — switching modes never copies rows.
-Session flags \`oke dev --local\` / \`oke dev --docker\` never change this
-preference.
-`);
-      return 0;
-    }
-  }
-
-  const positional = args.filter((a) => !a.startsWith("-"));
-  if (positional.length === 0) {
-    const saved = await readDevMode(cwd);
-    if (saved === null) {
-      console.log("oke mode: unset (default local until chosen)");
-      return 0;
-    }
-    console.log(saved);
-    return 0;
-  }
-
-  const next = parseDevMode(positional[0]);
-  if (next === null) {
-    console.error(`oke mode: expected local|docker, got ${JSON.stringify(positional[0])}`);
-    return 1;
-  }
-  await writeDevMode(cwd, next satisfies DevMode);
-
-  try {
-    const result = await syncDevSchema(cwd, next);
-    console.log(`oke mode: saved ${next} · dialect ${result.dialect}`);
-    return result.code;
-  } catch (err) {
-    const loaded = await loadOkeConfig(cwd).catch(() => null);
-    const dialect = loaded?.config
-      ? sqlDialectForEnv(loaded.config, next).dialect
-      : next === "docker"
-        ? "postgresql"
-        : "sqlite";
-    console.error(`oke mode: saved ${next} · dialect ${dialect}`);
-    console.error(err instanceof Error ? err.message : String(err));
-    return 1;
-  }
+export async function modeCli(_args: readonly string[]): Promise<number> {
+  void _args;
+  console.error("oke mode was removed — `oke dev` always uses Docker Compose");
+  return 1;
 }

package/src/cli/registry.ts

@@ -84,6 +84,27 @@ const HELP: CliFlag = {
   summary: "Show help",
 };
 
+const VAULT_KEY: CliFlag = {
+  long: "--key",
+  takesValue: true,
+  valueName: "base64|-",
+  summary: "Master key (`-` = stdin; else env / interactive prompt)",
+};
+
+const VAULT_NEW_KEY: CliFlag = {
+  long: "--new-key",
+  takesValue: true,
+  valueName: "base64|-",
+  summary: "New master key for resume (`-` = stdin)",
+};
+
+const VAULT_URL: CliFlag = {
+  long: "--url",
+  takesValue: true,
+  valueName: "url",
+  summary: "SQL URL (else DATABASE_URL)",
+};
+
 /**
  * Canonical `oke` command catalogue.
  *
@@ -93,24 +114,19 @@ const HELP: CliFlag = {
 export const OKE_COMMANDS: readonly CliCommand[] = [
   {
     name: "dev",
-    summary: "watch · hot reload · Console · client types",
+    summary: "watch · hot reload · Console · client types (Docker Compose)",
     leaf: true,
     flags: [
-      {
-        long: "--local",
-        short: "-l",
-        summary: "Session-only local mode (in-memory; no compose)",
-      },
       {
         long: "--docker",
         short: "-d",
         takesValue: true,
         valueName: "roles",
-        summary: "Session-only docker compose (optional role list)",
+        summary: "Optional compose role filter (default: all roles)",
       },
       {
         long: "--no-db-push",
-        summary: "Disable auto `oke db push` on schema change (local)",
+        summary: "Disable auto `oke db push` on schema change",
       },
       ENTRY,
       HELP,
@@ -118,7 +134,13 @@ export const OKE_COMMANDS: readonly CliCommand[] = [
   },
   {
     name: "mode",
-    summary: "get/set default oke dev mode (local|docker)",
+    summary: "deprecated — oke dev always uses Docker Compose",
+    leaf: true,
+    flags: [HELP],
+  },
+  {
+    name: "test",
+    summary: "run bun test with PGLite test posture",
     leaf: true,
     flags: [HELP],
   },
@@ -182,11 +204,11 @@ export const OKE_COMMANDS: readonly CliCommand[] = [
   },
   {
     name: "schema",
-    summary: "core + plugin tables → schema/oke.ts",
+    summary: "core + plugin tables → .oke/schema/oke.ts",
     subcommands: [
       {
         name: "generate",
-        summary: "Emit schema/oke.ts",
+        summary: "Emit .oke/schema/oke.ts",
         flags: [
           {
             long: "--check",
@@ -202,7 +224,7 @@ export const OKE_COMMANDS: readonly CliCommand[] = [
   },
   {
     name: "db",
-    summary: "domain schema — push · generate · migrate · seed",
+    summary: "domain schema — push · generate · migrate · seed · studio",
     subcommands: [
       {
         name: "push",
@@ -219,7 +241,7 @@ export const OKE_COMMANDS: readonly CliCommand[] = [
             long: "--env",
             takesValue: true,
             valueName: "name",
-            summary: "Config env (local|docker|test|prod)",
+            summary: "Config env (dev|test|prod)",
           },
           HELP,
         ],
@@ -239,7 +261,7 @@ export const OKE_COMMANDS: readonly CliCommand[] = [
             long: "--env",
             takesValue: true,
             valueName: "name",
-            summary: "Config env (local|docker|test|prod)",
+            summary: "Config env (dev|test|prod)",
           },
           HELP,
         ],
@@ -259,7 +281,7 @@ export const OKE_COMMANDS: readonly CliCommand[] = [
             long: "--env",
             takesValue: true,
             valueName: "name",
-            summary: "Config env (local|docker|test|prod)",
+            summary: "Config env (dev|test|prod)",
           },
           HELP,
         ],
@@ -272,7 +294,7 @@ export const OKE_COMMANDS: readonly CliCommand[] = [
             long: "--env",
             takesValue: true,
             valueName: "name",
-            summary: "Config env (local|docker|test|prod)",
+            summary: "Config env (dev|test|prod)",
           },
           {
             long: "--force",
@@ -282,6 +304,26 @@ export const OKE_COMMANDS: readonly CliCommand[] = [
           HELP,
         ],
       },
+      {
+        name: "studio",
+        summary: "Open drizzle-kit Studio (long-running)",
+        flags: [
+          {
+            long: "--config",
+            short: "-c",
+            takesValue: true,
+            valueName: "path",
+            summary: "drizzle.config.ts path",
+          },
+          {
+            long: "--env",
+            takesValue: true,
+            valueName: "name",
+            summary: "Config env (dev|test|prod)",
+          },
+          HELP,
+        ],
+      },
     ],
   },
   {
@@ -298,7 +340,7 @@ export const OKE_COMMANDS: readonly CliCommand[] = [
   },
   {
     name: "vault",
-    summary: "set · list · import · key rotate",
+    summary: "secrets — set · list · seal/unseal · rotate · audit · backup",
     subcommands: [
       {
         name: "set",
@@ -319,6 +361,96 @@ export const OKE_COMMANDS: readonly CliCommand[] = [
         positionals: "rotate",
         flags: [HELP],
       },
+      {
+        name: "init",
+        summary: "Create the builtin vault; print the master key once",
+        flags: [VAULT_URL, HELP],
+      },
+      {
+        name: "status",
+        summary: "Seal state · KEK generation · secret count",
+        flags: [VAULT_KEY, VAULT_URL, JSON_FLAG, HELP],
+      },
+      {
+        name: "seal",
+        summary: "Drop the master key; reads fail until unsealed",
+        flags: [VAULT_URL, HELP],
+      },
+      {
+        name: "unseal",
+        summary: "Verify the master key and clear the sealed flag",
+        flags: [VAULT_KEY, VAULT_URL, HELP],
+      },
+      {
+        name: "rotate",
+        summary: "New version of a secret under a fresh data key",
+        positionals: "<path> [value]",
+        flags: [VAULT_KEY, VAULT_URL, HELP],
+      },
+      {
+        name: "rotate-master",
+        summary: "New master key; re-wrap every data key",
+        flags: [VAULT_KEY, VAULT_NEW_KEY, VAULT_URL, HELP],
+      },
+      {
+        name: "audit",
+        summary: "Read · verify · purge the tamper-evident chain",
+        positionals: "[verify|purge]",
+        flags: [
+          {
+            long: "--limit",
+            takesValue: true,
+            valueName: "n",
+            summary: "Rows to show (default 50)",
+          },
+          {
+            long: "--path",
+            takesValue: true,
+            valueName: "path",
+            summary: "Restrict to one secret path",
+          },
+          {
+            long: "--before",
+            takesValue: true,
+            valueName: "iso",
+            summary: "Purge rows older than this instant",
+          },
+          VAULT_URL,
+          JSON_FLAG,
+          HELP,
+        ],
+      },
+      {
+        name: "purge-expired",
+        summary: "Hard-delete secret rows past expires_at",
+        flags: [
+          VAULT_KEY,
+          VAULT_URL,
+          {
+            long: "--dry-run",
+            summary: "Count expired rows without deleting",
+          },
+          {
+            long: "--before",
+            takesValue: true,
+            valueName: "iso",
+            summary: "Exclusive upper bound (default: now)",
+          },
+          HELP,
+        ],
+      },
+      {
+        name: "backup",
+        summary: "Write every live secret as one encrypted bundle",
+        positionals: "<file>",
+        flags: [VAULT_KEY, VAULT_URL, HELP],
+      },
+      {
+        name: "restore",
+        summary: "Replay a bundle as new versions",
+        positionals: "<file>",
+        flags: [VAULT_KEY, VAULT_URL, HELP],
+      },
     ],
   },
   {
@@ -549,7 +681,15 @@ export const OKE_COMMANDS: readonly CliCommand[] = [
  * @returns Help text (no trailing exit-code block)
  */
 export function formatOkeHelp(): string {
-  const lines = ["oke — okengine CLI", "", "Commands:"];
+  const lines = [
+    "oke — okengine CLI",
+    "",
+    "  oke              Interactive TUI (TTY). Non-TTY prints this help.",
+    "  oke --tui        Force the interactive TUI",
+    "  oke --help       This command list",
+    "",
+    "Commands:",
+  ];
   for (const cmd of OKE_COMMANDS) {
     const usage = formatCommandUsage(cmd);
     lines.push(`  ${pad(usage, 34)} ${cmd.summary}`);
@@ -608,7 +748,7 @@ function formatCommandUsage(cmd: CliCommand): string {
     return `oke ${cmd.name} ${sub.name}${pos}${flagHint ? ` ${flagHint}` : ""}`;
   }
   if (cmd.subcommands && cmd.subcommands.length > 1) {
-    const subs = cmd.subcommands.map((s) => s.name).join("|");
+    const subs = summarizeSubcommands(cmd.subcommands);
     // Prefer shared JSON flag hint when every list-like sub supports it.
     const jsonHint = cmd.subcommands.some((s) => s.flags?.some((f) => f.long === "--json"))
       ? " [--json|-j]"
@@ -624,6 +764,22 @@ function formatCommandUsage(cmd: CliCommand): string {
   return `oke ${cmd.name}${pos}${flagHint ? ` ${flagHint}` : ""}`;
 }
 
+/** Longest `a|b|c` sub list the one-line help layout can carry. */
+const MAX_SUBCOMMAND_HINTS = 4;
+
+/**
+ * Join subcommand names for the one-line usage, eliding a long tail.
+ *
+ * Commands with a large surface (`vault`) would otherwise push the summary
+ * column off screen; the full list still reaches completion and `--help`.
+ *
+ * @param subs - Subcommands in registry order
+ */
+function summarizeSubcommands(subs: readonly CliSubcommand[]): string {
+  const shown = subs.slice(0, MAX_SUBCOMMAND_HINTS).map((s) => s.name);
+  return subs.length > MAX_SUBCOMMAND_HINTS ? `${shown.join("|")}|…` : shown.join("|");
+}
+
 function formatFlagHint(f: CliFlag): string {
   const name = f.short ? `${f.long}|${f.short}` : f.long;
   if (f.takesValue) {