@platforma-sdk/tengo-builder 4.0.8 → 4.0.10

package/dist/commands/dump/software.js

@@ -1,19 +1,18 @@
 import { createLogger } from "../../compiler/util.js";
-import { GlobalFlags } from "../../shared/basecmd.js";
+import { GlobalOptions, addOptions } from "../../shared/basecmd.js";
 import { dumpSoftware } from "../../shared/dump.js";
-import { Command } from "@oclif/core";
+import { Command } from "commander";
 import { stdout } from "node:process";
 //#region src/commands/dump/software.ts
-var DumpSoftware = class DumpSoftware extends Command {
-	static description = "parse sources in current package and dump all software descriptors used by templates";
-	static examples = ["<%= config.bin %> <%= command.id %>"];
-	static flags = { ...GlobalFlags };
-	async run() {
-		const { flags } = await this.parse(DumpSoftware);
-		dumpSoftware(createLogger(flags["log-level"]), stdout);
-	}
-};
+function dumpSoftwareCommand() {
+	const cmd = new Command("software").description("parse sources in current package and dump all software descriptors used by templates");
+	addOptions(cmd, GlobalOptions());
+	cmd.action(async (o) => {
+		dumpSoftware(createLogger(o.logLevel), stdout);
+	});
+	return cmd;
+}
 //#endregion
-export { DumpSoftware as default };
+export { dumpSoftwareCommand as default };
 
 //# sourceMappingURL=software.js.map

package/dist/commands/dump/software.js.map

@@ -1 +1 @@
-{"version":3,"file":"software.js","names":["opts.GlobalFlags"],"sources":["../../../src/commands/dump/software.ts"],"sourcesContent":["import { Command } from \"@oclif/core\";\nimport { createLogger } from \"../../compiler/util\";\nimport { dumpSoftware } from \"../../shared/dump\";\nimport { stdout } from \"node:process\";\nimport * as opts from \"../../shared/basecmd\";\n\nexport default class DumpSoftware extends Command {\n  static override description =\n    \"parse sources in current package and dump all software descriptors used by templates\";\n\n  static override examples = [\"<%= config.bin %> <%= command.id %>\"];\n\n  static override flags = {\n    ...opts.GlobalFlags,\n  };\n\n  public async run(): Promise<void> {\n    const { flags } = await this.parse(DumpSoftware);\n    const logger = createLogger(flags[\"log-level\"]);\n    dumpSoftware(logger, stdout);\n  }\n}\n"],"mappings":";;;;;;AAMA,IAAqB,eAArB,MAAqB,qBAAqB,QAAQ;CAChD,OAAgB,cACd;CAEF,OAAgB,WAAW,CAAC,sCAAsC;CAElE,OAAgB,QAAQ,EACtB,GAAGA,aACJ;CAED,MAAa,MAAqB;EAChC,MAAM,EAAE,UAAU,MAAM,KAAK,MAAM,aAAa;AAEhD,eADe,aAAa,MAAM,aAAa,EAC1B,OAAO"}
+{"version":3,"file":"software.js","names":["opts.GlobalOptions"],"sources":["../../../src/commands/dump/software.ts"],"sourcesContent":["import { Command } from \"commander\";\nimport { createLogger } from \"../../compiler/util\";\nimport { dumpSoftware } from \"../../shared/dump\";\nimport { stdout } from \"node:process\";\nimport * as opts from \"../../shared/basecmd\";\n\nexport default function dumpSoftwareCommand(): Command {\n  const cmd = new Command(\"software\").description(\n    \"parse sources in current package and dump all software descriptors used by templates\",\n  );\n\n  opts.addOptions(cmd, opts.GlobalOptions());\n\n  cmd.action(async (o) => {\n    const logger = createLogger(o.logLevel as string);\n    dumpSoftware(logger, stdout);\n  });\n\n  return cmd;\n}\n"],"mappings":";;;;;;AAMA,SAAwB,sBAA+B;CACrD,MAAM,MAAM,IAAI,QAAQ,WAAW,CAAC,YAClC,uFACD;AAED,YAAgB,KAAKA,eAAoB,CAAC;AAE1C,KAAI,OAAO,OAAO,MAAM;AAEtB,eADe,aAAa,EAAE,SAAmB,EAC5B,OAAO;GAC5B;AAEF,QAAO"}

package/dist/commands/test.cjs

@@ -3,19 +3,17 @@ const require_util = require("../compiler/util.cjs");
 const require_basecmd = require("../shared/basecmd.cjs");
 const require_dump = require("../shared/dump.cjs");
 const require_proc = require("../shared/proc.cjs");
-let _oclif_core = require("@oclif/core");
+let commander = require("commander");
 let _milaboratories_tengo_tester = require("@milaboratories/tengo-tester");
 //#region src/commands/test.ts
