update Catharsis (fixes #652 and #767)

node_modules/catharsis/lib/schema.js

@@ -0,0 +1,69 @@
+'use strict';
+
+var _ = require('underscore-contrib');
+
+// JSON schema types
+var ARRAY = 'array';
+var BOOLEAN = 'boolean';
+var OBJECT = 'object';
+var STRING = 'string';
+var UNDEFINED = 'undefined';
+
+var TYPES = require('./types');
+var TYPE_NAMES = _.values(TYPES);
+
+module.exports = {
+	id: '#parsedType',
+	type: [OBJECT, UNDEFINED],
+	additionalProperties: false,
+	properties: {
+		type: {
+			type: STRING,
+			enum: TYPE_NAMES
+		},
+
+		// field type
+		key: { '$ref': '#parsedType' },
+		value: { '$ref': '#parsedType' },
+
+		// function type
+		params: {
+			type: ARRAY,
+			items: { '$ref': '#parsedType' }
+		},
+		'new': { '$ref': '#parsedType' },
+		'this': { '$ref': '#parsedType' },
+		result: {'$ref': '#parsedType' },
+
+		// name expression
+		name: STRING,
+
+		// record type
+		fields: {
+			type: ARRAY,
+			items: { '$ref': '#parsedType' }
+		},
+
+		// type application
+		expression: { '$ref': '#parsedType' },
+		applications: {
+			type: ARRAY,
+			minItems: 1,
+			maxItems: 2,
+			items: { '$ref': '#parsedType' }
+		},
+
+		// type union
+		elements: {
+			type: ARRAY,
+			minItems: 1,
+			items: { '$ref': '#parsedType' }
+		},
+
+		optional: BOOLEAN,
+		nullable: BOOLEAN,
+		repeatable: BOOLEAN,
+		reservedWord: BOOLEAN
+	},
+	required: [ 'type' ]
+};

node_modules/catharsis/node_modules/underscore-contrib/package.json

@@ -30,33 +30,14 @@
     "test": "node ./node_modules/grunt-cli/bin/grunt test"
   },
   "homepage": "https://github.com/documentcloud/underscore-contrib",
+  "readme": "underscore-contrib\n==================\n\nThe brass buckles on Underscore's utility belt -- a contributors' library for [Underscore](http://underscorejs.org/).\n\nLinks\n-----\n\n  * [Documentation](http://documentcloud.github.io/underscore-contrib/)\n  * [Source repository](https://github.com/documentcloud/underscore-contrib)\n  * [Tickets and bug reports](https://github.com/documentcloud/underscore-contrib/issues?state=open)\n  * [Maintainer's website](http://www.fogus.me)\n\nWhy underscore-contrib?\n-----------------------\n\nWhile Underscore provides a bevy of useful tools to support functional programming in JavaScript, it can't\n(and shouldn't) be everything to everyone. Underscore-contrib is intended as a home for functions that, for\nvarious reasons, don't belong in Underscore proper. In particular, it aims to be:\n\n  * a home for functions that are limited in scope, but solve certain point problems, and\n  * a proving ground for features that belong in Underscore proper, but need some advocacy and/or evolution\n(or devolution) to get them there.\n\nUse\n---\n\nFirst, you’ll need Underscore. Then you can grab the relevant underscore-contrib libraries and simply add\nsomething\nlike the following to your pages:\n\n    <script type=\"text/javascript\" src=\"underscore.js\"></script>\n    <script type=\"text/javascript\" src=\"underscore.object.builders.js\"></script>\n\nAt the moment there are no cross-contrib dependencies (i.e. each library can stand by itself), but that may\nchange in the future.\n\nContributing\n------------\n\nThere is still a lot of work to do around perf, documentation, examples, testing and distribution so any help\nin those areas is welcomed. Pull requests are accepted, but please search the [issues](https://github.com/documentcloud/underscore-contrib/issues)\nbefore proposing a new sub-contrib or addition. Additionally, all patches and proposals should have strong\ndocumentation, motivating cases and tests. It would be nice if we could not only provide useful tools built on\nUnderscore, but also provide an educational experience for why and how one might use them.\n\nOther (potentially) useful sub-contribs include the following:\n\n  * String utilities\n  * Date/time utilities\n  * Validators\n  * Iterators\n  * Generators\n  * Promises\n  * Monads\n  * Currying\n  * Laziness\n  * Multimethods\n\nWhat do these mean? Well, that’s up for discussion. :-)\n",
+  "readmeFilename": "README.md",
   "description": "underscore-contrib ==================",
   "bugs": {
     "url": "https://github.com/documentcloud/underscore-contrib/issues"
   },
   "_id": "underscore-contrib@0.3.0",
-  "dist": {
-    "shasum": "665b66c24783f8fa2b18c9f8cbb0e2c7d48c26c7",
-    "tarball": "http://registry.npmjs.org/underscore-contrib/-/underscore-contrib-0.3.0.tgz"
-  },
-  "_from": "underscore-contrib@~0.3.0",
-  "_npmVersion": "1.3.21",
-  "_npmUser": {
-    "name": "joshuacc",
-    "email": "joshua.clanton@gmail.com"
-  },
-  "maintainers": [
-    {
-      "name": "fogus",
-      "email": "mefogus@gmail.com"
-    },
-    {
-      "name": "joshuacc",
-      "email": "joshua.clanton@gmail.com"
-    }
-  ],
-  "directories": {},
   "_shasum": "665b66c24783f8fa2b18c9f8cbb0e2c7d48c26c7",
-  "_resolved": "https://registry.npmjs.org/underscore-contrib/-/underscore-contrib-0.3.0.tgz",
-  "readme": "ERROR: No README data found!"
+  "_from": "underscore-contrib@~0.3.0",
+  "_resolved": "https://registry.npmjs.org/underscore-contrib/-/underscore-contrib-0.3.0.tgz"
 }

package.json

@@ -19,7 +19,7 @@
   },
   "dependencies": {
     "async": "~0.1.22",
-    "catharsis": "~0.8.2",
+    "catharsis": "~0.8.3",
     "escape-string-regexp": "~1.0.0",
     "esprima": "https://github.com/ariya/esprima/tarball/49a2eccb243f29bd653b11e9419241a9d726af7c",
     "js2xmlparser": "~0.1.0",