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

package/lib/fields/blob-field.d.ts

@@ -0,0 +1,17 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+import { DataTypes } from 'sequelize';
+import { BaseColumnFieldOptions, Field } from './field';
+export declare class BlobField extends Field {
+    get dataType(): DataTypes.BlobDataTypeConstructor | DataTypes.BlobDataType;
+}
+export interface BlobFieldOptions extends BaseColumnFieldOptions {
+    type: 'blob';
+    length?: 'tiny' | 'medium' | 'long';
+}

package/lib/fields/blob-field.js

@@ -0,0 +1,48 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var blob_field_exports = {};
+__export(blob_field_exports, {
+  BlobField: () => BlobField
+});
+module.exports = __toCommonJS(blob_field_exports);
+var import_sequelize = require("sequelize");
+var import_field = require("./field");
+const _BlobField = class _BlobField extends import_field.Field {
+  get dataType() {
+    if (this.options.length) {
+      return import_sequelize.DataTypes.BLOB(this.options.length);
+    }
+    return import_sequelize.DataTypes.BLOB;
+  }
+};
+__name(_BlobField, "BlobField");
+let BlobField = _BlobField;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  BlobField
+});

package/lib/fields/context-field.d.ts

@@ -19,4 +19,10 @@ export interface ContextFieldOptions extends BaseColumnFieldOptions {
     dataIndex: string;
     dataType?: string;
     createOnly?: boolean;
+    /**
+     * applyIfUndefined:
+     * When true, the context value will be applied
+     * only if the field value is `undefined`.
+     */
+    applyIfUndefined?: boolean;
 }

package/lib/fields/context-field.js

