@koishijs/plugin-database-mongo 3.0.0-beta.4 → 3.0.0-rc.0

package/lib/index.d.ts

@@ -1,9 +1,8 @@
+/// <reference types="koishi/lib" />
 /// <reference types="node" />
-import { TableType, Query, Eval, Context, Channel, Database, User, Tables as KoishiTables, Schema } from 'koishi';
-import { MongoClient, Db, Collection } from 'mongodb';
+import { MongoClient, Db } from 'mongodb';
+import { Context, Database, Tables, Schema, Query } from 'koishi';
 import { URLSearchParams } from 'url';
-export function createFilter<T extends TableType>(name: T, query: Query<T>): {};
-export function transformEval(expr: Eval.Numeric | Eval.Aggregation): any;
 declare module 'koishi' {
     interface Database {
         mongo: MongoDatabase;
@@ -12,22 +11,39 @@ declare module 'koishi' {
         'database-mongo': typeof import('.');
     }
 }
-type TableType = keyof Tables;
-export interface Tables extends KoishiTables {
-}
+declare type TableType = keyof Tables;
 declare class MongoDatabase extends Database {
     ctx: Context;
     private config;
     client: MongoClient;
     db: Db;
     mongo: this;
-    user: Collection<User>;
-    channel: Collection<Channel>;
+    private tasks;
     constructor(ctx: Context, config: MongoDatabase.Config);
+    private connectionStringFromConfig;
     start(): Promise<void>;
-    collection<T extends TableType>(name: T): Collection<Tables[T]>;
     stop(): Promise<void>;
-    connectionStringFromConfig(): string;
+    /** synchronize table schema */
+    private _syncTable;
+    private _createFilter;
+    drop(): Promise<void>;
+    private _collStats;
+    stats(): Promise<{
+        size: any;
+        tables: {
+            [k: string]: {
+                readonly count: number;
+                readonly size: number;
+            };
+        };
+    }>;
+    get(name: TableType, query: Query, modifier: Query.Modifier): Promise<any>;
+    set(name: TableType, query: Query, update: {}): Promise<void>;
+    remove(name: TableType, query: Query): Promise<void>;
+    private queue;
+    create(name: TableType, data: any): Promise<any>;
+    upsert(name: TableType, data: any[], keys: string | string[]): Promise<void>;
+    aggregate(name: TableType, fields: {}, query: Query): Promise<any>;
 }
 declare namespace MongoDatabase {
     const name = "database-mongo";
@@ -39,11 +55,10 @@ declare namespace MongoDatabase {
         port?: number;
         /** database name */
         database?: string;
-        prefix?: string;
         /** default auth database */
         authDatabase?: string;
         connectOptions?: ConstructorParameters<typeof URLSearchParams>[0];
-        /** connection string (will overwrite all configs except 'name' and 'prefix') */
+        /** connection string (will overwrite all configs except 'name') */
         uri?: string;
     }
     const Config: Schema<{
@@ -53,7 +68,6 @@ declare namespace MongoDatabase {
         username?: string;
         password?: string;
         database?: string;
-        prefix?: string;
     } & {
         [x: string]: any;
     }, {
@@ -63,7 +77,6 @@ declare namespace MongoDatabase {
         username?: string;
         password?: string;
         database?: string;
-        prefix?: string;
     } & {
         [x: string]: any;
     }>;

package/lib/index.js

@@ -44,6 +44,7 @@ __export(exports, {
 var import_mongodb = __toModule(require("mongodb"));
 var import_koishi2 = __toModule(require("koishi"));
 var import_url = __toModule(require("url"));
+var import_orm_utils = __toModule(require("@koishijs/orm-utils"));
 
 // plugins/database/mongo/src/utils.ts
 var import_koishi = __toModule(require("koishi"));
@@ -87,7 +88,7 @@ function transformQuery(query) {
         return { $nor: [{}] };
       }
     } else if (key === "$not") {
-      filter["$nor"] = [transformQuery(value)];
+      filter.$nor = [transformQuery(value)];
     } else if (key === "$expr") {
       filter[key] = transformEval(value);
     } else {
@@ -97,23 +98,46 @@ function transformQuery(query) {
   return filter;
 }
 __name(transformQuery, "transformQuery");
-function createFilter(name, query) {
-  return transformQuery(import_koishi.Query.resolve(name, query));
+function transformEvalExpr(expr, aggrs) {
+  return (0, import_koishi.valueMap)(expr, (value, key) => {
+    if (Array.isArray(value)) {
+      return value.map((val) => transformEval(val, aggrs));
+    } else {
+      return transformEval(value, aggrs);
+    }
+  });
 }
-__name(createFilter, "createFilter");
-function transformEval(expr) {
+__name(transformEvalExpr, "transformEvalExpr");
+function transformAggr(expr) {
   if (typeof expr === "string") {
     return "$" + expr;
-  } else if (typeof expr === "number" || typeof expr === "boolean") {
+  }
+  return transformEvalExpr(expr);
+}
+__name(transformAggr, "transformAggr");
+var aggrKeys = ["$sum", "$avg", "$min", "$max", "$count"];
+function transformEval(expr, aggrs) {
+  if (typeof expr === "number" || typeof expr === "string" || typeof expr === "boolean") {
     return expr;
+  } else if (expr.$) {
+    return "$" + expr.$;
   }
-  return (0, import_koishi.valueMap)(expr, (value) => {
-    if (Array.isArray(value)) {
-      return value.map(transformEval);
+  for (const key of aggrKeys) {
+    if (!expr[key])
+      continue;
+    const value = transformAggr(expr[key]);
+    const $ = "temp" + aggrs.length;
+    if (key === "$count") {
+      aggrs.push([
+        { $group: { _id: value } },
+        { $group: { _id: null, [$]: { $count: {} } } }
+      ]);
     } else {
-      return transformEval(value);
+      aggrs.push([{ $group: { _id: null, [$]: { [key]: value } } }]);
     }
-  });
+    return { $ };
+  }
+  return transformEvalExpr(expr, aggrs);
 }
 __name(transformEval, "transformEval");
 
@@ -124,30 +148,7 @@ var MongoDatabase = class extends import_koishi2.Database {
     this.ctx = ctx;
     this.config = config;
     this.mongo = this;
-  }
-  async start() {
-    const mongourl = this.config.uri || this.connectionStringFromConfig();
-    this.client = await import_mongodb.MongoClient.connect(mongourl, { useNewUrlParser: true, useUnifiedTopology: true });
-    this.db = this.client.db(this.config.database);
-    if (this.config.prefix) {
-      this.db.collection = ((func, prefix) => /* @__PURE__ */ __name(function collection(name) {
-        return func(`${prefix}.${name}`);
-      }, "collection"))(this.db.collection.bind(this.db), this.config.prefix);
-    }
-    this.user = this.db.collection("user");
-    this.channel = this.db.collection("channel");
-    await this.channel.createIndex({ type: 1, pid: 1 }, { unique: true });
-    for (const name in import_koishi2.Tables.config) {
-      const { primary } = import_koishi2.Tables.config[name];
-      const col = this.db.collection(name);
-      await col.createIndex(Object.fromEntries((0, import_koishi2.makeArray)(primary).map((K) => [K, 1])), { unique: true });
-    }
-  }
-  collection(name) {
-    return this.db.collection(name);
-  }
-  stop() {
-    return this.client.close();
+    this.tasks = {};
   }
   connectionStringFromConfig() {
     const { authDatabase, connectOptions, host, database: name, password, port, protocol, username } = this.config;
@@ -161,87 +162,170 @@ var MongoDatabase = class extends import_koishi2.Database {
     }
     return mongourl;
   }
-};
-__name(MongoDatabase, "MongoDatabase");
-(function(MongoDatabase2) {
-  MongoDatabase2.name = "database-mongo";
-  MongoDatabase2.Config = import_koishi2.Schema.object({
-    protocol: import_koishi2.Schema.string().description("要使用的协议名。").default("mongodb"),
-    host: import_koishi2.Schema.string().description("要连接到的主机名。").default("localhost"),
-    port: import_koishi2.Schema.number().description("要连接到的端口号。"),
-    username: import_koishi2.Schema.string().description("要使用的用户名。"),
-    password: import_koishi2.Schema.string().description("要使用的密码。"),
-    database: import_koishi2.Schema.string().description("要访问的数据库名。").default("koishi"),
-    prefix: import_koishi2.Schema.string().description("使用的表名前缀。当配置了这一项时，所有通过 Koishi 创建的表名都会以这个配置项为前缀。")
-  });
-})(MongoDatabase || (MongoDatabase = {}));
-import_koishi2.Database.extend(MongoDatabase, {
-  async drop(table) {
-    if (table) {
-      await this.db.collection(table).drop();
-    } else {
-      const collections = await this.db.collections();
-      await Promise.all(collections.map((c) => c.drop()));
+  async start() {
+    const mongourl = this.config.uri || this.connectionStringFromConfig();
+    this.client = await import_mongodb.MongoClient.connect(mongourl);
+    this.db = this.client.db(this.config.database);
+    for (const name in this.ctx.model.config) {
+      this.tasks[name] = this._syncTable(name);
     }
-  },
+    this.ctx.on("model", (name) => {
+      this.tasks[name] = this._syncTable(name);
+    });
+  }
+  stop() {
+    return this.client.close();
+  }
+  async _syncTable(name) {
+    await this.tasks[name];
+    const coll = await this.db.createCollection(name).catch(() => this.db.collection(name));
+    const { primary, unique } = this.ctx.model.config[name];
+    const newSpecs = [];
+    const oldSpecs = await coll.indexes();
+    [primary, ...unique].forEach((keys, index) => {
+      keys = (0, import_koishi2.makeArray)(keys);
+      const name2 = (index ? "unique:" : "primary:") + keys.join("+");
+      if (oldSpecs.find((spec) => spec.name === name2))
+        return;
+      const key = Object.fromEntries(keys.map((key2) => [key2, 1]));
+      newSpecs.push({ name: name2, key, unique: true });
+    });
+    if (!newSpecs.length)
+      return;
+    await coll.createIndexes(newSpecs);
+  }
+  _createFilter(name, query) {
+    return transformQuery(this.ctx.model.resolveQuery(name, query));
+  }
+  async drop() {
+    await Promise.all(Object.keys(this.ctx.model.config).map((name) => this.db.dropCollection(name)));
+  }
+  async _collStats() {
+    const tables = Object.keys(this.ctx.model.config);
+    const entries = await Promise.all(tables.map(async (name) => {
+      const coll = this.db.collection(name);
+      const { count, size } = await coll.stats();
+      return [coll.collectionName, { count, size }];
+    }));
+    return Object.fromEntries(entries);
+  }
+  async stats() {
+    const [{ totalSize }, tables] = await Promise.all([
+      this.db.stats(),
+      this._collStats()
+    ]);
+    return { size: totalSize, tables };
+  }
   async get(name, query, modifier) {
-    const filter = createFilter(name, query);
+    const filter = this._createFilter(name, query);
     let cursor = this.db.collection(name).find(filter);
-    const { fields, limit, offset = 0 } = import_koishi2.Query.resolveModifier(modifier);
+    const { fields, limit, offset = 0, sort } = import_koishi2.Query.resolveModifier(modifier);
     cursor = cursor.project(__spreadValues({ _id: 0 }, Object.fromEntries((fields != null ? fields : []).map((key) => [key, 1]))));
     if (offset)
       cursor = cursor.skip(offset);
     if (limit)
       cursor = cursor.limit(offset + limit);
+    if (sort)
+      cursor = cursor.sort(sort);
     return await cursor.toArray();
-  },
-  async set(name, query, data) {
-    const filter = createFilter(name, query);
-    await this.db.collection(name).updateMany(filter, { $set: data });
-  },
+  }
+  async set(name, query, update) {
+    await this.tasks[name];
+    const { primary } = this.ctx.model.config[name];
+    const indexFields = (0, import_koishi2.makeArray)(primary);
+    const updateFields = new Set(Object.keys(update).map((key) => key.split(".", 1)[0]));
+    const filter = this._createFilter(name, query);
+    const coll = this.db.collection(name);
+    const original = await coll.find(filter).toArray();
+    if (!original.length)
+      return;
+    const bulk = coll.initializeUnorderedBulkOp();
+    for (const item of original) {
+      bulk.find((0, import_koishi2.pick)(item, indexFields)).updateOne({ $set: (0, import_koishi2.pick)((0, import_orm_utils.executeUpdate)(item, update), updateFields) });
+    }
+    await bulk.execute();
+  }
   async remove(name, query) {
-    const filter = createFilter(name, query);
+    const filter = this._createFilter(name, query);
     await this.db.collection(name).deleteMany(filter);
-  },
+  }
+  queue(name, callback) {
+    return this.tasks[name] = Promise.resolve(this.tasks[name]).catch(import_koishi2.noop).then(callback);
+  }
   async create(name, data) {
-    const table = import_koishi2.Tables.config[name];
-    const { primary, fields } = table;
-    if (!Array.isArray(primary) && table.autoInc && !(primary in data)) {
-      const [latest] = await this.db.collection(name).find().sort(primary, -1).limit(1).toArray();
-      data[primary] = latest ? +latest[primary] + 1 : 1;
-      if (import_koishi2.Tables.Field.string.includes(fields[primary].type)) {
-        data[primary] += "";
+    const coll = this.db.collection(name);
+    return this.queue(name, async () => {
+      const { primary, fields, autoInc } = this.ctx.model.config[name];
+      if (autoInc && !Array.isArray(primary) && !(primary in data)) {
+        const [latest] = await coll.find().sort(primary, -1).limit(1).toArray();
+        data[primary] = latest ? +latest[primary] + 1 : 1;
+        if (import_koishi2.Model.Field.string.includes(fields[primary].type)) {
+          data[primary] += "";
+        }
       }
-    }
-    const copy = __spreadValues(__spreadValues({}, import_koishi2.Tables.create(name)), data);
-    try {
-      await this.db.collection(name).insertOne(copy);
-      return copy;
-    } catch {
-    }
-  },
+      const copy = __spreadValues(__spreadValues({}, this.ctx.model.create(name)), data);
+      try {
+        await coll.insertOne(copy);
+        delete copy._id;
+        return copy;
+      } catch (err) {
+        if (err instanceof import_mongodb.MongoError && err.code === 11e3) {
+          throw new import_koishi2.KoishiError(err.message, "database.duplicate-entry");
+        }
+        throw err;
+      }
+    });
+  }
   async upsert(name, data, keys) {
     if (!data.length)
       return;
     if (!keys)
-      keys = import_koishi2.Tables.config[name].primary;
-    keys = (0, import_koishi2.makeArray)(keys);
-    const bulk = this.db.collection(name).initializeUnorderedBulkOp();
-    for (const item of data) {
-      bulk.find((0, import_koishi2.pick)(item, keys)).upsert().updateOne({ $set: (0, import_koishi2.omit)(item, keys), $setOnInsert: (0, import_koishi2.omit)(import_koishi2.Tables.create(name), [...keys, ...Object.keys(item)]) });
+      keys = this.ctx.model.config[name].primary;
+    const indexFields = (0, import_koishi2.makeArray)(keys);
+    await this.tasks[name];
+    const coll = this.db.collection(name);
+    const original = await coll.find({ $or: data.map((item) => (0, import_koishi2.pick)(item, indexFields)) }).toArray();
+    const bulk = coll.initializeUnorderedBulkOp();
+    for (const update of data) {
+      const item = original.find((item2) => indexFields.every((key) => item2[key].valueOf() === update[key].valueOf()));
+      if (item) {
+        const updateFields = new Set(Object.keys(update).map((key) => key.split(".", 1)[0]));
+        const override = (0, import_koishi2.omit)((0, import_koishi2.pick)((0, import_orm_utils.executeUpdate)(item, update), updateFields), indexFields);
+        bulk.find((0, import_koishi2.pick)(item, indexFields)).updateOne({ $set: override });
+      } else {
+        bulk.insert((0, import_orm_utils.executeUpdate)(this.ctx.model.create(name), update));
+      }
     }
     await bulk.execute();
-  },
+  }
   async aggregate(name, fields, query) {
-    const $match = createFilter(name, query);
-    const [data] = await this.db.collection(name).aggregate([{ $match }, {
-      $group: __spreadValues({
-        _id: 1
-      }, (0, import_koishi2.valueMap)(fields, transformEval))
-    }]).toArray();
-    return data;
+    if (!Object.keys(fields).length)
+      return {};
+    const $match = this._createFilter(name, query);
+    const aggrs = [];
+    fields = (0, import_koishi2.valueMap)(fields, (value) => transformEval(value, aggrs));
+    const stages = aggrs.map((pipeline) => {
+      pipeline.unshift({ $match });
+      return { $unionWith: { coll: name, pipeline } };
+    });
+    stages.unshift({ $match: { _id: null } });
+    const results = await this.db.collection(name).aggregate(stages).toArray();
+    const data = Object.assign({}, ...results);
+    return (0, import_koishi2.valueMap)(fields, (value) => (0, import_orm_utils.executeEval)(data, value));
   }
-});
+};
+__name(MongoDatabase, "MongoDatabase");
+(function(MongoDatabase2) {
+  MongoDatabase2.name = "database-mongo";
+  MongoDatabase2.Config = import_koishi2.Schema.object({
+    protocol: import_koishi2.Schema.string().description("要使用的协议名。").default("mongodb"),
+    host: import_koishi2.Schema.string().description("要连接到的主机名。").default("localhost"),
+    port: import_koishi2.Schema.number().description("要连接到的端口号。"),
+    username: import_koishi2.Schema.string().description("要使用的用户名。"),
+    password: import_koishi2.Schema.string().description("要使用的密码。"),
+    database: import_koishi2.Schema.string().description("要访问的数据库名。").default("koishi")
+  });
+})(MongoDatabase || (MongoDatabase = {}));
 var src_default = MongoDatabase;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {});

package/lib/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../src/index.ts", "../src/utils.ts"],
-  "sourcesContent": ["import { MongoClient, Db, Collection } from 'mongodb'\nimport { Context, Channel, Database, User, Tables as KoishiTables, makeArray, Schema, valueMap, pick, omit, Query } from 'koishi'\nimport { URLSearchParams } from 'url'\nimport { createFilter, transformEval } from './utils'\n\ndeclare module 'koishi' {\n  interface Database {\n    mongo: MongoDatabase\n  }\n\n  interface Modules {\n    'database-mongo': typeof import('.')\n  }\n}\n\ntype TableType = keyof Tables\n\nexport interface Tables extends KoishiTables {}\n\nclass MongoDatabase extends Database {\n  public client: MongoClient\n  public db: Db\n\n  mongo = this\n\n  user: Collection<User>\n  channel: Collection<Channel>\n\n  constructor(public ctx: Context, private config: MongoDatabase.Config) {\n    super(ctx)\n  }\n\n  async start() {\n    const mongourl = this.config.uri || this.connectionStringFromConfig()\n    this.client = await MongoClient.connect(\n      mongourl, { useNewUrlParser: true, useUnifiedTopology: true },\n    )\n    this.db = this.client.db(this.config.database)\n    if (this.config.prefix) {\n      this.db.collection = ((func, prefix) => function collection<T extends TableType>(name: T) {\n        return func(`${prefix}.${name}`)\n      })(this.db.collection.bind(this.db), this.config.prefix)\n    }\n    this.user = this.db.collection('user')\n    this.channel = this.db.collection('channel')\n    await this.channel.createIndex({ type: 1, pid: 1 }, { unique: true })\n\n    for (const name in KoishiTables.config) {\n      const { primary } = KoishiTables.config[name]\n      const col = this.db.collection(name)\n      await col.createIndex(Object.fromEntries(makeArray(primary).map(K => [K, 1])), { unique: true })\n    }\n  }\n\n  collection<T extends TableType>(name: T): Collection<Tables[T]> {\n    return this.db.collection(name)\n  }\n\n  stop() {\n    return this.client.close()\n  }\n\n  connectionStringFromConfig() {\n    const { authDatabase, connectOptions, host, database: name, password, port, protocol, username } = this.config\n    let mongourl = `${protocol}://`\n    if (username) mongourl += `${encodeURIComponent(username)}${password ? `:${encodeURIComponent(password)}` : ''}@`\n    mongourl += `${host}${port ? `:${port}` : ''}/${authDatabase || name}`\n    if (connectOptions) {\n      const params = new URLSearchParams(connectOptions)\n      mongourl += `?${params}`\n    }\n    return mongourl\n  }\n}\n\nnamespace MongoDatabase {\n  export const name = 'database-mongo'\n\n  export interface Config {\n    username?: string\n    password?: string\n    protocol?: string\n    host?: string\n    port?: number\n    /** database name */\n    database?: string\n    prefix?: string\n    /** default auth database */\n    authDatabase?: string\n    connectOptions?: ConstructorParameters<typeof URLSearchParams>[0]\n    /** connection string (will overwrite all configs except 'name' and 'prefix') */\n    uri?: string\n  }\n\n  export const Config = Schema.object({\n    protocol: Schema.string().description('要使用的协议名。').default('mongodb'),\n    host: Schema.string().description('要连接到的主机名。').default('localhost'),\n    port: Schema.number().description('要连接到的端口号。'),\n    username: Schema.string().description('要使用的用户名。'),\n    password: Schema.string().description('要使用的密码。'),\n    database: Schema.string().description('要访问的数据库名。').default('koishi'),\n    prefix: Schema.string().description('使用的表名前缀。当配置了这一项时，所有通过 Koishi 创建的表名都会以这个配置项为前缀。'),\n  })\n}\n\nDatabase.extend(MongoDatabase, {\n  async drop(table) {\n    if (table) {\n      await this.db.collection(table).drop()\n    } else {\n      const collections = await this.db.collections()\n      await Promise.all(collections.map(c => c.drop()))\n    }\n  },\n\n  async get(name, query, modifier) {\n    const filter = createFilter(name, query)\n    let cursor = this.db.collection(name).find(filter)\n    const { fields, limit, offset = 0 } = Query.resolveModifier(modifier)\n    cursor = cursor.project({ _id: 0, ...Object.fromEntries((fields ?? []).map(key => [key, 1])) })\n    if (offset) cursor = cursor.skip(offset)\n    if (limit) cursor = cursor.limit(offset + limit)\n    return await cursor.toArray()\n  },\n\n  async set(name, query, data) {\n    const filter = createFilter(name, query)\n    await this.db.collection(name).updateMany(filter, { $set: data })\n  },\n\n  async remove(name, query) {\n    const filter = createFilter(name, query)\n    await this.db.collection(name).deleteMany(filter)\n  },\n\n  async create(name, data: any) {\n    const table = KoishiTables.config[name]\n    const { primary, fields } = table\n    if (!Array.isArray(primary) && table.autoInc && !(primary in data)) {\n      const [latest] = await this.db.collection(name).find().sort(primary, -1).limit(1).toArray()\n      data[primary] = latest ? +latest[primary] + 1 : 1\n      if (KoishiTables.Field.string.includes(fields[primary].type)) {\n        data[primary] += ''\n      }\n    }\n    const copy = { ...KoishiTables.create(name), ...data }\n    try {\n      await this.db.collection(name).insertOne(copy)\n      return copy\n    } catch {}\n  },\n\n  async upsert(name, data: any[], keys: string | string[]) {\n    if (!data.length) return\n    if (!keys) keys = KoishiTables.config[name].primary\n    keys = makeArray(keys)\n    const bulk = this.db.collection(name).initializeUnorderedBulkOp()\n    for (const item of data) {\n      bulk.find(pick(item, keys))\n        .upsert()\n        .updateOne({ $set: omit(item, keys), $setOnInsert: omit(KoishiTables.create(name), [...keys, ...Object.keys(item) as any]) })\n    }\n    await bulk.execute()\n  },\n\n  async aggregate(name, fields, query) {\n    const $match = createFilter(name, query)\n    const [data] = await this.db.collection(name).aggregate([{ $match }, {\n      $group: {\n        _id: 1,\n        ...valueMap(fields, transformEval),\n      },\n    }]).toArray()\n    return data\n  },\n})\n\nexport default MongoDatabase\n", "import { TableType, Query, Eval, valueMap } from 'koishi'\nimport { QuerySelector } from 'mongodb'\n\nfunction transformFieldQuery(query: Query.FieldQuery, key: string) {\n  // shorthand syntax\n  if (typeof query === 'string' || typeof query === 'number' || query instanceof Date) {\n    return { $eq: query }\n  } else if (Array.isArray(query)) {\n    if (!query.length) return\n    return { $in: query }\n  } else if (query instanceof RegExp) {\n    return { $regex: query }\n  }\n\n  // query operators\n  const result: QuerySelector<any> = {}\n  for (const prop in query) {\n    if (prop === '$el') {\n      result.$elemMatch = transformFieldQuery(query[prop], key)\n    } else if (prop === '$regexFor') {\n      result.$expr = {\n        body(data: string, value: string) {\n          return new RegExp(data, 'i').test(value)\n        },\n        args: ['$' + key, query],\n        lang: 'js',\n      }\n    } else {\n      result[prop] = query[prop]\n    }\n  }\n  return result\n}\n\nfunction transformQuery(query: Query.Expr) {\n  const filter = {}\n  for (const key in query) {\n    const value = query[key]\n    if (key === '$and' || key === '$or') {\n      // MongoError: $and/$or/$nor must be a nonempty array\n      if (value.length) {\n        filter[key] = value.map(transformQuery)\n      } else if (key === '$or') {\n        return { $nor: [{}] }\n      }\n    } else if (key === '$not') {\n      // MongoError: unknown top level operator: $not\n      // https://stackoverflow.com/questions/25270396/mongodb-how-to-invert-query-with-not\n      filter['$nor'] = [transformQuery(value)]\n    } else if (key === '$expr') {\n      filter[key] = transformEval(value)\n    } else {\n      filter[key] = transformFieldQuery(value, key)\n    }\n  }\n  return filter\n}\n\nexport function createFilter<T extends TableType>(name: T, query: Query<T>) {\n  return transformQuery(Query.resolve(name, query))\n}\n\nexport function transformEval(expr: Eval.Numeric | Eval.Aggregation) {\n  if (typeof expr === 'string') {\n    return '$' + expr\n  } else if (typeof expr === 'number' || typeof expr === 'boolean') {\n    return expr\n  }\n\n  return valueMap(expr as any, (value) => {\n    if (Array.isArray(value)) {\n      return value.map(transformEval)\n    } else {\n      return transformEval(value)\n    }\n  })\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["import { MongoClient, Db, MongoError, IndexDescription } from 'mongodb'\nimport { Context, Database, Tables, makeArray, Schema, pick, omit, Query, Model, Dict, noop, KoishiError, valueMap } from 'koishi'\nimport { URLSearchParams } from 'url'\nimport { executeUpdate, executeEval } from '@koishijs/orm-utils'\nimport { transformQuery, transformEval } from './utils'\n\ndeclare module 'koishi' {\n  interface Database {\n    mongo: MongoDatabase\n  }\n\n  interface Modules {\n    'database-mongo': typeof import('.')\n  }\n}\n\ntype TableType = keyof Tables\n\nclass MongoDatabase extends Database {\n  public client: MongoClient\n  public db: Db\n  public mongo = this\n  private tasks: Dict<Promise<any>> = {}\n\n  constructor(public ctx: Context, private config: MongoDatabase.Config) {\n    super(ctx)\n  }\n\n  private connectionStringFromConfig() {\n    const { authDatabase, connectOptions, host, database: name, password, port, protocol, username } = this.config\n    let mongourl = `${protocol}://`\n    if (username) mongourl += `${encodeURIComponent(username)}${password ? `:${encodeURIComponent(password)}` : ''}@`\n    mongourl += `${host}${port ? `:${port}` : ''}/${authDatabase || name}`\n    if (connectOptions) {\n      const params = new URLSearchParams(connectOptions)\n      mongourl += `?${params}`\n    }\n    return mongourl\n  }\n\n  async start() {\n    const mongourl = this.config.uri || this.connectionStringFromConfig()\n    this.client = await MongoClient.connect(mongourl)\n    this.db = this.client.db(this.config.database)\n\n    for (const name in this.ctx.model.config) {\n      this.tasks[name] = this._syncTable(name)\n    }\n\n    this.ctx.on('model', (name) => {\n      this.tasks[name] = this._syncTable(name)\n    })\n  }\n\n  stop() {\n    return this.client.close()\n  }\n\n  /** synchronize table schema */\n  private async _syncTable(name: string) {\n    await this.tasks[name]\n    const coll = await this.db.createCollection(name).catch(() => this.db.collection(name))\n    const { primary, unique } = this.ctx.model.config[name]\n    const newSpecs: IndexDescription[] = []\n    const oldSpecs = await coll.indexes()\n    ;[primary, ...unique].forEach((keys, index) => {\n      keys = makeArray(keys)\n      const name = (index ? 'unique:' : 'primary:') + keys.join('+')\n      if (oldSpecs.find(spec => spec.name === name)) return\n      const key = Object.fromEntries(keys.map(key => [key, 1]))\n      newSpecs.push({ name, key, unique: true })\n    })\n    if (!newSpecs.length) return\n    await coll.createIndexes(newSpecs)\n  }\n\n  private _createFilter(name: string, query: Query) {\n    return transformQuery(this.ctx.model.resolveQuery(name, query))\n  }\n\n  async drop() {\n    await Promise.all(Object.keys(this.ctx.model.config).map(name => this.db.dropCollection(name)))\n  }\n\n  private async _collStats() {\n    const tables = Object.keys(this.ctx.model.config)\n    const entries = await Promise.all(tables.map(async (name) => {\n      const coll = this.db.collection(name)\n      const { count, size } = await coll.stats()\n      return [coll.collectionName, { count, size }] as const\n    }))\n    return Object.fromEntries(entries)\n  }\n\n  async stats() {\n    // https://docs.mongodb.com/manual/reference/command/dbStats/#std-label-dbstats-output\n    const [{ totalSize }, tables] = await Promise.all([\n      this.db.stats(),\n      this._collStats(),\n    ])\n    return { size: totalSize, tables }\n  }\n\n  async get(name: TableType, query: Query, modifier: Query.Modifier) {\n    const filter = this._createFilter(name, query)\n    let cursor = this.db.collection(name).find(filter)\n    const { fields, limit, offset = 0, sort } = Query.resolveModifier(modifier)\n    cursor = cursor.project({ _id: 0, ...Object.fromEntries((fields ?? []).map(key => [key, 1])) })\n    if (offset) cursor = cursor.skip(offset)\n    if (limit) cursor = cursor.limit(offset + limit)\n    if (sort) cursor = cursor.sort(sort)\n    return await cursor.toArray() as any\n  }\n\n  async set(name: TableType, query: Query, update: {}) {\n    await this.tasks[name]\n    const { primary } = this.ctx.model.config[name]\n    const indexFields = makeArray(primary)\n    const updateFields = new Set(Object.keys(update).map(key => key.split('.', 1)[0]))\n    const filter = this._createFilter(name, query)\n    const coll = this.db.collection(name)\n    const original = await coll.find(filter).toArray()\n    if (!original.length) return\n    const bulk = coll.initializeUnorderedBulkOp()\n    for (const item of original) {\n      bulk.find(pick(item, indexFields)).updateOne({ $set: pick(executeUpdate(item, update), updateFields) })\n    }\n    await bulk.execute()\n  }\n\n  async remove(name: TableType, query: Query) {\n    const filter = this._createFilter(name, query)\n    await this.db.collection(name).deleteMany(filter)\n  }\n\n  private queue(name: TableType, callback: () => Promise<any>) {\n    return this.tasks[name] = Promise.resolve(this.tasks[name]).catch(noop).then(callback)\n  }\n\n  async create(name: TableType, data: any) {\n    const coll = this.db.collection(name)\n    return this.queue(name, async () => {\n      const { primary, fields, autoInc } = this.ctx.model.config[name]\n      if (autoInc && !Array.isArray(primary) && !(primary in data)) {\n        const [latest] = await coll.find().sort(primary, -1).limit(1).toArray()\n        data[primary] = latest ? +latest[primary] + 1 : 1\n        if (Model.Field.string.includes(fields[primary].type)) {\n          data[primary] += ''\n        }\n      }\n      const copy = { ...this.ctx.model.create(name), ...data }\n      try {\n        await coll.insertOne(copy)\n        delete copy._id\n        return copy\n      } catch (err) {\n        if (err instanceof MongoError && err.code === 11000) {\n          throw new KoishiError(err.message, 'database.duplicate-entry')\n        }\n        throw err\n      }\n    })\n  }\n\n  async upsert(name: TableType, data: any[], keys: string | string[]) {\n    if (!data.length) return\n    if (!keys) keys = this.ctx.model.config[name].primary\n    const indexFields = makeArray(keys)\n    await this.tasks[name]\n    const coll = this.db.collection(name)\n    const original = await coll.find({ $or: data.map(item => pick(item, indexFields)) }).toArray()\n    const bulk = coll.initializeUnorderedBulkOp()\n    for (const update of data) {\n      const item = original.find(item => indexFields.every(key => item[key].valueOf() === update[key].valueOf()))\n      if (item) {\n        const updateFields = new Set(Object.keys(update).map(key => key.split('.', 1)[0]))\n        const override = omit(pick(executeUpdate(item, update), updateFields), indexFields)\n        bulk.find(pick(item, indexFields)).updateOne({ $set: override })\n      } else {\n        bulk.insert(executeUpdate(this.ctx.model.create(name), update))\n      }\n    }\n    await bulk.execute()\n  }\n\n  async aggregate(name: TableType, fields: {}, query: Query) {\n    if (!Object.keys(fields).length) return {}\n    const $match = this._createFilter(name, query)\n    const aggrs: any[][] = []\n    fields = valueMap(fields, value => transformEval(value, aggrs))\n    const stages = aggrs.map<any>((pipeline) => {\n      pipeline.unshift({ $match })\n      return { $unionWith: { coll: name, pipeline } }\n    })\n    stages.unshift({ $match: { _id: null } })\n    const results = await this.db.collection(name).aggregate(stages).toArray()\n    const data = Object.assign({}, ...results)\n    return valueMap(fields, value => executeEval(data, value)) as any\n  }\n}\n\nnamespace MongoDatabase {\n  export const name = 'database-mongo'\n\n  export interface Config {\n    username?: string\n    password?: string\n    protocol?: string\n    host?: string\n    port?: number\n    /** database name */\n    database?: string\n    /** default auth database */\n    authDatabase?: string\n    connectOptions?: ConstructorParameters<typeof URLSearchParams>[0]\n    /** connection string (will overwrite all configs except 'name') */\n    uri?: string\n  }\n\n  export const Config = Schema.object({\n    protocol: Schema.string().description('要使用的协议名。').default('mongodb'),\n    host: Schema.string().description('要连接到的主机名。').default('localhost'),\n    port: Schema.number().description('要连接到的端口号。'),\n    username: Schema.string().description('要使用的用户名。'),\n    password: Schema.string().description('要使用的密码。'),\n    database: Schema.string().description('要访问的数据库名。').default('koishi'),\n  })\n}\n\nexport default MongoDatabase\n", "import { Query, valueMap } from 'koishi'\nimport { Filter, FilterOperators } from 'mongodb'\n\nfunction transformFieldQuery(query: Query.FieldQuery, key: string) {\n  // shorthand syntax\n  if (typeof query === 'string' || typeof query === 'number' || query instanceof Date) {\n    return { $eq: query }\n  } else if (Array.isArray(query)) {\n    if (!query.length) return\n    return { $in: query }\n  } else if (query instanceof RegExp) {\n    return { $regex: query }\n  }\n\n  // query operators\n  const result: FilterOperators<any> = {}\n  for (const prop in query) {\n    if (prop === '$el') {\n      result.$elemMatch = transformFieldQuery(query[prop], key)\n    } else if (prop === '$regexFor') {\n      result.$expr = {\n        body(data: string, value: string) {\n          return new RegExp(data, 'i').test(value)\n        },\n        args: ['$' + key, query],\n        lang: 'js',\n      }\n    } else {\n      result[prop] = query[prop]\n    }\n  }\n  return result\n}\n\nexport function transformQuery(query: Query.Expr) {\n  const filter: Filter<any> = {}\n  for (const key in query) {\n    const value = query[key]\n    if (key === '$and' || key === '$or') {\n      // MongoError: $and/$or/$nor must be a nonempty array\n      if (value.length) {\n        filter[key] = value.map(transformQuery)\n      } else if (key === '$or') {\n        return { $nor: [{}] }\n      }\n    } else if (key === '$not') {\n      // MongoError: unknown top level operator: $not\n      // https://stackoverflow.com/questions/25270396/mongodb-how-to-invert-query-with-not\n      filter.$nor = [transformQuery(value)]\n    } else if (key === '$expr') {\n      filter[key] = transformEval(value)\n    } else {\n      filter[key] = transformFieldQuery(value, key)\n    }\n  }\n  return filter\n}\n\nfunction transformEvalExpr(expr: any, aggrs?: any[][]) {\n  return valueMap(expr as any, (value, key) => {\n    if (Array.isArray(value)) {\n      return value.map(val => transformEval(val, aggrs))\n    } else {\n      return transformEval(value, aggrs)\n    }\n  })\n}\n\nfunction transformAggr(expr: any) {\n  if (typeof expr === 'string') {\n    return '$' + expr\n  }\n  return transformEvalExpr(expr)\n}\n\nconst aggrKeys = ['$sum', '$avg', '$min', '$max', '$count']\n\nexport function transformEval(expr: any, aggrs?: any[][]) {\n  if (typeof expr === 'number' || typeof expr === 'string' || typeof expr === 'boolean') {\n    return expr\n  } else if (expr.$) {\n    return '$' + expr.$\n  }\n\n  for (const key of aggrKeys) {\n    if (!expr[key]) continue\n    const value = transformAggr(expr[key])\n    const $ = 'temp' + aggrs.length\n    if (key === '$count') {\n      aggrs.push([\n        { $group: { _id: value } },\n        { $group: { _id: null, [$]: { $count: {} } } }\n      ])\n    } else {\n      aggrs.push([{ $group: { _id: null, [$]: { [key]: value } } }])\n    }\n    return { $ }\n  }\n\n  return transformEvalExpr(expr, aggrs)\n}\n"],
+  "mappings": "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",
   "names": []
 }

package/lib/utils.d.ts

@@ -0,0 +1,5 @@
+/// <reference types="koishi/lib" />
+import { Query } from 'koishi';
+import { Filter } from 'mongodb';
+export declare function transformQuery(query: Query.Expr): Filter<any>;
+export declare function transformEval(expr: any, aggrs?: any[][]): any;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@koishijs/plugin-database-mongo",
   "description": "MongoDB support for Koishi",
-  "version": "3.0.0-beta.4",
+  "version": "3.0.0-rc.0",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [
@@ -32,14 +32,14 @@
     "mysql"
   ],
   "devDependencies": {
-    "@koishijs/plugin-mock": "^1.0.0-beta.0",
-    "@koishijs/test-utils": "^8.0.0-beta.4"
+    "@koishijs/plugin-mock": "^1.0.0-rc.0",
+    "@koishijs/test-utils": "^8.0.0-rc.0"
   },
   "peerDependencies": {
-    "koishi": "^4.0.0-beta.4"
+    "koishi": "^4.0.0-rc.0"
   },
   "dependencies": {
-    "@types/mongodb": "^3.6.12",
-    "mongodb": "^3.6.6"
+    "@koishijs/orm-utils": "^1.0.0-rc.0",
+    "mongodb": "^4.2.2"
   }
 }