-var Test = class Test extends _oclif_core.Command {
-	static description = "run tengo unit tests (.test.tengo)";
-	static strict = false;
-	static flags = { ...require_basecmd.GlobalFlags };
-	static examples = ["<%= config.bin %> <%= command.id %>"];
-	async run() {
-		const { flags } = await this.parse(Test);
-		const logger = require_util.createLogger(flags["log-level"]);
-		const testerArgs = this.argv.length == 0 ? ["./src"] : this.argv;
-		const tester = require_proc.spawnEmbed(_milaboratories_tengo_tester.TengoTesterBinaryPath, "run", "--log-level", flags["log-level"], "--artifacts", "-", ...testerArgs);
+function testCommand() {
+	const cmd = new commander.Command("test").description("run tengo unit tests (.test.tengo)");
+	cmd.argument("[paths...]", "source paths to test (defaults to ./src)");
+	require_basecmd.addOptions(cmd, require_basecmd.GlobalOptions());
+	cmd.action(async (paths, o) => {
+		const logLevel = o.logLevel;
+		const logger = require_util.createLogger(logLevel);
+		const tester = require_proc.spawnEmbed(_milaboratories_tengo_tester.TengoTesterBinaryPath, "run", "--log-level", logLevel, "--artifacts", "-", ...paths.length == 0 ? ["./src"] : paths);
 		try {
 			require_dump.dumpArtifacts(logger, tester.stdin);
 		} catch (err) {
@@ -25,9 +23,10 @@ var Test = class Test extends _oclif_core.Command {
 			const code = await require_proc.waitFor(tester);
 			process.exit(code);
 		}
-	}
-};
+	});
+	return cmd;
+}
 //#endregion
-exports.default = Test;
+exports.default = testCommand;
 
 //# sourceMappingURL=test.cjs.map

package/dist/commands/test.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"test.cjs","names":["Command","GlobalFlags","createLogger","spawnEmbed","TengoTesterBinaryPath","waitFor"],"sources":["../../src/commands/test.ts"],"sourcesContent":["import { Command } from \"@oclif/core\";\nimport { createLogger } from \"../compiler/util\";\nimport { dumpArtifacts } from \"../shared/dump\";\nimport { GlobalFlags } from \"../shared/basecmd\";\nimport { spawnEmbed, waitFor } from \"../shared/proc\";\nimport { TengoTesterBinaryPath } from \"@milaboratories/tengo-tester\";\n\nexport default class Test extends Command {\n  static override description = \"run tengo unit tests (.test.tengo)\";\n\n  static strict = false;\n\n  static override flags = { ...GlobalFlags };\n\n  static override examples = [\"<%= config.bin %> <%= command.id %>\"];\n\n  public async run(): Promise<void> {\n    const { flags } = await this.parse(Test);\n    const logger = createLogger(flags[\"log-level\"]);\n\n    const testerArgs: string[] = this.argv.length == 0 ? [\"./src\"] : this.argv;\n\n    const tester = spawnEmbed(\n      TengoTesterBinaryPath,\n      \"run\",\n      \"--log-level\",\n      flags[\"log-level\"],\n      \"--artifacts\",\n      \"-\",\n      ...testerArgs,\n    );\n\n    try {\n      dumpArtifacts(logger, tester.stdin);\n    } catch (err: unknown) {\n      logger.error(err);\n    } finally {\n      tester.stdin.end();\n      const code = await waitFor(tester);\n      process.exit(code);\n    }\n  }\n}\n"],"mappings":";;;;;;;;AAOA,IAAqB,OAArB,MAAqB,aAAaA,YAAAA,QAAQ;CACxC,OAAgB,cAAc;CAE9B,OAAO,SAAS;CAEhB,OAAgB,QAAQ,EAAE,GAAGC,gBAAAA,aAAa;CAE1C,OAAgB,WAAW,CAAC,sCAAsC;CAElE,MAAa,MAAqB;EAChC,MAAM,EAAE,UAAU,MAAM,KAAK,MAAM,KAAK;EACxC,MAAM,SAASC,aAAAA,aAAa,MAAM,aAAa;EAE/C,MAAM,aAAuB,KAAK,KAAK,UAAU,IAAI,CAAC,QAAQ,GAAG,KAAK;EAEtE,MAAM,SAASC,aAAAA,WACbC,6BAAAA,uBACA,OACA,eACA,MAAM,cACN,eACA,KACA,GAAG,WACJ;AAED,MAAI;AACF,gBAAA,cAAc,QAAQ,OAAO,MAAM;WAC5B,KAAc;AACrB,UAAO,MAAM,IAAI;YACT;AACR,UAAO,MAAM,KAAK;GAClB,MAAM,OAAO,MAAMC,aAAAA,QAAQ,OAAO;AAClC,WAAQ,KAAK,KAAK"}
+{"version":3,"file":"test.cjs","names":["Command","GlobalOptions","createLogger","spawnEmbed","TengoTesterBinaryPath","waitFor"],"sources":["../../src/commands/test.ts"],"sourcesContent":["import { Command } from \"commander\";\nimport { createLogger } from \"../compiler/util\";\nimport { dumpArtifacts } from \"../shared/dump\";\nimport { addOptions, GlobalOptions } from \"../shared/basecmd\";\nimport { spawnEmbed, waitFor } from \"../shared/proc\";\nimport { TengoTesterBinaryPath } from \"@milaboratories/tengo-tester\";\n\nexport default function testCommand(): Command {\n  const cmd = new Command(\"test\").description(\"run tengo unit tests (.test.tengo)\");\n\n  cmd.argument(\"[paths...]\", \"source paths to test (defaults to ./src)\");\n  addOptions(cmd, GlobalOptions());\n\n  cmd.action(async (paths: string[], o) => {\n    const logLevel = o.logLevel as string;\n    const logger = createLogger(logLevel);\n\n    const testerArgs: string[] = paths.length == 0 ? [\"./src\"] : paths;\n\n    const tester = spawnEmbed(\n      TengoTesterBinaryPath,\n      \"run\",\n      \"--log-level\",\n      logLevel,\n      \"--artifacts\",\n      \"-\",\n      ...testerArgs,\n    );\n\n    try {\n      dumpArtifacts(logger, tester.stdin);\n    } catch (err: unknown) {\n      logger.error(err);\n    } finally {\n      tester.stdin.end();\n      const code = await waitFor(tester);\n      process.exit(code);\n    }\n  });\n\n  return cmd;\n}\n"],"mappings":";;;;;;;;AAOA,SAAwB,cAAuB;CAC7C,MAAM,MAAM,IAAIA,UAAAA,QAAQ,OAAO,CAAC,YAAY,qCAAqC;AAEjF,KAAI,SAAS,cAAc,2CAA2C;AACtE,iBAAA,WAAW,KAAKC,gBAAAA,eAAe,CAAC;AAEhC,KAAI,OAAO,OAAO,OAAiB,MAAM;EACvC,MAAM,WAAW,EAAE;EACnB,MAAM,SAASC,aAAAA,aAAa,SAAS;EAIrC,MAAM,SAASC,aAAAA,WACbC,6BAAAA,uBACA,OACA,eACA,UACA,eACA,KACA,GAT2B,MAAM,UAAU,IAAI,CAAC,QAAQ,GAAG,MAU5D;AAED,MAAI;AACF,gBAAA,cAAc,QAAQ,OAAO,MAAM;WAC5B,KAAc;AACrB,UAAO,MAAM,IAAI;YACT;AACR,UAAO,MAAM,KAAK;GAClB,MAAM,OAAO,MAAMC,aAAAA,QAAQ,OAAO;AAClC,WAAQ,KAAK,KAAK;;GAEpB;AAEF,QAAO"}