@@ -50,9 +50,12 @@ const _ContextField = class _ContextField extends import_field.Field {
   }
   listener = /* @__PURE__ */ __name(async (instances, options) => {
     instances = Array.isArray(instances) ? instances : [instances];
-    const { name, dataIndex } = this.options;
+    const { name, dataIndex, applyIfUndefined } = this.options;
     const { context } = options;
     for (const instance of instances) {
+      if (applyIfUndefined && instance.get(name) !== void 0) {
+        continue;
+      }
       instance.set(name, import_lodash.default.get(context, dataIndex));
       instance.changed(name, true);
     }

package/lib/fields/index.d.ts

@@ -32,9 +32,11 @@ import { DateOnlyFieldOptions } from './date-only-field';
 import { DatetimeNoTzFieldOptions } from './datetime-no-tz-field';
 import { DatetimeTzFieldOptions } from './datetime-tz-field';
 import { SnowflakeIdFieldOptions } from './snowflake-id-field';
+import { BlobFieldOptions } from './blob-field';
 export * from './array-field';
 export * from './belongs-to-field';
 export * from './belongs-to-many-field';
+export * from './blob-field';
 export * from './boolean-field';
 export * from './context-field';
 export * from './date-field';
@@ -60,4 +62,4 @@ export * from './virtual-field';
 export * from './nanoid-field';
 export * from './unix-timestamp-field';
 export * from './snowflake-id-field';
-export type FieldOptions = BaseFieldOptions | StringFieldOptions | IntegerFieldOptions | FloatFieldOptions | DecimalFieldOptions | DoubleFieldOptions | RealFieldOptions | JsonFieldOptions | JsonbFieldOptions | BooleanFieldOptions | RadioFieldOptions | TextFieldOptions | VirtualFieldOptions | ArrayFieldOptions | SetFieldOptions | TimeFieldOptions | DateFieldOptions | DatetimeTzFieldOptions | DatetimeNoTzFieldOptions | DateOnlyFieldOptions | UnixTimestampFieldOptions | UidFieldOptions | UUIDFieldOptions | NanoidFieldOptions | PasswordFieldOptions | ContextFieldOptions | BelongsToFieldOptions | HasOneFieldOptions | HasManyFieldOptions | BelongsToManyFieldOptions | SnowflakeIdFieldOptions;
+export type FieldOptions = BaseFieldOptions | StringFieldOptions | IntegerFieldOptions | FloatFieldOptions | DecimalFieldOptions | DoubleFieldOptions | RealFieldOptions | JsonFieldOptions | JsonbFieldOptions | BlobFieldOptions | BooleanFieldOptions | RadioFieldOptions | TextFieldOptions | VirtualFieldOptions | ArrayFieldOptions | SetFieldOptions | TimeFieldOptions | DateFieldOptions | DatetimeTzFieldOptions | DatetimeNoTzFieldOptions | DateOnlyFieldOptions | UnixTimestampFieldOptions | UidFieldOptions | UUIDFieldOptions | NanoidFieldOptions | PasswordFieldOptions | ContextFieldOptions | BelongsToFieldOptions | HasOneFieldOptions | HasManyFieldOptions | BelongsToManyFieldOptions | SnowflakeIdFieldOptions;

package/lib/fields/index.js

@@ -26,6 +26,7 @@ module.exports = __toCommonJS(fields_exports);
 __reExport(fields_exports, require("./array-field"), module.exports);
 __reExport(fields_exports, require("./belongs-to-field"), module.exports);
 __reExport(fields_exports, require("./belongs-to-many-field"), module.exports);
+__reExport(fields_exports, require("./blob-field"), module.exports);
 __reExport(fields_exports, require("./boolean-field"), module.exports);
 __reExport(fields_exports, require("./context-field"), module.exports);
 __reExport(fields_exports, require("./date-field"), module.exports);
@@ -56,6 +57,7 @@ __reExport(fields_exports, require("./snowflake-id-field"), module.exports);
   ...require("./array-field"),
   ...require("./belongs-to-field"),
   ...require("./belongs-to-many-field"),
+  ...require("./blob-field"),
   ...require("./boolean-field"),
   ...require("./context-field"),
   ...require("./date-field"),

package/lib/fields/text-field.js

@@ -41,7 +41,7 @@ const _TextField = class _TextField extends import_field.Field {
   }
   init() {
     if (this.database.inDialect("mysql", "mariadb")) {
-      this.options.defaultValue = null;
+      this.options.defaultValue = void 0;
     }
   }
   additionalSequelizeOptions() {

package/lib/operators/empty.js

@@ -61,7 +61,7 @@ const findFilterFieldType = /* @__PURE__ */ __name((ctx) => {
     }
     model = modelAssociation.target;
   }
-  const collection = db.modelCollection.get(model);
+  const collection = db.getCollection(model.name);
   return collection.getField(fieldName);
 }, "findFilterFieldType");
 var empty_default = {

package/lib/options-parser.d.ts

@@ -45,6 +45,7 @@ export declare class OptionsParser {
         options?: object;
         raw?: string;
     };
+    protected normalizeAppends(appends: any): string[];
     protected parseAppends(appends: Appends, filterParams: any): any;
 }
 export {};

package/lib/options-parser.js

@@ -41,9 +41,9 @@ __export(options_parser_exports, {
 });
 module.exports = __toCommonJS(options_parser_exports);
 var import_lodash = __toESM(require("lodash"));
-var import_qs = __toESM(require("qs"));
 var import_sequelize = require("sequelize");
 var import_filter_parser = __toESM(require("./filter-parser"));
+var import_qs = __toESM(require("qs"));
 const debug = require("debug")("noco-database");
 const _OptionsParser = class _OptionsParser {
   options;
@@ -281,10 +281,26 @@ const _OptionsParser = class _OptionsParser {
     }
     return obj;
   }
+  normalizeAppends(appends) {
+    if (Array.isArray(appends)) {
+      return appends.filter((item) => typeof item === "string" && item.length > 0);
+    }
+    if (import_lodash.default.isPlainObject(appends)) {
+      return Object.values(appends).filter((item) => typeof item === "string" && item.length > 0);
+    }
+    if (typeof appends === "string" && appends.length > 0) {
+      return [appends];
+    }
+    return [];
+  }
   parseAppends(appends, filterParams) {
     if (!appends) return filterParams;
-    appends = import_lodash.default.sortBy(appends, (append) => append.split(".").length);
-    const setInclude = /* @__PURE__ */ __name((model, queryParams, append) => {
+    const appendList = this.normalizeAppends(appends);
+    if (!appendList.length) {
+      return filterParams;
+    }
+    const sortedAppends = import_lodash.default.sortBy(appendList, (append) => append.split(".").length);
+    const setInclude = /* @__PURE__ */ __name((model, queryParams, append, parentAs) => {
       var _a;
       const appendWithOptions = this.parseAppendWithOptions(append);
       append = appendWithOptions.name;
@@ -323,10 +339,21 @@ const _OptionsParser = class _OptionsParser {
         return;
       }
       if (existIncludeIndex == -1) {
-        queryParams["include"].push({
+        const association = associations[appendAssociation];
+        if (!association) {
+          throw new Error(`association ${appendAssociation} in ${model.name} not found`);
+        }
+        let includeOptions = {
           association: appendAssociation,
           options: appendWithOptions.options || {}
-        });
+        };
+        if (association.associationType === "BelongsToArray") {
+          includeOptions = {
+            ...includeOptions,
+            ...association.generateInclude(parentAs)
+          };
+        }
+        queryParams["include"].push(includeOptions);
         existIncludeIndex = queryParams["include"].length - 1;
       }
       if (lastLevel) {
@@ -362,14 +389,11 @@ const _OptionsParser = class _OptionsParser {
         if (appendWithOptions.raw) {
           nextAppend += appendWithOptions.raw;
         }
-        setInclude(
-          model.associations[queryParams["include"][existIncludeIndex].association].target,
-          queryParams["include"][existIncludeIndex],
-          nextAppend
-        );
+        const association = model.associations[queryParams["include"][existIncludeIndex].association];
+        setInclude(association.target, queryParams["include"][existIncludeIndex], nextAppend, association.as);
       }
     }, "setInclude");
-    for (const append of appends) {
+    for (const append of sortedAppends) {
       setInclude(this.model, filterParams, append);
     }
     debug("filter params: %o", filterParams);

package/lib/relation-repository/belongs-to-many-repository.js

@@ -140,6 +140,7 @@ const _BelongsToManyRepository = class _BelongsToManyRepository extends import_m
           [import_sequelize.Op.in]: ids
         }
       },
+      individualHooks: true,
       transaction: transaction2
     });
     return true;

package/lib/update-associations.js

@@ -219,16 +219,6 @@ async function updateSingleAssociation(model, key, value, options = {}) {
       );
     }
   }, "checkBelongsToForeignKeyValue");
