Minor tweaks and folder rename

Author: Anthropic

dist/json-schema-form-core.js

@@ -1,12 +1,7 @@
-import * as schemaDefaultsImp from './lib/schemaDefaults';
-import * as sfPathImp from './lib/sfPath';
-import canonicalTitleMapImp from './lib/canonicalTitleMap';
-
-export * from './lib/merge.js';
-export * from './lib/select.js';
-export * from './lib/traverse.js';
-export * from './lib/validate.js';
-
-export const sfPath = sfPathImp;
-export const schemaDefaults = schemaDefaultsImp;
-export const canonicalTitleMap = canonicalTitleMapImp;
+export { schemaDefaults } from './src/schemaDefaults';
+export { canonicalTitleMap } from './src/canonicalTitleMap';
+export { sfPath } from './src/sfPath';
+export { merge } from './src/merge';
+export { select } from './src/select';
+export { traverse } from './src/traverse';
+export { validate } from './src/validate';

index.js

@@ -1,6 +1,6 @@
 {
   "name": "json-schema-form-core",
-  "version": "1.0.0-alpha.2",
+  "version": "1.0.0-alpha.3",
   "description": "Core library",
   "main": "dist/json-schema-form-core.js",
   "scripts": {
@@ -30,12 +30,14 @@
   },
   "devDependencies": {
     "babel-core": "^6.6.5",
-    "babel-loader": "^6.2.4",
+    "babel-loader": "^6.2.8",
     "babel-preset-es2015": "^6.6.0",
+    "babel-preset-es2016": "^6.16.0",
+    "babel-preset-latest": "^6.16.0",
     "chai": "^3.5.0",
     "mocha": "^2.4.5",
     "tv4": "^1.2.7",
-    "webpack": "^1.12.14"
+    "webpack": "^1.13.3"
   },
   "licenses": [
     {

lib/sfPath.js

@@ -1,6 +1,6 @@
 // Takes a titleMap in either object or list format and returns one in
 // in the list format.
-export default function(titleMap, originalEnum) {
+const canonicalTitleMap = function (titleMap, originalEnum) {
   if (!Array.isArray(titleMap)) {
     const canonical = [];
     if (originalEnum) {
@@ -16,3 +16,5 @@ export default function(titleMap, originalEnum) {
   }
   return titleMap;
 }
+
+export { canonicalTitleMap };

package.json

@@ -1,8 +1,8 @@
 import {stringify, parse} from './sfPath';
-import canonicalTitleMap from './canonicalTitleMap';
+import { canonicalTitleMap } from './canonicalTitleMap';
 
 //export function merge(schema, form, schemaDefaultTypes, ignore, options, readonly, asyncTemplates) {
-export function merge(lookup, form, options, readonly, asyncTemplates) {
+const merge = function (lookup, form, options, readonly, asyncTemplates) {
   form  = form || [];
   options = options || {};
 
@@ -76,3 +76,4 @@ export function merge(lookup, form, options, readonly, asyncTemplates) {
     return obj;
   });
 }
+export { merge };

lib/canonicalTitleMap.js renamed to src/canonicalTitleMap.js

@@ -1,5 +1,5 @@
-import {stringify} from './sfPath';
-import canonicalTitleMap from './canonicalTitleMap';
+import { stringify } from './sfPath';
+import { canonicalTitleMap } from './canonicalTitleMap';
 
 /* Utils */
 const stripNullType = (type) => {

lib/merge.js renamed to src/merge.js

@@ -1,5 +1,5 @@
 
-import sfPath from './sfPath';
+import { parse } from './sfPath';
 
 const numRe = /^\d+$/;
 
@@ -19,12 +19,12 @@ const numRe = /^\d+$/;
   * @returns {Any|undefined} returns the value at the end of the projection path
   *                          or undefined if there is none.
   */
-export function select(projection, obj, valueToSet) {
+const select = (projection, obj, valueToSet) => {
   if (!obj) {
     obj = this;
   }
   //Support [] array syntax
-  var parts = typeof projection === 'string' ? sfPath.parse(projection) : projection;
+  var parts = typeof projection === 'string' ? parse(projection) : projection;
 
   if (typeof valueToSet !== 'undefined' && parts.length === 1) {
     //special case, just setting one variable
@@ -67,3 +67,5 @@ export function select(projection, obj, valueToSet) {
   }
   return value;
 }
+
+export { select };

lib/schemaDefaults.js renamed to src/schemaDefaults.js

@@ -0,0 +1,20 @@
+import { parse, stringify, normalize } from 'objectpath';
+
+const name = function(key, separator, formName, omitNumbers) {
+  if(key) {
+    var fieldKey = key.slice();
+    var fieldSeparator = separator || '-';
+
+    if(omitNumbers){
+      fieldKey = fieldKey.filter(function(key){
+        return  typeof key !== 'number';
+      });
+    };
+
+    return ((formName) ? formName + fieldSeparator : '') + fieldKey.join(fieldSeparator);
+  };
+
+  return '';
+};
+
+export { name, parse, stringify, normalize };

lib/select.js renamed to src/select.js

@@ -2,7 +2,7 @@
  * Traverse a schema, applying a function(schema,path) on every sub schema
  * i.e. every property of an object.
  */
-export function traverseSchema(schema, fn, path, ignoreArrays) {
+const traverseSchema = function (schema, fn, path, ignoreArrays) {
   ignoreArrays = ignoreArrays === undefined ? true : ignoreArrays;
 
   path = path || [];
@@ -45,3 +45,4 @@ export function traverseForm(form, fn) {
     });
   }
 }
+export { traverseSchema };

src/sfPath.js

@@ -10,7 +10,7 @@ import tv4 from 'tv4';
  * @param {Any} value the value to validate.
  * @return {Object} a tv4js result object.
  */
-export function validate(form, value) {
+const validate = function (form, value) {
   if (!form) {
     return { valid: true };
   };
@@ -51,3 +51,5 @@ export function validate(form, value) {
 
   return tv4.validateResult(valueWrap, wrap);
 };
+
+export { validate };

lib/traverse.js renamed to src/traverse.js

@@ -1,7 +1,7 @@
 
 import chai from 'chai';
-import {describe, it} from 'mocha';
-import {defaultForm, createDefaults } from '../lib/schemaDefaults';
+import { describe, it} from 'mocha';
+import { defaultForm, createDefaults } from '../src/schemaDefaults';
 
 chai.should();
 

lib/validate.js renamed to src/validate.js

@@ -2,14 +2,17 @@
 var webpack = require('webpack');
 var path = require('path');
 var pjson = require('./package.json');
+var library = 'JSONSchemaFormCore';
 console.log('JSON Schema Form Core v' + pjson.version);
 
 module.exports = {
   entry: [ './index.js' ],
   output: {
     path: path.join(__dirname, 'dist'),
     filename: 'json-schema-form-core.js',
-    libraryTarget: 'umd'
+    library: library,
+    libraryTarget: 'umd',
+    umdNamedDefine: true
   },
   resolve: { extensions: [ '', '.js' ] },
   module: {
@@ -27,9 +30,8 @@ module.exports = {
   },
   plugins: [
     new webpack.BannerPlugin(
-      'json-schema-form\n' +
-      '@version ' +
-      pjson.version + '\n' +
+      'json-schema-form-core\n' +
+      '@version ' + pjson.version + '\n' +
       '@link https://github.com/json-schema-form/json-schema-form-core\n' +
       '@license MIT\n' +
       'Copyright (c) 2016 JSON Schema Form')