@platforma-sdk/tengo-builder 4.0.9 → 4.0.10

package/src/commands/dump/artifacts.ts

@@ -1,24 +1,21 @@
-import { Command } from "@oclif/core";
+import { Command } from "commander";
 import { createLogger } from "../../compiler/util";
 import { dumpArtifacts } from "../../shared/dump";
 import { stdout } from "node:process";
 import type { ArtifactType } from "../../compiler/package";
 import * as opts from "../../shared/basecmd";
 
-export default class DumpArtifacts extends Command {
-  static override description =
-    "parse sources in current package and dump all found artifacts to stdout";
+export default function dumpArtifactsCommand(): Command {
+  const cmd = new Command("artifacts").description(
+    "parse sources in current package and dump all found artifacts to stdout",
+  );
 
-  static override examples = ["<%= config.bin %> <%= command.id %>"];
+  opts.addOptions(cmd, opts.GlobalOptions(), opts.ArtifactTypeOptions());
 
-  static override flags = {
-    ...opts.GlobalFlags,
-    ...opts.ArtifactTypeFlag,
-  };
+  cmd.action(async (o) => {
+    const logger = createLogger(o.logLevel as string);
+    dumpArtifacts(logger, stdout, o.type == "all" ? undefined : (o.type as ArtifactType));
+  });
 
-  public async run(): Promise<void> {
-    const { flags } = await this.parse(DumpArtifacts);
-    const logger = createLogger(flags["log-level"]);
-    dumpArtifacts(logger, stdout, flags.type == "all" ? undefined : (flags.type as ArtifactType));
-  }
+  return cmd;
 }

package/src/commands/dump/software.ts

@@ -1,22 +1,20 @@
-import { Command } from "@oclif/core";
+import { Command } from "commander";
 import { createLogger } from "../../compiler/util";
 import { dumpSoftware } from "../../shared/dump";
 import { stdout } from "node:process";
 import * as opts from "../../shared/basecmd";
 
-export default class DumpSoftware extends Command {
-  static override description =
-    "parse sources in current package and dump all software descriptors used by templates";
+export default function dumpSoftwareCommand(): Command {
+  const cmd = new Command("software").description(
+    "parse sources in current package and dump all software descriptors used by templates",
+  );
 
-  static override examples = ["<%= config.bin %> <%= command.id %>"];
+  opts.addOptions(cmd, opts.GlobalOptions());
 
-  static override flags = {
-    ...opts.GlobalFlags,
-  };
-
-  public async run(): Promise<void> {
-    const { flags } = await this.parse(DumpSoftware);
-    const logger = createLogger(flags["log-level"]);
+  cmd.action(async (o) => {
+    const logger = createLogger(o.logLevel as string);
     dumpSoftware(logger, stdout);
-  }
+  });
+
+  return cmd;
 }

package/src/commands/test.ts

@@ -1,30 +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 Test extends Command {
-  static override description = "run tengo unit tests (.test.tengo)";
+export default function testCommand(): Command {
+  const cmd = new Command("test").description("run tengo unit tests (.test.tengo)");
 
-  static strict = false;
+  cmd.argument("[paths...]", "source paths to test (defaults to ./src)");
+  addOptions(cmd, GlobalOptions());
 
-  static override flags = { ...GlobalFlags };
+  cmd.action(async (paths: string[], o) => {
+    const logLevel = o.logLevel as string;
+    const logger = createLogger(logLevel);
 
-  static override examples = ["<%= config.bin %> <%= command.id %>"];
-
-  public async run(): Promise<void> {
-    const { flags } = await this.parse(Test);
-    const logger = createLogger(flags["log-level"]);
-
-    const testerArgs: string[] = this.argv.length == 0 ? ["./src"] : this.argv;
+    const testerArgs: string[] = paths.length == 0 ? ["./src"] : paths;
 
     const tester = spawnEmbed(
       TengoTesterBinaryPath,
       "run",
       "--log-level",
-      flags["log-level"],
+      logLevel,
       "--artifacts",
       "-",
       ...testerArgs,
@@ -39,5 +36,7 @@ export default class Test extends Command {
       const code = await waitFor(tester);
       process.exit(code);
     }
-  }
+  });
+
+  return cmd;
 }

package/src/index.ts

@@ -1,15 +1 @@
-// DO NOT EDIT. This file was generated by oclif-index utility.
-
-import Cmd0 from "./commands/build";
-import Cmd1 from "./commands/check";
-import Cmd2 from "./commands/test";
-import Cmd3 from "./commands/dump/artifacts";
-import Cmd4 from "./commands/dump/software";
-
-export const COMMANDS = {
-  build: Cmd0,
-  check: Cmd1,
-  test: Cmd2,
-  "dump:artifacts": Cmd3,
-  "dump:software": Cmd4,
-};
+export { run, buildProgram } from "./cli";

package/src/shared/basecmd.ts

@@ -1,37 +1,41 @@
-import { Flags } from "@oclif/core";
+import { Command, Option } from "commander";
 
-export const GlobalFlags = {
-  "log-level": Flags.string({
-    description: "logging level",
-    default: "info",
-    options: ["error", "warn", "info", "debug"],
-  }),
-};
+/** Add one or more groups of options to a command, preserving group order. */
+export function addOptions(cmd: Command, ...optionGroups: Option[][]): Command {
+  for (const group of optionGroups) {
+    for (const opt of group) cmd.addOption(opt);
+  }
+  return cmd;
+}
 
-export const CtagsFlags = {
-  "generate-tags": Flags.boolean({
-    description: "generate tags, default false",
-    default: false,
-  }),
+// Comma-delimited, repeatable collector: `--tags-additional-args -e,-x` and/or
+// repeated occurrences accumulate into a single string[].
+function collectComma(value: string, previous: string[]): string[] {
+  return previous.concat(value.split(","));
+}
 
-  "tags-file": Flags.file({
-    description: 'where to put ".tags" file, it should be a root of VS Code project',
-    default: "../../.tags", // usually a user opens a directory with all blocks
-  }),
+export const GlobalOptions = (): Option[] => [
+  new Option("--log-level <level>", "logging level")
+    .choices(["error", "warn", "info", "debug"])
+    .default("info"),
+];
 
-  "tags-additional-args": Flags.string({
-    description: "additional flags for universal-ctags command: e.g. -e for emacs",
-    default: [],
-    multiple: true,
-    delimiter: ",",
-  }),
-};
+export const CtagsOptions = (): Option[] => [
+  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"), // usually a user opens a directory with all blocks
+  new Option(
+    "--tags-additional-args <args>",
+    "additional flags for universal-ctags command: e.g. -e for emacs",
+  )
+    .argParser(collectComma)
+    .default([] as string[]),
+];
 
-export const ArtifactTypeFlag = {
-  type: Flags.string({
-    aliases: ["t"],
-    description: "artifact type",
-    options: ["all", "library", "template", "test", "software", "asset", "wasm"],
-    default: "all",
-  }),
-};
+export const ArtifactTypeOptions = (): Option[] => [
+  new Option("-t, --type <type>", "artifact type")
+    .choices(["all", "library", "template", "test", "software", "asset", "wasm"])
+    .default("all"),
+];

package/dist/commands/build.d.ts

@@ -1,18 +0,0 @@
-import { Command } from "@oclif/core";
-import * as _$_oclif_core_interfaces0 from "@oclif/core/interfaces";
-
-//#region src/commands/build.d.ts
-declare class Build extends Command {
-  static description: string;
-  static examples: string[];
-  static flags: {
-    "generate-tags": _$_oclif_core_interfaces0.BooleanFlag<boolean>;
-    "tags-file": _$_oclif_core_interfaces0.OptionFlag<string, _$_oclif_core_interfaces0.CustomOptions>;
-    "tags-additional-args": _$_oclif_core_interfaces0.OptionFlag<string[], _$_oclif_core_interfaces0.CustomOptions>;
-    "log-level": _$_oclif_core_interfaces0.OptionFlag<string, _$_oclif_core_interfaces0.CustomOptions>;
-  };
-  run(): Promise<void>;
-}
-//#endregion
-export { Build };
-//# sourceMappingURL=build.d.ts.map

package/dist/commands/build.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"build.d.ts","names":[],"sources":["../../src/commands/build.ts"],"mappings":";;;;cAYqB,KAAA,SAAc,OAAA;EAAA,OACjB,WAAA;EAAA,OAEA,QAAA;EAAA,OAEA,KAAA;qBALS,yBAAA,CAAA,WAAA;;;;;EAUZ,GAAA,CAAA,GAAO,OAAA;AAAA"}

package/dist/commands/check.d.ts

@@ -1,16 +0,0 @@
-import { Command } from "@oclif/core";
-import * as _$_oclif_core_interfaces0 from "@oclif/core/interfaces";
-
-//#region src/commands/check.d.ts
-declare class Check extends Command {
-  static description: string;
-  static strict: boolean;
-  static flags: {
-    "log-level": _$_oclif_core_interfaces0.OptionFlag<string, _$_oclif_core_interfaces0.CustomOptions>;
-  };
-  static examples: string[];
-  run(): Promise<void>;
-}
-//#endregion
-export { Check };
-//# sourceMappingURL=check.d.ts.map

package/dist/commands/check.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"check.d.ts","names":[],"sources":["../../src/commands/check.ts"],"mappings":";;;;cAOqB,KAAA,SAAc,OAAA;EAAA,OACjB,WAAA;EAAA,OAMT,MAAA;EAAA,OAES,KAAA;8DATS,yBAAA,CAAA,aAAA;EAAA;EAAA,OAWT,QAAA;EAEH,GAAA,CAAA,GAAO,OAAA;AAAA"}

package/dist/commands/dump/artifacts.d.ts

@@ -1,16 +0,0 @@
-import { Command } from "@oclif/core";
-import * as _$_oclif_core_interfaces0 from "@oclif/core/interfaces";
-
-//#region src/commands/dump/artifacts.d.ts
-declare class DumpArtifacts extends Command {
-  static description: string;
-  static examples: string[];
-  static flags: {
-    type: _$_oclif_core_interfaces0.OptionFlag<string, _$_oclif_core_interfaces0.CustomOptions>;
-    "log-level": _$_oclif_core_interfaces0.OptionFlag<string, _$_oclif_core_interfaces0.CustomOptions>;
-  };
-  run(): Promise<void>;
-}
-//#endregion
-export { DumpArtifacts };
-//# sourceMappingURL=artifacts.d.ts.map

package/dist/commands/dump/artifacts.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"artifacts.d.ts","names":[],"sources":["../../../src/commands/dump/artifacts.ts"],"mappings":";;;;cAOqB,aAAA,SAAsB,OAAA;EAAA,OACzB,WAAA;EAAA,OAGA,QAAA;EAAA,OAEA,KAAA;uDANiB,yBAAA,CAAA,aAAA;;;EAWpB,GAAA,CAAA,GAAO,OAAA;AAAA"}

package/dist/commands/dump/software.d.ts

@@ -1,15 +0,0 @@
-import { Command } from "@oclif/core";
-import * as _$_oclif_core_interfaces0 from "@oclif/core/interfaces";
-
-//#region src/commands/dump/software.d.ts
-declare class DumpSoftware extends Command {
-  static description: string;
-  static examples: string[];
-  static flags: {
-    "log-level": _$_oclif_core_interfaces0.OptionFlag<string, _$_oclif_core_interfaces0.CustomOptions>;
-  };
-  run(): Promise<void>;
-}
-//#endregion
-export { DumpSoftware };
-//# sourceMappingURL=software.d.ts.map

package/dist/commands/dump/software.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"software.d.ts","names":[],"sources":["../../../src/commands/dump/software.ts"],"mappings":";;;;cAMqB,YAAA,SAAqB,OAAA;EAAA,OACxB,WAAA;EAAA,OAGA,QAAA;EAAA,OAEA,KAAA;8DANgB,yBAAA,CAAA,aAAA;EAAA;EAUnB,GAAA,CAAA,GAAO,OAAA;AAAA"}

