@e22m4u/js-repository-mongodb-adapter 0.7.2 → 0.8.1

package/.mocharc.json

@@ -0,0 +1,5 @@
+{
+  "extension": ["js"],
+  "spec": "src/**/*.spec.js",
+  "require": "./mocha.setup.js"
+}

package/dist/cjs/index.cjs

@@ -28,7 +28,6 @@ module.exports = __toCommonJS(index_exports);
 
 // src/mongodb-adapter.js
 var import_mongodb2 = require("mongodb");
-var import_mongodb3 = require("mongodb");
 
 // node_modules/@e22m4u/js-service/src/errors/invalid-argument-error.js
 var import_js_format = require("@e22m4u/js-format");
@@ -991,17 +990,6 @@ function transformValuesDeep(value, transformer) {
 }
 __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",
@@ -1109,7 +1097,6 @@ var _MongodbAdapter = class _MongodbAdapter extends import_js_repository3.Adapte
    * Mongodb instance.
    *
    * @type {MongoClient}
-   * @private
    */
   _client;
   /**
@@ -1124,14 +1111,13 @@ var _MongodbAdapter = class _MongodbAdapter extends import_js_repository3.Adapte
    * Collections.
    *
    * @type {Map<any, any>}
-   * @private
    */
   _collections = /* @__PURE__ */ new Map();
   /**
    * Constructor.
    *
    * @param {ServiceContainer} container
-   * @param settings
+   * @param {object} settings
    */
   constructor(container, settings) {
     settings = Object.assign({}, DEFAULT_SETTINGS, settings || {});
@@ -1142,13 +1128,13 @@ var _MongodbAdapter = class _MongodbAdapter extends import_js_repository3.Adapte
     super(container, settings);
     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);
