Commit 56eb4d2

committed

Inject upgrade: take an injection object instead of string

1 parent 32740c5 commit 56eb4d2Copy full SHA for 56eb4d2

File tree

+46

-9

lines changed

+46

-9

lines changed

Lines changed: 7 additions & 1 deletion

Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,10 @@`
`8`	`8`	`},`
`9`	`9`	`"devDependencies": {`
`10`	`10`	`"eslint": "^4.7.1",`
	`11`	`+ "he": "^1.1.1",`
`11`	`12`	`"json-stable-stringify": "^1.0.1",`
`12`		`- "mocha": "^3.5.3"`
	`13`	`+ "mocha": "^3.5.3",`
	`14`	`+ "underscore": "^1.8.3"`
`13`	`15`	`},`
`14`	`16`	`"scripts": {`
`15`	`17`	`"test": "mocha --recursive test/unit/",`

Lines changed: 2 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -607,13 +607,8 @@`
`607`	`607`	`if (serialized) SELECT.$injected = JSON.parse(obj);`
`608`	`608`	`} catch (error) { }`
`609`	`609`
`610`		`- if (SELECT.$injected.length > 0) {`
`611`		`- // inject variables from 'this' context by name`
`612`		`- SELECT.$injected.forEach(function(key) {`
`613`		`- var o = {};`
`614`		`- o[key] = $context[key];`
`615`		`- SELECT.select(o);`
`616`		`- });`
	`610`	`+ if (Object.keys(SELECT.$injected).length > 0) {`
	`611`	`+ SELECT.select(SELECT.$injected);`
`617`	`612`	`}`
`618`	`613`	`return SELECT;`
`619`	`614`	`},`

Lines changed: 34 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,34 @@`
	`1`	`+var assert = require('assert');`
	`2`	`+var ST = require('../../../st.js');`
	`3`	`+var stringify = require('json-stable-stringify');`
	`4`	`+var compare = function(actual, expected){`
	`5`	`+ assert.equal(stringify(actual), stringify(expected));`
	`6`	`+};`
	`7`	`+`
	`8`	`+describe("SELECT.inject", function() {`
	`9`	`+ it('underscore', function() {`
	`10`	`+ const _ = require('underscore')`
	`11`	`+ const data = {`
	`12`	`+ data: [1,2,3,3,3,4,4,4,4,5]`
	`13`	`+ }`
	`14`	`+ const res = ST.select(data).inject({_:_}).transformWith({`
	`15`	`+ "result": "{{_.uniq(data)}}"`
	`16`	`+ }).root()`
	`17`	`+ compare(res, {"result": [1,2,3,4,5]})`
	`18`	`+ })`
	`19`	`+ it('multiple libraries: underscore + he', function() {`
	`20`	`+ const _ = require('underscore')`
	`21`	`+ const he = require('he');`
	`22`	`+ const data = {`
	`23`	`+ data: [1,2,3,3,3,4,4,4,4,5]`
	`24`	`+ }`
	`25`	`+ const res = ST.select(data).inject({`
	`26`	`+ _:_,`
	`27`	`+ he: he`
	`28`	`+ }).transformWith({`
	`29`	`+ "_": "{{_.uniq(data)}}",`
	`30`	`+ "he": "{{he.decode('no man's land')}}"`
	`31`	`+ }).root()`
	`32`	`+ compare(res, {"_": [1,2,3,4,5], "he": "no man's land"})`
	`33`	`+ })`
	`34`	`+})`

Comments

(0)