Use parser's API support for BigInt

- Use parser's API support instead of normalizing bigint/number ourself.

Signed-off-by: Quoc-Hao Tran <quoc-hao.tran@polymtl.ca>

Author: haoadoreorange

tsp-typescript-client/package.json

@@ -11,7 +11,6 @@
   },
   "devDependencies": {
     "@types/jest": "^27.0.1",
-    "@types/json-bigint": "^1.0.1",
     "@types/node": "^11.13.8",
     "@types/node-fetch": "^2.3.3",
     "jest": "^27.1.0",
@@ -22,9 +21,9 @@
     "typescript": "latest"
   },
   "dependencies": {
-    "json-bigint": "sidorares/json-bigint#2c0a5f896d7888e68e5f4ae3c7ea5cd42fd54473",
     "node-fetch": "^2.5.0",
-    "rimraf": "latest"
+    "rimraf": "latest",
+    "when-json-met-bigint": "^0.21.0"
   },
   "scripts": {
     "prepare": "yarn run clean && yarn run build",

tsp-typescript-client/src/models/annotation.ts

@@ -1,4 +1,5 @@
-import { array, assertNumber, createNormalizer, record } from '../protocol/serialization';
+import { Schema } from 'when-json-met-bigint';
+import { assertNumber, bigint } from '../protocol/serialization';
 import { OutputElementStyle } from './styles';
 
 export enum Type {
@@ -10,12 +11,15 @@ export interface AnnotationCategoriesModel {
     annotationCategories: string[];
 }
 
-export const Annotation = createNormalizer<Annotation>({
-    duration: BigInt,
-    entryId: assertNumber,
-    time: BigInt,
-    style: OutputElementStyle,
-});
+export const AnnotationSchema: Schema = {
+    annotations: {
+        [Symbol.for(`any`)]: [{
+            duration: bigint,
+            entryId: assertNumber,
+            time: bigint,
+        }]
+    }
+};
 
 /**
  * Model for annotation
@@ -53,10 +57,6 @@ export interface Annotation {
     style?: OutputElementStyle;
 }
 
-export const AnnotationModel = createNormalizer<AnnotationModel>({
-    annotations: record(array(Annotation)),
-});
-
 export interface AnnotationModel {
     annotations: { [category: string]: Annotation[] };
 }

tsp-typescript-client/src/models/bookmark.ts

@@ -1,9 +1,10 @@
-import { createNormalizer } from '../protocol/serialization';
+import { Schema } from 'when-json-met-bigint';
+import { bigint } from '../protocol/serialization';
 
-export const Bookmark = createNormalizer<Bookmark>({
-    endTime: BigInt,
-    startTime: BigInt,
-});
+export const BookmarkSchema: Schema = {
+    endTime: bigint,
+    startTime: bigint,
+};
 
 /**
  * Model for bookmark

tsp-typescript-client/src/models/entry.ts

@@ -1,13 +1,11 @@
-import { array, assertNumber, createNormalizer, Normalizer } from '../protocol/serialization';
+import { Schema } from 'when-json-met-bigint';
+import { assertNumber } from '../protocol/serialization';
 import { OutputElementStyle } from './styles';
 
-export const Entry = createNormalizer<Entry>({
+export const EntrySchema: Schema = {
     id: assertNumber,
     parentId: assertNumber,
-    style: {
-        values: undefined,
-    },
-});
+};
 
 /**
  * Basic entry interface
@@ -54,11 +52,7 @@ export interface EntryHeader {
     tooltip: string
 }
 
-export function EntryModel<T extends Entry>(normalizer: Normalizer<T>): Normalizer<EntryModel<T>> {
-    return createNormalizer<EntryModel<any>>({
-        entries: array(normalizer),
-    });
-}
+export const EntryModelSchema = (schema: Schema): Schema => ({ entries: [schema] });
 
 /**
  * Entry model that will be returned by the server

tsp-typescript-client/src/models/experiment.ts

@@ -1,12 +1,13 @@
-import { array, assertNumber, createNormalizer } from '../protocol/serialization';
-import { Trace } from './trace';
+import { Schema } from 'when-json-met-bigint';
+import { assertNumber, bigint } from '../protocol/serialization';
+import { TraceSchema, Trace } from './trace';
 
-export const Experiment = createNormalizer<Experiment>({
-    end: BigInt,
+export const ExperimentSchema: Schema = {
+    end: bigint,
     nbEvents: assertNumber,
-    start: BigInt,
-    traces: array(Trace),
-});
+    start: bigint,
+    traces: [TraceSchema],
+};
 
 /**
  * Model of an experiment that contain one or more traces

tsp-typescript-client/src/models/output-descriptor.ts

@@ -1,10 +1,10 @@
-import { createNormalizer } from '../protocol/serialization';
+import { Schema } from 'when-json-met-bigint';
+import { bigint } from '../protocol/serialization';
 
-export const OutputDescriptor = createNormalizer<OutputDescriptor>({
-    end: BigInt,
-    queryParameters: undefined,
-    start: BigInt,
-});
+export const OutputDescriptorSchema: Schema = {
+    end: bigint,
+    start: bigint,
+};
 
 /**
  * Descriptor of a specific output provider

tsp-typescript-client/src/models/response/responses.ts

@@ -1,4 +1,4 @@
-import { Deserialized, createNormalizer, Normalizer } from '../../protocol/serialization';
+import { Schema } from 'when-json-met-bigint';
 
 /**
  * Response status
@@ -24,13 +24,7 @@ export enum ResponseStatus {
     CANCELLED = 'CANCELLED'
 }
 
-export function GenericResponse<T>(): Normalizer<GenericResponse<Deserialized<T>>>;
-export function GenericResponse<T>(normalizer: Normalizer<T>): Normalizer<GenericResponse<T>>;
-export function GenericResponse<T>(normalizer?: Normalizer<T>): Normalizer<GenericResponse<T>> | Normalizer<GenericResponse<Deserialized<T>>> {
-    return createNormalizer<GenericResponse<any>>({
-        model: normalizer,
-    });
-}
+export const GenericResponseSchema = (schema: Schema): Schema => ({ model: schema });
 
 /**
  * Generic response that contains a model

tsp-typescript-client/src/models/styles.ts

@@ -1,9 +1,3 @@
-import { createNormalizer } from '../protocol/serialization';
-
-export const OutputElementStyle = createNormalizer<OutputElementStyle>({
-    values: undefined,
-});
-
 /**
  * Output element style object for one style key. It supports style
  * inheritance. To avoid creating new styles the element style can have a parent

tsp-typescript-client/src/models/table.ts

@@ -1,8 +1,9 @@
-import { array, assertNumber, createNormalizer } from '../protocol/serialization';
+import { Schema } from 'when-json-met-bigint';
+import { assertNumber } from '../protocol/serialization';
 
-export const ColumnHeaderEntry = createNormalizer<ColumnHeaderEntry>({
+export const ColumnHeaderEntrySchema: Schema = {
     id: assertNumber,
-});
+};
 
 /**
  * Column header
@@ -29,9 +30,9 @@ export interface ColumnHeaderEntry {
     type: string;
 }
 
-export const Cell = createNormalizer<Cell>({
+export const CellSchema: Schema = {
     tags: assertNumber,
-});
+};
 
 /**
  * Cell inside a table line
@@ -48,11 +49,11 @@ export interface Cell {
     tags?: number;
 }
 
-export const Line = createNormalizer<Line>({
-    cells: array(Cell),
+export const LineSchema = {
+    cells: [CellSchema],
     index: assertNumber,
     tags: assertNumber,
-});
+};
 
 /**
  * Line of a table
@@ -74,12 +75,12 @@ export interface Line {
     tags?: number;
 }
 
-export const TableModel = createNormalizer<TableModel>({
-    columnIds: array(assertNumber),
-    lines: array(Line),
+export const TableModelSchema = {
+    columnIds: [assertNumber],
+    lines: [LineSchema],
     lowIndex: assertNumber,
     size: assertNumber,
-});
+};
 
 /**
  * Model of a table

tsp-typescript-client/src/models/timegraph.ts

@@ -1,14 +1,14 @@
-import { array, assertNumber, createNormalizer } from '../protocol/serialization';
+import { Schema } from 'when-json-met-bigint';
+import { assertNumber, bigint } from '../protocol/serialization';
 import { Entry } from './entry';
 import { OutputElementStyle } from './styles';
 
-export const TimeGraphEntry = createNormalizer<TimeGraphEntry>({
-    end: BigInt,
+export const TimeGraphEntrySchema: Schema = {
+    end: bigint,
     id: assertNumber,
     parentId: assertNumber,
-    start: BigInt,
-    style: OutputElementStyle,
-});
+    start: bigint,
+};
 
 /**
  * Entry in a time graph
@@ -25,12 +25,11 @@ export interface TimeGraphEntry extends Entry {
     end: bigint;
 }
 
-const TimeGraphState = createNormalizer<TimeGraphState>({
-    end: BigInt,
-    start: BigInt,
+const TimeGraphStateSchema: Schema = {
+    end: bigint,
+    start: bigint,
     tags: assertNumber,
-    style: OutputElementStyle,
-});
+};
 
 /**
  * Time graph state
@@ -62,10 +61,10 @@ export interface TimeGraphState {
     style?: OutputElementStyle;
 }
 
-export const TimeGraphRow = createNormalizer<TimeGraphRow>({
+export const TimeGraphRowSchema: Schema = {
     entryId: assertNumber,
-    states: array(TimeGraphState),
-});
+    states: [TimeGraphStateSchema],
+};
 
 /**
  * Time graph row described by an array of states for a specific entry
@@ -82,9 +81,9 @@ export interface TimeGraphRow {
     states: TimeGraphState[];
 }
 
-export const TimeGraphModel = createNormalizer<TimeGraphModel>({
-    rows: array(TimeGraphRow),
-});
+export const TimeGraphModelSchema: Schema = {
+    rows: [TimeGraphRowSchema],
+};
 
 /**
  * Time Graph model that will be returned by the server
@@ -93,13 +92,12 @@ export interface TimeGraphModel {
     rows: TimeGraphRow[];
 }
 
-export const TimeGraphArrow = createNormalizer<TimeGraphArrow>({
-    end: BigInt,
+export const TimeGraphArrowSchema: Schema = {
+    end: bigint,
     sourceId: assertNumber,
-    start: BigInt,
+    start: bigint,
     targetId: assertNumber,
-    style: OutputElementStyle,
-});
+};
 
 /**
  * Arrow for time graph