remove cliRegister

sparebytes · sparebytes · commit a5f13e745788 · 2020-04-25T21:19:56.000-05:00
diff --git a/example/harkfile.ts b/example/harkfile.ts
@@ -4,26 +4,24 @@ import { monorepo } from "@hark/plugin-monorepo";
 import { spawn } from "@hark/plugin-spawn";
 import { BaseCommand, MyMonorepo, MyPackage } from "../harkfile";
 
-export default extendCli<HarkMonorepoCommandContext<MyMonorepo>, HarkMonorepoCommandContext<MyMonorepo>>(
-  async ({ cli, cliRegister }) => {
-    return {
-      ...(await cliExtendMonorepo(BaseCommand)({ cli, cliRegister })),
-      monorepo: monorepo(
-        ["foo", "bar"],
-        plugin.map(({ packages }) => {
-          const myMonorepo = new MyMonorepo(packages.map((p) => new MyPackage(p.packageJson.name, p.path)));
-          const foo = myMonorepo.getProject("hark-example-foo");
-          const bar = myMonorepo.getProject("hark-example-bar");
-          foo.registerTask("dev", () =>
-            plugin.pipe(
-              //
-              foo.task.build(),
-              spawn(`node -r @babel/register foo/dist/index.js`),
-            ),
-          );
-          return myMonorepo;
-        }),
-      ),
-    };
-  },
-);
+export default extendCli<HarkMonorepoCommandContext<MyMonorepo>, HarkMonorepoCommandContext<MyMonorepo>>(async ({ cli }) => {
+  return {
+    ...(await cliExtendMonorepo(BaseCommand)({ cli })),
+    monorepo: monorepo(
+      ["foo", "bar"],
+      plugin.map(({ packages }) => {
+        const myMonorepo = new MyMonorepo(packages.map((p) => new MyPackage(p.packageJson.name, p.path)));
+        const foo = myMonorepo.getProject("hark-example-foo");
+        const bar = myMonorepo.getProject("hark-example-bar");
+        foo.registerTask("dev", () =>
+          plugin.pipe(
+            //
+            foo.task.build(),
+            spawn(`node -r @babel/register foo/dist/index.js`),
+          ),
+        );
+        return myMonorepo;
+      }),
+    ),
+  };
+});
diff --git a/harkfile.ts b/harkfile.ts
@@ -90,8 +90,7 @@ export abstract class BaseCommand extends HarkMonorepoCommand<
 }
 
 export default extendCli<HarkMonorepoCommandContext<MyMonorepo>, HarkMonorepoCommandContext<MyMonorepo>>(
-  async ({ cli, cliRegister }) => {
-    @cliRegister
+  async ({ cli }) => {
     class PrepareCommand extends BaseCommand {
       @Command.Path("prepare")
       async execute() {
@@ -106,7 +105,6 @@ export default extendCli<HarkMonorepoCommandContext<MyMonorepo>, HarkMonorepoCom
       }
     }
 
-    @cliRegister
     class PublishCommand extends BaseCommand {
       static usage = Command.Usage({
         category: "Distribute",
@@ -154,8 +152,11 @@ export default extendCli<HarkMonorepoCommandContext<MyMonorepo>, HarkMonorepoCom
       }
     }
 
+    cli.register(PrepareCommand);
+    cli.register(PublishCommand);
+
     return {
-      ...(await cliExtendMonorepo(BaseCommand)({ cli, cliRegister })),
+      ...(await cliExtendMonorepo(BaseCommand)({ cli })),
       monorepo: myMonorepoPlugin,
     };
   },
diff --git a/packages/cli/src/cli-extend-monorepo.ts b/packages/cli/src/cli-extend-monorepo.ts
@@ -6,7 +6,7 @@ import { HarkMonorepoCommand, HarkMonorepoCommandClass, HarkMonorepoCommandConte
 export const cliExtendMonorepo = <M extends Monorepo<BaseProjectContext, BaseProjectTasks<BaseProjectContext>>>(
   commandClass: HarkMonorepoCommandClass,
 ) =>
-  extendCli<any, HarkMonorepoCommandContext<M>>(async ({ cliRegister }) => {
+  extendCli<any, HarkMonorepoCommandContext<M>>(async ({ cli }) => {
     const { Command } = await import("clipanion");
     const { of } = await import("rxjs");
     const { switchMap, tap } = await import("rxjs/operators");
@@ -15,7 +15,6 @@ export const cliExtendMonorepo = <M extends Monorepo<BaseProjectContext, BasePro
       Monorepo<BaseProjectContext, BaseProjectTasks<BaseProjectContext>>
     > {}
 
-    @cliRegister
     class CleanCommand extends BaseCommand {
       @Command.Rest()
       projects: string[] = [];
@@ -36,7 +35,6 @@ export const cliExtendMonorepo = <M extends Monorepo<BaseProjectContext, BasePro
       }
     }
 
-    @cliRegister
     class FormatCommand extends BaseCommand {
       @Command.Rest()
       projects: string[] = [];
@@ -57,7 +55,6 @@ export const cliExtendMonorepo = <M extends Monorepo<BaseProjectContext, BasePro
       }
     }
 
-    @cliRegister
     class TaskCommand extends BaseCommand {
       @Command.Boolean("-w,--watch")
       watchMode: boolean = false;
@@ -107,7 +104,6 @@ export const cliExtendMonorepo = <M extends Monorepo<BaseProjectContext, BasePro
       }
     }
 
-    @cliRegister
     class BuildCommand extends BaseCommand {
       @Command.Boolean("-w,--watch")
       watchMode: boolean = false;
@@ -131,7 +127,6 @@ export const cliExtendMonorepo = <M extends Monorepo<BaseProjectContext, BasePro
       }
     }
 
-    @cliRegister
     class PackageJsonFormatCommand extends BaseCommand {
       @Command.Rest()
       projects: string[] = [];
@@ -152,7 +147,6 @@ export const cliExtendMonorepo = <M extends Monorepo<BaseProjectContext, BasePro
       }
     }
 
-    @cliRegister
     class ImportsCheckCommand extends BaseCommand {
       @Command.Boolean("--json")
       jsonOutput = false;
@@ -215,7 +209,6 @@ export const cliExtendMonorepo = <M extends Monorepo<BaseProjectContext, BasePro
       }
     }
 
-    @cliRegister
     class DevCommand extends BaseCommand {
       @Command.Rest()
       projects: string[] = [];
@@ -236,6 +229,14 @@ export const cliExtendMonorepo = <M extends Monorepo<BaseProjectContext, BasePro
       }
     }
 
+    cli.register(CleanCommand);
+    cli.register(FormatCommand);
+    cli.register(TaskCommand);
+    cli.register(BuildCommand);
+    cli.register(PackageJsonFormatCommand);
+    cli.register(ImportsCheckCommand);
+    cli.register(DevCommand);
+
     const result: HarkMonorepoCommandContext<M> = {
       monorepo: plugin.throwError("Monorepo not given."),
       rootProjectFilter: "name:root",
diff --git a/packages/cli/src/cli-init.ts b/packages/cli/src/cli-init.ts
@@ -1,5 +1,4 @@
 import { HarkCliInitOptions } from "./models";
-import { RegisterCommand } from "./register-command";
 
 export async function cliInit(options?: HarkCliInitOptions) {
   const { Cli, Command } = await import("clipanion");
@@ -8,7 +7,6 @@ export async function cliInit(options?: HarkCliInitOptions) {
     binaryName: options?.binaryName ?? `hark`,
     binaryVersion: options?.binaryVersion ?? `0.0.0-unknown`,
   });
-  const cliRegister = RegisterCommand(cli);
 
   class HelpCommand extends Command {
     @Command.Path(`--help`)
@@ -17,13 +15,11 @@ export async function cliInit(options?: HarkCliInitOptions) {
       this.context.stdout.write(this.cli.usage(null));
     }
   }
+  cli.register(HelpCommand);
 
   if (options?.useDefaultHelpCommand ?? true) {
     cli.register(HelpCommand);
   }
 
-  return {
-    cli,
-    cliRegister,
-  };
+  return { cli };
 }
diff --git a/packages/cli/src/index.ts b/packages/cli/src/index.ts
@@ -5,4 +5,3 @@ export * from "./extend-cli";
 export * from "./hark-command";
 export * from "./hark-monorepo-command";
 export * from "./models";
-export * from "./register-command";
diff --git a/packages/cli/src/models.ts b/packages/cli/src/models.ts
@@ -10,7 +10,7 @@ export interface HarkCliStartOptions<T extends Partial<BaseContext>> extends Har
   harkfilePath?: string;
   registerBabelOptions?: null | {
     extensions: string[];
-    [k:string]: unknown;
+    [k: string]: unknown;
   };
 }
 