-  if ((0, import_utils.isStringOrNumber)(value)) {
-    await model[setAccessor](value, { context, transaction });
-    return true;
-  }
-  if (value instanceof import_model.Model) {
-    await model[setAccessor](value, { context, transaction });
-    model.setDataValue(key, value);
-    return true;
-  }
-  const createAccessor = association.accessors.create;
   let dataKey;
   let M;
   if (association.associationType === "BelongsTo") {
@@ -238,6 +228,24 @@ async function updateSingleAssociation(model, key, value, options = {}) {
     M = association.target;
     dataKey = M.primaryKeyAttribute;
   }
+  if ((0, import_utils.isStringOrNumber)(value)) {
+    const instance2 = await M.findOne({
+      where: {
+        [dataKey]: value
+      },
+      transaction
+    });
+    if (instance2) {
+      await model[setAccessor](value, { context, transaction });
+    }
+    return true;
+  }
+  if (value instanceof import_model.Model) {
+    await model[setAccessor](value, { context, transaction });
+    model.setDataValue(key, value);
+    return true;
+  }
+  const createAccessor = association.accessors.create;
   if ((0, import_utils.isStringOrNumber)(value[dataKey])) {
     const instance2 = await M.findOne({
       where: {
@@ -311,7 +319,7 @@ async function updateMultipleAssociation(model, key, value, options = {}) {
     return;
   }
   value = import_lodash.default.castArray(value);
-  const setItems = [];
+  let setItems = [];
   const objectItems = [];
   for (const item of value) {
     if ((0, import_utils.isUndefinedOrNull)(item)) {
@@ -335,6 +343,25 @@ async function updateMultipleAssociation(model, key, value, options = {}) {
       objectItems.push(item);
     }
   }
+  if (setItems.length > 0) {
+    const TargetModel = association.target;
+    const pk2 = TargetModel.primaryKeyAttribute;
+    const targetKey2 = association.targetKey || association.options.targetKey || pk2;
+    const rawKeys = [];
+    const instanceItems = [];
+    for (const item of setItems) {
+      if (item instanceof import_model.Model) {
+        instanceItems.push(item);
+      } else if ((0, import_utils.isStringOrNumber)(item)) {
+        rawKeys.push(item);
+      }
+    }
+    const validInstances = rawKeys.length ? await TargetModel.findAll({
+      where: { [targetKey2]: rawKeys },
+      transaction
+    }) : [];
+    setItems = [...instanceItems, ...validInstances];
+  }
   await model[setAccessor](setItems, { transaction, context, individualHooks: true, validate: false });
   const newItems = [];
   const pk = association.target.primaryKeyAttribute;

package/lib/update-guard.js

@@ -69,7 +69,7 @@ const _UpdateGuard = class _UpdateGuard {
   }
   setAssociationKeysToBeUpdate(associationKeysToBeUpdate) {
     if (this.action == "create") {
-      this.associationKeysToBeUpdate = Object.keys(this.model.associations);
+      this.associationKeysToBeUpdate = (associationKeysToBeUpdate == null ? void 0 : associationKeysToBeUpdate.length) ? associationKeysToBeUpdate : Object.keys(this.model.associations);
     } else {
       this.associationKeysToBeUpdate = associationKeysToBeUpdate;
     }

package/lib/view/view-inference.js

@@ -40,7 +40,6 @@ __export(view_inference_exports, {
   ViewFieldInference: () => ViewFieldInference
 });
 module.exports = __toCommonJS(view_inference_exports);
-var import_mathjs = require("mathjs");
 var import_field_type_map = __toESM(require("./field-type-map"));
 const _ViewFieldInference = class _ViewFieldInference {
   static extractTypeFromDefinition(typeDefinition) {
@@ -137,7 +136,7 @@ const _ViewFieldInference = class _ViewFieldInference {
     }
     const queryType = this.extractTypeFromDefinition(options.type);
     const mappedType = fieldTypeMap[queryType];
-    if ((0, import_mathjs.isArray)(mappedType)) {
+    if (Array.isArray(mappedType)) {
       return {
         type: mappedType[0],
         possibleTypes: mappedType

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/database",
-  "version": "2.1.0-alpha.1",
+  "version": "2.1.0-alpha.3",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
   "dependencies": {
-    "@nocobase/logger": "2.1.0-alpha.1",
-    "@nocobase/utils": "2.1.0-alpha.1",
+    "@nocobase/logger": "2.1.0-alpha.3",
+    "@nocobase/utils": "2.1.0-alpha.3",
     "async-mutex": "^0.3.2",
     "chalk": "^4.1.1",
     "cron-parser": "4.4.0",
@@ -20,7 +20,6 @@
     "graphlib": "^2.1.8",
     "joi": "^17.13.3",
     "lodash": "^4.17.21",
-    "mathjs": "^10.6.1",
     "nanoid": "^3.3.11",
     "node-fetch": "^2.6.7",
     "node-sql-parser": "^4.18.0",
@@ -39,5 +38,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/database"
   },
-  "gitHead": "d27baf21569643d6fa83f882233f4e90eb5b89f1"
+  "gitHead": "b4d7448b938c1c3be8b2299ad32c6cbe012dd4ea"
 }