added filename to JSON.parse error

Author: psnider

commonjs/json-file.js

@@ -8,7 +8,7 @@ import fs                               = require('fs');
 
 
 
-export function readJSONFile(filename : string) : Promise<{filename: string, contents: any}> {
+export function readJSONFile(filename : string) : Promise<JSONFile.FilenameWContents> {
     return new Promise((resolve, reject) => {
         fs.readFile(filename, {"encoding": "utf-8"}, (error, data) => {
             if (error) {
@@ -18,6 +18,7 @@ export function readJSONFile(filename : string) : Promise<{filename: string, con
                     var obj = JSON.parse(data);
                     resolve({filename: filename, contents: obj});
                 } catch (error) {
+                    error.message += ', in filename=' + filename
                     reject(error);
                 }
             }
@@ -44,7 +45,7 @@ function convertJSONObjOrArrayToTypedObject(json_obj : any, convertJSONObjToType
 
 
 // @arg: typename: The typename for the type in the JSON file.
-export function loadDatabaseFromJSONFile(filename : string, convertJSONObjToTypedObj? : (json_obj : any) => void, validate?: JSONFile.Validate, typename?: string): Promise<any> {
+export function loadDatabaseFromJSONFile(filename : string, convertJSONObjToTypedObj? : (json_obj : any) => void, validate?: JSONFile.Validate, typename?: string): Promise<JSONFile.FilenameWContents> {
     // @throws An error if the object is not valid..
     function checkValidity(obj) {
         if (Array.isArray(obj)) {

src/ts/json-file.ts

@@ -57,7 +57,7 @@ describe('json-file', function() {
                     done(new Error('promise resolved'))
                 },
                 (error) => {
-                    expect(error.message).to.equal("Unexpected token }")
+                    expect(error.message).to.equal("Unexpected token }, in filename=" + INVALID_JSON_FILENAME)
                     done()
                 }
             )

test/src/ts/test-json-file.ts

@@ -2,6 +2,10 @@
 
 
 declare module JSONFile {
+    interface FilenameWContents {
+        filename: string;
+        contents: any;
+    }
     type Validate = (typename: string, element: any) => Error
 }
 
@@ -11,7 +15,7 @@ declare module 'json-file' {
     /* Read a JSON file.
      * @return a Promise that resolves if the file contains valid JSON.
      */
-    function readJSONFile(filename: string): Promise<{filename: string, contents: any}>
+    function readJSONFile(filename: string): Promise<JSONFile.FilenameWContents>
     /* Read a data-set from a JSON file.
      * @param convertJSONObjToTypedObj Optional function to convert JSON fields to equivalent objects.
      *        For example, to convert strings to Dates.
@@ -20,5 +24,5 @@ declare module 'json-file' {
      * @return a Promise that resolves if the file contains valid JSON.
      *         That is, both JSON.parse() and validate() don't find errors.
      */
-    function loadDatabaseFromJSONFile(filename: string, convertJSONObjToTypedObj?: (json_obj : any) => void, validate?: JSONFile.Validate, typename?: string): Promise<{filename: string, contents: any}>
+    function loadDatabaseFromJSONFile(filename: string, convertJSONObjToTypedObj?: (json_obj : any) => void, validate?: JSONFile.Validate, typename?: string): Promise<JSONFile.FilenameWContents>
 }