update deps, fix imports

Author: Mikhus

package-lock.json

@@ -23,43 +23,44 @@
   "author": "imqueue.com <[email protected]>",
   "license": "ISC",
   "dependencies": {
-    "@imqueue/js": "^1.1.3",
-    "@imqueue/rpc": "^1.5.0",
+    "@imqueue/core": "^1.6.8",
+    "@imqueue/js": "^1.1.4",
+    "@imqueue/rpc": "^1.6.5",
     "@types/bluebird": "^3.5.29",
     "@types/validator": "^12.0.1",
     "bluebird": "^3.7.2",
     "chalk": "^3.0.0",
     "dotenv": "^8.2.0",
-    "pg": "^7.14.0",
-    "sequelize": "^5.21.2",
+    "pg": "^7.17.0",
+    "sequelize": "^5.21.3",
     "sequelize-typescript": "^1.1.0",
     "sql-formatter": "^2.3.3",
     "uuid": "^3.3.3"
   },
   "devDependencies": {
-    "@types/chai": "^4.2.6",
+    "@types/chai": "^4.2.7",
     "@types/chalk": "^2.2.0",
     "@types/mocha": "^5.2.7",
     "@types/mock-require": "^2.0.0",
-    "@types/node": "^12.12.16",
-    "@types/pg": "^7.11.2",
+    "@types/node": "^13.1.2",
+    "@types/pg": "^7.14.0",
     "@types/sinon": "^7.5.1",
     "@types/uuid": "^3.4.6",
     "chai": "^4.2.0",
     "mocha": "^6.2.2",
     "mocha-lcov-reporter": "^1.3.0",
     "mock-require": "^3.0.3",
     "npm-scripts-help": "^0.8.0",
-    "nyc": "^14.1.1",
+    "nyc": "^15.0.0",
     "open": "^7.0.0",
     "reflect-metadata": "^0.1.13",
     "sequelize-cli": "^5.5.1",
-    "sinon": "^7.5.0",
+    "sinon": "^8.0.2",
     "source-map-support": "^0.5.16",
     "ts-node": "^8.5.4",
     "tslint": "^5.20.1",
-    "typedoc": "^0.15.4",
-    "typescript": "^3.7.3"
+    "typedoc": "^0.15.6",
+    "typescript": "^3.7.4"
   },
   "typescript": {
     "definitions": "index.d.ts"

package.json

@@ -110,7 +110,7 @@ import {
     RX_MATCHER,
     RX_NAME_MATCHER,
     ViewParams,
-} from './decorators/columnIndex';
+} from './decorators';
 import { query } from './helpers';
 import sql = query.sql;
 import E = query.E;

src/BaseModel.ts

@@ -20,6 +20,7 @@ import { addOptions, getOptions } from 'sequelize-typescript';
 export type FunctionType = (...args: any[]) => any;
 
 export enum IndexMethod {
+    // noinspection JSUnusedGlobalSymbols
     BTREE = 'BTREE',
     HASH = 'HASH',
     GIST = 'GIST',
@@ -29,6 +30,7 @@ export enum IndexMethod {
 }
 
 export enum SortOrder {
+    // noinspection JSUnusedGlobalSymbols
     ASC = 'ASC',
     DESC = 'DESC',
 }
@@ -86,7 +88,4 @@ function annotate(
     } as any);
 }
 
-export * from './DynamicView';
-export * from './View';
-export * from './NullableIndex';
-export * from './AssociatedWith';
+

src/decorators/columnIndex.ts src/decorators/ColumnIndex.tssrc/decorators/columnIndex.ts renamed to src/decorators/ColumnIndex.ts

@@ -51,7 +51,7 @@ export function DynamicView(
     const viewParams = options.viewParams || {};
 
     (viewDef.match(RX_MATCHER) || []).forEach(param => {
-        const [_, name] = (param.match(RX_NAME_MATCHER) || ['', '']);
+        const [, name] = (param.match(RX_NAME_MATCHER) || ['', '']);
 
         if (typeof viewParams[name] !== 'string') {
             throw new TypeError(

src/decorators/DynamicView.ts

@@ -0,0 +1,28 @@
+/*!
+ * @imqueue/sequelize - Sequelize ORM refines for @imqueue
+ *
+ * Copyright (c) 2019, imqueue.com <[email protected]>
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+ * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+import 'reflect-metadata';
+
+// noinspection JSUnusedGlobalSymbols
+/**
+ * Declares emittable model, which would have bound trigger sending
+ * table rows change events using PostgreSQL NOTIFY command.
+ * This is PostgreSQL only feature
+ */
+export function Emittable(target: any) {
+    // todo: implement
+}

src/decorators/Emittable.ts

@@ -15,7 +15,7 @@
  * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-import { ColumnIndexOptions, FunctionType, ColumnIndex } from './columnIndex';
+import { ColumnIndexOptions, FunctionType, ColumnIndex } from './ColumnIndex';
 
 type Omit<T, K extends keyof any> = Pick<T, Exclude<keyof T, K>>;
 

src/decorators/NullableIndex.ts

@@ -0,0 +1,23 @@
+/*!
+ * @imqueue/sequelize - Sequelize ORM refines for @imqueue
+ *
+ * Copyright (c) 2019, imqueue.com <[email protected]>
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+ * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+export * from './DynamicView';
+export * from './View';
+export * from './NullableIndex';
+export * from './AssociatedWith';
+export * from './ColumnIndex';
+export * from './Emittable';

src/decorators/index.ts

@@ -28,7 +28,7 @@ import isOk = js.isOk;
 /* models exports! */
 export * from './BaseModel';
 export * from './helpers';
-export * from './decorators/columnIndex';
+export * from './decorators';
 export * from './types';
 
 const JS_EXT_RX = /\.js$/;