@vocab/cli 2.1.10 → 2.1.11

package/dist/index.cjs

@@ -1,35 +1,7 @@
-//#region rolldown:runtime
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __copyProps = (to, from, except, desc) => {
-	if (from && typeof from === "object" || typeof from === "function") {
-		for (var keys = __getOwnPropNames(from), i = 0, n = keys.length, key; i < n; i++) {
-			key = keys[i];
-			if (!__hasOwnProp.call(to, key) && key !== except) {
-				__defProp(to, key, {
-					get: ((k) => from[k]).bind(null, key),
-					enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
-				});
-			}
-		}
-	}
-	return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", {
-	value: mod,
-	enumerable: true
-}) : target, mod));
-
-//#endregion
 let _vocab_phrase = require("@vocab/phrase");
 let _vocab_core = require("@vocab/core");
-let yargs = require("yargs");
-yargs = __toESM(yargs);
 let node_child_process = require("node:child_process");
+let commander = require("commander");
 
 //#region src/getGitBranch.ts
 function getGitBranch() {
@@ -45,68 +17,50 @@ function getGitBranch() {
 	}
 }
 
+//#endregion
+//#region package.json
+var version = "2.1.11";
+var description = "A CLI for generating typed Vocab translations and interacting with 3rd-party localization services";
+
 //#endregion
 //#region src/index.ts
