@e22m4u/js-repository-mongodb-adapter 0.6.4 → 0.7.1

package/dist/cjs/index.cjs

@@ -30,204 +30,12 @@ module.exports = __toCommonJS(index_exports);
 var import_mongodb2 = require("mongodb");
 var import_mongodb3 = require("mongodb");
 
-// src/utils/pluralize.js
-var singularExceptions = [
-  /access$/i,
-  /address$/i,
-  /alias$/i,
-  /bonus$/i,
-  /boss$/i,
-  /bus$/i,
-  /business$/i,
-  /canvas$/i,
-  /class$/i,
-  /cross$/i,
-  /dress$/i,
-  /focus$/i,
-  /gas$/i,
-  /glass$/i,
-  /kiss$/i,
-  /lens$/i,
-  /loss$/i,
-  /pass$/i,
-  /plus$/i,
-  /process$/i,
-  /status$/i,
-  /success$/i,
-  /virus$/i
-];
-function pluralize(input) {
-  if (!input || typeof input !== "string") {
-    return input;
-  }
-  if (/s$/i.test(input) && !singularExceptions.some((re) => re.test(input))) {
-    return input;
-  }
-  const lastChar = input.slice(-1);
-  const isLastCharUpper = lastChar === lastChar.toUpperCase() && lastChar !== lastChar.toLowerCase();
-  if (/(s|x|z|ch|sh)$/i.test(input)) {
-    return input + (isLastCharUpper ? "ES" : "es");
-  }
-  if (/[^aeiou]y$/i.test(input)) {
-    return input.slice(0, -1) + (isLastCharUpper ? "IES" : "ies");
-  }
-  return input + (isLastCharUpper ? "S" : "s");
-}
-__name(pluralize, "pluralize");
-
-// src/utils/is-iso-date.js
-function isIsoDate(value) {
-  if (!value) return false;
-  if (value instanceof Date) return true;
-  if (!/\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.\d{3}Z/.test(value)) return false;
-  const d = new Date(value);
-  return d instanceof Date && !isNaN(d.getTime()) && d.toISOString() === value;
-}
-__name(isIsoDate, "isIsoDate");
-
-// src/utils/is-object-id.js
-var import_mongodb = require("mongodb");
-function isObjectId(value) {
-  if (!value) return false;
-  if (value instanceof import_mongodb.ObjectId) return true;
-  if (typeof value !== "string") return false;
-  return value.match(/^[a-fA-F0-9]{24}$/) != null;
-}
-__name(isObjectId, "isObjectId");
-
-// src/utils/to-camel-case.js
-function toCamelCase(input) {
-  if (!input) return "";
-  const spacedString = String(input).replace(/([-_])/g, " ").replace(/([a-z])([A-Z])/g, "$1 $2");
-  const intermediateCased = spacedString.toLowerCase().replace(/\s(.)/g, ($1) => $1.toUpperCase()).replace(/\s/g, "");
-  if (!intermediateCased) return "";
-  return intermediateCased.charAt(0).toLowerCase() + intermediateCased.slice(1);
-}
-__name(toCamelCase, "toCamelCase");
-
-// src/utils/create-mongodb-url.js
-var import_js_repository = require("@e22m4u/js-repository");
-function createMongodbUrl(options = {}) {
-  if (!options || typeof options !== "object" || Array.isArray(options))
-    throw new import_js_repository.InvalidArgumentError(
-      'The first argument of "createMongodbUrl" must be an Object, but %v given.',
-      options
-    );
-  if (options.protocol && typeof options.protocol !== "string")
-    throw new import_js_repository.InvalidArgumentError(
-      'MongoDB option "protocol" must be a String, but %v given.',
-      options.protocol
-    );
-  if (options.hostname && typeof options.hostname !== "string")
-    throw new import_js_repository.InvalidArgumentError(
-      'MongoDB option "hostname" must be a String, but %v given.',
-      options.hostname
-    );
-  if (options.host && typeof options.host !== "string")
-    throw new import_js_repository.InvalidArgumentError(
-      'MongoDB option "host" must be a String, but %v given.',
-      options.host
-    );
-  if (options.port && typeof options.port !== "number" && typeof options.port !== "string") {
-    throw new import_js_repository.InvalidArgumentError(
-      'MongoDB option "port" must be a Number or a String, but %v given.',
-      options.port
-    );
-  }
-  if (options.database && typeof options.database !== "string")
-    throw new import_js_repository.InvalidArgumentError(
-      'MongoDB option "database" must be a String, but %v given.',
-      options.database
-    );
-  if (options.db && typeof options.db !== "string")
-    throw new import_js_repository.InvalidArgumentError(
-      'MongoDB option "db" must be a String, but %v given.',
-      options.db
-    );
-  if (options.username && typeof options.username !== "string")
-    throw new import_js_repository.InvalidArgumentError(
-      'MongoDB option "username" must be a String, but %v given.',
-      options.username
-    );
-  if (options.password && typeof options.password !== "string" && typeof options.password !== "number") {
-    throw new import_js_repository.InvalidArgumentError(
-      'MongoDB option "password" must be a String or a Number, but %v given.',
-      options.password
-    );
-  }
-  if (options.pass && typeof options.pass !== "string" && typeof options.pass !== "number") {
-    throw new import_js_repository.InvalidArgumentError(
-      'MongoDB option "pass" must be a String or a Number, but %v given.',
-      options.pass
-    );
-  }
-  const protocol = options.protocol || "mongodb";
-  const hostname = options.hostname || options.host || "127.0.0.1";
-  const port = options.port || 27017;
-  const database = options.database || options.db || "database";
-  const username = options.username || options.user;
-  const password = options.password || options.pass || void 0;
-  let portUrl = "";
-  if (protocol !== "mongodb+srv") {
-    portUrl = ":" + port;
-  }
-  if (username && password) {
-    return `${protocol}://${username}:${password}@${hostname}${portUrl}/${database}`;
-  } else {
-    return `${protocol}://${hostname}${portUrl}/${database}`;
-  }
-}
-__name(createMongodbUrl, "createMongodbUrl");
-
-// src/utils/transform-values-deep.js
-var import_js_repository2 = require("@e22m4u/js-repository");
-function transformValuesDeep(value, transformer) {
-  if (!transformer || typeof transformer !== "function")
-    throw new import_js_repository2.InvalidArgumentError(
-      'The second argument of "transformValuesDeep" must be a Function, but %v given.',
-      transformer
-    );
-  if (Array.isArray(value)) {
-    value.forEach((v, i) => value[i] = transformValuesDeep(v, transformer));
-    return value;
-  } else if (value && typeof value === "object") {
-    if (!value.constructor || value.constructor && value.constructor.name === "Object") {
-      Object.keys(value).forEach((key) => {
-        if (Object.prototype.hasOwnProperty.call(value, key))
-          value[key] = transformValuesDeep(value[key], transformer);
-      });
-      return value;
-    } else {
-      return transformer(value);
-    }
-  } else {
-    return transformer(value);
-  }
-}
-__name(transformValuesDeep, "transformValuesDeep");
-
-// src/utils/model-name-to-collection-name.js
-function modelNameToCollectionName(modelName) {
-  const ccName = toCamelCase(modelName);
-  const woModel = ccName.replace(/Model$/i, "");
-  if (woModel.length <= 2) {
-    return pluralize(ccName);
-  }
-  return pluralize(woModel);
-}
-__name(modelNameToCollectionName, "modelNameToCollectionName");
-
-// src/mongodb-adapter.js
-var import_js_repository3 = require("@e22m4u/js-repository");
-var import_js_repository4 = require("@e22m4u/js-repository");
-var import_js_repository5 = require("@e22m4u/js-repository");
-
 // node_modules/@e22m4u/js-service/src/errors/invalid-argument-error.js
 var import_js_format = require("@e22m4u/js-format");
 var _InvalidArgumentError = class _InvalidArgumentError extends import_js_format.Errorf {
 };
 __name(_InvalidArgumentError, "InvalidArgumentError");
