@dbx-tools/cli-args 0.9.105 → 0.9.108

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/index.ts CHANGED
@@ -3,7 +3,7 @@
3
3
  // Hand edits are overwritten on the next watch; this file is read-only.
4
4
 
5
5
  export const PACKAGE_IDENTIFIER = "@dbx-tools/cli-args";
6
- export const PACKAGE_VERSION = "0.9.105";
6
+ export const PACKAGE_VERSION = "0.9.108";
7
7
  export * as args from "./src/args.ts";
8
- export type { CliArgsOptions, CliArgMeta, ArgumentSource } from "./src/args.ts";
8
+ export type { CliArgsOptions, CliArgMeta, CliObjectSchema, ArgumentSource } from "./src/args.ts";
9
9
  export * from "./exports.ts";
package/lib/index.d.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  export declare const PACKAGE_IDENTIFIER = "@dbx-tools/cli-args";
2
- export declare const PACKAGE_VERSION = "0.9.105";
2
+ export declare const PACKAGE_VERSION = "0.9.108";
3
3
  export * as args from "./src/args.ts";
4
- export type { CliArgsOptions, CliArgMeta, ArgumentSource } from "./src/args.ts";
4
+ export type { CliArgsOptions, CliArgMeta, CliObjectSchema, ArgumentSource } from "./src/args.ts";
5
5
  export * from "./exports.ts";
package/lib/index.js CHANGED
@@ -2,7 +2,7 @@
2
2
  // Regenerated from the exporting modules in ./src.
3
3
  // Hand edits are overwritten on the next watch; this file is read-only.
4
4
  export const PACKAGE_IDENTIFIER = "@dbx-tools/cli-args";
5
- export const PACKAGE_VERSION = "0.9.105";
5
+ export const PACKAGE_VERSION = "0.9.108";
6
6
  export * as args from "./src/args.js";
7
7
  export * from "./exports.js";
8
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSwyQ0FBMkM7QUFDM0MsbURBQW1EO0FBQ25ELHdFQUF3RTtBQUV4RSxNQUFNLENBQUMsTUFBTSxrQkFBa0IsR0FBRyxxQkFBcUIsQ0FBQztBQUN4RCxNQUFNLENBQUMsTUFBTSxlQUFlLEdBQUcsU0FBUyxDQUFDO0FBQ3pDLE9BQU8sS0FBSyxJQUFJLE1BQU0sZUFBZSxDQUFDO0FBRXRDLGNBQWMsY0FBYyxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLy8gR0VORVJBVEVEIGJ5IHByb2plbiB3YXRjaCAtIERPIE5PVCBFRElULlxuLy8gUmVnZW5lcmF0ZWQgZnJvbSB0aGUgZXhwb3J0aW5nIG1vZHVsZXMgaW4gLi9zcmMuXG4vLyBIYW5kIGVkaXRzIGFyZSBvdmVyd3JpdHRlbiBvbiB0aGUgbmV4dCB3YXRjaDsgdGhpcyBmaWxlIGlzIHJlYWQtb25seS5cblxuZXhwb3J0IGNvbnN0IFBBQ0tBR0VfSURFTlRJRklFUiA9IFwiQGRieC10b29scy9jbGktYXJnc1wiO1xuZXhwb3J0IGNvbnN0IFBBQ0tBR0VfVkVSU0lPTiA9IFwiMC45LjEwNVwiO1xuZXhwb3J0ICogYXMgYXJncyBmcm9tIFwiLi9zcmMvYXJncy50c1wiO1xuZXhwb3J0IHR5cGUgeyBDbGlBcmdzT3B0aW9ucywgQ2xpQXJnTWV0YSwgQXJndW1lbnRTb3VyY2UgfSBmcm9tIFwiLi9zcmMvYXJncy50c1wiO1xuZXhwb3J0ICogZnJvbSBcIi4vZXhwb3J0cy50c1wiO1xuIl19
8
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSwyQ0FBMkM7QUFDM0MsbURBQW1EO0FBQ25ELHdFQUF3RTtBQUV4RSxNQUFNLENBQUMsTUFBTSxrQkFBa0IsR0FBRyxxQkFBcUIsQ0FBQztBQUN4RCxNQUFNLENBQUMsTUFBTSxlQUFlLEdBQUcsU0FBUyxDQUFDO0FBQ3pDLE9BQU8sS0FBSyxJQUFJLE1BQU0sZUFBZSxDQUFDO0FBRXRDLGNBQWMsY0FBYyxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLy8gR0VORVJBVEVEIGJ5IHByb2plbiB3YXRjaCAtIERPIE5PVCBFRElULlxuLy8gUmVnZW5lcmF0ZWQgZnJvbSB0aGUgZXhwb3J0aW5nIG1vZHVsZXMgaW4gLi9zcmMuXG4vLyBIYW5kIGVkaXRzIGFyZSBvdmVyd3JpdHRlbiBvbiB0aGUgbmV4dCB3YXRjaDsgdGhpcyBmaWxlIGlzIHJlYWQtb25seS5cblxuZXhwb3J0IGNvbnN0IFBBQ0tBR0VfSURFTlRJRklFUiA9IFwiQGRieC10b29scy9jbGktYXJnc1wiO1xuZXhwb3J0IGNvbnN0IFBBQ0tBR0VfVkVSU0lPTiA9IFwiMC45LjEwOFwiO1xuZXhwb3J0ICogYXMgYXJncyBmcm9tIFwiLi9zcmMvYXJncy50c1wiO1xuZXhwb3J0IHR5cGUgeyBDbGlBcmdzT3B0aW9ucywgQ2xpQXJnTWV0YSwgQ2xpT2JqZWN0U2NoZW1hLCBBcmd1bWVudFNvdXJjZSB9IGZyb20gXCIuL3NyYy9hcmdzLnRzXCI7XG5leHBvcnQgKiBmcm9tIFwiLi9leHBvcnRzLnRzXCI7XG4iXX0=
package/lib/src/args.d.ts CHANGED
@@ -9,7 +9,6 @@
9
9
  */