@@ -20,5 +20,4 @@ import { BaseContext, Cli, CommandClass } from "clipanion";
 
 export type HarkfileFunction<CliContext, ReturnContext> = (input: {
   cli: Cli<CliContext & BaseContext>;
-  cliRegister: CliCommandRegisterDecorator;
 }) => Promise<ReturnContext> | ReturnContext;
diff --git a/packages/cli/src/register-command.ts b/packages/cli/src/register-command.ts
diff --git a/release/harkfile.ts b/release/harkfile.ts
@@ -32,9 +32,9 @@ export abstract class ACommand extends HarkMonorepoCommand<AMonorepo, "version">
   }
 }
 
-export default extendCli(async ({ cli, cliRegister }) => {
+export default extendCli(async ({ cli }) => {
   return {
-    ...(await cliExtendMonorepo(ACommand)({ cli, cliRegister })),
+    ...(await cliExtendMonorepo(ACommand)({ cli })),
     monorepo: monorepo(
       ["packages/*/dist"],
       plugin.map(({ packages }) => new AMonorepo(packages.map((p) => new APackage(p.packageJson.name, p.path)))),

Original file line number	Diff line number	Diff line change
`@@ -90,8 +90,7 @@ export abstract class BaseCommand extends HarkMonorepoCommand<`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`export default extendCli<HarkMonorepoCommandContext<MyMonorepo>, HarkMonorepoCommandContext<MyMonorepo>>(`
`93`		`- async ({ cli, cliRegister }) => {`
`94`		`- @cliRegister`
	`93`	`+ async ({ cli }) => {`
`95`	`94`	`class PrepareCommand extends BaseCommand {`
`96`	`95`	`@Command.Path("prepare")`
`97`	`96`	`async execute() {`
`@@ -106,7 +105,6 @@ export default extendCli<HarkMonorepoCommandContext<MyMonorepo>, HarkMonorepoCom`
`106`	`105`	`}`
`107`	`106`	`}`
`108`	`107`
`109`		`- @cliRegister`
`110`	`108`	`class PublishCommand extends BaseCommand {`
`111`	`109`	`static usage = Command.Usage({`
`112`	`110`	`category: "Distribute",`
`@@ -154,8 +152,11 @@ export default extendCli<HarkMonorepoCommandContext<MyMonorepo>, HarkMonorepoCom`
`154`	`152`	`}`
`155`	`153`	`}`
`156`	`154`
	`155`	`+ cli.register(PrepareCommand);`
	`156`	`+ cli.register(PublishCommand);`
	`157`	`+`
`157`	`158`	`return {`
`158`		`- ...(await cliExtendMonorepo(BaseCommand)({ cli, cliRegister })),`
	`159`	`+ ...(await cliExtendMonorepo(BaseCommand)({ cli })),`
`159`	`160`	`monorepo: myMonorepoPlugin,`
`160`	`161`	`};`
`161`	`162`	`},`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import { HarkMonorepoCommand, HarkMonorepoCommandClass, HarkMonorepoCommandConte`
`6`	`6`	`export const cliExtendMonorepo = <M extends Monorepo<BaseProjectContext, BaseProjectTasks<BaseProjectContext>>>(`
`7`	`7`	`commandClass: HarkMonorepoCommandClass,`
`8`	`8`	`) =>`
`9`		`- extendCli<any, HarkMonorepoCommandContext<M>>(async ({ cliRegister }) => {`
	`9`	`+ extendCli<any, HarkMonorepoCommandContext<M>>(async ({ cli }) => {`
`10`	`10`	`const { Command } = await import("clipanion");`
`11`	`11`	`const { of } = await import("rxjs");`
`12`	`12`	`const { switchMap, tap } = await import("rxjs/operators");`
`@@ -15,7 +15,6 @@ export const cliExtendMonorepo = <M extends Monorepo<BaseProjectContext, BasePro`
`15`	`15`	`Monorepo<BaseProjectContext, BaseProjectTasks<BaseProjectContext>>`
`16`	`16`	`> {}`
`17`	`17`
`18`		`- @cliRegister`
`19`	`18`	`class CleanCommand extends BaseCommand {`
`20`	`19`	`@Command.Rest()`
`21`	`20`	`projects: string[] = [];`
`@@ -36,7 +35,6 @@ export const cliExtendMonorepo = <M extends Monorepo<BaseProjectContext, BasePro`
`36`	`35`	`}`
`37`	`36`	`}`
`38`	`37`
`39`		`- @cliRegister`
`40`	`38`	`class FormatCommand extends BaseCommand {`
`41`	`39`	`@Command.Rest()`
`42`	`40`	`projects: string[] = [];`
`@@ -57,7 +55,6 @@ export const cliExtendMonorepo = <M extends Monorepo<BaseProjectContext, BasePro`
`57`	`55`	`}`
`58`	`56`	`}`
`59`	`57`
`60`		`- @cliRegister`
`61`	`58`	`class TaskCommand extends BaseCommand {`
`62`	`59`	`@Command.Boolean("-w,--watch")`
`63`	`60`	`watchMode: boolean = false;`
`@@ -107,7 +104,6 @@ export const cliExtendMonorepo = <M extends Monorepo<BaseProjectContext, BasePro`
`107`	`104`	`}`
`108`	`105`	`}`
`109`	`106`
`110`		`- @cliRegister`
`111`	`107`	`class BuildCommand extends BaseCommand {`
`112`	`108`	`@Command.Boolean("-w,--watch")`
`113`	`109`	`watchMode: boolean = false;`
`@@ -131,7 +127,6 @@ export const cliExtendMonorepo = <M extends Monorepo<BaseProjectContext, BasePro`
`131`	`127`	`}`
`132`	`128`	`}`
`133`	`129`
`134`		`- @cliRegister`
`135`	`130`	`class PackageJsonFormatCommand extends BaseCommand {`
`136`	`131`	`@Command.Rest()`
`137`	`132`	`projects: string[] = [];`
`@@ -152,7 +147,6 @@ export const cliExtendMonorepo = <M extends Monorepo<BaseProjectContext, BasePro`
`152`	`147`	`}`
`153`	`148`	`}`
`154`	`149`
`155`		`- @cliRegister`
`156`	`150`	`class ImportsCheckCommand extends BaseCommand {`
`157`	`151`	`@Command.Boolean("--json")`
`158`	`152`	`jsonOutput = false;`
`@@ -215,7 +209,6 @@ export const cliExtendMonorepo = <M extends Monorepo<BaseProjectContext, BasePro`
`215`	`209`	`}`
`216`	`210`	`}`
`217`	`211`
`218`		`- @cliRegister`
`219`	`212`	`class DevCommand extends BaseCommand {`
`220`	`213`	`@Command.Rest()`
`221`	`214`	`projects: string[] = [];`
`@@ -236,6 +229,14 @@ export const cliExtendMonorepo = <M extends Monorepo<BaseProjectContext, BasePro`
`236`	`229`	`}`
`237`	`230`	`}`
`238`	`231`
	`232`	`+ cli.register(CleanCommand);`
	`233`	`+ cli.register(FormatCommand);`
	`234`	`+ cli.register(TaskCommand);`
	`235`	`+ cli.register(BuildCommand);`
	`236`	`+ cli.register(PackageJsonFormatCommand);`
	`237`	`+ cli.register(ImportsCheckCommand);`
	`238`	`+ cli.register(DevCommand);`
	`239`	`+`
`239`	`240`	`const result: HarkMonorepoCommandContext<M> = {`
`240`	`241`	`monorepo: plugin.throwError("Monorepo not given."),`
`241`	`242`	`rootProjectFilter: "name:root",`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`import { HarkCliInitOptions } from "./models";`
`2`		`-import { RegisterCommand } from "./register-command";`
`3`	`2`
`4`	`3`	`export async function cliInit(options?: HarkCliInitOptions) {`
`5`	`4`	`const { Cli, Command } = await import("clipanion");`
`@@ -8,7 +7,6 @@ export async function cliInit(options?: HarkCliInitOptions) {`
`8`	`7`	binaryName: options?.binaryName ?? `hark`,
`9`	`8`	binaryVersion: options?.binaryVersion ?? `0.0.0-unknown`,
`10`	`9`	`});`
`11`		`- const cliRegister = RegisterCommand(cli);`
`12`	`10`
`13`	`11`	`class HelpCommand extends Command {`
`14`	`12`	@Command.Path(`--help`)
`@@ -17,13 +15,11 @@ export async function cliInit(options?: HarkCliInitOptions) {`
`17`	`15`	`this.context.stdout.write(this.cli.usage(null));`
`18`	`16`	`}`
`19`	`17`	`}`
	`18`	`+ cli.register(HelpCommand);`
`20`	`19`
`21`	`20`	`if (options?.useDefaultHelpCommand ?? true) {`
`22`	`21`	`cli.register(HelpCommand);`
`23`	`22`	`}`
`24`	`23`
`25`		`- return {`
`26`		`- cli,`
`27`		`- cliRegister,`
`28`		`- };`
	`24`	`+ return { cli };`
`29`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,9 +32,9 @@ export abstract class ACommand extends HarkMonorepoCommand<AMonorepo, "version">`
`32`	`32`	`}`
`33`	`33`	`}`
`34`	`34`
`35`		`-export default extendCli(async ({ cli, cliRegister }) => {`
	`35`	`+export default extendCli(async ({ cli }) => {`
`36`	`36`	`return {`
`37`		`- ...(await cliExtendMonorepo(ACommand)({ cli, cliRegister })),`
	`37`	`+ ...(await cliExtendMonorepo(ACommand)({ cli })),`
`38`	`38`	`monorepo: monorepo(`
`39`	`39`	`["packages/*/dist"],`
`40`	`40`	`plugin.map(({ packages }) => new AMonorepo(packages.map((p) => new APackage(p.packageJson.name, p.path)))),`