-var InvalidArgumentError3 = _InvalidArgumentError;
+var InvalidArgumentError = _InvalidArgumentError;
 
 // node_modules/@e22m4u/js-service/src/service-container.js
 var SERVICE_CONTAINER_CLASS_NAME = "ServiceContainer";
@@ -254,7 +62,7 @@ var _ServiceContainer = class _ServiceContainer {
   constructor(parent = void 0) {
     if (parent != null) {
       if (!(parent instanceof _ServiceContainer))
-        throw new InvalidArgumentError3(
+        throw new InvalidArgumentError(
           'The provided parameter "parent" of ServicesContainer.constructor must be an instance ServiceContainer, but %v given.',
           parent
         );
@@ -268,7 +76,7 @@ var _ServiceContainer = class _ServiceContainer {
    */
   getParent() {
     if (!this._parent)
-      throw new InvalidArgumentError3("The service container has no parent.");
+      throw new InvalidArgumentError("The service container has no parent.");
     return this._parent;
   }
   /**
@@ -288,21 +96,23 @@ var _ServiceContainer = class _ServiceContainer {
    */
   get(ctor, ...args) {
     if (!ctor || typeof ctor !== "function")
-      throw new InvalidArgumentError3(
+      throw new InvalidArgumentError(
         "The first argument of ServicesContainer.get must be a class constructor, but %v given.",
         ctor
       );
-    if (!this._services.has(ctor) && this._parent && this._parent.has(ctor)) {
-      return this._parent.get(ctor);
-    }
+    const isCtorRegistered = this._services.has(ctor);
     let service = this._services.get(ctor);
+    let inheritedCtor = void 0;
     if (!service) {
-      const ctors = this._services.keys();
-      const inheritedCtor = ctors.find((v) => v.prototype instanceof ctor);
-      if (inheritedCtor) {
-        service = this._services.get(inheritedCtor);
-        ctor = inheritedCtor;
-      }
+      const ctors = Array.from(this._services.keys());
+      inheritedCtor = ctors.find((v) => v.prototype instanceof ctor);
+      if (inheritedCtor) service = this._services.get(inheritedCtor);
+    }
+    if (!service && !isCtorRegistered && !inheritedCtor && this._parent && this._parent.has(ctor)) {
+      return this._parent.get(ctor, ...args);
+    }
+    if (!isCtorRegistered && inheritedCtor) {
+      ctor = inheritedCtor;
     }
     if (!service || args.length) {
       service = Array.isArray(ctor.kinds) && ctor.kinds.includes(SERVICE_CLASS_NAME) ? new ctor(this, ...args) : new ctor(...args);
@@ -323,7 +133,7 @@ var _ServiceContainer = class _ServiceContainer {
    */
   getRegistered(ctor, ...args) {
     if (!this.has(ctor))
-      throw new InvalidArgumentError3(
+      throw new InvalidArgumentError(
         "The constructor %v is not registered.",
         ctor
       );
@@ -337,10 +147,10 @@ var _ServiceContainer = class _ServiceContainer {
    */
   has(ctor) {
     if (this._services.has(ctor)) return true;
-    if (this._parent) return this._parent.has(ctor);
-    const ctors = this._services.keys();
+    const ctors = Array.from(this._services.keys());
     const inheritedCtor = ctors.find((v) => v.prototype instanceof ctor);
     if (inheritedCtor) return true;
+    if (this._parent) return this._parent.has(ctor);
     return false;
   }
   /**
@@ -352,7 +162,7 @@ var _ServiceContainer = class _ServiceContainer {
    */
   add(ctor, ...args) {
     if (!ctor || typeof ctor !== "function")
-      throw new InvalidArgumentError3(
+      throw new InvalidArgumentError(
         "The first argument of ServicesContainer.add must be a class constructor, but %v given.",
         ctor
       );
@@ -369,7 +179,7 @@ var _ServiceContainer = class _ServiceContainer {
    */
   use(ctor, ...args) {
     if (!ctor || typeof ctor !== "function")
-      throw new InvalidArgumentError3(
+      throw new InvalidArgumentError(
         "The first argument of ServicesContainer.use must be a class constructor, but %v given.",
         ctor
       );
@@ -386,18 +196,48 @@ var _ServiceContainer = class _ServiceContainer {
    */
   set(ctor, service) {
     if (!ctor || typeof ctor !== "function")
-      throw new InvalidArgumentError3(
+      throw new InvalidArgumentError(
         "The first argument of ServicesContainer.set must be a class constructor, but %v given.",
         ctor
       );
     if (!service || typeof service !== "object" || Array.isArray(service))
-      throw new InvalidArgumentError3(
+      throw new InvalidArgumentError(
         "The second argument of ServicesContainer.set must be an Object, but %v given.",
         service
       );
     this._services.set(ctor, service);
     return this;
   }
+  /**
+   * Найти сервис удовлетворяющий условию.
+   *
+   * @param {function(Function, ServiceContainer): boolean} predicate
+   * @param {boolean} noParent
+   * @returns {*}
+   */
+  find(predicate, noParent = false) {
+    if (typeof predicate !== "function") {
+      throw new InvalidArgumentError(
+        "The first argument of ServiceContainer.find must be a function, but %v given.",
+        predicate
+      );
+    }
+    const isRecursive = !noParent;
+    let currentContainer = this;
+    do {
+      for (const ctor of currentContainer._services.keys()) {
+        if (predicate(ctor, currentContainer) === true) {
+          return this.get(ctor);
+        }
+      }
+      if (isRecursive && currentContainer.hasParent()) {
+        currentContainer = currentContainer.getParent();
+      } else {
+        currentContainer = null;
+      }
+    } while (currentContainer);
+    return void 0;
+  }
 };
 __name(_ServiceContainer, "ServiceContainer");
 /**
@@ -496,6 +336,16 @@ var _Service = class _Service {
     this.container.set(ctor, service);
     return this;
   }
+  /**
+   * Найти сервис удовлетворяющий условию.
+   *
+   * @param {function(Function, ServiceContainer): boolean} predicate
+   * @param {boolean} noParent
+   * @returns {*}
+   */
+  findService(predicate, noParent = false) {
+    return this.container.find(predicate, noParent);
+  }
 };
 __name(_Service, "Service");
 /**
@@ -507,10 +357,10 @@ __publicField(_Service, "kinds", [SERVICE_CLASS_NAME]);
 var Service = _Service;
 
 // node_modules/@e22m4u/js-debug/src/utils/to-camel-case.js
-function toCamelCase2(input) {
+function toCamelCase(input) {
   return input.replace(/(^\w|[A-Z]|\b\w)/g, (c) => c.toUpperCase()).replace(/\W+/g, "").replace(/(^\w)/g, (c) => c.toLowerCase());
 }
-__name(toCamelCase2, "toCamelCase");
+__name(toCamelCase, "toCamelCase");
 
 // node_modules/@e22m4u/js-debug/src/utils/is-non-array-object.js
 function isNonArrayObject(input) {
@@ -558,16 +408,16 @@ var _Debuggable = class _Debuggable {
    * @returns {Function}
    */
   getDebuggerFor(method) {
-    return this.debug.withHash().withNs(method.name);
+    const name = method.name || "anonymous";
+    return this.debug.withHash().withNs(name);
   }
   /**
    * Constructor.
    *
-   * @param {object|undefined} container
    * @param {DebuggableOptions|undefined} options
    */
   constructor(options = void 0) {
-    const className = toCamelCase2(this.constructor.name);
+    const className = toCamelCase(this.constructor.name);
     options = typeof options === "object" && options || {};
     const namespace = options.namespace && String(options.namespace) || void 0;
     if (namespace) {
@@ -575,10 +425,12 @@ var _Debuggable = class _Debuggable {
     } else {
       this.debug = createDebugger(className);
     }
-    const noEnvNs = Boolean(options.noEnvNs);
-    if (noEnvNs) this.debug = this.debug.withoutEnvNs();
+    const noEnvironmentNamespace = Boolean(options.noEnvironmentNamespace);
+    if (noEnvironmentNamespace) this.debug = this.debug.withoutEnvNs();
     this.ctorDebug = this.debug.withNs("constructor").withHash();
-    this.ctorDebug(_Debuggable.INSTANTIATION_MESSAGE);
+    const noInstantiationMessage = Boolean(options.noInstantiationMessage);
+    if (!noInstantiationMessage)
+      this.ctorDebug(_Debuggable.INSTANTIATION_MESSAGE);
   }
 };
 __name(_Debuggable, "Debuggable");
@@ -932,6 +784,14 @@ var _DebuggableService = class _DebuggableService extends Debuggable {
   get setService() {
     return this._service.setService;
   }
+  /**
+   * Найти сервис удовлетворяющий условию.
+   *
+   * @type {Service['findService']}
+   */
+  get findService() {
+    return this._service.findService;
+  }
   /**
    * Constructor.
    *
@@ -953,12 +813,196 @@ __publicField(_DebuggableService, "kinds", Service.kinds);
 var DebuggableService = _DebuggableService;
 
 // src/mongodb-adapter.js
-var import_js_repository6 = require("@e22m4u/js-repository");
-var import_js_repository7 = require("@e22m4u/js-repository");
-var import_js_repository8 = require("@e22m4u/js-repository");
-var import_js_repository9 = require("@e22m4u/js-repository");
-var import_js_repository10 = require("@e22m4u/js-repository");
-var import_js_repository11 = require("@e22m4u/js-repository");
+var import_js_repository3 = require("@e22m4u/js-repository");
+
+// src/utils/pluralize.js
+var singularExceptions = [
+  /access$/i,
+  /address$/i,
+  /alias$/i,
+  /bonus$/i,
+  /boss$/i,
+  /bus$/i,
+  /business$/i,
+  /canvas$/i,
+  /class$/i,
+  /cross$/i,
+  /dress$/i,
+  /focus$/i,
+  /gas$/i,
+  /glass$/i,
+  /kiss$/i,
+  /lens$/i,
+  /loss$/i,
+  /pass$/i,
+  /plus$/i,
+  /process$/i,
+  /status$/i,
+  /success$/i,
+  /virus$/i
+];
+function pluralize(input) {
+  if (!input || typeof input !== "string") {
+    return input;
+  }
+  if (/s$/i.test(input) && !singularExceptions.some((re) => re.test(input))) {
+    return input;
+  }
+  const lastChar = input.slice(-1);
+  const isLastCharUpper = lastChar === lastChar.toUpperCase() && lastChar !== lastChar.toLowerCase();
+  if (/(s|x|z|ch|sh)$/i.test(input)) {
+    return input + (isLastCharUpper ? "ES" : "es");
+  }
+  if (/[^aeiou]y$/i.test(input)) {
+    return input.slice(0, -1) + (isLastCharUpper ? "IES" : "ies");
+  }
+  return input + (isLastCharUpper ? "S" : "s");
+}
+__name(pluralize, "pluralize");
+
+// src/utils/is-iso-date.js
+function isIsoDate(value) {
+  if (!value) return false;
+  if (value instanceof Date) return true;
+  if (!/\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.\d{3}Z/.test(value)) return false;
+  const d = new Date(value);
+  return d instanceof Date && !isNaN(d.getTime()) && d.toISOString() === value;
+}
+__name(isIsoDate, "isIsoDate");
+
+// src/utils/is-object-id.js
+var import_mongodb = require("mongodb");
+function isObjectId(value) {
+  if (!value) return false;
+  if (value instanceof import_mongodb.ObjectId) return true;
+  if (typeof value !== "string") return false;
+  return value.match(/^[a-fA-F0-9]{24}$/) != null;
+}
+__name(isObjectId, "isObjectId");
+
+// src/utils/to-camel-case.js
+function toCamelCase2(input) {
+  if (!input) return "";
+  const spacedString = String(input).replace(/([-_])/g, " ").replace(/([a-z])([A-Z])/g, "$1 $2");
+  const intermediateCased = spacedString.toLowerCase().replace(/\s(.)/g, ($1) => $1.toUpperCase()).replace(/\s/g, "");
+  if (!intermediateCased) return "";
+  return intermediateCased.charAt(0).toLowerCase() + intermediateCased.slice(1);
+}
+__name(toCamelCase2, "toCamelCase");
+
+// src/utils/create-mongodb-url.js
+var import_js_repository = require("@e22m4u/js-repository");
+function createMongodbUrl(options = {}) {
+  if (!options || typeof options !== "object" || Array.isArray(options))
+    throw new import_js_repository.InvalidArgumentError(
+      'The first argument of "createMongodbUrl" must be an Object, but %v given.',
+      options
+    );
+  if (options.protocol && typeof options.protocol !== "string")
+    throw new import_js_repository.InvalidArgumentError(
+      'MongoDB option "protocol" must be a String, but %v given.',
+      options.protocol
+    );
+  if (options.hostname && typeof options.hostname !== "string")
+    throw new import_js_repository.InvalidArgumentError(
+      'MongoDB option "hostname" must be a String, but %v given.',
+      options.hostname
+    );
+  if (options.host && typeof options.host !== "string")
+    throw new import_js_repository.InvalidArgumentError(
+      'MongoDB option "host" must be a String, but %v given.',
+      options.host
+    );
+  if (options.port && typeof options.port !== "number" && typeof options.port !== "string") {
+    throw new import_js_repository.InvalidArgumentError(
+      'MongoDB option "port" must be a Number or a String, but %v given.',
+      options.port
+    );
+  }
+  if (options.database && typeof options.database !== "string")
+    throw new import_js_repository.InvalidArgumentError(
+      'MongoDB option "database" must be a String, but %v given.',
+      options.database
+    );
+  if (options.db && typeof options.db !== "string")
+    throw new import_js_repository.InvalidArgumentError(
+      'MongoDB option "db" must be a String, but %v given.',
+      options.db
+    );
+  if (options.username && typeof options.username !== "string")
+    throw new import_js_repository.InvalidArgumentError(
+      'MongoDB option "username" must be a String, but %v given.',
+      options.username
+    );
+  if (options.password && typeof options.password !== "string" && typeof options.password !== "number") {
+    throw new import_js_repository.InvalidArgumentError(
+      'MongoDB option "password" must be a String or a Number, but %v given.',
+      options.password
+    );
+  }
+  if (options.pass && typeof options.pass !== "string" && typeof options.pass !== "number") {
+    throw new import_js_repository.InvalidArgumentError(
+      'MongoDB option "pass" must be a String or a Number, but %v given.',
+      options.pass
+    );
+  }
+  const protocol = options.protocol || "mongodb";
+  const hostname = options.hostname || options.host || "127.0.0.1";
+  const port = options.port || 27017;
+  const database = options.database || options.db || "database";
+  const username = options.username || options.user;
+  const password = options.password || options.pass || void 0;
+  let portUrl = "";
+  if (protocol !== "mongodb+srv") {
+    portUrl = ":" + port;
+  }
+  if (username && password) {
+    return `${protocol}://${username}:${password}@${hostname}${portUrl}/${database}`;
+  } else {
+    return `${protocol}://${hostname}${portUrl}/${database}`;
+  }
+}
+__name(createMongodbUrl, "createMongodbUrl");
+
+// src/utils/transform-values-deep.js
+var import_js_repository2 = require("@e22m4u/js-repository");
+function transformValuesDeep(value, transformer) {
+  if (!transformer || typeof transformer !== "function")
+    throw new import_js_repository2.InvalidArgumentError(
+      'The second argument of "transformValuesDeep" must be a Function, but %v given.',
+      transformer
+    );
+  if (Array.isArray(value)) {
+    value.forEach((v, i) => value[i] = transformValuesDeep(v, transformer));
+    return value;
+  } else if (value && typeof value === "object") {
+    if (!value.constructor || value.constructor && value.constructor.name === "Object") {
+      Object.keys(value).forEach((key) => {
+        if (Object.prototype.hasOwnProperty.call(value, key))
+          value[key] = transformValuesDeep(value[key], transformer);
+      });
+      return value;
+    } else {
+      return transformer(value);
+    }
+  } else {
+    return transformer(value);
+  }
+}
+__name(transformValuesDeep, "transformValuesDeep");
+
+// src/utils/model-name-to-collection-name.js
+function modelNameToCollectionName(modelName) {
+  const ccName = toCamelCase2(modelName);
+  const woModel = ccName.replace(/Model$/i, "");
+  if (woModel.length <= 2) {
+    return pluralize(ccName);
+  }
+  return pluralize(woModel);
+}
+__name(modelNameToCollectionName, "modelNameToCollectionName");
+
+// src/mongodb-adapter.js
 var MONGODB_OPTION_NAMES = [
   "ALPNProtocols",
   "allowPartialTrustChain",
@@ -1096,7 +1140,7 @@ var _MongodbAdapter = class _MongodbAdapter extends import_js_repository3.Adapte
     settings.port = settings.port || 27017;
     settings.database = settings.database || settings.db || "database";
     super(container, settings);
-    const options = (0, import_js_repository7.selectObjectKeys)(this.settings, MONGODB_OPTION_NAMES);
+    const options = (0, import_js_repository3.selectObjectKeys)(this.settings, MONGODB_OPTION_NAMES);
     const url = createMongodbUrl(this.settings);
     this._client = new import_mongodb3.MongoClient(url, options);
   }
@@ -1107,7 +1151,7 @@ var _MongodbAdapter = class _MongodbAdapter extends import_js_repository3.Adapte
    * @private
    */
   _getIdPropName(modelName) {
-    return this.getService(import_js_repository9.ModelDefinitionUtils).getPrimaryKeyAsPropertyName(
+    return this.getService(import_js_repository3.ModelDefinitionUtils).getPrimaryKeyAsPropertyName(
       modelName
     );
   }
@@ -1118,7 +1162,7 @@ var _MongodbAdapter = class _MongodbAdapter extends import_js_repository3.Adapte
    * @private
    */
   _getIdColName(modelName) {
-    return this.getService(import_js_repository9.ModelDefinitionUtils).getPrimaryKeyAsColumnName(
+    return this.getService(import_js_repository3.ModelDefinitionUtils).getPrimaryKeyAsColumnName(
       modelName
     );
   }
@@ -1157,11 +1201,11 @@ var _MongodbAdapter = class _MongodbAdapter extends import_js_repository3.Adapte
    */
   _toDatabase(modelName, modelData) {
     const tableData = this.getService(
-      import_js_repository9.ModelDefinitionUtils
+      import_js_repository3.ModelDefinitionUtils
     ).convertPropertyNamesToColumnNames(modelName, modelData);
     const idColName = this._getIdColName(modelName);
     if (idColName !== "id" && idColName !== "_id")
-      throw new import_js_repository10.InvalidArgumentError(
+      throw new import_js_repository3.InvalidArgumentError(
         'MongoDB is not supporting custom names of the primary key. Do use "id" as a primary key instead of %v.',
         idColName
       );
@@ -1189,7 +1233,7 @@ var _MongodbAdapter = class _MongodbAdapter extends import_js_repository3.Adapte
     if ("_id" in tableData) {
       const idColName = this._getIdColName(modelName);
       if (idColName !== "id" && idColName !== "_id")
-        throw new import_js_repository10.InvalidArgumentError(
+        throw new import_js_repository3.InvalidArgumentError(
           'MongoDB is not supporting custom names of the primary key. Do use "id" as a primary key instead of %v.',
           idColName
         );
@@ -1199,7 +1243,7 @@ var _MongodbAdapter = class _MongodbAdapter extends import_js_repository3.Adapte
       }
     }
     const modelData = this.getService(
-      import_js_repository9.ModelDefinitionUtils
+      import_js_repository3.ModelDefinitionUtils
     ).convertColumnNamesToPropertyNames(modelName, tableData);
     return transformValuesDeep(modelData, (value) => {
       if (value instanceof import_mongodb2.ObjectId) return String(value);
@@ -1213,7 +1257,7 @@ var _MongodbAdapter = class _MongodbAdapter extends import_js_repository3.Adapte
    * @param {string} modelName
    */
   _getCollectionNameByModelName(modelName) {
-    const modelDef = this.getService(import_js_repository8.DefinitionRegistry).getModel(modelName);
+    const modelDef = this.getService(import_js_repository3.DefinitionRegistry).getModel(modelName);
     if (modelDef.tableName != null) return modelDef.tableName;
     return modelNameToCollectionName(modelDef.name);
   }
@@ -1240,7 +1284,7 @@ var _MongodbAdapter = class _MongodbAdapter extends import_js_repository3.Adapte
    * @private
    */
   _getIdType(modelName) {
-    const utils = this.getService(import_js_repository9.ModelDefinitionUtils);
+    const utils = this.getService(import_js_repository3.ModelDefinitionUtils);
     const pkPropName = utils.getPrimaryKeyAsPropertyName(modelName);
     return utils.getDataTypeByPropertyName(modelName, pkPropName);
   }
@@ -1254,16 +1298,16 @@ var _MongodbAdapter = class _MongodbAdapter extends import_js_repository3.Adapte
    */
   _getColName(modelName, propName) {
     if (!propName || typeof propName !== "string")
-      throw new import_js_repository10.InvalidArgumentError(
+      throw new import_js_repository3.InvalidArgumentError(
         "Property name must be a non-empty String, but %v given.",
         propName
       );
-    const utils = this.getService(import_js_repository9.ModelDefinitionUtils);
+    const utils = this.getService(import_js_repository3.ModelDefinitionUtils);
     let colName = propName;
     try {
       colName = utils.getColumnNameByPropertyName(modelName, propName);
     } catch (error) {
-      if (!(error instanceof import_js_repository10.InvalidArgumentError) || error.message.indexOf("does not have the property") === -1) {
+      if (!(error instanceof import_js_repository3.InvalidArgumentError) || error.message.indexOf("does not have the property") === -1) {
         throw error;
       }
     }
@@ -1279,18 +1323,18 @@ var _MongodbAdapter = class _MongodbAdapter extends import_js_repository3.Adapte
    */
   _convertPropNamesChainToColNamesChain(modelName, propsChain) {
     if (!modelName || typeof modelName !== "string")
-      throw new import_js_repository10.InvalidArgumentError(
+      throw new import_js_repository3.InvalidArgumentError(
         "Model name must be a non-empty String, but %v given.",
         modelName
       );
     if (!propsChain || typeof propsChain !== "string")
-      throw new import_js_repository10.InvalidArgumentError(
+      throw new import_js_repository3.InvalidArgumentError(
         "Properties chain must be a non-empty String, but %v given.",
         propsChain
       );
     propsChain = propsChain.replace(/\.{2,}/g, ".");
     const propNames = propsChain.split(".");
-    const utils = this.getService(import_js_repository9.ModelDefinitionUtils);
+    const utils = this.getService(import_js_repository3.ModelDefinitionUtils);
     let currModelName = modelName;
     return propNames.map((currPropName) => {
       if (!currModelName) return currPropName;
@@ -1317,7 +1361,7 @@ var _MongodbAdapter = class _MongodbAdapter extends import_js_repository3.Adapte
     if (fields.indexOf("_id") === -1) fields.push("_id");
     return fields.reduce((acc, field) => {
       if (!field || typeof field !== "string")
-        throw new import_js_repository10.InvalidArgumentError(
+        throw new import_js_repository3.InvalidArgumentError(
           'The provided option "fields" should be a non-empty String or an Array of non-empty String, but %v given.',
           field
         );
@@ -1344,7 +1388,7 @@ var _MongodbAdapter = class _MongodbAdapter extends import_js_repository3.Adapte
     const idPropName = this._getIdPropName(modelName);
     return clause.reduce((acc, order) => {
       if (!order || typeof order !== "string")
-        throw new import_js_repository10.InvalidArgumentError(
+        throw new import_js_repository3.InvalidArgumentError(
           'The provided option "order" should be a non-empty String or an Array of non-empty String, but %v given.',
           order
         );
@@ -1356,7 +1400,7 @@ var _MongodbAdapter = class _MongodbAdapter extends import_js_repository3.Adapte
         try {
           field = this._convertPropNamesChainToColNamesChain(modelName, field);
         } catch (error) {
-          if (!(error instanceof import_js_repository10.InvalidArgumentError) || error.message.indexOf("does not have the property") === -1) {
+          if (!(error instanceof import_js_repository3.InvalidArgumentError) || error.message.indexOf("does not have the property") === -1) {
             throw error;
           }
         }
@@ -1376,7 +1420,7 @@ var _MongodbAdapter = class _MongodbAdapter extends import_js_repository3.Adapte
   _buildQuery(modelName, clause) {
     if (clause == null) return;
     if (typeof clause !== "object" || Array.isArray(clause))
-      throw new import_js_repository10.InvalidArgumentError(
+      throw new import_js_repository3.InvalidArgumentError(
         'The provided option "where" should be an Object, but %v given.',
         clause
       );
@@ -1385,7 +1429,7 @@ var _MongodbAdapter = class _MongodbAdapter extends import_js_repository3.Adapte
     Object.keys(clause).forEach((key) => {
       var _a, _b;
       if (String(key).indexOf("$") !== -1)
-        throw new import_js_repository10.InvalidArgumentError(
+        throw new import_js_repository3.InvalidArgumentError(
           'The symbol "$" is not supported, but %v given.',
           key
         );
@@ -1393,7 +1437,7 @@ var _MongodbAdapter = class _MongodbAdapter extends import_js_repository3.Adapte
       if (key === "and" || key === "or" || key === "nor") {
         if (cond == null) return;
         if (!Array.isArray(cond))
-          throw new import_js_repository11.InvalidOperatorValueError(key, "an Array", cond);
+          throw new import_js_repository3.InvalidOperatorValueError(key, "an Array", cond);
         if (cond.length === 0) return;
         cond = cond.map((c) => this._buildQuery(modelName, c));
         cond = cond.filter((c) => c != null);
@@ -1446,7 +1490,7 @@ var _MongodbAdapter = class _MongodbAdapter extends import_js_repository3.Adapte
         }
         if ("inq" in cond) {
           if (!cond.inq || !Array.isArray(cond.inq))
-            throw new import_js_repository11.InvalidOperatorValueError(
+            throw new import_js_repository3.InvalidOperatorValueError(
               "inq",
               "an Array of possible values",
               cond.inq
@@ -1460,7 +1504,7 @@ var _MongodbAdapter = class _MongodbAdapter extends import_js_repository3.Adapte
         }
         if ("nin" in cond) {
           if (!cond.nin || !Array.isArray(cond.nin))
-            throw new import_js_repository11.InvalidOperatorValueError(
+            throw new import_js_repository3.InvalidOperatorValueError(
               "nin",
               "an Array of possible values",
               cond
@@ -1474,7 +1518,7 @@ var _MongodbAdapter = class _MongodbAdapter extends import_js_repository3.Adapte
         }
         if ("between" in cond) {
           if (!Array.isArray(cond.between) || cond.between.length !== 2)
-            throw new import_js_repository11.InvalidOperatorValueError(
+            throw new import_js_repository3.InvalidOperatorValueError(
               "between",
               "an Array of 2 elements",
               cond.between
@@ -1485,7 +1529,7 @@ var _MongodbAdapter = class _MongodbAdapter extends import_js_repository3.Adapte
         }
         if ("exists" in cond) {
           if (typeof cond.exists !== "boolean")
-            throw new import_js_repository11.InvalidOperatorValueError(
+            throw new import_js_repository3.InvalidOperatorValueError(
               "exists",
               "a Boolean",
               cond.exists
@@ -1494,44 +1538,44 @@ var _MongodbAdapter = class _MongodbAdapter extends import_js_repository3.Adapte
         }
         if ("like" in cond) {
           if (typeof cond.like !== "string" && !(cond.like instanceof RegExp))
-            throw new import_js_repository11.InvalidOperatorValueError(
+            throw new import_js_repository3.InvalidOperatorValueError(
               "like",
               "a String or RegExp",
               cond.like
             );
-          opConds.push({ $regex: (0, import_js_repository6.stringToRegexp)(cond.like) });
+          opConds.push({ $regex: (0, import_js_repository3.likeToRegexp)(cond.like) });
         }
         if ("nlike" in cond) {
           if (typeof cond.nlike !== "string" && !(cond.nlike instanceof RegExp))
-            throw new import_js_repository11.InvalidOperatorValueError(
+            throw new import_js_repository3.InvalidOperatorValueError(
               "nlike",
               "a String or RegExp",
               cond.nlike
             );
-          opConds.push({ $not: (0, import_js_repository6.stringToRegexp)(cond.nlike) });
+          opConds.push({ $not: (0, import_js_repository3.likeToRegexp)(cond.nlike) });
         }
         if ("ilike" in cond) {
           if (typeof cond.ilike !== "string" && !(cond.ilike instanceof RegExp))
-            throw new import_js_repository11.InvalidOperatorValueError(
+            throw new import_js_repository3.InvalidOperatorValueError(
               "ilike",
               "a String or RegExp",
               cond.ilike
             );
-          opConds.push({ $regex: (0, import_js_repository6.stringToRegexp)(cond.ilike, "i") });
+          opConds.push({ $regex: (0, import_js_repository3.likeToRegexp)(cond.ilike, true) });
         }
         if ("nilike" in cond) {
           if (typeof cond.nilike !== "string" && !(cond.nilike instanceof RegExp)) {
-            throw new import_js_repository11.InvalidOperatorValueError(
+            throw new import_js_repository3.InvalidOperatorValueError(
               "nilike",
               "a String or RegExp",
               cond.nilike
             );
           }
-          opConds.push({ $not: (0, import_js_repository6.stringToRegexp)(cond.nilike, "i") });
+          opConds.push({ $not: (0, import_js_repository3.likeToRegexp)(cond.nilike, true) });
         }
         if ("regexp" in cond) {
           if (typeof cond.regexp !== "string" && !(cond.regexp instanceof RegExp)) {
-            throw new import_js_repository11.InvalidOperatorValueError(
+            throw new import_js_repository3.InvalidOperatorValueError(
               "regexp",
               "a String or RegExp",
               cond.regexp
@@ -1539,11 +1583,11 @@ var _MongodbAdapter = class _MongodbAdapter extends import_js_repository3.Adapte
           }
           const flags = cond.flags || void 0;
           if (flags && typeof flags !== "string")
-            throw new import_js_repository10.InvalidArgumentError(
+            throw new import_js_repository3.InvalidArgumentError(
               "RegExp flags must be a String, but %v given.",
               cond.flags
             );
-          opConds.push({ $regex: (0, import_js_repository6.stringToRegexp)(cond.regexp, flags) });
+          opConds.push({ $regex: (0, import_js_repository3.stringToRegexp)(cond.regexp, flags) });
         }
         if (opConds.length === 1) {
           query[key] = opConds[0];
@@ -1570,10 +1614,10 @@ var _MongodbAdapter = class _MongodbAdapter extends import_js_repository3.Adapte
     const idValue = modelData[idPropName];
     if (idValue == null || idValue === "" || idValue === 0) {
       const pkType = this._getIdType(modelName);
-      if (pkType !== import_js_repository4.DataType.STRING && pkType !== import_js_repository4.DataType.ANY)
-        throw new import_js_repository10.InvalidArgumentError(
+      if (pkType !== import_js_repository3.DataType.STRING && pkType !== import_js_repository3.DataType.ANY)
+        throw new import_js_repository3.InvalidArgumentError(
           "MongoDB unable to generate primary keys of %s. Do provide your own value for the %v property or set property type to String.",
-          (0, import_js_repository5.capitalize)(pkType),
+          (0, import_js_repository3.capitalize)(pkType),
           idPropName
         );
       delete modelData[idPropName];
@@ -1605,7 +1649,7 @@ var _MongodbAdapter = class _MongodbAdapter extends import_js_repository3.Adapte
     const table = this._getCollection(modelName);
     const { matchedCount } = await table.replaceOne({ _id: id }, tableData);
     if (matchedCount < 1)
-      throw new import_js_repository10.InvalidArgumentError("Identifier %v is not found.", String(id));
+      throw new import_js_repository3.InvalidArgumentError("Identifier %v is not found.", String(id));
     const projection = this._buildProjection(
       modelName,
       filter && filter.fields
@@ -1627,10 +1671,10 @@ var _MongodbAdapter = class _MongodbAdapter extends import_js_repository3.Adapte
     idValue = this._coerceId(idValue);
     if (idValue == null || idValue === "" || idValue === 0) {
       const pkType = this._getIdType(modelName);
-      if (pkType !== import_js_repository4.DataType.STRING && pkType !== import_js_repository4.DataType.ANY)
-        throw new import_js_repository10.InvalidArgumentError(
+      if (pkType !== import_js_repository3.DataType.STRING && pkType !== import_js_repository3.DataType.ANY)
+        throw new import_js_repository3.InvalidArgumentError(
           "MongoDB unable to generate primary keys of %s. Do provide your own value for the %v property or set property type to String.",
-          (0, import_js_repository5.capitalize)(pkType),
+          (0, import_js_repository3.capitalize)(pkType),
           idPropName
         );
       delete modelData[idPropName];
@@ -1688,7 +1732,7 @@ var _MongodbAdapter = class _MongodbAdapter extends import_js_repository3.Adapte
     const table = this._getCollection(modelName);
     const { matchedCount } = await table.updateOne({ _id: id }, { $set: tableData });
     if (matchedCount < 1)
-      throw new import_js_repository10.InvalidArgumentError("Identifier %v is not found.", String(id));
+      throw new import_js_repository3.InvalidArgumentError("Identifier %v is not found.", String(id));
     const projection = this._buildProjection(
       modelName,
       filter && filter.fields
@@ -1732,7 +1776,7 @@ var _MongodbAdapter = class _MongodbAdapter extends import_js_repository3.Adapte
     );
     const patchedData = await table.findOne({ _id: id }, { projection });
     if (!patchedData)
-      throw new import_js_repository10.InvalidArgumentError("Identifier %v is not found.", String(id));
+      throw new import_js_repository3.InvalidArgumentError("Identifier %v is not found.", String(id));
     return this._fromDatabase(modelName, patchedData);
   }
   /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e22m4u/js-repository-mongodb-adapter",
-  "version": "0.6.4",
+  "version": "0.7.1",
   "description": "MongoDB адаптер для @e22m4u/js-repository",
   "author": "Mikhail Evstropov <e22m4u@yandex.ru>",
   "license": "MIT",
@@ -42,25 +42,25 @@
   },
   "peerDependencies": {
     "@e22m4u/js-format": "~0.2.0",
-    "@e22m4u/js-repository": "~0.5.0"
+    "@e22m4u/js-repository": "~0.6.3"
   },
   "devDependencies": {
-    "@commitlint/cli": "~19.8.1",
-    "@commitlint/config-conventional": "~19.8.1",
-    "@eslint/js": "~9.36.0",
+    "@commitlint/cli": "~20.1.0",
+    "@commitlint/config-conventional": "~20.0.0",
+    "@eslint/js": "~9.39.0",
     "c8": "~10.1.3",
-    "chai": "~6.0.1",
+    "chai": "~6.2.0",
     "chai-as-promised": "~8.0.2",
-    "dotenv": "~17.2.2",
-    "esbuild": "~0.25.10",
-    "eslint": "~9.36.0",
+    "dotenv": "~17.2.3",
+    "esbuild": "~0.25.12",
+    "eslint": "~9.39.0",
     "eslint-config-prettier": "~10.1.8",
     "eslint-plugin-chai-expect": "~3.1.0",
-    "eslint-plugin-mocha": "~11.1.0",
-    "globals": "~16.4.0",
+    "eslint-plugin-mocha": "~11.2.0",
+    "globals": "~16.5.0",
     "husky": "~9.1.7",
-    "mocha": "~11.7.2",
+    "mocha": "~11.7.4",
     "prettier": "~3.6.2",
-    "rimraf": "~6.0.1"
+    "rimraf": "~6.1.0"
   }
 }

package/src/mongodb-adapter.js

@@ -1,21 +1,28 @@
 /* eslint no-unused-vars: 0 */
 import {ObjectId} from 'mongodb';
 import {MongoClient} from 'mongodb';
-import {isIsoDate} from './utils/index.js';
-import {isObjectId} from './utils/index.js';
-import {Adapter} from '@e22m4u/js-repository';
-import {DataType} from '@e22m4u/js-repository';
-import {capitalize} from '@e22m4u/js-repository';
-import {createMongodbUrl} from './utils/index.js';
 import {ServiceContainer} from '@e22m4u/js-service';
-import {transformValuesDeep} from './utils/index.js';
-import {stringToRegexp} from '@e22m4u/js-repository';
-import {selectObjectKeys} from '@e22m4u/js-repository';
-import {DefinitionRegistry} from '@e22m4u/js-repository';
-import {ModelDefinitionUtils} from '@e22m4u/js-repository';
-import {InvalidArgumentError} from '@e22m4u/js-repository';
-import {modelNameToCollectionName} from './utils/index.js';
-import {InvalidOperatorValueError} from '@e22m4u/js-repository';
+
+import {
+  Adapter,
+  DataType,
+  likeToRegexp,
+  capitalize,
+  stringToRegexp,
+  selectObjectKeys,
+  DefinitionRegistry,
+  ModelDefinitionUtils,
+  InvalidArgumentError,
+  InvalidOperatorValueError,
+} from '@e22m4u/js-repository';
+
+import {
+  isIsoDate,
+  isObjectId,
+  createMongodbUrl,
+  transformValuesDeep,
+  modelNameToCollectionName,
+} from './utils/index.js';
 
 /**
  * Mongodb option names.
@@ -630,7 +637,7 @@ export class MongodbAdapter extends Adapter {
               'a String or RegExp',
               cond.like,
             );
-          opConds.push({$regex: stringToRegexp(cond.like)});
+          opConds.push({$regex: likeToRegexp(cond.like)});
         }
         // nlike
         if ('nlike' in cond) {
@@ -640,7 +647,7 @@ export class MongodbAdapter extends Adapter {
               'a String or RegExp',
               cond.nlike,
             );
-          opConds.push({$not: stringToRegexp(cond.nlike)});
+          opConds.push({$not: likeToRegexp(cond.nlike)});
         }
         // ilike
         if ('ilike' in cond) {
@@ -650,7 +657,7 @@ export class MongodbAdapter extends Adapter {
               'a String or RegExp',
               cond.ilike,
             );
-          opConds.push({$regex: stringToRegexp(cond.ilike, 'i')});
+          opConds.push({$regex: likeToRegexp(cond.ilike, true)});
         }
         // nilike
         if ('nilike' in cond) {
@@ -664,7 +671,7 @@ export class MongodbAdapter extends Adapter {
               cond.nilike,
             );
           }
-          opConds.push({$not: stringToRegexp(cond.nilike, 'i')});
+          opConds.push({$not: likeToRegexp(cond.nilike, true)});
         }
         // regexp and flags (optional)
         if ('regexp' in cond) {

package/src/mongodb-adapter.spec.js

@@ -1164,39 +1164,63 @@ describe('MongodbAdapter', function () {
     });
 
     it('converts the "like" operator to "$regex"', async function () {
-      const input = {foo: {like: 'test'}};
+      const input1 = {foo: {like: 'test'}};
+      const input2 = {foo: {like: 'test%'}};
+      const input3 = {foo: {like: 'test_'}};
       const schema = createSchema();
       schema.defineModel({name: 'model', datasource: 'mongodb'});
       const A = await schema.getService(AdapterRegistry).getAdapter('mongodb');
-      const res = A._buildQuery('model', input);
-      expect(res).to.be.eql({foo: {$regex: /test/}});
+      const res1 = A._buildQuery('model', input1);
+      const res2 = A._buildQuery('model', input2);
+      const res3 = A._buildQuery('model', input3);
+      expect(res1).to.be.eql({foo: {$regex: /^test$/}});
+      expect(res2).to.be.eql({foo: {$regex: /^test.*$/}});
+      expect(res3).to.be.eql({foo: {$regex: /^test.$/}});
     });
 
     it('converts the "nlike" operator to "$not"', async function () {
-      const input = {foo: {nlike: 'test'}};
+      const input1 = {foo: {nlike: 'test'}};
+      const input2 = {foo: {nlike: 'test%'}};
+      const input3 = {foo: {nlike: 'test_'}};
       const schema = createSchema();
       schema.defineModel({name: 'model', datasource: 'mongodb'});
       const A = await schema.getService(AdapterRegistry).getAdapter('mongodb');
-      const res = A._buildQuery('model', input);
-      expect(res).to.be.eql({foo: {$not: /test/}});
+      const res1 = A._buildQuery('model', input1);
+      const res2 = A._buildQuery('model', input2);
+      const res3 = A._buildQuery('model', input3);
+      expect(res1).to.be.eql({foo: {$not: /^test$/}});
+      expect(res2).to.be.eql({foo: {$not: /^test.*$/}});
+      expect(res3).to.be.eql({foo: {$not: /^test.$/}});
     });
 
     it('converts the "ilike" operator to "$regex" with "i" flag', async function () {
-      const input = {foo: {ilike: 'test'}};
+      const input1 = {foo: {ilike: 'test'}};
+      const input2 = {foo: {ilike: 'test%'}};
+      const input3 = {foo: {ilike: 'test_'}};
       const schema = createSchema();
       schema.defineModel({name: 'model', datasource: 'mongodb'});
       const A = await schema.getService(AdapterRegistry).getAdapter('mongodb');
-      const res = A._buildQuery('model', input);
-      expect(res).to.be.eql({foo: {$regex: /test/i}});
+      const res1 = A._buildQuery('model', input1);
+      const res2 = A._buildQuery('model', input2);
+      const res3 = A._buildQuery('model', input3);
+      expect(res1).to.be.eql({foo: {$regex: /^test$/i}});
+      expect(res2).to.be.eql({foo: {$regex: /^test.*$/i}});
+      expect(res3).to.be.eql({foo: {$regex: /^test.$/i}});
     });
 
     it('converts the "nilike" operator to "$not" with "i" flag', async function () {
-      const input = {foo: {nilike: 'test'}};
+      const input1 = {foo: {nilike: 'test'}};
+      const input2 = {foo: {nilike: 'test%'}};
+      const input3 = {foo: {nilike: 'test_'}};
       const schema = createSchema();
       schema.defineModel({name: 'model', datasource: 'mongodb'});
       const A = await schema.getService(AdapterRegistry).getAdapter('mongodb');
-      const res = A._buildQuery('model', input);
-      expect(res).to.be.eql({foo: {$not: /test/i}});
+      const res1 = A._buildQuery('model', input1);
+      const res2 = A._buildQuery('model', input2);
+      const res3 = A._buildQuery('model', input3);
+      expect(res1).to.be.eql({foo: {$not: /^test$/i}});
+      expect(res2).to.be.eql({foo: {$not: /^test.*$/i}});
+      expect(res3).to.be.eql({foo: {$not: /^test.$/i}});
     });
 
     it('converts property value to an instance of ObjectId', async function () {
@@ -1442,10 +1466,10 @@ describe('MongodbAdapter', function () {
           {foo: {$nin: ['qwe']}},
           {foo: {$gte: 100, $lte: 200}},
           {foo: {$exists: true}},
-          {foo: {$regex: /asd/}},
-          {foo: {$not: /zxc/}},
-          {foo: {$regex: /rty/i}},
-          {foo: {$not: /fgh/i}},
+          {foo: {$regex: /^asd$/}},
+          {foo: {$not: /^zxc$/}},
+          {foo: {$regex: /^rty$/i}},
+          {foo: {$not: /^fgh$/i}},
           {foo: {$regex: /vbn/i}},
         ],
       };
@@ -1492,10 +1516,10 @@ describe('MongodbAdapter', function () {
           {foo: {$nin: ['qwe']}},
           {foo: {$gte: 100, $lte: 200}},
           {foo: {$exists: true}},
-          {foo: {$regex: /asd/}},
-          {foo: {$not: /zxc/}},
-          {foo: {$regex: /rty/i}},
-          {foo: {$not: /fgh/i}},
+          {foo: {$regex: /^asd$/}},
+          {foo: {$not: /^zxc$/}},
+          {foo: {$regex: /^rty$/i}},
+          {foo: {$not: /^fgh$/i}},
           {foo: {$regex: /vbn/i}},
         ],
       };
@@ -3814,7 +3838,7 @@ describe('MongodbAdapter', function () {
         const id4 = input4[DEF_PK];
         const result = await rep.patch(
           {foo: 'test'},
-          {foo: {like: 'sit amet'}},
+          {foo: {like: '%sit amet%'}},
         );
         expect(result).to.be.eq(2);
         const rawData = await MDB_CLIENT.db()
@@ -3843,7 +3867,7 @@ describe('MongodbAdapter', function () {
         const id4 = input4[DEF_PK];
         const result = await rep.patch(
           {foo: 'test'},
-          {foo: {nlike: 'sit amet'}},
+          {foo: {nlike: '%sit amet%'}},
         );
         expect(result).to.be.eq(2);
         const rawData = await MDB_CLIENT.db()
@@ -3872,7 +3896,7 @@ describe('MongodbAdapter', function () {
         const id4 = input4[DEF_PK];
         const result = await rep.patch(
           {foo: 'test'},
-          {foo: {ilike: 'sit amet'}},
+          {foo: {ilike: '%sit amet%'}},
         );
         expect(result).to.be.eq(3);
         const rawData = await MDB_CLIENT.db()
@@ -3901,7 +3925,7 @@ describe('MongodbAdapter', function () {
         const id4 = input4[DEF_PK];
         const result = await rep.patch(
           {foo: 'test'},
-          {foo: {nilike: 'sit amet'}},
+          {foo: {nilike: '%sit amet%'}},
         );
         expect(result).to.be.eq(1);
         const rawData = await MDB_CLIENT.db()
@@ -4703,7 +4727,7 @@ describe('MongodbAdapter', function () {
         const created2 = await rep.create({foo: 'dolor sit amet'});
         await rep.create({foo: 'DOLOR SIT AMET'});
         const created4 = await rep.create({foo: 'sit amet'});
-        const result = await rep.find({where: {foo: {like: 'sit amet'}}});
+        const result = await rep.find({where: {foo: {like: '%sit amet%'}}});
         expect(result).to.be.eql([
           {[DEF_PK]: created2[DEF_PK], foo: 'dolor sit amet'},
           {[DEF_PK]: created4[DEF_PK], foo: 'sit amet'},
@@ -4718,7 +4742,7 @@ describe('MongodbAdapter', function () {
         const created2 = await rep.create({foo: 'dolor sit amet'});
         const created3 = await rep.create({foo: 'DOLOR SIT AMET'});
         const created4 = await rep.create({foo: 'sit amet'});
-        const result = await rep.find({where: {foo: {ilike: 'sit amet'}}});
+        const result = await rep.find({where: {foo: {ilike: '%sit amet%'}}});
         expect(result).to.be.eql([
           {[DEF_PK]: created2[DEF_PK], foo: 'dolor sit amet'},
           {[DEF_PK]: created3[DEF_PK], foo: 'DOLOR SIT AMET'},
@@ -4734,7 +4758,7 @@ describe('MongodbAdapter', function () {
         await rep.create({foo: 'dolor sit amet'});
         const created3 = await rep.create({foo: 'DOLOR SIT AMET'});
         await rep.create({foo: 'sit amet'});
-        const result = await rep.find({where: {foo: {nlike: 'sit amet'}}});
+        const result = await rep.find({where: {foo: {nlike: '%sit amet%'}}});
         expect(result).to.be.eql([
           {[DEF_PK]: created1[DEF_PK], foo: 'lorem ipsum'},
           {[DEF_PK]: created3[DEF_PK], foo: 'DOLOR SIT AMET'},
@@ -4749,7 +4773,7 @@ describe('MongodbAdapter', function () {
         await rep.create({foo: 'dolor sit amet'});
         await rep.create({foo: 'DOLOR SIT AMET'});
         await rep.create({foo: 'sit amet'});
-        const result = await rep.find({where: {foo: {nilike: 'sit amet'}}});
+        const result = await rep.find({where: {foo: {nilike: '%sit amet%'}}});
         expect(result).to.be.eql([
           {[DEF_PK]: created1[DEF_PK], foo: 'lorem ipsum'},
         ]);
@@ -5077,7 +5101,7 @@ describe('MongodbAdapter', function () {
         await rep.create({foo: 'dolor sit amet'});
         const created3 = await rep.create({foo: 'DOLOR SIT AMET'});
         await rep.create({foo: 'sit amet'});
-        const result = await rep.delete({foo: {like: 'sit amet'}});
+        const result = await rep.delete({foo: {like: '%sit amet%'}});
         expect(result).to.be.eq(2);
         const rawData = await MDB_CLIENT.db()
           .collection('models')
@@ -5097,7 +5121,7 @@ describe('MongodbAdapter', function () {
         const created2 = await rep.create({foo: 'dolor sit amet'});
         await rep.create({foo: 'DOLOR SIT AMET'});
         const created4 = await rep.create({foo: 'sit amet'});
-        const result = await rep.delete({foo: {nlike: 'sit amet'}});
+        const result = await rep.delete({foo: {nlike: '%sit amet%'}});
         expect(result).to.be.eq(2);
         const rawData = await MDB_CLIENT.db()
           .collection('models')
@@ -5117,7 +5141,7 @@ describe('MongodbAdapter', function () {
         await rep.create({foo: 'dolor sit amet'});
         await rep.create({foo: 'DOLOR SIT AMET'});
         await rep.create({foo: 'sit amet'});
-        const result = await rep.delete({foo: {ilike: 'sit amet'}});
+        const result = await rep.delete({foo: {ilike: '%sit amet%'}});
         expect(result).to.be.eq(3);
         const rawData = await MDB_CLIENT.db()
           .collection('models')
@@ -5136,7 +5160,7 @@ describe('MongodbAdapter', function () {
         const created2 = await rep.create({foo: 'dolor sit amet'});
         const created3 = await rep.create({foo: 'DOLOR SIT AMET'});
         const created4 = await rep.create({foo: 'sit amet'});
-        const result = await rep.delete({foo: {nilike: 'sit amet'}});
+        const result = await rep.delete({foo: {nilike: '%sit amet%'}});
         expect(result).to.be.eq(1);
         const rawData = await MDB_CLIENT.db()
           .collection('models')
@@ -5401,7 +5425,7 @@ describe('MongodbAdapter', function () {
         await rep.create({foo: 'dolor sit amet'});
         await rep.create({foo: 'DOLOR SIT AMET'});
         await rep.create({foo: 'sit amet'});
-        const result = await rep.count({foo: {like: 'sit amet'}});
+        const result = await rep.count({foo: {like: '%sit amet%'}});
         expect(result).to.be.eql(2);
       });
 
@@ -5413,7 +5437,7 @@ describe('MongodbAdapter', function () {
         await rep.create({foo: 'dolor sit amet'});
         await rep.create({foo: 'DOLOR SIT AMET'});
         await rep.create({foo: 'sit amet'});
-        const result = await rep.count({foo: {nlike: 'sit amet'}});
+        const result = await rep.count({foo: {nlike: '%sit amet%'}});
         expect(result).to.be.eql(2);
       });
 
@@ -5425,7 +5449,7 @@ describe('MongodbAdapter', function () {
         await rep.create({foo: 'dolor sit amet'});
         await rep.create({foo: 'DOLOR SIT AMET'});
         await rep.create({foo: 'sit amet'});
-        const result = await rep.count({foo: {ilike: 'sit amet'}});
+        const result = await rep.count({foo: {ilike: '%sit amet%'}});
         expect(result).to.be.eql(3);
       });
 
@@ -5437,7 +5461,7 @@ describe('MongodbAdapter', function () {
         await rep.create({foo: 'dolor sit amet'});
         await rep.create({foo: 'DOLOR SIT AMET'});
         await rep.create({foo: 'sit amet'});
-        const result = await rep.count({foo: {nilike: 'sit amet'}});
+        const result = await rep.count({foo: {nilike: '%sit amet%'}});
         expect(result).to.be.eql(1);
       });