occam-furtle 2.0.111 → 2.0.113
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/README.md +1 -1
- package/lib/dom/query/node.js +20 -11
- package/lib/dom/query/nodes.js +17 -7
- package/package.json +1 -1
- package/src/dom/query/node.js +23 -7
- package/src/dom/query/nodes.js +23 -6
package/README.md
CHANGED
|
@@ -27,7 +27,7 @@ Rule (FreeVariable)
|
|
|
27
27
|
|
|
28
28
|
```
|
|
29
29
|
String variableNameFromTermNode(Node termNode) {
|
|
30
|
-
Node variableNameTerminalNode = nodeQuery(termNode, /term/variable/@name);
|
|
30
|
+
Node variableNameTerminalNode = nodeQuery(termNode, "/term/variable/@name");
|
|
31
31
|
|
|
32
32
|
String variableName =
|
|
33
33
|
|
package/lib/dom/query/node.js
CHANGED
|
@@ -8,8 +8,9 @@ Object.defineProperty(exports, "default", {
|
|
|
8
8
|
return _default;
|
|
9
9
|
}
|
|
10
10
|
});
|
|
11
|
-
var _necessary = require("necessary");
|
|
12
11
|
var _occamquery = require("occam-query");
|
|
12
|
+
var _necessary = require("necessary");
|
|
13
|
+
var _occamentities = require("occam-entities");
|
|
13
14
|
var _dom = /*#__PURE__*/ _interop_require_wildcard(require("../../dom"));
|
|
14
15
|
var _exception = /*#__PURE__*/ _interop_require_default(require("../../exception"));
|
|
15
16
|
var _types = require("../../types");
|
|
@@ -93,8 +94,8 @@ function _interop_require_wildcard(obj, nodeInterop) {
|
|
|
93
94
|
return newObj;
|
|
94
95
|
}
|
|
95
96
|
var _NodeQuery;
|
|
96
|
-
var first = _necessary.arrayUtilities.first;
|
|
97
|
-
var
|
|
97
|
+
var first = _necessary.arrayUtilities.first, trimDoubleQuotes = _occamentities.contentUtilities.trimDoubleQuotes;
|
|
98
|
+
var valueNodeQueryNodeQuery = (0, _query.nodeQuery)("/value/nodeQuery"), stringLiteralTerminalNodeQuery = (0, _query.nodeQuery)("/nodeQuery/@string-literal");
|
|
98
99
|
var _default = (0, _dom.domAssigned)((_NodeQuery = /*#__PURE__*/ function() {
|
|
99
100
|
function NodeQuery(string, variable, query) {
|
|
100
101
|
_class_call_check(this, NodeQuery);
|
|
@@ -127,23 +128,27 @@ var _default = (0, _dom.domAssigned)((_NodeQuery = /*#__PURE__*/ function() {
|
|
|
127
128
|
var value;
|
|
128
129
|
var nodeQueryString = this.string; ///
|
|
129
130
|
context.trace("Evaluating the '".concat(nodeQueryString, "' node query..."));
|
|
131
|
+
if (this.query === null) {
|
|
132
|
+
var message = "Cannot evaluate the '".concat(nodeQueryString, "' node query because its expression is malformed."), exception = _exception.default.fromMessage(message);
|
|
133
|
+
throw exception;
|
|
134
|
+
}
|
|
130
135
|
value = this.variable.evaluate(context);
|
|
131
136
|
var valueType = value.getType();
|
|
132
137
|
if (valueType !== _types.NODE_TYPE) {
|
|
133
|
-
var valueString = value.asString(context),
|
|
134
|
-
throw
|
|
138
|
+
var valueString = value.asString(context), message1 = "The ".concat(valueString, " value's '").concat(valueType, "' type should be '").concat(_types.NODE_TYPE, "'."), exception1 = _exception.default.fromMessage(message1);
|
|
139
|
+
throw exception1;
|
|
135
140
|
}
|
|
136
141
|
var valueNode = value.getNode();
|
|
137
142
|
if (valueNode === null) {
|
|
138
|
-
var valueString1 = value.asString(context),
|
|
139
|
-
throw
|
|
143
|
+
var valueString1 = value.asString(context), message2 = "The ".concat(valueString1, " value's node is null."), exception2 = _exception.default.fromMessage(message2);
|
|
144
|
+
throw exception2;
|
|
140
145
|
}
|
|
141
146
|
var node;
|
|
142
147
|
node = valueNode; ///
|
|
143
148
|
var nodes = this.query.execute(node), nodesLength = nodes.length;
|
|
144
149
|
if (nodesLength !== 1) {
|
|
145
|
-
var
|
|
146
|
-
throw
|
|
150
|
+
var message3 = "The length of the returned nodes is ".concat(nodesLength, " when it should be 1."), exception3 = _exception.default.fromMessage(message3);
|
|
151
|
+
throw exception3;
|
|
147
152
|
}
|
|
148
153
|
var firstNode = first(nodes);
|
|
149
154
|
node = firstNode; ///
|
|
@@ -170,8 +175,12 @@ var _default = (0, _dom.domAssigned)((_NodeQuery = /*#__PURE__*/ function() {
|
|
|
170
175
|
return NodeQuery;
|
|
171
176
|
}(), _define_property(_NodeQuery, "name", "NodeQuery"), _NodeQuery));
|
|
172
177
|
function nodeQueryFromNodeQueryNode(nodeQueryNode, context) {
|
|
173
|
-
var Variable = _dom.default.Variable, NodeQuery = _dom.default.NodeQuery, node = nodeQueryNode, string = context.nodeAsString(node),
|
|
178
|
+
var Variable = _dom.default.Variable, NodeQuery = _dom.default.NodeQuery, node = nodeQueryNode, string = context.nodeAsString(node), expressionString = expressionStringFromNodeQueryNode(nodeQueryNode, context), variable = Variable.fromNodeQueryNode(nodeQueryNode, context), query = _occamquery.Query.fromExpressionString(expressionString), _$nodeQuery = new NodeQuery(string, variable, query);
|
|
174
179
|
return _$nodeQuery;
|
|
175
180
|
}
|
|
181
|
+
function expressionStringFromNodeQueryNode(nodeQueryNode, context) {
|
|
182
|
+
var stringLiteralTerminalNode = stringLiteralTerminalNodeQuery(nodeQueryNode), stringLiteralTerminalNodeContent = stringLiteralTerminalNode.getContent(), expressionString = trimDoubleQuotes(stringLiteralTerminalNodeContent);
|
|
183
|
+
return expressionString;
|
|
184
|
+
}
|
|
176
185
|
|
|
177
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
186
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../../src/dom/query/node.js"],"sourcesContent":["\"use strict\";\n\nimport { Query } from \"occam-query\";\nimport { arrayUtilities } from \"necessary\";\nimport { contentUtilities } from \"occam-entities\";\n\nimport dom from \"../../dom\";\nimport Exception from \"../../exception\";\n\nimport { NODE_TYPE } from \"../../types\";\nimport { nodeQuery } from \"../../utilities/query\";\nimport { domAssigned } from \"../../dom\";\n\nconst { first } = arrayUtilities,\n      { trimDoubleQuotes } = contentUtilities;\n\nconst valueNodeQueryNodeQuery = nodeQuery(\"/value/nodeQuery\"),\n      stringLiteralTerminalNodeQuery = nodeQuery(\"/nodeQuery/@string-literal\");\n\nexport default domAssigned(class NodeQuery {\n  constructor(string, variable, query) {\n    this.string = string;\n    this.variable = variable;\n    this.query = query;\n  }\n\n  getString() {\n    return this.string;\n  }\n\n  getVariable() {\n    return this.variable;\n  }\n\n  getQuery() {\n    return this.query;\n  }\n\n  evaluate(context) {\n    let value;\n\n    const nodeQueryString = this.string;  ///\n\n    context.trace(`Evaluating the '${nodeQueryString}' node query...`);\n\n    if (this.query === null) {\n      const message = `Cannot evaluate the '${nodeQueryString}' node query because its expression is malformed.`,\n            exception = Exception.fromMessage(message);\n\n      throw exception;\n    }\n\n    value = this.variable.evaluate(context);\n\n    const valueType = value.getType();\n\n    if (valueType !== NODE_TYPE) {\n      const valueString = value.asString(context),\n            message = `The ${valueString} value's '${valueType}' type should be '${NODE_TYPE}'.`,\n            exception = Exception.fromMessage(message);\n\n      throw exception;\n    }\n\n    const valueNode = value.getNode();\n\n    if (valueNode === null) {\n      const valueString = value.asString(context),\n            message = `The ${valueString} value's node is null.`,\n            exception = Exception.fromMessage(message);\n\n      throw exception;\n    }\n\n    let node;\n\n    node = valueNode; ///\n\n    const nodes = this.query.execute(node),\n          nodesLength = nodes.length;\n\n    if (nodesLength !== 1) {\n      const message = `The length of the returned nodes is ${nodesLength} when it should be 1.`,\n            exception = Exception.fromMessage(message);\n\n      throw exception;\n    }\n\n    const firstNode = first(nodes);\n\n    node = firstNode; ///\n\n    const { Value } = dom;\n\n    value = Value.fromNode(node, context);\n\n    context.debug(`...evaluated the '${nodeQueryString}' node query.`);\n\n    return value;\n  }\n\n  static name = \"NodeQuery\";\n\n  static fromValueNode(valueNode, context) {\n    let nodeQuery = null;\n\n    const valueNodeQueryNode = valueNodeQueryNodeQuery(valueNode);\n\n    if (valueNodeQueryNode !== null) {\n      const nodeQueryNode = valueNodeQueryNode; ///\n\n      nodeQuery = nodeQueryFromNodeQueryNode(nodeQueryNode, context);\n    }\n\n    return nodeQuery;\n  }\n});\n\nfunction nodeQueryFromNodeQueryNode(nodeQueryNode, context) {\n  const { Variable, NodeQuery } = dom,\n        node = nodeQueryNode, ///\n        string = context.nodeAsString(node),\n        expressionString = expressionStringFromNodeQueryNode(nodeQueryNode, context),\n        variable = Variable.fromNodeQueryNode(nodeQueryNode, context),\n        query = Query.fromExpressionString(expressionString),\n        nodeQuery = new NodeQuery(string, variable, query);\n\n  return nodeQuery;\n}\n\nfunction expressionStringFromNodeQueryNode(nodeQueryNode, context) {\n  const stringLiteralTerminalNode = stringLiteralTerminalNodeQuery(nodeQueryNode),\n        stringLiteralTerminalNodeContent = stringLiteralTerminalNode.getContent(),\n        expressionString = trimDoubleQuotes(stringLiteralTerminalNodeContent);\n\n  return expressionString;\n}\n"],"names":["first","arrayUtilities","trimDoubleQuotes","contentUtilities","valueNodeQueryNodeQuery","nodeQuery","stringLiteralTerminalNodeQuery","domAssigned","NodeQuery","string","variable","query","getString","getVariable","getQuery","evaluate","context","value","nodeQueryString","trace","message","exception","Exception","fromMessage","valueType","getType","NODE_TYPE","valueString","asString","valueNode","getNode","node","nodes","execute","nodesLength","length","firstNode","Value","dom","fromNode","debug","fromValueNode","valueNodeQueryNode","nodeQueryNode","nodeQueryFromNodeQueryNode","name","Variable","nodeAsString","expressionString","expressionStringFromNodeQueryNode","fromNodeQueryNode","Query","fromExpressionString","stringLiteralTerminalNode","stringLiteralTerminalNodeContent","getContent"],"mappings":"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"}
|
package/lib/dom/query/nodes.js
CHANGED
|
@@ -9,6 +9,7 @@ Object.defineProperty(exports, "default", {
|
|
|
9
9
|
}
|
|
10
10
|
});
|
|
11
11
|
var _occamquery = require("occam-query");
|
|
12
|
+
var _occamentities = require("occam-entities");
|
|
12
13
|
var _dom = /*#__PURE__*/ _interop_require_wildcard(require("../../dom"));
|
|
13
14
|
var _exception = /*#__PURE__*/ _interop_require_default(require("../../exception"));
|
|
14
15
|
var _query = require("../../utilities/query");
|
|
@@ -92,7 +93,8 @@ function _interop_require_wildcard(obj, nodeInterop) {
|
|
|
92
93
|
return newObj;
|
|
93
94
|
}
|
|
94
95
|
var _NodesQuery;
|
|
95
|
-
var
|
|
96
|
+
var trimDoubleQuotes = _occamentities.contentUtilities.trimDoubleQuotes;
|
|
97
|
+
var valueNodesQueryNodeQuery = (0, _query.nodeQuery)("/value/nodesQuery"), stringLiteralTerminalNodesQuery = (0, _query.nodeQuery)("/nodesQuery/@string-literal");
|
|
96
98
|
var _default = (0, _dom.domAssigned)((_NodesQuery = /*#__PURE__*/ function() {
|
|
97
99
|
function NodesQuery(string, variable, query) {
|
|
98
100
|
_class_call_check(this, NodesQuery);
|
|
@@ -125,16 +127,20 @@ var _default = (0, _dom.domAssigned)((_NodesQuery = /*#__PURE__*/ function() {
|
|
|
125
127
|
var value;
|
|
126
128
|
var nodesQueryString = this.string; ///
|
|
127
129
|
context.trace("Evaluating the '".concat(nodesQueryString, "' nodes query..."));
|
|
130
|
+
if (this.query === null) {
|
|
131
|
+
var message = "Cannot evaluate the '".concat(nodesQueryString, "' nodes query because its expression is malformed."), exception = _exception.default.fromMessage(message);
|
|
132
|
+
throw exception;
|
|
133
|
+
}
|
|
128
134
|
value = this.variable.evaluate(context);
|
|
129
135
|
var valueType = value.getType();
|
|
130
136
|
if (valueType !== _types.NODE_TYPE) {
|
|
131
|
-
var valueString = value.asString(context),
|
|
132
|
-
throw
|
|
137
|
+
var valueString = value.asString(context), message1 = "The ".concat(valueString, " value's '").concat(valueType, "' type should be '").concat(_types.NODE_TYPE, "'."), exception1 = _exception.default.fromMessage(message1);
|
|
138
|
+
throw exception1;
|
|
133
139
|
}
|
|
134
140
|
var valueNode = value.getNode();
|
|
135
141
|
if (valueNode === null) {
|
|
136
|
-
var valueString1 = value.asString(context),
|
|
137
|
-
throw
|
|
142
|
+
var valueString1 = value.asString(context), message2 = "The ".concat(valueString1, " value's node is null."), exception2 = _exception.default.fromMessage(message2);
|
|
143
|
+
throw exception2;
|
|
138
144
|
}
|
|
139
145
|
var node;
|
|
140
146
|
node = valueNode; ///
|
|
@@ -162,8 +168,12 @@ var _default = (0, _dom.domAssigned)((_NodesQuery = /*#__PURE__*/ function() {
|
|
|
162
168
|
return NodesQuery;
|
|
163
169
|
}(), _define_property(_NodesQuery, "name", "NodesQuery"), _NodesQuery));
|
|
164
170
|
function nodesQueryFromNodesQueryNode(nodesQueryNode, context) {
|
|
165
|
-
var Variable = _dom.default.Variable, NodesQuery = _dom.default.NodesQuery, node = nodesQueryNode, string = context.nodeAsString(node),
|
|
171
|
+
var Variable = _dom.default.Variable, NodesQuery = _dom.default.NodesQuery, node = nodesQueryNode, string = context.nodeAsString(node), expressionString = expressionStringFromNodesQueryNode(nodesQueryNode, context), variable = Variable.fromNodesQueryNode(nodesQueryNode, context), query = _occamquery.Query.fromExpressionString(expressionString), nodesQuery = new NodesQuery(string, variable, query);
|
|
166
172
|
return nodesQuery;
|
|
167
173
|
}
|
|
174
|
+
function expressionStringFromNodesQueryNode(nodesQueryNode, context) {
|
|
175
|
+
var stringLiteralTerminalNode = stringLiteralTerminalNodesQuery(nodesQueryNode), stringLiteralTerminalNodeContent = stringLiteralTerminalNode.getContent(), expressionString = trimDoubleQuotes(stringLiteralTerminalNodeContent);
|
|
176
|
+
return expressionString;
|
|
177
|
+
}
|
|
168
178
|
|
|
169
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
179
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../../src/dom/query/nodes.js"],"sourcesContent":["\"use strict\";\n\nimport { Query } from \"occam-query\";\nimport { contentUtilities } from \"occam-entities\";\n\nimport dom from \"../../dom\";\nimport Exception from \"../../exception\";\n\nimport { nodeQuery } from \"../../utilities/query\";\nimport { NODE_TYPE } from \"../../types\";\nimport { domAssigned } from \"../../dom\";\n\nconst { trimDoubleQuotes } = contentUtilities;\n\nconst valueNodesQueryNodeQuery = nodeQuery(\"/value/nodesQuery\"),\n      stringLiteralTerminalNodesQuery = nodeQuery(\"/nodesQuery/@string-literal\");\n\nexport default domAssigned(class NodesQuery {\n  constructor(string, variable, query) {\n    this.string = string;\n    this.variable = variable;\n    this.query = query;\n  }\n\n  getString() {\n    return this.string;\n  }\n\n  getVariable() {\n    return this.variable;\n  }\n\n  getQuery() {\n    return this.query;\n  }\n\n  evaluate(context) {\n    let value;\n\n    const nodesQueryString = this.string;  ///\n\n    context.trace(`Evaluating the '${nodesQueryString}' nodes query...`);\n\n    if (this.query === null) {\n      const message = `Cannot evaluate the '${nodesQueryString}' nodes query because its expression is malformed.`,\n            exception = Exception.fromMessage(message);\n\n      throw exception;\n    }\n\n    value = this.variable.evaluate(context);\n\n    const valueType = value.getType();\n\n    if (valueType !== NODE_TYPE) {\n      const valueString = value.asString(context),\n            message = `The ${valueString} value's '${valueType}' type should be '${NODE_TYPE}'.`,\n            exception = Exception.fromMessage(message);\n\n      throw exception;\n    }\n\n    const valueNode = value.getNode();\n\n    if (valueNode === null) {\n      const valueString = value.asString(context),\n            message = `The ${valueString} value's node is null.`,\n            exception = Exception.fromMessage(message);\n\n      throw exception;\n    }\n\n    let node;\n\n    node = valueNode; ///\n\n    const nodes = this.query.execute(node);\n\n    const { Value } = dom;\n\n    value = Value.fromNodes(nodes, context);\n\n    context.debug(`...evaluated the '${nodesQueryString}' nodes query.`);\n\n    return value;\n  }\n\n  static name = \"NodesQuery\";\n\n  static fromValueNode(valueNode, context) {\n    let nodesQuery = null;\n\n    const valueNodesQueryNode = valueNodesQueryNodeQuery(valueNode);\n\n    if (valueNodesQueryNode !== null) {\n      const nodesQueryNode = valueNodesQueryNode; ///\n\n      nodesQuery = nodesQueryFromNodesQueryNode(nodesQueryNode, context);\n    }\n\n    return nodesQuery;\n  }\n});\n\nfunction nodesQueryFromNodesQueryNode(nodesQueryNode, context) {\n  const { Variable, NodesQuery } = dom,\n        node = nodesQueryNode,  ///\n        string = context.nodeAsString(node),\n        expressionString = expressionStringFromNodesQueryNode(nodesQueryNode, context),\n        variable = Variable.fromNodesQueryNode(nodesQueryNode, context),\n        query = Query.fromExpressionString(expressionString),\n        nodesQuery = new NodesQuery(string, variable, query);\n\n  return nodesQuery;\n}\n\nfunction expressionStringFromNodesQueryNode(nodesQueryNode, context) {\n  const stringLiteralTerminalNode = stringLiteralTerminalNodesQuery(nodesQueryNode),\n        stringLiteralTerminalNodeContent = stringLiteralTerminalNode.getContent(),\n        expressionString = trimDoubleQuotes(stringLiteralTerminalNodeContent);\n\n  return expressionString;\n}\n"],"names":["trimDoubleQuotes","contentUtilities","valueNodesQueryNodeQuery","nodeQuery","stringLiteralTerminalNodesQuery","domAssigned","NodesQuery","string","variable","query","getString","getVariable","getQuery","evaluate","context","value","nodesQueryString","trace","message","exception","Exception","fromMessage","valueType","getType","NODE_TYPE","valueString","asString","valueNode","getNode","node","nodes","execute","Value","dom","fromNodes","debug","fromValueNode","nodesQuery","valueNodesQueryNode","nodesQueryNode","nodesQueryFromNodesQueryNode","name","Variable","nodeAsString","expressionString","expressionStringFromNodesQueryNode","fromNodesQueryNode","Query","fromExpressionString","stringLiteralTerminalNode","stringLiteralTerminalNodeContent","getContent"],"mappings":"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"}
|
package/package.json
CHANGED
package/src/dom/query/node.js
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
+
import { Query } from "occam-query";
|
|
3
4
|
import { arrayUtilities } from "necessary";
|
|
4
|
-
import {
|
|
5
|
+
import { contentUtilities } from "occam-entities";
|
|
5
6
|
|
|
6
7
|
import dom from "../../dom";
|
|
7
8
|
import Exception from "../../exception";
|
|
@@ -10,10 +11,11 @@ import { NODE_TYPE } from "../../types";
|
|
|
10
11
|
import { nodeQuery } from "../../utilities/query";
|
|
11
12
|
import { domAssigned } from "../../dom";
|
|
12
13
|
|
|
13
|
-
const { first } = arrayUtilities
|
|
14
|
+
const { first } = arrayUtilities,
|
|
15
|
+
{ trimDoubleQuotes } = contentUtilities;
|
|
14
16
|
|
|
15
|
-
const
|
|
16
|
-
|
|
17
|
+
const valueNodeQueryNodeQuery = nodeQuery("/value/nodeQuery"),
|
|
18
|
+
stringLiteralTerminalNodeQuery = nodeQuery("/nodeQuery/@string-literal");
|
|
17
19
|
|
|
18
20
|
export default domAssigned(class NodeQuery {
|
|
19
21
|
constructor(string, variable, query) {
|
|
@@ -41,6 +43,13 @@ export default domAssigned(class NodeQuery {
|
|
|
41
43
|
|
|
42
44
|
context.trace(`Evaluating the '${nodeQueryString}' node query...`);
|
|
43
45
|
|
|
46
|
+
if (this.query === null) {
|
|
47
|
+
const message = `Cannot evaluate the '${nodeQueryString}' node query because its expression is malformed.`,
|
|
48
|
+
exception = Exception.fromMessage(message);
|
|
49
|
+
|
|
50
|
+
throw exception;
|
|
51
|
+
}
|
|
52
|
+
|
|
44
53
|
value = this.variable.evaluate(context);
|
|
45
54
|
|
|
46
55
|
const valueType = value.getType();
|
|
@@ -111,11 +120,18 @@ function nodeQueryFromNodeQueryNode(nodeQueryNode, context) {
|
|
|
111
120
|
const { Variable, NodeQuery } = dom,
|
|
112
121
|
node = nodeQueryNode, ///
|
|
113
122
|
string = context.nodeAsString(node),
|
|
114
|
-
|
|
115
|
-
expression = Expression.fromExpressionNode(expressionNode),
|
|
123
|
+
expressionString = expressionStringFromNodeQueryNode(nodeQueryNode, context),
|
|
116
124
|
variable = Variable.fromNodeQueryNode(nodeQueryNode, context),
|
|
117
|
-
query = Query.
|
|
125
|
+
query = Query.fromExpressionString(expressionString),
|
|
118
126
|
nodeQuery = new NodeQuery(string, variable, query);
|
|
119
127
|
|
|
120
128
|
return nodeQuery;
|
|
121
129
|
}
|
|
130
|
+
|
|
131
|
+
function expressionStringFromNodeQueryNode(nodeQueryNode, context) {
|
|
132
|
+
const stringLiteralTerminalNode = stringLiteralTerminalNodeQuery(nodeQueryNode),
|
|
133
|
+
stringLiteralTerminalNodeContent = stringLiteralTerminalNode.getContent(),
|
|
134
|
+
expressionString = trimDoubleQuotes(stringLiteralTerminalNodeContent);
|
|
135
|
+
|
|
136
|
+
return expressionString;
|
|
137
|
+
}
|
package/src/dom/query/nodes.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
import { Query
|
|
3
|
+
import { Query } from "occam-query";
|
|
4
|
+
import { contentUtilities } from "occam-entities";
|
|
4
5
|
|
|
5
6
|
import dom from "../../dom";
|
|
6
7
|
import Exception from "../../exception";
|
|
@@ -9,8 +10,10 @@ import { nodeQuery } from "../../utilities/query";
|
|
|
9
10
|
import { NODE_TYPE } from "../../types";
|
|
10
11
|
import { domAssigned } from "../../dom";
|
|
11
12
|
|
|
12
|
-
const
|
|
13
|
-
|
|
13
|
+
const { trimDoubleQuotes } = contentUtilities;
|
|
14
|
+
|
|
15
|
+
const valueNodesQueryNodeQuery = nodeQuery("/value/nodesQuery"),
|
|
16
|
+
stringLiteralTerminalNodesQuery = nodeQuery("/nodesQuery/@string-literal");
|
|
14
17
|
|
|
15
18
|
export default domAssigned(class NodesQuery {
|
|
16
19
|
constructor(string, variable, query) {
|
|
@@ -38,6 +41,13 @@ export default domAssigned(class NodesQuery {
|
|
|
38
41
|
|
|
39
42
|
context.trace(`Evaluating the '${nodesQueryString}' nodes query...`);
|
|
40
43
|
|
|
44
|
+
if (this.query === null) {
|
|
45
|
+
const message = `Cannot evaluate the '${nodesQueryString}' nodes query because its expression is malformed.`,
|
|
46
|
+
exception = Exception.fromMessage(message);
|
|
47
|
+
|
|
48
|
+
throw exception;
|
|
49
|
+
}
|
|
50
|
+
|
|
41
51
|
value = this.variable.evaluate(context);
|
|
42
52
|
|
|
43
53
|
const valueType = value.getType();
|
|
@@ -96,11 +106,18 @@ function nodesQueryFromNodesQueryNode(nodesQueryNode, context) {
|
|
|
96
106
|
const { Variable, NodesQuery } = dom,
|
|
97
107
|
node = nodesQueryNode, ///
|
|
98
108
|
string = context.nodeAsString(node),
|
|
99
|
-
|
|
100
|
-
expression = Expression.fromExpressionNode(expressionNode),
|
|
109
|
+
expressionString = expressionStringFromNodesQueryNode(nodesQueryNode, context),
|
|
101
110
|
variable = Variable.fromNodesQueryNode(nodesQueryNode, context),
|
|
102
|
-
query = Query.
|
|
111
|
+
query = Query.fromExpressionString(expressionString),
|
|
103
112
|
nodesQuery = new NodesQuery(string, variable, query);
|
|
104
113
|
|
|
105
114
|
return nodesQuery;
|
|
106
115
|
}
|
|
116
|
+
|
|
117
|
+
function expressionStringFromNodesQueryNode(nodesQueryNode, context) {
|
|
118
|
+
const stringLiteralTerminalNode = stringLiteralTerminalNodesQuery(nodesQueryNode),
|
|
119
|
+
stringLiteralTerminalNodeContent = stringLiteralTerminalNode.getContent(),
|
|
120
|
+
expressionString = trimDoubleQuotes(stringLiteralTerminalNodeContent);
|
|
121
|
+
|
|
122
|
+
return expressionString;
|
|
123
|
+
}
|