pangea-server 3.3.28 → 3.3.30

package/dist/database/db.class.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Db = void 0;
 const sequelize_1 = require("sequelize");
+const utils_1 = require("sequelize/lib/utils");
 const db_client_1 = require("./db-client");
 const _1 = require(".");
 // helpers
@@ -242,6 +243,7 @@ function convertWhereKeys(obj) {
         !(obj instanceof RegExp) &&
         !(obj instanceof Map) &&
         !(obj instanceof Set) &&
+        !(obj instanceof utils_1.Where) &&
         !(typeof obj === 'function')) {
         const newObj = {};
         for (const key of Reflect.ownKeys(obj)) {

package/dist/database/index.d.ts

@@ -1,4 +1,11 @@
-export { Op as Ops, fn, col, where, literal } from 'sequelize';
+import { fn, col, where, literal } from 'sequelize';
+export { Op as Ops } from 'sequelize';
+export declare const Sql: {
+    fn: typeof fn;
+    col: typeof col;
+    where: typeof where;
+    literal: typeof literal;
+};
 export * from './decorators';
 export * from './models';
 export * from './base-service.class';

package/dist/database/index.js

@@ -14,13 +14,11 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.literal = exports.where = exports.col = exports.fn = exports.Ops = void 0;
-var sequelize_1 = require("sequelize");
-Object.defineProperty(exports, "Ops", { enumerable: true, get: function () { return sequelize_1.Op; } });
-Object.defineProperty(exports, "fn", { enumerable: true, get: function () { return sequelize_1.fn; } });
-Object.defineProperty(exports, "col", { enumerable: true, get: function () { return sequelize_1.col; } });
-Object.defineProperty(exports, "where", { enumerable: true, get: function () { return sequelize_1.where; } });
-Object.defineProperty(exports, "literal", { enumerable: true, get: function () { return sequelize_1.literal; } });
+exports.Sql = exports.Ops = void 0;
+const sequelize_1 = require("sequelize");
+var sequelize_2 = require("sequelize");
+Object.defineProperty(exports, "Ops", { enumerable: true, get: function () { return sequelize_2.Op; } });
+exports.Sql = { fn: sequelize_1.fn, col: sequelize_1.col, where: sequelize_1.where, literal: sequelize_1.literal };
 __exportStar(require("./decorators"), exports);
 __exportStar(require("./models"), exports);
 __exportStar(require("./base-service.class"), exports);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "pangea-server",
   "description": "",
-  "version": "3.3.28",
+  "version": "3.3.30",
   "files": [
     "dist"
   ],