From 749b96284ae0a7e6d03034806deab998a36b7cf6 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Sat, 14 Dec 2019 17:23:31 +0100 Subject: codecs WIP --- gulpfile.js | 1 + src/util/codec-test.ts | 36 ++++++++++ src/util/codec.ts | 181 +++++++++++++++++++++++++++++++++++++++++++++++++ tsconfig.json | 3 + 4 files changed, 221 insertions(+) create mode 100644 src/util/codec-test.ts create mode 100644 src/util/codec.ts diff --git a/gulpfile.js b/gulpfile.js index dbdb33cc0..15f6ff10f 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -99,6 +99,7 @@ const tsBaseArgs = { strictPropertyInitialization: false, outDir: "dist/node", noImplicitAny: true, + noImplicitThis: true, allowJs: true, checkJs: true, incremental: true, diff --git a/src/util/codec-test.ts b/src/util/codec-test.ts new file mode 100644 index 000000000..d7edd545f --- /dev/null +++ b/src/util/codec-test.ts @@ -0,0 +1,36 @@ +/* + This file is part of GNU Taler + (C) 2018-2019 GNUnet e.V. + + GNU Taler is free software; you can redistribute it and/or modify it under the + terms of the GNU General Public License as published by the Free Software + Foundation; either version 3, or (at your option) any later version. + + GNU Taler is distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR + A PARTICULAR PURPOSE. See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along with + GNU Taler; see the file COPYING. If not, see + */ + +/** + * Type-safe codecs for converting from/to JSON. + */ + +import test from "ava"; +import { stringCodec, objectCodec } from "./codec"; + +interface MyObj { + foo: string; +} + +test("basic codec", (t) => { + const myObjCodec = objectCodec().property("foo", stringCodec).build("MyObj"); + const res = myObjCodec.decode({ foo: "hello" }); + t.assert(res.foo === "hello"); + + t.throws(() => { + const res2 = myObjCodec.decode({ foo: 123 }); + }); +}); diff --git a/src/util/codec.ts b/src/util/codec.ts new file mode 100644 index 000000000..690486b7d --- /dev/null +++ b/src/util/codec.ts @@ -0,0 +1,181 @@ +/* + This file is part of GNU Taler + (C) 2018-2019 GNUnet e.V. + + GNU Taler is free software; you can redistribute it and/or modify it under the + terms of the GNU General Public License as published by the Free Software + Foundation; either version 3, or (at your option) any later version. + + GNU Taler is distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR + A PARTICULAR PURPOSE. See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along with + GNU Taler; see the file COPYING. If not, see + */ + +/** + * Type-safe codecs for converting from/to JSON. + */ + +/** + * Error thrown when decoding fails. + */ +export class DecodingError extends Error { + constructor(message: string) { + super(message); + Object.setPrototypeOf(this, DecodingError.prototype); + this.name = "DecodingError"; + } +} + +/** + * Context information to show nicer error messages when decoding fails. + */ +interface Context { + readonly path?: string[]; +} + +function renderContext(c?: Context): string { + const p = c?.path; + if (p) { + return p.join("."); + } else { + return "(unknown)"; + } +} + +function joinContext(c: Context | undefined, part: string): Context { + const path = c?.path ?? []; + return { + path: path.concat([part]), + }; +} + +/** + * A codec converts untyped JSON to a typed object. + */ +export interface Codec { + /** + * Decode untyped JSON to an object of type [[V]]. + */ + readonly decode: (x: any, c?: Context) => V; +} + +type SingletonRecord = { [Y in K]: V }; + +interface Prop { + name: string; + codec: Codec; +} + +class ObjectCodecBuilder { + private propList: Prop[] = []; + + /** + * Define a property for the object. + */ + property( + x: K, + codec: Codec, + ): ObjectCodecBuilder> { + this.propList.push({ name: x, codec: codec }); + return this as any; + } + + /** + * Return the built codec. + * + * @param objectDisplayName name of the object that this codec operates on, + * used in error messages. + */ + build(objectDisplayName: string): Codec { + const propList = this.propList; + return { + decode(x: any, c?: Context): TC { + if (!c) { + c = { + path: [`(${objectDisplayName})`], + }; + } + const obj: any = {}; + for (const prop of propList) { + const propRawVal = x[prop.name]; + const propVal = prop.codec.decode( + propRawVal, + joinContext(c, prop.name), + ); + obj[prop.name] = propVal; + } + return obj as TC; + }, + }; + } +} + +/** + * Return a codec for a value that must be a string. + */ +export const stringCodec: Codec = { + decode(x: any, c?: Context): string { + if (typeof x === "string") { + return x; + } + throw new DecodingError(`expected string at ${renderContext(c)}`); + }, +}; + +/** + * Return a codec for a value that must be a number. + */ +export const numberCodec: Codec = { + decode(x: any, c?: Context): number { + if (typeof x === "number") { + return x; + } + throw new DecodingError(`expected number at ${renderContext(c)}`); + }, +}; + +/** + * Return a codec for a list, containing values described by the inner codec. + */ +export function listCodec(innerCodec: Codec): Codec { + return { + decode(x: any, c?: Context): T[] { + const arr: T[] = []; + if (!Array.isArray(x)) { + throw new DecodingError(`expected array at ${renderContext(c)}`); + } + for (const i in x) { + arr.push(innerCodec.decode(x[i], joinContext(c, `[${i}]`))); + } + return arr; + }, + }; +} + +/** + * Return a codec for a mapping from a string to values described by the inner codec. + */ +export function mapCodec(innerCodec: Codec): Codec<{ [x: string]: T }> { + return { + decode(x: any, c?: Context): { [x: string]: T } { + const map: { [x: string]: T } = {}; + if (typeof x !== "object") { + throw new DecodingError(`expected object at ${renderContext(c)}`); + } + for (const i in x) { + map[i] = innerCodec.decode(x[i], joinContext(c, `[${i}]`)); + } + return map; + }, + }; +} + +/** + * Return a builder for a codec that decodes an object with properties. + */ +export function objectCodec(): ObjectCodecBuilder { + return new ObjectCodecBuilder(); +} diff --git a/tsconfig.json b/tsconfig.json index 8d696591c..cb2985aeb 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -17,6 +17,7 @@ "strictPropertyInitialization": false, "outDir": "dist/node", "noImplicitAny": true, + "noImplicitThis": true, "allowJs": true, "checkJs": true, "incremental": true, @@ -69,6 +70,8 @@ "src/util/assertUnreachable.ts", "src/util/asyncMemo.ts", "src/util/checkable.ts", + "src/util/codec-test.ts", + "src/util/codec.ts", "src/util/helpers-test.ts", "src/util/helpers.ts", "src/util/http.ts", -- cgit v1.2.3