@loopback/service-proxy 2.1.1 → 2.3.0

package/CHANGELOG.md

@@ -3,6 +3,44 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.3.0](https://github.com/strongloop/loopback-next/compare/@loopback/service-proxy@2.2.1...@loopback/service-proxy@2.3.0) (2020-05-20)
+
+
+### Features
+
+* **service-proxy:** refine service mixin ([a6d0e2a](https://github.com/strongloop/loopback-next/commit/a6d0e2a457751568faffc1e733dc15f2e7232d2c))
+
+
+
+
+
+## [2.2.1](https://github.com/strongloop/loopback-next/compare/@loopback/service-proxy@2.2.0...@loopback/service-proxy@2.2.1) (2020-05-19)
+
+**Note:** Version bump only for package @loopback/service-proxy
+
+
+
+
+
+# [2.2.0](https://github.com/strongloop/loopback-next/compare/@loopback/service-proxy@2.1.2...@loopback/service-proxy@2.2.0) (2020-05-07)
+
+
+### Features
+
+* **core:** allow options for artifact registration on an application ([f3fdc3b](https://github.com/strongloop/loopback-next/commit/f3fdc3b94e34610dd1bebb600a497c77a2794019))
+
+
+
+
+
+## [2.1.2](https://github.com/strongloop/loopback-next/compare/@loopback/service-proxy@2.1.1...@loopback/service-proxy@2.1.2) (2020-04-29)
+
+**Note:** Version bump only for package @loopback/service-proxy
+
+
+
+
+
 ## [2.1.1](https://github.com/strongloop/loopback-next/compare/@loopback/service-proxy@2.1.0...@loopback/service-proxy@2.1.1) (2020-04-23)
 
 **Note:** Version bump only for package @loopback/service-proxy

package/dist/decorators/service.decorator.js

@@ -4,6 +4,7 @@
 // This file is licensed under the MIT License.
 // License text available at https://opensource.org/licenses/MIT
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.serviceProxy = exports.ServiceProxyMetadata = exports.SERVICE_PROXY_KEY = void 0;
 const context_1 = require("@loopback/context");
 const __1 = require("..");
 exports.SERVICE_PROXY_KEY = context_1.MetadataAccessor.create('service.proxy');

package/dist/decorators/service.decorator.js.map

@@ -1 +1 @@
-{"version":3,"file":"service.decorator.js","sourceRoot":"","sources":["../../src/decorators/service.decorator.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,uCAAuC;AACvC,+CAA+C;AAC/C,gEAAgE;;AAEhE,+CAM2B;AAC3B,0BAAuC;AAO1B,QAAA,iBAAiB,GAAG,0BAAgB,CAAC,MAAM,CAGtD,eAAe,CAAC,CAAC;AAEnB;;GAEG;AACH,MAAa,oBAAoB;IAK/B,YAAY,UAAuC;QAJnD,cAAS,GAAG,eAAe,CAAC;QAK1B,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE;YAClC,IAAI,CAAC,cAAc,GAAG,UAAU,CAAC;SAClC;aAAM;YACL,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;SAC9B;IACH,CAAC;CACF;AAZD,oDAYC;AAED,SAAgB,YAAY,CAAC,UAAuC;IAClE,OAAO,UAAU,MAAc,EAAE,GAAW,EAAE,cAAuB;QACnE,IAAI,GAAG,IAAI,OAAO,cAAc,KAAK,QAAQ,EAAE;YAC7C,MAAM,IAAI,GAAG,IAAI,oBAAoB,CAAC,UAAU,CAAC,CAAC;YAClD,gBAAM,CAAC,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC,MAAM,EAAE,GAAG,EAAE,cAAc,CAAC,CAAC;SACxD;aAAM;YACL,MAAM,IAAI,KAAK,CACb,sEAAsE,CACvE,CAAC;SACH;IACH,CAAC,CAAC;AACJ,CAAC;AAXD,oCAWC;AAED;;;;GAIG;AACH,KAAK,UAAU,OAAO,CAAC,GAAY,EAAE,SAAoB;IACvD,MAAM,IAAI,GAAG,SAAS,CAAC,QAAgC,CAAC;IACxD,IAAI,IAAI,CAAC,UAAU;QAAE,OAAO,cAAU,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IACxD,IAAI,IAAI,CAAC,cAAc,EAAE;QACvB,MAAM,EAAE,GAAG,MAAM,GAAG,CAAC,GAAG,CACtB,cAAc,GAAG,IAAI,CAAC,cAAc,CACrC,CAAC;QACF,OAAO,cAAU,CAAC,EAAE,CAAC,CAAC;KACvB;IACD,MAAM,IAAI,KAAK,CACb,gEAAgE,CACjE,CAAC;AACJ,CAAC"}
+{"version":3,"file":"service.decorator.js","sourceRoot":"","sources":["../../src/decorators/service.decorator.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,uCAAuC;AACvC,+CAA+C;AAC/C,gEAAgE;;;AAEhE,+CAM2B;AAC3B,0BAAuC;AAO1B,QAAA,iBAAiB,GAAG,0BAAgB,CAAC,MAAM,CAGtD,eAAe,CAAC,CAAC;AAEnB;;GAEG;AACH,MAAa,oBAAoB;IAK/B,YAAY,UAAuC;QAJnD,cAAS,GAAG,eAAe,CAAC;QAK1B,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE;YAClC,IAAI,CAAC,cAAc,GAAG,UAAU,CAAC;SAClC;aAAM;YACL,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;SAC9B;IACH,CAAC;CACF;AAZD,oDAYC;AAED,SAAgB,YAAY,CAAC,UAAuC;IAClE,OAAO,UAAU,MAAc,EAAE,GAAW,EAAE,cAAuB;QACnE,IAAI,GAAG,IAAI,OAAO,cAAc,KAAK,QAAQ,EAAE;YAC7C,MAAM,IAAI,GAAG,IAAI,oBAAoB,CAAC,UAAU,CAAC,CAAC;YAClD,gBAAM,CAAC,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC,MAAM,EAAE,GAAG,EAAE,cAAc,CAAC,CAAC;SACxD;aAAM;YACL,MAAM,IAAI,KAAK,CACb,sEAAsE,CACvE,CAAC;SACH;IACH,CAAC,CAAC;AACJ,CAAC;AAXD,oCAWC;AAED;;;;GAIG;AACH,KAAK,UAAU,OAAO,CAAC,GAAY,EAAE,SAAoB;IACvD,MAAM,IAAI,GAAG,SAAS,CAAC,QAAgC,CAAC;IACxD,IAAI,IAAI,CAAC,UAAU;QAAE,OAAO,cAAU,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IACxD,IAAI,IAAI,CAAC,cAAc,EAAE;QACvB,MAAM,EAAE,GAAG,MAAM,GAAG,CAAC,GAAG,CACtB,cAAc,GAAG,IAAI,CAAC,cAAc,CACrC,CAAC;QACF,OAAO,cAAU,CAAC,EAAE,CAAC,CAAC;KACvB;IACD,MAAM,IAAI,KAAK,CACb,gEAAgE,CACjE,CAAC;AACJ,CAAC"}

package/dist/legacy-juggler-bridge.js

@@ -4,6 +4,7 @@
 // This file is licensed under the MIT License.
 // License text available at https://opensource.org/licenses/MIT
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.getService = exports.juggler = void 0;
 const tslib_1 = require("tslib");
 const loopback_datasource_juggler_1 = tslib_1.__importDefault(require("loopback-datasource-juggler"));
 var juggler;

package/dist/legacy-juggler-bridge.js.map

@@ -1 +1 @@
-{"version":3,"file":"legacy-juggler-bridge.js","sourceRoot":"","sources":["../src/legacy-juggler-bridge.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,uCAAuC;AACvC,+CAA+C;AAC/C,gEAAgE;;;AAEhE,sGAAiD;AAEjD,IAAiB,OAAO,CAGvB;AAHD,WAAiB,OAAO;IACtB,6DAA6D;IAC/C,kBAAU,GAAG,qCAAM,CAAC,UAAU,CAAC;AAC/C,CAAC,EAHgB,OAAO,GAAP,eAAO,KAAP,eAAO,QAGvB;AAUD;;;;;;GAMG;AACI,KAAK,UAAU,UAAU,CAC9B,EAAqB;IAErB,MAAM,EAAE,CAAC,OAAO,EAAE,CAAC;IACnB,8DAA8D;IAC9D,OAAO,EAAE,CAAC,gBAAuB,CAAC;AACpC,CAAC;AAND,gCAMC"}
+{"version":3,"file":"legacy-juggler-bridge.js","sourceRoot":"","sources":["../src/legacy-juggler-bridge.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,uCAAuC;AACvC,+CAA+C;AAC/C,gEAAgE;;;;AAEhE,sGAAiD;AAEjD,IAAiB,OAAO,CAGvB;AAHD,WAAiB,OAAO;IACtB,6DAA6D;IAC/C,kBAAU,GAAG,qCAAM,CAAC,UAAU,CAAC;AAC/C,CAAC,EAHgB,OAAO,GAAP,eAAO,KAAP,eAAO,QAGvB;AAUD;;;;;;GAMG;AACI,KAAK,UAAU,UAAU,CAC9B,EAAqB;IAErB,MAAM,EAAE,CAAC,OAAO,EAAE,CAAC;IACnB,8DAA8D;IAC9D,OAAO,EAAE,CAAC,gBAAuB,CAAC;AACpC,CAAC;AAND,gCAMC"}

package/dist/mixins/service.mixin.d.ts

@@ -1,5 +1,7 @@
-import { Binding, Provider } from '@loopback/context';
-import { Application } from '@loopback/core';
+import { Binding, BindingFromClassOptions, Provider, Constructor } from '@loopback/context';
+import { Application, MixinTarget, ServiceOptions, Component } from '@loopback/core';
+import { BindingAddress, BindingFilter, JSONObject, Context, ContextSubscriptionManager, ContextEvent, Interceptor, InterceptorBindingOptions, ResolutionOptions, BindingKey, ValueOrPromise, ContextEventObserver, ContextObserver, Subscription, BindingComparator, ContextView, ResolutionSession, BindingCreationPolicy, ContextInspectOptions } from '@loopback/context';
+import { Server, ApplicationConfig, ApplicationMetadata, LifeCycleObserver } from '@loopback/core';
 /**
  * Interface for classes with `new` operator.
  */
@@ -20,9 +22,8 @@ export interface Class<T> {
  * called <a href="#ServiceMixinDoc">ServiceMixinDoc</a>
  *
  */
-export declare function ServiceMixin<T extends Class<any>>(superClass: T): {
+export declare function ServiceMixin<T extends MixinTarget<Application>>(superClass: T): {
     new (...args: any[]): {
-        [x: string]: any;
         /**
          * Add a service to this application.
          *
@@ -50,7 +51,7 @@ export declare function ServiceMixin<T extends Class<any>>(superClass: T): {
          * app.serviceProvider(GeocoderServiceProvider);
          * ```
          */
-        serviceProvider<S>(provider: Class<Provider<S>>, name?: string | undefined): Binding<S>;
+        serviceProvider<S>(provider: Constructor<Provider<S>>, nameOrOptions?: string | ServiceOptions | undefined): Binding<S>;
         /**
          * Add a component to this application. Also mounts
          * all the components services.
@@ -72,7 +73,7 @@ export declare function ServiceMixin<T extends Class<any>>(superClass: T): {
          * app.component(ProductComponent);
          * ```
          */
-        component(component: Class<unknown>, name?: string | undefined): void;
+        component<T_1 extends Component = Component>(componentCtor: Constructor<T_1>, nameOrOptions?: string | BindingFromClassOptions | undefined): Binding<T_1>;
         /**
          * Get an instance of a component and mount all it's
          * services. This function is intended to be used internally
@@ -80,7 +81,74 @@ export declare function ServiceMixin<T extends Class<any>>(superClass: T): {
          *
          * @param component - The component to mount services of
          */
-        mountComponentServices(component: Class<unknown>): void;
+        mountComponentServices<T_2 extends Component = Component>(component: Constructor<T_2>, componentBindingKey?: string | BindingKey<T_2> | undefined): void;
+        readonly options: ApplicationConfig;
+        readonly state: string;
+        controller: <T_3>(controllerCtor: Constructor<T_3>, nameOrOptions?: string | BindingFromClassOptions | undefined) => Binding<T_3>;
+        server: <T_4 extends Server>(ctor: Constructor<T_4>, nameOrOptions?: string | BindingFromClassOptions | undefined) => Binding<T_4>;
+        servers: <T_5 extends Server>(ctors: Constructor<T_5>[]) => Binding<any>[];
+        getServer: <T_6 extends Server>(target: string | Constructor<T_6>) => Promise<T_6>;
+        start: () => Promise<void>;
+        stop: () => Promise<void>;
+        setMetadata: (metadata: ApplicationMetadata) => void;
+        lifeCycleObserver: <T_7 extends LifeCycleObserver>(ctor: Constructor<T_7>, nameOrOptions?: string | BindingFromClassOptions | undefined) => Binding<T_7>;
+        service: <S_2>(cls: Constructor<S_2 | Provider<S_2>>, nameOrOptions?: string | ServiceOptions | undefined) => Binding<S_2>;
+        interceptor: (interceptor: Interceptor | Constructor<Provider<Interceptor>>, nameOrOptions?: string | InterceptorBindingOptions | undefined) => Binding<Interceptor>;
+        readonly name: string;
+        readonly subscriptionManager: ContextSubscriptionManager;
+        readonly parent: Context | undefined;
+        emitEvent: <T_8 extends ContextEvent>(type: string, event: T_8) => void;
+        emitError: (err: unknown) => void;
+        bind: <ValueType = any>(key: BindingAddress<ValueType>) => Binding<ValueType>;
+        add: (binding: Binding<unknown>) => Application;
+        configure: <ConfigValueType = any>(key?: string | BindingKey<unknown> | undefined) => Binding<ConfigValueType>;
+        getConfigAsValueOrPromise: <ConfigValueType_1>(key: BindingAddress<unknown>, propertyPath?: string | undefined, resolutionOptions?: ResolutionOptions | undefined) => ValueOrPromise<ConfigValueType_1 | undefined>;
+        getConfig: <ConfigValueType_2>(key: BindingAddress<unknown>, propertyPath?: string | undefined, resolutionOptions?: ResolutionOptions | undefined) => Promise<ConfigValueType_2 | undefined>;
+        getConfigSync: <ConfigValueType_3>(key: BindingAddress<unknown>, propertyPath?: string | undefined, resolutionOptions?: ResolutionOptions | undefined) => ConfigValueType_3 | undefined;
+        unbind: (key: BindingAddress<unknown>) => boolean;
+        subscribe: (observer: ContextEventObserver) => Subscription;
+        unsubscribe: (observer: ContextEventObserver) => boolean;
+        close: () => void;
+        isSubscribed: (observer: ContextObserver) => boolean;
+        createView: <T_9 = unknown>(filter: BindingFilter, comparator?: BindingComparator | undefined) => ContextView<T_9>;
+        contains: (key: BindingAddress<unknown>) => boolean;
+        isBound: (key: BindingAddress<unknown>) => boolean;
+        getOwnerContext: (key: BindingAddress<unknown>) => Context | undefined;
+        find: <ValueType_1 = any>(pattern?: string | RegExp | BindingFilter | undefined) => Readonly<Binding<ValueType_1>>[];
+        findByTag: <ValueType_2 = any>(tagFilter: string | RegExp | Record<string, any>) => Readonly<Binding<ValueType_2>>[];
+        get: {
+            <ValueType_3>(keyWithPath: BindingAddress<ValueType_3>, session?: ResolutionSession | undefined): Promise<ValueType_3>;
+            <ValueType_4>(keyWithPath: BindingAddress<ValueType_4>, options: ResolutionOptions): Promise<ValueType_4 | undefined>;
+        };
+        getSync: {
+            <ValueType_5>(keyWithPath: BindingAddress<ValueType_5>, session?: ResolutionSession | undefined): ValueType_5;
+            <ValueType_6>(keyWithPath: BindingAddress<ValueType_6>, options?: ResolutionOptions | undefined): ValueType_6 | undefined;
+        };
+        getBinding: {
+            <ValueType_7 = any>(key: BindingAddress<ValueType_7>): Binding<ValueType_7>;
+            <ValueType_8>(key: BindingAddress<ValueType_8>, options?: {
+                optional?: boolean | undefined;
+            } | undefined): Binding<ValueType_8> | undefined;
+        };
+        findOrCreateBinding: <T_10>(key: BindingAddress<T_10>, policy?: BindingCreationPolicy | undefined) => Binding<T_10>;
+        getValueOrPromise: <ValueType_9>(keyWithPath: BindingAddress<ValueType_9>, optionsOrSession?: ResolutionOptions | ResolutionSession | undefined) => ValueOrPromise<ValueType_9 | undefined>;
+        toJSON: () => JSONObject;
+        inspect: (options?: ContextInspectOptions | undefined) => JSONObject;
+        addListener: (event: string | symbol, listener: (...args: any[]) => void) => Application;
+        on: (event: string | symbol, listener: (...args: any[]) => void) => Application;
+        once: (event: string | symbol, listener: (...args: any[]) => void) => Application;
+        prependListener: (event: string | symbol, listener: (...args: any[]) => void) => Application;
+        prependOnceListener: (event: string | symbol, listener: (...args: any[]) => void) => Application;
+        removeListener: (event: string | symbol, listener: (...args: any[]) => void) => Application;
+        off: (event: string | symbol, listener: (...args: any[]) => void) => Application;
+        removeAllListeners: (event?: string | symbol | undefined) => Application;
+        setMaxListeners: (n: number) => Application;
+        getMaxListeners: () => number;
+        listeners: (event: string | symbol) => Function[];
+        rawListeners: (event: string | symbol) => Function[];
+        emit: (event: string | symbol, ...args: any[]) => boolean;
+        eventNames: () => (string | symbol)[];
+        listenerCount: (type: string | symbol) => number;
     };
 } & T;
 /**

package/dist/mixins/service.mixin.js

@@ -4,6 +4,7 @@
 // This file is licensed under the MIT License.
 // License text available at https://opensource.org/licenses/MIT
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.ServiceMixinDoc = exports.ServiceMixin = void 0;
 /**
  * A mixin class for Application that creates a .serviceProvider()
  * function to register a service automatically. Also overrides
@@ -18,7 +19,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
  * called <a href="#ServiceMixinDoc">ServiceMixinDoc</a>
  *
  */
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
 function ServiceMixin(superClass) {
     return class extends superClass {
         /**
@@ -48,8 +48,8 @@ function ServiceMixin(superClass) {
          * app.serviceProvider(GeocoderServiceProvider);
          * ```
          */
-        serviceProvider(provider, name) {
-            return this.service(provider, name);
+        serviceProvider(provider, nameOrOptions) {
+            return this.service(provider, nameOrOptions);
         }
         /**
          * Add a component to this application. Also mounts
@@ -72,9 +72,14 @@ function ServiceMixin(superClass) {
          * app.component(ProductComponent);
          * ```
          */
-        component(component, name) {
-            super.component(component, name);
-            this.mountComponentServices(component);
+        // Unfortunately, TypeScript does not allow overriding methods inherited
+        // from mapped types. https://github.com/microsoft/TypeScript/issues/38496
+        // eslint-disable-next-line @typescript-eslint/ban-ts-ignore
+        // @ts-ignore
+        component(componentCtor, nameOrOptions) {
+            const binding = super.component(componentCtor, nameOrOptions);
+            this.mountComponentServices(componentCtor, binding.key);
+            return binding;
         }
         /**
          * Get an instance of a component and mount all it's
@@ -83,8 +88,8 @@ function ServiceMixin(superClass) {
          *
          * @param component - The component to mount services of
          */
-        mountComponentServices(component) {
-            const componentKey = `components.${component.name}`;
+        mountComponentServices(component, componentBindingKey) {
+            const componentKey = componentBindingKey !== null && componentBindingKey !== void 0 ? componentBindingKey : `components.${component.name}`;
             const compInstance = this.getSync(componentKey);
             if (compInstance.serviceProviders) {
                 for (const provider of compInstance.serviceProviders) {

package/dist/mixins/service.mixin.js.map

@@ -1 +1 @@
-{"version":3,"file":"service.mixin.js","sourceRoot":"","sources":["../../src/mixins/service.mixin.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,uCAAuC;AACvC,+CAA+C;AAC/C,gEAAgE;;AAchE;;;;;;;;;;;;;GAaG;AACH,8DAA8D;AAC9D,SAAgB,YAAY,CAAuB,UAAa;IAC9D,OAAO,KAAM,SAAQ,UAAU;QAC7B;;;;;;;;;;;;;;;;;;;;;;;;;;WA0BG;QACH,eAAe,CACb,QAA4B,EAC5B,IAAa;YAEb,OAAO,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QACtC,CAAC;QAED;;;;;;;;;;;;;;;;;;;;WAoBG;QACI,SAAS,CAAC,SAAyB,EAAE,IAAa;YACvD,KAAK,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;YACjC,IAAI,CAAC,sBAAsB,CAAC,SAAS,CAAC,CAAC;QACzC,CAAC;QAED;;;;;;WAMG;QACH,sBAAsB,CAAC,SAAyB;YAC9C,MAAM,YAAY,GAAG,cAAc,SAAS,CAAC,IAAI,EAAE,CAAC;YACpD,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;YAEhD,IAAI,YAAY,CAAC,gBAAgB,EAAE;gBACjC,KAAK,MAAM,QAAQ,IAAI,YAAY,CAAC,gBAAgB,EAAE;oBACpD,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;iBAChC;aACF;QACH,CAAC;KACF,CAAC;AACJ,CAAC;AAhFD,oCAgFC;AAWD;;;;;;GAMG;AACH,MAAa,eAAe;IAC1B,8DAA8D;IAC9D,YAAY,GAAG,IAAW;QACxB,MAAM,IAAI,KAAK,CACb,iEAAiE,CAClE,CAAC;IACJ,CAAC;IAED;;;;;;;;;;;;;;;;;;;;;;;;OAwBG;IACH,eAAe,CAAI,QAA4B;QAC7C,MAAM,IAAI,KAAK,EAAE,CAAC;IACpB,CAAC;IAED;;;;;;;;;;;;;;;;;;;;OAoBG;IACI,SAAS,CAAC,SAAyB;QACxC,MAAM,IAAI,KAAK,EAAE,CAAC;IACpB,CAAC;IAED;;;;;;OAMG;IACH,sBAAsB,CAAC,SAAyB,IAAG,CAAC;CACrD;AAtED,0CAsEC"}
+{"version":3,"file":"service.mixin.js","sourceRoot":"","sources":["../../src/mixins/service.mixin.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,uCAAuC;AACvC,+CAA+C;AAC/C,gEAAgE;;;AAsDhE;;;;;;;;;;;;;GAaG;AACH,SAAgB,YAAY,CAC1B,UAAa;IAEb,OAAO,KAAM,SAAQ,UAAU;QAC7B;;;;;;;;;;;;;;;;;;;;;;;;;;WA0BG;QACH,eAAe,CACb,QAAkC,EAClC,aAAuC;YAEvC,OAAO,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC;QAC/C,CAAC;QAED;;;;;;;;;;;;;;;;;;;;WAoBG;QACH,wEAAwE;QACxE,0EAA0E;QAC1E,4DAA4D;QAC5D,aAAa;QACb,SAAS,CACP,aAA6B,EAC7B,aAAgD;YAEhD,MAAM,OAAO,GAAG,KAAK,CAAC,SAAS,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC;YAC9D,IAAI,CAAC,sBAAsB,CAAC,aAAa,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC;YACxD,OAAO,OAAO,CAAC;QACjB,CAAC;QAED;;;;;;WAMG;QACH,sBAAsB,CACpB,SAAyB,EACzB,mBAAuC;YAEvC,MAAM,YAAY,GAChB,mBAAmB,aAAnB,mBAAmB,cAAnB,mBAAmB,GAAI,cAAc,SAAS,CAAC,IAAI,EAAE,CAAC;YACxD,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAY,YAAY,CAAC,CAAC;YAE3D,IAAI,YAAY,CAAC,gBAAgB,EAAE;gBACjC,KAAK,MAAM,QAAQ,IAAI,YAAY,CAAC,gBAAgB,EAAE;oBACpD,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;iBAChC;aACF;QACH,CAAC;KACF,CAAC;AACJ,CAAC;AA9FD,oCA8FC;AAWD;;;;;;GAMG;AACH,MAAa,eAAe;IAC1B,8DAA8D;IAC9D,YAAY,GAAG,IAAW;QACxB,MAAM,IAAI,KAAK,CACb,iEAAiE,CAClE,CAAC;IACJ,CAAC;IAED;;;;;;;;;;;;;;;;;;;;;;;;OAwBG;IACH,eAAe,CAAI,QAA4B;QAC7C,MAAM,IAAI,KAAK,EAAE,CAAC;IACpB,CAAC;IAED;;;;;;;;;;;;;;;;;;;;OAoBG;IACI,SAAS,CAAC,SAAyB;QACxC,MAAM,IAAI,KAAK,EAAE,CAAC;IACpB,CAAC;IAED;;;;;;OAMG;IACH,sBAAsB,CAAC,SAAyB,IAAG,CAAC;CACrD;AAtED,0CAsEC"}

package/package.json

@@ -1,11 +1,12 @@
 {
   "name": "@loopback/service-proxy",
-  "version": "2.1.1",
+  "version": "2.3.0",
   "description": "Service integration for LoopBack 4",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
   "engines": {
     "node": ">=10"
   },
-  "main": "index",
   "scripts": {
     "acceptance": "lb-mocha \"dist/__tests__/acceptance/**/*.js\"",
     "build": "lb-tsc",
@@ -23,21 +24,19 @@
   "copyright.owner": "IBM Corp.",
   "license": "MIT",
   "devDependencies": {
-    "@loopback/build": "^5.2.0",
-    "@loopback/eslint-config": "^6.0.4",
-    "@loopback/testlab": "^3.1.1",
-    "@types/node": "^10.17.21"
+    "@loopback/build": "^5.4.1",
+    "@loopback/eslint-config": "^7.0.1",
+    "@loopback/testlab": "^3.1.5",
+    "@types/node": "^10.17.24"
   },
   "dependencies": {
-    "@loopback/context": "^3.5.1",
-    "@loopback/core": "^2.4.1",
-    "loopback-datasource-juggler": "^4.20.0",
-    "tslib": "^1.11.1"
+    "@loopback/context": "^3.8.1",
+    "@loopback/core": "^2.7.0",
+    "loopback-datasource-juggler": "^4.21.2",
+    "tslib": "^2.0.0"
   },
   "files": [
     "README.md",
-    "index.js",
-    "index.d.ts",
     "dist",
     "src",
     "!*/__tests__"
@@ -47,5 +46,5 @@
     "url": "https://github.com/strongloop/loopback-next.git",
     "directory": "packages/service-proxy"
   },
-  "gitHead": "11f282df0bbdf25c505a2131e6d82b85005a22a2"
+  "gitHead": "62aea854bf85c5a5995b59e6908fe5409f7eea96"
 }

package/src/mixins/service.mixin.ts

@@ -3,8 +3,48 @@
 // This file is licensed under the MIT License.
 // License text available at https://opensource.org/licenses/MIT
 
-import {Binding, Provider} from '@loopback/context';
-import {Application} from '@loopback/core';
+import {
+  Binding,
+  BindingFromClassOptions,
+  Provider,
+  Constructor,
+} from '@loopback/context';
+import {
+  Application,
+  MixinTarget,
+  ServiceOptions,
+  Component,
+} from '@loopback/core';
+
+// FIXME(rfeng): Workaround for https://github.com/microsoft/rushstack/pull/1867
+/* eslint-disable @typescript-eslint/no-unused-vars */
+import {
+  BindingAddress,
+  BindingFilter,
+  JSONObject,
+  Context,
+  ContextSubscriptionManager,
+  ContextEvent,
+  Interceptor,
+  InterceptorBindingOptions,
+  ResolutionOptions,
+  BindingKey,
+  ValueOrPromise,
+  ContextEventObserver,
+  ContextObserver,
+  Subscription,
+  BindingComparator,
+  ContextView,
+  ResolutionSession,
+  BindingCreationPolicy,
+  ContextInspectOptions,
+} from '@loopback/context';
+import {
+  Server,
+  ApplicationConfig,
+  ApplicationMetadata,
+  LifeCycleObserver,
+} from '@loopback/core';
 
 /**
  * Interface for classes with `new` operator.
@@ -29,8 +69,9 @@ export interface Class<T> {
  * called <a href="#ServiceMixinDoc">ServiceMixinDoc</a>
  *
  */
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export function ServiceMixin<T extends Class<any>>(superClass: T) {
+export function ServiceMixin<T extends MixinTarget<Application>>(
+  superClass: T,
+) {
   return class extends superClass {
     /**
      * Add a service to this application.
@@ -60,10 +101,10 @@ export function ServiceMixin<T extends Class<any>>(superClass: T) {
      * ```
      */
     serviceProvider<S>(
-      provider: Class<Provider<S>>,
-      name?: string,
+      provider: Constructor<Provider<S>>,
+      nameOrOptions?: string | ServiceOptions,
     ): Binding<S> {
-      return this.service(provider, name);
+      return this.service(provider, nameOrOptions);
     }
 
     /**
@@ -87,9 +128,17 @@ export function ServiceMixin<T extends Class<any>>(superClass: T) {
      * app.component(ProductComponent);
      * ```
      */
-    public component(component: Class<unknown>, name?: string) {
-      super.component(component, name);
-      this.mountComponentServices(component);
+    // Unfortunately, TypeScript does not allow overriding methods inherited
+    // from mapped types. https://github.com/microsoft/TypeScript/issues/38496
+    // eslint-disable-next-line @typescript-eslint/ban-ts-ignore
+    // @ts-ignore
+    component<T extends Component = Component>(
+      componentCtor: Constructor<T>,
+      nameOrOptions?: string | BindingFromClassOptions,
+    ) {
+      const binding = super.component(componentCtor, nameOrOptions);
+      this.mountComponentServices(componentCtor, binding.key);
+      return binding;
     }
 
     /**
@@ -99,9 +148,13 @@ export function ServiceMixin<T extends Class<any>>(superClass: T) {
      *
      * @param component - The component to mount services of
      */
-    mountComponentServices(component: Class<unknown>) {
-      const componentKey = `components.${component.name}`;
-      const compInstance = this.getSync(componentKey);
+    mountComponentServices<T extends Component = Component>(
+      component: Constructor<T>,
+      componentBindingKey?: BindingAddress<T>,
+    ) {
+      const componentKey =
+        componentBindingKey ?? `components.${component.name}`;
+      const compInstance = this.getSync<Component>(componentKey);
 
       if (compInstance.serviceProviders) {
         for (const provider of compInstance.serviceProviders) {

package/index.d.ts

@@ -1,6 +0,0 @@
-// Copyright IBM Corp. 2018,2020. All Rights Reserved.
-// Node module: @loopback/service-proxy
-// This file is licensed under the MIT License.
-// License text available at https://opensource.org/licenses/MIT
-
-export * from './dist';

package/index.js

@@ -1,6 +0,0 @@
-// Copyright IBM Corp. 2018,2020. All Rights Reserved.
-// Node module: @loopback/service-proxy
-// This file is licensed under the MIT License.
-// License text available at https://opensource.org/licenses/MIT
-
-module.exports = require('./dist');