10
10
  import { configUtils } from "@dbx-tools/core";
11
11
  import { Command } from "commander";
12
- import { z } from "zod";
13
12
  /** Layered config lookup used to resolve argument values and help defaults. */
14
13
  export type CliArgsOptions = configUtils.ConfigOptions;
15
14
  /** CLI metadata read from a field's Zod `.meta()` value. */
@@ -20,12 +19,19 @@ export interface CliArgMeta {
20
19
  readonly flag?: boolean;
21
20
  /** Set false to keep schema and configured defaults out of generated help. */
22
21
  readonly helpDefault?: boolean;
22
+ /** One-character short flag without a dash, or false to disable automatic generation. */
23
+ readonly short?: string | false;
24
+ }
25
+ /** Structural Zod object contract that remains compatible across Zod v4 minors. */
26
+ export interface CliObjectSchema<TOutput extends Readonly<Record<string, unknown>> = Readonly<Record<string, unknown>>> {
27
+ parse(value: unknown): TOutput;
28
+ toJSONSchema(): unknown;
23
29
  }
24
30
  /** Zod defaults or concrete option values serialized by {@link serializeArgs}. */
25
- export type ArgumentSource = z.ZodObject<z.ZodRawShape> | Readonly<Record<string, unknown>>;
31
+ export type ArgumentSource = CliObjectSchema | Readonly<Record<string, unknown>>;
26
32
  /** Register Commander arguments for every enabled field on a Zod object schema. */
27
- export declare function addArgs<T extends z.ZodRawShape>(command: Command, schema: z.ZodObject<T>, options?: CliArgsOptions): Command;
33
+ export declare function addArgs<TSchema extends CliObjectSchema>(command: Command, schema: TSchema, options?: CliArgsOptions): Command;
28
34
  /** Merge CLI values over layered config, then validate and default through Zod. */
29
- export declare function parseArgs<T extends z.ZodRawShape>(command: Command, schema: z.ZodObject<T>, options?: CliArgsOptions): z.output<z.ZodObject<T>>;
35
+ export declare function parseArgs<TSchema extends CliObjectSchema>(command: Command, schema: TSchema, options?: CliArgsOptions): ReturnType<TSchema["parse"]>;
30
36
  /** Convert schema defaults or concrete option values into Commander arguments. */
31
37
  export declare function serializeArgs(source: ArgumentSource): string[];
package/lib/src/args.js CHANGED
@@ -10,17 +10,18 @@
10
10
  import { configUtils } from "@dbx-tools/core";
11
11
  import { object, options as sharedOptions, stringUtils } from "@dbx-tools/shared-core";
12
12
  import { Option } from "commander";
13
- import { z } from "zod";
14
13
  const boundOptions = new WeakMap();
15
14
  /** Register Commander arguments for every enabled field on a Zod object schema. */