+    this._client = new import_mongodb2.MongoClient(url, options);
   }
   /**
    * Get id prop name.
    *
-   * @param modelName
-   * @private
+   * @param {string} modelName
+   * @returns {string}
    */
   _getIdPropName(modelName) {
     return this.getService(import_js_repository3.ModelDefinitionUtils).getPrimaryKeyAsPropertyName(
@@ -1158,8 +1144,8 @@ var _MongodbAdapter = class _MongodbAdapter extends import_js_repository3.Adapte
   /**
    * Get id col name.
    *
-   * @param modelName
-   * @private
+   * @param {string} modelName
+   * @returns {string}
    */
   _getIdColName(modelName) {
     return this.getService(import_js_repository3.ModelDefinitionUtils).getPrimaryKeyAsColumnName(
@@ -1169,9 +1155,8 @@ var _MongodbAdapter = class _MongodbAdapter extends import_js_repository3.Adapte
   /**
    * Coerce id.
    *
-   * @param value
+   * @param {*} value
    * @returns {ObjectId|*}
-   * @private
    */
   _coerceId(value) {
     if (value == null) return value;
@@ -1181,9 +1166,8 @@ var _MongodbAdapter = class _MongodbAdapter extends import_js_repository3.Adapte
   /**
    * Coerce date.
    *
-   * @param value
+   * @param {Date|string|*} value
    * @returns {Date|*}
-   * @private
    */
   _coerceDate(value) {
     if (value == null) return value;
@@ -1197,7 +1181,6 @@ var _MongodbAdapter = class _MongodbAdapter extends import_js_repository3.Adapte
    * @param {string} modelName
    * @param {object} modelData
    * @returns {object}
-   * @private
    */
   _toDatabase(modelName, modelData) {
     const tableData = this.getService(
@@ -1227,7 +1210,6 @@ var _MongodbAdapter = class _MongodbAdapter extends import_js_repository3.Adapte
    * @param {string} modelName
    * @param {object} tableData
    * @returns {object}
-   * @private
    */
   _fromDatabase(modelName, tableData) {
     if ("_id" in tableData) {
@@ -1255,18 +1237,18 @@ var _MongodbAdapter = class _MongodbAdapter extends import_js_repository3.Adapte
    * Get collection name by model name.
    *
    * @param {string} modelName
+   * @returns {string}
    */
   _getCollectionNameByModelName(modelName) {
     const modelDef = this.getService(import_js_repository3.DefinitionRegistry).getModel(modelName);
     if (modelDef.tableName != null) return modelDef.tableName;
-    return modelNameToCollectionName(modelDef.name);
+    return pluralize(toCamelCase2(modelDef.name));
   }
   /**
    * Get collection.
    *
    * @param {string} modelName
    * @returns {*}
-   * @private
    */
   _getCollection(modelName) {
     let collection = this._collections.get(modelName);
@@ -1279,9 +1261,8 @@ var _MongodbAdapter = class _MongodbAdapter extends import_js_repository3.Adapte
   /**
    * Get id type.
    *
-   * @param modelName
+   * @param {string} modelName
    * @returns {string|*}
-   * @private
    */
   _getIdType(modelName) {
     const utils = this.getService(import_js_repository3.ModelDefinitionUtils);
@@ -1294,7 +1275,6 @@ var _MongodbAdapter = class _MongodbAdapter extends import_js_repository3.Adapte
    * @param {string} modelName
    * @param {string} propName
    * @returns {string}
-   * @private
    */
   _getColName(modelName, propName) {
     if (!propName || typeof propName !== "string")
@@ -1319,7 +1299,6 @@ var _MongodbAdapter = class _MongodbAdapter extends import_js_repository3.Adapte
    * @param {string} modelName
    * @param {string} propsChain
    * @returns {string}
-   * @private
    */
   _convertPropNamesChainToColNamesChain(modelName, propsChain) {
     if (!modelName || typeof modelName !== "string")
@@ -1352,7 +1331,6 @@ var _MongodbAdapter = class _MongodbAdapter extends import_js_repository3.Adapte
    * @param {string} modelName
    * @param {string|string[]} fields
    * @returns {Record<string, number>|undefined}
-   * @private
    */
   _buildProjection(modelName, fields) {
     if (fields == null) return;
@@ -1379,7 +1357,6 @@ var _MongodbAdapter = class _MongodbAdapter extends import_js_repository3.Adapte
    * @param {string} modelName
    * @param {string|string[]} clause
    * @returns {object|undefined}
-   * @private
    */
   _buildSort(modelName, clause) {
     if (clause == null) return;
@@ -1414,8 +1391,7 @@ var _MongodbAdapter = class _MongodbAdapter extends import_js_repository3.Adapte
    *
    * @param {string} modelName
    * @param {object} clause
-   * @returns {object}
-   * @private
+   * @returns {object|undefined}
    */
   _buildQuery(modelName, clause) {
     if (clause == null) return;

package/eslint.config.js

@@ -1,6 +1,8 @@
 import globals from 'globals';
 import eslintJs from '@eslint/js';
+import eslintJsdocPlugin from 'eslint-plugin-jsdoc';
 import eslintMochaPlugin from 'eslint-plugin-mocha';
+import eslintImportPlugin from 'eslint-plugin-import';
 import eslintPrettierConfig from 'eslint-config-prettier';
 import eslintChaiExpectPlugin from 'eslint-plugin-chai-expect';
 
@@ -13,14 +15,25 @@ export default [{
     },
   },
   plugins: {
+    'jsdoc': eslintJsdocPlugin,
     'mocha': eslintMochaPlugin,
+    'import': eslintImportPlugin,
     'chai-expect': eslintChaiExpectPlugin,
   },
   rules: {
     ...eslintJs.configs.recommended.rules,
     ...eslintPrettierConfig.rules,
+    ...eslintImportPlugin.flatConfigs.recommended.rules,
     ...eslintMochaPlugin.configs.recommended.rules,
     ...eslintChaiExpectPlugin.configs['recommended-flat'].rules,
+    ...eslintJsdocPlugin.configs['flat/recommended-error'].rules,
+    'no-duplicate-imports': 'error',
+    'jsdoc/reject-any-type': 0,
+    'jsdoc/reject-function-type': 0,
+    'jsdoc/require-param-description': 0,
+    'jsdoc/require-returns-description': 0,
+    'jsdoc/require-property-description': 0,
+    'jsdoc/tag-lines': ['error', 'any', {startLines: 1}],
   },
   files: ['src/**/*.js'],
 }];

package/jsconfig.json

@@ -0,0 +1,7 @@
+{
+  "compilerOptions": {
+    "target": "es2022",
+    "module": "NodeNext",
+    "moduleResolution": "NodeNext"
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e22m4u/js-repository-mongodb-adapter",
-  "version": "0.7.2",
+  "version": "0.8.1",
   "description": "MongoDB адаптер для @e22m4u/js-repository",
   "author": "Mikhail Evstropov <e22m4u@yandex.ru>",
   "license": "MIT",
@@ -13,10 +13,10 @@
     "Datasource",
     "Relations"
   ],
-  "homepage": "https://github.com/e22m4u/js-repository-mongodb-adapter",
+  "homepage": "https://gitrepos.ru/e22m4u/js-repository-mongodb-adapter",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/e22m4u/js-repository-mongodb-adapter.git"
+    "url": "git+https://gitrepos.ru/e22m4u/js-repository-mongodb-adapter.git"
   },
   "type": "module",
   "module": "./src/index.js",
@@ -38,29 +38,31 @@
     "prepare": "husky"
   },
   "dependencies": {
-    "@e22m4u/js-format": "~0.2.1",
+    "@e22m4u/js-format": "~0.3.0",
     "mongodb": "6.20.0"
   },
   "peerDependencies": {
-    "@e22m4u/js-repository": "~0.6.3"
+    "@e22m4u/js-repository": "~0.8.0"
   },
   "devDependencies": {
     "@commitlint/cli": "~20.1.0",
     "@commitlint/config-conventional": "~20.0.0",
     "@eslint/js": "~9.39.1",
     "c8": "~10.1.3",
-    "chai": "~6.2.0",
+    "chai": "~6.2.1",
     "chai-as-promised": "~8.0.2",
     "dotenv": "~17.2.3",
-    "esbuild": "~0.25.12",
+    "esbuild": "~0.27.0",
     "eslint": "~9.39.1",
     "eslint-config-prettier": "~10.1.8",
     "eslint-plugin-chai-expect": "~3.1.0",
+    "eslint-plugin-import": "~2.32.0",
+    "eslint-plugin-jsdoc": "~61.4.1",
     "eslint-plugin-mocha": "~11.2.0",
     "globals": "~16.5.0",
     "husky": "~9.1.7",
     "mocha": "~11.7.5",
-    "prettier": "~3.6.2",
-    "rimraf": "~6.1.0"
+    "prettier": "~3.7.3",
+    "rimraf": "~6.1.2"
   }
 }

package/src/mongodb-adapter.js

@@ -1,6 +1,5 @@
 /* eslint no-unused-vars: 0 */
-import {ObjectId} from 'mongodb';
-import {MongoClient} from 'mongodb';
+import {ObjectId, MongoClient} from 'mongodb';
 import {ServiceContainer} from '@e22m4u/js-service';
 
 import {
@@ -17,11 +16,12 @@ import {
 } from '@e22m4u/js-repository';
 
 import {
+  pluralize,
   isIsoDate,
   isObjectId,
+  toCamelCase,
   createMongodbUrl,
   transformValuesDeep,
-  modelNameToCollectionName,
 } from './utils/index.js';
 
 /**
@@ -148,7 +148,6 @@ export class MongodbAdapter extends Adapter {
    * Mongodb instance.
    *
    * @type {MongoClient}
-   * @private
    */
   _client;
 
@@ -165,7 +164,6 @@ export class MongodbAdapter extends Adapter {
    * Collections.
    *
    * @type {Map<any, any>}
-   * @private
    */
   _collections = new Map();
 
@@ -173,7 +171,7 @@ export class MongodbAdapter extends Adapter {
    * Constructor.
    *
    * @param {ServiceContainer} container
-   * @param settings
+   * @param {object} settings
    */
   constructor(container, settings) {
     settings = Object.assign({}, DEFAULT_SETTINGS, settings || {});
@@ -190,8 +188,8 @@ export class MongodbAdapter extends Adapter {
   /**
    * Get id prop name.
    *
-   * @param modelName
-   * @private
+   * @param {string} modelName
+   * @returns {string}
    */
   _getIdPropName(modelName) {
     return this.getService(ModelDefinitionUtils).getPrimaryKeyAsPropertyName(
@@ -202,8 +200,8 @@ export class MongodbAdapter extends Adapter {
   /**
    * Get id col name.
    *
-   * @param modelName
-   * @private
+   * @param {string} modelName
+   * @returns {string}
    */
   _getIdColName(modelName) {
     return this.getService(ModelDefinitionUtils).getPrimaryKeyAsColumnName(
@@ -214,9 +212,8 @@ export class MongodbAdapter extends Adapter {
   /**
    * Coerce id.
    *
-   * @param value
+   * @param {*} value
    * @returns {ObjectId|*}
-   * @private
    */
   _coerceId(value) {
     if (value == null) return value;
@@ -227,9 +224,8 @@ export class MongodbAdapter extends Adapter {
   /**
    * Coerce date.
    *
-   * @param value
+   * @param {Date|string|*} value
    * @returns {Date|*}
-   * @private
    */
   _coerceDate(value) {
     if (value == null) return value;
@@ -244,7 +240,6 @@ export class MongodbAdapter extends Adapter {
    * @param {string} modelName
    * @param {object} modelData
    * @returns {object}
-   * @private
    */
   _toDatabase(modelName, modelData) {
     const tableData = this.getService(
@@ -278,7 +273,6 @@ export class MongodbAdapter extends Adapter {
    * @param {string} modelName
    * @param {object} tableData
    * @returns {object}
-   * @private
    */
   _fromDatabase(modelName, tableData) {
     if ('_id' in tableData) {
@@ -310,11 +304,16 @@ export class MongodbAdapter extends Adapter {
    * Get collection name by model name.
    *
    * @param {string} modelName
+   * @returns {string}
    */
   _getCollectionNameByModelName(modelName) {
     const modelDef = this.getService(DefinitionRegistry).getModel(modelName);
     if (modelDef.tableName != null) return modelDef.tableName;
-    return modelNameToCollectionName(modelDef.name);
+    // если имя коллекции не определено явно (опция "tableName"),
+    // то выполняется приведение имени модели к стандартному camelCase
+    // во множественном числе
+    // "Article" -> "articles", "AccessToken" -> "accessTokens"
+    return pluralize(toCamelCase(modelDef.name));
   }
 
   /**
@@ -322,7 +321,6 @@ export class MongodbAdapter extends Adapter {
    *
    * @param {string} modelName
    * @returns {*}
-   * @private
    */
   _getCollection(modelName) {
     let collection = this._collections.get(modelName);
@@ -338,9 +336,8 @@ export class MongodbAdapter extends Adapter {
   /**
    * Get id type.
    *
-   * @param modelName
+   * @param {string} modelName
    * @returns {string|*}
-   * @private
    */
   _getIdType(modelName) {
     const utils = this.getService(ModelDefinitionUtils);
@@ -354,7 +351,6 @@ export class MongodbAdapter extends Adapter {
    * @param {string} modelName
    * @param {string} propName
    * @returns {string}
-   * @private
    */
   _getColName(modelName, propName) {
     if (!propName || typeof propName !== 'string')
@@ -383,7 +379,6 @@ export class MongodbAdapter extends Adapter {
    * @param {string} modelName
    * @param {string} propsChain
    * @returns {string}
-   * @private
    */
   _convertPropNamesChainToColNamesChain(modelName, propsChain) {
     if (!modelName || typeof modelName !== 'string')
@@ -424,7 +419,6 @@ export class MongodbAdapter extends Adapter {
    * @param {string} modelName
    * @param {string|string[]} fields
    * @returns {Record<string, number>|undefined}
-   * @private
    */
   _buildProjection(modelName, fields) {
     if (fields == null) return;
@@ -453,7 +447,6 @@ export class MongodbAdapter extends Adapter {
    * @param {string} modelName
    * @param {string|string[]} clause
    * @returns {object|undefined}
-   * @private
    */
   _buildSort(modelName, clause) {
     if (clause == null) return;
@@ -493,8 +486,7 @@ export class MongodbAdapter extends Adapter {
    *
    * @param {string} modelName
    * @param {object} clause
-   * @returns {object}
-   * @private
+   * @returns {object|undefined}
    */
   _buildQuery(modelName, clause) {
     if (clause == null) return;

package/src/mongodb-adapter.spec.js

@@ -1,14 +1,16 @@
 import {expect} from 'chai';
-import {ObjectId} from 'mongodb';
-import {MongoClient} from 'mongodb';
 import {format} from '@e22m4u/js-format';
-import {DataType} from '@e22m4u/js-repository';
+import {ObjectId, MongoClient} from 'mongodb';
 import {createMongodbUrl} from './utils/index.js';
 import {MongodbAdapter} from './mongodb-adapter.js';
-import {DatabaseSchema} from '@e22m4u/js-repository';
-import {AdapterRegistry} from '@e22m4u/js-repository';
-import {InvalidOperatorValueError} from '@e22m4u/js-repository';
-import {DEFAULT_PRIMARY_KEY_PROPERTY_NAME as DEF_PK} from '@e22m4u/js-repository';
+
+import {
+  DataType,
+  DatabaseSchema,
+  AdapterRegistry,
+  InvalidOperatorValueError,
+  DEFAULT_PRIMARY_KEY_PROPERTY_NAME as DEF_PK,
+} from '@e22m4u/js-repository';
 
 const CONFIG = {
   host: process.env.MONGODB_HOST || 'localhost',
@@ -19,6 +21,11 @@ const CONFIG = {
 const MDB_CLIENT = new MongoClient(createMongodbUrl(CONFIG));
 const ADAPTERS_STACK = [];
 
+/**
+ * Database schema factory.
+ *
+ * @returns {DatabaseSchema}
+ */
 function createSchema() {
   const schema = new DatabaseSchema();
   const adapter = new MongodbAdapter(schema.container, CONFIG);
@@ -62,26 +69,6 @@ describe('MongodbAdapter', function () {
       );
     });
 
-    // prettier-ignore
-    it('cuts off the "Model" suffix from the model name', async function () {
-      const schema = createSchema();
-      const modelNamesToCollectionNames = [
-        ['camelCaseEntityModel', 'camelCaseEntities'],
-        ['PascalCaseEntityModel', 'pascalCaseEntities'],
-        ['snake_case_entity_model', 'snakeCaseEntities'],
-        ['kebab-case-entity-model', 'kebabCaseEntities'],
-        ['UPPER_SNAKE_CASE_ENTITY_MODEL', 'upperSnakeCaseEntities'],
-        ['UPPER-KEBAB-CASE-ENTITY-MODEL', 'upperKebabCaseEntities'],
-      ];
-      modelNamesToCollectionNames.forEach(tuple =>
-        schema.defineModel({name: tuple[0], datasource: 'mongodb'}),
-      );
-      const A = await schema.getService(AdapterRegistry).getAdapter('mongodb');
-      modelNamesToCollectionNames.forEach(tuple =>
-        expect(A._getCollectionNameByModelName(tuple[0])).to.be.eq(tuple[1]),
-      );
-    });
-
     it('converts already pluralized model name to camel case', async function () {
       const schema = createSchema();
       const modelNamesToCollectionNames = [
@@ -101,26 +88,6 @@ describe('MongodbAdapter', function () {
       );
     });
 
-    // prettier-ignore
-    it('converts already pluralized model name to camel case and cut off the "Model" suffix', async function () {
-      const schema = createSchema();
-      const modelNamesToCollectionNames = [
-        ['camelCaseEntitiesModel', 'camelCaseEntities'],
-        ['PascalCaseEntitiesModel', 'pascalCaseEntities'],
-        ['snake_case_entities_model', 'snakeCaseEntities'],
-        ['kebab-case-entities-model', 'kebabCaseEntities'],
-        ['UPPER_SNAKE_CASE_ENTITIES_MODEL', 'upperSnakeCaseEntities'],
-        ['UPPER-KEBAB-CASE-ENTITIES-MODEL', 'upperKebabCaseEntities'],
-      ];
-      modelNamesToCollectionNames.forEach(tuple =>
-        schema.defineModel({name: tuple[0], datasource: 'mongodb'}),
-      );
-      const A = await schema.getService(AdapterRegistry).getAdapter('mongodb');
-      modelNamesToCollectionNames.forEach(tuple =>
-        expect(A._getCollectionNameByModelName(tuple[0])).to.be.eq(tuple[1]),
-      );
-    });
-
     it('returns the value from the "tableName" option if defined', async function () {
       const schema = createSchema();
       schema.defineModel({
@@ -136,31 +103,31 @@ describe('MongodbAdapter', function () {
   describe('_getCollection', function () {
     it('should create and return a new collection object on the first call', async function () {
       const schema = createSchema();
-      schema.defineModel({name: 'myTestModel', datasource: 'mongodb'});
+      schema.defineModel({name: 'model', datasource: 'mongodb'});
       const A = await schema.getService(AdapterRegistry).getAdapter('mongodb');
-      expect(A._collections.has('myTestModel')).to.be.false;
-      const collection = A._getCollection('myTestModel');
+      expect(A._collections.has('model')).to.be.false;
+      const collection = A._getCollection('model');
       expect(collection).to.exist;
-      expect(collection.collectionName).to.equal('myTests');
+      expect(collection.collectionName).to.equal('models');
       expect(collection.dbName).to.equal(CONFIG.database);
     });
 
     it('should cache the collection object after the first call', async function () {
       const schema = createSchema();
-      schema.defineModel({name: 'myTestModel', datasource: 'mongodb'});
+      schema.defineModel({name: 'model', datasource: 'mongodb'});
       const A = await schema.getService(AdapterRegistry).getAdapter('mongodb');
-      expect(A._collections.has('myTestModel')).to.be.false;
-      A._getCollection('myTestModel');
-      expect(A._collections.has('myTestModel')).to.be.true;
-      expect(A._collections.get('myTestModel')).to.exist;
+      expect(A._collections.has('model')).to.be.false;
+      A._getCollection('model');
+      expect(A._collections.has('model')).to.be.true;
+      expect(A._collections.get('model')).to.exist;
     });
 
     it('should return the cached collection instance on subsequent calls', async function () {
       const schema = createSchema();
-      schema.defineModel({name: 'myTestModel', datasource: 'mongodb'});
+      schema.defineModel({name: 'model', datasource: 'mongodb'});
       const A = await schema.getService(AdapterRegistry).getAdapter('mongodb');
-      const collection1 = A._getCollection('myTestModel');
-      const collection2 = A._getCollection('myTestModel');
+      const collection1 = A._getCollection('model');
+      const collection2 = A._getCollection('model');
       expect(collection2).to.equal(collection1);
     });
 
@@ -182,24 +149,6 @@ describe('MongodbAdapter', function () {
       });
     });
 
-    it('cuts off the "Model" suffix from the model name', async function () {
-      const schema = createSchema();
-      const modelNamesToCollectionNames = [
-        ['camelCaseEntityModel', 'camelCaseEntities'],
-        ['PascalCaseEntityModel', 'pascalCaseEntities'],
-        ['snake_case_entity_model', 'snakeCaseEntities'],
-        ['kebab-case-entity-model', 'kebabCaseEntities'],
-        ['UPPER_SNAKE_CASE_ENTITY_MODEL', 'upperSnakeCaseEntities'],
-        ['UPPER-KEBAB-CASE-ENTITY-MODEL', 'upperKebabCaseEntities'],
-      ];
-      const A = await schema.getService(AdapterRegistry).getAdapter('mongodb');
-      modelNamesToCollectionNames.forEach(tuple => {
-        schema.defineModel({name: tuple[0], datasource: 'mongodb'});
-        const collection = A._getCollection(tuple[0]);
-        expect(collection.collectionName).to.equal(tuple[1]);
-      });
-    });
-
     it('converts already pluralized model name to camel case', async function () {
       const schema = createSchema();
       const modelNamesToCollectionNames = [
@@ -218,24 +167,6 @@ describe('MongodbAdapter', function () {
       });
     });
 
-    it('converts already pluralized model name to camel case and cut off the "Model" suffix', async function () {
-      const schema = createSchema();
-      const modelNamesToCollectionNames = [
-        ['camelCaseEntitiesModel', 'camelCaseEntities'],
-        ['PascalCaseEntitiesModel', 'pascalCaseEntities'],
-        ['snake_case_entities_model', 'snakeCaseEntities'],
-        ['kebab-case-entities-model', 'kebabCaseEntities'],
-        ['UPPER_SNAKE_CASE_ENTITIES_MODEL', 'upperSnakeCaseEntities'],
-        ['UPPER-KEBAB-CASE-ENTITIES-MODEL', 'upperKebabCaseEntities'],
-      ];
-      const A = await schema.getService(AdapterRegistry).getAdapter('mongodb');
-      modelNamesToCollectionNames.forEach(tuple => {
-        schema.defineModel({name: tuple[0], datasource: 'mongodb'});
-        const collection = A._getCollection(tuple[0]);
-        expect(collection.collectionName).to.equal(tuple[1]);
-      });
-    });
-
     it('uses the value from the "tableName" option if defined', async function () {
       const schema = createSchema();
       const A = await schema.getService(AdapterRegistry).getAdapter('mongodb');

package/src/utils/create-mongodb-url.js

@@ -1,7 +1,23 @@
 import {InvalidArgumentError} from '@e22m4u/js-repository';
 
+/**
+ * @typedef {object} MongoDBUrlOptions
+ * @property {string} [protocol]
+ * @property {string} [hostname]
+ * @property {string} [host]
+ * @property {number|string} [port]
+ * @property {string} [database]
+ * @property {string} [db]
+ * @property {string} [username]
+ * @property {string} [password]
+ * @property {string} [pass]
+ */
+
 /**
  * Generate the mongodb URL from the options.
+ *
+ * @param {MongoDBUrlOptions} options
+ * @returns {string}
  */
 export function createMongodbUrl(options = {}) {
   if (!options || typeof options !== 'object' || Array.isArray(options))

package/src/utils/index.js

@@ -4,4 +4,3 @@ export * from './is-object-id.js';
 export * from './to-camel-case.js';
 export * from './create-mongodb-url.js';
 export * from './transform-values-deep.js';
-export * from './model-name-to-collection-name.js';

package/src/utils/is-iso-date.js

@@ -1,8 +1,8 @@
 /**
  * Is iso date.
  *
- * @param value
- * @return {boolean}
+ * @param {*} value
+ * @returns {boolean}
  */
 export function isIsoDate(value) {
   if (!value) return false;

package/src/utils/is-object-id.js

@@ -3,8 +3,8 @@ import {ObjectId} from 'mongodb';
 /**
  * Is object id.
  *
- * @param value
- * @return {boolean}
+ * @param {*} value
+ * @returns {boolean}
  */
 export function isObjectId(value) {
   if (!value) return false;

package/src/utils/transform-values-deep.js

@@ -1,11 +1,17 @@
 import {InvalidArgumentError} from '@e22m4u/js-repository';
 
+/**
+ * @callback Transformer
+ * @param {*} value
+ * @returns {*}
+ */
+
 /**
  * Transform values deep.
  *
- * @param value
- * @param transformer
- * @return {*}
+ * @param {*} value
+ * @param {Transformer} transformer
+ * @returns {*}
  */
 export function transformValuesDeep(value, transformer) {
   if (!transformer || typeof transformer !== 'function')

package/.mocharc.cjs

@@ -1,7 +0,0 @@
-const path = require('path');
-
-module.exports = {
-  extension: ['js'],
-  spec: 'src/**/*.spec.js',
-  require: [path.join(__dirname, 'mocha.setup.js')],
-}

package/src/utils/model-name-to-collection-name.js

@@ -1,26 +0,0 @@
-import {pluralize} from './pluralize.js';
-import {toCamelCase} from './to-camel-case.js';
-
-/**
- * Создает имя таблицы/коллекции по названию модели.
- *
- * @param {string} modelName
- * @returns {string}
- */
-export function modelNameToCollectionName(modelName) {
-  // приведение имени класса к стандартному camelCase
-  // "UserModel" -> "userModel", "Article" -> "article"
-  const ccName = toCamelCase(modelName);
-  // удаление постфикса "Model" с конца строки
-  // "userModel" -> "user", "myModel" -> "my"
-  const woModel = ccName.replace(/Model$/i, '');
-  // если базовое имя слишком короткое (как "my" для "myModel"),
-  // то используется имя, включающее постфикс "Model"
-  if (woModel.length <= 2) {
-    // pluralize('myModel') -> "myModels"
-    return pluralize(ccName);
-  }
-  // для обычных имен обрабатывается без суффикса
-  // pluralize('user') -> "users"
-  return pluralize(woModel);
-}

package/src/utils/model-name-to-collection-name.spec.js

@@ -1,89 +0,0 @@
-import {expect} from 'chai';
-import {modelNameToCollectionName} from './model-name-to-collection-name.js';
-
-describe('modelNameToCollectionName', function () {
-  it('should correctly pluralize and remove the "Model" suffix for standard names', function () {
-    expect(modelNameToCollectionName('userModel')).to.equal('users');
-    expect(modelNameToCollectionName('UserModel')).to.equal('users');
-    expect(modelNameToCollectionName('user_model')).to.equal('users');
-    expect(modelNameToCollectionName('USER_MODEL')).to.equal('users');
-    expect(modelNameToCollectionName('articleModel')).to.equal('articles');
-    expect(modelNameToCollectionName('ArticleModel')).to.equal('articles');
-    expect(modelNameToCollectionName('article_model')).to.equal('articles');
-    expect(modelNameToCollectionName('ARTICLE_MODEL')).to.equal('articles');
-  });
-
-  it('should just pluralize names that do not have the "Model" suffix', function () {
-    expect(modelNameToCollectionName('user')).to.equal('users');
-    expect(modelNameToCollectionName('User')).to.equal('users');
-    expect(modelNameToCollectionName('USER')).to.equal('users');
-    expect(modelNameToCollectionName('article')).to.equal('articles');
-    expect(modelNameToCollectionName('Article')).to.equal('articles');
-    expect(modelNameToCollectionName('ARTICLE')).to.equal('articles');
-  });
-
-  it('should correctly handle already pluralized names with the "Model" suffix', function () {
-    expect(modelNameToCollectionName('usersModel')).to.equal('users');
-    expect(modelNameToCollectionName('UsersModel')).to.equal('users');
-    expect(modelNameToCollectionName('users_model')).to.equal('users');
-    expect(modelNameToCollectionName('USERS_MODEL')).to.equal('users');
-    expect(modelNameToCollectionName('articlesModel')).to.equal('articles');
-    expect(modelNameToCollectionName('ArticlesModel')).to.equal('articles');
-    expect(modelNameToCollectionName('articles_model')).to.equal('articles');
-    expect(modelNameToCollectionName('ARTICLES_MODEL')).to.equal('articles');
-  });
-
-  it('should correctly handle already pluralized names', function () {
-    expect(modelNameToCollectionName('users')).to.equal('users');
-    expect(modelNameToCollectionName('Users')).to.equal('users');
-    expect(modelNameToCollectionName('USERS')).to.equal('users');
-    expect(modelNameToCollectionName('articles')).to.equal('articles');
-    expect(modelNameToCollectionName('Articles')).to.equal('articles');
-    expect(modelNameToCollectionName('ARTICLES')).to.equal('articles');
-  });
-
-  it('should correctly handle different pluralization rules (like y -> ies)', function () {
-    expect(modelNameToCollectionName('companyModel')).to.equal('companies');
-    expect(modelNameToCollectionName('CompanyModel')).to.equal('companies');
-    expect(modelNameToCollectionName('company_model')).to.equal('companies');
-    expect(modelNameToCollectionName('COMPANY_MODEL')).to.equal('companies');
-  });
-
-  it('should correctly handle exceptions from pluralize (like status -> statuses)', function () {
-    expect(modelNameToCollectionName('statusModel')).to.equal('statuses');
-    expect(modelNameToCollectionName('StatusModel')).to.equal('statuses');
-    expect(modelNameToCollectionName('status_model')).to.equal('statuses');
-    expect(modelNameToCollectionName('STATUS_MODEL')).to.equal('statuses');
-  });
-
-  it('should handle edge cases where removing "Model" leaves a short word', function () {
-    expect(modelNameToCollectionName('myModel')).to.equal('myModels');
-    expect(modelNameToCollectionName('MyModel')).to.equal('myModels');
-    expect(modelNameToCollectionName('my_model')).to.equal('myModels');
-    expect(modelNameToCollectionName('MY_MODEL')).to.equal('myModels');
-    expect(modelNameToCollectionName('doModel')).to.equal('doModels');
-    expect(modelNameToCollectionName('DoModel')).to.equal('doModels');
-    expect(modelNameToCollectionName('do_model')).to.equal('doModels');
-    expect(modelNameToCollectionName('DO_MODEL')).to.equal('doModels');
-  });
-
-  it('should remove the "Model" suffix case-insensitively', function () {
-    expect(modelNameToCollectionName('Usermodel')).to.equal('users');
-    expect(modelNameToCollectionName('USERMODEL')).to.equal('users');
-  });
-
-  it('should handle names that contain "Model" but not at the end', function () {
-    expect(modelNameToCollectionName('remodelAction')).to.equal(
-      'remodelActions',
-    );
-    expect(modelNameToCollectionName('RemodelAction')).to.equal(
-      'remodelActions',
-    );
-    expect(modelNameToCollectionName('remodel_action')).to.equal(
-      'remodelActions',
-    );
-    expect(modelNameToCollectionName('REMODEL_ACTION')).to.equal(
-      'remodelActions',
-    );
-  });
-});