@tachybase/database 1.3.25 → 1.3.27

package/lib/collection.d.ts

@@ -1,4 +1,4 @@
-import { EventEmitter } from 'events';
+import { EventEmitter } from 'node:events';
 import { ModelOptions, ModelStatic, QueryInterfaceDropTableOptions, QueryInterfaceOptions, SyncOptions, Transactionable } from 'sequelize';
 import { BuiltInGroup } from './collection-group-manager';
 import { Database } from './database';

package/lib/collection.js

@@ -74,7 +74,7 @@ __export(collection_exports, {
   Collection: () => Collection
 });
 module.exports = __toCommonJS(collection_exports);
-var import_events = require("events");
+var import_node_events = require("node:events");
 var import_deepmerge = __toESM(require("deepmerge"));
 var import_lodash = __toESM(require("lodash"));
 var import_sequelize = require("sequelize");
@@ -107,7 +107,7 @@ function EnsureAtomicity(originalMethod, context) {
   return newMethod;
 }
 __name(EnsureAtomicity, "EnsureAtomicity");
-const _Collection = class _Collection extends (_a = import_events.EventEmitter, _setField_dec = [EnsureAtomicity], _a) {
+const _Collection = class _Collection extends (_a = import_node_events.EventEmitter, _setField_dec = [EnsureAtomicity], _a) {
   constructor(options, context) {
     super();
     __runInitializers(_init, 5, this);

package/lib/database.d.ts

@@ -1,4 +1,4 @@
-import { EventEmitter } from 'events';
+import { EventEmitter } from 'node:events';
 import { Logger, LoggerOptions } from '@tachybase/logger';
 import { AsyncEmitter } from '@tachybase/utils';
 import merge from 'deepmerge';

package/lib/database.js

@@ -36,8 +36,8 @@ __export(database_exports, {
   extendCollection: () => extendCollection
 });
 module.exports = __toCommonJS(database_exports);
-var import_events = require("events");
-var import_path = require("path");
+var import_node_events = require("node:events");
+var import_node_path = require("node:path");
 var import_logger = require("@tachybase/logger");
 var import_utils = require("@tachybase/utils");
 var import_chalk = __toESM(require("chalk"));
@@ -119,7 +119,7 @@ const _DatabaseVersion = class _DatabaseVersion {
 };
 __name(_DatabaseVersion, "DatabaseVersion");
 let DatabaseVersion = _DatabaseVersion;
-const _Database = class _Database extends import_events.EventEmitter {
+const _Database = class _Database extends import_node_events.EventEmitter {
   constructor(options) {
     super();
     this.fieldTypes = /* @__PURE__ */ new Map();
@@ -165,8 +165,8 @@ const _Database = class _Database extends import_events.EventEmitter {
       this._instanceId = options.instanceId;
     }
     if (options.storage && options.storage !== ":memory:") {
-      if (!(0, import_path.isAbsolute)(options.storage)) {
-        opts.storage = (0, import_path.resolve)(process.cwd(), options.storage);
+      if (!(0, import_node_path.isAbsolute)(options.storage)) {
+        opts.storage = (0, import_node_path.resolve)(process.cwd(), options.storage);
       }
     }
     if (options.dialect === "sqlite") {
@@ -370,7 +370,7 @@ const _Database = class _Database extends import_events.EventEmitter {
       ignore: ["**/*.d.ts"]
     });
     for (const file of files) {
-      let filename = (0, import_path.basename)(file);
+      let filename = (0, import_node_path.basename)(file);
       filename = filename.substring(0, filename.lastIndexOf(".")) || filename;
       this.migrations.add({
         name: namespace ? `${namespace}/${filename}` : filename,

package/lib/fields/password-field.js

@@ -31,7 +31,7 @@ __export(password_field_exports, {
   PasswordField: () => PasswordField
 });
 module.exports = __toCommonJS(password_field_exports);
-var import_crypto = __toESM(require("crypto"));
+var import_node_crypto = __toESM(require("node:crypto"));
 var import_sequelize = require("sequelize");
 var import_field = require("./field");
 const _PasswordField = class _PasswordField extends import_field.Field {
@@ -45,17 +45,17 @@ const _PasswordField = class _PasswordField extends import_field.Field {
     return new Promise((resolve, reject) => {
       const salt = hash.substring(0, randomBytesSize * 2);
       const key = hash.substring(randomBytesSize * 2);
-      import_crypto.default.scrypt(password, salt, length / 2 - randomBytesSize, (err, derivedKey) => {
+      import_node_crypto.default.scrypt(password, salt, length / 2 - randomBytesSize, (err, derivedKey) => {
         if (err) reject(err);
-        resolve(key == derivedKey.toString("hex"));
+        resolve(key === derivedKey.toString("hex"));
       });
     });
   }
   async hash(password) {
     const { length = 64, randomBytesSize = 8 } = this.options;
     return new Promise((resolve, reject) => {
-      const salt = import_crypto.default.randomBytes(randomBytesSize).toString("hex");
-      import_crypto.default.scrypt(password, salt, length / 2 - randomBytesSize, (err, derivedKey) => {
+      const salt = import_node_crypto.default.randomBytes(randomBytesSize).toString("hex");
+      import_node_crypto.default.scrypt(password, salt, length / 2 - randomBytesSize, (err, derivedKey) => {
         if (err) reject(err);
         resolve(salt + derivedKey.toString("hex"));
       });

package/lib/helpers.js

@@ -32,14 +32,14 @@ __export(helpers_exports, {
   parseDatabaseOptionsFromEnv: () => parseDatabaseOptionsFromEnv
 });
 module.exports = __toCommonJS(helpers_exports);
-var import_fs = __toESM(require("fs"));
+var import_node_fs = __toESM(require("node:fs"));
 var import_semver = __toESM(require("semver"));
 function getEnvValue(key, defaultValue) {
   return process.env[key] || defaultValue;
 }
 __name(getEnvValue, "getEnvValue");
 function isFilePath(value) {
-  return import_fs.default.promises.stat(value).then((stats) => stats.isFile()).catch((err) => {
+  return import_node_fs.default.promises.stat(value).then((stats) => stats.isFile()).catch((err) => {
     if (err.code === "ENOENT") {
       return false;
     }
@@ -54,7 +54,7 @@ function getValueOrFileContent(envVarName) {
   }
   return isFilePath(value).then((isFile) => {
     if (isFile) {
-      return import_fs.default.promises.readFile(value, "utf8");
+      return import_node_fs.default.promises.readFile(value, "utf8");
     }
     return value;
   }).catch((error) => {
@@ -83,7 +83,7 @@ function extractSSLOptionsFromEnv() {
 __name(extractSSLOptionsFromEnv, "extractSSLOptionsFromEnv");
 async function parseDatabaseOptionsFromEnv() {
   const databaseOptions = {
-    logging: process.env.DB_LOGGING == "on" ? customLogger : false,
+    logging: process.env.DB_LOGGING === "on" ? customLogger : false,
     dialect: process.env.DB_DIALECT,
     storage: process.env.DB_STORAGE,
     username: process.env.DB_USER,

package/lib/mock-database.js

@@ -33,7 +33,7 @@ __export(mock_database_exports, {
   mockDatabase: () => mockDatabase
 });
 module.exports = __toCommonJS(mock_database_exports);
-var import_path = __toESM(require("path"));
+var import_node_path = __toESM(require("node:path"));
 var import_utils = require("@tachybase/utils");
 var import_nanoid = require("nanoid");
 var import_node_fetch = __toESM(require("node-fetch"));
@@ -68,7 +68,7 @@ function getConfigByEnv() {
     schema: process.env.DB_SCHEMA !== "public" ? process.env.DB_SCHEMA : void 0,
     dialectOptions: {}
   };
-  if (process.env.DB_DIALECT == "postgres") {
+  if (process.env.DB_DIALECT === "postgres") {
     options.dialectOptions["application_name"] = "tachybase.main";
   }
   return options;
@@ -101,7 +101,7 @@ function mockDatabase(options = {}) {
       const instanceId = `d_${nanoid()}`;
       const databaseName = `${process.env["DB_TEST_PREFIX"]}_${instanceId}`;
       if (dbOptions.dialect === "sqlite") {
-        dbOptions.storage = import_path.default.resolve(import_path.default.dirname(dbOptions.storage), databaseName);
+        dbOptions.storage = import_node_path.default.resolve(import_node_path.default.dirname(dbOptions.storage), databaseName);
       } else {
         dbOptions.database = databaseName;
       }

package/lib/repositories/tree-repository/adjacency-list-repository.js

@@ -55,7 +55,7 @@ const _AdjacencyListRepository = class _AdjacencyListRepository extends import_r
   }
   async update(options) {
     return super.update({
-      ...options || {},
+      ...options,
       addIndex: false
     });
   }
@@ -77,7 +77,7 @@ const _AdjacencyListRepository = class _AdjacencyListRepository extends import_r
     const foreignKey = treeParentField.options.foreignKey;
     const childrenKey = ((_a = collection.treeChildrenField) == null ? void 0 : _a.name) ?? "children";
     const parentIds = parentNodes.map((node) => node[primaryKey]);
-    if (parentIds.length == 0) {
+    if (parentIds.length === 0) {
       this.database.logger.warn("parentIds is empty");
       return parentNodes;
     }

package/lib/sql-parser/postgres.js

@@ -1651,7 +1651,7 @@ function peg$parse(input, options) {
       column: c,
       definition: d,
       resource: "column",
-      ...cdo || {}
+      ...cdo
     };
   }, "peg$f72");
   var peg$f73 = /* @__PURE__ */ __name(function(n, df) {
@@ -2564,7 +2564,7 @@ function peg$parse(input, options) {
       distinct: d,
       columns: c,
       into: {
-        ...ci || fi || li || {},
+        ...ci || fi || li,
         position: ci && "column" || fi && "from" || li && "end"
       },
       from: f,

package/lib/utils.js

@@ -36,11 +36,11 @@ __export(utils_exports, {
   snakeCase: () => snakeCase
 });
 module.exports = __toCommonJS(utils_exports);
-var import_crypto = __toESM(require("crypto"));
+var import_node_crypto = __toESM(require("node:crypto"));
 var import_lodash = __toESM(require("lodash"));
 var import_identifier_error = require("./errors/identifier-error");
 function md5(value) {
-  return import_crypto.default.createHash("md5").update(value).digest("hex");
+  return import_node_crypto.default.createHash("md5").update(value).digest("hex");
 }
 __name(md5, "md5");
 const MAX_IDENTIFIER_LENGTH = 63;

package/lib/value-parsers/to-many-value-parser.js

@@ -21,7 +21,7 @@ __export(to_many_value_parser_exports, {
   ToManyValueParser: () => ToManyValueParser
 });
 module.exports = __toCommonJS(to_many_value_parser_exports);
-var import_path = require("path");
+var import_node_path = require("node:path");
 var import_base_value_parser = require("./base-value-parser");
 const _ToManyValueParser = class _ToManyValueParser extends import_base_value_parser.BaseValueParser {
   constructor() {
@@ -34,9 +34,9 @@ const _ToManyValueParser = class _ToManyValueParser extends import_base_value_pa
   async setAttachments(value) {
     this.value = this.toArr(value).map((url) => {
       return {
-        title: (0, import_path.basename)(url),
-        extname: (0, import_path.extname)(url),
-        filename: (0, import_path.basename)(url),
+        title: (0, import_node_path.basename)(url),
+        extname: (0, import_node_path.extname)(url),
+        filename: (0, import_node_path.basename)(url),
         url
       };
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tachybase/database",
-  "version": "1.3.25",
+  "version": "1.3.27",
   "description": "",
   "license": "Apache-2.0",
   "main": "./lib/index.js",
@@ -25,15 +25,12 @@
     "semver": "7.7.2",
     "sequelize": "^6.37.5",
     "umzug": "^3.8.2",
-    "@tachybase/logger": "1.3.25",
-    "@tachybase/utils": "1.3.25"
+    "@tachybase/utils": "1.3.27",
+    "@tachybase/logger": "1.3.27"
   },
   "devDependencies": {
     "@types/flat": "^5.0.5",
     "@types/glob": "^7.2.0",
     "@types/lodash": "^4.17.20"
-  },
-  "scripts": {
-    "build": "tachybase-build --no-dts @tachybase/database"
   }
 }