feat(core): Remove Uberproto (#2178)

BREAKING CHANGE: Services no longer extend Uberproto objects and
`service.mixin()` is no longer available.

packages/adapter-tests/src/methods.ts

@@ -539,7 +539,7 @@ export default (test: any, app: any, _errors: any, serviceName: string, idProp:
       let throwing: any;
 
       before(() => {
-        throwing = app.service(serviceName).extend({
+        throwing = Object.assign(Object.create(app.service(serviceName)), {
           get store () {
             return app.service(serviceName).store;
           },

packages/express/package.json

@@ -54,8 +54,7 @@
     "@types/express": "^4.17.9",
     "debug": "^4.3.1",
     "express": "^4.17.1",
-    "lodash": "^4.17.20",
-    "uberproto": "^2.0.6"
+    "lodash": "^4.17.20"
   },
   "devDependencies": {
     "@feathersjs/authentication": "^5.0.0-pre.1",

packages/express/src/index.ts

@@ -1,5 +1,3 @@
-// @ts-ignore
-import Proto from 'uberproto';
 import express, { Express, static as _static, json, raw, text, urlencoded, query } from 'express';
 import Debug from 'debug';
 import {
@@ -55,9 +53,10 @@ export default function feathersExpress<T = any> (feathersApp?: FeathersApplicat
     throw new Error(`@feathersjs/express requires an instance of a Feathers application version 3.x or later (got ${feathersApp.version || 'unknown'})`);
   }
 
+  const { use, listen } = expressApp as any;
   // An Uberproto mixin that provides the extended functionality
   const mixin: any = {
-    use (location: string) {
+    use (location: string, ...rest: any[]) {
       let service: any;
       const middleware = Array.from(arguments).slice(1)
         .reduce(function (middleware, arg) {
@@ -81,7 +80,7 @@ export default function feathersExpress<T = any> (feathersApp?: FeathersApplicat
       // Check for service (any object with at least one service method)
       if (hasMethod(['handle', 'set']) || !hasMethod(this.methods.concat('setup'))) {
         debug('Passing app.use call to Express app');
-        return this._super.apply(this, arguments);
+        return use.call(this, location, ...rest);
       }
 
       debug('Registering service with middleware', middleware);
@@ -91,8 +90,8 @@ export default function feathersExpress<T = any> (feathersApp?: FeathersApplicat
       return this;
     },
 
-    listen () {
-      const server = this._super.apply(this, arguments);
+    listen (...args: any[]) {
+      const server = listen.call(this, ...args);
 
       this.setup(server);
       debug('Feathers application listening');
@@ -112,7 +111,7 @@ export default function feathersExpress<T = any> (feathersApp?: FeathersApplicat
     }
   });
 
-  return Proto.mixin(mixin, expressApp);
+  return Object.assign(expressApp, mixin);
 }
 
 if (typeof module !== 'undefined') {

packages/express/src/rest/index.ts

@@ -9,16 +9,10 @@ const HTTP_METHOD = Symbol('@feathersjs/express/rest/HTTP_METHOD');
 
 export function httpMethod (verb: any, uris?: any) {
   return (method: any) => {
-    Object.defineProperty(method, HTTP_METHOD, {
-      enumerable: false,
-      configurable: true,
-      writable: false,
-      value: (Array.isArray(uris) ? uris : [uris])
-        .reduce(
-          (result, uri) => ([...result, { verb, uri }]),
-          method[HTTP_METHOD] || []
-        )
-    });
+    method[HTTP_METHOD] = (Array.isArray(uris) ? uris : [uris]).reduce(
+      (result, uri) => ([...result, { verb, uri }]),
+      method[HTTP_METHOD] || []
+    );
 
     return method;
   };

packages/feathers/package.json

@@ -47,7 +47,8 @@
     "version": "npm run write-version",
     "publish": "npm run reset-version",
     "compile": "shx rm -rf lib/ && tsc",
-    "test": "npm run compile && mocha --config ../../.mocharc.json --recursive test/**.test.ts test/**/*.test.ts"
+    "test": "npm run compile && npm run mocha",
+    "mocha": "mocha --config ../../.mocharc.json --recursive test/**.test.ts test/**/*.test.ts"
   },
   "engines": {
     "node": ">= 12"
@@ -59,8 +60,7 @@
     "@feathersjs/commons": "^5.0.0-pre.1",
     "@feathersjs/hooks": "^0.6.1",
     "debug": "^4.3.1",
-    "events": "^3.2.0",
-    "uberproto": "^2.0.6"
+    "events": "^3.2.0"
   },
   "devDependencies": {
     "@types/mocha": "^8.2.0",

packages/feathers/src/application.ts

@@ -1,19 +1,13 @@
 import Debug from 'debug';
 import { stripSlashes } from '@feathersjs/commons';
 
-// @ts-ignore
-import Uberproto from 'uberproto';
 import events from './events';
 import hooks from './hooks';
 import version from './version';
 import { BaseApplication, Service } from './declarations';
 
 const debug = Debug('feathers:application');
 
-const Proto = Uberproto.extend({
-  create: null
-});
-
 interface AppExtensions {
   _isSetup: boolean;
   init (): void;
@@ -106,8 +100,9 @@ export default {
       throw new Error(`Invalid service object passed for path \`${location}\``);
     }
 
-    // If the service is already Uberproto'd use it directly
-    const protoService = Proto.isPrototypeOf(service) ? service : Proto.extend(service);
+    // Use existing service or create a new object with prototype pointing to original
+    const isFeathersService = typeof service.hooks === 'function' && (service as any)._serviceEvents;
+    const protoService = isFeathersService ? service : Object.create(service);
 
     debug(`Registering new service at \`${location}\``);
 

packages/feathers/src/events.ts

@@ -1,5 +1,3 @@
-// @ts-ignore
-import Proto from 'uberproto';
 import { EventEmitter } from 'events';
 import { HookContext, Service, Application } from './declarations';
 
@@ -32,9 +30,9 @@ export function eventMixin (this: Application, service: Service<any>) {
   const isEmitter = typeof service.on === 'function' &&
     typeof service.emit === 'function';
 
-  // If not, mix it in (the service is always an Uberproto object that has a .mixin)
-  if (typeof service.mixin === 'function' && !isEmitter) {
-    service.mixin(EventEmitter.prototype);
+  // If not, add EventEmitter functionality
+  if (!isEmitter) {
+    Object.assign(service, EventEmitter.prototype);
   }
 
   // Define non-enumerable properties of
@@ -81,7 +79,7 @@ export default function () {
     app.hooks({ finally: eventHook() });
 
     // Make the app an event emitter
-    Proto.mixin(EventEmitter.prototype, app);
+    Object.assign(app, EventEmitter.prototype);
 
     app.mixins.push(eventMixin);
   };

packages/feathers/src/hooks/index.ts

@@ -89,25 +89,29 @@ function withHooks (app: Application, service: Service<any>, methods: string[])
   hooksDecorator(service, hookMap);
 }
 
-function mixinMethod (this: any) {
-  const service = this;
-  const args = Array.from(arguments);
-
-  const returnHook = args[args.length - 1] === true || args[args.length - 1] instanceof HookContext
-    ? args.pop() : false;
-
-  const hookContext = returnHook instanceof 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;
-      }
-    });
+const mixinMethod = (_super: any) => {
+  const result = function (this: any) {
+    const service = this;
+    const args = Array.from(arguments);
+
+    const returnHook = args[args.length - 1] === true || args[args.length - 1] instanceof HookContext
+      ? args.pop() : false;
+
+    const hookContext = returnHook instanceof HookContext ? returnHook : _super.createContext();
+
+    return _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;
+        }
+      });
+  };
+
+  return Object.assign(result, _super);
 }
 
 // A service mixin that adds `service.hooks()` method and functionality
@@ -116,7 +120,7 @@ const hookMixin = exports.hookMixin = function hookMixin (service: any) {
     return;
   }
 
-  service.methods = Object.getOwnPropertyNames(service)
+  service.methods = Object.getOwnPropertyNames(Object.getPrototypeOf(service))
     .filter(key => typeof service[key] === 'function' && service[key][ACTIVATE_HOOKS])
     .reduce((result, methodName) => {
       result[methodName] = service[methodName][ACTIVATE_HOOKS];
@@ -143,15 +147,15 @@ const hookMixin = exports.hookMixin = function hookMixin (service: any) {
       return mixin;
     }
 
-    mixin[method] = mixinMethod;
+    mixin[method] = mixinMethod(service[method]);
 
     return mixin;
   }, {} as any);
 
   // Add .hooks method and properties to the service
   enableHooks(service, methodNames, app.hookTypes);
 
-  service.mixin(mixin);
+  Object.assign(service, mixin);
 };
 
 export default function () {

packages/feathers/src/index.ts

@@ -1,20 +1,13 @@
-// @ts-ignore
-import Proto from 'uberproto';
 import Application from './application';
 import version from './version';
 import { Application as ApplicationType } from './declarations'
 
-const baseObject = Object.create(null);
-
 export default function feathers<ServiceTypes = {}> (): ApplicationType<ServiceTypes> {
-  const app = Object.create(baseObject);
-
-  // Mix in the base application
-  Proto.mixin(Application, app);
+  const app = Object.assign({}, Application);
 
   app.init();
 
-  return app;
+  return app as any as ApplicationType<ServiceTypes>;
 }
 
 export { version };

packages/feathers/test/application.test.ts

@@ -1,5 +1,3 @@
-// @ts-ignore
-import Proto from 'uberproto';
 import assert from 'assert';
 import feathers, { Id, version } from '../src'
 import { HookContext } from '@feathersjs/hooks';
@@ -117,7 +115,7 @@ describe('Feathers application', () => {
       const app = feathers().use('/dummy', dummyService);
       const wrappedService = app.service('dummy');
 
-      assert.ok(Proto.isPrototypeOf(wrappedService), 'Service got wrapped as Uberproto object');
+      assert.strictEqual(Object.getPrototypeOf(wrappedService), dummyService, 'Object points to original service prototype');
 
       return wrappedService.create({
         message: 'Test message'

packages/socketio/package.json

@@ -52,8 +52,7 @@
   "dependencies": {
     "@feathersjs/transport-commons": "^5.0.0-pre.1",
     "debug": "^4.3.1",
-    "socket.io": "^3.0.4",
-    "uberproto": "^2.0.6"
+    "socket.io": "^3.0.4"
   },
   "devDependencies": {
     "@feathersjs/adapter-memory": "^5.0.0-pre.1",

packages/socketio/src/index.ts

@@ -1,5 +1,3 @@
-// @ts-ignore
-import Proto from 'uberproto';
 import Debug from 'debug';
 import { Server, ServerOptions } from 'socket.io';
 import http from 'http';
@@ -38,12 +36,14 @@ function configureSocketio (port?: any, options?: any, config?: any) {
     // Promise that resolves with the Socket.io `io` instance
     // when `setup` has been called (with a server)
     const done = new Promise(resolve => {
-      Proto.mixin({
-        listen (...args: any[]) {
-          if (typeof this._super === 'function') {
+      const { listen, setup } = app as any;
+
+      Object.assign(app, {
+        listen (this: any, ...args: any[]) {
+          if (typeof listen === 'function') {
             // If `listen` already exists
             // usually the case when the app has been expressified
-            return this._super(...args);
+            return listen.call(this, ...args);
           }
 
           const server = http.createServer();
@@ -53,7 +53,7 @@ function configureSocketio (port?: any, options?: any, config?: any) {
           return server.listen(...args);
         },
 
-        setup (server: http.Server) {
+        setup (this: any, server: http.Server, ...rest: any[]) {
           if (!this.io) {
             const io = this.io = new Server(port || server, options);
 
@@ -74,9 +74,9 @@ function configureSocketio (port?: any, options?: any, config?: any) {
 
           resolve(this.io);
 
-          return this._super.apply(this, arguments);
+          return setup.call(this, server, ...rest);
         }
-      }, app);
+      });
     });
 
     app.configure(socket({