From 152efc29ae3893030a607d64550def2272b87536 Mon Sep 17 00:00:00 2001 From: jonaslagoni Date: Mon, 8 Aug 2022 23:02:42 +0200 Subject: [PATCH 1/2] remove unused type helper functions --- src/helpers/TypeHelpers.ts | 23 ------------- test/helpers/TypeHelpers.spec.ts | 55 +------------------------------- 2 files changed, 1 insertion(+), 77 deletions(-) diff --git a/src/helpers/TypeHelpers.ts b/src/helpers/TypeHelpers.ts index cc191cc4bc..167249f164 100644 --- a/src/helpers/TypeHelpers.ts +++ b/src/helpers/TypeHelpers.ts @@ -1,29 +1,6 @@ import { CommonModel } from '../models'; import { ConstrainedAnyModel, ConstrainedBooleanModel, ConstrainedFloatModel, ConstrainedIntegerModel, ConstrainedMetaModel, ConstrainedObjectModel, ConstrainedReferenceModel, ConstrainedStringModel, ConstrainedTupleModel, ConstrainedArrayModel, ConstrainedUnionModel, ConstrainedEnumModel, ConstrainedDictionaryModel } from '../models/ConstrainedMetaModel'; -export enum ModelKind { - OBJECT = 'object', - ARRAY = 'array', - ENUM = 'enum', - UNION = 'union', - PRIMITIVE = 'primitive', -} - -export class TypeHelpers { - /** - * Returns the type (object | array | union | enum | primitive) of the model - * @param model to check - * @returns {ModelKind} - */ - static extractKind(model: CommonModel): ModelKind { - if (model.type === 'object') {return ModelKind.OBJECT;} - if (model.type === 'array') {return ModelKind.ARRAY;} - if (Array.isArray(model.enum)) {return ModelKind.ENUM;} - if (Array.isArray(model.type)) {return ModelKind.UNION;} - return ModelKind.PRIMITIVE; - } -} - export type TypeContext = { propertyKey?: string, options: Options, diff --git a/test/helpers/TypeHelpers.spec.ts b/test/helpers/TypeHelpers.spec.ts index 21b1f2d709..d510494345 100644 --- a/test/helpers/TypeHelpers.spec.ts +++ b/test/helpers/TypeHelpers.spec.ts @@ -1,60 +1,7 @@ -import { TypeHelpers, ModelKind, getTypeFromMapping, TypeMapping } from '../../src/helpers'; +import { getTypeFromMapping, TypeMapping } from '../../src/helpers'; import { CommonModel, ConstrainedAnyModel, ConstrainedArrayModel, ConstrainedBooleanModel, ConstrainedDictionaryModel, ConstrainedEnumModel, ConstrainedFloatModel, ConstrainedIntegerModel, ConstrainedMetaModel, ConstrainedObjectModel, ConstrainedReferenceModel, ConstrainedStringModel, ConstrainedTupleModel, ConstrainedUnionModel } from '../../src/models'; describe('TypeHelpers', () => { - describe('extractKind', () => { - test('should return object', () => { - const model = new CommonModel(); - model.type = 'object'; - const kind = TypeHelpers.extractKind(model); - - expect(kind).toEqual(ModelKind.OBJECT); - }); - - test('should return array', () => { - const model = new CommonModel(); - model.type = 'array'; - const kind = TypeHelpers.extractKind(model); - - expect(kind).toEqual(ModelKind.ARRAY); - }); - - test('should return enum', () => { - const model = new CommonModel(); - model.type = 'string'; - model.enum = ['someValue1', 'someValue2']; - const kind = TypeHelpers.extractKind(model); - - expect(kind).toEqual(ModelKind.ENUM); - }); - - test('should return union', () => { - const model = new CommonModel(); - model.type = ['number', 'string']; - const kind = TypeHelpers.extractKind(model); - - expect(kind).toEqual(ModelKind.UNION); - }); - - test('should return primitive', () => { - const model = new CommonModel(); - model.type = 'string'; - let kind = TypeHelpers.extractKind(model); - expect(kind).toEqual(ModelKind.PRIMITIVE); - - model.type = 'number'; - kind = TypeHelpers.extractKind(model); - expect(kind).toEqual(ModelKind.PRIMITIVE); - - model.type = 'integer'; - kind = TypeHelpers.extractKind(model); - expect(kind).toEqual(ModelKind.PRIMITIVE); - - model.type = 'boolean'; - kind = TypeHelpers.extractKind(model); - expect(kind).toEqual(ModelKind.PRIMITIVE); - }); - }); describe('getTypeFromMapping', () => { const typeMapping: TypeMapping = { Object: jest.fn().mockReturnValue('test'), From 5a7e627cb1bbd95e4a642b477dc63aacecd7c4ca Mon Sep 17 00:00:00 2001 From: Jonas Lagoni Date: Mon, 12 Sep 2022 15:00:52 +0200 Subject: [PATCH 2/2] Update src/helpers/TypeHelpers.ts --- src/helpers/TypeHelpers.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/helpers/TypeHelpers.ts b/src/helpers/TypeHelpers.ts index 167249f164..ffbfd00519 100644 --- a/src/helpers/TypeHelpers.ts +++ b/src/helpers/TypeHelpers.ts @@ -1,4 +1,3 @@ -import { CommonModel } from '../models'; import { ConstrainedAnyModel, ConstrainedBooleanModel, ConstrainedFloatModel, ConstrainedIntegerModel, ConstrainedMetaModel, ConstrainedObjectModel, ConstrainedReferenceModel, ConstrainedStringModel, ConstrainedTupleModel, ConstrainedArrayModel, ConstrainedUnionModel, ConstrainedEnumModel, ConstrainedDictionaryModel } from '../models/ConstrainedMetaModel'; export type TypeContext = {