package/dist/commands/test.d.ts

@@ -1,16 +0,0 @@
-import { Command } from "@oclif/core";
-import * as _$_oclif_core_interfaces0 from "@oclif/core/interfaces";
-
-//#region src/commands/test.d.ts
-declare class Test extends Command {
-  static description: string;
-  static strict: boolean;
-  static flags: {
-    "log-level": _$_oclif_core_interfaces0.OptionFlag<string, _$_oclif_core_interfaces0.CustomOptions>;
-  };
-  static examples: string[];
-  run(): Promise<void>;
-}
-//#endregion
-export { Test };
-//# sourceMappingURL=test.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"test.d.ts","names":[],"sources":["../../src/commands/test.ts"],"mappings":";;;;cAOqB,IAAA,SAAa,OAAA;EAAA,OAChB,WAAA;EAAA,OAET,MAAA;EAAA,OAES,KAAA;8DALQ,yBAAA,CAAA,aAAA;EAAA;EAAA,OAOR,QAAA;EAEH,GAAA,CAAA,GAAO,OAAA;AAAA"}

package/dist/index.cjs.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.cjs","names":["Cmd0","Cmd1","Cmd2","Cmd3","Cmd4"],"sources":["../src/index.ts"],"sourcesContent":["// DO NOT EDIT. This file was generated by oclif-index utility.\n\nimport Cmd0 from \"./commands/build\";\nimport Cmd1 from \"./commands/check\";\nimport Cmd2 from \"./commands/test\";\nimport Cmd3 from \"./commands/dump/artifacts\";\nimport Cmd4 from \"./commands/dump/software\";\n\nexport const COMMANDS = {\n  build: Cmd0,\n  check: Cmd1,\n  test: Cmd2,\n  \"dump:artifacts\": Cmd3,\n  \"dump:software\": Cmd4,\n};\n"],"mappings":";;;;;;;AAQA,MAAa,WAAW;CACtB,OAAOA,cAAAA;CACP,OAAOC,cAAAA;CACP,MAAMC,aAAAA;CACN,kBAAkBC,kBAAAA;CAClB,iBAAiBC,iBAAAA;CAClB"}

package/dist/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","names":[],"sources":["../src/index.ts"],"mappings":";;;;;;;cAQa,QAAA"}

package/dist/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","names":["Cmd0","Cmd1","Cmd2","Cmd3","Cmd4"],"sources":["../src/index.ts"],"sourcesContent":["// DO NOT EDIT. This file was generated by oclif-index utility.\n\nimport Cmd0 from \"./commands/build\";\nimport Cmd1 from \"./commands/check\";\nimport Cmd2 from \"./commands/test\";\nimport Cmd3 from \"./commands/dump/artifacts\";\nimport Cmd4 from \"./commands/dump/software\";\n\nexport const COMMANDS = {\n  build: Cmd0,\n  check: Cmd1,\n  test: Cmd2,\n  \"dump:artifacts\": Cmd3,\n  \"dump:software\": Cmd4,\n};\n"],"mappings":";;;;;;AAQA,MAAa,WAAW;CACtB,OAAOA;CACP,OAAOC;CACP,MAAMC;CACN,kBAAkBC;CAClB,iBAAiBC;CAClB"}