@e22m4u/js-repository 0.6.5 → 0.7.0

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

@@ -3,20 +3,12 @@ import {chai} from '../../../chai.js';
 import {DataType} from './data-type.js';
 import {format} from '@e22m4u/js-format';
 import {PropertyUniqueness} from './property-uniqueness.js';
-import {PropertyValidatorRegistry} from './property-validator/index.js';
-import {PropertyTransformerRegistry} from './property-transformer/index.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();
 
-S.getService(PropertyValidatorRegistry).addValidator('myValidator', () => true);
-S.getService(PropertyTransformerRegistry).addTransformer(
-  'myTransformer',
-  () => true,
-);
-
 describe('PropertiesDefinitionValidator', function () {
   afterEach(function () {
     sandbox.restore();
@@ -426,160 +418,6 @@ describe('PropertiesDefinitionValidator', function () {
       expect(V.validate).to.have.been.called.with.exactly('model', propDefs);
     });
 
-    it('the option "validate" should have a non-empty String, a Function, an Array or an Object', function () {
-      const validate = v => () => {
-        const foo = {
-          type: DataType.ANY,
-          validate: v,
-        };
-        S.validate('model', {foo});
-      };
-      const error = v =>
-        format(
-          'The provided option "validate" for the property "foo" in the model "model" ' +
-            'should be either a validator name, a validator function, an array ' +
-            'of validator names or functions, or an object mapping validator ' +
-            'names to their arguments, but %s was given.',
-          v,
-        );
-      expect(validate('')).to.throw(error('""'));
-      expect(validate(10)).to.throw(error('10'));
-      expect(validate(0)).to.throw(error('0'));
-      expect(validate(true)).to.throw(error('true'));
-      expect(validate(false)).to.throw(error('false'));
-      validate('myValidator')();
-      validate(() => true)();
-      validate(['myValidator'])();
-      validate([() => true])();
-      validate([])();
-      validate({myValidator: true})();
-      validate({})();
-      validate(null)();
-      validate(undefined)();
-    });
-
-    it('the option "validate" with an Array value requires elements to be a non-empty String or a Function', function () {
-      const validate = v => () => {
-        const foo = {
-          type: DataType.ANY,
-          validate: [v],
-        };
-        S.validate('model', {foo});
-      };
-      const error = v =>
-        format(
-          'The provided option "validate" for the property "foo" in the model "model" ' +
-            'has an Array value that should contain validator names or validator functions, ' +
-            'but %s was given.',
-          v,
-        );
-      expect(validate('')).to.throw(error('""'));
-      expect(validate(10)).to.throw(error('10'));
-      expect(validate(0)).to.throw(error('0'));
-      expect(validate(true)).to.throw(error('true'));
-      expect(validate(false)).to.throw(error('false'));
-      expect(validate([1, 2, 3])).to.throw(error('Array'));
-      expect(validate({foo: 'bar'})).to.throw(error('Object'));
-      expect(validate(null)).to.throw(error('null'));
-      expect(validate(undefined)).to.throw(error('undefined'));
-      validate('myValidator')();
-      validate(() => true)();
-    });
-
-    it('the option "validate" requires only existing validator names', function () {
-      const validate = v => () => {
-        const foo = {
-          type: DataType.ANY,
-          validate: v,
-        };
-        S.validate('model', {foo});
-      };
-      const error = v => format('The property validator %s is not found.', v);
-      expect(validate('unknown')).to.throw(error('"unknown"'));
-      expect(validate({unknown: true})).to.throw(error('"unknown"'));
-      expect(validate(['unknown'])).to.throw(error('"unknown"'));
-      validate('myValidator')();
-      validate(['myValidator'])();
-      validate({myValidator: true})();
-    });
-
-    it('the option "transform" should have a non-empty String, a Function, an Array or an Object', function () {
-      const validate = v => () => {
-        const foo = {
-          type: DataType.ANY,
-          transform: v,
-        };
-        S.validate('model', {foo});
-      };
-      const error = v =>
-        format(
-          'The provided option "transform" for the property "foo" in the model "model" ' +
-            'should be either a transformer name, a transformer function, an array ' +
-            'of transformer names or functions, or an object mapping transformer ' +
-            'names to their arguments, but %s was given.',
-          v,
-        );
-      expect(validate('')).to.throw(error('""'));
-      expect(validate(10)).to.throw(error('10'));
-      expect(validate(0)).to.throw(error('0'));
-      expect(validate(true)).to.throw(error('true'));
-      expect(validate(false)).to.throw(error('false'));
-      validate('myTransformer')();
-      validate(v => v)();
-      validate(['myTransformer'])();
-      validate([v => v])();
-      validate([])();
-      validate({myTransformer: true})();
-      validate({})();
-      validate(null)();
-      validate(undefined)();
-    });
-
-    it('the option "transform" with an Array value requires elements to be a non-empty String or a Function', function () {
-      const validate = v => () => {
-        const foo = {
-          type: DataType.ANY,
-          transform: [v],
-        };
-        S.validate('model', {foo});
-      };
-      const error = v =>
-        format(
-          'The provided option "transform" for the property "foo" in the model "model" ' +
-            'has an Array value that should contain transformer names or transformer functions, ' +
-            'but %s was given.',
-          v,
-        );
-      expect(validate('')).to.throw(error('""'));
-      expect(validate(10)).to.throw(error('10'));
-      expect(validate(0)).to.throw(error('0'));
-      expect(validate(true)).to.throw(error('true'));
-      expect(validate(false)).to.throw(error('false'));
-      expect(validate([1, 2, 3])).to.throw(error('Array'));
-      expect(validate({foo: 'bar'})).to.throw(error('Object'));
-      expect(validate(null)).to.throw(error('null'));
-      expect(validate(undefined)).to.throw(error('undefined'));
-      validate('myTransformer')();
-      validate(v => v)();
-    });
-
-    it('the option "transform" requires only existing transformer names', function () {
-      const validate = v => () => {
-        const foo = {
-          type: DataType.ANY,
-          transform: v,
-        };
-        S.validate('model', {foo});
-      };
-      const error = v => format('The property transformer %s is not found.', v);
-      expect(validate('unknown')).to.throw(error('"unknown"'));
-      expect(validate({unknown: true})).to.throw(error('"unknown"'));
-      expect(validate(['unknown'])).to.throw(error('"unknown"'));
-      validate('myTransformer')();
-      validate(['myTransformer'])();
-      validate({myTransformer: true})();
-    });
-
     it('expects the provided option "unique" to be a Boolean or the PropertyUniqueness', function () {
       const validate = v => {
         const foo = {

package/src/definition/model/properties/property-definition.d.ts

@@ -1,7 +1,5 @@
 import {DataType} from './data-type.js';
 import {PropertyUniqueness} from './property-uniqueness.js';
-import {PropertyValidateOptions} from './property-validator/index.js';
-import {PropertyTransformOptions} from './property-transformer/index.js';
 
 /**
  * Full property definition.
@@ -16,12 +14,10 @@ export declare type FullPropertyDefinition = {
   columnType?: string;
   required?: boolean;
   default?: unknown;
-  validate?: PropertyValidateOptions;
-  transform?: PropertyTransformOptions;
   unique?: boolean | PropertyUniqueness;
 };
 
 /**
  * Property definition.
  */
-declare type PropertyDefinition = DataType | FullPropertyDefinition;
+export declare type PropertyDefinition = DataType | FullPropertyDefinition;

package/src/utils/index.d.ts

@@ -1,16 +1,12 @@
-export * from './is-ctor.js';
 export * from './is-promise.js';
 export * from './capitalize.js';
 export * from './clone-deep.js';
 export * from './singularize.js';
 export * from './is-deep-equal.js';
-export * from './get-ctor-name.js';
 export * from './like-to-regexp.js';
 export * from './is-plain-object.js';
 export * from './string-to-regexp.js';
 export * from './get-value-by-path.js';
-export * from './transform-promise.js';
 export * from './select-object-keys.js';
 export * from './exclude-object-keys.js';
 export * from './model-name-to-model-key.js';
-export * from './get-decorator-target-type.js';

package/src/utils/index.js

@@ -1,16 +1,12 @@
-export * from './is-ctor.js';
 export * from './is-promise.js';
 export * from './capitalize.js';
 export * from './clone-deep.js';
 export * from './singularize.js';
 export * from './is-deep-equal.js';
-export * from './get-ctor-name.js';
 export * from './like-to-regexp.js';
 export * from './is-plain-object.js';
 export * from './string-to-regexp.js';
 export * from './get-value-by-path.js';
-export * from './transform-promise.js';
 export * from './select-object-keys.js';
 export * from './exclude-object-keys.js';
 export * from './model-name-to-model-key.js';
-export * from './get-decorator-target-type.js';

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

@@ -13,9 +13,5 @@ export function modelNameToModelKey(modelName) {
         'without spaces, but %v was given.',
       modelName,
     );
-  if (modelName.toLowerCase() !== 'model')
-    modelName = modelName
-      .replace(/[-_]?Model$/, '')
-      .replace(/[-_](MODEL|model)$/, '');
   return modelName.toLowerCase().replace(/[-_]/g, '');
 }

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

@@ -36,29 +36,6 @@ describe('modelNameToModelKey', function () {
     expect(modelNameToModelKey(modelName)).to.be.eq(expected);
   });
 
-  it('should remove the "model" word from a model name', function () {
-    const modelNames = [
-      'userProfileDetailsModel',
-      'UserProfileDetailsModel',
-      'user-profile-details-model',
-      'user_profile_details_model',
-      'User-Profile-Details-Model',
-      'User_Profile_Details_Model',
-      'USER-PROFILE-DETAILS-MODEL',
-      'USER_PROFILE_DETAILS_MODEL',
-    ];
-    modelNames.forEach(v =>
-      expect(modelNameToModelKey(v)).to.be.eq('userprofiledetails'),
-    );
-  });
-
-  it('should not remove the "model" suffix as a part of last word in a model name', function () {
-    const exceptions = ['SUPERMODEL', 'supermodel'];
-    exceptions.forEach(v =>
-      expect(modelNameToModelKey(v)).to.be.eq('supermodel'),
-    );
-  });
-
   it('should throw an error for an empty string', function () {
     const throwable = () => modelNameToModelKey('');
     expect(throwable).to.throw(

package/tsconfig.json

@@ -1,11 +1,11 @@
 {
   "compilerOptions": {
     "strict": true,
-    "rootDir": "src",
     "noEmit": true,
     "target": "es2022",
     "module": "NodeNext",
     "moduleResolution": "NodeNext",
-    "strictNullChecks": true
+    "strictNullChecks": true,
+    "allowJs": true
   }
 }

package/src/adapter/decorator/data-transformation-decorator.d.ts

@@ -1,14 +0,0 @@
-import {Adapter} from '../adapter.js';
-import {Service} from '@e22m4u/js-service';
-
-/**
- * Data transformation decorator.
- */
-export declare class DataTransformationDecorator extends Service {
-  /**
-   * Decorate.
-   *
-   * @param adapter
-   */
-  decorate(adapter: Adapter): void;
-}

package/src/adapter/decorator/data-transformation-decorator.js

@@ -1,54 +0,0 @@
-import {Adapter} from '../adapter.js';
-import {Service} from '@e22m4u/js-service';
-import {InvalidArgumentError} from '../../errors/index.js';
-import {ModelDataTransformer} from '../../definition/index.js';
-
-/**
- * Data transformation decorator.
- */
-export class DataTransformationDecorator extends Service {
-  /**
-   * Decorate.
-   *
-   * @param {Adapter} adapter
-   */
-  decorate(adapter) {
-    if (!adapter || !(adapter instanceof Adapter))
-      throw new InvalidArgumentError(
-        'The first argument of DataTransformerDecorator.decorate should be ' +
-          'an Adapter instance, but %v was given.',
-        adapter,
-      );
-    const transformer = this.getService(ModelDataTransformer);
-
-    const create = adapter.create;
-    adapter.create = async function (modelName, modelData, filter) {
-      modelData = await transformer.transform(modelName, modelData);
-      return create.call(this, modelName, modelData, filter);
-    };
-
-    const replaceById = adapter.replaceById;
-    adapter.replaceById = async function (modelName, id, modelData, filter) {
-      modelData = await transformer.transform(modelName, modelData);
-      return replaceById.call(this, modelName, id, modelData, filter);
-    };
-
-    const replaceOrCreate = adapter.replaceOrCreate;
-    adapter.replaceOrCreate = async function (modelName, modelData, filter) {
-      modelData = await transformer.transform(modelName, modelData);
-      return replaceOrCreate.call(this, modelName, modelData, filter);
-    };
-
-    const patch = adapter.patch;
-    adapter.patch = async function (modelName, modelData, where) {
-      modelData = await transformer.transform(modelName, modelData, true);
-      return patch.call(this, modelName, modelData, where);
-    };
-
-    const patchById = adapter.patchById;
-    adapter.patchById = async function (modelName, id, modelData, filter) {
-      modelData = await transformer.transform(modelName, modelData, true);
-      return patchById.call(this, modelName, id, modelData, filter);
-    };
-  }
-}

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

@@ -1,193 +0,0 @@
-import {expect} from 'chai';
-import {chai} from '../../chai.js';
-import {Adapter} from '../adapter.js';
-import {DatabaseSchema} from '../../database-schema.js';
-import {ModelDataTransformer} from '../../definition/index.js';
-
-const MODEL_NAME = 'myModel';
-const MODEL_DATA = {kind: 'modelData'};
-const TRANSFORMED_DATA = {kind: 'transformedData'};
-const WHERE_CLAUSE = {kind: {existed: true}};
-const FILTER_CLAUSE = {where: WHERE_CLAUSE};
-const DUMMY_ID = 1;
-
-class TestAdapter extends Adapter {
-  create(modelName, modelData, filter = undefined) {
-    expect(modelName).to.be.eq(MODEL_NAME);
-    expect(modelData).to.be.eql(TRANSFORMED_DATA);
-    expect(filter).to.be.eql(FILTER_CLAUSE);
-    return Promise.resolve(modelData);
-  }
-  replaceById(modelName, id, modelData, filter = undefined) {
-    expect(modelName).to.be.eq(MODEL_NAME);
-    expect(id).to.be.eq(DUMMY_ID);
-    expect(modelData).to.be.eql(TRANSFORMED_DATA);
-    expect(filter).to.be.eql(FILTER_CLAUSE);
-    return Promise.resolve(modelData);
-  }
-  replaceOrCreate(modelName, modelData, filter = undefined) {
-    expect(modelName).to.be.eq(MODEL_NAME);
-    expect(modelData).to.be.eql(TRANSFORMED_DATA);
-    expect(filter).to.be.eql(FILTER_CLAUSE);
-    return Promise.resolve(modelData);
-  }
-  patch(modelName, modelData, where = undefined) {
-    expect(modelName).to.be.eq(MODEL_NAME);
-    expect(modelData).to.be.eql(TRANSFORMED_DATA);
-    expect(where).to.be.eql(WHERE_CLAUSE);
-    return Promise.resolve(modelData);
-  }
-  patchById(modelName, id, modelData, filter = undefined) {
-    expect(modelName).to.be.eq(MODEL_NAME);
-    expect(id).to.be.eq(DUMMY_ID);
-    expect(modelData).to.be.eql(TRANSFORMED_DATA);
-    expect(filter).to.be.eql(FILTER_CLAUSE);
-    return Promise.resolve(modelData);
-  }
-}
-
-const dbs = new DatabaseSchema();
-dbs.defineModel({name: MODEL_NAME});
-const A = dbs.getService(TestAdapter);
-const T = dbs.getService(ModelDataTransformer);
-const sandbox = chai.spy.sandbox();
-
-describe('DataTransformationDecorator', function () {
-  afterEach(function () {
-    sandbox.restore();
-  });
-
-  describe('overrides the "create" method', function () {
-    it('transforms the given data', async function () {
-      sandbox.on(T, 'transform', () => TRANSFORMED_DATA);
-      const res = await A.create(MODEL_NAME, MODEL_DATA, FILTER_CLAUSE);
-      expect(res).to.be.eql(TRANSFORMED_DATA);
-      expect(T.transform).to.be.called.once;
-      expect(T.transform).to.be.called.with.exactly(MODEL_NAME, MODEL_DATA);
-    });
-
-    it('resolves the transformation promise', async function () {
-      sandbox.on(T, 'transform', () => Promise.resolve(TRANSFORMED_DATA));
-      const res = await A.create(MODEL_NAME, MODEL_DATA, FILTER_CLAUSE);
-      expect(res).to.be.eql(TRANSFORMED_DATA);
-      expect(T.transform).to.be.called.once;
-      expect(T.transform).to.be.called.with.exactly(MODEL_NAME, MODEL_DATA);
-    });
-  });
-
-  describe('overrides the "replaceById" method', function () {
-    it('transforms the given data', async function () {
-      sandbox.on(T, 'transform', () => TRANSFORMED_DATA);
-      const res = await A.replaceById(
-        MODEL_NAME,
-        DUMMY_ID,
-        MODEL_DATA,
-        FILTER_CLAUSE,
-      );
-      expect(res).to.be.eql(TRANSFORMED_DATA);
-      expect(T.transform).to.be.called.once;
-      expect(T.transform).to.be.called.with.exactly(MODEL_NAME, MODEL_DATA);
-    });
-
-    it('resolves the transformation promise', async function () {
-      sandbox.on(T, 'transform', () => Promise.resolve(TRANSFORMED_DATA));
-      const res = await A.replaceById(
-        MODEL_NAME,
-        DUMMY_ID,
-        MODEL_DATA,
-        FILTER_CLAUSE,
-      );
-      expect(res).to.be.eql(TRANSFORMED_DATA);
-      expect(T.transform).to.be.called.once;
-      expect(T.transform).to.be.called.with.exactly(MODEL_NAME, MODEL_DATA);
-    });
-  });
-
-  describe('overrides the "replaceOrCreate" method', function () {
-    it('transforms the given data', async function () {
-      sandbox.on(T, 'transform', () => TRANSFORMED_DATA);
-      const res = await A.replaceOrCreate(
-        MODEL_NAME,
-        MODEL_DATA,
-        FILTER_CLAUSE,
-      );
-      expect(res).to.be.eql(TRANSFORMED_DATA);
-      expect(T.transform).to.be.called.once;
-      expect(T.transform).to.be.called.with.exactly(MODEL_NAME, MODEL_DATA);
-    });
-
-    it('resolves the transformation promise', async function () {
-      sandbox.on(T, 'transform', () => Promise.resolve(TRANSFORMED_DATA));
-      const res = await A.replaceOrCreate(
-        MODEL_NAME,
-        MODEL_DATA,
-        FILTER_CLAUSE,
-      );
-      expect(res).to.be.eql(TRANSFORMED_DATA);
-      expect(T.transform).to.be.called.once;
-      expect(T.transform).to.be.called.with.exactly(MODEL_NAME, MODEL_DATA);
-    });
-  });
-
-  describe('overrides the "patch" method', function () {
-    it('transforms the given data', async function () {
-      sandbox.on(T, 'transform', () => TRANSFORMED_DATA);
-      const res = await A.patch(MODEL_NAME, MODEL_DATA, WHERE_CLAUSE);
-      expect(res).to.be.eql(TRANSFORMED_DATA);
-      expect(T.transform).to.be.called.once;
-      expect(T.transform).to.be.called.with.exactly(
-        MODEL_NAME,
-        MODEL_DATA,
-        true,
-      );
-    });
-
-    it('resolves the transformation promise', async function () {
-      sandbox.on(T, 'transform', () => Promise.resolve(TRANSFORMED_DATA));
-      const res = await A.patch(MODEL_NAME, MODEL_DATA, WHERE_CLAUSE);
-      expect(res).to.be.eql(TRANSFORMED_DATA);
-      expect(T.transform).to.be.called.once;
-      expect(T.transform).to.be.called.with.exactly(
-        MODEL_NAME,
-        MODEL_DATA,
-        true,
-      );
-    });
-  });
-
-  describe('overrides the "patchById" method', function () {
-    it('transforms the given data', async function () {
-      sandbox.on(T, 'transform', () => TRANSFORMED_DATA);
-      const res = await A.patchById(
-        MODEL_NAME,
-        DUMMY_ID,
-        MODEL_DATA,
-        FILTER_CLAUSE,
-      );
-      expect(res).to.be.eql(TRANSFORMED_DATA);
-      expect(T.transform).to.be.called.once;
-      expect(T.transform).to.be.called.with.exactly(
-        MODEL_NAME,
-        MODEL_DATA,
-        true,
-      );
-    });
-
-    it('resolves the transformation promise', async function () {
-      sandbox.on(T, 'transform', () => Promise.resolve(TRANSFORMED_DATA));
-      const res = await A.patchById(
-        MODEL_NAME,
-        DUMMY_ID,
-        MODEL_DATA,
-        FILTER_CLAUSE,
-      );
-      expect(res).to.be.eql(TRANSFORMED_DATA);
-      expect(T.transform).to.be.called.once;
-      expect(T.transform).to.be.called.with.exactly(
-        MODEL_NAME,
-        MODEL_DATA,
-        true,
-      );
-    });
-  });
-});

package/src/adapter/decorator/data-validation-decorator.d.ts

@@ -1,14 +0,0 @@
-import {Service} from '@e22m4u/js-service';
-import {Adapter} from '../adapter.js';
-
-/**
- * Data validation decorator.
- */
-export declare class DataValidationDecorator extends Service {
-  /**
-   * Decorate.
-   *
-   * @param adapter
-   */
-  decorate(adapter: Adapter): void;
-}

package/src/adapter/decorator/data-validation-decorator.js

@@ -1,54 +0,0 @@
-import {Adapter} from '../adapter.js';
-import {Service} from '@e22m4u/js-service';
-import {InvalidArgumentError} from '../../errors/index.js';
-import {ModelDataValidator} from '../../definition/index.js';
-
-/**
- * Data validation decorator.
- */
-export class DataValidationDecorator extends Service {
-  /**
-   * Decorate.
-   *
-   * @param {Adapter} adapter
-   */
-  decorate(adapter) {
-    if (!adapter || !(adapter instanceof Adapter))
-      throw new InvalidArgumentError(
-        'The first argument of DataValidationDecorator.decorate should be ' +
-          'an Adapter instance, but %v was given.',
-        adapter,
-      );
-    const validator = this.getService(ModelDataValidator);
-
-    const create = adapter.create;
-    adapter.create = function (modelName, modelData, filter) {
-      validator.validate(modelName, modelData);
-      return create.call(this, modelName, modelData, filter);
-    };
-
-    const replaceById = adapter.replaceById;
-    adapter.replaceById = function (modelName, id, modelData, filter) {
-      validator.validate(modelName, modelData);
-      return replaceById.call(this, modelName, id, modelData, filter);
-    };
-
-    const replaceOrCreate = adapter.replaceOrCreate;
-    adapter.replaceOrCreate = function (modelName, modelData, filter) {
-      validator.validate(modelName, modelData);
-      return replaceOrCreate.call(this, modelName, modelData, filter);
-    };
-
-    const patch = adapter.patch;
-    adapter.patch = function (modelName, modelData, where) {
-      validator.validate(modelName, modelData, true);
-      return patch.call(this, modelName, modelData, where);
-    };
-
-    const patchById = adapter.patchById;
-    adapter.patchById = function (modelName, id, modelData, filter) {
-      validator.validate(modelName, modelData, true);
-      return patchById.call(this, modelName, id, modelData, filter);
-    };
-  }
-}