Skip to content

Commit 5e3d80b

Browse files
author
Hakan Bilgin
committed
bugfix related to node env
1 parent a76c7a1 commit 5e3d80b

File tree

4 files changed

+15
-10
lines changed

4 files changed

+15
-10
lines changed

dist/defiant.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* defiant.js [v2.2.3]
2+
* defiant.js [v2.2.4]
33
* http://www.defiantjs.com
44
* Copyright (c) 2013-2019 Hakan Bilgin <[email protected]>
55
* License GNU AGPLv3

dist/defiant.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

index.js

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ const defiant = {
1313
page.on('console', msg => console.log(msg.text()))
1414
await page.setContent('<script>'+ script +'</script>')
1515

16+
defiant.browser = browser
1617
defiant.page = page
1718
if (page) resolve(page)
1819
else reject()
@@ -24,7 +25,7 @@ const defiant = {
2425

2526
data = data || {};
2627
return defiant.page.evaluate(async (name, data) => {
27-
var str = Defiant.render(name, data);
28+
var str = defiant.render(name, data);
2829
str = str.replace(/ (xmlns\:xlink|xmlns:d)=".*?"/ig, '');
2930
return str;
3031
}, name, data);
@@ -34,7 +35,7 @@ const defiant = {
3435
if (!defiant.page) await defiant.init()
3536

3637
return defiant.page.evaluate(async (name, xstr) => {
37-
var that = Defiant,
38+
var that = defiant,
3839
data = that.xmlFromString(xstr),
3940
str = that.render_xml(name, data);
4041
str = str.replace(/ (xmlns\:xlink|xmlns:d)=".*?"/ig, '');
@@ -45,7 +46,7 @@ const defiant = {
4546
if (!defiant.page) await defiant.init()
4647

4748
return defiant.page.evaluate(async (str) => {
48-
var that = Defiant;
49+
var that = defiant;
4950
that.xsl_template = that.xmlFromString('<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink" '+ that.namespace +'>'+ str.replace(/defiant:(\w+)/g, '$1') +'</xsl:stylesheet>');
5051
}, str);
5152
},
@@ -54,18 +55,22 @@ const defiant = {
5455

5556
return defiant.page.evaluate(async (data, callback) => {
5657
return new Promise((resolve, reject) => {
57-
Defiant.createSnapshot(data, function(snapshotId) {
58+
defiant.createSnapshot(data, function(snapshotId) {
5859
resolve(snapshotId)
5960
})
6061
})
6162
}, data, callback)
6263
},
63-
search: async (data, xpath) => {
64+
search: async (data, xpath, persist) => {
6465
if (!defiant.page) await defiant.init()
6566

66-
return defiant.page.evaluate(async (data, xpath) => {
67-
return JSON.search(data, xpath)
67+
const result = await defiant.page.evaluate(async (data, xpath) => {
68+
return defiant.search(data, xpath)
6869
}, data, xpath)
70+
71+
if (!persist) defiant.browser.close()
72+
73+
return result
6974
}
7075
}
7176

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "defiant.js",
3-
"version": "2.2.3",
3+
"version": "2.2.4",
44
"description": "Search JSON structures plus smart templating with XSLT and XPath.",
55
"author": {
66
"name": "Hakan Bilgin",

0 commit comments

Comments
 (0)