Merge branch 'bauglir-fix-data-switch'

Author: epoberezkin

src/commands/options.ts

@@ -93,14 +93,13 @@ function parameter(str: string): string {
 
 export function getOptions(argv: ParsedArgs): Options & {code: CodeOptions} {
   const options: {[K in string]: any} = {code: {}}
-  for (let opt in ajvOptions) {
-    if (opt === "data") opt = "$data"
+  for (const opt in ajvOptions) {
     const value = argv[toDashCase(opt)] ?? argv[opt]
     if (value === undefined) continue
     if (opt.startsWith(CODE)) {
       options.code[opt.slice(CODE.length)] = value
     } else {
-      options[opt] = value
+      options[opt === "data" ? "$data" : opt] = value
     }
   }
   return options as Options & {code: CodeOptions}

test/data_for_schema_with_data_reference.json

@@ -0,0 +1,4 @@
+{
+  "larger": 20,
+  "smaller": 10
+}

test/schema_with_data_reference.json

@@ -0,0 +1,17 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$id": "schema_with_data.json",
+  "description": "schema to test $data references",
+  "type": "object",
+  "properties": {
+    "larger": {
+      "type": "number",
+      "minimum": {
+        "$data": "1/smaller"
+      }
+    },
+    "smaller": {
+      "type": "number"
+    }
+  }
+}

test/validate.spec.ts

@@ -232,6 +232,34 @@ describe("validate", function () {
     })
   })
 
+  describe('option "data"', () => {
+    it("should exit with error when not specified in the presence of `$data` references", (done) => {
+      cli(
+        "validate -s test/schema_with_data_reference -d test/data_for_schema_with_data_reference",
+        (error, stdout, stderr) => {
+          assert(error instanceof Error)
+          assert.strictEqual(stdout, "")
+          assert(stderr.includes("test/schema_with_data_reference is invalid"))
+          assert(stderr.includes("larger/minimum"))
+          assert(stderr.includes("should be number"))
+          done()
+        }
+      )
+    })
+
+    it("it should enable `$data` references when specified", (done) => {
+      cli(
+        "validate --data -s test/schema_with_data_reference -d test/data_for_schema_with_data_reference",
+        (error, stdout, stderr) => {
+          assert.strictEqual(error, null)
+          assertValid(stdout, 1)
+          assert.strictEqual(stderr, "")
+          done()
+        }
+      )
+    })
+  })
+
   describe("custom keywords", () => {
     it("should validate valid data; custom keyword definition in file", (done) => {
       cli(