Merge pull request #1405 from owenconti/bug/1395-dot-in-model-names

Fixes #1395 - Allow model names with "."s

Author: shockey

package.json

@@ -33,7 +33,7 @@
     "test": "npm run lint-errors && npm run just-test-in-node",
     "test-in-node": "npm run lint-errors && npm run just-test-in-node",
     "just-test": "karma start --config karma.conf.js",
-    "just-test-in-node": "mocha --recursive --compilers js:babel-core/register test/plugins",
+    "just-test-in-node": "mocha --recursive --compilers js:babel-core/register test",
     "serve-static": "http-server -i -a 0.0.0.0 -p 3001",
     "prestart": "npm install",
     "start": "npm-run-all --parallel serve-static open-static",

src/plugins/validation/index.js

@@ -1,6 +1,13 @@
+import { transformPathToArray } from "./path-translator"
+
+
 // Core validation plugin
 // Does nothing for now
 
 export default function() {
-  return {}
+  return {
+    fn: {
+      transformPathToArray
+    }
+  }
 }

src/path-translator.js renamed to src/plugins/validation/path-translator.js

@@ -9,8 +9,13 @@ export function transformPathToArray(property, jsSpec) {
 
   var pathArr = []
 
+  // replace '.', '["', '"]' separators with pipes
+  str = str.replace(/\.(?![^["]*"\])|(\[\")|(\"\]\.?)/g, "|")
+
+  // split on our new delimiter, pipe
+  str = str.split("|")
+
   str
-    .split(".")
     .map(item => {
       // "key[0]" becomes ["key", "0"]
       if(item.includes("[")) {

src/plugins/validation/semantic-validators/hook.js

@@ -1,7 +1,7 @@
 import concat from "lodash/concat"
 import reduce from "lodash/reduce"
 import isArray from "lodash/isArray"
-import { transformPathToArray } from "../../../path-translator"
+import { transformPathToArray } from "../path-translator"
 
 import assign from "lodash/assign"
 import getTimestamp from "../get-timestamp"

src/plugins/validation/structural-validation/validator.js

@@ -1,5 +1,5 @@
 import JSONSchema from "jsonschema"
-import { transformPathToArray } from "../../../path-translator.js"
+import { transformPathToArray } from "../path-translator.js"
 
 
 import jsonSchema from "./jsonSchema"

test/path-translator.js

@@ -1,6 +1,6 @@
 /* eslint-env mocha */
 import expect from "expect"
-import { transformPathToArray } from "core/path-translator"
+import { transformPathToArray } from "src/plugins/validation/path-translator"
 
 describe("validation plugin - path translator", function(){
 
@@ -50,6 +50,37 @@ describe("validation plugin - path translator", function(){
 
     })
 
+    it("should translate paths separated by brackets", function() {
+      // Given
+      let jsSpec = {
+        definitions: {
+          "One.Two": {
+            a: "1"
+          }
+        }
+      }
+      let path = "instance.definitions[\"One.Two\"]"
+
+      // Then
+      expect(transformPathToArray(path, jsSpec)).toEqual(["definitions", "One.Two"])
+    })
+
+    it("should translate paths separated by brackets with string keys, and then periods", function() {
+      // Given
+      let jsSpec = {
+        definitions: {
+          "One.Two": {
+            a: "1",
+            abc123: "1"
+          }
+        }
+      }
+      let path = "instance.definitions[\"One.Two\"].abc123"
+
+      // Then
+      expect(transformPathToArray(path, jsSpec)).toEqual(["definitions", "One.Two", "abc123"])
+    })
+
     it("should translate an doubly ambiguous string path to an array", function(){
       // Since JSONSchema uses periods to mark different properties,
       // a key with two periods in it (like "www.google.com") is doubly ambiguous,