-const branchDefinition = {
-	type: "string",
-	describe: "The Phrase branch to target",
-	default: getGitBranch() || "local-development"
+const DEFAULT_BRANCH = getGitBranch() || "local-development";
+const program = new commander.Command();
+program.name("vocab").version(version).description(description).option("--config <path>", "Path to config file").hook("preAction", async (thisCommand, actionCommand) => {
+	const options = thisCommand.optsWithGlobals();
+	console.log("Loading configuration from", options.config || process.cwd());
+	const userConfig = await (0, _vocab_core.resolveConfig)(options.config);
+	if (!userConfig) throw new Error("No configuration file found");
+	console.log("Successfully loaded configuration");
+	actionCommand.setOptionValue("userConfig", userConfig);
+});
+const branchOption = new commander.Option("--branch", "The Phrase branch to target").default(DEFAULT_BRANCH);
+const pushAction = async (options) => {
+	await (0, _vocab_phrase.push)({
+		branch: options.branch,
+		deleteUnusedKeys: options.deleteUnusedKeys,
+		ignore: options.ignore
+	}, options.userConfig);
 };
-const ignorePathDefinition = {
-	type: "string",
-	array: true,
-	describe: "Array of glob paths to ignore when searching for keys to push",
-	default: []
+program.command("push").description("Push translations to Phrase").addOption(branchOption).option("--delete-unused-keys", "Whether or not to delete unused keys after pushing", false).option("--ignore <paths...>", "Array of glob paths to ignore when searching for keys to push", []).action(pushAction);
+const pullAction = async (options) => {
+	await (0, _vocab_phrase.pull)({
+		branch: options.branch,
+		errorOnNoGlobalKeyTranslation: options.errorOnNoGlobalKeyTranslation || false
+	}, options.userConfig);
 };
-let config = null;
-(0, yargs.default)(process.argv.slice(2)).scriptName("vocab").option("config", {
-	type: "string",
-	describe: "Path to config file"
-}).middleware(async ({ config: configPath }) => {
-	config = await (0, _vocab_core.resolveConfig)(configPath);
-	console.log("Loaded config from", configPath || process.cwd());
-}).command({
-	command: "push",
-	builder: (yargs$1) => yargs$1.options({
-		branch: branchDefinition,
-		"delete-unused-keys": {
-			type: "boolean",
-			describe: "Whether or not to delete unused keys after pushing",
-			default: false
-		},
-		ignore: ignorePathDefinition
-	}),
-	handler: async (options) => {
-		await (0, _vocab_phrase.push)(options, config);
-	}
-}).command({
-	command: "pull",
-	builder: (yargs$1) => yargs$1.options({
-		branch: branchDefinition,
-		"error-on-no-global-key-translation": {
-			type: "boolean",
-			describe: "Throw an error when there is no translation for a global key",
-			default: false
-		}
-	}),
-	handler: async (options) => {
-		await (0, _vocab_phrase.pull)(options, config);
-	}
-}).command({
-	command: "compile",
-	builder: (yargs$1) => yargs$1.options({ watch: {
-		type: "boolean",
-		default: false
-	} }),
-	handler: async ({ watch }) => {
-		await (0, _vocab_core.compile)({ watch }, config);
-	}
-}).command({
-	command: "validate",
-	handler: async () => {
-		if (!await (0, _vocab_core.validate)(config)) throw new Error("Project invalid");
-	}
-}).help().wrap(72).parse();
+program.command("pull").description("Pull translations from Phrase").addOption(branchOption).option("--error-on-no-global-key-translation", "Throw an error when there is no translation for a global key", false).action(pullAction);
+const compileAction = async (options) => {
+	await (0, _vocab_core.compile)({ watch: options.watch }, options.userConfig);
+};
+program.command("compile").description("Compile translations").option("--watch", "Watch for changes", false).action(compileAction);
+const validateAction = async (options) => {
+	console.log("Validating project");
+	if (!await (0, _vocab_core.validate)(options.userConfig)) throw new Error("Project is invalid");
+	console.log("Project is valid");
+};
+program.command("validate").description("Validate translations").action(validateAction);
+program.parseAsync();
 
 //#endregion
 //# sourceMappingURL=index.cjs.map

package/dist/index.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.cjs","names":["config: UserConfig | null","yargs"],"sources":["../src/getGitBranch.ts","../src/index.ts"],"sourcesContent":["import { execSync } from 'node:child_process';\n\n// Modified from `env-ci` to use `execSync`\n// https://github.com/semantic-release/env-ci/blob/e11b2965aa82cd7366511635d9bc4ae3d0144f64/lib/git.js#L11C24-L35\nexport function getGitBranch() {\n  try {\n    const headRef = execSync('git rev-parse --abbrev-ref HEAD', {\n      encoding: 'utf8',\n    }).trim();\n\n    if (headRef === 'HEAD') {\n      const branch = execSync('git show -s --pretty=%d HEAD', {\n        encoding: 'utf8',\n      })\n        .trim()\n        .replace(/^\\(|\\)$/g, '')\n        .split(', ')\n        .find((b) => b.startsWith('origin/'));\n\n      return branch ? branch.match(/^origin\\/(?<branch>.+)/)?.[1] : undefined;\n    }\n\n    return headRef;\n  } catch {\n    return undefined;\n  }\n}\n","/* eslint-disable no-console */\nimport { pull, push } from '@vocab/phrase';\nimport { type UserConfig, resolveConfig, compile, validate } from '@vocab/core';\nimport yargsCli from 'yargs';\nimport { getGitBranch } from './getGitBranch.js';\n\nconst branch = getGitBranch();\n\nconst branchDefinition = {\n  type: 'string',\n  describe: 'The Phrase branch to target',\n  default: branch || 'local-development',\n} as const;\n\nconst ignorePathDefinition = {\n  type: 'string',\n  array: true,\n  describe: 'Array of glob paths to ignore when searching for keys to push',\n  default: [] as string[],\n} as const;\n\nlet config: UserConfig | null = null;\n\nyargsCli(process.argv.slice(2))\n  .scriptName('vocab')\n  .option('config', {\n    type: 'string',\n    describe: 'Path to config file',\n  })\n  .middleware(async ({ config: configPath }) => {\n    config = await resolveConfig(configPath);\n    console.log('Loaded config from', configPath || process.cwd());\n  })\n  .command({\n    command: 'push',\n    builder: (yargs) =>\n      yargs.options({\n        branch: branchDefinition,\n        'delete-unused-keys': {\n          type: 'boolean',\n          describe: 'Whether or not to delete unused keys after pushing',\n          default: false,\n        },\n        ignore: ignorePathDefinition,\n      }),\n    handler: async (options) => {\n      await push(options, config!);\n    },\n  })\n  .command({\n    command: 'pull',\n    builder: (yargs) =>\n      yargs.options({\n        branch: branchDefinition,\n        'error-on-no-global-key-translation': {\n          type: 'boolean',\n          describe:\n            'Throw an error when there is no translation for a global key',\n          default: false,\n        },\n      }),\n    handler: async (options) => {\n      await pull(options, config!);\n    },\n  })\n  .command({\n    command: 'compile',\n    builder: (yargs) =>\n      yargs.options({\n        watch: { type: 'boolean', default: false },\n      }),\n    handler: async ({ watch }) => {\n      await compile({ watch }, config!);\n    },\n  })\n  .command({\n    command: 'validate',\n    handler: async () => {\n      const valid = await validate(config!);\n\n      if (!valid) {\n        throw new Error('Project invalid');\n      }\n    },\n  })\n  .help()\n  .wrap(72)\n  .parse();\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAIA,SAAgB,eAAe;AAC7B,KAAI;EACF,MAAM,2CAAmB,mCAAmC,EAC1D,UAAU,QACX,CAAC,CAAC,MAAM;AAET,MAAI,YAAY,QAAQ;GACtB,MAAM,0CAAkB,gCAAgC,EACtD,UAAU,QACX,CAAC,CACC,MAAM,CACN,QAAQ,YAAY,GAAG,CACvB,MAAM,KAAK,CACX,MAAM,MAAM,EAAE,WAAW,UAAU,CAAC;AAEvC,UAAO,SAAS,OAAO,MAAM,yBAAyB,GAAG,KAAK;;AAGhE,SAAO;SACD;AACN;;;;;;AChBJ,MAAM,mBAAmB;CACvB,MAAM;CACN,UAAU;CACV,SALa,cAAc,IAKR;CACpB;AAED,MAAM,uBAAuB;CAC3B,MAAM;CACN,OAAO;CACP,UAAU;CACV,SAAS,EAAE;CACZ;AAED,IAAIA,SAA4B;mBAEvB,QAAQ,KAAK,MAAM,EAAE,CAAC,CAC5B,WAAW,QAAQ,CACnB,OAAO,UAAU;CAChB,MAAM;CACN,UAAU;CACX,CAAC,CACD,WAAW,OAAO,EAAE,QAAQ,iBAAiB;AAC5C,UAAS,qCAAoB,WAAW;AACxC,SAAQ,IAAI,sBAAsB,cAAc,QAAQ,KAAK,CAAC;EAC9D,CACD,QAAQ;CACP,SAAS;CACT,UAAU,YACRC,QAAM,QAAQ;EACZ,QAAQ;EACR,sBAAsB;GACpB,MAAM;GACN,UAAU;GACV,SAAS;GACV;EACD,QAAQ;EACT,CAAC;CACJ,SAAS,OAAO,YAAY;AAC1B,gCAAW,SAAS,OAAQ;;CAE/B,CAAC,CACD,QAAQ;CACP,SAAS;CACT,UAAU,YACRA,QAAM,QAAQ;EACZ,QAAQ;EACR,sCAAsC;GACpC,MAAM;GACN,UACE;GACF,SAAS;GACV;EACF,CAAC;CACJ,SAAS,OAAO,YAAY;AAC1B,gCAAW,SAAS,OAAQ;;CAE/B,CAAC,CACD,QAAQ;CACP,SAAS;CACT,UAAU,YACRA,QAAM,QAAQ,EACZ,OAAO;EAAE,MAAM;EAAW,SAAS;EAAO,EAC3C,CAAC;CACJ,SAAS,OAAO,EAAE,YAAY;AAC5B,iCAAc,EAAE,OAAO,EAAE,OAAQ;;CAEpC,CAAC,CACD,QAAQ;CACP,SAAS;CACT,SAAS,YAAY;AAGnB,MAAI,CAFU,gCAAe,OAAQ,CAGnC,OAAM,IAAI,MAAM,kBAAkB;;CAGvC,CAAC,CACD,MAAM,CACN,KAAK,GAAG,CACR,OAAO"}
+{"version":3,"file":"index.cjs","names":["Command","Option"],"sources":["../src/getGitBranch.ts","../package.json","../src/index.ts"],"sourcesContent":["import { execSync } from 'node:child_process';\n\n// Modified from `env-ci` to use `execSync`\n// https://github.com/semantic-release/env-ci/blob/e11b2965aa82cd7366511635d9bc4ae3d0144f64/lib/git.js#L11C24-L35\nexport function getGitBranch() {\n  try {\n    const headRef = execSync('git rev-parse --abbrev-ref HEAD', {\n      encoding: 'utf8',\n    }).trim();\n\n    if (headRef === 'HEAD') {\n      const branch = execSync('git show -s --pretty=%d HEAD', {\n        encoding: 'utf8',\n      })\n        .trim()\n        .replace(/^\\(|\\)$/g, '')\n        .split(', ')\n        .find((b) => b.startsWith('origin/'));\n\n      return branch ? branch.match(/^origin\\/(?<branch>.+)/)?.[1] : undefined;\n    }\n\n    return headRef;\n  } catch {\n    return undefined;\n  }\n}\n","","/* eslint-disable no-console */\nimport { pull, push } from '@vocab/phrase';\nimport { type UserConfig, resolveConfig, compile, validate } from '@vocab/core';\nimport { getGitBranch } from './getGitBranch.js';\nimport { Command, Option } from 'commander';\nimport {\n  description,\n  version,\n} from '@vocab/cli/package.json' with { type: 'json' };\n\nconst branch = getGitBranch();\nconst DEFAULT_BRANCH = branch || 'local-development';\n\nconst program = new Command();\n\nprogram\n  .name('vocab')\n  .version(version)\n  .description(description)\n  .option('--config <path>', 'Path to config file')\n  .hook('preAction', async (thisCommand, actionCommand) => {\n    const options = thisCommand.optsWithGlobals<{ config?: string }>();\n\n    console.log('Loading configuration from', options.config || process.cwd());\n    const userConfig = await resolveConfig(options.config);\n\n    if (!userConfig) {\n      throw new Error('No configuration file found');\n    }\n\n    console.log('Successfully loaded configuration');\n    actionCommand.setOptionValue('userConfig', userConfig);\n  });\n\nconst branchOption = new Option(\n  '--branch',\n  'The Phrase branch to target',\n).default(DEFAULT_BRANCH);\n\nconst pushAction = async (options: {\n  branch: string;\n  deleteUnusedKeys?: boolean;\n  ignore?: string[];\n  userConfig: UserConfig;\n}) => {\n  await push(\n    {\n      branch: options.branch,\n      deleteUnusedKeys: options.deleteUnusedKeys,\n      ignore: options.ignore,\n    },\n    options.userConfig,\n  );\n};\n\nprogram\n  .command('push')\n  .description('Push translations to Phrase')\n  .addOption(branchOption)\n  .option(\n    '--delete-unused-keys',\n    'Whether or not to delete unused keys after pushing',\n    false,\n  )\n  .option(\n    '--ignore <paths...>',\n    'Array of glob paths to ignore when searching for keys to push',\n    [],\n  )\n  .action(pushAction);\n\nconst pullAction = async (options: {\n  branch: string;\n  errorOnNoGlobalKeyTranslation: boolean;\n  userConfig: UserConfig;\n}) => {\n  await pull(\n    {\n      branch: options.branch,\n      errorOnNoGlobalKeyTranslation:\n        options.errorOnNoGlobalKeyTranslation || false,\n    },\n    options.userConfig,\n  );\n};\n\nprogram\n  .command('pull')\n  .description('Pull translations from Phrase')\n  .addOption(branchOption)\n  .option(\n    '--error-on-no-global-key-translation',\n    'Throw an error when there is no translation for a global key',\n    false,\n  )\n  .action(pullAction);\n\nconst compileAction = async (options: {\n  watch: boolean;\n  userConfig: UserConfig;\n}) => {\n  await compile({ watch: options.watch }, options.userConfig);\n};\n\nprogram\n  .command('compile')\n  .description('Compile translations')\n  .option('--watch', 'Watch for changes', false)\n  .action(compileAction);\n\nconst validateAction = async (options: { userConfig: UserConfig }) => {\n  console.log('Validating project');\n  const valid = await validate(options.userConfig);\n\n  if (!valid) {\n    throw new Error('Project is invalid');\n  }\n\n  console.log('Project is valid');\n};\n\nprogram\n  .command('validate')\n  .description('Validate translations')\n  .action(validateAction);\n\nprogram.parseAsync();\n"],"mappings":";;;;;;AAIA,SAAgB,eAAe;AAC7B,KAAI;EACF,MAAM,2CAAmB,mCAAmC,EAC1D,UAAU,QACX,CAAC,CAAC,MAAM;AAET,MAAI,YAAY,QAAQ;GACtB,MAAM,0CAAkB,gCAAgC,EACtD,UAAU,QACX,CAAC,CACC,MAAM,CACN,QAAQ,YAAY,GAAG,CACvB,MAAM,KAAK,CACX,MAAM,MAAM,EAAE,WAAW,UAAU,CAAC;AAEvC,UAAO,SAAS,OAAO,MAAM,yBAAyB,GAAG,KAAK;;AAGhE,SAAO;SACD;AACN;;;;;;;;;;;AEbJ,MAAM,iBADS,cAAc,IACI;AAEjC,MAAM,UAAU,IAAIA,mBAAS;AAE7B,QACG,KAAK,QAAQ,CACb,QAAQ,QAAQ,CAChB,YAAY,YAAY,CACxB,OAAO,mBAAmB,sBAAsB,CAChD,KAAK,aAAa,OAAO,aAAa,kBAAkB;CACvD,MAAM,UAAU,YAAY,iBAAsC;AAElE,SAAQ,IAAI,8BAA8B,QAAQ,UAAU,QAAQ,KAAK,CAAC;CAC1E,MAAM,aAAa,qCAAoB,QAAQ,OAAO;AAEtD,KAAI,CAAC,WACH,OAAM,IAAI,MAAM,8BAA8B;AAGhD,SAAQ,IAAI,oCAAoC;AAChD,eAAc,eAAe,cAAc,WAAW;EACtD;AAEJ,MAAM,eAAe,IAAIC,iBACvB,YACA,8BACD,CAAC,QAAQ,eAAe;AAEzB,MAAM,aAAa,OAAO,YAKpB;AACJ,+BACE;EACE,QAAQ,QAAQ;EAChB,kBAAkB,QAAQ;EAC1B,QAAQ,QAAQ;EACjB,EACD,QAAQ,WACT;;AAGH,QACG,QAAQ,OAAO,CACf,YAAY,8BAA8B,CAC1C,UAAU,aAAa,CACvB,OACC,wBACA,sDACA,MACD,CACA,OACC,uBACA,iEACA,EAAE,CACH,CACA,OAAO,WAAW;AAErB,MAAM,aAAa,OAAO,YAIpB;AACJ,+BACE;EACE,QAAQ,QAAQ;EAChB,+BACE,QAAQ,iCAAiC;EAC5C,EACD,QAAQ,WACT;;AAGH,QACG,QAAQ,OAAO,CACf,YAAY,gCAAgC,CAC5C,UAAU,aAAa,CACvB,OACC,wCACA,gEACA,MACD,CACA,OAAO,WAAW;AAErB,MAAM,gBAAgB,OAAO,YAGvB;AACJ,gCAAc,EAAE,OAAO,QAAQ,OAAO,EAAE,QAAQ,WAAW;;AAG7D,QACG,QAAQ,UAAU,CAClB,YAAY,uBAAuB,CACnC,OAAO,WAAW,qBAAqB,MAAM,CAC7C,OAAO,cAAc;AAExB,MAAM,iBAAiB,OAAO,YAAwC;AACpE,SAAQ,IAAI,qBAAqB;AAGjC,KAAI,CAFU,gCAAe,QAAQ,WAAW,CAG9C,OAAM,IAAI,MAAM,qBAAqB;AAGvC,SAAQ,IAAI,mBAAmB;;AAGjC,QACG,QAAQ,WAAW,CACnB,YAAY,wBAAwB,CACpC,OAAO,eAAe;AAEzB,QAAQ,YAAY"}

package/package.json

@@ -1,6 +1,7 @@
 {
   "name": "@vocab/cli",
-  "version": "2.1.10",
+  "version": "2.1.11",
+  "description": "A CLI for generating typed Vocab translations and interacting with 3rd-party localization services",
   "repository": {
     "type": "git",
     "url": "https://github.com/seek-oss/vocab.git",
@@ -22,12 +23,11 @@
   "author": "SEEK",
   "license": "MIT",
   "dependencies": {
-    "yargs": "^17.7.2",
+    "commander": "^14.0.2",
     "@vocab/core": "^1.7.6",
     "@vocab/phrase": "^2.1.10"
   },
   "devDependencies": {
-    "@types/node": "^22.0.0",
-    "@types/yargs": "^17.0.32"
+    "@types/node": "^22.0.0"
   }
 }