@e22m4u/js-repository 0.1.5 → 0.1.7

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

@@ -1,20 +1,32 @@
 import {expect} from 'chai';
 import {format} from '@e22m4u/js-format';
+import {regexpValidator} from './builtin/index.js';
+import {maxLengthValidator} from './builtin/index.js';
+import {minLengthValidator} from './builtin/index.js';
 import {PropertyValidatorRegistry} from './property-validator-registry.js';
 
 describe('PropertyValidatorRegistry', function () {
+  it('has builtin validators', function () {
+    const S = new PropertyValidatorRegistry();
+    expect(S['_validators']).to.be.eql({
+      maxLength: maxLengthValidator,
+      minLength: minLengthValidator,
+      regexp: regexpValidator,
+    });
+  });
+
   describe('addValidator', function () {
     it('adds a given validator with the name', function () {
-      const s = new PropertyValidatorRegistry();
-      const myValidator = () => {};
-      const res = s.addValidator('myValidator', myValidator);
-      expect(res).to.be.eq(s);
-      expect(s['_validators']['myValidator']).to.be.eq(myValidator);
+      const S = new PropertyValidatorRegistry();
+      const myValidator = () => undefined;
+      const res = S.addValidator('myValidator', myValidator);
+      expect(res).to.be.eq(S);
+      expect(S['_validators']['myValidator']).to.be.eq(myValidator);
     });
 
     it('requires the given name to be a non-empty string', function () {
-      const s = new PropertyValidatorRegistry();
-      const throwable = v => () => s.addValidator(v, () => undefined);
+      const S = new PropertyValidatorRegistry();
+      const throwable = v => () => S.addValidator(v, () => undefined);
       const error = v =>
         format(
           'A name of the property validator must ' +
@@ -34,17 +46,17 @@ describe('PropertyValidatorRegistry', function () {
     });
 
     it('throws an error if the given name already exists', function () {
-      const s = new PropertyValidatorRegistry();
-      s.addValidator('test', () => undefined);
-      const throwable = () => s.addValidator('test', () => undefined);
+      const S = new PropertyValidatorRegistry();
+      S.addValidator('test', () => undefined);
+      const throwable = () => S.addValidator('test', () => undefined);
       expect(throwable).to.throw(
         'The property validator "test" is already defined.',
       );
     });
 
     it('requires the given validator to be a function', function () {
-      const s = new PropertyValidatorRegistry();
-      const throwable = v => () => s.addValidator('test', v);
+      const S = new PropertyValidatorRegistry();
+      const throwable = v => () => S.addValidator('test', v);
       const error = v =>
         format(
           'The property validator "test" must be a Function, but %s given.',
@@ -65,44 +77,44 @@ describe('PropertyValidatorRegistry', function () {
 
   describe('hasValidator', function () {
     it('returns false for a not existing name', function () {
-      const s = new PropertyValidatorRegistry();
-      expect(s.hasValidator('str')).to.be.false;
-      expect(s.hasValidator('')).to.be.false;
-      expect(s.hasValidator(10)).to.be.false;
-      expect(s.hasValidator(0)).to.be.false;
-      expect(s.hasValidator(true)).to.be.false;
-      expect(s.hasValidator(false)).to.be.false;
-      expect(s.hasValidator(null)).to.be.false;
-      expect(s.hasValidator(undefined)).to.be.false;
-      expect(s.hasValidator({})).to.be.false;
-      expect(s.hasValidator([])).to.be.false;
-      expect(s.hasValidator(() => undefined)).to.be.false;
+      const S = new PropertyValidatorRegistry();
+      expect(S.hasValidator('str')).to.be.false;
+      expect(S.hasValidator('')).to.be.false;
+      expect(S.hasValidator(10)).to.be.false;
+      expect(S.hasValidator(0)).to.be.false;
+      expect(S.hasValidator(true)).to.be.false;
+      expect(S.hasValidator(false)).to.be.false;
+      expect(S.hasValidator(null)).to.be.false;
+      expect(S.hasValidator(undefined)).to.be.false;
+      expect(S.hasValidator({})).to.be.false;
+      expect(S.hasValidator([])).to.be.false;
+      expect(S.hasValidator(() => undefined)).to.be.false;
     });
 
     it('returns true for an existing name', function () {
-      const s = new PropertyValidatorRegistry();
-      expect(s.hasValidator('test')).to.be.false;
-      s.addValidator('test', () => undefined);
-      expect(s.hasValidator('test')).to.be.true;
+      const S = new PropertyValidatorRegistry();
+      expect(S.hasValidator('test')).to.be.false;
+      S.addValidator('test', () => undefined);
+      expect(S.hasValidator('test')).to.be.true;
     });
   });
 
   describe('getValidator', function () {
     it('returns validator by its name', function () {
-      const s = new PropertyValidatorRegistry();
-      const validator1 = () => undefined;
-      const validator2 = () => undefined;
-      s.addValidator('foo', validator1);
-      s.addValidator('bar', validator2);
-      const res1 = s.getValidator('foo');
-      const res2 = s.getValidator('bar');
-      expect(res1).to.be.eq(validator1);
-      expect(res2).to.be.eq(validator2);
+      const S = new PropertyValidatorRegistry();
+      const myValidator1 = () => undefined;
+      const myValidator2 = () => undefined;
+      S.addValidator('foo', myValidator1);
+      S.addValidator('bar', myValidator2);
+      const res1 = S.getValidator('foo');
+      const res2 = S.getValidator('bar');
+      expect(res1).to.be.eq(myValidator1);
+      expect(res2).to.be.eq(myValidator2);
     });
 
     it('throws an error for a not existed name', function () {
-      const s = new PropertyValidatorRegistry();
-      const throwable = v => () => s.getValidator(v);
+      const S = new PropertyValidatorRegistry();
+      const throwable = v => () => S.getValidator(v);
       const error = v => format('The property validator %s is not defined.', v);
       expect(throwable('str')).to.throw(error('"str"'));
       expect(throwable('')).to.throw(error('""'));

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

@@ -1,6 +1,3 @@
-import {ServiceContainer} from '@e22m4u/js-service';
-import {FullPropertyDefinition} from '../property-definition.js';
-
 /**
  * Property validator context.
  */
@@ -8,8 +5,6 @@ export type PropertyValidatorContext = {
   validatorName: string,
   modelName: string,
   propName: string,
-  propDef: FullPropertyDefinition,
-  container: ServiceContainer,
 }
 
 /**
@@ -19,7 +14,7 @@ export type PropertyValidator = (
   value: unknown,
   options: unknown,
   context: PropertyValidatorContext,
-) => Promise<boolean> | boolean;
+) => boolean;
 
 /**
  * Property validate options.