uniforms-bridge-json-schema - npm Package Compare versions

Comparing version 2.4.0 to 2.4.1

JSONSchemaBridge.js

@@ -26,2 +26,4 @@ "use strict";
 
+var _Bridge2 = _interopRequireDefault(require("uniforms/Bridge"));
+
 var _cloneDeep = _interopRequireDefault(require("lodash/cloneDeep"));
@@ -33,2 +35,4 @@
 
+var _joinName = _interopRequireDefault(require("uniforms/joinName"));
+
 var _lowerCase = _interopRequireDefault(require("lodash/lowerCase"));
@@ -40,6 +44,2 @@
 
-var _Bridge2 = _interopRequireDefault(require("uniforms/Bridge"));
-
-var _joinName = _interopRequireDefault(require("uniforms/joinName"));
-
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
@@ -82,2 +82,7 @@
 
+var pathToName = function pathToName(path) {
+  if (path[0] === '.') path = path.replace(/\['(.+?)'\]/g, '.$1').replace(/\[(.+?)\]/g, '.$1').replace(/\\'/g, "'");else path = path.replace(/\//g, '.').replace(/~0/g, '~').replace(/~1/g, '/');
+  return path.slice(1);
+};
+
 var toHumanLabel = function toHumanLabel(label) {
@@ -110,3 +115,3 @@ return (0, _upperFirst["default"])((0, _lowerCase["default"])(label));
       return error && error.details && error.details.find && error.details.find(function (detail) {
-        var path = detail.dataPath.substring(1);
+        var path = pathToName(detail.dataPath);
         return name === path || rootName === path && baseName === detail.params.missingProperty;
@@ -257,11 +262,11 @@ });
 
-      var _omit = (0, _omit2["default"])(_objectSpread({}, field, {}, uniforms, {}, this._compiledSchema[name]), ['default', 'format']),
+      var _omit = (0, _omit2["default"])(_objectSpread({}, field, {}, uniforms, {}, this._compiledSchema[name]), ['default', 'format', 'type']),
           enum_ = _omit["enum"],
           isRequired = _omit.isRequired,
           title = _omit.title,
-          type = _omit.type,
-          ready = (0, _objectWithoutProperties2["default"])(_omit, ["enum", "isRequired", "title", "type"]);
+          ready = (0, _objectWithoutProperties2["default"])(_omit, ["enum", "isRequired", "title"]);
 
       if (enum_) ready.allowedValues = enum_;
-      if (type === 'number') ready.decimal = true;
+      if (field.type === 'number') ready.decimal = true;
+      if (uniforms && uniforms.type !== undefined) ready.type = uniforms.type;
       if (ready.required === undefined) ready.required = isRequired;
@@ -268,0 +273,0 @@ ready.label = extractValue(ready.label, title, toHumanLabel((0, _joinName["default"])(null, name).slice(-1)[0]));

package.json

 {
   "name": "uniforms-bridge-json-schema",
-  "version": "2.4.0",
+  "version": "2.4.1",
   "license": "MIT",
@@ -25,5 +25,5 @@ "main": "index.js",
     "lodash": "^4.0.0",
-    "uniforms": "^2.4.0"
+    "uniforms": "^2.4.1"
   },
-  "gitHead": "1bfdd0ae8d6287d5d8417c43270226c59c8710e7"
+  "gitHead": "8da4f0cc555bb66c5c55479fb24c64ca0ed37298"
 }

src/JSONSchemaBridge.js

@@ -0,4 +1,6 @@
+import Bridge from 'uniforms/Bridge';
 import cloneDeep from 'lodash/cloneDeep';
 import get from 'lodash/get';
 import invariant from 'invariant';
+import joinName from 'uniforms/joinName';
 import lowerCase from 'lodash/lowerCase';
@@ -8,5 +10,2 @@ import omit from 'lodash/omit';
 
-import Bridge from 'uniforms/Bridge';
-import joinName from 'uniforms/joinName';
-
 const resolveRef = (referance, schema) => {
@@ -50,2 +49,17 @@ invariant(
 
+const pathToName = path => {
+  if (path[0] === '.')
+    path = path
+      .replace(/\['(.+?)'\]/g, '.$1')
+      .replace(/\[(.+?)\]/g, '.$1')
+      .replace(/\\'/g, "'");
+  else
+    path = path
+      .replace(/\//g, '.')
+      .replace(/~0/g, '~')
+      .replace(/~1/g, '/');
+
+  return path.slice(1);
+};
+
 const toHumanLabel = label => upperFirst(lowerCase(label));
@@ -76,3 +90,4 @@
       error.details.find(detail => {
-        const path = detail.dataPath.substring(1);
+        const path = pathToName(detail.dataPath);
+
         return (
@@ -216,9 +231,10 @@ name === path ||
     const { uniforms, ...field } = this.getField(name);
-    const { enum: enum_, isRequired, title, type, ...ready } = omit(
+    const { enum: enum_, isRequired, title, ...ready } = omit(
       { ...field, ...uniforms, ...this._compiledSchema[name] },
-      ['default', 'format']
+      ['default', 'format', 'type']
     );
 
     if (enum_) ready.allowedValues = enum_;
-    if (type === 'number') ready.decimal = true;
+    if (field.type === 'number') ready.decimal = true;
+    if (uniforms && uniforms.type !== undefined) ready.type = uniforms.type;
     if (ready.required === undefined) ready.required = isRequired;
@@ -225,0 +241,0 @@ ready.label = extractValue(

No alert changes

Improved metrics

Total package byte prevSize

25501

2.87%

Lines of code

569

3.27%

Dependency changes

• Updated

  uniforms@^2.4.1