@nocobase/database 0.20.0-alpha.1 → 0.20.0-alpha.10

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

@@ -278,11 +278,15 @@ const _EagerLoadingTree = class _EagerLoadingTree {
         }
         if (associationType == "BelongsToMany") {
           const foreignKeyValues = node.parent.instances.map((instance) => instance.get(association.sourceKey));
-          const pivotAssoc = new import_sequelize.HasOne(association.target, association.through.model, {
+          const hasOneOptions = {
             as: "_pivot_",
             foreignKey: association.otherKey,
             sourceKey: association.targetKey
-          });
+          };
+          if (association.through.scope) {
+            hasOneOptions.scope = association.through.scope;
+          }
+          const pivotAssoc = new import_sequelize.HasOne(association.target, association.through.model, hasOneOptions);
           instances = await node.model.findAll({
             transaction,
             attributes: node.attributes,

package/lib/fields/index.d.ts

@@ -19,6 +19,7 @@ import { TimeFieldOptions } from './time-field';
 import { UidFieldOptions } from './uid-field';
 import { UUIDFieldOptions } from './uuid-field';
 import { VirtualFieldOptions } from './virtual-field';
+import { NanoidFieldOptions } from './nanoid-field';
 export * from './array-field';
 export * from './belongs-to-field';
 export * from './belongs-to-many-field';
@@ -41,4 +42,5 @@ export * from './time-field';
 export * from './uid-field';
 export * from './uuid-field';
 export * from './virtual-field';
-export type FieldOptions = BaseFieldOptions | StringFieldOptions | IntegerFieldOptions | FloatFieldOptions | DecimalFieldOptions | DoubleFieldOptions | RealFieldOptions | JsonFieldOptions | JsonbFieldOptions | BooleanFieldOptions | RadioFieldOptions | SortFieldOptions | TextFieldOptions | VirtualFieldOptions | ArrayFieldOptions | SetFieldOptions | TimeFieldOptions | DateFieldOptions | UidFieldOptions | UUIDFieldOptions | PasswordFieldOptions | ContextFieldOptions | BelongsToFieldOptions | HasOneFieldOptions | HasManyFieldOptions | BelongsToManyFieldOptions;
+export * from './nanoid-field';
+export type FieldOptions = BaseFieldOptions | StringFieldOptions | IntegerFieldOptions | FloatFieldOptions | DecimalFieldOptions | DoubleFieldOptions | RealFieldOptions | JsonFieldOptions | JsonbFieldOptions | BooleanFieldOptions | RadioFieldOptions | SortFieldOptions | TextFieldOptions | VirtualFieldOptions | ArrayFieldOptions | SetFieldOptions | TimeFieldOptions | DateFieldOptions | UidFieldOptions | UUIDFieldOptions | NanoidFieldOptions | PasswordFieldOptions | ContextFieldOptions | BelongsToFieldOptions | HasOneFieldOptions | HasManyFieldOptions | BelongsToManyFieldOptions;

package/lib/fields/index.js

@@ -36,6 +36,7 @@ __reExport(fields_exports, require("./time-field"), module.exports);
 __reExport(fields_exports, require("./uid-field"), module.exports);
 __reExport(fields_exports, require("./uuid-field"), module.exports);
 __reExport(fields_exports, require("./virtual-field"), module.exports);
+__reExport(fields_exports, require("./nanoid-field"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ...require("./array-field"),
@@ -59,5 +60,6 @@ __reExport(fields_exports, require("./virtual-field"), module.exports);
   ...require("./time-field"),
   ...require("./uid-field"),
   ...require("./uuid-field"),
-  ...require("./virtual-field")
+  ...require("./virtual-field"),
+  ...require("./nanoid-field")
 });

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

@@ -0,0 +1,13 @@
+import { DataTypes } from 'sequelize';
+import { BaseColumnFieldOptions, Field } from './field';
+export declare class NanoidField extends Field {
+    get dataType(): DataTypes.StringDataTypeConstructor;
+    init(): void;
+    bind(): void;
+    unbind(): void;
+}
+export interface NanoidFieldOptions extends BaseColumnFieldOptions {
+    type: 'nanoid';
+    size?: number;
+    customAlphabet?: string;
+}

package/lib/fields/nanoid-field.js

@@ -0,0 +1,58 @@
+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 nanoid_field_exports = {};
+__export(nanoid_field_exports, {
+  NanoidField: () => NanoidField
+});
+module.exports = __toCommonJS(nanoid_field_exports);
+var import_sequelize = require("sequelize");
+var import_field = require("./field");
+var import_nanoid = require("nanoid");
+const DEFAULT_SIZE = 12;
+const _NanoidField = class _NanoidField extends import_field.Field {
+  get dataType() {
+    return import_sequelize.DataTypes.STRING;
+  }
+  init() {
+    const { name, size, customAlphabet: customAlphabetOptions } = this.options;
+    this.listener = async (instance) => {
+      const value = instance.get(name);
+      if (!value) {
+        const nanoIdFunc = customAlphabetOptions ? (0, import_nanoid.customAlphabet)(customAlphabetOptions) : import_nanoid.nanoid;
+        instance.set(name, nanoIdFunc(size || DEFAULT_SIZE));
+      }
+    };
+  }
+  bind() {
+    super.bind();
+    this.on("beforeCreate", this.listener);
+    this.on("beforeUpdate", this.listener);
+  }
+  unbind() {
+    super.unbind();
+    this.off("beforeCreate", this.listener);
+    this.off("beforeUpdate", this.listener);
+  }
+};
+__name(_NanoidField, "NanoidField");
+let NanoidField = _NanoidField;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  NanoidField
+});

package/lib/fields/sort-field.js

@@ -96,8 +96,16 @@ const _SortField = class _SortField extends import_field.Field {
       const quotedOrderField = queryInterface.quoteIdentifier(orderField);
       const sortColumnName = queryInterface.quoteIdentifier(this.collection.model.rawAttributes[this.name].field);
       let sql;
-      const whereClause = scopeKey2 && scopeValue ? `
-  WHERE ${queryInterface.quoteIdentifier(scopeKey2)} IN (${scopeValue.filter((v) => v !== null).map((v) => `'${v}'`).join(", ")})${scopeValue.includes(null) ? ` OR ${queryInterface.quoteIdentifier(scopeKey2)} IS NULL` : ""}` : "";
+      const whereClause = scopeKey2 && scopeValue ? (() => {
+        const filteredScopeValue = scopeValue.filter((v) => v !== null);
+        if (filteredScopeValue.length === 0) {
+          return "";
+        }
+        const initialClause = `
+  WHERE ${queryInterface.quoteIdentifier(scopeKey2)} IN (${filteredScopeValue.map((v) => `'${v}'`).join(", ")})`;
+        const nullCheck = scopeValue.includes(null) ? ` OR ${queryInterface.quoteIdentifier(scopeKey2)} IS NULL` : "";
+        return initialClause + nullCheck;
+      })() : "";
       if (this.collection.db.inDialect("postgres")) {
         sql = `
     UPDATE ${this.collection.quotedTableName()}

package/lib/operators/string.js

@@ -2,6 +2,7 @@ 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 });
@@ -22,83 +23,87 @@ __export(string_exports, {
 module.exports = __toCommonJS(string_exports);
 var import_sequelize = require("sequelize");
 var import_utils = require("./utils");
+function escapeLike(value) {
+  return value.replace(/[_%]/g, "\\$&");
+}
+__name(escapeLike, "escapeLike");
 var string_default = {
   $includes(value, ctx) {
     if (Array.isArray(value)) {
       const conditions = value.map((item) => ({
-        [(0, import_utils.isPg)(ctx) ? import_sequelize.Op.iLike : import_sequelize.Op.like]: `%${item}%`
+        [(0, import_utils.isPg)(ctx) ? import_sequelize.Op.iLike : import_sequelize.Op.like]: `%${escapeLike(item)}%`
       }));
       return {
         [import_sequelize.Op.or]: conditions
       };
     }
     return {
-      [(0, import_utils.isPg)(ctx) ? import_sequelize.Op.iLike : import_sequelize.Op.like]: `%${value}%`
+      [(0, import_utils.isPg)(ctx) ? import_sequelize.Op.iLike : import_sequelize.Op.like]: `%${escapeLike(value)}%`
     };
   },
   $notIncludes(value, ctx) {
     if (Array.isArray(value)) {
       const conditions = value.map((item) => ({
-        [(0, import_utils.isPg)(ctx) ? import_sequelize.Op.notILike : import_sequelize.Op.notLike]: `%${item}%`
+        [(0, import_utils.isPg)(ctx) ? import_sequelize.Op.notILike : import_sequelize.Op.notLike]: `%${escapeLike(item)}%`
       }));
       return {
         [import_sequelize.Op.and]: conditions
       };
     }
     return {
-      [(0, import_utils.isPg)(ctx) ? import_sequelize.Op.notILike : import_sequelize.Op.notLike]: `%${value}%`
+      [(0, import_utils.isPg)(ctx) ? import_sequelize.Op.notILike : import_sequelize.Op.notLike]: `%${escapeLike(value)}%`
     };
   },
   $startsWith(value, ctx) {
     if (Array.isArray(value)) {
       const conditions = value.map((item) => ({
-        [(0, import_utils.isPg)(ctx) ? import_sequelize.Op.iLike : import_sequelize.Op.like]: `${item}%`
+        [(0, import_utils.isPg)(ctx) ? import_sequelize.Op.iLike : import_sequelize.Op.like]: `${escapeLike(item)}%`
       }));
       return {
         [import_sequelize.Op.or]: conditions
       };
     }
     return {
-      [(0, import_utils.isPg)(ctx) ? import_sequelize.Op.iLike : import_sequelize.Op.like]: `${value}%`
+      [(0, import_utils.isPg)(ctx) ? import_sequelize.Op.iLike : import_sequelize.Op.like]: `${escapeLike(value)}%`
     };
   },
   $notStartsWith(value, ctx) {
     if (Array.isArray(value)) {
       const conditions = value.map((item) => ({
-        [(0, import_utils.isPg)(ctx) ? import_sequelize.Op.notILike : import_sequelize.Op.notLike]: `${item}%`
+        [(0, import_utils.isPg)(ctx) ? import_sequelize.Op.notILike : import_sequelize.Op.notLike]: `${escapeLike(item)}%`
       }));
       return {
         [import_sequelize.Op.and]: conditions
       };
     }
     return {
-      [(0, import_utils.isPg)(ctx) ? import_sequelize.Op.notILike : import_sequelize.Op.notLike]: `${value}%`
+      [(0, import_utils.isPg)(ctx) ? import_sequelize.Op.notILike : import_sequelize.Op.notLike]: `${escapeLike(value)}%`
     };
   },
   $endWith(value, ctx) {
     if (Array.isArray(value)) {
       const conditions = value.map((item) => ({
-        [(0, import_utils.isPg)(ctx) ? import_sequelize.Op.iLike : import_sequelize.Op.like]: `%${item}`
+        [(0, import_utils.isPg)(ctx) ? import_sequelize.Op.iLike : import_sequelize.Op.like]: `%${escapeLike(item)}`
       }));
       return {
         [import_sequelize.Op.or]: conditions
       };
     }
     return {
-      [(0, import_utils.isPg)(ctx) ? import_sequelize.Op.iLike : import_sequelize.Op.like]: `%${value}`
+      [(0, import_utils.isPg)(ctx) ? import_sequelize.Op.iLike : import_sequelize.Op.like]: `%${escapeLike(value)}`
     };
   },
   $notEndWith(value, ctx) {
     if (Array.isArray(value)) {
       const conditions = value.map((item) => ({
-        [(0, import_utils.isPg)(ctx) ? import_sequelize.Op.notILike : import_sequelize.Op.notLike]: `%${item}`
+        [(0, import_utils.isPg)(ctx) ? import_sequelize.Op.notILike : import_sequelize.Op.notLike]: `%${escapeLike(item)}`
       }));
       return {
         [import_sequelize.Op.and]: conditions
       };
     }
     return {
-      [(0, import_utils.isPg)(ctx) ? import_sequelize.Op.notILike : import_sequelize.Op.notLike]: `%${value}`
+      [(0, import_utils.isPg)(ctx) ? import_sequelize.Op.notILike : import_sequelize.Op.notLike]: `%${escapeLike(value)}`
     };
   }
 };

package/lib/query-interface/postgres-query-interface.js

@@ -134,9 +134,13 @@ const _PostgresQueryInterface = class _PostgresQueryInterface extends import_que
         const columnUsage = columnUsages.find((columnUsage2) => {
           let columnExprTable = column.expr.table;
           const from = ast[0].from;
-          const findAs = from.find((from2) => from2.as === columnExprTable);
-          if (findAs) {
-            columnExprTable = findAs.table;
+          if (columnExprTable === null && column.expr.type === "column_ref") {
+            columnExprTable = from[0].table;
+          } else {
+            const findAs = from.find((from2) => from2.as === columnExprTable);
+            if (findAs) {
+              columnExprTable = findAs.table;
+            }
           }
           return columnUsage2.column_name === column.expr.column && columnUsage2.table_name === columnExprTable;
         });

package/lib/view/field-type-map.d.ts

@@ -1,10 +1,10 @@
 declare const _default: {
     postgres: {
-        'character varying': string;
-        varchar: string;
+        'character varying': string[];
+        varchar: string[];
+        char: string[];
         character: string;
         text: string;
-        char: string;
         oid: string;
         name: string;
         smallint: string[];
@@ -34,10 +34,10 @@ declare const _default: {
         'smallint unsigned': string[];
         'tinyint unsigned': string[];
         'mediumint unsigned': string[];
-        char: string;
+        char: string[];
+        varchar: string[];
         date: string;
         time: string;
-        varchar: string;
         text: string;
         longtext: string;
         int: string[];
@@ -55,7 +55,7 @@ declare const _default: {
     };
     sqlite: {
         text: string;
-        varchar: string;
+        varchar: string[];
         integer: string;
         real: string;
         datetime: string;
@@ -72,10 +72,10 @@ declare const _default: {
         'smallint unsigned': string[];
         'tinyint unsigned': string[];
         'mediumint unsigned': string[];
-        char: string;
+        char: string[];
+        varchar: string[];
         date: string;
         time: string;
-        varchar: string;
         text: string;
         longtext: string;
         int: string[];

package/lib/view/field-type-map.js

@@ -21,11 +21,11 @@ __export(field_type_map_exports, {
 });
 module.exports = __toCommonJS(field_type_map_exports);
 const postgres = {
-  "character varying": "string",
-  varchar: "string",
+  "character varying": ["string", "uuid", "nanoid"],
+  varchar: ["string", "uuid", "nanoid"],
+  char: ["string", "uuid", "nanoid"],
   character: "string",
   text: "text",
-  char: "string",
   oid: "string",
   name: "string",
   smallint: ["integer", "sort"],
@@ -46,7 +46,7 @@ const postgres = {
   path: "json",
   polygon: "json",
   circle: "json",
-  uuid: "string"
+  uuid: "uuid"
 };
 const mysql = {
   smallint: ["integer", "boolean", "sort"],
@@ -55,10 +55,10 @@ const mysql = {
   "smallint unsigned": ["integer", "boolean", "sort"],
   "tinyint unsigned": ["integer", "boolean", "sort"],
   "mediumint unsigned": ["integer", "boolean", "sort"],
-  char: "string",
+  char: ["string", "uuid", "nanoid"],
+  varchar: ["string", "uuid", "nanoid"],
   date: "date",
   time: "time",
-  varchar: "string",
   text: "text",
   longtext: "text",
   int: ["integer", "sort"],
@@ -76,7 +76,7 @@ const mysql = {
 };
 const sqlite = {
   text: "text",
-  varchar: "string",
+  varchar: ["string", "uuid", "nanoid"],
   integer: "integer",
   real: "real",
   datetime: "date",

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/database",
-  "version": "0.20.0-alpha.1",
+  "version": "0.20.0-alpha.10",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "Apache-2.0",
   "dependencies": {
-    "@nocobase/logger": "0.20.0-alpha.1",
-    "@nocobase/utils": "0.20.0-alpha.1",
+    "@nocobase/logger": "0.20.0-alpha.10",
+    "@nocobase/utils": "0.20.0-alpha.10",
     "async-mutex": "^0.3.2",
     "chalk": "^4.1.1",
     "cron-parser": "4.4.0",
@@ -35,5 +35,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/database"
   },
-  "gitHead": "516c0b1470d77ff499f533ae6b57e4c084450ff5"
+  "gitHead": "453e0774dae21750e96c7ddd2019c8889a0314d6"
 }