@e22m4u/js-repository 0.8.1 → 0.8.3

package/.mocharc.json

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

package/README.md

@@ -483,14 +483,14 @@ dbs.defineModel({
 наоборот допускает дублирование пустых значений уникального свойства,
 поскольку они не участвуют в проверке.
 
-| тип         | пустые значения           |
-|-------------|---------------------------|
-| `'any'`     | `undefined`, `null`       |
-| `'string'`  | `undefined`, `null`, `''` |
-| `'number'`  | `undefined`, `null`, `0`  |
-| `'boolean'` | `undefined`, `null`       |
-| `'array'`   | `undefined`, `null`, `[]` |
-| `'object'`  | `undefined`, `null`, `{}` |
+| константа          | тип         | пустые значения              |
+|--------------------|-------------|------------------------------|
+| `DataType.ANY`     | `"any"`     | *пустые значения всех типов* |
+| `DataType.STRING`  | `"string"`  | `undefined`, `null`, `""`    |
+| `DataType.NUMBER`  | `"number"`  | `undefined`, `null`, `0`     |
+| `DataType.BOOLEAN` | `"boolean"` | `undefined`, `null`          |
+| `DataType.ARRAY`   | `"array"`   | `undefined`, `null`, `[]`    |
+| `DataType.OBJECT`  | `"object"`  | `undefined`, `null`, `{}`    |
 
 ### Переопределение пустых значений
 
@@ -526,9 +526,9 @@ class EmptyValuesService {
 
 **Пример**
 
-По умолчанию, для числовых свойств значение `0` считается пустым. Следующий
-пример демонстрирует, как изменить это поведение, оставив в качестве пустых
-значений только `undefined` и `null`.
+Если свойство с типом `string` является обязательным, то попытка записи пустой
+строки приведет к ошибке. Следующий пример демонстрирует, как изменить данное
+поведение, оставив в качестве пустых значений только `undefined` и `null`.
 
 ```js
 import {DataType} from '@e22m4u/js-repository';
@@ -540,13 +540,13 @@ const dbs = new DatabaseSchema();
 // получение сервиса для работы с пустыми значениями
 const emptyValuesService = dbs.getService(EmptyValuesService);
 
-// переопределение пустых значений для типа DataType.NUMBER
-emptyValuesService.setEmptyValuesOf(DataType.NUMBER, [undefined, null]);
+// переопределение пустых значений для типа DataType.STRING
+emptyValuesService.setEmptyValuesOf(DataType.STRING, [undefined, null]);
 ```
 
-После этого, значение `0` для свойств типа `DataType.NUMBER` больше не будет
-считаться пустым и будет проходить проверку с опцией `required`, а также
-не будет заменяться значением по умолчанию.
+Теперь пустая строка будет успешно проходить проверку для обязательных свойств
+с типом `string`, а также не будет заменяться на значение по умолчанию
+для необязательных свойств модели.
 
 ## Репозиторий
 

package/dist/cjs/index.cjs

@@ -1881,7 +1881,7 @@ var init_model_definition_utils = __esm({
           const propDef = propDefs[propName];
           const propValue = extendedData[propName];
           const propType = propDef != null ? this.getDataTypeFromPropertyDefinition(propDef) : DataType.ANY;
-          const isEmpty = emptyValuesService.isEmptyByType(propType, propValue);
+          const isEmpty = emptyValuesService.isEmptyOf(propType, propValue);
           if (!isEmpty) return;
           if (propDef && typeof propDef === "object" && propDef.default !== void 0) {
             extendedData[propName] = this.getDefaultPropertyValue(
@@ -2239,7 +2239,7 @@ var init_property_uniqueness_validator = __esm({
           const propValue = modelData[propName];
           if (propDef.unique === PropertyUniqueness.SPARSE) {
             const propType = propDef.type || DataType.ANY;
-            const isEmpty = emptyValuesService.isEmptyByType(propType, propValue);
+            const isEmpty = emptyValuesService.isEmptyOf(propType, propValue);
             if (isEmpty) continue;
           }
           if (methodName === "create") {

package/mocha.setup.js

@@ -0,0 +1,6 @@
+import * as chai from 'chai';
+import {chaiSpies} from '@e22m4u/js-spy';
+import chaiAsPromised from 'chai-as-promised';
+
+chai.use(chaiSpies);
+chai.use(chaiAsPromised);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e22m4u/js-repository",
-  "version": "0.8.1",
+  "version": "0.8.3",
   "description": "Реализация репозитория для работы с базами данных",
   "author": "Mikhail Evstropov <e22m4u@yandex.ru>",
   "license": "MIT",
@@ -39,27 +39,26 @@
     "prepare": "husky"
   },
   "dependencies": {
-    "@e22m4u/js-empty-values": "~0.2.1",
-    "@e22m4u/js-format": "~0.3.1",
+    "@e22m4u/js-empty-values": "~0.3.2",
+    "@e22m4u/js-format": "~0.3.2",
     "@e22m4u/js-service": "~0.5.1"
   },
   "devDependencies": {
-    "@commitlint/cli": "~20.1.0",
-    "@commitlint/config-conventional": "~20.0.0",
+    "@commitlint/cli": "~20.2.0",
+    "@commitlint/config-conventional": "~20.2.0",
+    "@e22m4u/js-spy": "~0.3.5",
     "@types/chai": "~5.2.3",
     "@types/chai-as-promised": "~8.0.2",
-    "@types/chai-spies": "~1.0.6",
     "@types/mocha": "~10.0.10",
     "c8": "~10.1.3",
-    "chai": "~6.2.1",
+    "chai": "~6.2.2",
     "chai-as-promised": "~8.0.2",
-    "chai-spies": "~1.1.0",
-    "esbuild": "~0.27.0",
-    "eslint": "~9.39.1",
+    "esbuild": "~0.27.2",
+    "eslint": "~9.39.2",
     "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-jsdoc": "~61.5.0",
     "eslint-plugin-mocha": "~11.2.0",
     "husky": "~9.1.7",
     "mocha": "~11.7.5",

package/src/adapter/adapter.spec.js

@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import {chai} from '../chai.js';
+import {createSandbox} from '@e22m4u/js-spy';
 import {DatabaseSchema} from '../database-schema.js';
 import {Adapter, ADAPTER_CLASS_NAME} from './adapter.js';
 import {Service, ServiceContainer} from '@e22m4u/js-service';
@@ -12,7 +12,7 @@ import {
   PropertyUniquenessDecorator,
 } from './decorator/index.js';
 
-const sandbox = chai.spy.sandbox();
+const sandbox = createSandbox();
 
 describe('Adapter', function () {
   it('exposes static property "kinds"', function () {

package/src/adapter/decorator/data-sanitizing-decorator.spec.js

@@ -1,6 +1,6 @@
 import {expect} from 'chai';
-import {chai} from '../../chai.js';
 import {Adapter} from '../adapter.js';
+import {createSandbox} from '@e22m4u/js-spy';
 import {DatabaseSchema} from '../../database-schema.js';
 import {ModelDataSanitizer} from '../../definition/index.js';
 
@@ -36,7 +36,7 @@ class TestAdapter extends Adapter {
 
 const A = dbs.getService(TestAdapter);
 const V = dbs.getService(ModelDataSanitizer);
-const sandbox = chai.spy.sandbox();
+const sandbox = createSandbox();
 
 describe('DataSanitizingDecorator', function () {
   afterEach(function () {
@@ -48,7 +48,7 @@ describe('DataSanitizingDecorator', function () {
     const data = {};
     await A.create('model', data);
     expect(V.sanitize).to.be.called.once;
-    expect(V.sanitize).to.be.called.with.exactly('model', data);
+    expect(V.sanitize).to.be.called.with('model', data);
   });
 
   it('overrides the "replaceById" method and sanitizes a given data', async function () {
@@ -56,7 +56,7 @@ describe('DataSanitizingDecorator', function () {
     const data = {};
     await A.replaceById('model', 1, data);
     expect(V.sanitize).to.be.called.once;
-    expect(V.sanitize).to.be.called.with.exactly('model', data);
+    expect(V.sanitize).to.be.called.with('model', data);
   });
 
   it('overrides the "replaceOrCreate" method and sanitizes a given data', async function () {
@@ -64,7 +64,7 @@ describe('DataSanitizingDecorator', function () {
     const data = {};
     await A.replaceOrCreate('model', data);
     expect(V.sanitize).to.be.called.once;
-    expect(V.sanitize).to.be.called.with.exactly('model', data);
+    expect(V.sanitize).to.be.called.with('model', data);
   });
 
   it('overrides the "patch" method and sanitizes a given data', async function () {
@@ -72,7 +72,7 @@ describe('DataSanitizingDecorator', function () {
     const data = {};
     await A.patch('model', data);
     expect(V.sanitize).to.be.called.once;
-    expect(V.sanitize).to.be.called.with.exactly('model', data);
+    expect(V.sanitize).to.be.called.with('model', data);
   });
 
   it('overrides the "patchById" method and sanitizes a given data', async function () {
@@ -80,6 +80,6 @@ describe('DataSanitizingDecorator', function () {
     const data = {};
     await A.patchById('model', 1, data);
     expect(V.sanitize).to.be.called.once;
-    expect(V.sanitize).to.be.called.with.exactly('model', data);
+    expect(V.sanitize).to.be.called.with('model', data);
   });
 });

package/src/adapter/decorator/default-values-decorator.spec.js

@@ -1,6 +1,6 @@
 import {expect} from 'chai';
-import {chai} from '../../chai.js';
 import {Adapter} from '../adapter.js';
+import {createSandbox} from '@e22m4u/js-spy';
 import {DatabaseSchema} from '../../database-schema.js';
 import {DataType, ModelDefinitionUtils} from '../../definition/index.js';
 
@@ -57,7 +57,7 @@ class TestAdapter extends Adapter {
 
 const A = dbs.getService(TestAdapter);
 const U = dbs.getService(ModelDefinitionUtils);
-const sandbox = chai.spy.sandbox();
+const sandbox = createSandbox();
 
 describe('DefaultValuesDecorator', function () {
   afterEach(function () {

package/src/adapter/decorator/fields-filtering-decorator.spec.js

@@ -1,6 +1,6 @@
 import {expect} from 'chai';
-import {chai} from '../../chai.js';
 import {Adapter} from '../adapter.js';
+import {createSandbox} from '@e22m4u/js-spy';
 import {FieldsClauseTool} from '../../filter/index.js';
 import {DatabaseSchema} from '../../database-schema.js';
 
@@ -55,7 +55,7 @@ class TestAdapter extends Adapter {
 
 const A = dbs.getService(TestAdapter);
 const T = dbs.getService(FieldsClauseTool);
-const sandbox = chai.spy.sandbox();
+const sandbox = createSandbox();
 
 describe('FieldsFilteringDecorator', function () {
   afterEach(function () {
@@ -67,11 +67,7 @@ describe('FieldsFilteringDecorator', function () {
     const retval = await A.create(MODEL_NAME, {}, FILTER);
     expect(retval).to.be.eql(RETVAL_DATA);
     expect(T.filter).to.be.called.once;
-    expect(T.filter).to.be.called.with.exactly(
-      MODEL_DATA,
-      MODEL_NAME,
-      FILTER.fields,
-    );
+    expect(T.filter).to.be.called.with(MODEL_DATA, MODEL_NAME, FILTER.fields);
   });
 
   it('overrides the "replaceById" method and filtering output fields', async function () {
@@ -79,11 +75,7 @@ describe('FieldsFilteringDecorator', function () {
     const retval = await A.replaceById(MODEL_NAME, 1, {}, FILTER);
     expect(retval).to.be.eql(RETVAL_DATA);
     expect(T.filter).to.be.called.once;
-    expect(T.filter).to.be.called.with.exactly(
-      MODEL_DATA,
-      MODEL_NAME,
-      FILTER.fields,
-    );
+    expect(T.filter).to.be.called.with(MODEL_DATA, MODEL_NAME, FILTER.fields);
   });
 
   it('overrides the "replaceOrCreate" method and filtering output fields', async function () {
@@ -91,11 +83,7 @@ describe('FieldsFilteringDecorator', function () {
     const retval = await A.replaceOrCreate(MODEL_NAME, {}, FILTER);
     expect(retval).to.be.eql(RETVAL_DATA);
     expect(T.filter).to.be.called.once;
-    expect(T.filter).to.be.called.with.exactly(
-      MODEL_DATA,
-      MODEL_NAME,
-      FILTER.fields,
-    );
+    expect(T.filter).to.be.called.with(MODEL_DATA, MODEL_NAME, FILTER.fields);
   });
 
   it('overrides the "patchById" method and filtering output fields', async function () {
@@ -103,11 +91,7 @@ describe('FieldsFilteringDecorator', function () {
     const retval = await A.patchById(MODEL_NAME, 1, {}, FILTER);
     expect(retval).to.be.eql(RETVAL_DATA);
     expect(T.filter).to.be.called.once;
-    expect(T.filter).to.be.called.with.exactly(
-      MODEL_DATA,
-      MODEL_NAME,
-      FILTER.fields,
-    );
+    expect(T.filter).to.be.called.with(MODEL_DATA, MODEL_NAME, FILTER.fields);
   });
 
   it('overrides the "find" method and filtering output fields', async function () {
@@ -127,10 +111,6 @@ describe('FieldsFilteringDecorator', function () {
     const retval = await A.findById(MODEL_NAME, 1, FILTER);
     expect(retval).to.be.eql(RETVAL_DATA);
     expect(T.filter).to.be.called.once;
-    expect(T.filter).to.be.called.with.exactly(
-      MODEL_DATA,
-      MODEL_NAME,
-      FILTER.fields,
-    );
+    expect(T.filter).to.be.called.with(MODEL_DATA, MODEL_NAME, FILTER.fields);
   });
 });

package/src/adapter/decorator/inclusion-decorator.spec.js

@@ -1,6 +1,6 @@
 import {expect} from 'chai';
-import {chai} from '../../chai.js';
 import {Adapter} from '../adapter.js';
+import {createSandbox} from '@e22m4u/js-spy';
 import {DatabaseSchema} from '../../database-schema.js';
 import {IncludeClauseTool} from '../../filter/index.js';
 
@@ -53,7 +53,7 @@ class TestAdapter extends Adapter {
 
 const A = dbs.getService(TestAdapter);
 const T = dbs.getService(IncludeClauseTool);
-const sandbox = chai.spy.sandbox();
+const sandbox = createSandbox();
 
 describe('InclusionDecorator', function () {
   afterEach(function () {

package/src/adapter/decorator/property-uniqueness-decorator.spec.js

@@ -1,6 +1,6 @@
 import {expect} from 'chai';
-import {chai} from '../../chai.js';
 import {Adapter} from '../adapter.js';
+import {createSandbox} from '@e22m4u/js-spy';
 import {DatabaseSchema} from '../../database-schema.js';
 import {PropertyUniquenessValidator} from '../../definition/index.js';
 
@@ -36,7 +36,7 @@ class TestAdapter extends Adapter {
 
 const A = dbs.getService(TestAdapter);
 const V = dbs.getService(PropertyUniquenessValidator);
-const sandbox = chai.spy.sandbox();
+const sandbox = createSandbox();
 
 describe('PropertyUniquenessDecorator', function () {
   afterEach(function () {

package/src/definition/definition-registry.spec.js

@@ -1,10 +1,10 @@
 import {expect} from 'chai';
-import {chai} from '../chai.js';
+import {createSandbox} from '@e22m4u/js-spy';
 import {ModelDefinitionValidator} from './model/index.js';
 import {DefinitionRegistry} from './definition-registry.js';
 import {DatasourceDefinitionValidator} from '../definition/index.js';
 
-const sandbox = chai.spy.sandbox();
+const sandbox = createSandbox();
 
 describe('DefinitionRegistry', function () {
   let S;
@@ -31,7 +31,7 @@ describe('DefinitionRegistry', function () {
       const datasource = {name: 'datasource', adapter: 'adapter'};
       S.addDatasource(datasource);
       expect(V.validate).to.have.been.called.once;
-      expect(V.validate).to.have.been.called.with.exactly(datasource);
+      expect(V.validate).to.have.been.called.with(datasource);
     });
 
     it('throws an error if a given datasource is already defined', function () {
@@ -82,7 +82,7 @@ describe('DefinitionRegistry', function () {
       const model = {name: 'model'};
       S.addModel(model);
       expect(V.validate).to.have.been.called.once;
-      expect(V.validate).to.have.been.called.with.exactly(model);
+      expect(V.validate).to.have.been.called.with(model);
     });
 
     it('throws an error if a given model is already defined', function () {

package/src/definition/model/model-definition-utils.js

@@ -147,7 +147,7 @@ export class ModelDefinitionUtils extends Service {
         propDef != null
           ? this.getDataTypeFromPropertyDefinition(propDef)
           : DataType.ANY;
-      const isEmpty = emptyValuesService.isEmptyByType(propType, propValue);
+      const isEmpty = emptyValuesService.isEmptyOf(propType, propValue);
       if (!isEmpty) return;
       if (
         propDef &&

package/src/definition/model/model-definition-utils.spec.js

@@ -1,6 +1,6 @@
 import {expect} from 'chai';
-import {chai} from '../../chai.js';
 import {format} from '@e22m4u/js-format';
+import {createSandbox} from '@e22m4u/js-spy';
 import {DataType} from './properties/index.js';
 import {RelationType} from './relations/index.js';
 import {DatabaseSchema} from '../../database-schema.js';
@@ -12,7 +12,7 @@ import {
   DEFAULT_PRIMARY_KEY_PROPERTY_NAME as DEF_PK,
 } from './model-definition-utils.js';
 
-const sandbox = chai.spy.sandbox();
+const sandbox = createSandbox();
 
 describe('ModelDefinitionUtils', function () {
   afterEach(function () {

package/src/definition/model/model-definition-validator.spec.js

@@ -1,12 +1,12 @@
 import {expect} from 'chai';
-import {chai} from '../../chai.js';
 import {format} from '@e22m4u/js-format';
+import {createSandbox} from '@e22m4u/js-spy';
 import {RelationsDefinitionValidator} from './relations/index.js';
 import {PropertiesDefinitionValidator} from './properties/index.js';
 import {ModelDefinitionValidator} from './model-definition-validator.js';
 
 const S = new ModelDefinitionValidator();
-const sandbox = chai.spy.sandbox();
+const sandbox = createSandbox();
 
 describe('ModelDefinitionValidator', function () {
   afterEach(function () {
@@ -131,7 +131,7 @@ describe('ModelDefinitionValidator', function () {
       const properties = {};
       S.validate({name: 'model', properties});
       expect(V.validate).to.have.been.called.once;
-      expect(V.validate).to.have.been.called.with.exactly('model', properties);
+      expect(V.validate).to.have.been.called.with('model', properties);
     });
 
     it('uses RelationsDefinitionValidator service to validate model relations', function () {
@@ -140,7 +140,7 @@ describe('ModelDefinitionValidator', function () {
       const relations = {};
       S.validate({name: 'model', relations});
       expect(V.validate).to.have.been.called.once;
-      expect(V.validate).to.have.been.called.with.exactly('model', relations);
+      expect(V.validate).to.have.been.called.with('model', relations);
     });
   });
 });

package/src/definition/model/properties/properties-definition-validator.spec.js

@@ -1,13 +1,13 @@
 import {expect} from 'chai';
-import {chai} from '../../../chai.js';
 import {DataType} from './data-type.js';
 import {format} from '@e22m4u/js-format';
+import {createSandbox} from '@e22m4u/js-spy';
 import {PropertyUniqueness} from './property-uniqueness.js';
 import {PropertiesDefinitionValidator} from './properties-definition-validator.js';
 import {PrimaryKeysDefinitionValidator} from './primary-keys-definition-validator.js';
 
 const S = new PropertiesDefinitionValidator();
-const sandbox = chai.spy.sandbox();
+const sandbox = createSandbox();
 
 describe('PropertiesDefinitionValidator', function () {
   afterEach(function () {
@@ -415,7 +415,7 @@ describe('PropertiesDefinitionValidator', function () {
       const propDefs = {};
       S.validate('model', propDefs);
       expect(V.validate).to.have.been.called.once;
-      expect(V.validate).to.have.been.called.with.exactly('model', propDefs);
+      expect(V.validate).to.have.been.called.with('model', propDefs);
     });
 
     it('expects the provided option "unique" to be a Boolean or the PropertyUniqueness', function () {

package/src/definition/model/properties/property-uniqueness-validator.js

@@ -85,7 +85,7 @@ export class PropertyUniquenessValidator extends Service {
       const propValue = modelData[propName];
       if (propDef.unique === PropertyUniqueness.SPARSE) {
         const propType = propDef.type || DataType.ANY;
-        const isEmpty = emptyValuesService.isEmptyByType(propType, propValue);
+        const isEmpty = emptyValuesService.isEmptyOf(propType, propValue);
         if (isEmpty) continue;
       }
       // create

package/src/chai.js

@@ -1,9 +0,0 @@
-import * as chaiModule from 'chai';
-import chaiSpies from 'chai-spies';
-import chaiAsPromised from 'chai-as-promised';
-const chai = {...chaiModule};
-
-chaiSpies(chai, chai.util);
-chaiAsPromised(chai, chai.util);
-
-export {chai};