occam-entities 1.0.136 → 1.0.139
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/utilities/query.js +4 -9
- package/package.json +2 -2
- package/src/utilities/query.js +3 -9
package/lib/utilities/query.js
CHANGED
|
@@ -20,22 +20,17 @@ var _occamquery = require("occam-query");
|
|
|
20
20
|
function nodeQuery(expression) {
|
|
21
21
|
var query = _occamquery.Query.fromExpression(expression);
|
|
22
22
|
return function(node) {
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
node = nodes.shift() || null; ///
|
|
26
|
-
}
|
|
23
|
+
var nodes = query.execute(node);
|
|
24
|
+
node = nodes.shift() || null; ///
|
|
27
25
|
return node;
|
|
28
26
|
};
|
|
29
27
|
}
|
|
30
28
|
function nodesQuery(expression) {
|
|
31
29
|
var query = _occamquery.Query.fromExpression(expression);
|
|
32
30
|
return function(node) {
|
|
33
|
-
var nodes =
|
|
34
|
-
if (node !== null) {
|
|
35
|
-
nodes = query.execute(node);
|
|
36
|
-
}
|
|
31
|
+
var nodes = query.execute(node);
|
|
37
32
|
return nodes;
|
|
38
33
|
};
|
|
39
34
|
}
|
|
40
35
|
|
|
41
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
36
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsaXRpZXMvcXVlcnkuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCB7IFF1ZXJ5IH0gZnJvbSBcIm9jY2FtLXF1ZXJ5XCI7XG5cbmV4cG9ydCBmdW5jdGlvbiBub2RlUXVlcnkoZXhwcmVzc2lvbikge1xuICBjb25zdCBxdWVyeSA9IFF1ZXJ5LmZyb21FeHByZXNzaW9uKGV4cHJlc3Npb24pO1xuXG4gIHJldHVybiBmdW5jdGlvbihub2RlKSB7XG4gICAgY29uc3Qgbm9kZXMgPSBxdWVyeS5leGVjdXRlKG5vZGUpO1xuXG4gICAgbm9kZSA9IG5vZGVzLnNoaWZ0KCkgfHwgbnVsbDsgLy8vXG5cbiAgICByZXR1cm4gbm9kZTtcbiAgfTtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIG5vZGVzUXVlcnkoZXhwcmVzc2lvbikge1xuICBjb25zdCBxdWVyeSA9IFF1ZXJ5LmZyb21FeHByZXNzaW9uKGV4cHJlc3Npb24pO1xuXG4gIHJldHVybiBmdW5jdGlvbihub2RlKSB7XG4gICAgY29uc3Qgbm9kZXMgPSBxdWVyeS5leGVjdXRlKG5vZGUpO1xuXG4gICAgcmV0dXJuIG5vZGVzO1xuICB9O1xufVxuIl0sIm5hbWVzIjpbIm5vZGVRdWVyeSIsIm5vZGVzUXVlcnkiLCJleHByZXNzaW9uIiwicXVlcnkiLCJRdWVyeSIsImZyb21FeHByZXNzaW9uIiwibm9kZSIsIm5vZGVzIiwiZXhlY3V0ZSIsInNoaWZ0Il0sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7Ozs7Ozs7SUFJZ0JBLFNBQVM7ZUFBVEE7O0lBWUFDLFVBQVU7ZUFBVkE7OzswQkFkTTtBQUVmLFNBQVNELFVBQVVFLFVBQVU7SUFDbEMsSUFBTUMsUUFBUUMsaUJBQUssQ0FBQ0MsY0FBYyxDQUFDSDtJQUVuQyxPQUFPLFNBQVNJLElBQUk7UUFDbEIsSUFBTUMsUUFBUUosTUFBTUssT0FBTyxDQUFDRjtRQUU1QkEsT0FBT0MsTUFBTUUsS0FBSyxNQUFNLE1BQU0sR0FBRztRQUVqQyxPQUFPSDtJQUNUO0FBQ0Y7QUFFTyxTQUFTTCxXQUFXQyxVQUFVO0lBQ25DLElBQU1DLFFBQVFDLGlCQUFLLENBQUNDLGNBQWMsQ0FBQ0g7SUFFbkMsT0FBTyxTQUFTSSxJQUFJO1FBQ2xCLElBQU1DLFFBQVFKLE1BQU1LLE9BQU8sQ0FBQ0Y7UUFFNUIsT0FBT0M7SUFDVDtBQUNGIn0=
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "occam-entities",
|
|
3
3
|
"author": "James Smith",
|
|
4
|
-
"version": "1.0.
|
|
4
|
+
"version": "1.0.139",
|
|
5
5
|
"license": "MIT, Anti-996",
|
|
6
6
|
"homepage": "https://github.com/djalbat/occam-entities",
|
|
7
7
|
"description": "Occam's entities.",
|
|
@@ -11,7 +11,7 @@
|
|
|
11
11
|
},
|
|
12
12
|
"dependencies": {
|
|
13
13
|
"necessary": "^14.0.1",
|
|
14
|
-
"occam-grammars": "^1.0.
|
|
14
|
+
"occam-grammars": "^1.0.698",
|
|
15
15
|
"occam-query": "^3.1.174"
|
|
16
16
|
},
|
|
17
17
|
"devDependencies": {
|
package/src/utilities/query.js
CHANGED
|
@@ -6,11 +6,9 @@ export function nodeQuery(expression) {
|
|
|
6
6
|
const query = Query.fromExpression(expression);
|
|
7
7
|
|
|
8
8
|
return function(node) {
|
|
9
|
-
|
|
10
|
-
const nodes = query.execute(node);
|
|
9
|
+
const nodes = query.execute(node);
|
|
11
10
|
|
|
12
|
-
|
|
13
|
-
}
|
|
11
|
+
node = nodes.shift() || null; ///
|
|
14
12
|
|
|
15
13
|
return node;
|
|
16
14
|
};
|
|
@@ -20,11 +18,7 @@ export function nodesQuery(expression) {
|
|
|
20
18
|
const query = Query.fromExpression(expression);
|
|
21
19
|
|
|
22
20
|
return function(node) {
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
if (node !== null) {
|
|
26
|
-
nodes = query.execute(node);
|
|
27
|
-
}
|
|
21
|
+
const nodes = query.execute(node);
|
|
28
22
|
|
|
29
23
|
return nodes;
|
|
30
24
|
};
|