@tsed/cli-testing 6.0.0-beta.1 → 6.0.0-beta.2

package/lib/esm/CliPlatformTest.js

@@ -1,4 +1,4 @@
-import { CliCore, CliExeca, CliFs, CliHttpClient, CliService, createInjector, DITest, Env, getCommandMetadata, InjectorService, ProjectPackageJson, resolveConfiguration } from "@tsed/cli-core";
+import { $emit, CliCore, CliExeca, CliFs, CliHttpClient, CliService, configuration, createInjector, DITest, Env, getCommandMetadata, injector, InjectorService, logger, ProjectPackageJson, resolveConfiguration } from "@tsed/cli-core";
 import { Type } from "@tsed/core";
 import { DIContext, runInContext } from "@tsed/di";
 import { v4 } from "uuid";
@@ -17,8 +17,8 @@ export class CliPlatformTest extends DITest {
             },
             ...options
         });
-        DITest.injector = CliPlatformTest.createInjector(options);
-        DITest.injector
+        CliPlatformTest.createInjector(options);
+        injector()
             .addProvider(CliHttpClient, {
             useClass: FakeCliHttpClient
         })
@@ -29,9 +29,9 @@ export class CliPlatformTest extends DITest {
             useClass: FakeCliExeca
         })
             .addProvider(CliCore);
-        await DITest.injector.load();
-        await DITest.injector.emit("$onReady");
-        await DITest.injector.emit("$loadPackageJson");
+        await injector().load();
+        await $emit("$onReady");
+        await $emit("$loadPackageJson");
         CliPlatformTest.get(CliService).load();
     }
     static async create(options = {}, rootModule = CliCore) {
@@ -39,11 +39,11 @@ export class CliPlatformTest extends DITest {
             name: "tsed",
             ...options
         });
-        DITest.injector = CliPlatformTest.createInjector(options);
-        DITest.injector.addProvider(CliCore, {
+        CliPlatformTest.createInjector(options);
+        injector().addProvider(CliCore, {
             useClass: rootModule
         });
-        await DITest.injector.load();
+        await injector().load();
     }
     /**
      * Create a new injector with the right default services
@@ -65,30 +65,6 @@ export class CliPlatformTest extends DITest {
         injector.settings.env = Env.TEST;
         return injector;
     }
-    /**
-     * It injects services into the test function where you can alter, spy on, and manipulate them.
-     *
-     * The inject function has two parameters
-     *
-     * * an array of Service dependency injection tokens,
-     * * a test function whose parameters correspond exactly to each item in the injection token array.
-     *
-     * @param targets
-     * @param func
-     */
-    static inject(targets, func) {
-        return async () => {
-            if (!DITest.hasInjector()) {
-                await CliPlatformTest.create();
-            }
-            const injector = DITest.injector;
-            const deps = [];
-            for (const target of targets) {
-                deps.push(injector.has(target) ? injector.get(target) : await injector.invoke(target));
-            }
-            return func(...deps);
-        };
-    }
     static setPackageJson(pkg) {
         const projectPackageJson = CliPlatformTest.get(ProjectPackageJson);
         projectPackageJson.setRaw(pkg);
@@ -101,10 +77,10 @@ export class CliPlatformTest extends DITest {
     static exec(cmdName, initialData) {
         const $ctx = new DIContext({
             id: v4(),
-            injector: this.injector,
-            logger: this.injector.logger
+            injector: injector(),
+            logger: logger()
         });
-        const metadata = this.injector.settings
+        const metadata = configuration()
             .get("commands")
             .map((token) => getCommandMetadata(token))
             .find((commandOpts) => cmdName === commandOpts.name);

package/lib/types/CliPlatformTest.d.ts

@@ -1,9 +1,5 @@
-import { DITest, InjectorService, type TokenProvider } from "@tsed/cli-core";
+import { DITest, InjectorService } from "@tsed/cli-core";
 import { Type } from "@tsed/core";
-export interface InvokeOptions {
-    token: TokenProvider;
-    use: any;
-}
 export declare class CliPlatformTest extends DITest {
     static bootstrap(options?: Partial<TsED.Configuration>): Promise<void>;
     static create(options?: Partial<TsED.Configuration>, rootModule?: Type): Promise<void>;
@@ -11,23 +7,11 @@ export declare class CliPlatformTest extends DITest {
      * Create a new injector with the right default services
      */
     static createInjector(options?: Partial<TsED.Configuration>): InjectorService;
-    /**
-     * It injects services into the test function where you can alter, spy on, and manipulate them.
-     *
-     * The inject function has two parameters
-     *
-     * * an array of Service dependency injection tokens,
-     * * a test function whose parameters correspond exactly to each item in the injection token array.
-     *
-     * @param targets
-     * @param func
-     */
-    static inject<T>(targets: any[], func: (...args: any[]) => Promise<T> | T): () => Promise<T>;
     static setPackageJson(pkg: any): void;
     /**
      * Invoke command with a new context without running prompts
      * @param cmdName
      * @param initialData
      */
-    static exec(cmdName: string, initialData: any): Promise<any>;
+    static exec(cmdName: string, initialData: any): Promise<Promise<any>>;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tsed/cli-testing",
   "description": "Utils to test you CLI based on Ts.ED CLI",
-  "version": "6.0.0-beta.1",
+  "version": "6.0.0-beta.2",
   "type": "module",
   "main": "./lib/esm/index.js",
   "source": "./src/index.ts",
@@ -29,11 +29,11 @@
     "decorators"
   ],
   "dependencies": {
-    "@tsed/cli-core": "6.0.0-beta.1",
+    "@tsed/cli-core": "6.0.0-beta.2",
     "tslib": "2.7.0"
   },
   "devDependencies": {
-    "@tsed/typescript": "6.0.0-beta.1",
+    "@tsed/typescript": "6.0.0-beta.2",
     "cross-env": "7.0.3",
     "typescript": "5.6.2",
     "vitest": "2.1.1"