@feathersjs/feathers 5.0.0-pre.9 → 5.0.1

package/lib/hooks.js

@@ -0,0 +1,176 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.hookMixin = exports.FeathersHookManager = exports.createContext = exports.enableHooks = exports.collectHooks = exports.convertHookData = void 0;
+const hooks_1 = require("@feathersjs/hooks");
+const service_1 = require("./service");
+const types = ['before', 'after', 'error', 'around'];
+const isType = (value) => types.includes(value);
+// 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;
+function collectHooks(target, method) {
+    const { collected, collectedAll, around } = target.__hooks;
+    return [
+        ...(around.all || []),
+        ...(around[method] || []),
+        ...(collectedAll.before || []),
+        ...(collected[method] || []),
+        ...(collectedAll.after || [])
+    ];
+}
+exports.collectHooks = collectHooks;
+// Add `.hooks` functionality to an object
+function enableHooks(object) {
+    const store = {
+        around: {},
+        before: {},
+        after: {},
+        error: {},
+        collected: {},
+        collectedAll: {}
+    };
+    Object.defineProperty(object, '__hooks', {
+        configurable: true,
+        value: store,
+        writable: true
+    });
+    return function registerHooks(input) {
+        const store = this.__hooks;
+        const map = Object.keys(input).reduce((map, type) => {
+            if (!isType(type)) {
+                throw new Error(`'${type}' is not a valid hook type`);
+            }
+            map[type] = convertHookData(input[type]);
+            return map;
+        }, {});
+        const types = Object.keys(map);
+        types.forEach((type) => Object.keys(map[type]).forEach((method) => {
+            var _a;
+            const mapHooks = map[type][method];
+            const storeHooks = ((_a = store[type])[method] || (_a[method] = []));
+            storeHooks.push(...mapHooks);
+            if (method === 'all') {
+                if (store.before[method] || store.error[method]) {
+                    const beforeAll = (0, hooks_1.collect)({
+                        before: store.before[method] || [],
+                        error: store.error[method] || []
+                    });
+                    store.collectedAll.before = [beforeAll];
+                }
+                if (store.after[method]) {
+                    const afterAll = (0, hooks_1.collect)({
+                        after: store.after[method] || []
+                    });
+                    store.collectedAll.after = [afterAll];
+                }
+            }
+            else {
+                if (store.before[method] || store.after[method] || store.error[method]) {
+                    const collected = (0, hooks_1.collect)({
+                        before: store.before[method] || [],
+                        after: store.after[method] || [],
+                        error: store.error[method] || []
+                    });
+                    store.collected[method] = [collected];
+                }
+            }
+        }));
+        return this;
+    };
+}
+exports.enableHooks = enableHooks;
+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);
+}
+exports.createContext = createContext;
+class FeathersHookManager extends hooks_1.HookManager {
+    constructor(app, method) {
+        super();
+        this.app = app;
+        this.method = method;
+        this._middleware = [];
+    }
+    collectMiddleware(self, args) {
+        const appHooks = collectHooks(this.app, this.method);
+        const middleware = super.collectMiddleware(self, args);
+        const methodHooks = collectHooks(self, this.method);
+        return [...appHooks, ...middleware, ...methodHooks];
+    }
+    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;
+    }
+}
+exports.FeathersHookManager = FeathersHookManager;
+function hookMixin(service, path, options) {
+    if (typeof service.hooks === 'function') {
+        return service;
+    }
+    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(this, method).params(...params).props({
+            app: this,
+            path,
+            method,
+            service,
+            event: null,
+            type: 'around',
+            get statusCode() {
+                var _a;
+                return (_a = this.http) === null || _a === void 0 ? void 0 : _a.status;
+            },
+            set statusCode(value) {
+                this.http = this.http || {};
+                this.http.status = value;
+            }
+        });
+        return res;
+    }, {});
+    const registerHooks = enableHooks(service);
+    (0, hooks_1.hooks)(service, serviceMethodHooks);
+    service.hooks = function (hookOptions) {
+        if (hookOptions.before || hookOptions.after || hookOptions.error || hookOptions.around) {
+            return registerHooks.call(this, hookOptions);
+        }
+        if (Array.isArray(hookOptions)) {
+            return (0, hooks_1.hooks)(this, hookOptions);
+        }
+        Object.keys(hookOptions).forEach((method) => {
+            const manager = (0, hooks_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]);
+        });
+        return this;
+    };
+    return service;
+}
+exports.hookMixin = hookMixin;
+//# sourceMappingURL=hooks.js.map

