feat(types): toJSON() on List now return Json[].

Author: aahoogendoorn

src/services/AxiosProvider.ts

@@ -1,14 +1,5 @@
 import axios, { AxiosError, Method } from 'axios';
-import {
-  HttpStatus,
-  HttpVerb,
-  isRestResult,
-  Request,
-  RequestOptions,
-  RequestProvider,
-  Response,
-  toResponse,
-} from '../http';
+import { HttpStatus, HttpVerb, isRestResult, Request, RequestOptions, RequestProvider, Response, toResponse } from '../http';
 import { isDefined, toResult, Uri } from '../types';
 import { choose } from '../utils';
 

src/types/List.ts

@@ -13,7 +13,7 @@ export class List<T> extends Array<T> {
 
   last = (p?: (value: T, index: number, array: T[]) => unknown, params?: unknown): T => (p ? this.filter(p, params).last() : this[this.length - 1]);
 
-  toJSON = (): List<Json> => this.map(i => json.parse(i));
+  toJSON = (): Json[] => this.reduce((a, i) => { a.push(json.parse(i)); return a; }, new Array<Json>());
 
   map = <U>(f: (value: T, index: number, array: T[]) => U, params?: unknown): List<U> => super.map(f, params) as List<U>;
 

src/validation/Contraints.ts

@@ -1,18 +1,4 @@
-import {
-  Func,
-  inFuture,
-  inPast,
-  isDefined,
-  isFunction,
-  isIn,
-  isNotEmpty,
-  isString,
-  list,
-  List,
-  meta,
-  Results,
-  Text,
-} from '../types';
+import { Func, inFuture, inPast, isDefined, isFunction, isIn, isNotEmpty, isString, list, List, meta, Results, Text } from '../types';
 import { validate, Validator } from './Validate';
 
 export type Constraint = Func<boolean | Results, any>;

src/validation/When.ts

@@ -1,16 +1,4 @@
-import {
-  Constructor,
-  ErrorOrigin,
-  Exception,
-  Get,
-  isDefined,
-  isEmpty,
-  isIn,
-  ofGet,
-  Predicate,
-  Results,
-  toArray,
-} from '../types';
+import { Constructor, ErrorOrigin, Exception, Get, isDefined, isEmpty, isIn, ofGet, Predicate, Results, toArray } from '../types';
 import { validate } from './Validate';
 import { reject, resolve } from '../utils';
 

test/data/CollectionGateway.test.ts

@@ -1,4 +1,4 @@
-import { CollectionGateway, Exception, resolve, toJson } from '../../src';
+import { CollectionGateway, Exception, resolve, Json, toJson, toList } from '../../src';
 import { Dev } from '../ref';
 import '@thisisagile/easy-test';
 
@@ -7,7 +7,7 @@ describe('CollectionGateway', () => {
   let gateway: CollectionGateway;
 
   beforeEach(() => {
-    gateway = new CollectionGateway(resolve(Dev.All.toJSON()));
+    gateway = new CollectionGateway(resolve(toList<Json>(Dev.All.toJSON())));
   });
 
   test('byId with known id returns product', () => {

test/types/Is.test.ts

@@ -1,17 +1,4 @@
-import {
-  Entity,
-  isArray,
-  isBoolean,
-  isDefined,
-  isEmpty,
-  isEmptyObject,
-  isInstance,
-  isNotEmpty,
-  isNumber,
-  isObject,
-  isPrimitive,
-  isString,
-} from '../../src';
+import { Entity, isArray, isBoolean, isDefined, isEmpty, isEmptyObject, isInstance, isNotEmpty, isNumber, isObject, isPrimitive, isString } from '../../src';
 import { Dev } from '../ref';
 
 describe('isDefined', () => {

test/types/List.test.ts

@@ -93,6 +93,8 @@ describe('List', () => {
 
   test('toJSON', () => {
     const json = list(Dev.Sander, Dev.Wouter).toJSON();
+    expect(json).not.toBeInstanceOf(List);
+    expect(json).toBeInstanceOf(Array);
     expect(JSON.stringify(json)).toBe(JSON.stringify([Dev.Sander.toJSON(), Dev.Wouter.toJSON()]));
     const j = list(Scope.Auth, Scope.Basic, Scope.Admin).toJSON();
     expect(JSON.stringify(j)).toBe(JSON.stringify([Scope.Auth.toJSON(), Scope.Basic.toJSON(), Scope.Admin.toJSON()]));

test/validation/Constraints.test.ts

@@ -58,28 +58,27 @@ describe('Constraints', () => {
   });
 });
 
-const is42 = (message?: Text): PropertyDecorator => constraint(v => v === 42, message ?? 'Property {property} should have value \'42\' instead of \'{actual}\'.');
+const is42 = (message?: Text): PropertyDecorator => constraint(v => v === 42, message ?? "Property {property} should have value '42' instead of '{actual}'.");
 
 class Person extends Struct {
   @valid() readonly age: Age = new Age(this.state.age);
   @is42() readonly realAge: number = this.state.age;
 }
 
 describe('Custom constraints', () => {
-
-  test('test age', () => {
+  test('age', () => {
     expect(isValue(new Age(42))).toBeTruthy();
     expect(validate(new Age(42))).toBeValid();
     expect(validate(new Age(142))).not.toBeValid();
   });
 
-  test('test person', () => {
+  test('person', () => {
     expect(validate(new Person({ age: 42 }))).toBeValid();
     expect(validate(new Person({ age: 142 }))).not.toBeValid();
   });
 
-  test('test custom validation', () => {
+  test('custom validation', () => {
     const res = validate(new Person({ age: 142 }));
     expect(res.results).toHaveLength(2);
   });
-});
+});

test/validation/Validate.test.ts

@@ -1,17 +1,4 @@
-import {
-  asList,
-  Entity,
-  Enum,
-  includes,
-  List,
-  required,
-  rule,
-  Struct,
-  toList,
-  valid,
-  validate,
-  Value,
-} from '../../src';
+import { asList, Entity, Enum, includes, List, required, rule, Struct, toList, valid, validate, Value } from '../../src';
 import '@thisisagile/easy-test';
 import { Dev } from '../ref';