@tachybase/database 1.3.39 → 1.3.41

package/lib/database.d.ts

@@ -72,13 +72,13 @@ export declare const DialectVersionAccessors: {
     };
     postgres: {
         sql: string;
-        get: (v: string) => any;
+        get: (v: string) => string;
     };
 };
 declare class DatabaseVersion {
     db: Database;
     constructor(db: Database);
-    satisfies(versions: any): Promise<any>;
+    satisfies(versions: any): Promise<boolean>;
 }
 declare module 'sequelize' {
     interface Sequelize {

package/lib/fields/sort-field.js

@@ -32,7 +32,7 @@ const _SortField = class _SortField extends import_field.Field {
     this.setSortValue = /* @__PURE__ */ __name(async (instance, options) => {
       const { name, scopeKey } = this.options;
       const { model } = this.context.collection;
-      if ((0, import_lodash.isNumber)(instance.get(name)) && instance._previousDataValues[scopeKey] == instance[scopeKey]) {
+      if ((0, import_lodash.isNumber)(instance.get(name)) && instance._previousDataValues[scopeKey] === instance[scopeKey]) {
         return;
       }
       const where = {};
@@ -50,7 +50,7 @@ const _SortField = class _SortField extends import_field.Field {
     }, "setSortValue");
     this.onScopeChange = /* @__PURE__ */ __name(async (instance, options) => {
       const { scopeKey } = this.options;
-      if (scopeKey && !instance.isNewRecord && instance._previousDataValues[scopeKey] != instance[scopeKey]) {
+      if (scopeKey && !instance.isNewRecord && instance._previousDataValues[scopeKey] !== instance[scopeKey]) {
         await this.setSortValue(instance, options);
       }
     }, "onScopeChange");

package/lib/filter-parser.js

@@ -49,7 +49,7 @@ const _FilterParser = class _FilterParser {
       for (const key of Object.keys(filter)) {
         if (key.endsWith(".$exists") || key.endsWith(".$notExists")) {
           const keyArr = key.split(".");
-          if (keyArr[keyArr.length - 2] == "id") {
+          if (keyArr[keyArr.length - 2] === "id") {
             continue;
           }
           keyArr.splice(keyArr.length - 1, 0, "id");
@@ -84,7 +84,7 @@ const _FilterParser = class _FilterParser {
       if (skipPrefix && key.startsWith(skipPrefix)) {
         continue;
       }
-      if ((key == "$or" || key == "$and") && Array.isArray(value) && value.length == 0) {
+      if ((key === "$or" || key === "$and") && Array.isArray(value) && value.length === 0) {
         continue;
       }
       debug('handle filter key "%s: "%s"', key, value);

package/lib/inherited-sync-runner.js

@@ -39,7 +39,7 @@ const _InheritedSyncRunner = class _InheritedSyncRunner {
     const db = inheritedCollection.context.database;
     const dialect = db.sequelize.getDialect();
     const queryInterface = db.sequelize.getQueryInterface();
-    if (dialect != "postgres") {
+    if (dialect !== "postgres") {
       throw new Error("Inherit model is only supported on postgres");
     }
     const parents = inheritedCollection.parents;
@@ -119,7 +119,7 @@ const _InheritedSyncRunner = class _InheritedSyncRunner {
           const idColumnQuery = await queryInterface.sequelize.query(idColumnSql, {
             transaction
           });
-          if (idColumnQuery[0].length == 0) {
+          if (idColumnQuery[0].length === 0) {
             continue;
           }
           await queryInterface.sequelize.query(

package/lib/relation-repository/multiple-relation-repository.js

@@ -156,7 +156,7 @@ const _MultipleRelationRepository = class _MultipleRelationRepository extends (_
   async findOne(options) {
     const transaction2 = await this.getTransaction(options, false);
     const rows = await this.find({ ...options, limit: 1, transaction: transaction2 });
-    return rows.length == 1 ? rows[0] : null;
+    return rows.length === 1 ? rows[0] : null;
   }
   async remove(options) {
     const transaction2 = await this.getTransaction(options);

package/lib/sql-parser/postgres.js

@@ -3091,7 +3091,7 @@ function peg$parse(input, options) {
       let table = t && t.table || null;
       if (Array.isArray(v)) {
         v.forEach((row, idx) => {
-          if (row.value.length != c.length) {
+          if (row.value.length !== c.length) {
             throw new Error(`Error: column count doesn't match value count at row ${idx + 1}`);
           }
         });

package/lib/sync-runner.js

@@ -82,17 +82,17 @@ const _SyncRunner = class _SyncRunner {
     }
     try {
       const columnsBePrimaryKey = Object.keys(columns).filter((key) => {
-        return columns[key].primaryKey == true;
+        return columns[key].primaryKey === true;
       }).sort();
       const columnsWillBePrimaryKey = Object.keys(this.rawAttributes).filter((key) => {
-        return this.rawAttributes[key].primaryKey == true;
+        return this.rawAttributes[key].primaryKey === true;
       }).map((key) => {
         return this.rawAttributes[key].field;
       }).sort();
-      if (columnsWillBePrimaryKey.length == 0) {
+      if (columnsWillBePrimaryKey.length === 0) {
         return;
       }
-      if (JSON.stringify(columnsBePrimaryKey) != JSON.stringify(columnsWillBePrimaryKey)) {
+      if (JSON.stringify(columnsBePrimaryKey) !== JSON.stringify(columnsWillBePrimaryKey)) {
         await this.queryInterface.addConstraint(this.tableName, {
           type: "primary key",
           fields: columnsWillBePrimaryKey,
@@ -124,7 +124,7 @@ const _SyncRunner = class _SyncRunner {
       const columnDefaultValue = columns[columnName].defaultValue;
       if (columnDefaultValue === null && attributeDefaultValue === void 0) continue;
       if (columnDefaultValue === "NULL" && attributeDefaultValue === null) continue;
-      if (columnDefaultValue != attributeDefaultValue) {
+      if (columnDefaultValue !== attributeDefaultValue) {
         const changeAttribute = {
           ...currentAttribute,
           defaultValue: attributeDefaultValue
@@ -153,10 +153,10 @@ const _SyncRunner = class _SyncRunner {
     const existsIndexes = await this.queryInterface.showIndex(this.collection.getTableNameWithSchema(), options);
     const existsUniqueIndexes = existsIndexes.filter((index) => index.unique);
     const uniqueAttributes = Object.keys(this.rawAttributes).filter((key) => {
-      return this.rawAttributes[key].unique == true;
+      return this.rawAttributes[key].unique === true;
     });
     for (const existUniqueIndex of existsUniqueIndexes) {
-      const isSingleField = existUniqueIndex.fields.length == 1;
+      const isSingleField = existUniqueIndex.fields.length === 1;
       if (!isSingleField) continue;
       const columnName = existUniqueIndex.fields[0].attribute;
       const currentAttribute = this.findAttributeByColumnName(columnName);
@@ -180,7 +180,7 @@ const _SyncRunner = class _SyncRunner {
     }
     for (const uniqueAttribute of uniqueAttributes) {
       const indexExists = existsUniqueIndexes.find((index) => {
-        return index.fields.length == 1 && index.fields[0].attribute == this.rawAttributes[uniqueAttribute].field;
+        return index.fields.length === 1 && index.fields[0].attribute === this.rawAttributes[uniqueAttribute].field;
       });
       if (!indexExists) {
         await this.queryInterface.addIndex(this.tableName, [this.rawAttributes[uniqueAttribute].field], {
@@ -226,7 +226,7 @@ const _SyncRunner = class _SyncRunner {
   }
   findAttributeByColumnName(columnName) {
     return Object.values(this.rawAttributes).find((attribute) => {
-      return attribute.field == columnName;
+      return attribute.field === columnName;
     });
   }
   async performSync(options) {
@@ -259,7 +259,7 @@ const _SyncRunner = class _SyncRunner {
   }
   async handleSchema(options) {
     const _schema = this.model._schema;
-    if (_schema && _schema != "public") {
+    if (_schema && _schema !== "public") {
       await this.sequelize.query(`CREATE SCHEMA IF NOT EXISTS "${_schema}";`, {
         raw: true,
         transaction: options == null ? void 0 : options.transaction

package/lib/update-guard.js

@@ -53,7 +53,7 @@ const _UpdateGuard = class _UpdateGuard {
     this.model = model;
   }
   setAssociationKeysToBeUpdate(associationKeysToBeUpdate) {
-    if (this.action == "create") {
+    if (this.action === "create") {
       this.associationKeysToBeUpdate = Object.keys(this.model.associations);
     } else {
       this.associationKeysToBeUpdate = associationKeysToBeUpdate;
@@ -112,7 +112,7 @@ const _UpdateGuard = class _UpdateGuard {
     const listOfAssociation = /* @__PURE__ */ __name((list, association) => {
       if (list) {
         list = list.filter((whiteListKey) => whiteListKey.startsWith(`${association}.`)).map((whiteListKey) => whiteListKey.replace(`${association}.`, ""));
-        if (list.length == 0) {
+        if (list.length === 0) {
           return void 0;
         }
         return list;
@@ -130,7 +130,7 @@ const _UpdateGuard = class _UpdateGuard {
         if (associationKeysToBeUpdate.includes(association)) {
           return value;
         }
-        const associationKeyName = associationObj.associationType == "BelongsTo" || associationObj.associationType == "HasOne" ? associationObj.targetKey : associationObj.target.primaryKeyAttribute;
+        const associationKeyName = associationObj.associationType === "BelongsTo" || associationObj.associationType === "HasOne" ? associationObj.targetKey : associationObj.target.primaryKeyAttribute;
         if (value[associationKeyName]) {
           return import_lodash.default.pick(value, [associationKeyName, ...Object.keys(associationObj.target.associations)]);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tachybase/database",
-  "version": "1.3.39",
+  "version": "1.3.41",
   "description": "",
   "license": "Apache-2.0",
   "main": "./lib/index.js",
@@ -23,12 +23,13 @@
     "semver": "7.7.2",
     "sequelize": "^6.37.5",
     "umzug": "^3.8.2",
-    "@tachybase/utils": "1.3.39",
-    "@tachybase/logger": "1.3.39"
+    "@tachybase/logger": "1.3.41",
+    "@tachybase/utils": "1.3.41"
   },
   "devDependencies": {
     "@types/flat": "^5.0.5",
     "@types/glob": "^7.2.0",
-    "@types/lodash": "^4.17.20"
+    "@types/lodash": "^4.17.20",
+    "@types/semver": "7.7.0"
   }
 }