@nocobase/database 0.18.0-alpha.1 → 0.18.0-alpha.3

package/lib/database.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import { Logger } from '@nocobase/logger';
+import { Logger, LoggerOptions } from '@nocobase/logger';
 import { AsyncEmitter } from '@nocobase/utils';
 import merge from 'deepmerge';
 import { EventEmitter } from 'events';
@@ -36,6 +36,7 @@ export interface IDatabaseOptions extends Options {
     migrator?: any;
     usingBigIntForId?: boolean;
     underscored?: boolean;
+    logger?: LoggerOptions | Logger;
     customHooks?: any;
     instanceId?: string;
 }
@@ -114,7 +115,6 @@ export declare class Database extends EventEmitter implements AsyncEmitter {
     get instanceId(): string;
     registerCollectionType(): void;
     setContext(context: any): void;
-    setLogger(logger: Logger): void;
     sequelizeOptions(options: any): any;
     initListener(): void;
     addMigration(item: MigrationItem): void;

package/lib/database.js

@@ -36,6 +36,7 @@ __export(database_exports, {
   extendCollection: () => extendCollection
 });
 module.exports = __toCommonJS(database_exports);
+var import_logger = require("@nocobase/logger");
 var import_utils = require("@nocobase/utils");
 var import_events = require("events");
 var import_exponential_backoff = require("exponential-backoff");
@@ -157,6 +158,15 @@ const _Database = class _Database extends import_events.EventEmitter {
       },
       ...import_lodash.default.clone(options)
     };
+    if (options.logger) {
+      if (typeof options.logger["log"] === "function") {
+        this.logger = options.logger;
+      } else {
+        this.logger = (0, import_logger.createLogger)(options.logger);
+      }
+    } else {
+      this.logger = (0, import_logger.createConsoleLogger)();
+    }
     if (!options.instanceId) {
       this._instanceId = (0, import_nanoid.nanoid)();
     } else {
@@ -260,9 +270,6 @@ const _Database = class _Database extends import_events.EventEmitter {
   setContext(context) {
     this.context = context;
   }
-  setLogger(logger) {
-    this.logger = logger;
-  }
   sequelizeOptions(options) {
     if (options.dialect === "postgres") {
       if (!options.hooks) {
@@ -572,11 +579,13 @@ const _Database = class _Database extends import_events.EventEmitter {
     const authenticate = /* @__PURE__ */ __name(async () => {
       try {
         await this.sequelize.authenticate(others);
-        console.log("Connection has been established successfully.");
+        this.logger.info("Connection has been established successfully.", { method: "auth" });
       } catch (error) {
-        console.log(`Attempt ${attemptNumber}/${retry}: Unable to connect to the database: ${error.message}`);
+        this.logger.warn(`Attempt ${attemptNumber}/${retry}: Unable to connect to the database: ${error.message}`, {
+          method: "auth"
+        });
         const nextDelay = startingDelay * Math.pow(timeMultiple, attemptNumber - 1);
-        console.log(`Will retry in ${nextDelay}ms...`);
+        this.logger.warn(`Will retry in ${nextDelay}ms...`, { method: "auth" });
         attemptNumber++;
         throw error;
       }

package/lib/eager-loading/eager-loading-tree.js

@@ -147,13 +147,22 @@ const _EagerLoadingTree = class _EagerLoadingTree {
           var _a2, _b;
           return Object.keys(include.where || {}).length > 0 || ((_b = JSON.stringify((_a2 = this.rootQueryOptions) == null ? void 0 : _a2.filter)) == null ? void 0 : _b.includes(include.association));
         });
-        const belongsToAssociationsOnly = includeForFilter.every((include) => {
-          const association = node.model.associations[include.association];
-          if (!association) {
-            return false;
+        const isBelongsToAssociationOnly = /* @__PURE__ */ __name((includes, model) => {
+          for (const include of includes) {
+            const association = model.associations[include.association];
+            if (!association) {
+              return false;
+            }
+            if (association.associationType != "BelongsTo") {
+              return false;
+            }
+            if (!isBelongsToAssociationOnly(include.include || [], association.target)) {
+              return false;
+            }
           }
-          return association.associationType == "BelongsTo";
-        });
+          return true;
+        }, "isBelongsToAssociationOnly");
+        const belongsToAssociationsOnly = isBelongsToAssociationOnly(includeForFilter, node.model);
         if (belongsToAssociationsOnly) {
           instances = await node.model.findAll({
             ...this.rootQueryOptions,

package/lib/operators/array.js

@@ -1,6 +1,8 @@
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 var __export = (target, all) => {
@@ -15,12 +17,21 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var array_exports = {};
 __export(array_exports, {
   default: () => array_default
 });
 module.exports = __toCommonJS(array_exports);
+var import_lodash = __toESM(require("lodash"));
 var import_sequelize = require("sequelize");
 var import_utils = require("./utils");
 const getFieldName = /* @__PURE__ */ __name((ctx) => {
@@ -89,6 +100,7 @@ var array_default = {
   },
   $anyOf(value, ctx) {
     const fieldName = getFieldName(ctx);
+    value = import_lodash.default.castArray(value);
     if ((0, import_utils.isPg)(ctx)) {
       const name = ctx.fullName === fieldName ? `"${ctx.model.name}"."${fieldName}"` : `"${fieldName}"`;
       return import_sequelize.Sequelize.literal(
@@ -108,6 +120,7 @@ var array_default = {
   },
   $noneOf(value, ctx) {
     let where;
+    value = import_lodash.default.castArray(value);
     if ((0, import_utils.isPg)(ctx)) {
       const fieldName = getFieldName(ctx);
       const name = ctx.fullName === fieldName ? `"${ctx.model.name}"."${fieldName}"` : `"${fieldName}"`;

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/database",
-  "version": "0.18.0-alpha.1",
+  "version": "0.18.0-alpha.3",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "Apache-2.0",
   "dependencies": {
-    "@nocobase/logger": "0.18.0-alpha.1",
-    "@nocobase/utils": "0.18.0-alpha.1",
+    "@nocobase/logger": "0.18.0-alpha.3",
+    "@nocobase/utils": "0.18.0-alpha.3",
     "async-mutex": "^0.3.2",
     "chalk": "^4.1.1",
     "cron-parser": "4.4.0",
@@ -18,6 +18,7 @@
     "flat": "^5.0.2",
     "glob": "^7.1.6",
     "graphlib": "^2.1.8",
+    "lodash": "^4.17.21",
     "mathjs": "^10.6.1",
     "nanoid": "^3.3.6",
     "qs": "^6.11.2",
@@ -34,5 +35,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/database"
   },
-  "gitHead": "0f5f1c0a37dc397a9dc4c8eec0c4ec20fd8107b0"
+  "gitHead": "3d34bcd0e3aca0f485e4a2425b87bc971526634d"
 }