Migrate CLI Command

Author: CarsonF

src/core/cli/command.discovery.ts

@@ -1,25 +1,23 @@
-import {
-  type DiscoveredModule,
-  DiscoveryService,
-} from '@golevelup/nestjs-discovery';
 import { Injectable } from '@nestjs/common';
-import { Command } from 'clipanion';
+import { type Command } from 'clipanion';
+import { MetadataDiscovery } from '~/core/discovery';
+import { CommandWatermark } from './decorator';
 
 @Injectable()
 export class CommandDiscovery {
-  constructor(private readonly discovery: DiscoveryService) {}
+  constructor(private readonly discovery: MetadataDiscovery) {}
 
   async discover() {
-    const discovered = await this.discovery.providersWithMetaAtKey(
-      Command as any,
-    );
-    return discovered.map((d) => {
-      const command = d.discoveredClass as DiscoveredModule<Command>;
-      return new Proxy(command.dependencyType, {
-        construct() {
-          return command.instance;
-        },
-      });
-    });
+    return this.discovery
+      .discover(CommandWatermark)
+      .classes<Command>()
+      .map(
+        ({ instance: command }) =>
+          new Proxy(command.constructor, {
+            construct() {
+              return command;
+            },
+          }),
+      );
   }
 }

src/core/cli/decorator.ts

@@ -1,6 +1,12 @@
-import { applyDecorators, Injectable, SetMetadata } from '@nestjs/common';
-import { Command } from 'clipanion';
+import { Injectable } from '@nestjs/common';
+import { createMetadataDecorator } from '@seedcompany/nest';
+import { type Command } from 'clipanion';
 import { type AbstractClass } from 'type-fest';
 
+export const CommandWatermark = createMetadataDecorator({
+  types: ['class'],
+  additionalDecorators: [Injectable()],
+});
+
 export const InjectableCommand = () => (cls: AbstractClass<Command>) =>
-  applyDecorators(Injectable(), SetMetadata(Command, true))(cls);
+  CommandWatermark()(cls);

src/core/gel/schema-ast/access-policy.commands.ts

@@ -1,17 +1,19 @@
+import { Injectable } from '@nestjs/common';
 import { Command, Option } from 'clipanion';
 import { $, execa } from 'execa';
 import { realpath } from 'node:fs/promises';
 import { tmpdir as getTempDir } from 'node:os';
 import { InjectableCommand } from '~/core';
 import { GelAccessPolicyInjector } from './access-policy.injector';
 
-@InjectableCommand()
+@Injectable()
 abstract class ApCommand extends Command {
   constructor(protected readonly injector: GelAccessPolicyInjector) {
     super();
   }
 }
 
+@InjectableCommand()
 export class GelAccessPolicyWrapCommand extends ApCommand {
   static paths = [['gel']];
   static usage = Command.Usage({
@@ -51,6 +53,7 @@ export class GelAccessPolicyWrapCommand extends ApCommand {
   }
 }
 
+@InjectableCommand()
 export class GelAccessPolicyInjectCommand extends ApCommand {
   static paths = [['gel', 'ap', 'inject']];
   static usage = Command.Usage({
@@ -63,6 +66,7 @@ export class GelAccessPolicyInjectCommand extends ApCommand {
   }
 }
 
+@InjectableCommand()
 export class GelAccessPolicyEjectCommand extends ApCommand {
   static paths = [['gel', 'ap', 'eject']];
   static usage = Command.Usage({