@cleverbrush/schema 0.0.4 → 0.0.7

package/dist/index.d.ts

@@ -66,8 +66,8 @@ export interface ISchemasProvider<T = Record<string, never>> {
     };
 }
 export interface ISchemaValidator<T = Record<string, never>> {
-    addSchemaType<K, L extends ObjectSchemaDefinitionParam<M>, M = any>(name: keyof K, schema: L): SchemaValidator<T & {
-        [key in keyof K]: L;
+    addSchemaType<K, L extends ObjectSchemaDefinitionParam<M>, M = any>(name: keyof K, schema: L | Array<Schema<any>>): SchemaValidator<T & {
+        [key in keyof K]: typeof schema;
     }>;
     validate(schema: keyof T | DefaultSchemaType | Schema<any>, obj: any): Promise<ValidationResult>;
 }

package/dist/schemaValidator.d.ts

@@ -2,7 +2,7 @@ import { ISchemasProvider, Schema, ISchemaActions, ObjectSchemaDefinitionParam,
 export default class SchemaValidator<T = Record<string, never>> implements ISchemasProvider<T>, ISchemaValidator<T> {
     private _schemasMap;
     private _schemasCache;
-    addSchemaType<K, L extends ObjectSchemaDefinitionParam<M>, M = any>(name: keyof K, schema: L): SchemaValidator<T & {
+    addSchemaType<K, L extends ObjectSchemaDefinitionParam<M>, M = any>(name: keyof K, schema: L | Array<Schema<any>>): SchemaValidator<T & {
         [key in keyof K]: L;
     }>;
     get schemas(): {

package/dist/schemaValidator.js

@@ -40,13 +40,18 @@ class SchemaValidator {
     addSchemaType(name, schema) {
         if (typeof name !== 'string' || !name)
             throw new Error('Name is required');
-        if (typeof schema !== 'object')
-            throw new Error('Object is required');
         if (isDefaultType(name.toString()))
             throw new Error(`You can't add a schema named "${name}" because it's a name of a default schema, please consider another name to be used`);
         if (this._schemasMap.has(name.toString())) {
             throw new Error(`Schema "${name}" already exists`);
         }
+        if (Array.isArray(schema)) {
+            this._schemasMap.set(name.toString(), schema);
+            this._schemasCache = null;
+            return this;
+        }
+        if (typeof schema !== 'object')
+            throw new Error('Array or Object is required');
         this._schemasMap.set(name.toString(), {
             ...schema,
             type: 'object'
@@ -123,6 +128,10 @@ class SchemaValidator {
                 return await this.validateDefaultType(schema, obj);
             }
             else if (typeof this.schemas[schema] !== 'undefined') {
+                if (Array.isArray(this.schemas[schema].schema)) {
+                    return this.validate(this.schemas[schema]
+                        .schema, obj);
+                }
                 const objSchema = (0, deep_1.deepExtend)(defaultSchemas.object, this.schemas[schema].schema);
                 const res = await (0, validateObject_1.validateObject)(obj, objSchema, this);
                 if (!res.valid)

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cleverbrush/schema",
-    "version": "0.0.4",
+    "version": "0.0.7",
     "keywords": [
         "object schema validator",
         "schema",
@@ -10,12 +10,16 @@
     "license": "BSD",
     "main": "./dist/index.js",
     "readme": "https://github.com/cleverbrush/libs/tree/master/libs/schema#readme",
+    "repository": {
+        "type": "git",
+        "url": "github:cleverbrush/libs"
+    },
     "scripts": {
         "watch": "tsc --watch",
         "build": "tsc"
     },
     "dependencies": {
-        "@cleverbrush/deep": "0.0.4"
+        "@cleverbrush/deep": "0.0.7"
     },
     "types": "./dist/index.d.ts"
 }

package/src/index.ts

@@ -124,8 +124,8 @@ export interface ISchemasProvider<T = Record<string, never>> {
 export interface ISchemaValidator<T = Record<string, never>> {
     addSchemaType<K, L extends ObjectSchemaDefinitionParam<M>, M = any>(
         name: keyof K,
-        schema: L
-    ): SchemaValidator<T & { [key in keyof K]: L }>;
+        schema: L | Array<Schema<any>>
+    ): SchemaValidator<T & { [key in keyof K]: typeof schema }>;
 
     validate(
         schema: keyof T | DefaultSchemaType | Schema<any>,

package/src/schemaValidator.test.ts

@@ -97,39 +97,39 @@ test('Schemas property is updated after adding a new schema', () => {
 });
 
 test('Trows when trying to add a schema with name = "number"', () => {
-    let validator = new SchemaValidator();
+    const validator = new SchemaValidator();
     expect(() => validator.addSchemaType('number', {})).toThrow();
 });
 
 test('Trows when trying to add a schema with name = "array"', () => {
-    let validator = new SchemaValidator();
+    const validator = new SchemaValidator();
     expect(() => validator.addSchemaType('array', {})).toThrow();
 });
 
 test('Trows when trying to add a schema with name = "date"', () => {
-    let validator = new SchemaValidator();
+    const validator = new SchemaValidator();
     expect(() => validator.addSchemaType('date', {})).toThrow();
 });
 
 test('Trows when trying to add a schema with name = "string"', () => {
-    let validator = new SchemaValidator();
+    const validator = new SchemaValidator();
     expect(() => validator.addSchemaType('string', {})).toThrow();
 });
 
 test('Throws if schema name is empty', () => {
-    let validator = new SchemaValidator();
+    const validator = new SchemaValidator();
     expect(() => validator.addSchemaType('', {})).toThrow();
 });
 
 test('Throws if schema name is not a string', () => {
-    let validator = new SchemaValidator();
+    const validator = new SchemaValidator();
     expect(() =>
         validator.addSchemaType(new Date() as any as string, {})
     ).toThrow();
 });
 
 test('Throws if schema is not an object', () => {
-    let validator = new SchemaValidator();
+    const validator = new SchemaValidator();
     expect(() =>
         validator.addSchemaType(
             'string',
@@ -138,6 +138,33 @@ test('Throws if schema is not an object', () => {
     ).toThrow();
 });
 
+test('Array as schema type', async () => {
+    const validator = new SchemaValidator()
+        .addSchemaType('name', {
+            properties: {
+                name: 'string'
+            }
+        })
+        .addSchemaType('number_or_string', ['number', 'string', 'name']);
+
+    let result = await validator.schemas.number_or_string.validate(123);
+
+    expect(result).toHaveProperty('valid', true);
+
+    result = await validator.schemas.number_or_string.validate('some string');
+
+    expect(result).toHaveProperty('valid', true);
+
+    result = await validator.schemas.number_or_string.validate({});
+
+    expect(result).toHaveProperty('valid', false);
+
+    result = await validator.schemas.number_or_string.validate({
+        name: 'some name'
+    });
+    expect(result).toHaveProperty('valid', true);
+});
+
 test('Validate - no schema', async () => {
     const validator = new SchemaValidator();
     const cth = jest.fn();
@@ -741,7 +768,7 @@ test('Validate - array - ofType - 1', async () => {
 });
 
 test('Validate - object - 1', async () => {
-    let validator = new SchemaValidator().addSchemaType(
+    const validator = new SchemaValidator().addSchemaType(
         'user',
         getUserSchema()
     );
@@ -824,7 +851,7 @@ test('Validate - object - 1', async () => {
 });
 
 test('Validate - object - 2', async () => {
-    let validator = new SchemaValidator().addSchemaType(
+    const validator = new SchemaValidator().addSchemaType(
         'user',
         deepExtend(getUserSchema(), {
             validators: [
@@ -853,7 +880,7 @@ test('Validate - object - 2', async () => {
         aliases: []
     };
 
-    let result = await validator.validate('user', user);
+    const result = await validator.validate('user', user);
     expect(result).toHaveProperty('valid', false);
 });
 
@@ -885,3 +912,211 @@ test('Validate - one of - 1', async () => {
     );
     expect(result).toHaveProperty('valid', true);
 });
+
+test('Validate schema', async () => {
+    const authorsReportSpecificationSchema = {
+        properties: {
+            type: {
+                type: 'string',
+                equals: 'author'
+            },
+            start: 'Date',
+            end: 'Date',
+            selectionStart: 'Date',
+            selectionEnd: 'Date',
+            granularity: ['day', 'week', 'month'],
+            metrics: {
+                type: 'array',
+                ofType: [
+                    'articlesPublished',
+                    'searchReferrers',
+                    'socialReferrers',
+                    'views',
+                    'visitors',
+                    'newVisitors'
+                ]
+            },
+            filters: {
+                type: 'object',
+                properties: {
+                    author: 'AuthorFilter'
+                    // publication: 'PublicationFilter',
+                    // article: 'ArticleFilter'
+                }
+            }
+        },
+        validators: [
+            (value) =>
+                value.start <= value.end &&
+                value.selectionStart <= value.selectionEnd &&
+                value.selectionStart >= value.start &&
+                value.selectionStart <= value.end &&
+                value.selectionEnd >= value.start &&
+                value.selectionEnd <= value.end
+                    ? {
+                          valid: true
+                      }
+                    : {
+                          valid: false,
+                          errors: [
+                              'selectionStart <=> selectionEnd should be inside the start <=> end interval'
+                          ]
+                      }
+        ]
+    };
+
+    const validator = new SchemaValidator()
+        .addSchemaType('Date', {
+            validators: [
+                (value) =>
+                    value instanceof Date && !Number.isNaN(value)
+                        ? {
+                              valid: true
+                          }
+                        : {
+                              valid: false,
+                              errors: ['should be a valid Date object']
+                          }
+            ]
+        })
+        .addSchemaType('EqualsFilterCondition', {
+            properties: {
+                operation: {
+                    type: 'string',
+                    equals: 'equals'
+                },
+                value: ['object', 'string', 'number']
+            }
+        })
+        .addSchemaType('GreaterThanFilterCondition', {
+            properties: {
+                operation: {
+                    type: 'string',
+                    equals: 'greater_than'
+                },
+                value: 'number'
+            }
+        })
+        .addSchemaType('LessThanFilterCondition', {
+            properties: {
+                operation: {
+                    type: 'string',
+                    equals: 'less_than'
+                },
+                value: 'number'
+            }
+        })
+        .addSchemaType('ContainsFilterCondition', {
+            properties: {
+                operation: {
+                    type: 'string',
+                    equals: 'contains'
+                },
+                value: [
+                    'string',
+                    'number',
+                    {
+                        type: 'array',
+                        ofType: ['string', 'number']
+                    }
+                ]
+            }
+        })
+        .addSchemaType('LikeFilterCondition', {
+            properties: {
+                operation: 'like',
+                value: 'string'
+            }
+        })
+        .addSchemaType('BetweenFilterCondition', {
+            properties: {
+                operation: 'between',
+                from: 'number',
+                to: 'number'
+            },
+            validators: [
+                (value) =>
+                    value.from <= value.to
+                        ? { valid: true }
+                        : { valid: false, error: ['from must be <= to'] }
+            ]
+        })
+        .addSchemaType('StringFilterCondition', [
+            'EqualsFilterCondition',
+            'LikeFilterCondition'
+        ])
+        .addSchemaType('AuthorFilter', {
+            properties: {
+                fullName: 'StringFilterCondition'
+            }
+        })
+        .addSchemaType(
+            'AuthorsReportSpecification',
+            authorsReportSpecificationSchema as ObjectSchemaDefinitionParam<any>
+        );
+
+    /**
+     * @type {import('smg-iq/editorial-analytics.reports').AuthorsReportSpecification}
+     */
+    let reportSpec = {
+        type: 'author',
+        start: new Date(2021, 0, 1),
+        end: new Date(),
+        selectionStart: new Date(2022, 0, 1),
+        selectionEnd: new Date(2022, 2, 1),
+        granularity: 'day',
+        metrics: [
+            'articlesPublished',
+            'searchReferrers',
+            'socialReferrers',
+            'views',
+            'visitors',
+            'newVisitors'
+        ],
+        filters: {
+            author: {
+                fullName: {
+                    operation: 'between',
+                    value: 'some name'
+                }
+            }
+        }
+    };
+
+    let result = await validator.schemas.AuthorsReportSpecification.validate(
+        reportSpec
+    );
+
+    expect(result).toHaveProperty('valid', false);
+
+    reportSpec = {
+        type: 'author',
+        start: new Date(2021, 0, 1),
+        end: new Date(),
+        selectionStart: new Date(2022, 0, 1),
+        selectionEnd: new Date(2022, 2, 1),
+        granularity: 'day',
+        metrics: [
+            'articlesPublished',
+            'searchReferrers',
+            'socialReferrers',
+            'views',
+            'visitors',
+            'newVisitors'
+        ],
+        filters: {
+            author: {
+                fullName: {
+                    operation: 'equals',
+                    value: 'some name'
+                }
+            }
+        }
+    };
+
+    result = await validator.schemas.AuthorsReportSpecification.validate(
+        reportSpec
+    );
+
+    expect(result).toHaveProperty('valid', true);
+});

package/src/schemaValidator.ts

@@ -73,11 +73,11 @@ export default class SchemaValidator<T = Record<string, never>>
 
     public addSchemaType<K, L extends ObjectSchemaDefinitionParam<M>, M = any>(
         name: keyof K,
-        schema: L
+        schema: L | Array<Schema<any>>
     ): SchemaValidator<T & { [key in keyof K]: L }> {
         if (typeof name !== 'string' || !name)
             throw new Error('Name is required');
-        if (typeof schema !== 'object') throw new Error('Object is required');
+
         if (isDefaultType(name.toString()))
             throw new Error(
                 `You can't add a schema named "${name}" because it's a name of a default schema, please consider another name to be used`
@@ -86,6 +86,14 @@ export default class SchemaValidator<T = Record<string, never>>
             throw new Error(`Schema "${name}" already exists`);
         }
 
+        if (Array.isArray(schema)) {
+            this._schemasMap.set(name.toString(), schema as Schema<any>);
+            this._schemasCache = null;
+            return this as any as SchemaValidator<T & { [key in keyof K]: L }>;
+        }
+
+        if (typeof schema !== 'object')
+            throw new Error('Array or Object is required');
         this._schemasMap.set(name.toString(), {
             ...schema,
             type: 'object'
@@ -194,6 +202,13 @@ export default class SchemaValidator<T = Record<string, never>>
                     obj
                 );
             } else if (typeof this.schemas[schema as keyof T] !== 'undefined') {
+                if (Array.isArray(this.schemas[schema as keyof T].schema)) {
+                    return this.validate(
+                        this.schemas[schema as keyof T]
+                            .schema as any as Schema<any>,
+                        obj
+                    );
+                }
                 const objSchema = deepExtend(
                     defaultSchemas.object,
                     this.schemas[schema as keyof T].schema