From 3d1031470af08b97c7dad9cbca600599dd84dbc6 Mon Sep 17 00:00:00 2001 From: backmeupplz <backmeupplz@gmail.com> Date: Wed, 4 Mar 2020 08:55:06 -0800 Subject: [PATCH 1/2] add date --- lib/types.d.ts | 2 +- lib/types.js | 5 ++++- src/types.ts | 29 +++++++++++++++++------------ 3 files changed, 22 insertions(+), 14 deletions(-) diff --git a/lib/types.d.ts b/lib/types.d.ts index 104910e..153d895 100644 --- a/lib/types.d.ts +++ b/lib/types.d.ts @@ -1,4 +1,4 @@ -export declare type Types = 'object' | 'list' | 'map'; +export declare type Types = 'object' | 'list' | 'map' | 'date'; export declare const types: { [key: string]: ((s?: any) => any); }; diff --git a/lib/types.js b/lib/types.js index db1dd1b..f46d080 100644 --- a/lib/types.js +++ b/lib/types.js @@ -18,4 +18,7 @@ function list(s) { function map(s) { return serializr_1.map(object(s)); } -exports.types = { object: object, list: list, map: map }; +function date(s) { + return serializr_1.date(object(s)); +} +exports.types = { object: object, list: list, map: map, date: date }; diff --git a/src/types.ts b/src/types.ts index 5894d3b..2f58f1f 100644 --- a/src/types.ts +++ b/src/types.ts @@ -1,30 +1,35 @@ import { - list as _list, - map as _map, - object as _object, - custom + list as _list, + map as _map, + object as _object, + date as _date, + custom } from 'serializr' function _walk(v: any) { - if (typeof v === 'object' && v) Object.keys(v).map(k => _walk(v[k])) - return v + if (typeof v === 'object' && v) Object.keys(v).map(k => _walk(v[k])) + return v } function _default() { - return custom(_walk, (v: any) => v) + return custom(_walk, (v: any) => v) } function object(s: any) { - return s ? _object(s) : _default() + return s ? _object(s) : _default() } function list(s: any) { - return _list(object(s)) + return _list(object(s)) } function map(s: any) { - return _map(object(s)) + return _map(object(s)) } -export type Types = 'object' | 'list' | 'map' -export const types: { [key: string]: ((s?: any) => any) } = { object, list, map } +function date(s: any) { + return _date(object(s)) +} + +export type Types = 'object' | 'list' | 'map' | 'date' +export const types: { [key: string]: ((s?: any) => any) } = { object, list, map, date } From 17c00be2b88882c27fe9bfd386121ca3845ec28d Mon Sep 17 00:00:00 2001 From: backmeupplz <backmeupplz@gmail.com> Date: Wed, 4 Mar 2020 08:57:38 -0800 Subject: [PATCH 2/2] fix indentation --- src/types.ts | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/types.ts b/src/types.ts index 2f58f1f..68fd36a 100644 --- a/src/types.ts +++ b/src/types.ts @@ -1,34 +1,34 @@ import { - list as _list, - map as _map, - object as _object, - date as _date, - custom + list as _list, + map as _map, + object as _object, + date as _date, + custom } from 'serializr' function _walk(v: any) { - if (typeof v === 'object' && v) Object.keys(v).map(k => _walk(v[k])) - return v + if (typeof v === 'object' && v) Object.keys(v).map(k => _walk(v[k])) + return v } function _default() { - return custom(_walk, (v: any) => v) + return custom(_walk, (v: any) => v) } function object(s: any) { - return s ? _object(s) : _default() + return s ? _object(s) : _default() } function list(s: any) { - return _list(object(s)) + return _list(object(s)) } function map(s: any) { - return _map(object(s)) + return _map(object(s)) } function date(s: any) { - return _date(object(s)) + return _date(object(s)) } export type Types = 'object' | 'list' | 'map' | 'date'