16
15
  export function addArgs(command, schema, options = {}) {
17
16
  boundOptions.set(command, options);
18
- for (const field of fields(schema)) {
17
+ const schemaFields = fields(schema);
18
+ const shortFlags = fieldShortFlags(schemaFields);
19
+ for (const field of schemaFields) {
19
20
  if (field.flag === false)
20
21
  continue;
21
22
  const envKeys = fieldEnvKeys(field);
22
23
  const envName = envArgName(field, envKeys, options);
23
- const flags = argFlags(field);
24
+ const flags = argFlags(field, shortFlags.get(field.key));
24
25
  const sourced = configValue(field, envKeys, options);
25
26
  const fallback = sourced ?? field.fallback;
26
27
  const option = new Option(flags, field.description);
@@ -61,14 +62,14 @@ export function parseArgs(command, schema, options = boundOptions.get(command) ?
61
62
  }
62
63
  /** Convert schema defaults or concrete option values into Commander arguments. */
63
64
  export function serializeArgs(source) {
64
- if (source instanceof z.ZodObject) {
65
+ if (isCliObjectSchema(source)) {
65
66
  const values = source.parse({});
66
67
  return fields(source).flatMap((field) => field.flag === false ? [] : valueArguments(field.key, values[field.key]));
67
68
  }
68
69
  return Object.entries(source).flatMap(([key, value]) => valueArguments(key, value));
69
70
  }
70
71
  function fields(schema) {
71
- const document = z.toJSONSchema(schema);
72
+ const document = schema.toJSONSchema();
72
73
  const properties = object.isRecord(document) ? document.properties : undefined;
73
74
  if (!object.isRecord(properties)) {
74
75
  throw new TypeError("Zod Commander binding requires a z.object() schema");
@@ -88,12 +89,53 @@ function fields(schema) {
88
89
  env: json.env,
89
90
  flag: json.flag,
90
91
  helpDefault: json.helpDefault,
92
+ short: json.short,
91
93
  };
92
94
  });
93
95
  }
94
- function argFlags(field) {
95
- const flag = `--${stringUtils.toSlug(field.key)}`;
96
- return field.type === "boolean" ? flag : `${flag} <value>`;
96
+ function isCliObjectSchema(value) {
97
+ return typeof value.parse === "function" && typeof value.toJSONSchema === "function";
98
+ }
99
+ function argFlags(field, short) {
100
+ const long = `--${stringUtils.toSlug(field.key)}`;
101
+ const value = field.type === "boolean" ? "" : " <value>";
102
+ if (short)
103
+ return `-${short}, ${long}${value}`;
104
+ return `${long}${value}`;
105
+ }
106
+ function fieldShortFlags(fields) {
107
+ const result = new Map();
108
+ const reserved = new Map([["h", "help"]]);
109
+ for (const field of fields) {
110
+ if (field.short === false || field.short === undefined)
111
+ continue;
112
+ if (!/^[A-Za-z]$/.test(field.short)) {
113
+ throw new TypeError(`Short flag for "${field.key}" must be one letter or false`);
114
+ }
115
+ const short = field.short.toLowerCase();
116
+ const existing = reserved.get(short);
117
+ if (existing) {
118
+ throw new TypeError(`Short flag -${short} is shared by "${existing}" and "${field.key}"`);
119
+ }
120
+ reserved.set(short, field.key);
121
+ result.set(field.key, short);
122
+ }
123
+ const candidates = new Map();
124
+ for (const field of fields) {
125
+ if (field.short !== undefined)
126
+ continue;
127
+ const short = [...stringUtils.tokenize(field.key)][0]?.[0]?.toLowerCase();
128
+ if (!short || reserved.has(short))
129
+ continue;
130
+ const matching = candidates.get(short) ?? [];
131
+ matching.push(field);
132
+ candidates.set(short, matching);
133
+ }
134
+ for (const [short, matching] of candidates) {
135
+ if (matching.length === 1)
136
+ result.set(matching[0].key, short);
137
+ }
138
+ return result;
97
139
  }
98
140
  function fieldEnvKeys(field) {
99
141
  if (typeof field.env === "string")
@@ -152,4 +194,4 @@ function listenAddress(value) {
152
194
  }
153
195
  return undefined;
154
196
  }
155
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"args.js","sourceRoot":"","sources":["../../src/args.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,MAAM,EAAE,OAAO,IAAI,aAAa,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACvF,OAAO,EAAW,MAAM,EAAE,MAAM,WAAW,CAAC;AAC5C,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAkCxB,MAAM,YAAY,GAAG,IAAI,OAAO,EAA2B,CAAC;AAE5D,mFAAmF;AACnF,MAAM,UAAU,OAAO,CACrB,OAAgB,EAChB,MAAsB,EACtB,UAA0B,EAAE;IAE5B,YAAY,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACnC,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;QACnC,IAAI,KAAK,CAAC,IAAI,KAAK,KAAK;YAAE,SAAS;QACnC,MAAM,OAAO,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC;QACpC,MAAM,OAAO,GAAG,UAAU,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;QACpD,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;QAC9B,MAAM,OAAO,GAAG,WAAW,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;QACrD,MAAM,QAAQ,GAAG,OAAO,IAAI,KAAK,CAAC,QAAQ,CAAC;QAC3C,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,WAAW,CAAC,CAAC;QACpD,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,mBAAmB,EAAE;YACjD,KAAK,EAAE,KAAK,CAAC,WAAW,KAAK,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ;SAChE,CAAC,CAAC;QACH,IAAI,OAAO;YAAE,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACjC,IAAI,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC;YAAE,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAC7E,IAAI,QAAQ,KAAK,SAAS,IAAI,KAAK,CAAC,WAAW,KAAK,KAAK,EAAE,CAAC;YAC1D,MAAM,OAAO,GAAG,aAAa,CAAC,QAAQ,CAAC,CAAC;YACxC,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC,aAAa,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;QAC7F,CAAC;QACD,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;YAC3B,MAAM,CAAC,SAAS,CAAC,CAAC,KAAa,EAAE,QAAiB,EAAE,EAAE,CACpD,QAAQ,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,QAAQ,EAAE,KAAK,CAAC,CACnF,CAAC;QACJ,CAAC;QACD,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QAC1B,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC;YAC5C,OAAO,CAAC,SAAS,CACf,IAAI,MAAM,CAAC,QAAQ,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,WAAW,KAAK,CAAC,WAAW,CAAC,WAAW,EAAE,EAAE,CAAC,CACzF,CAAC;QACJ,CAAC;IACH,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,mFAAmF;AACnF,MAAM,UAAU,SAAS,CACvB,OAAgB,EAChB,MAAsB,EACtB,UAA0B,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE;IAEzD,MAAM,MAAM,GAA4B,EAAE,CAAC;IAC3C,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;QACnC,IAAI,OAAO,CAAC,oBAAoB,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,KAAK,EAAE,CAAC;YACtD,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,cAAc,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACtD,SAAS;QACX,CAAC;QACD,MAAM,OAAO,GAAG,WAAW,CAAC,KAAK,EAAE,YAAY,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,CAAC;QACjE,IAAI,OAAO,KAAK,SAAS;YAAE,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC;IACzD,CAAC;IACD,OAAO,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;AAC9B,CAAC;AAED,kFAAkF;AAClF,MAAM,UAAU,aAAa,CAAC,MAAsB;IAClD,IAAI,MAAM,YAAY,CAAC,CAAC,SAAS,EAAE,CAAC;QAClC,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,EAAE,CAAsC,CAAC;QACrE,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE,CACtC,KAAK,CAAC,IAAI,KAAK,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,cAAc,CAAC,KAAK,CAAC,GAAG,EAAE,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CACzE,CAAC;IACJ,CAAC;IACD,OAAO,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,cAAc,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC;AACtF,CAAC;AAED,SAAS,MAAM,CAAC,MAAkC;IAChD,MAAM,QAAQ,GAAG,CAAC,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;IACxC,MAAM,UAAU,GAAG,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC;IAC/E,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;QACjC,MAAM,IAAI,SAAS,CAAC,oDAAoD,CAAC,CAAC;IAC5E,CAAC;IACD,OAAO,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;QACrD,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YAC5B,MAAM,IAAI,SAAS,CAAC,6BAA6B,GAAG,GAAG,CAAC,CAAC;QAC3D,CAAC;QACD,MAAM,IAAI,GAAG,KAAkB,CAAC;QAChC,MAAM,OAAO,GACX,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAC1F,OAAO;YACL,GAAG;YACH,WAAW,EAAE,OAAO,IAAI,CAAC,WAAW,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE;YACzE,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,OAAO;YACP,QAAQ,EAAE,IAAI,CAAC,OAAO;YACtB,GAAG,EAAE,IAAI,CAAC,GAAG;YACb,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,WAAW,EAAE,IAAI,CAAC,WAAW;SAC9B,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,QAAQ,CAAC,KAAY;IAC5B,MAAM,IAAI,GAAG,KAAK,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;IAClD,OAAO,KAAK,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,UAAU,CAAC;AAC7D,CAAC;AAED,SAAS,YAAY,CAAC,KAAY;IAChC,IAAI,OAAO,KAAK,CAAC,GAAG,KAAK,QAAQ;QAAE,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACtD,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC;QAAE,OAAO,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;IACpD,OAAO,WAAW,CAAC,eAAe,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;AAChD,CAAC;AAED,SAAS,UAAU,CAAC,KAAY,EAAE,OAA0B,EAAE,OAAuB;IACnF,IAAI,KAAK,CAAC,GAAG,KAAK,SAAS;QAAE,OAAO,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IACrD,MAAM,SAAS,GACb,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,+BAA+B,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAChE,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,KAAK,GAAG,CAAC,WAAW,EAAE,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACrE,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QACd,EAAE,CAAC;IACL,4EAA4E;IAC5E,OAAO,WAAW,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE,GAAG,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC;AAChE,CAAC;AAED,SAAS,WAAW,CAClB,KAAY,EACZ,OAAmC,EACnC,OAAuB;IAEvB,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;QAC3B,MAAM,MAAM,GAAG,WAAW,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;QACxE,OAAO,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;IAChD,CAAC;IACD,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS;QAAE,OAAO,WAAW,CAAC,OAAO,CAAC,SAAS,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;IACtF,OAAO,WAAW,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;AAC5C,CAAC;AAED,SAAS,cAAc,CAAC,GAAW,EAAE,KAAc;IACjD,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI;QAAE,OAAO,EAAE,CAAC;IACrD,MAAM,IAAI,GAAG,KAAK,WAAW,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC;IAC5C,IAAI,OAAO,KAAK,KAAK,SAAS;QAAE,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IAChF,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO,KAAK,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,cAAc,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;IACtE,CAAC;IACD,OAAO,CAAC,IAAI,EAAE,cAAc,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC;AAC5C,CAAC;AAED,SAAS,cAAc,CAAC,GAAW,EAAE,KAAc;IACjD,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QACxF,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;IACvB,CAAC;IACD,MAAM,OAAO,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC;IACrC,IAAI,OAAO;QAAE,OAAO,aAAa,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC;IAC/D,MAAM,IAAI,SAAS,CAAC,kCAAkC,GAAG,2BAA2B,CAAC,CAAC;AACxF,CAAC;AAED,SAAS,aAAa,CAAC,KAAc;IACnC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC;QAAE,OAAO,SAAS,CAAC;IAC9C,IAAI,KAAK,CAAC,MAAM,KAAK,KAAK,IAAI,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,IAAI,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC/F,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC;IAC/D,CAAC;IACD,IAAI,KAAK,CAAC,MAAM,KAAK,MAAM,IAAI,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC9D,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC;IAC9C,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC","sourcesContent":["/**\n * Commander arguments generated from a Zod object schema.\n *\n * Zod owns validation, coercion, metadata, and defaults. Commander owns flags,\n * help, and environment display. {@link configUtils} supplies layered local\n * configuration before the final Zod parse.\n *\n * @module\n */\n\nimport { configUtils } from \"@dbx-tools/core\";\nimport { object, options as sharedOptions, stringUtils } from \"@dbx-tools/shared-core\";\nimport { Command, Option } from \"commander\";\nimport { z } from \"zod\";\n\n/** Layered config lookup used to resolve argument values and help defaults. */\nexport type CliArgsOptions = configUtils.ConfigOptions;\n\n/** CLI metadata read from a field's Zod `.meta()` value. */\nexport interface CliArgMeta {\n  /** Exact environment name or ordered aliases used instead of field-name derivation. */\n  readonly env?: string | readonly string[];\n  /** Set false to resolve the field from config without generating a Commander flag. */\n  readonly flag?: boolean;\n  /** Set false to keep schema and configured defaults out of generated help. */\n  readonly helpDefault?: boolean;\n}\n\n/** Zod defaults or concrete option values serialized by {@link serializeArgs}. */\nexport type ArgumentSource = z.ZodObject<z.ZodRawShape> | Readonly<Record<string, unknown>>;\n\ninterface JsonField extends CliArgMeta {\n  type?: string;\n  description?: string;\n  default?: unknown;\n  enum?: unknown[];\n  const?: unknown;\n}\n\ninterface Field extends CliArgMeta {\n  key: string;\n  description: string;\n  type?: string;\n  choices?: string[];\n  fallback?: unknown;\n}\n\nconst boundOptions = new WeakMap<Command, CliArgsOptions>();\n\n/** Register Commander arguments for every enabled field on a Zod object schema. */\nexport function addArgs<T extends z.ZodRawShape>(\n  command: Command,\n  schema: z.ZodObject<T>,\n  options: CliArgsOptions = {},\n): Command {\n  boundOptions.set(command, options);\n  for (const field of fields(schema)) {\n    if (field.flag === false) continue;\n    const envKeys = fieldEnvKeys(field);\n    const envName = envArgName(field, envKeys, options);\n    const flags = argFlags(field);\n    const sourced = configValue(field, envKeys, options);\n    const fallback = sourced ?? field.fallback;\n    const option = new Option(flags, field.description);\n    Object.defineProperty(option, \"schemaHelpDefault\", {\n      value: field.helpDefault === false ? undefined : field.fallback,\n    });\n    if (envName) option.env(envName);\n    if (field.choices && field.choices.length > 0) option.choices(field.choices);\n    if (fallback !== undefined && field.helpDefault !== false) {\n      const address = listenAddress(fallback);\n      option.default(fallback, address ? sharedOptions.formatListenAddress(address) : undefined);\n    }\n    if (field.type === \"array\") {\n      option.argParser((value: string, previous: unknown) =>\n        previous === fallback || !Array.isArray(previous) ? [value] : [...previous, value],\n      );\n    }\n    command.addOption(option);\n    if (field.type === \"boolean\" && option.long) {\n      command.addOption(\n        new Option(`--no-${option.long.slice(2)}`, `Disable ${field.description.toLowerCase()}`),\n      );\n    }\n  }\n  return command;\n}\n\n/** Merge CLI values over layered config, then validate and default through Zod. */\nexport function parseArgs<T extends z.ZodRawShape>(\n  command: Command,\n  schema: z.ZodObject<T>,\n  options: CliArgsOptions = boundOptions.get(command) ?? {},\n): z.output<z.ZodObject<T>> {\n  const values: Record<string, unknown> = {};\n  for (const field of fields(schema)) {\n    if (command.getOptionValueSource(field.key) === \"cli\") {\n      values[field.key] = command.getOptionValue(field.key);\n      continue;\n    }\n    const sourced = configValue(field, fieldEnvKeys(field), options);\n    if (sourced !== undefined) values[field.key] = sourced;\n  }\n  return schema.parse(values);\n}\n\n/** Convert schema defaults or concrete option values into Commander arguments. */\nexport function serializeArgs(source: ArgumentSource): string[] {\n  if (source instanceof z.ZodObject) {\n    const values = source.parse({}) as Readonly<Record<string, unknown>>;\n    return fields(source).flatMap((field) =>\n      field.flag === false ? [] : valueArguments(field.key, values[field.key]),\n    );\n  }\n  return Object.entries(source).flatMap(([key, value]) => valueArguments(key, value));\n}\n\nfunction fields(schema: z.ZodObject<z.ZodRawShape>): Field[] {\n  const document = z.toJSONSchema(schema);\n  const properties = object.isRecord(document) ? document.properties : undefined;\n  if (!object.isRecord(properties)) {\n    throw new TypeError(\"Zod Commander binding requires a z.object() schema\");\n  }\n  return Object.entries(properties).map(([key, value]) => {\n    if (!object.isRecord(value)) {\n      throw new TypeError(`Cannot bind CLI argument \"${key}\"`);\n    }\n    const json = value as JsonField;\n    const choices =\n      json.enum?.map(String) ?? (json.const === undefined ? undefined : [String(json.const)]);\n    return {\n      key,\n      description: typeof json.description === \"string\" ? json.description : \"\",\n      type: json.type,\n      choices,\n      fallback: json.default,\n      env: json.env,\n      flag: json.flag,\n      helpDefault: json.helpDefault,\n    };\n  });\n}\n\nfunction argFlags(field: Field): string {\n  const flag = `--${stringUtils.toSlug(field.key)}`;\n  return field.type === \"boolean\" ? flag : `${flag} <value>`;\n}\n\nfunction fieldEnvKeys(field: Field): readonly string[] {\n  if (typeof field.env === \"string\") return [field.env];\n  if (Array.isArray(field.env)) return [...field.env];\n  return configUtils.environmentKeys(field.key);\n}\n\nfunction envArgName(field: Field, envKeys: readonly string[], options: CliArgsOptions): string {\n  if (field.env !== undefined) return envKeys[0] ?? \"\";\n  const canonical =\n    envKeys.find((key) => /^[A-Z][A-Z0-9]*(_[A-Z0-9]+)+$/.test(key)) ??\n    envKeys.find((key) => key === key.toUpperCase() && /[A-Z]/.test(key)) ??\n    envKeys.at(-1) ??\n    \"\";\n  // Help shows the unscoped name; configUtils still reads DBX_TOOLS_ aliases.\n  return configUtils.name(canonical, { ...options, scope: [] });\n}\n\nfunction configValue(\n  field: Field,\n  envKeys: string | readonly string[],\n  options: CliArgsOptions,\n): unknown {\n  if (field.type === \"array\") {\n    const values = configUtils.list(undefined, envKeys, undefined, options);\n    return values.length > 0 ? values : undefined;\n  }\n  if (field.type === \"boolean\") return configUtils.boolean(undefined, envKeys, options);\n  return configUtils.text(envKeys, options);\n}\n\nfunction valueArguments(key: string, value: unknown): string[] {\n  if (value === undefined || value === null) return [];\n  const flag = `--${stringUtils.toSlug(key)}`;\n  if (typeof value === \"boolean\") return [value ? flag : `--no-${flag.slice(2)}`];\n  if (Array.isArray(value)) {\n    return value.flatMap((entry) => [flag, scalarArgument(key, entry)]);\n  }\n  return [flag, scalarArgument(key, value)];\n}\n\nfunction scalarArgument(key: string, value: unknown): string {\n  if (typeof value === \"string\" || typeof value === \"number\" || typeof value === \"bigint\") {\n    return String(value);\n  }\n  const address = listenAddress(value);\n  if (address) return sharedOptions.formatListenAddress(address);\n  throw new TypeError(`Cannot serialize CLI argument \"${key}\" with a non-scalar value`);\n}\n\nfunction listenAddress(value: unknown): sharedOptions.ListenAddress | undefined {\n  if (!object.isRecord(value)) return undefined;\n  if (value.scheme === \"tcp\" && typeof value.host === \"string\" && typeof value.port === \"number\") {\n    return { scheme: \"tcp\", host: value.host, port: value.port };\n  }\n  if (value.scheme === \"unix\" && typeof value.path === \"string\") {\n    return { scheme: \"unix\", path: value.path };\n  }\n  return undefined;\n}\n"]}
197
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"args.js","sourceRoot":"","sources":["../../src/args.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Commander arguments generated from a Zod object schema.\n *\n * Zod owns validation, coercion, metadata, and defaults. Commander owns flags,\n * help, and environment display. {@link configUtils} supplies layered local\n * configuration before the final Zod parse.\n *\n * @module\n */\n\nimport { configUtils } from \"@dbx-tools/core\";\nimport { object, options as sharedOptions, stringUtils } from \"@dbx-tools/shared-core\";\nimport { Command, Option } from \"commander\";\n\n/** Layered config lookup used to resolve argument values and help defaults. */\nexport type CliArgsOptions = configUtils.ConfigOptions;\n\n/** CLI metadata read from a field's Zod `.meta()` value. */\nexport interface CliArgMeta {\n  /** Exact environment name or ordered aliases used instead of field-name derivation. */\n  readonly env?: string | readonly string[];\n  /** Set false to resolve the field from config without generating a Commander flag. */\n  readonly flag?: boolean;\n  /** Set false to keep schema and configured defaults out of generated help. */\n  readonly helpDefault?: boolean;\n  /** One-character short flag without a dash, or false to disable automatic generation. */\n  readonly short?: string | false;\n}\n\n/** Structural Zod object contract that remains compatible across Zod v4 minors. */\nexport interface CliObjectSchema<\n  TOutput extends Readonly<Record<string, unknown>> = Readonly<Record<string, unknown>>,\n> {\n  parse(value: unknown): TOutput;\n  toJSONSchema(): unknown;\n}\n\n/** Zod defaults or concrete option values serialized by {@link serializeArgs}. */\nexport type ArgumentSource = CliObjectSchema | Readonly<Record<string, unknown>>;\n\ninterface JsonField extends CliArgMeta {\n  type?: string;\n  description?: string;\n  default?: unknown;\n  enum?: unknown[];\n  const?: unknown;\n}\n\ninterface Field extends CliArgMeta {\n  key: string;\n  description: string;\n  type?: string;\n  choices?: string[];\n  fallback?: unknown;\n}\n\nconst boundOptions = new WeakMap<Command, CliArgsOptions>();\n\n/** Register Commander arguments for every enabled field on a Zod object schema. */\nexport function addArgs<TSchema extends CliObjectSchema>(\n  command: Command,\n  schema: TSchema,\n  options: CliArgsOptions = {},\n): Command {\n  boundOptions.set(command, options);\n  const schemaFields = fields(schema);\n  const shortFlags = fieldShortFlags(schemaFields);\n  for (const field of schemaFields) {\n    if (field.flag === false) continue;\n    const envKeys = fieldEnvKeys(field);\n    const envName = envArgName(field, envKeys, options);\n    const flags = argFlags(field, shortFlags.get(field.key));\n    const sourced = configValue(field, envKeys, options);\n    const fallback = sourced ?? field.fallback;\n    const option = new Option(flags, field.description);\n    Object.defineProperty(option, \"schemaHelpDefault\", {\n      value: field.helpDefault === false ? undefined : field.fallback,\n    });\n    if (envName) option.env(envName);\n    if (field.choices && field.choices.length > 0) option.choices(field.choices);\n    if (fallback !== undefined && field.helpDefault !== false) {\n      const address = listenAddress(fallback);\n      option.default(fallback, address ? sharedOptions.formatListenAddress(address) : undefined);\n    }\n    if (field.type === \"array\") {\n      option.argParser((value: string, previous: unknown) =>\n        previous === fallback || !Array.isArray(previous) ? [value] : [...previous, value],\n      );\n    }\n    command.addOption(option);\n    if (field.type === \"boolean\" && option.long) {\n      command.addOption(\n        new Option(`--no-${option.long.slice(2)}`, `Disable ${field.description.toLowerCase()}`),\n      );\n    }\n  }\n  return command;\n}\n\n/** Merge CLI values over layered config, then validate and default through Zod. */\nexport function parseArgs<TSchema extends CliObjectSchema>(\n  command: Command,\n  schema: TSchema,\n  options: CliArgsOptions = boundOptions.get(command) ?? {},\n): ReturnType<TSchema[\"parse\"]> {\n  const values: Record<string, unknown> = {};\n  for (const field of fields(schema)) {\n    if (command.getOptionValueSource(field.key) === \"cli\") {\n      values[field.key] = command.getOptionValue(field.key);\n      continue;\n    }\n    const sourced = configValue(field, fieldEnvKeys(field), options);\n    if (sourced !== undefined) values[field.key] = sourced;\n  }\n  return schema.parse(values) as ReturnType<TSchema[\"parse\"]>;\n}\n\n/** Convert schema defaults or concrete option values into Commander arguments. */\nexport function serializeArgs(source: ArgumentSource): string[] {\n  if (isCliObjectSchema(source)) {\n    const values = source.parse({}) as Readonly<Record<string, unknown>>;\n    return fields(source).flatMap((field) =>\n      field.flag === false ? [] : valueArguments(field.key, values[field.key]),\n    );\n  }\n  return Object.entries(source).flatMap(([key, value]) => valueArguments(key, value));\n}\n\nfunction fields(schema: CliObjectSchema): Field[] {\n  const document = schema.toJSONSchema();\n  const properties = object.isRecord(document) ? document.properties : undefined;\n  if (!object.isRecord(properties)) {\n    throw new TypeError(\"Zod Commander binding requires a z.object() schema\");\n  }\n  return Object.entries(properties).map(([key, value]) => {\n    if (!object.isRecord(value)) {\n      throw new TypeError(`Cannot bind CLI argument \"${key}\"`);\n    }\n    const json = value as JsonField;\n    const choices =\n      json.enum?.map(String) ?? (json.const === undefined ? undefined : [String(json.const)]);\n    return {\n      key,\n      description: typeof json.description === \"string\" ? json.description : \"\",\n      type: json.type,\n      choices,\n      fallback: json.default,\n      env: json.env,\n      flag: json.flag,\n      helpDefault: json.helpDefault,\n      short: json.short,\n    };\n  });\n}\n\nfunction isCliObjectSchema(value: ArgumentSource): value is CliObjectSchema {\n  return typeof value.parse === \"function\" && typeof value.toJSONSchema === \"function\";\n}\n\nfunction argFlags(field: Field, short: string | undefined): string {\n  const long = `--${stringUtils.toSlug(field.key)}`;\n  const value = field.type === \"boolean\" ? \"\" : \" <value>\";\n  if (short) return `-${short}, ${long}${value}`;\n  return `${long}${value}`;\n}\n\nfunction fieldShortFlags(fields: readonly Field[]): ReadonlyMap<string, string> {\n  const result = new Map<string, string>();\n  const reserved = new Map<string, string>([[\"h\", \"help\"]]);\n  for (const field of fields) {\n    if (field.short === false || field.short === undefined) continue;\n    if (!/^[A-Za-z]$/.test(field.short)) {\n      throw new TypeError(`Short flag for \"${field.key}\" must be one letter or false`);\n    }\n    const short = field.short.toLowerCase();\n    const existing = reserved.get(short);\n    if (existing) {\n      throw new TypeError(`Short flag -${short} is shared by \"${existing}\" and \"${field.key}\"`);\n    }\n    reserved.set(short, field.key);\n    result.set(field.key, short);\n  }\n  const candidates = new Map<string, Field[]>();\n  for (const field of fields) {\n    if (field.short !== undefined) continue;\n    const short = [...stringUtils.tokenize(field.key)][0]?.[0]?.toLowerCase();\n    if (!short || reserved.has(short)) continue;\n    const matching = candidates.get(short) ?? [];\n    matching.push(field);\n    candidates.set(short, matching);\n  }\n  for (const [short, matching] of candidates) {\n    if (matching.length === 1) result.set(matching[0]!.key, short);\n  }\n  return result;\n}\n\nfunction fieldEnvKeys(field: Field): readonly string[] {\n  if (typeof field.env === \"string\") return [field.env];\n  if (Array.isArray(field.env)) return [...field.env];\n  return configUtils.environmentKeys(field.key);\n}\n\nfunction envArgName(field: Field, envKeys: readonly string[], options: CliArgsOptions): string {\n  if (field.env !== undefined) return envKeys[0] ?? \"\";\n  const canonical =\n    envKeys.find((key) => /^[A-Z][A-Z0-9]*(_[A-Z0-9]+)+$/.test(key)) ??\n    envKeys.find((key) => key === key.toUpperCase() && /[A-Z]/.test(key)) ??\n    envKeys.at(-1) ??\n    \"\";\n  // Help shows the unscoped name; configUtils still reads DBX_TOOLS_ aliases.\n  return configUtils.name(canonical, { ...options, scope: [] });\n}\n\nfunction configValue(\n  field: Field,\n  envKeys: string | readonly string[],\n  options: CliArgsOptions,\n): unknown {\n  if (field.type === \"array\") {\n    const values = configUtils.list(undefined, envKeys, undefined, options);\n    return values.length > 0 ? values : undefined;\n  }\n  if (field.type === \"boolean\") return configUtils.boolean(undefined, envKeys, options);\n  return configUtils.text(envKeys, options);\n}\n\nfunction valueArguments(key: string, value: unknown): string[] {\n  if (value === undefined || value === null) return [];\n  const flag = `--${stringUtils.toSlug(key)}`;\n  if (typeof value === \"boolean\") return [value ? flag : `--no-${flag.slice(2)}`];\n  if (Array.isArray(value)) {\n    return value.flatMap((entry) => [flag, scalarArgument(key, entry)]);\n  }\n  return [flag, scalarArgument(key, value)];\n}\n\nfunction scalarArgument(key: string, value: unknown): string {\n  if (typeof value === \"string\" || typeof value === \"number\" || typeof value === \"bigint\") {\n    return String(value);\n  }\n  const address = listenAddress(value);\n  if (address) return sharedOptions.formatListenAddress(address);\n  throw new TypeError(`Cannot serialize CLI argument \"${key}\" with a non-scalar value`);\n}\n\nfunction listenAddress(value: unknown): sharedOptions.ListenAddress | undefined {\n  if (!object.isRecord(value)) return undefined;\n  if (value.scheme === \"tcp\" && typeof value.host === \"string\" && typeof value.port === \"number\") {\n    return { scheme: \"tcp\", host: value.host, port: value.port };\n  }\n  if (value.scheme === \"unix\" && typeof value.path === \"string\") {\n    return { scheme: \"unix\", path: value.path };\n  }\n  return undefined;\n}\n"]}
package/package.json CHANGED
@@ -23,8 +23,8 @@
23
23
  "typescript": "^5.9.3"
24
24
  },
25
25
  "dependencies": {
26
- "@dbx-tools/core": "^0.9.105",
27
- "@dbx-tools/shared-core": "^0.9.105",
26
+ "@dbx-tools/core": "^0.9.108",
27
+ "@dbx-tools/shared-core": "^0.9.108",
28
28
  "commander": "^15.0.0",
29
29
  "zod": "4.3.6"
30
30
  },
@@ -46,7 +46,7 @@
46
46
  "./package.json": "./package.json"
47
47
  }
48
48
  },