package/lib/hooks.js.map

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

package/lib/index.d.ts

@@ -3,9 +3,9 @@ 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;
+    var setDebug: typeof import("@feathersjs/commons").setDebug;
 }
 export { version, Feathers };
-export * from './hooks/index';
+export * from './hooks';
 export * from './declarations';
 export * from './service';

package/lib/index.js

@@ -1,7 +1,11 @@
 "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]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -14,7 +18,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Feathers = exports.version = exports.feathers = void 0;
-const dependencies_1 = require("./dependencies");
+const commons_1 = require("@feathersjs/commons");
 const version_1 = __importDefault(require("./version"));
 exports.version = version_1.default;
 const application_1 = require("./application");
@@ -23,8 +27,8 @@ function feathers() {
     return new application_1.Feathers();
 }
 exports.feathers = feathers;
-feathers.setDebug = dependencies_1.setDebug;
-__exportStar(require("./hooks/index"), exports);
+feathers.setDebug = commons_1.setDebug;
+__exportStar(require("./hooks"), exports);
 __exportStar(require("./declarations"), exports);
 __exportStar(require("./service"), exports);
 if (typeof module !== 'undefined') {

package/lib/index.js.map

@@ -1 +1 @@
-{"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA,iDAA8C;AAE9C,wDAA+B;AAUtB,kBAVF,iBAAO,CAUE;AAThB,+CAAwC;AAStB,yFATT,sBAAQ,OASS;AAN1B,SAAgB,QAAQ;IACtB,OAAO,IAAI,sBAAQ,EAA6B,CAAA;AAClD,CAAC;AAFD,4BAEC;AAED,QAAQ,CAAC,QAAQ,GAAG,kBAAQ,CAAA;AAG5B,0CAAuB;AACvB,iDAA8B;AAC9B,4CAAyB;AAEzB,IAAI,OAAO,MAAM,KAAK,WAAW,EAAE;IACjC,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,OAAO,CAAC,CAAA;CACzD"}

package/lib/service.d.ts

@@ -15,7 +15,9 @@ export declare const defaultEventMap: {
     patch: string;
     remove: string;
 };
+export declare const defaultServiceEvents: 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 getServiceOptions(service: any): ServiceOptions;
+export declare const normalizeServiceOptions: (service: any, options?: ServiceOptions) => ServiceOptions;
 export declare function wrapService(location: string, service: any, options: ServiceOptions): any;

package/lib/service.js

@@ -1,8 +1,9 @@
 "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 = dependencies_1.createSymbol('@feathersjs/service');
+exports.wrapService = exports.normalizeServiceOptions = exports.getServiceOptions = exports.getHookMethods = exports.protectedMethods = exports.defaultServiceEvents = exports.defaultEventMap = exports.defaultServiceMethods = exports.defaultServiceArguments = exports.SERVICE = void 0;
+const events_1 = require("events");
+const commons_1 = require("@feathersjs/commons");
+exports.SERVICE = (0, commons_1.createSymbol)('@feathersjs/service');
 exports.defaultServiceArguments = {
     find: ['params'],
     get: ['id', 'params'],
@@ -11,48 +12,48 @@ exports.defaultServiceArguments = {
     patch: ['id', 'data', 'params'],
     remove: ['id', 'params']
 };
-exports.defaultServiceMethods = Object.keys(exports.defaultServiceArguments);
+exports.defaultServiceMethods = ['find', 'get', 'create', 'update', 'patch', 'remove'];
 exports.defaultEventMap = {
     create: 'created',
     update: 'updated',
     patch: 'patched',
     remove: 'removed'
 };
+exports.defaultServiceEvents = Object.values(exports.defaultEventMap);
 exports.protectedMethods = Object.keys(Object.prototype)
-    .concat(Object.keys(dependencies_1.EventEmitter.prototype))
-    .concat([
-    'before',
-    'after',
-    'error',
-    'hooks',
-    'setup',
-    'publish'
-]);
+    .concat(Object.keys(events_1.EventEmitter.prototype))
+    .concat(['all', 'around', 'before', 'after', 'error', 'hooks', 'setup', 'teardown', 'publish']);
 function getHookMethods(service, options) {
     const { methods } = options;
-    return exports.defaultServiceMethods.filter(m => typeof service[m] === 'function' && !methods.includes(m)).concat(methods);
+    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 Object.assign(Object.assign({}, options), { events,
-        methods,
-        serviceEvents });
+function getServiceOptions(service) {
+    return service[exports.SERVICE];
 }
 exports.getServiceOptions = getServiceOptions;
+const normalizeServiceOptions = (service, options = {}) => {
+    const { methods = exports.defaultServiceMethods.filter((method) => typeof service[method] === 'function'), events = service.events || [] } = options;
+    const serviceEvents = options.serviceEvents || exports.defaultServiceEvents.concat(events);
+    return {
+        ...options,
+        events,
+        methods,
+        serviceEvents
+    };
+};
+exports.normalizeServiceOptions = normalizeServiceOptions;
 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') {
+    const serviceOptions = (0, exports.normalizeServiceOptions)(service, options);
+    if (Object.keys(serviceOptions.methods).length === 0 &&
+        ![...exports.defaultServiceMethods, 'setup', 'teardown'].some((method) => typeof service[method] === 'function')) {
         throw new Error(`Invalid service object passed for path \`${location}\``);
     }
     Object.defineProperty(protoService, exports.SERVICE, {

package/lib/service.js.map

@@ -1 +1 @@
-{"version":3,"file":"service.js","sourceRoot":"","sources":["../src/service.ts"],"names":[],"mappings":";;;AAAA,iDAA4D;AAG/C,QAAA,OAAO,GAAG,2BAAY,CAAC,qBAAqB,CAAC,CAAC;AAE9C,QAAA,uBAAuB,GAAG;IACrC,IAAI,EAAE,CAAE,QAAQ,CAAE;IAClB,GAAG,EAAE,CAAE,IAAI,EAAE,QAAQ,CAAE;IACvB,MAAM,EAAE,CAAE,MAAM,EAAE,QAAQ,CAAE;IAC5B,MAAM,EAAE,CAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAE;IAClC,KAAK,EAAE,CAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAE;IACjC,MAAM,EAAE,CAAE,IAAI,EAAE,QAAQ,CAAE;CAC3B,CAAA;AAEY,QAAA,qBAAqB,GAAG,MAAM,CAAC,IAAI,CAAC,+BAAuB,CAAC,CAAC;AAE7D,QAAA,eAAe,GAAG;IAC7B,MAAM,EAAE,SAAS;IACjB,MAAM,EAAE,SAAS;IACjB,KAAK,EAAE,SAAS;IAChB,MAAM,EAAE,SAAS;CAClB,CAAA;AAEY,QAAA,gBAAgB,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC;KAC1D,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,2BAAY,CAAC,SAAS,CAAC,CAAC;KAC3C,MAAM,CAAC;IACN,QAAQ;IACR,OAAO;IACP,OAAO;IACP,OAAO;IACP,OAAO;IACP,SAAS;CACV,CAAC,CAAC;AAEL,SAAgB,cAAc,CAAE,OAAY,EAAE,OAAuB;IACnE,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IAE5B,OAAO,6BAAqB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CACtC,OAAO,OAAO,CAAC,CAAC,CAAC,KAAK,UAAU,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CACzD,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;AACpB,CAAC;AAND,wCAMC;AAED,SAAgB,iBAAiB,CAC/B,OAAY,EAAE,UAA0B,EAAE;IAE1C,MAAM,eAAe,GAAG,OAAO,CAAC,eAAO,CAAC,CAAC;IAEzC,IAAI,eAAe,EAAE;QACnB,OAAO,eAAe,CAAC;KACxB;IAED,MAAM,EACJ,OAAO,GAAG,6BAAqB,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAC9C,OAAO,OAAO,CAAC,MAAM,CAAC,KAAK,UAAU,CACtC,EACD,MAAM,GAAG,OAAO,CAAC,MAAM,IAAI,EAAE,EAC9B,GAAG,OAAO,CAAC;IACZ,MAAM,EACJ,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,uBAAe,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,EAC9D,GAAG,OAAO,CAAC;IAEZ,uCACK,OAAO,KACV,MAAM;QACN,OAAO;QACP,aAAa,IACb;AACJ,CAAC;AAzBD,8CAyBC;AAED,SAAgB,WAAW,CACzB,QAAgB,EAAE,OAAY,EAAE,OAAuB;IAEvD,+CAA+C;IAC/C,IAAI,OAAO,CAAC,eAAO,CAAC,EAAE;QACpB,OAAO,OAAO,CAAC;KAChB;IAED,MAAM,YAAY,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAC5C,MAAM,cAAc,GAAG,iBAAiB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAE3D,IAAI,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,MAAM,KAAK,CAAC,IAAI,OAAO,OAAO,CAAC,KAAK,KAAK,UAAU,EAAE;QAC3F,MAAM,IAAI,KAAK,CAAC,4CAA4C,QAAQ,IAAI,CAAC,CAAC;KAC3E;IAED,MAAM,CAAC,cAAc,CAAC,YAAY,EAAE,eAAO,EAAE;QAC3C,KAAK,EAAE,cAAc;KACtB,CAAC,CAAC;IAEH,OAAO,YAAY,CAAC;AACtB,CAAC;AApBD,kCAoBC"}
+{"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.9";
+declare const _default: "5.0.1";
 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.9';
+exports.default = '5.0.1';
 //# sourceMappingURL=version.js.map

package/lib/version.js.map

@@ -1 +1 @@
-{"version":3,"file":"version.js","sourceRoot":"","sources":["../src/version.ts"],"names":[],"mappings":";;AAAA,kBAAe,aAAa,CAAC"}
+{"version":3,"file":"version.js","sourceRoot":"","sources":["../src/version.ts"],"names":[],"mappings":";;AAAA,kBAAe,OAAO,CAAA"}

package/package.json

@@ -1,11 +1,12 @@
 {
   "name": "@feathersjs/feathers",
   "description": "A framework for real-time applications and REST API with JavaScript and TypeScript",
-  "version": "5.0.0-pre.9",
+  "version": "5.0.1",
   "homepage": "http://feathersjs.com",
   "repository": {
     "type": "git",
-    "url": "git://github.com/feathersjs/feathers.git"
+    "url": "git://github.com/feathersjs/feathers.git",
+    "directory": "packages/feathers"
   },
   "keywords": [
     "feathers",
@@ -41,14 +42,14 @@
     "*.js"
   ],
   "scripts": {
-    "write-version": "node -e \"console.log('export default \\'' + require('./package.json').version + '\\';')\" > src/version.ts",
-    "reset-version": "node -e \"console.log('export default \\'development\\';')\" > src/version.ts",
+    "write-version": "node -e \"console.log('export default \\'' + require('./package.json').version + '\\'')\" > src/version.ts",
+    "reset-version": "node -e \"console.log('export default \\'development\\'')\" > src/version.ts",
     "prepublish": "npm run compile",
     "version": "npm run write-version",
     "publish": "npm run reset-version",
-    "compile": "shx rm -rf lib/ && tsc",
-    "test": "npm run compile && npm run mocha",
-    "mocha": "mocha --config ../../.mocharc.json --recursive test/"
+    "pack": "npm pack --pack-destination ../generators/test/build",
+    "compile": "shx rm -rf lib/ && tsc && npm run pack",
+    "test": "mocha --config ../../.mocharc.json --recursive test/"
   },
   "engines": {
     "node": ">= 12"
@@ -57,17 +58,17 @@
     "access": "public"
   },
   "dependencies": {
-    "@feathersjs/commons": "^5.0.0-pre.9",
-    "@feathersjs/hooks": "^0.6.5",
+    "@feathersjs/commons": "^5.0.1",
+    "@feathersjs/hooks": "^0.8.1",
     "events": "^3.3.0"
   },
   "devDependencies": {
-    "@types/mocha": "^9.0.0",
-    "@types/node": "^16.4.13",
-    "mocha": "^9.0.3",
-    "shx": "^0.3.3",
-    "ts-node": "^10.1.0",
-    "typescript": "^4.3.5"
+    "@types/mocha": "^10.0.1",
+    "@types/node": "^18.14.6",
+    "mocha": "^10.2.0",
+    "shx": "^0.3.4",
+    "ts-node": "^10.9.1",
+    "typescript": "^4.9.5"
   },
-  "gitHead": "3d1721a7286e6a7f37bbc38695fe45084023f13b"
+  "gitHead": "18b7f4ab0a8075572a81d78956ba1205a9795c91"
 }