Merge pull request #88 from ralfhandl/patch-1

Support JSONC

Author: epoberezkin

package.json

@@ -3,7 +3,7 @@
   "version": "4.1.0",
   "description": "Command line interface for Ajv JSON schema validator",
   "scripts": {
-    "build": "rm -rf dist && tsc",
+    "build": "rimraf dist && tsc",
     "prepublish": "npm run build",
     "eslint": "eslint \"src/**/*.*s\" \"test/**/*.js\"",
     "prettier:write": "prettier --write \"./**/*.{md,json,yaml,js,ts}\"",
@@ -63,6 +63,7 @@
     "nyc": "^15.0.1",
     "pre-commit": "^1.2.0",
     "prettier": "^2.2.1",
+    "rimraf": "^3.0.2",
     "ts-node": "^9.1.0",
     "typescript": "^4.1.2"
   },

src/commands/util.ts

@@ -30,6 +30,7 @@ function decodeFile(contents: string, format: string): any {
   switch (format) {
     case "json":
       return JSON.parse(contents)
+    case "jsonc":
     case "json5":
       return JSON5.parse(contents)
     case "yml":

test/valid_data.jsonc

@@ -0,0 +1,32 @@
+[
+    // with comments
+    {
+        "id": 2,
+        "name": "An ice sculpture",
+        "price": 12.50,
+        "tags": ["cold", "ice"],
+        "dimensions": {
+            "length": 7.0,
+            "width": 12.0,
+            "height": 9.5
+        },
+        "warehouseLocation": {
+            "latitude": -78.75,
+            "longitude": 20.4
+        }
+    },
+    {
+        "id": 3,
+        "name": "A blue mouse",
+        "price": 25.50,
+        "dimensions": {
+            "length": 3.1,
+            "width": 1.0,
+            "height": 1.0
+        },
+        "warehouseLocation": {
+            "latitude": 54.4,
+            "longitude": -32.7
+        }
+    }
+]

test/validate.spec.ts

@@ -42,6 +42,15 @@ describe("validate", function () {
       })
     })
 
+    it('should validate valid data with the "jsonc" extension', (done) => {
+      cli("-s test/schema -d test/valid_data.jsonc", (error, stdout, stderr) => {
+        assert.strictEqual(error, null)
+        assertValid(stdout, 1)
+        assert.strictEqual(stderr, "")
+        done()
+      })
+    })
+
     it("falls back to require on unsupported formats", (done) => {
       cli(
         "-s test/schema.json -d test/invalid_format.cson --errors=line",