fratzinger · Aug 3, 2022 · Aug 3, 2022 · Aug 3, 2022 · Aug 3, 2022 · Aug 3, 2022
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -0,0 +1,158 @@
+{
+  "env": {
+    "browser": true,
+    "es6": true,
+    "mocha": true,
+    "node": true
+  },
+  "extends": [
+    "plugin:@typescript-eslint/recommended"
+  ],
+  "parser": "@typescript-eslint/parser",
+  "parserOptions": {
+    "project": "tsconfig.test.json",
+    "sourceType": "module"
+  },
+  "plugins": [
+    "@typescript-eslint"
+  ],
+  "rules": {
+    "indent": ["warn", 2],
+    "prefer-rest-params": "off",
+    "prefer-spread": "off",
+    "@typescript-eslint/no-unsafe-member-access": "off",
+    "@typescript-eslint/no-unsafe-assignment": "off",
+    "@typescript-eslint/no-unsafe-argument": "off",
+    "@typescript-eslint/no-unsafe-call": "off",
+    "@typescript-eslint/no-unsafe-return": "off",
+    "@typescript-eslint/no-floating-promises": "off",
+    "@typescript-eslint/restrict-template-expressions": "off",
+    "@typescript-eslint/explicit-module-boundary-types": "off",
+    "@typescript-eslint/require-await": "off",
+    "@typescript-eslint/ban-ts-comment": "off",
+    "@typescript-eslint/unbound-method": "off",
+    "@typescript-eslint/no-this-alias": "off",
+    "@typescript-eslint/prefer-regexp-exec": "off",
+    "@typescript-eslint/no-misused-promises": "off",
+    "@typescript-eslint/restrict-plus-operands": "off",
+    // ----
+    "@typescript-eslint/adjacent-overload-signatures": "error",
+    "@typescript-eslint/array-type": [
+      "error",
+      {
+        "default": "array"
+      }
+    ],
+    "@typescript-eslint/ban-types": "off",
+    "@typescript-eslint/consistent-type-assertions": "error",
+    "@typescript-eslint/dot-notation": "error",
+    "@typescript-eslint/explicit-member-accessibility": [
+      "error",
+      {
+          "accessibility": "no-public"
+      }
+    ],
+    "@typescript-eslint/naming-convention": "off",
+    "@typescript-eslint/no-empty-function": "off",
+    "@typescript-eslint/no-empty-interface": "error",
+    "@typescript-eslint/no-explicit-any": "off",
+    "@typescript-eslint/no-misused-new": "error",
+    "@typescript-eslint/no-namespace": "error",
+    "@typescript-eslint/no-parameter-properties": "off",
+    "@typescript-eslint/no-unused-expressions": "error",
+    "@typescript-eslint/no-use-before-define": "off",
+    "@typescript-eslint/no-var-requires": "error",
+    "@typescript-eslint/prefer-for-of": "error",
+    "@typescript-eslint/prefer-function-type": "error",
+    "@typescript-eslint/prefer-namespace-keyword": "error",
+    "@typescript-eslint/quotes": [
+      "error",
+      "single"
+    ],
+    "@typescript-eslint/triple-slash-reference": [
+      "error",
+      {
+        "path": "always",
+        "types": "prefer-import",
+        "lib": "always"
+      }
+    ],
+    "@typescript-eslint/unified-signatures": "error",
+    "@typescript-eslint/consistent-type-imports": ["warn", { "prefer": "type-imports" }],
+    "@typescript-eslint/object-curly-spacing": ["warn", "always"],
+    "arrow-parens": [
+      "off",
+      "always"
+    ],
+    "comma-dangle": "error",
+    "complexity": "off",
+    "constructor-super": "error",
+    "eqeqeq": [
+      "error",
+      "smart"
+    ],
+    "guard-for-in": "error",
+    "id-blacklist": "off",
+    "id-match": "off",
+    "import/order": "off",
+    // "jsdoc/check-alignment": "error",
+    // "jsdoc/check-indentation": "error",
+    // "jsdoc/newline-after-description": "error",
+    "max-classes-per-file": "off",
+    "max-len": "off",
+    "new-parens": "error",
+    "no-bitwise": "error",
+    "no-caller": "error",
+    "no-cond-assign": "error",
+    "no-console": "error",
+    "no-debugger": "error",
+    "no-empty": "off",
+    "no-eval": "error",
+    "no-fallthrough": "off",
+    "no-invalid-this": "off",
+    "no-new-wrappers": "error",
+    "no-shadow": [
+      "off",
+      {
+        "hoist": "all"
+      }
+    ],
+    "no-throw-literal": "error",
+    "no-trailing-spaces": "error",
+    "no-undef-init": "error",
+    "no-underscore-dangle": "off",
+    "no-unsafe-finally": "error",
+    "no-unused-labels": "error",
+    "no-var": "error",
+    "object-shorthand": "error",
+    "one-var": [
+      "error",
+      "never"
+    ],
+    "prefer-arrow/prefer-arrow-functions": "off",
+    "prefer-const": "error",
+    "radix": "error",
+    "space-before-function-paren": "error",
+    "spaced-comment": [
+      "error",
+      "always",
+      {
+        "markers": [
+          "/"
+        ]
+      }
+    ],
+    "use-isnan": "error",
+    "valid-typeof": "off"
+  },
+  "overrides": [
+    {
+      "files": ["test/**/*.ts"],
+      "rules": {
+        "@typescript-eslint/ban-ts-comment": "off",
+        "@typescript-eslint/no-unused-vars": "off",
+        "no-console": "off"
+      }
+    }
+  ]
+}
diff --git a/.gitignore b/.gitignore
@@ -29,5 +29,5 @@ node_modules
 # Users Environment Variables
 .lock-wscript
 
