refactor: fix imports in unit tests files

.eslintrc

@@ -32,7 +32,11 @@
   },
   "overrides": [
     {
-      "files": ["**/*.spec.ts", "**/*.benchmark.ts", "**/test/**", "**/__mock__/**"],
+      "files": [
+        "**/*.benchmark.ts",
+        "**/test/**",
+        "**/__mock__/**"
+      ],
       "rules": {
         "workspaces/no-absolute-imports": "off"
       }

packages/core/src/domain/AnyToPromise.spec.ts

@@ -1,6 +1,7 @@
-import {catchAsyncError, isStream} from "@tsed/core";
 import {createReadStream} from "fs";
 import {of} from "rxjs";
+import {catchAsyncError} from "../utils/catchError";
+import {isStream} from "../utils/objects/isStream";
 import {AnyToPromise, AnyToPromiseStatus} from "./AnyToPromise";
 
 describe("AnyToPromise", () => {

packages/core/src/domain/Hooks.spec.ts

@@ -1,4 +1,4 @@
-import {Hooks} from "@tsed/core";
+import {Hooks} from "./Hooks";
 
 describe("Hooks", () => {
   describe("emit", () => {

packages/core/src/domain/Metadata.spec.ts

@@ -1,4 +1,4 @@
-import {Metadata} from "../../src";
+import {Metadata} from "./Metadata";
 
 function logger(target: any, method?: any, descriptor?: any) {
   return descriptor;

packages/core/src/domain/Store.spec.ts

@@ -1,4 +1,5 @@
-import {CLASS_STORE, Metadata, METHOD_STORE, PARAM_STORE, PROPERTY_STORE, Store} from "../../src";
+import {Metadata} from "./Metadata";
+import {CLASS_STORE, METHOD_STORE, PARAM_STORE, PROPERTY_STORE, Store} from "./Store";
 
 class FakeMetadata {
   attr1: any;

packages/core/src/utils/catchError.spec.ts

@@ -1,4 +1,4 @@
-import {catchError} from "./catchError";
+import {catchAsyncError, catchError} from "./catchError";
 
 describe("catchError", () => {
   it("should catch error", () => {
@@ -9,3 +9,15 @@ describe("catchError", () => {
     ).toEqual("message");
   });
 });
+
+describe("catchAsyncError", () => {
+  it("should catch error", async () => {
+    expect(
+      (
+        await catchAsyncError(async () => {
+          throw new Error("message");
+        })
+      )?.message
+    ).toEqual("message");
+  });
+});

packages/core/src/utils/decorators/decorateMethodsOf.spec.ts

@@ -1,4 +1,7 @@
-import {descriptorOf, Store, StoreMerge, StoreSet} from "@tsed/core";
+import {StoreMerge} from "../../decorators/storeMerge";
+import {StoreSet} from "../../decorators/storeSet";
+import {Store} from "../../domain/Store";
+import {descriptorOf} from "../objects/descriptorOf";
 import {decorateMethodsOf} from "./decorateMethodsOf";
 
 describe("decorateMethodsOf", () => {

packages/core/src/utils/decorators/decoratorArgs.spec.ts

@@ -1,4 +1,6 @@
-import {decoratorArgs, descriptorOf, prototypeOf} from "@tsed/core";
+import {descriptorOf} from "../objects/descriptorOf";
+import {prototypeOf} from "../objects/prototypeOf";
+import {decoratorArgs} from "./decoratorArgs";
 
 describe("decoratorArgs", () => {
   it("should return decorator arguments", () => {

packages/core/src/utils/decorators/useDecorators.spec.ts

@@ -1,5 +1,7 @@
-import {Store, StoreFn, useDecorators} from "@tsed/core";
+import {StoreFn} from "../../decorators/storeFn";
+import {useDecorators} from "./useDecorators";
 import {AnyDecorator} from "../../interfaces/AnyDecorator";
+import {Store} from "../../domain/Store";
 
 describe("useDecorators", () => {
   function decorator1(value: any) {

packages/core/src/utils/decorators/useMethodDecorator.spec.ts

@@ -1,4 +1,7 @@
-import {Store, StoreFn, useDecorators, useMethodDecorator, useMethodDecorators} from "@tsed/core";
+import {StoreFn} from "../../decorators/storeFn";
+import {Store} from "../../domain/Store";
+import {useDecorators} from "./useDecorators";
+import {useMethodDecorator, useMethodDecorators} from "./useMethodDecorators";
 
 describe("useMethodDecorators", () => {
   it("should apply all decorators", () => {

packages/core/src/utils/imports/importPackage.spec.ts

@@ -1,5 +1,5 @@
+import {catchAsyncError} from "../catchError";
 import {importPackage} from "./importPackage";
-import {catchAsyncError} from "@tsed/core";
 
 describe("importPackage", () => {
   it("should load package util", async () => {

packages/core/src/utils/objects/cleanObject.spec.ts

@@ -1,4 +1,4 @@
-import {cleanObject} from "@tsed/core";
+import {cleanObject} from "./cleanObject";
 
 describe("cleanObject", () => {
   it("should clean undefined value from object", () => {

packages/core/src/utils/objects/getConstructorArgNames.spec.ts

@@ -1,4 +1,4 @@
-import {getConstructorArgNames} from "@tsed/core";
+import {getConstructorArgNames} from "./getConstructorArgNames";
 
 describe("getConstructorArgNames", () => {
   it("should return the constructor args names", () => {

packages/core/src/utils/objects/getEnumerableKeys.spec.ts

@@ -1,4 +1,5 @@
-import {Enumerable, getEnumerableKeys} from "@tsed/core";
+import {Enumerable} from "../../decorators/enumerable";
+import {getEnumerableKeys} from "./getEnumerableKeys";
 
 describe("getEnumerableKeys", () => {
   it("should return enumerable keys", () => {

packages/core/src/utils/objects/isClass.spec.ts

@@ -1,4 +1,4 @@
-import {isClass} from "@tsed/core";
+import {isClass} from "./isClass";
 
 describe("isClass", () => {
   it("should test if a value is a class", () => {

packages/core/src/utils/objects/isEmpty.spec.ts

@@ -1,4 +1,4 @@
-import {isEmpty} from "@tsed/core";
+import {isEmpty} from "./isEmpty";
 
 describe("isEmpty", () => {
   it("should return true", () => {

packages/core/src/utils/objects/isNil.spec.ts

@@ -1,4 +1,4 @@
-import {isNil} from "@tsed/core";
+import {isNil} from "./isNil";
 
 describe("isNil", () => {
   it("should return true", () => {

packages/core/src/utils/objects/isPlainObject.spec.ts

@@ -1,9 +1,10 @@
-import {isPlainObject} from "@tsed/core";
+import {isPlainObject} from "./isPlainObject";
 
 describe("isPlainObject", () => {
   it("should test if the value is a plain object", () => {
     expect(isPlainObject({})).toEqual(true);
     expect(isPlainObject(class {})).toEqual(false);
     expect(isPlainObject(new (class {})())).toEqual(false);
+    expect(isPlainObject(Object)).toEqual(false);
   });
 });

packages/core/src/utils/objects/isPrimitive.spec.ts

@@ -1,4 +1,4 @@
-import {isPrimitive, isPrimitiveClass} from "@tsed/core";
+import {isPrimitive, isPrimitiveClass} from "./isPrimitive";
 
 describe("isPrimitive", () => {
   it("should test if an variable content is a primitive", () => {

packages/core/src/utils/objects/isSerializable.spec.ts

@@ -1,4 +1,4 @@
-import {isSerializable} from "@tsed/core";
+import {isSerializable} from "./isSerializable";
 
 describe("isSerializable()", () => {
   it("should return the expected value", () => {

packages/core/src/utils/objects/isSymbol.spec.ts

@@ -1,4 +1,4 @@
-import {isSymbol, isSymbolOrSymbolClass} from "@tsed/core";
+import {isSymbol, isSymbolOrSymbolClass} from "./isSymbol";
 
 describe("isSymbol()", () => {
   it("should validate value", () => {

packages/core/src/utils/proxyDelegation.spec.ts

@@ -1,4 +1,4 @@
-import {proxyDelegation} from "@tsed/core";
+import {proxyDelegation} from "./proxyDelegation";
 
 describe("proxyDelegation", () => {
   it("should create proxy delegation with internal map", () => {

packages/di/src/decorators/__mock__/lazy.import.module.ts

@@ -1,4 +1,4 @@
-import {Injectable} from "@tsed/di";
+import {Injectable} from "../injectable";
 
 @Injectable()
 export class MyLazyModule {

packages/di/src/decorators/__mock__/lazy.module.ts

@@ -1,8 +1,9 @@
-import {Injectable} from "@tsed/di";
+import {Injectable} from "../injectable";
 
 @Injectable()
 export class MyLazyModule {
   called = false;
+
   $onInit() {
     this.called = true;
   }

packages/di/src/decorators/__mock__/lazy.nodefault.module.ts

@@ -1,4 +1,4 @@
-import {Injectable} from "@tsed/di";
+import {Injectable} from "../injectable";
 
 @Injectable()
 export class MyLazyModule {

packages/di/src/decorators/configuration.spec.ts

@@ -1,6 +1,10 @@
 import {Store} from "@tsed/core";
-import {Container, GlobalProviders, Injectable, InjectorService, Provider} from "@tsed/di";
+import {Container} from "../domain/Container";
+import {Provider} from "../domain/Provider";
+import {GlobalProviders} from "../registries/GlobalProviders";
+import {InjectorService} from "../services/InjectorService";
 import {Configuration} from "./configuration";
+import {Injectable} from "./injectable";
 
 describe("@Configuration", () => {
   it("should declare a new provider with custom configuration", () => {

packages/di/src/decorators/constant.spec.ts

@@ -1,6 +1,6 @@
 import {Store} from "@tsed/core";
-import {Constant} from "../../src";
 import {INJECTABLE_PROP} from "../constants/constants";
+import {Constant} from "./constant";
 
 class Test {}
 

packages/di/src/decorators/controller.spec.ts

@@ -1,5 +1,7 @@
-import {Controller} from "@tsed/common";
-import {GlobalProviders, ProviderScope, ProviderType} from "@tsed/di";
+import {ProviderScope} from "../domain/ProviderScope";
+import {ProviderType} from "../domain/ProviderType";
+import {GlobalProviders} from "../registries/GlobalProviders";
+import {Controller} from "./controller";
 
 class Test {}
 

packages/di/src/decorators/inject.spec.ts

@@ -1,6 +1,8 @@
-import {catchError, descriptorOf} from "@tsed/core";
-import {Required} from "@tsed/schema";
-import {Inject, Injectable, InjectorService, registerProvider} from "../../src";
+import {descriptorOf} from "@tsed/core";
+import {registerProvider} from "../registries/ProviderRegistry";
+import {InjectorService} from "../services/InjectorService";
+import {Inject} from "./inject";
+import {Injectable} from "./injectable";
 
 describe("@Inject()", () => {
   describe("used on unsupported decorator type", () => {

packages/di/src/decorators/injectable.spec.ts

@@ -1,5 +1,5 @@
-import {Injectable} from "@tsed/di";
-import * as ProviderRegistry from "../../src/registries/ProviderRegistry";
+import {Injectable} from "../decorators/injectable";
+import * as ProviderRegistry from "../registries/ProviderRegistry";
 
 describe("@Injectable()", () => {
   beforeEach(() => jest.spyOn(ProviderRegistry, "registerProvider"));

packages/di/src/decorators/intercept.spec.ts

@@ -1,6 +1,9 @@
 import {Store} from "@tsed/core";
-import {InterceptorMethods, InterceptorContext, InjectablePropertyType, Intercept} from "../../src";
 import {INJECTABLE_PROP} from "../constants/constants";
+import {InjectablePropertyType} from "../domain/InjectablePropertyType";
+import {InterceptorContext} from "../interfaces/InterceptorContext";
+import {InterceptorMethods} from "../interfaces/InterceptorMethods";
+import {Intercept} from "./intercept";
 
 describe("@Intercept", () => {
   it("should add interceptor on method", () => {

packages/di/src/decorators/lazyInject.spec.ts

@@ -1,6 +1,8 @@
-import {Injectable, InjectorService, LazyInject, OptionalLazyInject} from "@tsed/di";
-import type {MyLazyModule} from "./__mock__/lazy.module";
 import {catchAsyncError, classOf, nameOf} from "@tsed/core";
+import {InjectorService} from "../services/InjectorService";
+import type {MyLazyModule} from "./__mock__/lazy.module";
+import {Injectable} from "./injectable";
+import {LazyInject, OptionalLazyInject} from "./lazyInject";
 
 describe("LazyInject", () => {
   it("should lazy load module (import)", async () => {

packages/di/src/decorators/overrideProvider.spec.ts

@@ -1,6 +1,7 @@
 import Sinon from "sinon";
-import {GlobalProviders, Provider} from "../../src";
-import {OverrideProvider} from "../../src/decorators/overrideProvider";
+import {OverrideProvider} from "./overrideProvider";
+import {Provider} from "../domain/Provider";
+import {GlobalProviders} from "../registries/GlobalProviders";
 
 describe("OverrideProvider", () => {
   class Test {}

packages/di/src/decorators/scope.spec.ts

@@ -1,5 +1,5 @@
 import {Store} from "@tsed/core";
-import {Scope} from "../../src";
+import {Scope} from "./scope";
 
 class Test {}
 

packages/di/src/decorators/useOpts.spec.ts

@@ -1,5 +1,11 @@
 import {descriptorOf} from "@tsed/core";
-import {DITest, Inject, Injectable, Opts, ProviderScope, Scope, UseOpts} from "@tsed/di";
+import {ProviderScope} from "../domain/ProviderScope";
+import {DITest} from "../services/DITest";
+import {Inject} from "./inject";
+import {Injectable} from "./injectable";
+import {Opts} from "./opts";
+import {Scope} from "./scope";
+import {UseOpts} from "./useOpts";
 
 describe("UseOpts", () => {
   let testContext: any;

packages/di/src/decorators/value.spec.ts

@@ -1,5 +1,5 @@
 import {Store} from "@tsed/core";
-import {Value} from "../../src";
+import {Value} from "./value";
 import {INJECTABLE_PROP} from "../constants/constants";
 
 describe("@Value()", () => {

packages/di/src/domain/Container.spec.ts

@@ -1,4 +1,6 @@
-import {Container, Provider, ProviderType} from "../../src";
+import {Container} from "./Container";
+import {Provider} from "./Provider";
+import {ProviderType} from "./ProviderType";
 
 describe("Container", () => {
   describe("getProvider()", () => {

packages/di/src/domain/ContextLogger.spec.ts

@@ -1,4 +1,5 @@
-import {InjectorService, ContextLogger} from "@tsed/di";
+import {InjectorService} from "../services/InjectorService";
+import {ContextLogger} from "./ContextLogger";
 
 function getIgnoreLogFixture(ignore: string[], url: string) {
   const ignoreReg = ignore.map((pattern: string | RegExp) => (typeof pattern === "string" ? new RegExp(pattern, "gi") : pattern));

packages/di/src/domain/ControllerProvider.spec.ts

@@ -1,5 +1,5 @@
-import {ProviderScope} from "@tsed/di";
 import {ControllerProvider} from "./ControllerProvider";
+import {ProviderScope} from "./ProviderScope";
 
 class Test {}