$$$ update $$$

darekf77 · Apr 27, 2024 · f28ab83 · f28ab83
1 parent eaef092
commit f28ab83
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 5 deletions.
diff --git a/src/app.ts b/src/app.ts
@@ -102,6 +102,12 @@ const UserContext = Firedev.createContext({
     UserProvider,
   }
 });
+
+
+const AppContext = Firedev.createContext({
+  remoteHost: `http://localhost:${HOST_BACKEND_PORT}`,
+  contexts: { UserContext },
+});
 //#endregion
 
 

diff --git a/src/lib/base-classes/base-class.ts b/src/lib/base-classes/base-class.ts
@@ -1,18 +1,30 @@
 import { EndpointContext } from "../endpoint-context";
 import { Symbols } from "../symbols";
+import { inject } from '@angular/core';
 
 
 export class BaseClass {
+  /**
+   * Current endpoint context
+   */
   get __endpoint_context__() {
     return this[Symbols.ctxInClassOrClassObj] as EndpointContext;
   }
 
+  /**
+   * Inject: Controllers, Providers, Repositories, Services, etc.
+   * TODO  addd nest js injecting
+   */
   inject<T>(ctor: new (...args: any[]) => T): T {
     return new Proxy({}, {
       get: (_, propName) => {
-        const res = this.__endpoint_context__;
-        let instance: T = res.inject(ctor);
-        return typeof instance[propName] === 'function' ? instance[propName].bind(instance) : instance[propName];
+        const contextFromClass = ctor[Symbols.ctxInClassOrClassObj];
+        const resultContext = contextFromClass ? contextFromClass : this.__endpoint_context__;
+        if (resultContext) {
+          let instance: T = resultContext.inject(ctor);
+          return typeof instance[propName] === 'function' ? instance[propName].bind(instance) : instance[propName];
+        }
+        return inject(ctor)[propName];
       },
     }) as T;
   }

diff --git a/src/lib/models.ts b/src/lib/models.ts
@@ -101,7 +101,7 @@ export namespace Models {
   export class ControllerConfig implements FiredevControllerOptions {
     realtime?: boolean;
     path: string;
-    className?: string;
+    className: string;
     uniqueKey?: string;
     classReference?: Function;
     methods: { [methodName: string]: MethodConfig } = {};
@@ -117,7 +117,7 @@ export namespace Models {
 
   //#region models / decorator abstract options
   export interface DecoratorAbstractOpt {
-    className?: string;
+    className: string;
   }
   //#endregion