package/dist/commands/test.js

@@ -1,20 +1,18 @@
 import { createLogger } from "../compiler/util.js";
-import { GlobalFlags } from "../shared/basecmd.js";
+import { GlobalOptions, addOptions } from "../shared/basecmd.js";
 import { dumpArtifacts } from "../shared/dump.js";
 import { spawnEmbed, waitFor } from "../shared/proc.js";
-import { Command } from "@oclif/core";
+import { Command } from "commander";
 import { TengoTesterBinaryPath } from "@milaboratories/tengo-tester";
 //#region src/commands/test.ts
-var Test = class Test extends Command {
-	static description = "run tengo unit tests (.test.tengo)";
-	static strict = false;
-	static flags = { ...GlobalFlags };
-	static examples = ["<%= config.bin %> <%= command.id %>"];
-	async run() {
-		const { flags } = await this.parse(Test);
-		const logger = createLogger(flags["log-level"]);
-		const testerArgs = this.argv.length == 0 ? ["./src"] : this.argv;
-		const tester = spawnEmbed(TengoTesterBinaryPath, "run", "--log-level", flags["log-level"], "--artifacts", "-", ...testerArgs);
+function testCommand() {
+	const cmd = new Command("test").description("run tengo unit tests (.test.tengo)");
+	cmd.argument("[paths...]", "source paths to test (defaults to ./src)");
+	addOptions(cmd, GlobalOptions());
+	cmd.action(async (paths, o) => {
+		const logLevel = o.logLevel;
+		const logger = createLogger(logLevel);
+		const tester = spawnEmbed(TengoTesterBinaryPath, "run", "--log-level", logLevel, "--artifacts", "-", ...paths.length == 0 ? ["./src"] : paths);
 		try {
 			dumpArtifacts(logger, tester.stdin);
 		} catch (err) {
@@ -24,9 +22,10 @@ var Test = class Test extends Command {
 			const code = await waitFor(tester);
 			process.exit(code);
 		}
-	}
-};
+	});
+	return cmd;
+}
 //#endregion
-export { Test as default };
+export { testCommand as default };
 
 //# sourceMappingURL=test.js.map

package/dist/commands/test.js.map

@@ -1 +1 @@
-{"version":3,"file":"test.js","names":[],"sources":["../../src/commands/test.ts"],"sourcesContent":["import { Command } from \"@oclif/core\";\nimport { createLogger } from \"../compiler/util\";\nimport { dumpArtifacts } from \"../shared/dump\";\nimport { GlobalFlags } from \"../shared/basecmd\";\nimport { spawnEmbed, waitFor } from \"../shared/proc\";\nimport { TengoTesterBinaryPath } from \"@milaboratories/tengo-tester\";\n\nexport default class Test extends Command {\n  static override description = \"run tengo unit tests (.test.tengo)\";\n\n  static strict = false;\n\n  static override flags = { ...GlobalFlags };\n\n  static override examples = [\"<%= config.bin %> <%= command.id %>\"];\n\n  public async run(): Promise<void> {\n    const { flags } = await this.parse(Test);\n    const logger = createLogger(flags[\"log-level\"]);\n\n    const testerArgs: string[] = this.argv.length == 0 ? [\"./src\"] : this.argv;\n\n    const tester = spawnEmbed(\n      TengoTesterBinaryPath,\n      \"run\",\n      \"--log-level\",\n      flags[\"log-level\"],\n      \"--artifacts\",\n      \"-\",\n      ...testerArgs,\n    );\n\n    try {\n      dumpArtifacts(logger, tester.stdin);\n    } catch (err: unknown) {\n      logger.error(err);\n    } finally {\n      tester.stdin.end();\n      const code = await waitFor(tester);\n      process.exit(code);\n    }\n  }\n}\n"],"mappings":";;;;;;;AAOA,IAAqB,OAArB,MAAqB,aAAa,QAAQ;CACxC,OAAgB,cAAc;CAE9B,OAAO,SAAS;CAEhB,OAAgB,QAAQ,EAAE,GAAG,aAAa;CAE1C,OAAgB,WAAW,CAAC,sCAAsC;CAElE,MAAa,MAAqB;EAChC,MAAM,EAAE,UAAU,MAAM,KAAK,MAAM,KAAK;EACxC,MAAM,SAAS,aAAa,MAAM,aAAa;EAE/C,MAAM,aAAuB,KAAK,KAAK,UAAU,IAAI,CAAC,QAAQ,GAAG,KAAK;EAEtE,MAAM,SAAS,WACb,uBACA,OACA,eACA,MAAM,cACN,eACA,KACA,GAAG,WACJ;AAED,MAAI;AACF,iBAAc,QAAQ,OAAO,MAAM;WAC5B,KAAc;AACrB,UAAO,MAAM,IAAI;YACT;AACR,UAAO,MAAM,KAAK;GAClB,MAAM,OAAO,MAAM,QAAQ,OAAO;AAClC,WAAQ,KAAK,KAAK"}
+{"version":3,"file":"test.js","names":[],"sources":["../../src/commands/test.ts"],"sourcesContent":["import { Command } from \"commander\";\nimport { createLogger } from \"../compiler/util\";\nimport { dumpArtifacts } from \"../shared/dump\";\nimport { addOptions, GlobalOptions } from \"../shared/basecmd\";\nimport { spawnEmbed, waitFor } from \"../shared/proc\";\nimport { TengoTesterBinaryPath } from \"@milaboratories/tengo-tester\";\n\nexport default function testCommand(): Command {\n  const cmd = new Command(\"test\").description(\"run tengo unit tests (.test.tengo)\");\n\n  cmd.argument(\"[paths...]\", \"source paths to test (defaults to ./src)\");\n  addOptions(cmd, GlobalOptions());\n\n  cmd.action(async (paths: string[], o) => {\n    const logLevel = o.logLevel as string;\n    const logger = createLogger(logLevel);\n\n    const testerArgs: string[] = paths.length == 0 ? [\"./src\"] : paths;\n\n    const tester = spawnEmbed(\n      TengoTesterBinaryPath,\n      \"run\",\n      \"--log-level\",\n      logLevel,\n      \"--artifacts\",\n      \"-\",\n      ...testerArgs,\n    );\n\n    try {\n      dumpArtifacts(logger, tester.stdin);\n    } catch (err: unknown) {\n      logger.error(err);\n    } finally {\n      tester.stdin.end();\n      const code = await waitFor(tester);\n      process.exit(code);\n    }\n  });\n\n  return cmd;\n}\n"],"mappings":";;;;;;;AAOA,SAAwB,cAAuB;CAC7C,MAAM,MAAM,IAAI,QAAQ,OAAO,CAAC,YAAY,qCAAqC;AAEjF,KAAI,SAAS,cAAc,2CAA2C;AACtE,YAAW,KAAK,eAAe,CAAC;AAEhC,KAAI,OAAO,OAAO,OAAiB,MAAM;EACvC,MAAM,WAAW,EAAE;EACnB,MAAM,SAAS,aAAa,SAAS;EAIrC,MAAM,SAAS,WACb,uBACA,OACA,eACA,UACA,eACA,KACA,GAT2B,MAAM,UAAU,IAAI,CAAC,QAAQ,GAAG,MAU5D;AAED,MAAI;AACF,iBAAc,QAAQ,OAAO,MAAM;WAC5B,KAAc;AACrB,UAAO,MAAM,IAAI;YACT;AACR,UAAO,MAAM,KAAK;GAClB,MAAM,OAAO,MAAM,QAAQ,OAAO;AAClC,WAAQ,KAAK,KAAK;;GAEpB;AAEF,QAAO"}

package/dist/index.cjs

@@ -1,18 +1,4 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_build = require("./commands/build.cjs");
-const require_check = require("./commands/check.cjs");
-const require_test = require("./commands/test.cjs");
-const require_artifacts = require("./commands/dump/artifacts.cjs");
-const require_software = require("./commands/dump/software.cjs");
-//#region src/index.ts
-const COMMANDS = {
-	build: require_build.default,
-	check: require_check.default,
-	test: require_test.default,
-	"dump:artifacts": require_artifacts.default,
-	"dump:software": require_software.default
-};
-//#endregion
-exports.COMMANDS = COMMANDS;
-
-//# sourceMappingURL=index.cjs.map
+const require_cli = require("./cli.cjs");
+exports.buildProgram = require_cli.buildProgram;
+exports.run = require_cli.run;

package/dist/index.d.ts

@@ -1,17 +1,2 @@
-import { Build } from "./commands/build.js";
-import { Check } from "./commands/check.js";
-import { Test } from "./commands/test.js";
-import { DumpArtifacts } from "./commands/dump/artifacts.js";
-import { DumpSoftware } from "./commands/dump/software.js";
-
-//#region src/index.d.ts
-declare const COMMANDS: {
-  build: typeof Build;
-  check: typeof Check;
-  test: typeof Test;
-  "dump:artifacts": typeof DumpArtifacts;
-  "dump:software": typeof DumpSoftware;
-};
-//#endregion
-export { COMMANDS };
-//# sourceMappingURL=index.d.ts.map
+import { buildProgram, run } from "./cli.js";
+export { buildProgram, run };

package/dist/index.js

@@ -1,17 +1,2 @@
-import Build from "./commands/build.js";
-import Check from "./commands/check.js";
-import Test from "./commands/test.js";
-import DumpArtifacts from "./commands/dump/artifacts.js";
-import DumpSoftware from "./commands/dump/software.js";
-//#region src/index.ts
-const COMMANDS = {
-	build: Build,
-	check: Check,
-	test: Test,
-	"dump:artifacts": DumpArtifacts,
-	"dump:software": DumpSoftware
-};
-//#endregion
-export { COMMANDS };
-
-//# sourceMappingURL=index.js.map
+import { buildProgram, run } from "./cli.js";
+export { buildProgram, run };

package/dist/shared/basecmd.cjs

@@ -1,49 +1,38 @@
 require("../_virtual/_rolldown/runtime.cjs");
-let _oclif_core = require("@oclif/core");
+let commander = require("commander");
 //#region src/shared/basecmd.ts
-const GlobalFlags = { "log-level": _oclif_core.Flags.string({
-	description: "logging level",
-	default: "info",
-	options: [
-		"error",
-		"warn",
-		"info",
-		"debug"
-	]
-}) };
-const CtagsFlags = {
-	"generate-tags": _oclif_core.Flags.boolean({
-		description: "generate tags, default false",
-		default: false
-	}),
-	"tags-file": _oclif_core.Flags.file({
-		description: "where to put \".tags\" file, it should be a root of VS Code project",
-		default: "../../.tags"
-	}),
-	"tags-additional-args": _oclif_core.Flags.string({
-		description: "additional flags for universal-ctags command: e.g. -e for emacs",
-		default: [],
-		multiple: true,
-		delimiter: ","
-	})
-};
-const ArtifactTypeFlag = { type: _oclif_core.Flags.string({
-	aliases: ["t"],
-	description: "artifact type",
-	options: [
-		"all",
-		"library",
-		"template",
-		"test",
-		"software",
-		"asset",
-		"wasm"
-	],
-	default: "all"
-}) };
+/** Add one or more groups of options to a command, preserving group order. */
+function addOptions(cmd, ...optionGroups) {
+	for (const group of optionGroups) for (const opt of group) cmd.addOption(opt);
+	return cmd;
+}
+function collectComma(value, previous) {
+	return previous.concat(value.split(","));
+}
+const GlobalOptions = () => [new commander.Option("--log-level <level>", "logging level").choices([
+	"error",
+	"warn",
+	"info",
+	"debug"
+]).default("info")];
+const CtagsOptions = () => [
+	new commander.Option("--generate-tags", "generate tags, default false").default(false),
+	new commander.Option("--tags-file <path>", "where to put \".tags\" file, it should be a root of VS Code project").default("../../.tags"),
+	new commander.Option("--tags-additional-args <args>", "additional flags for universal-ctags command: e.g. -e for emacs").argParser(collectComma).default([])
+];
+const ArtifactTypeOptions = () => [new commander.Option("-t, --type <type>", "artifact type").choices([
+	"all",
+	"library",
+	"template",
+	"test",
+	"software",
+	"asset",
+	"wasm"
+]).default("all")];
 //#endregion
-exports.ArtifactTypeFlag = ArtifactTypeFlag;
-exports.CtagsFlags = CtagsFlags;
-exports.GlobalFlags = GlobalFlags;
+exports.ArtifactTypeOptions = ArtifactTypeOptions;
+exports.CtagsOptions = CtagsOptions;
+exports.GlobalOptions = GlobalOptions;
+exports.addOptions = addOptions;
 
 //# sourceMappingURL=basecmd.cjs.map

package/dist/shared/basecmd.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"basecmd.cjs","names":["Flags"],"sources":["../../src/shared/basecmd.ts"],"sourcesContent":["import { Flags } from \"@oclif/core\";\n\nexport const GlobalFlags = {\n  \"log-level\": Flags.string({\n    description: \"logging level\",\n    default: \"info\",\n    options: [\"error\", \"warn\", \"info\", \"debug\"],\n  }),\n};\n\nexport const CtagsFlags = {\n  \"generate-tags\": Flags.boolean({\n    description: \"generate tags, default false\",\n    default: false,\n  }),\n\n  \"tags-file\": Flags.file({\n    description: 'where to put \".tags\" file, it should be a root of VS Code project',\n    default: \"../../.tags\", // usually a user opens a directory with all blocks\n  }),\n\n  \"tags-additional-args\": Flags.string({\n    description: \"additional flags for universal-ctags command: e.g. -e for emacs\",\n    default: [],\n    multiple: true,\n    delimiter: \",\",\n  }),\n};\n\nexport const ArtifactTypeFlag = {\n  type: Flags.string({\n    aliases: [\"t\"],\n    description: \"artifact type\",\n    options: [\"all\", \"library\", \"template\", \"test\", \"software\", \"asset\", \"wasm\"],\n    default: \"all\",\n  }),\n};\n"],"mappings":";;;AAEA,MAAa,cAAc,EACzB,aAAaA,YAAAA,MAAM,OAAO;CACxB,aAAa;CACb,SAAS;CACT,SAAS;EAAC;EAAS;EAAQ;EAAQ;EAAQ;CAC5C,CAAC,EACH;AAED,MAAa,aAAa;CACxB,iBAAiBA,YAAAA,MAAM,QAAQ;EAC7B,aAAa;EACb,SAAS;EACV,CAAC;CAEF,aAAaA,YAAAA,MAAM,KAAK;EACtB,aAAa;EACb,SAAS;EACV,CAAC;CAEF,wBAAwBA,YAAAA,MAAM,OAAO;EACnC,aAAa;EACb,SAAS,EAAE;EACX,UAAU;EACV,WAAW;EACZ,CAAC;CACH;AAED,MAAa,mBAAmB,EAC9B,MAAMA,YAAAA,MAAM,OAAO;CACjB,SAAS,CAAC,IAAI;CACd,aAAa;CACb,SAAS;EAAC;EAAO;EAAW;EAAY;EAAQ;EAAY;EAAS;EAAO;CAC5E,SAAS;CACV,CAAC,EACH"}
+{"version":3,"file":"basecmd.cjs","names":["Option"],"sources":["../../src/shared/basecmd.ts"],"sourcesContent":["import { Command, Option } from \"commander\";\n\n/** Add one or more groups of options to a command, preserving group order. */\nexport function addOptions(cmd: Command, ...optionGroups: Option[][]): Command {\n  for (const group of optionGroups) {\n    for (const opt of group) cmd.addOption(opt);\n  }\n  return cmd;\n}\n\n// Comma-delimited, repeatable collector: `--tags-additional-args -e,-x` and/or\n// repeated occurrences accumulate into a single string[].\nfunction collectComma(value: string, previous: string[]): string[] {\n  return previous.concat(value.split(\",\"));\n}\n\nexport const GlobalOptions = (): Option[] => [\n  new Option(\"--log-level <level>\", \"logging level\")\n    .choices([\"error\", \"warn\", \"info\", \"debug\"])\n    .default(\"info\"),\n];\n\nexport const CtagsOptions = (): Option[] => [\n  new Option(\"--generate-tags\", \"generate tags, default false\").default(false),\n  new Option(\n    \"--tags-file <path>\",\n    'where to put \".tags\" file, it should be a root of VS Code project',\n  ).default(\"../../.tags\"), // usually a user opens a directory with all blocks\n  new Option(\n    \"--tags-additional-args <args>\",\n    \"additional flags for universal-ctags command: e.g. -e for emacs\",\n  )\n    .argParser(collectComma)\n    .default([] as string[]),\n];\n\nexport const ArtifactTypeOptions = (): Option[] => [\n  new Option(\"-t, --type <type>\", \"artifact type\")\n    .choices([\"all\", \"library\", \"template\", \"test\", \"software\", \"asset\", \"wasm\"])\n    .default(\"all\"),\n];\n"],"mappings":";;;;AAGA,SAAgB,WAAW,KAAc,GAAG,cAAmC;AAC7E,MAAK,MAAM,SAAS,aAClB,MAAK,MAAM,OAAO,MAAO,KAAI,UAAU,IAAI;AAE7C,QAAO;;AAKT,SAAS,aAAa,OAAe,UAA8B;AACjE,QAAO,SAAS,OAAO,MAAM,MAAM,IAAI,CAAC;;AAG1C,MAAa,sBAAgC,CAC3C,IAAIA,UAAAA,OAAO,uBAAuB,gBAAgB,CAC/C,QAAQ;CAAC;CAAS;CAAQ;CAAQ;CAAQ,CAAC,CAC3C,QAAQ,OAAO,CACnB;AAED,MAAa,qBAA+B;CAC1C,IAAIA,UAAAA,OAAO,mBAAmB,+BAA+B,CAAC,QAAQ,MAAM;CAC5E,IAAIA,UAAAA,OACF,sBACA,sEACD,CAAC,QAAQ,cAAc;CACxB,IAAIA,UAAAA,OACF,iCACA,kEACD,CACE,UAAU,aAAa,CACvB,QAAQ,EAAE,CAAa;CAC3B;AAED,MAAa,4BAAsC,CACjD,IAAIA,UAAAA,OAAO,qBAAqB,gBAAgB,CAC7C,QAAQ;CAAC;CAAO;CAAW;CAAY;CAAQ;CAAY;CAAS;CAAO,CAAC,CAC5E,QAAQ,MAAM,CAClB"}

