fix: rename CliCommand to CliCommandFactory (#4880)

Co-authored-by: adrians5j <adrian@webiny.com>
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: adrians5j <5121148+adrians5j@users.noreply.github.com>

Author: Copilot

extensions/MyCustomCommand.ts

@@ -1,14 +1,14 @@
-import { CliCommand } from "webiny/cli/features/CliCommand";
+import { CliCommandFactory } from "webiny/cli/features/CliCommand";
 import { UiService } from "webiny/cli/features/Ui";
 
 export interface IMyCustomCommandParams {
     name: string;
 }
 
-class MyCustomCommandImpl implements CliCommand.Interface<IMyCustomCommandParams> {
+class MyCustomCommandImpl implements CliCommandFactory.Interface<IMyCustomCommandParams> {
     constructor(private ui: UiService.Interface) {}
 
-    execute(): CliCommand.CommandDefinition<IMyCustomCommandParams> {
+    execute(): CliCommandFactory.CommandDefinition<IMyCustomCommandParams> {
         return {
             name: "my-custom-command",
             description: "This is my custom command",
@@ -22,14 +22,14 @@ class MyCustomCommandImpl implements CliCommand.Interface<IMyCustomCommandParams
             ],
             handler: async params => {
                 this.ui.info("Starting my custom command...");
-                this.ui.newLine();
+                this.ui.emptyLine();
                 this.ui.success(`Hello, ${params.name}! This is my custom command.`);
             }
         };
     }
 }
 
-export const MyCustomCommand = CliCommand.createImplementation({
+export const MyCustomCommand = CliCommandFactory.createImplementation({
     implementation: MyCustomCommandImpl,
     dependencies: [UiService]
 });

packages/admin-ui/src/Tag/Tag.tsx

@@ -33,7 +33,7 @@ const tagVariants = cva(
                 ],
                 "neutral-base-outline": [
                     "border-sm border-solid px-[calc(var(--padding-xs-plus)-(var(--border-width-sm)))] py-[calc(var(--padding-xxs)-(var(--border-width-sm)))]",
-                    "bg-transparent border-neutral-muted text-neutral-primary",
+                    "bg-neutral-base border-neutral-muted text-neutral-primary",
                     "hover:bg-neutral-light",
                     "aria-disabled:bg-transparent aria-disabled:border-neutral-dimmed aria-disabled:text-neutral-disabled"
                 ],

packages/cli-core/src/abstractions/features/CliCommand.ts

@@ -36,9 +36,9 @@ export interface ICliCommand<TCommandParams> {
         | ICliCommandDefinition<TCommandParams>;
 }
 
-export const CliCommand = createAbstraction<ICliCommand<any>>("CliCommand");
+export const CliCommandFactory = createAbstraction<ICliCommand<any>>("CliCommandFactory");
 
-export namespace CliCommand {
+export namespace CliCommandFactory {
     export type Interface<TCommandParams> = ICliCommand<TCommandParams>;
 
     export type ParamDefinition<TCommandParams> = ICliCommandParamDefinition<TCommandParams>;

packages/cli-core/src/abstractions/features/ErrorHandler.ts

@@ -1,11 +1,11 @@
 import { createAbstraction } from "~/abstractions/createAbstraction.js";
-import { CliCommand } from "~/abstractions/index.js";
+import { CliCommandFactory } from "~/abstractions/index.js";
 
 export type IError = Error;
 
 export interface IErrorHandlerParams<TParams> {
     error: Error;
-    command: CliCommand.CommandDefinition<any>;
+    command: CliCommandFactory.CommandDefinition<any>;
     params: TParams;
 }
 

packages/cli-core/src/abstractions/features/index.ts

@@ -1,3 +1,3 @@
-export { CliCommand } from "./CliCommand.js";
+export { CliCommandFactory } from "./CliCommand.js";
 export { ErrorHandler } from "./ErrorHandler.js";
 export { GlobalCliOption } from "./GlobalCliOption.js";

packages/cli-core/src/abstractions/services/CommandsRegistryService.ts

@@ -1,8 +1,8 @@
 import { createAbstraction } from "~/abstractions/createAbstraction.js";
-import { CliCommand } from "~/abstractions/index.js";
+import { CliCommandFactory } from "~/abstractions/index.js";
 
 export interface ICommandsRegistryService {
-    execute(): CliCommand.Interface<any>[];
+    execute(): CliCommandFactory.Interface<any>[];
 }
 
 export const CommandsRegistryService =

packages/cli-core/src/decorators/CommandsWithGracefulErrorHandling.ts

@@ -1,10 +1,12 @@
-import { CliCommand, ErrorHandler } from "~/abstractions/index.js";
+import { CliCommandFactory, ErrorHandler } from "~/abstractions/index.js";
 import { GracefulError } from "@webiny/project";
 
-export class CommandsWithGracefulErrorHandling<TParams> implements CliCommand.Interface<TParams> {
+export class CommandsWithGracefulErrorHandling<TParams>
+    implements CliCommandFactory.Interface<TParams>
+{
     constructor(
         private gracefulErrorHandlers: ErrorHandler.Interface<TParams>[],
-        private decoratee: CliCommand.Interface<TParams>
+        private decoratee: CliCommandFactory.Interface<TParams>
     ) {}
 
     async execute() {
@@ -36,7 +38,7 @@ export class CommandsWithGracefulErrorHandling<TParams> implements CliCommand.In
     }
 }
 
-export const commandsWithGracefulErrorHandling = CliCommand.createDecorator({
+export const commandsWithGracefulErrorHandling = CliCommandFactory.createDecorator({
     decorator: CommandsWithGracefulErrorHandling,
     dependencies: [[ErrorHandler, { multiple: true }]]
 });

packages/cli-core/src/decorators/DeployCommandWithTelemetry.ts

@@ -2,20 +2,20 @@ import {
     isEnabled as globalIsTelemetryEnabled,
     sendEvent as telemetrySendEvent
 } from "@webiny/telemetry/cli.js";
-import { CliCommand, GetProjectSdkService } from "~/abstractions/index.js";
+import { CliCommandFactory, GetProjectSdkService } from "~/abstractions/index.js";
 import { IDeployCommandParams } from "~/features/index.js";
 import { GracefulError } from "@webiny/project";
 
 const isDeployCommand = (
-    command: CliCommand.CommandDefinition<any>
-): command is CliCommand.CommandDefinition<IDeployCommandParams> => {
+    command: CliCommandFactory.CommandDefinition<any>
+): command is CliCommandFactory.CommandDefinition<IDeployCommandParams> => {
     return command.name === "deploy";
 };
 
-export class DeployCommandWithTelemetry<TParams> implements CliCommand.Interface<TParams> {
+export class DeployCommandWithTelemetry<TParams> implements CliCommandFactory.Interface<TParams> {
     constructor(
         private getProjectSdkService: GetProjectSdkService.Interface,
-        private decoratee: CliCommand.Interface<TParams>
+        private decoratee: CliCommandFactory.Interface<TParams>
     ) {}
 
     async execute() {
@@ -38,7 +38,7 @@ export class DeployCommandWithTelemetry<TParams> implements CliCommand.Interface
         }
 
         // Getting a different type without type assertion. :|
-        const deployCommand = command as CliCommand.CommandDefinition<IDeployCommandParams>;
+        const deployCommand = command as CliCommandFactory.CommandDefinition<IDeployCommandParams>;
         const originalCommandHandler = deployCommand.handler;
 
         deployCommand.handler = async (params: IDeployCommandParams) => {
@@ -114,7 +114,7 @@ export class DeployCommandWithTelemetry<TParams> implements CliCommand.Interface
     }
 }
 
-export const deployCommandWithTelemetry = CliCommand.createDecorator({
+export const deployCommandWithTelemetry = CliCommandFactory.createDecorator({
     decorator: DeployCommandWithTelemetry,
     dependencies: [GetProjectSdkService]
 });

packages/cli-core/src/extensions/CliCommand.ts

@@ -1,5 +1,5 @@
 import { defineExtension, zodPathToAbstraction } from "@webiny/project/extensions/index.js";
-import { CliCommand as CliCommandAbstraction } from "~/abstractions/index.js";
+import { CliCommandFactory as CliCommandFactoryAbstraction } from "~/abstractions/index.js";
 import { z } from "zod";
 
 export const CliCommand = defineExtension({
@@ -9,7 +9,7 @@ export const CliCommand = defineExtension({
     multiple: true,
     paramsSchema: ({ project }) => {
         return z.object({
-            src: zodPathToAbstraction(CliCommandAbstraction, project)
+            src: zodPathToAbstraction(CliCommandFactoryAbstraction, project)
         });
     }
 });

packages/cli-core/src/extensions/CliCommandDecorator.ts

@@ -1,5 +1,5 @@
 import { defineExtension, zodPathToAbstraction } from "@webiny/project/extensions/index.js";
-import { CliCommand as CliCommandAbstraction } from "~/abstractions/index.js";
+import { CliCommandFactory as CliCommandFactoryAbstraction } from "~/abstractions/index.js";
 import { z } from "zod";
 
 export const CliCommandDecorator = defineExtension({
@@ -9,7 +9,7 @@ export const CliCommandDecorator = defineExtension({
     multiple: true,
     paramsSchema: ({ project }) => {
         return z.object({
-            src: zodPathToAbstraction(CliCommandAbstraction, project)
+            src: zodPathToAbstraction(CliCommandFactoryAbstraction, project)
         });
     }
 });