Add $ref resolution and update webpack

Author: Anthropic

.babelrc

@@ -1,6 +1,6 @@
 {
   "presets": [
-    [ "es2015" ]
+    [ "es2015", "stage-0" ]
   ],
-  "plugins": [ "transform-flow-strip-types" ]
+  "plugins": [ "transform-flow-strip-types", "transform-async-to-generator" ]
 }

bower.json

@@ -0,0 +1,26 @@
+{
+  "name": "json-schema-form-core",
+  "main": "dist/json-schema-form-core.js",
+  "maintainers": [
+    "Marcel J Bennett <[email protected]>"
+  ],
+  "description": "json-schema-form-core",
+  "keywords": [
+    "json",
+    "json-schema",
+    "schema",
+    "json-schema-form"
+  ],
+  "license": "MIT",
+  "ignore": [
+    "**/.*",
+    "node_modules",
+    "bower_components",
+    "index.js",
+    "package.json",
+    "docs"
+  ],
+  "devDependencies": {
+    "json-refs": "2.1.6"
+  }
+}

dist/json-schema-form-core.js

@@ -1,10 +1,11 @@
 {
   "name": "json-schema-form-core",
-  "version": "1.0.0-alpha.1",
+  "version": "1.0.0-alpha.2",
   "description": "JSON-Schema and JSON-UI-Schema utilities for form generation.",
   "main": "dist/json-schema-form-core.js",
   "scripts": {
     "build": "webpack",
+    "watch": "webpack --watch",
     "dist-untested": "webpack --config webpack.config.dist.js",
     "tslint": "tslint \"src/**/*.ts\"",
     "test": "mocha --opts .mocha",
@@ -26,9 +27,9 @@
   "bugs": {
     "url": "https://github.com/json-schema-form/json-schema-form-core/issues"
   },
-  "repository" : {
-    "type" : "git",
-    "url" : "http://github.com/json-schema-form/json-schema-form-core.git"
+  "repository": {
+    "type": "git",
+    "url": "http://github.com/json-schema-form/json-schema-form-core.git"
   },
   "keywords": [
     "angular-schema-form",
@@ -43,12 +44,16 @@
     "@types/node": "^6.0.42",
     "babel-core": "^6.18.2",
     "babel-loader": "^6.2.9",
+    "babel-plugin-syntax-async-functions": "^6.13.0",
+    "babel-plugin-transform-async-to-generator": "^6.22.0",
     "babel-plugin-transform-flow-strip-types": "^6.21.0",
     "babel-polyfill": "^6.20.0",
     "babel-preset-es2015": "^6.18.0",
     "babel-preset-latest": "^6.16.0",
+    "babel-preset-stage-0": "^6.22.0",
     "babel-register": "^6.18.0",
     "chai": "^3.5.0",
+    "json-refs": "^2.1.6",
     "karma": "^1.3.0",
     "karma-babel-preprocessor": "^6.0.1",
     "karma-chai-sinon": "^0.1.5",
@@ -67,6 +72,6 @@
     "tslint-loader": "^3.2.1",
     "tv4": "^1.2.7",
     "typescript": "~2.0.3",
-    "webpack": "^2.1.0-beta.27"
+    "webpack": "^2.2.1"
   }
 }

dist/json-schema-form-core.js.map

@@ -0,0 +1,22 @@
+import * as JsonRefs from './../../lib/json-refs-standalone-min';
+
+export function jsonref(schema, callBack) {
+  let promise = new Promise(
+    function(resolve, reject) {
+      JsonRefs.resolveRefs(schema, {
+        "filter": [ 'relative', 'local' ]
+      })
+        .then(function(res) { resolve(res.resolved); })
+        .catch(function(err) { reject(new Error(err)); });
+    }
+  );
+
+  if(typeof(callBack) === 'function') {
+    promise
+      .then((resolved) => { callBack(null, resolved); })
+      .catch((error) => { callBack(error); });
+  }
+  else {
+    return promise;
+  }
+};

lib/json-refs-standalone-min.js

@@ -0,0 +1,113 @@
+import chai from 'chai';
+import { describe, it} from 'mocha';
+import { jsonref } from './resolve';
+
+chai.should();
+
+describe('resolve.js', () => {
+  const schema = {
+    "id": "http://some.site.somewhere/entry-schema#",
+    "$schema": "http://json-schema.org/draft-04/schema#",
+    "description": "schema for an fstab entry",
+    "type": "object",
+    "required": [ "storage" ],
+    "properties": {
+      "storage": {
+        "type": "object",
+        "oneOf": [
+          { "$ref": "#/definitions/diskDevice" },
+          { "$ref": "#/definitions/diskUUID" },
+          { "$ref": "#/definitions/nfs" },
+          { "$ref": "#/definitions/tmpfs" }
+        ]
+      }
+    },
+    "definitions": {
+      "diskDevice": {
+        "properties": {
+          "type": { "enum": [ "disk" ] },
+          "device": {
+            "type": "string",
+            "pattern": "^/dev/[^/]+(/[^/]+)*$"
+          }
+        },
+        "required": [ "type", "device" ],
+        "additionalProperties": false
+      },
+      "diskUUID": {
+        "properties": {
+          "type": { "enum": [ "disk" ] },
+          "label": {
+            "type": "string",
+            "pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$"
+          }
+        },
+        "required": [ "type", "label" ],
+        "additionalProperties": false
+      },
+      "nfs": {
+        "properties": {
+          "type": { "enum": [ "nfs" ] },
+          "remotePath": {
+            "type": "string",
+            "pattern": "^(/[^/]+)+$"
+          },
+          "server": {
+            "type": "string",
+            "oneOf": [
+              { "format": "host-name" },
+              { "format": "ipv4" },
+              { "format": "ipv6" }
+            ]
+          }
+        },
+        "required": [ "type", "server", "remotePath" ],
+        "additionalProperties": false
+      },
+      "tmpfs": {
+        "properties": {
+          "type": { "enum": [ "tmpfs" ] },
+          "sizeInMB": {
+            "type": "integer",
+            "minimum": 16,
+            "maximum": 512
+          }
+        },
+        "required": [ "type", "sizeInMB" ],
+        "additionalProperties": false
+      }
+    }
+  };
+
+  it('should contain a function for resolving relative & local references', () => {
+    jsonref.should.be.an('function');
+  })
+
+  describe('jsonref', () => {
+
+    it('should resolve json-ref via promise', (done) => {
+      jsonref(schema)
+        .then((resolved) => {
+          resolved.properties.storage.oneOf[0].properties.should.have.property('device');
+          resolved.properties.storage.oneOf[0].properties.should.equal(
+            resolved.definitions.diskDevice.properties
+          );
+          resolved.properties.storage.oneOf[3].properties.should.equal(
+            resolved.definitions.tmpfs.properties
+          );
+          done();
+        })
+        .catch((error) => {
+          done(error);
+        });
+    });
+
+    it('should resolve json-ref via callback', (done) => {
+      jsonref(schema, function(error, resolved) {
+        if (error) done(error);
+        resolved.properties.storage.oneOf[0].properties.should.have.property('device');
+        done();
+      });
+    });
+  });
+});

package.json

@@ -4,6 +4,7 @@ import canonicalTitleMapImp from './lib/canonical-title-map';
 
 export { merge } from './lib/merge';
 export { select }  from './lib/select';
+export { jsonref }  from './lib/resolve';
 export { traverseSchema, traverseForm } from './lib/traverse';
 export { validate } from './lib/validate';
 

src/lib/resolve.js

@@ -7,7 +7,8 @@ import {
   validate,
   sfPath,
   schemaDefaults,
-  canonicalTitleMap
+  canonicalTitleMap,
+  jsonref
 } from './module';
 
 chai.should();
@@ -22,5 +23,6 @@ describe('module.js', () => {
     sfPath.should.be.an('object');
     schemaDefaults.should.be.an('object');
     canonicalTitleMap.should.be.an('function');
+    jsonref.should.be.an('function');
   });
 });