package/dist/shared/basecmd.js

@@ -1,46 +1,34 @@
-import { Flags } from "@oclif/core";
+import { Option } from "commander";
 //#region src/shared/basecmd.ts
-const GlobalFlags = { "log-level": Flags.string({
-	description: "logging level",
-	default: "info",
-	options: [
-		"error",
-		"warn",
-		"info",
-		"debug"
-	]
-}) };
-const CtagsFlags = {
-	"generate-tags": Flags.boolean({
-		description: "generate tags, default false",
-		default: false
-	}),
-	"tags-file": Flags.file({
-		description: "where to put \".tags\" file, it should be a root of VS Code project",
-		default: "../../.tags"
-	}),
-	"tags-additional-args": Flags.string({
-		description: "additional flags for universal-ctags command: e.g. -e for emacs",
-		default: [],
-		multiple: true,
-		delimiter: ","
-	})
-};
-const ArtifactTypeFlag = { type: Flags.string({
-	aliases: ["t"],
-	description: "artifact type",
-	options: [
-		"all",
-		"library",
-		"template",
-		"test",
-		"software",
-		"asset",
-		"wasm"
-	],
-	default: "all"
-}) };
+/** Add one or more groups of options to a command, preserving group order. */
+function addOptions(cmd, ...optionGroups) {
+	for (const group of optionGroups) for (const opt of group) cmd.addOption(opt);
+	return cmd;
+}
+function collectComma(value, previous) {
+	return previous.concat(value.split(","));
+}
+const GlobalOptions = () => [new Option("--log-level <level>", "logging level").choices([
+	"error",
+	"warn",
+	"info",
+	"debug"
+]).default("info")];
+const CtagsOptions = () => [
+	new Option("--generate-tags", "generate tags, default false").default(false),
+	new Option("--tags-file <path>", "where to put \".tags\" file, it should be a root of VS Code project").default("../../.tags"),
+	new Option("--tags-additional-args <args>", "additional flags for universal-ctags command: e.g. -e for emacs").argParser(collectComma).default([])
+];
+const ArtifactTypeOptions = () => [new Option("-t, --type <type>", "artifact type").choices([
+	"all",
+	"library",
+	"template",
+	"test",
+	"software",
+	"asset",
+	"wasm"
+]).default("all")];
 //#endregion
