moost 0.5.16 → 0.5.18

package/dist/index.cjs

@@ -91,12 +91,13 @@ function getNewMoostInfact() {
                 scopeId: meta?.injectable === 'FOR_EVENT' ? eventCore.useEventId().getId() : undefined,
             };
         },
-        resolveParam({ paramMeta, customData, classConstructor, index }) {
+        resolveParam({ paramMeta, customData, classConstructor, index, scopeId }) {
             if (paramMeta && customData?.pipes) {
                 return runPipes(customData.pipes, undefined, {
                     paramMeta,
                     type: classConstructor,
                     key: 'constructor',
+                    scopeId,
                     classMeta: getMoostMate().read(classConstructor),
                     index,
                     targetMeta: paramMeta,
@@ -107,12 +108,13 @@ function getNewMoostInfact() {
             const meta = getMoostMate().read(classConstructor, key);
             return meta;
         },
-        resolveProp({ instance, key, initialValue, propMeta, classMeta, customData, classConstructor, }) {
+        resolveProp({ instance, key, initialValue, propMeta, scopeId, classMeta, customData, classConstructor, }) {
             if (propMeta && customData?.pipes) {
                 return runPipes(customData.pipes, initialValue, {
                     instance,
                     type: classConstructor,
                     key,
+                    scopeId,
                     propMeta,
                     targetMeta: propMeta,
                     classMeta: classMeta,
@@ -749,9 +751,19 @@ function Replace(type, newType) {
 function Inject(type) {
     return getMoostMate().decorate('inject', type);
 }
-function FromScope(name) {
+function InjectFromScope(name) {
     return getMoostMate().decorate('fromScope', name);
 }
+function InjectScopeVars(name) {
+    return Resolve(({ scopeId }) => {
+        if (scopeId) {
+            return name
+                ? getInfactScopeVars(scopeId)?.[name]
+                : getInfactScopeVars(scopeId);
+        }
+        return undefined;
+    });
+}
 
 function defineInterceptorFn(fn, priority = exports.TInterceptorPriority.INTERCEPTOR) {
     fn.priority = priority;
@@ -1034,13 +1046,14 @@ exports.Const = Const;
 exports.ConstFactory = ConstFactory;
 exports.Controller = Controller;
 exports.Description = Description;
-exports.FromScope = FromScope;
 exports.Id = Id;
 exports.ImportController = ImportController;
 exports.Inherit = Inherit;
 exports.Inject = Inject;
 exports.InjectEventLogger = InjectEventLogger;
+exports.InjectFromScope = InjectFromScope;
 exports.InjectMoostLogger = InjectMoostLogger;
+exports.InjectScopeVars = InjectScopeVars;
 exports.Injectable = Injectable;
 exports.Intercept = Intercept;
 exports.InterceptorHandler = InterceptorHandler;

package/dist/index.d.ts

@@ -147,8 +147,23 @@ declare function getMoostInfact(): Infact<TMoostMetadata<TEmpty>, TMoostMetadata
 interface TCustom {
     pipes?: TPipeData[];
 }
-declare function defineInfactScope(name: string | symbol, scopeVars: Record<string, unknown>): void;
-declare function getInfactScopeVars(name: string | symbol): Record<string, unknown> | undefined;
+/**
+ * Define global scope name to be used with `@InjectFromScope` and `@InjectScopeVars` decorators
+ *
+ * You can read scoped vars with `getInfactScopeVars`
+ * @param name scope name
+ * @param scopeVars key-value object as scoped vars
+ */
+declare function defineInfactScope<T extends object>(name: string | symbol, scopeVars: T): void;
+/**
+ * Read scoped vars defined with `defineInfactScope`
+ * @param name scope name
+ * @returns key-value object as scoped vars
+ */
+declare function getInfactScopeVars<T extends object>(name: string | symbol): T | undefined;
+/**
+ * Get Infact instance (used for Dependency Injections)
+ */
 declare function getNewMoostInfact(): Infact<TMoostMetadata<TEmpty>, TMoostMetadata<TEmpty>, TMoostParamsMetadata, TCustom>;
 
 interface TPipeMetas<T extends TObject = TEmpty> {
@@ -158,6 +173,7 @@ interface TPipeMetas<T extends TObject = TEmpty> {
     paramMeta?: TMoostParamsMetadata & T;
     targetMeta?: TMoostParamsMetadata & T;
     instance?: TObject;
+    scopeId?: string | symbol;
     type: TFunction;
     index?: number;
     key: string | symbol;
@@ -289,7 +305,7 @@ declare function Pipe(handler: TPipeFn, priority?: TPipePriority): ClassDecorato
  * @param type - string or class constructor
  * @param fn - factory function for provided value
  */
-declare function Provide(type: string | TClassConstructor, fn: TProvideFn): ClassDecorator;
+declare function Provide(type: string | TClassConstructor, fn: TProvideFn): ClassDecorator & ParameterDecorator & PropertyDecorator;
 /**
  * ## Replace
  * ### @Decorator
@@ -305,8 +321,19 @@ declare function Replace(type: TClassConstructor, newType: TClassConstructor): C
  * (For optional values use with @Optional())
  * @param type - string or class constructor
  */
-declare function Inject(type: string | TClassConstructor): ParameterDecorator;
-declare function FromScope(name: string | symbol): ParameterDecorator;
+declare function Inject(type: string | TClassConstructor): ParameterDecorator & PropertyDecorator;
+/**
+ * Injects instance from scope
+ *
+ * (scope must be defined by `defineInfactScope` fn)
+ * @param name scope name
+ */
+declare function InjectFromScope(name: string | symbol): ParameterDecorator & PropertyDecorator;
+/**
+ * Inject vars from scope for instances
+ * instantiated with `@InjectFromScope` decorator
+ */
+declare function InjectScopeVars(name?: string): ParameterDecorator & PropertyDecorator;
 
 /**
  * Hook to the Response Status
@@ -663,4 +690,4 @@ type TInterceptorClass = TClassFunction<TInterceptorFn>;
  */
 declare function definePipeFn<T extends TObject = TEmpty>(fn: TPipeFn<T>, priority?: TPipePriority): TPipeFn<T>;
 
-export { Circular, Const, ConstFactory, Controller, Description, FromScope, Id, ImportController, Inherit, Inject, InjectEventLogger, InjectMoostLogger, Injectable, Intercept, InterceptorHandler, Label, LoggerTopic, Moost, Optional, Param, Params, Pipe, Provide, Replace, Required, Resolve, type TCallableClassFunction, type TClassConstructor, type TClassFunction, type TContextInjectorHook, type TControllerOverview, type TInjectableScope, type TInterceptorAfter, type TInterceptorBefore, type TInterceptorClass, type TInterceptorData, type TInterceptorFn, type TInterceptorOnError, TInterceptorPriority, type TMoostAdapter, type TMoostAdapterOptions, type TMoostEventHandlerHookOptions, type TMoostEventHandlerOptions, type TMoostHandler, type TMoostMetadata, type TMoostOptions, type TMoostParamsMetadata, type TPipeData, type TPipeFn, type TPipeMetas, TPipePriority, Value, defineInfactScope, defineInterceptorFn, defineMoostEventHandler, definePipeFn, getInfactScopeVars, getInstanceOwnMethods, getInstanceOwnProps, getMoostInfact, getMoostMate, getNewMoostInfact, registerEventScope, resolvePipe, setControllerContext, setInfactLoggingOptions, useControllerContext };
+export { Circular, Const, ConstFactory, Controller, Description, Id, ImportController, Inherit, Inject, InjectEventLogger, InjectFromScope, InjectMoostLogger, InjectScopeVars, Injectable, Intercept, InterceptorHandler, Label, LoggerTopic, Moost, Optional, Param, Params, Pipe, Provide, Replace, Required, Resolve, type TCallableClassFunction, type TClassConstructor, type TClassFunction, type TContextInjectorHook, type TControllerOverview, type TInjectableScope, type TInterceptorAfter, type TInterceptorBefore, type TInterceptorClass, type TInterceptorData, type TInterceptorFn, type TInterceptorOnError, TInterceptorPriority, type TMoostAdapter, type TMoostAdapterOptions, type TMoostEventHandlerHookOptions, type TMoostEventHandlerOptions, type TMoostHandler, type TMoostMetadata, type TMoostOptions, type TMoostParamsMetadata, type TPipeData, type TPipeFn, type TPipeMetas, TPipePriority, Value, defineInfactScope, defineInterceptorFn, defineMoostEventHandler, definePipeFn, getInfactScopeVars, getInstanceOwnMethods, getInstanceOwnProps, getMoostInfact, getMoostMate, getNewMoostInfact, registerEventScope, resolvePipe, setControllerContext, setInfactLoggingOptions, useControllerContext };

package/dist/index.mjs

@@ -93,12 +93,13 @@ function getNewMoostInfact() {
                 scopeId: meta?.injectable === 'FOR_EVENT' ? useEventId().getId() : undefined,
             };
         },
-        resolveParam({ paramMeta, customData, classConstructor, index }) {
+        resolveParam({ paramMeta, customData, classConstructor, index, scopeId }) {
             if (paramMeta && customData?.pipes) {
                 return runPipes(customData.pipes, undefined, {
                     paramMeta,
                     type: classConstructor,
                     key: 'constructor',
+                    scopeId,
                     classMeta: getMoostMate().read(classConstructor),
                     index,
                     targetMeta: paramMeta,
@@ -109,12 +110,13 @@ function getNewMoostInfact() {
             const meta = getMoostMate().read(classConstructor, key);
             return meta;
         },
-        resolveProp({ instance, key, initialValue, propMeta, classMeta, customData, classConstructor, }) {
+        resolveProp({ instance, key, initialValue, propMeta, scopeId, classMeta, customData, classConstructor, }) {
             if (propMeta && customData?.pipes) {
                 return runPipes(customData.pipes, initialValue, {
                     instance,
                     type: classConstructor,
                     key,
+                    scopeId,
                     propMeta,
                     targetMeta: propMeta,
                     classMeta: classMeta,
@@ -751,9 +753,19 @@ function Replace(type, newType) {
 function Inject(type) {
     return getMoostMate().decorate('inject', type);
 }
-function FromScope(name) {
+function InjectFromScope(name) {
     return getMoostMate().decorate('fromScope', name);
 }
+function InjectScopeVars(name) {
+    return Resolve(({ scopeId }) => {
+        if (scopeId) {
+            return name
+                ? getInfactScopeVars(scopeId)?.[name]
+                : getInfactScopeVars(scopeId);
+        }
+        return undefined;
+    });
+}
 
 function defineInterceptorFn(fn, priority = TInterceptorPriority.INTERCEPTOR) {
     fn.priority = priority;
@@ -979,4 +991,4 @@ class Moost extends Hookable {
     }
 }
 
-export { Circular, Const, ConstFactory, Controller, Description, FromScope, Id, ImportController, Inherit, Inject, InjectEventLogger, InjectMoostLogger, Injectable, Intercept, InterceptorHandler, Label, LoggerTopic, Moost, Optional, Param, Params, Pipe, Provide, Replace, Required, Resolve, TInterceptorPriority, TPipePriority, Value, defineInfactScope, defineInterceptorFn, defineMoostEventHandler, definePipeFn, getInfactScopeVars, getInstanceOwnMethods, getInstanceOwnProps, getMoostInfact, getMoostMate, getNewMoostInfact, registerEventScope, resolvePipe, setControllerContext, setInfactLoggingOptions, useControllerContext };
+export { Circular, Const, ConstFactory, Controller, Description, Id, ImportController, Inherit, Inject, InjectEventLogger, InjectFromScope, InjectMoostLogger, InjectScopeVars, Injectable, Intercept, InterceptorHandler, Label, LoggerTopic, Moost, Optional, Param, Params, Pipe, Provide, Replace, Required, Resolve, TInterceptorPriority, TPipePriority, Value, defineInfactScope, defineInterceptorFn, defineMoostEventHandler, definePipeFn, getInfactScopeVars, getInstanceOwnMethods, getInstanceOwnProps, getMoostInfact, getMoostMate, getNewMoostInfact, registerEventScope, resolvePipe, setControllerContext, setInfactLoggingOptions, useControllerContext };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "moost",
-  "version": "0.5.16",
+  "version": "0.5.18",
   "description": "moost",
   "main": "dist/index.cjs",
   "module": "dist/index.mjs",
@@ -31,7 +31,7 @@
     "prostojs"
   ],
   "dependencies": {
-    "@prostojs/infact": "^0.3.1",
+    "@prostojs/infact": "^0.3.3",
     "@prostojs/mate": "^0.3.3",
     "@prostojs/logger": "^0.4.3",
     "@wooksjs/event-core": "^0.5.20",