More complete JSON value type

pretenderjs · Jan 11, 2018 · a35e2c8 · a35e2c8
1 parent 7101a31
commit a35e2c8
Show file tree

Hide file tree

Showing 3 changed files with 181 additions and 22 deletions.
diff --git a/index.d.ts b/index.d.ts
@@ -1,5 +1,16 @@
 import FakeXMLHttpRequest from "fake-xml-http-request";
 import { Params, QueryParams } from "route-recognizer";
+import * as JSON from 'json-typescript';
+// export type JSONPrimitive = string | number | boolean | null;
+// export interface JSONObject {
+//   [member: string]: JSONValue;
+//   [member: number]: JSONValue;
+// }
+// export interface JSONArray extends Array<JSONValue> {}
+
+// export type JSONValue = JSONPrimitive | JSONObject | JSONArray;
+
+
 type SetupCallback = (this: Server) => void;
 interface SetupConfig {
   forcePassthrough: boolean;
@@ -25,7 +36,7 @@ export type RequestHandler = (
   async?: boolean
 ) => void;
 
-export type ResponseData = [number, { [k: string]: string }, string];
+export type ResponseData = [number, JSON.Value, string];
 interface ExtraRequestData {
   params: Params;
   queryParams: QueryParams;

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pretender",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "main": "./pretender.js",
   "license": "MIT",
   "engines": {
@@ -38,6 +38,7 @@
   },
   "dependencies": {
     "fake-xml-http-request": "^2.0.0",
+    "json-typescript": "^1.0.0",
     "route-recognizer": "^0.3.3"
   },
   "jspm": {