-export { ArtifactTypeFlag, CtagsFlags, GlobalFlags };
+export { ArtifactTypeOptions, CtagsOptions, GlobalOptions, addOptions };
 
 //# sourceMappingURL=basecmd.js.map

package/dist/shared/basecmd.js.map

@@ -1 +1 @@
-{"version":3,"file":"basecmd.js","names":[],"sources":["../../src/shared/basecmd.ts"],"sourcesContent":["import { Flags } from \"@oclif/core\";\n\nexport const GlobalFlags = {\n  \"log-level\": Flags.string({\n    description: \"logging level\",\n    default: \"info\",\n    options: [\"error\", \"warn\", \"info\", \"debug\"],\n  }),\n};\n\nexport const CtagsFlags = {\n  \"generate-tags\": Flags.boolean({\n    description: \"generate tags, default false\",\n    default: false,\n  }),\n\n  \"tags-file\": Flags.file({\n    description: 'where to put \".tags\" file, it should be a root of VS Code project',\n    default: \"../../.tags\", // usually a user opens a directory with all blocks\n  }),\n\n  \"tags-additional-args\": Flags.string({\n    description: \"additional flags for universal-ctags command: e.g. -e for emacs\",\n    default: [],\n    multiple: true,\n    delimiter: \",\",\n  }),\n};\n\nexport const ArtifactTypeFlag = {\n  type: Flags.string({\n    aliases: [\"t\"],\n    description: \"artifact type\",\n    options: [\"all\", \"library\", \"template\", \"test\", \"software\", \"asset\", \"wasm\"],\n    default: \"all\",\n  }),\n};\n"],"mappings":";;AAEA,MAAa,cAAc,EACzB,aAAa,MAAM,OAAO;CACxB,aAAa;CACb,SAAS;CACT,SAAS;EAAC;EAAS;EAAQ;EAAQ;EAAQ;CAC5C,CAAC,EACH;AAED,MAAa,aAAa;CACxB,iBAAiB,MAAM,QAAQ;EAC7B,aAAa;EACb,SAAS;EACV,CAAC;CAEF,aAAa,MAAM,KAAK;EACtB,aAAa;EACb,SAAS;EACV,CAAC;CAEF,wBAAwB,MAAM,OAAO;EACnC,aAAa;EACb,SAAS,EAAE;EACX,UAAU;EACV,WAAW;EACZ,CAAC;CACH;AAED,MAAa,mBAAmB,EAC9B,MAAM,MAAM,OAAO;CACjB,SAAS,CAAC,IAAI;CACd,aAAa;CACb,SAAS;EAAC;EAAO;EAAW;EAAY;EAAQ;EAAY;EAAS;EAAO;CAC5E,SAAS;CACV,CAAC,EACH"}
+{"version":3,"file":"basecmd.js","names":[],"sources":["../../src/shared/basecmd.ts"],"sourcesContent":["import { Command, Option } from \"commander\";\n\n/** Add one or more groups of options to a command, preserving group order. */\nexport function addOptions(cmd: Command, ...optionGroups: Option[][]): Command {\n  for (const group of optionGroups) {\n    for (const opt of group) cmd.addOption(opt);\n  }\n  return cmd;\n}\n\n// Comma-delimited, repeatable collector: `--tags-additional-args -e,-x` and/or\n// repeated occurrences accumulate into a single string[].\nfunction collectComma(value: string, previous: string[]): string[] {\n  return previous.concat(value.split(\",\"));\n}\n\nexport const GlobalOptions = (): Option[] => [\n  new Option(\"--log-level <level>\", \"logging level\")\n    .choices([\"error\", \"warn\", \"info\", \"debug\"])\n    .default(\"info\"),\n];\n\nexport const CtagsOptions = (): Option[] => [\n  new Option(\"--generate-tags\", \"generate tags, default false\").default(false),\n  new Option(\n    \"--tags-file <path>\",\n    'where to put \".tags\" file, it should be a root of VS Code project',\n  ).default(\"../../.tags\"), // usually a user opens a directory with all blocks\n  new Option(\n    \"--tags-additional-args <args>\",\n    \"additional flags for universal-ctags command: e.g. -e for emacs\",\n  )\n    .argParser(collectComma)\n    .default([] as string[]),\n];\n\nexport const ArtifactTypeOptions = (): Option[] => [\n  new Option(\"-t, --type <type>\", \"artifact type\")\n    .choices([\"all\", \"library\", \"template\", \"test\", \"software\", \"asset\", \"wasm\"])\n    .default(\"all\"),\n];\n"],"mappings":";;;AAGA,SAAgB,WAAW,KAAc,GAAG,cAAmC;AAC7E,MAAK,MAAM,SAAS,aAClB,MAAK,MAAM,OAAO,MAAO,KAAI,UAAU,IAAI;AAE7C,QAAO;;AAKT,SAAS,aAAa,OAAe,UAA8B;AACjE,QAAO,SAAS,OAAO,MAAM,MAAM,IAAI,CAAC;;AAG1C,MAAa,sBAAgC,CAC3C,IAAI,OAAO,uBAAuB,gBAAgB,CAC/C,QAAQ;CAAC;CAAS;CAAQ;CAAQ;CAAQ,CAAC,CAC3C,QAAQ,OAAO,CACnB;AAED,MAAa,qBAA+B;CAC1C,IAAI,OAAO,mBAAmB,+BAA+B,CAAC,QAAQ,MAAM;CAC5E,IAAI,OACF,sBACA,sEACD,CAAC,QAAQ,cAAc;CACxB,IAAI,OACF,iCACA,kEACD,CACE,UAAU,aAAa,CACvB,QAAQ,EAAE,CAAa;CAC3B;AAED,MAAa,4BAAsC,CACjD,IAAI,OAAO,qBAAqB,gBAAgB,CAC7C,QAAQ;CAAC;CAAO;CAAW;CAAY;CAAQ;CAAY;CAAS;CAAO,CAAC,CAC5E,QAAQ,MAAM,CAClB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platforma-sdk/tengo-builder",
-  "version": "4.0.8",
+  "version": "4.0.10",
   "description": "Pl Tengo Template Builder",
   "license": "UNLICENSED",
   "bin": {
@@ -14,10 +14,10 @@
   "type": "module",
   "dependencies": {
     "@milaboratories/tengo-tester": "^1.6.4",
-    "@oclif/core": "^4.0.37",
+    "commander": "^15.0.0",
     "winston": "^3.17.0",
     "@milaboratories/ts-helpers": "1.8.3",
-    "@milaboratories/pl-model-backend": "1.4.7",
+    "@milaboratories/pl-model-backend": "1.4.8",
     "@milaboratories/resolve-helper": "1.1.3"
   },
   "devDependencies": {
@@ -25,26 +25,15 @@
     "@vitest/coverage-istanbul": "^4.1.3",
     "typescript": "~5.9.3",
     "vitest": "^4.1.3",
-    "@milaboratories/oclif-index": "1.1.1",
-    "@milaboratories/ts-builder": "1.5.0",
-    "@milaboratories/ts-configs": "1.2.3",
-    "@milaboratories/build-configs": "2.0.0"
-  },
-  "oclif": {
-    "bin": "pl-tengo",
-    "commands": {
-      "identifier": "COMMANDS",
-      "strategy": "explicit",
-      "target": "./dist/index.js"
-    },
-    "dirname": "pl-tengo",
-    "topicSeparator": " "
+    "@milaboratories/build-configs": "2.0.0",
+    "@milaboratories/ts-builder": "1.5.2",
+    "@milaboratories/ts-configs": "1.2.3"
   },
   "engines": {
     "node": ">=22"
   },
   "scripts": {
-    "build": "oclif-index && node --run fmt && ts-builder build --target node",
+    "build": "node --run fmt && ts-builder build --target node",
     "watch": "ts-builder build --target node --watch",
     "check": "ts-builder check --target node",
     "formatter:check": "ts-builder formatter --check",

package/src/cli.ts

@@ -0,0 +1,27 @@
+import { Command } from "commander";
+import buildCommand from "./commands/build";
+import checkCommand from "./commands/check";
+import testCommand from "./commands/test";
+import dumpArtifactsCommand from "./commands/dump/artifacts";
+import dumpSoftwareCommand from "./commands/dump/software";
+
+export function buildProgram(): Command {
+  const program = new Command();
+  program.name("pl-tengo").description("Pl Tengo Template Builder");
+
+  program.addCommand(buildCommand());
+  program.addCommand(checkCommand());
+  program.addCommand(testCommand());
+
+  // `dump` is a pure topic (no action): `pl-tengo dump` prints help.
+  const dump = new Command("dump").description("dump parsed artifacts or software descriptors");
+  dump.addCommand(dumpArtifactsCommand());
+  dump.addCommand(dumpSoftwareCommand());
+  program.addCommand(dump);
+
+  return program;
+}
+
+export async function run(argv: string[] = process.argv): Promise<void> {
+  await buildProgram().parseAsync(argv);
+}

package/src/commands/build.ts

@@ -1,6 +1,6 @@
 import type { SpawnSyncReturns } from "node:child_process";
 import { spawnSync } from "node:child_process";
-import { Command } from "@oclif/core";
+import { Command } from "commander";
 import { compile, savePacks, getPackageInfo } from "../compiler/main";
 import { createLogger } from "../compiler/util";
 import * as opts from "../shared/basecmd";
@@ -10,18 +10,20 @@ import * as path from "node:path";
 import type * as winston from "winston";
 import type { TemplatesAndLibs } from "../compiler/compiler";
 
-export default class Build extends Command {
-  static override description = "build tengo sources into single distributable pack file";
-
-  static override examples = ["<%= config.bin %> <%= command.id %>"];
+export default function buildCommand(): Command {
+  const cmd = new Command("build").description(
+    "build tengo sources into single distributable pack file",
+  );
 
-  static override flags = {
-    ...opts.GlobalFlags,
-    ...opts.CtagsFlags,
-  };
+  opts.addOptions(cmd, opts.GlobalOptions(), opts.CtagsOptions());
 
-  public async run(): Promise<void> {
-    const { flags } = await this.parse(Build);
+  cmd.action(async (o) => {
+    const flags = {
+      "log-level": o.logLevel as string,
+      "generate-tags": o.generateTags as boolean,
+      "tags-file": o.tagsFile as string,
+      "tags-additional-args": o.tagsAdditionalArgs as string[],
+    };
     const logger = createLogger(flags["log-level"]);
 
     const packageInfo = getPackageInfo(process.cwd(), logger);
@@ -44,7 +46,9 @@ export default class Build extends Command {
     if (flags["generate-tags"]) checkAndGenerateCtags(logger, flags);
 
     logger.info("Template Pack build done.");
-  }
+  });
+
+  return cmd;
 }
 
 function generateTsBinding(compiledDist: TemplatesAndLibs) {

package/src/commands/check.ts

@@ -1,34 +1,27 @@
-import { Command } from "@oclif/core";
+import { Command } from "commander";
 import { createLogger } from "../compiler/util";
 import { dumpArtifacts } from "../shared/dump";
-import { GlobalFlags } from "../shared/basecmd";
+import { addOptions, GlobalOptions } from "../shared/basecmd";
 import { spawnEmbed, waitFor } from "../shared/proc";
 import { TengoTesterBinaryPath } from "@milaboratories/tengo-tester";
 
-export default class Check extends Command {
-  static override description = "check tengo sources for language processor an";
+export default function checkCommand(): Command {
+  const cmd = new Command("check").description("check tengo sources for language processor an");
 
-  // static override args = {
-  //   "log-level": Args.string({description: 'logging level'}),
-  // }
+  cmd.argument("[paths...]", "source paths to check (defaults to ./src)");
+  addOptions(cmd, GlobalOptions());
 
-  static strict = false;
+  cmd.action(async (paths: string[], o) => {
+    const logLevel = o.logLevel as string;
+    const logger = createLogger(logLevel);
 
-  static override flags = { ...GlobalFlags };
-
-  static override examples = ["<%= config.bin %> <%= command.id %>"];
-
-  public async run(): Promise<void> {
-    const { flags, argv } = await this.parse(Check);
-    const logger = createLogger(flags["log-level"]);
-
-    const testerArgs: string[] = argv.length == 0 ? ["./src"] : (argv as string[]);
+    const testerArgs: string[] = paths.length == 0 ? ["./src"] : paths;
 
     const tester = spawnEmbed(
       TengoTesterBinaryPath,
       "check",
       "--log-level",
-      flags["log-level"],
+      logLevel,
       "--artifacts",
       "-",
       ...testerArgs,
@@ -43,5 +36,7 @@ export default class Check extends Command {
       const code = await waitFor(tester);
       process.exit(code);
     }
-  }
+  });
+
+  return cmd;
 }