-dist/
+lib/
 db.sqlite
diff --git a/.mocharc.js b/.mocharc.js
@@ -0,0 +1,12 @@
+'use strict';
+const path = require("path");
+
+module.exports = {
+  extension: ["ts", "js"],
+  package: path.join(__dirname, "./package.json"),
+  ui: "bdd",
+  spec: [
+    "./test/**/*.test.*",
+  ],
+  exit: true
+};
diff --git a/.nycrc b/.nycrc
@@ -1,18 +1,20 @@
 {
   "verbose": false,
   "tempDirectory": "./coverage/.tmp",
-  "semistandard": {
-    "env": [
-      "mocha"
-    ]
-  },
   "extension": [
     ".ts",
     ".tsx",
     ".js"
   ],
+  "include": [
+    "src/**/*.js",
+    "src/**/*.ts"
+  ],
   "exclude": [
-    "**/test/*"
+    "coverage/**",
+    "node_modules/**",
+    "**/*.d.ts",
+    "**/*.test.ts"
   ],
   "print": "detail",
   "reporter": [

diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -0,0 +1,28 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "type": "node",
+      "resolveSourceMapLocations": [
+        "${workspaceFolder}/**",
+        "!**/node_modules/**"
+      ],
+      "request": "launch",
+      "name": "Mocha Tests",
+      "program": "${workspaceFolder}/node_modules/mocha/bin/mocha",
+      "args": [
+        "--require",
+        "ts-node/register",
+        "--timeout",
+        "10000",
+        "--colors",
+        "--recursive"
+      ],
+      "internalConsoleOptions": "openOnSessionStart",
+      "outputCapture": "std",
+      "skipFiles": [
+        "<node_internals>/**"
+      ]
+    },
+  ]
+}
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 Feathers
+Copyright (c) 2022 Feathers
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/README.md b/README.md
@@ -60,16 +60,16 @@ npm install --save tedious // MSSQL
 
 ## API
 
-### `service(options)`
+### `new Service(options)`
 
 Returns a new service instance initialized with the given options.
 
 ```js
 const Model = require('./models/mymodel');
-const service = require('feathers-sequelize');
+const { Service } = require('feathers-sequelize');
 
-app.use('/messages', service({ Model }));
-app.use('/messages', service({ Model, id, events, paginate }));
+app.use('/messages', new Service({ Model }));
+app.use('/messages', new Service({ Model, id, events, paginate }));
 ```
 
 __Options:__
@@ -206,7 +206,7 @@ const express = require('@feathersjs/express');
 const socketio = require('@feathersjs/socketio');
 
 const Sequelize = require('sequelize');
-const service = require('feathers-sequelize');
+const { Service } = require('feathers-sequelize');
 
 const sequelize = new Sequelize('sequelize', '', '', {
   dialect: 'sqlite',
@@ -235,7 +235,7 @@ app.configure(express.rest());
 app.configure(socketio());
 // Create an in-memory Feathers service with a default page size of 2 items
 // and a maximum size of 4
-app.use('/messages', service({
+app.use('/messages', new Service({
   Model: Message,
   paginate: {
     default: 2,
@@ -357,8 +357,7 @@ It is highly recommended to use `raw` queries, which is the default. However, th
 
 > **Important:** When working with Sequelize Instances, most of the feathers-hooks-common will no longer work. If you need to use a common hook or other 3rd party hooks, you should use the "dehydrate" hook to convert data back to a plain object:
 > ```js
-> const hydrate = require('feathers-sequelize/hooks/hydrate');
-> const dehydrate = require('feathers-sequelize/hooks/dehydrate');
+> const { dehydrate, hydrate } = require('feathers-sequelize');
 > const { populate } = require('feathers-hooks-common');
 >
 > hooks.after.find = [hydrate(), doSomethingCustom(), dehydrate(), populate()];

diff --git a/hooks/dehydrate.js b/hooks/dehydrate.js
diff --git a/hooks/hydrate.js b/hooks/hydrate.js
diff --git a/lib/hooks/dehydrate.js b/lib/hooks/dehydrate.js
diff --git a/lib/hooks/hydrate.js b/lib/hooks/hydrate.js
diff --git a/lib/hooks/index.js b/lib/hooks/index.js