@feathersjs/feathers 5.0.0-pre.22 → 5.0.0-pre.25

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 = (0, dependencies_1.createSymbol)('@feathersjs/service');
+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'],
@@ -19,20 +20,13 @@ exports.defaultEventMap = {
     remove: 'removed'
 };
 exports.protectedMethods = Object.keys(Object.prototype)
-    .concat(Object.keys(dependencies_1.EventEmitter.prototype))
-    .concat([
-    'all',
-    'before',
-    'after',
-    'error',
-    'hooks',
-    'setup',
-    'teardown',
-    '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 = {}) {
@@ -40,7 +34,7 @@ function getServiceOptions(service, options = {}) {
     if (existingOptions) {
         return existingOptions;
     }
-    const { methods = exports.defaultServiceMethods.filter(method => typeof service[method] === 'function'), events = service.events || [] } = options;
+    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,

package/lib/service.js.map

@@ -1 +1 @@
-{"version":3,"file":"service.js","sourceRoot":"","sources":["../src/service.ts"],"names":[],"mappings":"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"}
+{"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.22";
+declare const _default: "5.0.0-pre.25";
 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.22';
+exports.default = '5.0.0-pre.25';
 //# 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,cAAc,CAAC"}
+{"version":3,"file":"version.js","sourceRoot":"","sources":["../src/version.ts"],"names":[],"mappings":";;AAAA,kBAAe,cAAc,CAAA"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@feathersjs/feathers",
   "description": "A framework for real-time applications and REST API with JavaScript and TypeScript",
-  "version": "5.0.0-pre.22",
+  "version": "5.0.0-pre.25",
   "homepage": "http://feathersjs.com",
   "repository": {
     "type": "git",
@@ -42,8 +42,8 @@
     "*.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",
@@ -57,17 +57,17 @@
     "access": "public"
   },
   "dependencies": {
-    "@feathersjs/commons": "^5.0.0-pre.22",
-    "@feathersjs/hooks": "^0.7.4",
+    "@feathersjs/commons": "^5.0.0-pre.25",
+    "@feathersjs/hooks": "^0.7.5",
     "events": "^3.3.0"
   },
   "devDependencies": {
     "@types/mocha": "^9.1.1",
-    "@types/node": "^17.0.31",
+    "@types/node": "^17.0.40",
     "mocha": "^10.0.0",
     "shx": "^0.3.4",
-    "ts-node": "^10.7.0",
-    "typescript": "^4.6.4"
+    "ts-node": "^10.8.1",
+    "typescript": "^4.7.3"
   },
-  "gitHead": "e452e02063e6d8943a9cae2315ab585bc4f82fb6"
+  "gitHead": "c0ab3b603920dff6e9c912b2767cf168094d45c8"
 }

package/src/application.ts

@@ -1,10 +1,10 @@
-import version from './version';
-import {
-  EventEmitter, stripSlashes, createDebug, HOOKS, hooks, middleware
-} from './dependencies';
-import { eventHook, eventMixin } from './events';
-import { hookMixin } from './hooks/index';
-import { wrapService, getServiceOptions, protectedMethods } from './service';
+import version from './version'
+import { EventEmitter } from 'events'
+import { stripSlashes, createDebug } from '@feathersjs/commons'
+import { hooks, middleware } from '@feathersjs/hooks'
+import { eventHook, eventMixin } from './events'
+import { hookMixin } from './hooks'
+import { wrapService, getServiceOptions, protectedMethods } from './service'
 import {
   FeathersApplication,
   ServiceMixin,
@@ -13,28 +13,26 @@ import {
   ServiceInterface,
   Application,
   FeathersService,
-  HookMap,
   ApplicationHookOptions
-} from './declarations';
-import { enableRegularHooks } from './hooks/regular';
-
-const debug = createDebug('@feathersjs/feathers');
-
-export class Feathers<Services, Settings> extends EventEmitter implements FeathersApplication<Services, Settings> {
-  services: Services = ({} as Services);
-  settings: Settings = ({} as Settings);
-  mixins: ServiceMixin<Application<Services, Settings>>[] = [ hookMixin, eventMixin ];
-  version: string = version;
-  _isSetup = false;
-  appHooks: HookMap<Application<Services, Settings>, any> = {
-    [HOOKS]: [ (eventHook as any) ]
-  };
-
-  private regularHooks: (this: any, allHooks: any) => any;
-
-  constructor () {
-    super();
-    this.regularHooks = enableRegularHooks(this);
+} from './declarations'
+import { enableHooks } from './hooks'
+
+const debug = createDebug('@feathersjs/feathers')
+
+export class Feathers<Services, Settings>
+  extends EventEmitter
+  implements FeathersApplication<Services, Settings>
+{
+  services: Services = {} as Services
+  settings: Settings = {} as Settings
+  mixins: ServiceMixin<Application<Services, Settings>>[] = [hookMixin, eventMixin]
+  version: string = version
+  _isSetup = false
+
+  protected registerHooks: (this: any, allHooks: any) => any
+
+  constructor() {
+    super()
     hooks(this, {
       setup: middleware().params('server').props({
         app: this
@@ -42,137 +40,148 @@ export class Feathers<Services, Settings> extends EventEmitter implements Feathe
       teardown: middleware().params('server').props({
         app: this
       })
-    });
+    })
+    this.registerHooks = enableHooks(this)
+    this.registerHooks({
+      around: [eventHook]
+    })
   }
 
-  get<L extends keyof Settings & string> (name: L): Settings[L] {
-    return this.settings[name];
+  get<L extends keyof Settings & string>(name: L): Settings[L] {
+    return this.settings[name]
   }
 
-  set<L extends keyof Settings & string> (name: L, value: Settings[L]) {
-    this.settings[name] = value;
-    return this;
+  set<L extends keyof Settings & string>(name: L, value: Settings[L]) {
+    this.settings[name] = value
+    return this
   }
 
-  configure (callback: (this: this, app: this) => void) {
-    callback.call(this, this);
+  configure(callback: (this: this, app: this) => void) {
+    callback.call(this, this)
 
-    return this;
+    return this
   }
 
-  defaultService (location: string): ServiceInterface {
-    throw new Error(`Can not find service '${location}'`);
+  defaultService(location: string): ServiceInterface {
+    throw new Error(`Can not find service '${location}'`)
   }
 
-  service<L extends keyof Services & string> (
+  service<L extends keyof Services & string>(
     location: L
   ): FeathersService<this, keyof any extends keyof Services ? Service : Services[L]> {
-    const path = (stripSlashes(location) || '/') as L;
-    const current = this.services[path];
+    const path = (stripSlashes(location) || '/') as L
+    const current = this.services[path]
 
     if (typeof current === 'undefined') {
-      this.use(path, this.defaultService(path) as any);
-      return this.service(path);
+      this.use(path, this.defaultService(path) as any)
+      return this.service(path)
     }
 
-    return current as any;
+    return current as any
   }
 
-  use<L extends keyof Services & string> (
+  use<L extends keyof Services & string>(
     path: L,
     service: keyof any extends keyof Services ? ServiceInterface | Application : Services[L],
     options?: ServiceOptions
   ): this {
     if (typeof path !== 'string') {
-      throw new Error(`'${path}' is not a valid service path.`);
+      throw new Error(`'${path}' is not a valid service path.`)
     }
 
-    const location = (stripSlashes(path) || '/') as L;
-    const subApp = service as Application;
-    const isSubApp = typeof subApp.service === 'function' && subApp.services;
+    const location = (stripSlashes(path) || '/') as L
+    const subApp = service as Application
+    const isSubApp = typeof subApp.service === 'function' && subApp.services
 
     if (isSubApp) {
-      Object.keys(subApp.services).forEach(subPath =>
+      Object.keys(subApp.services).forEach((subPath) =>
         this.use(`${location}/${subPath}` as any, subApp.service(subPath) as any)
-      );
+      )
 
-      return this;
+      return this
     }
 
-    const protoService = wrapService(location, service, options);
-    const serviceOptions = getServiceOptions(protoService);
+    const protoService = wrapService(location, service, options)
+    const serviceOptions = getServiceOptions(protoService)
 
     for (const name of protectedMethods) {
       if (serviceOptions.methods.includes(name)) {
-        throw new Error(`'${name}' on service '${location}' is not allowed as a custom method name`);
+        throw new Error(`'${name}' on service '${location}' is not allowed as a custom method name`)
       }
     }
 
-    debug(`Registering new service at \`${location}\``);
+    debug(`Registering new service at \`${location}\``)
 
     // Add all the mixins
-    this.mixins.forEach(fn => fn.call(this, protoService, location, serviceOptions));
+    this.mixins.forEach((fn) => fn.call(this, protoService, location, serviceOptions))
 
-    this.services[location] = protoService;
+    this.services[location] = protoService
 
     // If we ran setup already, set this service up explicitly, this will not `await`
     if (this._isSetup && typeof protoService.setup === 'function') {
-      debug(`Setting up service for \`${location}\``);
-      protoService.setup(this, location);
+      debug(`Setting up service for \`${location}\``)
+      protoService.setup(this, location)
     }
 
-    return this;
+    return this
   }
 
-  hooks (hookMap: ApplicationHookOptions<this>) {
-    const untypedMap = hookMap as any;
+  hooks(hookMap: ApplicationHookOptions<this>) {
+    const untypedMap = hookMap as any
 
-    if (untypedMap.before || untypedMap.after || untypedMap.error) {
-      this.regularHooks(untypedMap);
+    if (untypedMap.before || untypedMap.after || untypedMap.error || untypedMap.around) {
+      // regular hooks for all service methods
+      this.registerHooks(untypedMap)
     } else if (untypedMap.setup || untypedMap.teardown) {
-      hooks(this, untypedMap);
-   } else if (Array.isArray(hookMap)) {
-      this.appHooks[HOOKS].push(...hookMap as any);
+      // .setup and .teardown application hooks
+      hooks(this, untypedMap)
     } else {
-      const methodHookMap = hookMap as HookMap<Application<Services, Settings>, any>;
-
-      Object.keys(methodHookMap).forEach(key => {
-        const methodHooks = this.appHooks[key] || [];
-
-        this.appHooks[key] = methodHooks.concat(methodHookMap[key]);
-      });
+      // Other registration formats are just `around` hooks
+      this.registerHooks({
+        around: untypedMap
+      })
     }
 
-    return this;
+    return this
   }
 
-  setup () {
-    this._isSetup = true;
+  setup() {
+    this._isSetup = true
 
-    return Object.keys(this.services).reduce((current, path) => current
-      .then(() => {
-        const service: any = this.service(path as any);
+    return Object.keys(this.services)
+      .reduce(
+        (current, path) =>
+          current.then(() => {
+            const service: any = this.service(path as any)
 
-        if (typeof service.setup === 'function') {
-          debug(`Setting up service for \`${path}\``);
+            if (typeof service.setup === 'function') {
+              debug(`Setting up service for \`${path}\``)
 
-          return service.setup(this, path);
-        }
-      }), Promise.resolve()).then(() => this);
+              return service.setup(this, path)
+            }
+          }),
+        Promise.resolve()
+      )
+      .then(() => this)
   }
 
-  teardown () {
-    this._isSetup = false;
+  teardown() {
+    this._isSetup = false
 
-    return Object.keys(this.services).reduce((current, path) => current
-      .then(() => {
-        const service: any = this.service(path as any);
+    return Object.keys(this.services)
+      .reduce(
+        (current, path) =>
+          current.then(() => {
+            const service: any = this.service(path as any)
 
-        if (typeof service.teardown === 'function') {
-          debug(`Tearing down service for \`${path}\``);
+            if (typeof service.teardown === 'function') {
+              debug(`Tearing down service for \`${path}\``)
 
-          return service.teardown(this, path);
-        }
-      }), Promise.resolve()).then(() => this)
+              return service.teardown(this, path)
+            }
+          }),
+        Promise.resolve()
+      )
+      .then(() => this)
   }
 }