49
- "version": "0.9.105",
49
+ "version": "0.9.108",
50
50
  "types": "./lib/index.d.ts",
51
51
  "dbxToolsConfig": {
52
52
  "tags": [
package/src/args.ts CHANGED
@@ -11,7 +11,6 @@
11
11
  import { configUtils } from "@dbx-tools/core";
12
12
  import { object, options as sharedOptions, stringUtils } from "@dbx-tools/shared-core";
13
13
  import { Command, Option } from "commander";
14
- import { z } from "zod";
15
14
 
16
15
  /** Layered config lookup used to resolve argument values and help defaults. */
17
16
  export type CliArgsOptions = configUtils.ConfigOptions;
@@ -24,10 +23,20 @@ export interface CliArgMeta {
24
23
  readonly flag?: boolean;
25
24
  /** Set false to keep schema and configured defaults out of generated help. */
26
25
  readonly helpDefault?: boolean;
26
+ /** One-character short flag without a dash, or false to disable automatic generation. */
27
+ readonly short?: string | false;
28
+ }
29
+
30
+ /** Structural Zod object contract that remains compatible across Zod v4 minors. */
31
+ export interface CliObjectSchema<
32
+ TOutput extends Readonly<Record<string, unknown>> = Readonly<Record<string, unknown>>,
33
+ > {
34
+ parse(value: unknown): TOutput;
35
+ toJSONSchema(): unknown;
27
36
  }
28
37
 
29
38
  /** Zod defaults or concrete option values serialized by {@link serializeArgs}. */
30
- export type ArgumentSource = z.ZodObject<z.ZodRawShape> | Readonly<Record<string, unknown>>;
39
+ export type ArgumentSource = CliObjectSchema | Readonly<Record<string, unknown>>;
31
40
 
32
41
  interface JsonField extends CliArgMeta {
33
42
  type?: string;
@@ -48,17 +57,19 @@ interface Field extends CliArgMeta {
48
57
  const boundOptions = new WeakMap<Command, CliArgsOptions>();
49
58
 
50
59
  /** Register Commander arguments for every enabled field on a Zod object schema. */
51
- export function addArgs<T extends z.ZodRawShape>(
60
+ export function addArgs<TSchema extends CliObjectSchema>(
52
61
  command: Command,
53
- schema: z.ZodObject<T>,
62
+ schema: TSchema,
54
63
  options: CliArgsOptions = {},
55
64
  ): Command {
56
65
  boundOptions.set(command, options);
57
- for (const field of fields(schema)) {
66
+ const schemaFields = fields(schema);
67
+ const shortFlags = fieldShortFlags(schemaFields);
68
+ for (const field of schemaFields) {
58
69
  if (field.flag === false) continue;
59
70
  const envKeys = fieldEnvKeys(field);
60
71
  const envName = envArgName(field, envKeys, options);
61
- const flags = argFlags(field);
72
+ const flags = argFlags(field, shortFlags.get(field.key));
62
73
  const sourced = configValue(field, envKeys, options);
63
74
  const fallback = sourced ?? field.fallback;
64
75
  const option = new Option(flags, field.description);
@@ -87,11 +98,11 @@ export function addArgs<T extends z.ZodRawShape>(
87
98
  }
88
99
 
89
100
  /** Merge CLI values over layered config, then validate and default through Zod. */
90
- export function parseArgs<T extends z.ZodRawShape>(
101
+ export function parseArgs<TSchema extends CliObjectSchema>(
91
102
  command: Command,
92
- schema: z.ZodObject<T>,
103
+ schema: TSchema,
93
104
  options: CliArgsOptions = boundOptions.get(command) ?? {},
94
- ): z.output<z.ZodObject<T>> {
105
+ ): ReturnType<TSchema["parse"]> {
95
106
  const values: Record<string, unknown> = {};
96
107
  for (const field of fields(schema)) {
97
108
  if (command.getOptionValueSource(field.key) === "cli") {
@@ -101,12 +112,12 @@ export function parseArgs<T extends z.ZodRawShape>(
101
112
  const sourced = configValue(field, fieldEnvKeys(field), options);
102
113
  if (sourced !== undefined) values[field.key] = sourced;
103
114
  }
104
- return schema.parse(values);
115
+ return schema.parse(values) as ReturnType<TSchema["parse"]>;
105
116
  }
106
117
 
107
118
  /** Convert schema defaults or concrete option values into Commander arguments. */
108
119
  export function serializeArgs(source: ArgumentSource): string[] {
109
- if (source instanceof z.ZodObject) {
120
+ if (isCliObjectSchema(source)) {
110
121
  const values = source.parse({}) as Readonly<Record<string, unknown>>;
111
122
  return fields(source).flatMap((field) =>
112
123
  field.flag === false ? [] : valueArguments(field.key, values[field.key]),
@@ -115,8 +126,8 @@ export function serializeArgs(source: ArgumentSource): string[] {
115
126
  return Object.entries(source).flatMap(([key, value]) => valueArguments(key, value));
116
127
  }
117
128
 
118
- function fields(schema: z.ZodObject<z.ZodRawShape>): Field[] {
119
- const document = z.toJSONSchema(schema);
129
+ function fields(schema: CliObjectSchema): Field[] {
130
+ const document = schema.toJSONSchema();
120
131
  const properties = object.isRecord(document) ? document.properties : undefined;
121
132
  if (!object.isRecord(properties)) {
122
133
  throw new TypeError("Zod Commander binding requires a z.object() schema");
@@ -137,13 +148,51 @@ function fields(schema: z.ZodObject<z.ZodRawShape>): Field[] {
137
148
  env: json.env,
138
149
  flag: json.flag,
139
150
  helpDefault: json.helpDefault,
151
+ short: json.short,
140
152
  };
141
153
  });
142
154
  }
143
155
 
144
- function argFlags(field: Field): string {
145
- const flag = `--${stringUtils.toSlug(field.key)}`;
146
- return field.type === "boolean" ? flag : `${flag} <value>`;
156
+ function isCliObjectSchema(value: ArgumentSource): value is CliObjectSchema {
157
+ return typeof value.parse === "function" && typeof value.toJSONSchema === "function";
158
+ }
159
+
160
+ function argFlags(field: Field, short: string | undefined): string {
161
+ const long = `--${stringUtils.toSlug(field.key)}`;
162
+ const value = field.type === "boolean" ? "" : " <value>";
163
+ if (short) return `-${short}, ${long}${value}`;
164
+ return `${long}${value}`;
165
+ }
166
+
167
+ function fieldShortFlags(fields: readonly Field[]): ReadonlyMap<string, string> {
168
+ const result = new Map<string, string>();
169
+ const reserved = new Map<string, string>([["h", "help"]]);
170
+ for (const field of fields) {
171
+ if (field.short === false || field.short === undefined) continue;
172
+ if (!/^[A-Za-z]$/.test(field.short)) {
173
+ throw new TypeError(`Short flag for "${field.key}" must be one letter or false`);
174
+ }
175
+ const short = field.short.toLowerCase();
176
+ const existing = reserved.get(short);
177
+ if (existing) {
178
+ throw new TypeError(`Short flag -${short} is shared by "${existing}" and "${field.key}"`);
179
+ }
180
+ reserved.set(short, field.key);
181
+ result.set(field.key, short);
182
+ }
183
+ const candidates = new Map<string, Field[]>();
184
+ for (const field of fields) {
185
+ if (field.short !== undefined) continue;
186
+ const short = [...stringUtils.tokenize(field.key)][0]?.[0]?.toLowerCase();
187
+ if (!short || reserved.has(short)) continue;
188
+ const matching = candidates.get(short) ?? [];
189
+ matching.push(field);
190
+ candidates.set(short, matching);
191
+ }
192
+ for (const [short, matching] of candidates) {
193
+ if (matching.length === 1) result.set(matching[0]!.key, short);
194
+ }
195
+ return result;
147
196
  }
148
197
 
149
198
  function fieldEnvKeys(field: Field): readonly string[] {