velocityjs - npm Package Compare versions

Comparing version 0.4.11 to 0.5.0-alpha.2

package.json

		{
		"name": "velocityjs",
		"description": "Velocity Template Language(VTL) for JavaScript",
		"version": "0.4.11",
		"version": "0.5.0-alpha.2",
		"keywords": [
		@@ -6,0 +6,0 @@ "velocity template"

src/compile/blocks.js

		@@ -0,1 +1,2 @@
		'use strict';
		module.exports = function(Velocity, utils){
		@@ -87,2 +88,3 @@
		};
		jsmacros.prototype.context = this.context;
		}
		@@ -93,9 +95,3 @@
		} catch(e){
		var pos = ast.pos;
		var text = Velocity.Helper.getRefText(ast);
		// throws error tree
		var err = '\n at ' + text + ' L/N ' + pos.first_line + ':' + pos.first_column;
		e.name = '';
		e.message += err;
		throw new Error(e);
		getErrorMessage(ast, e, jsArgs);
		}
		@@ -256,2 +252,30 @@
		});

		function getErrorMessage(ast, e, args) {
		var pos = ast.pos;
		var text = Velocity.Helper.getRefText(ast);
		// throws error tree

		var stacks = e.stack.split('\n');
		var msgs = [''];
		var spase = stacks[1].replace(/^(\s+)\w[\s\S]+$/, '$1');
		var err = spase + 'at ' + text + ' L/N ' + pos.first_line + ':' +
		pos.first_column + ', args: '+ args;

		stacks.some(function(msg, i) {
		if (msg.indexOf('Velocity.utils.mixin.getMacro') > -1) {
		return true;
		}

		if (i && msg.indexOf('getErrorMessage') === -1) {
		msgs.push(msg);
		}
		});
		msgs.push(err);
		e.message += msgs.join('\n');
		e.name = '';

		throw new Error(e);
		}
		};

tests/compile.js

		@@ -564,11 +564,17 @@ var Velocity = require('../src/velocity')

		var expected = '' +
		'Run error\n' +
		' at #foo($name) L/N 3:0\n' +
		' at #parse("vm.vm") L/N 2:5\n' +
		' at #parse("vm1.vm") L/N 3:0';
		var expected = [
		'Run error\n',
		'at #foo($name) L/N 3:0' ,
		'tests/compile.js',
		'at #parse("vm.vm") L/N 2:5' ,
		'at #parse("vm1.vm") L/N 3:0'
		];

		try {
		compile.render({}, macros)
		} catch(e) {
		assert.equal(expected, e.message);
		console.log(e.message);
		expected.forEach(function(msg){
		assert.ok(e.message.indexOf(msg) > -1);
		});
		}
		@@ -575,0 +581,0 @@ })

New alerts