@ssv/ngx.command 3.0.0-dev.21 → 3.0.0-dev.25

package/index.ts

@@ -0,0 +1 @@
+export * from "./src/index";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ssv/ngx.command",
-  "version": "3.0.0-dev.21",
+  "version": "3.0.0-dev.25",
   "versionSuffix": "",
   "description": "Command pattern implementation for angular. Command used to encapsulate information which is needed to perform an action.",
   "keywords": [

package/src/command.directive.ts

@@ -9,13 +9,12 @@ import {
 	ChangeDetectorRef,
 	inject,
 } from "@angular/core";
-import { Subject } from "rxjs";
-import { tap, delay, takeUntil } from "rxjs/operators";
+import { Subject, tap, delay, takeUntil } from "rxjs";
 
-import { CommandOptions, COMMAND_OPTIONS } from "./command.options";
+import { type CommandOptions, COMMAND_OPTIONS } from "./command.options";
 import { Command } from "./command";
 import { isCommand, isCommandCreator } from "./command.util";
-import { CommandCreator, ICommand } from "./command.model";
+import { CommandCreator, type ICommand } from "./command.model";
 
 /**
  * Controls the state of a component in sync with `Command`.
@@ -100,7 +99,7 @@ export class CommandDirective implements OnInit, OnDestroy {
 	private _destroy$ = new Subject<void>();
 
 	ngOnInit(): void {
-		// console.log("[ssvCommand::init]", this.config);
+		// console.log("[ssvCommand::init]", this.globalOptions);
 		if (!this.commandOrCreator) {
 			throw new Error(`${NAME_CAMEL}: [${NAME_CAMEL}] should be defined!`);
 		} else if (isCommand(this.commandOrCreator)) {

package/src/command.options.ts

@@ -1,4 +1,4 @@
-import { EnvironmentProviders, InjectionToken, makeEnvironmentProviders } from "@angular/core";
+import { type EnvironmentProviders, InjectionToken, makeEnvironmentProviders } from "@angular/core";
 
 export interface CommandOptions {
 	/**

package/src/command.ts

@@ -1,7 +1,45 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import { Observable, combineLatest, Subscription, Subject, BehaviorSubject, of, EMPTY } from "rxjs";
-import { tap, map, filter, switchMap, catchError, finalize, take } from "rxjs/operators";
-import { ICommand } from "./command.model";
+import {
+	Observable, combineLatest, Subscription, Subject, BehaviorSubject, of, EMPTY,
+	tap, map, filter, switchMap, catchError, finalize, take,
+ } from "rxjs";
+import type { ICommand } from "./command.model";
+import { DestroyRef, inject, isSignal, type Signal } from "@angular/core";
+import { toObservable } from "@angular/core/rxjs-interop";
+
+export type ExecuteFn = (...args: any[]) => unknown;
+export type ExecuteAsyncFn = (...args: any[]) => Observable<unknown> | Promise<unknown>;
+export type CanExecute = Signal<boolean> | Observable<boolean>;
+
+/** Creates an async {@link Command}. Must be used within an injection context.
+ * NOTE: this auto injects `DestroyRef` and handles auto destroy. {@link ICommand.autoDestroy} should not be used.
+ */
+export function createCommandAsync(
+	execute: ExecuteAsyncFn,
+	canExecute$?: CanExecute,
+): Command {
+	return createCommand(execute, canExecute$, true);
+}
+
+/** Creates a {@link Command}. Must be used within an injection context.
+ * NOTE: this auto injects `DestroyRef` and handles auto destroy. {@link ICommand.autoDestroy} should not be used.
+ */
+export function createCommand(
+	execute: ExecuteFn,
+	canExecute$?: CanExecute,
+	isAsync?: boolean,
+): Command {
+	const destroyRef = inject(DestroyRef);
+
+	const cmd = new Command(execute, canExecute$, isAsync);
+	cmd.autoDestroy = false;
+
+	destroyRef.onDestroy(() => {
+		// console.warn("[createCommandAsync::destroy]");
+		cmd.destroy();
+	});
+	return cmd;
+}
 
 /**
  * Command object used to encapsulate information which is needed to perform an action.
@@ -46,14 +84,14 @@ export class Command implements ICommand {
 	 * @param isAsync Indicates that the execute function is async e.g. Observable.
 	 */
 	constructor(
-		execute: (...args: unknown[]) => unknown,
-		canExecute$?: Observable<boolean>,
+		execute: ExecuteFn,
+		canExecute$?: CanExecute,
 		isAsync?: boolean,
 	) {
 		if (canExecute$) {
 			this.canExecute$ = combineLatest([
 				this._isExecuting$,
-				canExecute$
+				isSignal(canExecute$) ? toObservable(canExecute$) : canExecute$
 			]).pipe(
 				map(([isExecuting, canExecuteResult]) => {
 					// console.log("[command::combineLatest$] update!", { isExecuting, canExecuteResult });
@@ -161,8 +199,8 @@ export class Command implements ICommand {
 export class CommandAsync extends Command {
 
 	constructor(
-		execute: (...args: any[]) => Observable<unknown> | Promise<unknown>,
-		canExecute$?: Observable<boolean>,
+		execute: ExecuteAsyncFn,
+		canExecute$?: CanExecute,
 	) {
 		super(execute, canExecute$, true);
 	}

package/src/command.util.ts

@@ -1,6 +1,5 @@
 import { AbstractControl, AbstractControlDirective, FormControlStatus } from "@angular/forms";
-import { Observable, of } from "rxjs";
-import { map, distinctUntilChanged, startWith, delay } from "rxjs/operators";
+import { Observable, of, map, distinctUntilChanged, startWith, delay } from "rxjs";
 
 import { CommandCreator, ICommand } from "./command.model";
 import { Command } from "./command";

package/src/index.ts

@@ -1,8 +1,8 @@
+export { SsvCommandModule } from "./command.module";
+export { provideSsvCommandOptions, COMMAND_OPTIONS, type CommandOptions } from "./command.options";
 export * from "./command";
-export * from "./command.directive";
-export * from "./command-ref.directive";
-export * from "./command.util";
-export { CommandCreator, ICommand } from "./command.model";
-export * from "./command.options";
-export * from "./module";
-export * from "./version";
+export { CommandDirective } from "./command.directive";
+export { CommandRefDirective } from "./command-ref.directive";
+export { type CanExecuteFormOptions, isCommand, isCommandCreator, canExecuteFromNgForm } from "./command.util";
+export type { CommandCreator, ICommand } from "./command.model";
+export { VERSION } from "./version";

package/src/version.ts

@@ -1 +1 @@
-export const VERSION = "3.0.0-dev.21";
+export const VERSION = "3.0.0-dev.25";