@feathersjs/feathers 5.0.0-pre.1 → 5.0.0-pre.15

package/lib/hooks/index.js

@@ -1,158 +1,96 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.activateHooks = void 0;
-const hookCommons = __importStar(require("./commons"));
-const hooks_1 = require("@feathersjs/hooks");
-const base_1 = require("./base");
-const baseHooks = [base_1.assignArguments, base_1.validate];
-const { getHooks, enableHooks, ACTIVATE_HOOKS, finallyWrapper, errorWrapper, wrap } = hookCommons;
-function getMiddlewareOptions(app, service, method) {
-    const params = service.methods[method];
-    const defaults = params.find(v => v === 'params') ? { params: {} } : null;
-    return {
-        params,
-        defaults,
-        props: {
-            app,
-            service,
-            type: 'before',
-            get path() {
-                if (!service || !app || !app.services) {
-                    return null;
-                }
-                return Object.keys(app.services)
-                    .find(path => app.services[path] === service);
-            }
-        }
-    };
-}
-function getCollector(app, service, method) {
-    return function () {
-        const previous = this._parent && this._parent.getMiddleware();
-        let result;
-        if (previous && this._middleware) {
-            result = previous.concat(this._middleware);
-        }
-        else {
-            result = previous || this._middleware || [];
-        }
-        const hooks = {
-            async: getHooks(app, service, 'async', method),
-            before: getHooks(app, service, 'before', method),
-            after: getHooks(app, service, 'after', method, true),
-            error: getHooks(app, service, 'error', method, true),
-            finally: getHooks(app, service, 'finally', method, true)
-        };
-        return [
-            ...finallyWrapper(hooks.finally),
-            ...errorWrapper(hooks.error),
-            ...baseHooks,
-            ...result,
-            ...wrap(hooks)
-        ];
-    };
-}
-function withHooks(app, service, methods) {
-    const hookMap = methods.reduce((accu, method) => {
-        if (typeof service[method] !== 'function') {
-            return accu;
-        }
-        const hookManager = hooks_1.middleware([], getMiddlewareOptions(app, service, method));
-        hookManager.getMiddleware = getCollector(app, service, method);
-        accu[method] = hookManager;
-        return accu;
-    }, {});
-    hooks_1.hooks(service, hookMap);
+exports.hookMixin = exports.FeathersHookManager = exports.createContext = exports.fromErrorHooks = exports.fromErrorHook = exports.fromAfterHooks = exports.fromAfterHook = exports.fromBeforeHooks = exports.fromBeforeHook = void 0;
+const dependencies_1 = require("../dependencies");
+const service_1 = require("../service");
+const regular_1 = require("./regular");
+var regular_2 = require("./regular");
+Object.defineProperty(exports, "fromBeforeHook", { enumerable: true, get: function () { return regular_2.fromBeforeHook; } });
+Object.defineProperty(exports, "fromBeforeHooks", { enumerable: true, get: function () { return regular_2.fromBeforeHooks; } });
+Object.defineProperty(exports, "fromAfterHook", { enumerable: true, get: function () { return regular_2.fromAfterHook; } });
+Object.defineProperty(exports, "fromAfterHooks", { enumerable: true, get: function () { return regular_2.fromAfterHooks; } });
+Object.defineProperty(exports, "fromErrorHook", { enumerable: true, get: function () { return regular_2.fromErrorHook; } });
+Object.defineProperty(exports, "fromErrorHooks", { enumerable: true, get: function () { return regular_2.fromErrorHooks; } });
+function createContext(service, method, data = {}) {
+    const createContext = service[method].createContext;
+    if (typeof createContext !== 'function') {
+        throw new Error(`Can not create context for method ${method}`);
+    }
+    return createContext(data);
 }
-function mixinMethod() {
-    const service = this;
-    const args = Array.from(arguments);
-    const returnHook = args[args.length - 1] === true || args[args.length - 1] instanceof hooks_1.HookContext
-        ? args.pop() : false;
-    const hookContext = returnHook instanceof hooks_1.HookContext ? returnHook : this._super.createContext();
-    return this._super.call(service, ...args, hookContext)
-        .then(() => returnHook ? hookContext : hookContext.result)
-        // Handle errors
-        .catch(() => {
-        if (typeof hookContext.error !== 'undefined' && typeof hookContext.result === 'undefined') {
-            return Promise.reject(returnHook ? hookContext : hookContext.error);
-        }
-        else {
-            return returnHook ? hookContext : hookContext.result;
-        }
-    });
+exports.createContext = createContext;
+class FeathersHookManager extends dependencies_1.HookManager {
+    constructor(app, method) {
+        super();
+        this.app = app;
+        this.method = method;
+        this._middleware = [];
+    }
+    collectMiddleware(self, args) {
+        const app = this.app;
+        const appHooks = app.appHooks[dependencies_1.HOOKS].concat(app.appHooks[this.method] || []);
+        const regularAppHooks = (0, regular_1.collectRegularHooks)(this.app, this.method);
+        const middleware = super.collectMiddleware(self, args);
+        const regularHooks = (0, regular_1.collectRegularHooks)(self, this.method);
+        return [...appHooks, ...regularAppHooks, ...middleware, ...regularHooks];
+    }
+    initializeContext(self, args, context) {
+        const ctx = super.initializeContext(self, args, context);
+        ctx.params = ctx.params || {};
+        return ctx;
+    }
+    middleware(mw) {
+        this._middleware.push(...mw);
+        return this;
+    }
 }
-// A service mixin that adds `service.hooks()` method and functionality
-const hookMixin = exports.hookMixin = function hookMixin(service) {
+exports.FeathersHookManager = FeathersHookManager;
+function hookMixin(service, path, options) {
     if (typeof service.hooks === 'function') {
-        return;
+        return service;
     }
-    service.methods = Object.getOwnPropertyNames(service)
-        .filter(key => typeof service[key] === 'function' && service[key][ACTIVATE_HOOKS])
-        .reduce((result, methodName) => {
-        result[methodName] = service[methodName][ACTIVATE_HOOKS];
-        return result;
-    }, service.methods || {});
-    Object.assign(service.methods, {
-        find: ['params'],
-        get: ['id', 'params'],
-        create: ['data', 'params'],
-        update: ['id', 'data', 'params'],
-        patch: ['id', 'data', 'params'],
-        remove: ['id', 'params']
-    });
     const app = this;
-    const methodNames = Object.keys(service.methods);
-    withHooks(app, service, methodNames);
-    // Usefull only for the `returnHook` backwards compatibility with `true`
-    const mixin = methodNames.reduce((mixin, method) => {
-        if (typeof service[method] !== 'function') {
-            return mixin;
-        }
-        mixin[method] = mixinMethod;
-        return mixin;
+    const hookMethods = (0, service_1.getHookMethods)(service, options);
+    const serviceMethodHooks = hookMethods.reduce((res, method) => {
+        const params = service_1.defaultServiceArguments[method] || ['data', 'params'];
+        res[method] = new FeathersHookManager(app, method)
+            .params(...params)
+            .props({
+            app,
+            path,
+            method,
+            service,
+            event: null,
+            type: null,
+            get statusCode() {
+                var _a;
+                return (_a = this.http) === null || _a === void 0 ? void 0 : _a.statusCode;
+            },
+            set statusCode(value) {
+                (this.http || (this.http = {})).statusCode = value;
+            }
+        });
+        return res;
     }, {});
-    // Add .hooks method and properties to the service
-    enableHooks(service, methodNames, app.hookTypes);
-    service.mixin(mixin);
-};
-function default_1() {
-    return function (app) {
-        // We store a reference of all supported hook types on the app
-        // in case someone needs it
-        Object.assign(app, {
-            hookTypes: ['async', 'before', 'after', 'error', 'finally']
+    const handleRegularHooks = (0, regular_1.enableRegularHooks)(service, hookMethods);
+    (0, dependencies_1.hooks)(service, serviceMethodHooks);
+    service.hooks = function (hookOptions) {
+        if (hookOptions.before || hookOptions.after || hookOptions.error) {
+            return handleRegularHooks.call(this, hookOptions);
+        }
+        if (Array.isArray(hookOptions)) {
+            return (0, dependencies_1.hooks)(this, hookOptions);
+        }
+        Object.keys(hookOptions).forEach(method => {
+            const manager = (0, dependencies_1.getManager)(this[method]);
+            if (!(manager instanceof FeathersHookManager)) {
+                throw new Error(`Method ${method} is not a Feathers hooks enabled service method`);
+            }
+            manager.middleware(hookOptions[method]);
         });
-        // Add functionality for hooks to be registered as app.hooks
-        enableHooks(app, app.methods, app.hookTypes);
-        app.mixins.push(hookMixin);
-    };
-}
-exports.default = default_1;
-function activateHooks(args) {
-    return (fn) => {
-        Object.defineProperty(fn, ACTIVATE_HOOKS, { value: args });
-        return fn;
+        return this;
     };
+    return service;
 }
-exports.activateHooks = activateHooks;
+exports.hookMixin = hookMixin;
 //# sourceMappingURL=index.js.map

package/lib/hooks/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/hooks/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/hooks/index.ts"],"names":[],"mappings":"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"}

package/lib/hooks/regular.d.ts

@@ -0,0 +1,12 @@
+import { HookFunction, RegularHookFunction, RegularHookMap } from '../declarations';
+export declare function fromBeforeHook<A, S>(hook: RegularHookFunction<A, S>): HookFunction<A, S>;
+export declare function fromAfterHook<A, S>(hook: RegularHookFunction<A, S>): HookFunction<A, S>;
+export declare function fromErrorHook<A, S>(hook: RegularHookFunction<A, S>): HookFunction<A, S>;
+export declare function fromBeforeHooks<A, S>(hooks: RegularHookFunction<A, S>[]): HookFunction<unknown, unknown>;
+export declare function fromAfterHooks<A, S>(hooks: RegularHookFunction<A, S>[]): HookFunction<unknown, unknown>;
+export declare function fromErrorHooks<A, S>(hooks: RegularHookFunction<A, S>[]): HookFunction<unknown, unknown>;
+export declare function collectRegularHooks(target: any, method: string): any;
+export declare function convertHookData(input: any): {
+    [method: string]: RegularHookFunction<import("../declarations").Application<any, any>, import("../declarations").Service<any, Partial<any>>>[];
+};
+export declare function enableRegularHooks(object: any, methods?: string[]): (this: any, input: RegularHookMap<any, any>) => any;

package/lib/hooks/regular.js

@@ -0,0 +1,169 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.enableRegularHooks = exports.convertHookData = exports.collectRegularHooks = exports.fromErrorHooks = exports.fromAfterHooks = exports.fromBeforeHooks = exports.fromErrorHook = exports.fromAfterHook = exports.fromBeforeHook = void 0;
+const service_1 = require("../service");
+const runHook = (hook, context, type) => {
+    if (type)
+        context.type = type;
+    return Promise.resolve(hook.call(context.self, context))
+        .then((res) => {
+        if (type)
+            context.type = null;
+        if (res && res !== context) {
+            Object.assign(context, res);
+        }
+    });
+};
+function fromBeforeHook(hook) {
+    return (context, next) => {
+        return runHook(hook, context, 'before').then(next);
+    };
+}
+exports.fromBeforeHook = fromBeforeHook;
+function fromAfterHook(hook) {
+    return (context, next) => {
+        return next().then(() => runHook(hook, context, 'after'));
+    };
+}
+exports.fromAfterHook = fromAfterHook;
+function fromErrorHook(hook) {
+    return (context, next) => {
+        return next().catch((error) => {
+            if (context.error !== error || context.result !== undefined) {
+                context.original = { ...context };
+                context.error = error;
+                delete context.result;
+            }
+            return runHook(hook, context, 'error').then(() => {
+                if (context.result === undefined && context.error !== undefined) {
+                    throw context.error;
+                }
+            });
+        });
+    };
+}
+exports.fromErrorHook = fromErrorHook;
+const RunHooks = (hooks) => (context) => {
+    return hooks.reduce((promise, hook) => {
+        return promise.then(() => runHook(hook, context));
+    }, Promise.resolve(undefined));
+};
+function fromBeforeHooks(hooks) {
+    return fromBeforeHook(RunHooks(hooks));
+}
+exports.fromBeforeHooks = fromBeforeHooks;
+function fromAfterHooks(hooks) {
+    return fromAfterHook(RunHooks(hooks));
+}
+exports.fromAfterHooks = fromAfterHooks;
+function fromErrorHooks(hooks) {
+    return fromErrorHook(RunHooks(hooks));
+}
+exports.fromErrorHooks = fromErrorHooks;
+function collectRegularHooks(target, method) {
+    return target.__hooks.hooks[method] || [];
+}
+exports.collectRegularHooks = collectRegularHooks;
+// Converts different hook registration formats into the
+// same internal format
+function convertHookData(input) {
+    const result = {};
+    if (Array.isArray(input)) {
+        result.all = input;
+    }
+    else if (typeof input !== 'object') {
+        result.all = [input];
+    }
+    else {
+        for (const key of Object.keys(input)) {
+            const value = input[key];
+            result[key] = Array.isArray(value) ? value : [value];
+        }
+    }
+    return result;
+}
+exports.convertHookData = convertHookData;
+const types = ['before', 'after', 'error'];
+const isType = (value) => types.includes(value);
+const wrappers = {
+    before: fromBeforeHooks,
+    after: fromAfterHooks,
+    error: fromErrorHooks
+};
+const createStore = (methods) => {
+    const store = {
+        before: {},
+        after: {},
+        error: {},
+        hooks: {}
+    };
+    for (const method of methods) {
+        store.hooks[method] = [];
+    }
+    return store;
+};
+const setStore = (object, store) => {
+    Object.defineProperty(object, '__hooks', {
+        configurable: true,
+        value: store,
+        writable: true
+    });
+};
+const getStore = (object) => object.__hooks;
+const createMap = (input, methods) => {
+    const map = {};
+    Object.keys(input).forEach((type) => {
+        if (!isType(type)) {
+            throw new Error(`'${type}' is not a valid hook type`);
+        }
+        const data = convertHookData(input[type]);
+        Object.keys(data).forEach((method) => {
+            if (method !== 'all' && !methods.includes(method)) {
+                throw new Error(`'${method}' is not a valid hook method`);
+            }
+        });
+        map[type] = data;
+    });
+    return map;
+};
+const createAdapter = (type) => {
+    const hooks = [];
+    const hook = wrappers[type](hooks);
+    const adapter = Object.assign(hook, { hooks });
+    return adapter;
+};
+const updateStore = (store, map) => {
+    Object.keys(store.hooks).forEach((method) => {
+        let adapted = false;
+        Object.keys(map).forEach((key) => {
+            var _a;
+            const type = key;
+            const allHooks = map[type].all || [];
+            const methodHooks = map[type][method] || [];
+            if (allHooks.length || methodHooks.length) {
+                const adapter = (_a = store[type])[method] || (_a[method] = (adapted = true, createAdapter(type)));
+                adapter.hooks.push(...allHooks, ...methodHooks);
+            }
+        });
+        if (adapted) {
+            store.hooks[method] = [
+                store.error[method],
+                store.before[method],
+                store.after[method]
+            ].filter(hook => hook);
+        }
+    });
+};
+// Add `.hooks` functionality to an object
+function enableRegularHooks(object, methods = service_1.defaultServiceMethods) {
+    const store = createStore(methods);
+    setStore(object, store);
+    return function regularHooks(input) {
+        const store = getStore(this);
+        const map = createMap(input, methods);
+        updateStore(store, map);
+        return this;
+    };
+}
+exports.enableRegularHooks = enableRegularHooks;
+//# sourceMappingURL=regular.js.map

package/lib/hooks/regular.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"regular.js","sourceRoot":"","sources":["../../src/hooks/regular.ts"],"names":[],"mappings":"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"}

package/lib/index.d.ts

@@ -1,6 +1,11 @@
 import version from './version';
-import { Application as ApplicationType } from './declarations';
-export default function feathers<ServiceTypes = {}>(): ApplicationType<ServiceTypes>;
-export { version };
-export * from './declarations';
+import { Feathers } from './application';
+import { Application } from './declarations';
+export declare function feathers<T = any, S = any>(): Application<T, S>;
+export declare namespace feathers {
+    var setDebug: typeof import("@feathersjs/commons/lib/debug").setDebug;
+}
+export { version, Feathers };
 export * from './hooks/index';
+export * from './declarations';
+export * from './service';

package/lib/index.js

@@ -13,23 +13,20 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.version = void 0;
-// @ts-ignore
-const uberproto_1 = __importDefault(require("uberproto"));
-const application_1 = __importDefault(require("./application"));
+exports.Feathers = exports.version = exports.feathers = void 0;
+const dependencies_1 = require("./dependencies");
 const version_1 = __importDefault(require("./version"));
 exports.version = version_1.default;
-const baseObject = Object.create(null);
+const application_1 = require("./application");
+Object.defineProperty(exports, "Feathers", { enumerable: true, get: function () { return application_1.Feathers; } });
 function feathers() {
-    const app = Object.create(baseObject);
-    // Mix in the base application
-    uberproto_1.default.mixin(application_1.default, app);
-    app.init();
-    return app;
+    return new application_1.Feathers();
 }
-exports.default = feathers;
-__exportStar(require("./declarations"), exports);
+exports.feathers = feathers;
+feathers.setDebug = dependencies_1.setDebug;
 __exportStar(require("./hooks/index"), exports);
+__exportStar(require("./declarations"), exports);
+__exportStar(require("./service"), exports);
 if (typeof module !== 'undefined') {
     module.exports = Object.assign(feathers, module.exports);
 }

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,aAAa;AACb,0DAA8B;AAC9B,gEAAwC;AACxC,wDAAgC;AAgBvB,kBAhBF,iBAAO,CAgBE;AAbhB,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;AAEvC,SAAwB,QAAQ;IAC9B,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IAEtC,8BAA8B;IAC9B,mBAAK,CAAC,KAAK,CAAC,qBAAW,EAAE,GAAG,CAAC,CAAC;IAE9B,GAAG,CAAC,IAAI,EAAE,CAAC;IAEX,OAAO,GAAG,CAAC;AACb,CAAC;AATD,2BASC;AAGD,iDAA+B;AAC/B,gDAA8B;AAE9B,IAAI,OAAO,MAAM,KAAK,WAAW,EAAE;IACjC,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;CAC1D"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,iDAA0C;AAC1C,wDAAgC;AAUvB,kBAVF,iBAAO,CAUE;AAThB,+CAAyC;AASvB,yFATT,sBAAQ,OASS;AAN1B,SAAgB,QAAQ;IACtB,OAAO,IAAI,sBAAQ,EAA6B,CAAC;AACnD,CAAC;AAFD,4BAEC;AAED,QAAQ,CAAC,QAAQ,GAAG,uBAAQ,CAAC;AAG7B,gDAA8B;AAC9B,iDAA+B;AAC/B,4CAA0B;AAE1B,IAAI,OAAO,MAAM,KAAK,WAAW,EAAE;IACjC,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;CAC1D"}

package/lib/service.d.ts

@@ -0,0 +1,21 @@
+import { ServiceOptions } from './declarations';
+export declare const SERVICE: string | symbol;
+export declare const defaultServiceArguments: {
+    find: string[];
+    get: string[];
+    create: string[];
+    update: string[];
+    patch: string[];
+    remove: string[];
+};
+export declare const defaultServiceMethods: string[];
+export declare const defaultEventMap: {
+    create: string;
+    update: string;
+    patch: string;
+    remove: string;
+};
+export declare const protectedMethods: string[];
+export declare function getHookMethods(service: any, options: ServiceOptions): string[];
+export declare function getServiceOptions(service: any, options?: ServiceOptions): ServiceOptions;
+export declare function wrapService(location: string, service: any, options: ServiceOptions): any;

package/lib/service.js

@@ -0,0 +1,68 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.wrapService = exports.getServiceOptions = exports.getHookMethods = exports.protectedMethods = exports.defaultEventMap = exports.defaultServiceMethods = exports.defaultServiceArguments = exports.SERVICE = void 0;
+const dependencies_1 = require("./dependencies");
+exports.SERVICE = (0, dependencies_1.createSymbol)('@feathersjs/service');
+exports.defaultServiceArguments = {
+    find: ['params'],
+    get: ['id', 'params'],
+    create: ['data', 'params'],
+    update: ['id', 'data', 'params'],
+    patch: ['id', 'data', 'params'],
+    remove: ['id', 'params']
+};
+exports.defaultServiceMethods = Object.keys(exports.defaultServiceArguments);
+exports.defaultEventMap = {
+    create: 'created',
+    update: 'updated',
+    patch: 'patched',
+    remove: 'removed'
+};
+exports.protectedMethods = Object.keys(Object.prototype)
+    .concat(Object.keys(dependencies_1.EventEmitter.prototype))
+    .concat([
+    'all',
+    'before',
+    'after',
+    'error',
+    'hooks',
+    'setup',
+    'publish'
+]);
+function getHookMethods(service, options) {
+    const { methods } = options;
+    return exports.defaultServiceMethods.filter(m => typeof service[m] === 'function' && !methods.includes(m)).concat(methods);
+}
+exports.getHookMethods = getHookMethods;
+function getServiceOptions(service, options = {}) {
+    const existingOptions = service[exports.SERVICE];
+    if (existingOptions) {
+        return existingOptions;
+    }
+    const { methods = exports.defaultServiceMethods.filter(method => typeof service[method] === 'function'), events = service.events || [] } = options;
+    const { serviceEvents = Object.values(exports.defaultEventMap).concat(events) } = options;
+    return {
+        ...options,
+        events,
+        methods,
+        serviceEvents
+    };
+}
+exports.getServiceOptions = getServiceOptions;
+function wrapService(location, service, options) {
+    // Do nothing if this is already an initialized
+    if (service[exports.SERVICE]) {
+        return service;
+    }
+    const protoService = Object.create(service);
+    const serviceOptions = getServiceOptions(service, options);
+    if (Object.keys(serviceOptions.methods).length === 0 && typeof service.setup !== 'function') {
+        throw new Error(`Invalid service object passed for path \`${location}\``);
+    }
+    Object.defineProperty(protoService, exports.SERVICE, {
+        value: serviceOptions
+    });
+    return protoService;
+}
+exports.wrapService = wrapService;
+//# sourceMappingURL=service.js.map

package/lib/service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"service.js","sourceRoot":"","sources":["../src/service.ts"],"names":[],"mappings":"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"}

package/lib/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "5.0.0-pre.1";
+declare const _default: "5.0.0-pre.15";
 export default _default;

package/lib/version.js

@@ -1,4 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = '5.0.0-pre.1';
+exports.default = '5.0.0-pre.15';
 //# sourceMappingURL=version.js.map