occam-furtle 1.0.19 → 1.0.20
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/dom/forEachLoop.js +60 -4
- package/lib/dom/query/node.js +11 -10
- package/lib/dom/query/nodes.js +10 -9
- package/lib/dom/variable.js +9 -2
- package/lib/index.js +1 -2
- package/package.json +2 -2
- package/src/dom/forEachLoop.js +18 -2
- package/src/dom/query/node.js +16 -9
- package/src/dom/query/nodes.js +13 -8
- package/src/dom/variable.js +12 -0
- package/src/index.js +0 -1
- package/lib/dom/expression.js +0 -60
- package/src/dom/expression.js +0 -11
package/lib/dom/forEachLoop.js
CHANGED
|
@@ -8,8 +8,8 @@ Object.defineProperty(exports, "default", {
|
|
|
8
8
|
return _default;
|
|
9
9
|
}
|
|
10
10
|
});
|
|
11
|
+
var _dom = /*#__PURE__*/ _interop_require_wildcard(require("../dom"));
|
|
11
12
|
var _query = require("../utilities/query");
|
|
12
|
-
var _dom = require("../dom");
|
|
13
13
|
function _class_call_check(instance, Constructor) {
|
|
14
14
|
if (!(instance instanceof Constructor)) {
|
|
15
15
|
throw new TypeError("Cannot call a class as a function");
|
|
@@ -42,13 +42,68 @@ function _define_property(obj, key, value) {
|
|
|
42
42
|
}
|
|
43
43
|
return obj;
|
|
44
44
|
}
|
|
45
|
+
function _getRequireWildcardCache(nodeInterop) {
|
|
46
|
+
if (typeof WeakMap !== "function") return null;
|
|
47
|
+
var cacheBabelInterop = new WeakMap();
|
|
48
|
+
var cacheNodeInterop = new WeakMap();
|
|
49
|
+
return (_getRequireWildcardCache = function(nodeInterop) {
|
|
50
|
+
return nodeInterop ? cacheNodeInterop : cacheBabelInterop;
|
|
51
|
+
})(nodeInterop);
|
|
52
|
+
}
|
|
53
|
+
function _interop_require_wildcard(obj, nodeInterop) {
|
|
54
|
+
if (!nodeInterop && obj && obj.__esModule) {
|
|
55
|
+
return obj;
|
|
56
|
+
}
|
|
57
|
+
if (obj === null || typeof obj !== "object" && typeof obj !== "function") {
|
|
58
|
+
return {
|
|
59
|
+
default: obj
|
|
60
|
+
};
|
|
61
|
+
}
|
|
62
|
+
var cache = _getRequireWildcardCache(nodeInterop);
|
|
63
|
+
if (cache && cache.has(obj)) {
|
|
64
|
+
return cache.get(obj);
|
|
65
|
+
}
|
|
66
|
+
var newObj = {
|
|
67
|
+
__proto__: null
|
|
68
|
+
};
|
|
69
|
+
var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
|
|
70
|
+
for(var key in obj){
|
|
71
|
+
if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
|
|
72
|
+
var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;
|
|
73
|
+
if (desc && (desc.get || desc.set)) {
|
|
74
|
+
Object.defineProperty(newObj, key, desc);
|
|
75
|
+
} else {
|
|
76
|
+
newObj[key] = obj[key];
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
newObj.default = obj;
|
|
81
|
+
if (cache) {
|
|
82
|
+
cache.set(obj, newObj);
|
|
83
|
+
}
|
|
84
|
+
return newObj;
|
|
85
|
+
}
|
|
45
86
|
var _ForEachLoop;
|
|
46
87
|
var forEachLoopNodeQuery = (0, _query.nodeQuery)("/step/forEachLoop");
|
|
47
88
|
var _default = (0, _dom.domAssigned)((_ForEachLoop = /*#__PURE__*/ function() {
|
|
48
|
-
function ForEachLoop() {
|
|
89
|
+
function ForEachLoop(variable, anonymousFunction) {
|
|
49
90
|
_class_call_check(this, ForEachLoop);
|
|
91
|
+
this.variable = variable;
|
|
92
|
+
this.anonymousFunction = anonymousFunction;
|
|
50
93
|
}
|
|
51
94
|
_create_class(ForEachLoop, [
|
|
95
|
+
{
|
|
96
|
+
key: "getVariable",
|
|
97
|
+
value: function getVariable() {
|
|
98
|
+
return this.variable;
|
|
99
|
+
}
|
|
100
|
+
},
|
|
101
|
+
{
|
|
102
|
+
key: "getAnonymousFunction",
|
|
103
|
+
value: function getAnonymousFunction() {
|
|
104
|
+
return this.anonymousFunction;
|
|
105
|
+
}
|
|
106
|
+
},
|
|
52
107
|
{
|
|
53
108
|
key: "getString",
|
|
54
109
|
value: function getString() {
|
|
@@ -62,7 +117,8 @@ var _default = (0, _dom.domAssigned)((_ForEachLoop = /*#__PURE__*/ function() {
|
|
|
62
117
|
var forEachLoop = null;
|
|
63
118
|
var forEachLoopNode = forEachLoopNodeQuery(stepNode);
|
|
64
119
|
if (forEachLoopNode !== null) {
|
|
65
|
-
|
|
120
|
+
var Variable = _dom.default.Variable, AnonymousFunction = _dom.default.AnonymousFunction, variable = Variable.fromForEachLoopNode(forEachLoopNode, context), anonymousFunction = AnonymousFunction.fromForEachLoopNode(forEachLoopNode, context);
|
|
121
|
+
forEachLoop = new ForEachLoop(variable, anonymousFunction);
|
|
66
122
|
}
|
|
67
123
|
return forEachLoop;
|
|
68
124
|
}
|
|
@@ -71,4 +127,4 @@ var _default = (0, _dom.domAssigned)((_ForEachLoop = /*#__PURE__*/ function() {
|
|
|
71
127
|
return ForEachLoop;
|
|
72
128
|
}(), _define_property(_ForEachLoop, "name", "ForEachLoop"), _ForEachLoop));
|
|
73
129
|
|
|
74
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
130
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9kb20vZm9yRWFjaExvb3AuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCBkb20gZnJvbSBcIi4uL2RvbVwiO1xuXG5pbXBvcnQgeyBub2RlUXVlcnkgfSBmcm9tIFwiLi4vdXRpbGl0aWVzL3F1ZXJ5XCI7XG5pbXBvcnQgeyBkb21Bc3NpZ25lZCB9IGZyb20gXCIuLi9kb21cIjtcblxuY29uc3QgZm9yRWFjaExvb3BOb2RlUXVlcnkgPSBub2RlUXVlcnkoXCIvc3RlcC9mb3JFYWNoTG9vcFwiKTtcblxuZXhwb3J0IGRlZmF1bHQgZG9tQXNzaWduZWQoY2xhc3MgRm9yRWFjaExvb3Age1xuICBjb25zdHJ1Y3Rvcih2YXJpYWJsZSwgYW5vbnltb3VzRnVuY3Rpb24pIHtcbiAgICB0aGlzLnZhcmlhYmxlID0gdmFyaWFibGU7XG4gICAgdGhpcy5hbm9ueW1vdXNGdW5jdGlvbiA9IGFub255bW91c0Z1bmN0aW9uO1xuICB9XG5cbiAgZ2V0VmFyaWFibGUoKSB7XG4gICAgcmV0dXJuIHRoaXMudmFyaWFibGU7XG4gIH1cblxuICBnZXRBbm9ueW1vdXNGdW5jdGlvbigpIHtcbiAgICByZXR1cm4gdGhpcy5hbm9ueW1vdXNGdW5jdGlvbjtcbiAgfVxuXG4gIGdldFN0cmluZygpIHtcbiAgICBkZWJ1Z2dlclxuICB9XG5cbiAgc3RhdGljIG5hbWUgPSBcIkZvckVhY2hMb29wXCI7XG5cbiAgc3RhdGljIGZyb21TdGVwTm9kZShzdGVwTm9kZSwgY29udGV4dCkge1xuICAgIGxldCBmb3JFYWNoTG9vcCA9IG51bGw7XG5cbiAgICBjb25zdCBmb3JFYWNoTG9vcE5vZGUgPSBmb3JFYWNoTG9vcE5vZGVRdWVyeShzdGVwTm9kZSk7XG5cbiAgICBpZiAoZm9yRWFjaExvb3BOb2RlICE9PSBudWxsKSB7XG4gICAgICBjb25zdCB7IFZhcmlhYmxlLCBBbm9ueW1vdXNGdW5jdGlvbiB9ID0gZG9tLFxuICAgICAgICAgICAgdmFyaWFibGUgPSBWYXJpYWJsZS5mcm9tRm9yRWFjaExvb3BOb2RlKGZvckVhY2hMb29wTm9kZSwgY29udGV4dCksXG4gICAgICAgICAgICBhbm9ueW1vdXNGdW5jdGlvbiA9IEFub255bW91c0Z1bmN0aW9uLmZyb21Gb3JFYWNoTG9vcE5vZGUoZm9yRWFjaExvb3BOb2RlLCBjb250ZXh0KTtcblxuICAgICAgZm9yRWFjaExvb3AgPSBuZXcgRm9yRWFjaExvb3AodmFyaWFibGUsIGFub255bW91c0Z1bmN0aW9uKTtcbiAgICB9XG5cbiAgICByZXR1cm4gZm9yRWFjaExvb3A7XG4gIH1cbn0pO1xuIl0sIm5hbWVzIjpbImZvckVhY2hMb29wTm9kZVF1ZXJ5Iiwibm9kZVF1ZXJ5IiwiZG9tQXNzaWduZWQiLCJGb3JFYWNoTG9vcCIsInZhcmlhYmxlIiwiYW5vbnltb3VzRnVuY3Rpb24iLCJnZXRWYXJpYWJsZSIsImdldEFub255bW91c0Z1bmN0aW9uIiwiZ2V0U3RyaW5nIiwiZnJvbVN0ZXBOb2RlIiwic3RlcE5vZGUiLCJjb250ZXh0IiwiZm9yRWFjaExvb3AiLCJmb3JFYWNoTG9vcE5vZGUiLCJWYXJpYWJsZSIsImRvbSIsIkFub255bW91c0Z1bmN0aW9uIiwiZnJvbUZvckVhY2hMb29wTm9kZSIsIm5hbWUiXSwibWFwcGluZ3MiOiJBQUFBOzs7OytCQVNBOzs7ZUFBQTs7OzJEQVBnQjtxQkFFVTs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBRzFCLElBQU1BLHVCQUF1QkMsSUFBQUEsZ0JBQVMsRUFBQztJQUV2QyxXQUFlQyxJQUFBQSxnQkFBVyxnQ0FBQzthQUFNQyxZQUNuQkMsUUFBUSxFQUFFQyxpQkFBaUI7Z0NBRFJGO1FBRTdCLElBQUksQ0FBQ0MsUUFBUSxHQUFHQTtRQUNoQixJQUFJLENBQUNDLGlCQUFpQixHQUFHQTs7OztZQUczQkMsS0FBQUE7bUJBQUFBLFNBQUFBO2dCQUNFLE9BQU8sSUFBSSxDQUFDRixRQUFRO1lBQ3RCOzs7WUFFQUcsS0FBQUE7bUJBQUFBLFNBQUFBO2dCQUNFLE9BQU8sSUFBSSxDQUFDRixpQkFBaUI7WUFDL0I7OztZQUVBRyxLQUFBQTttQkFBQUEsU0FBQUE7Z0JBQ0UsUUFBUTtZQUNWOzs7O1lBSU9DLEtBQUFBO21CQUFQLFNBQU9BLGFBQWFDLFFBQVEsRUFBRUMsT0FBTztnQkFDbkMsSUFBSUMsY0FBYztnQkFFbEIsSUFBTUMsa0JBQWtCYixxQkFBcUJVO2dCQUU3QyxJQUFJRyxvQkFBb0IsTUFBTTtvQkFDNUIsSUFBUUMsV0FBZ0NDLFlBQUcsQ0FBbkNELFVBQVVFLG9CQUFzQkQsWUFBRyxDQUF6QkMsbUJBQ1paLFdBQVdVLFNBQVNHLG1CQUFtQixDQUFDSixpQkFBaUJGLFVBQ3pETixvQkFBb0JXLGtCQUFrQkMsbUJBQW1CLENBQUNKLGlCQUFpQkY7b0JBRWpGQyxjQUFjLElBQUlULFlBQVlDLFVBQVVDO2dCQUMxQztnQkFFQSxPQUFPTztZQUNUOzs7O0tBaEJBLCtCQUFPTSxRQUFPIn0=
|
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
|
|
11
|
+
var _occamquery = require("occam-query");
|
|
12
12
|
var _dom = /*#__PURE__*/ _interop_require_wildcard(require("../../dom"));
|
|
13
|
+
var _query = require("../../utilities/query");
|
|
13
14
|
function _class_call_check(instance, Constructor) {
|
|
14
15
|
if (!(instance instanceof Constructor)) {
|
|
15
16
|
throw new TypeError("Cannot call a class as a function");
|
|
@@ -84,7 +85,7 @@ function _interop_require_wildcard(obj, nodeInterop) {
|
|
|
84
85
|
return newObj;
|
|
85
86
|
}
|
|
86
87
|
var _NodeQuery;
|
|
87
|
-
var nodeQueryNodeQuery = (0, _query.nodeQuery)("/assignment/nodeQuery");
|
|
88
|
+
var nodeQueryNodeQuery = (0, _query.nodeQuery)("/assignment/nodeQuery"), expressionNodeQuery = (0, _query.nodeQuery)("/nodesQuery/expression");
|
|
88
89
|
var _default = (0, _dom.domAssigned)((_NodeQuery = /*#__PURE__*/ function() {
|
|
89
90
|
function NodeQuery() {
|
|
90
91
|
_class_call_check(this, NodeQuery);
|
|
@@ -92,9 +93,9 @@ var _default = (0, _dom.domAssigned)((_NodeQuery = /*#__PURE__*/ function() {
|
|
|
92
93
|
_create_class(NodeQuery, [
|
|
93
94
|
{
|
|
94
95
|
key: "getString",
|
|
95
|
-
value: function getString(variable,
|
|
96
|
+
value: function getString(variable, query) {
|
|
96
97
|
this.variable = variable;
|
|
97
|
-
this.
|
|
98
|
+
this.query = query;
|
|
98
99
|
}
|
|
99
100
|
},
|
|
100
101
|
{
|
|
@@ -104,9 +105,9 @@ var _default = (0, _dom.domAssigned)((_NodeQuery = /*#__PURE__*/ function() {
|
|
|
104
105
|
}
|
|
105
106
|
},
|
|
106
107
|
{
|
|
107
|
-
key: "
|
|
108
|
-
value: function
|
|
109
|
-
return this.
|
|
108
|
+
key: "getQuery",
|
|
109
|
+
value: function getQuery() {
|
|
110
|
+
return this.query;
|
|
110
111
|
}
|
|
111
112
|
}
|
|
112
113
|
], [
|
|
@@ -116,8 +117,8 @@ var _default = (0, _dom.domAssigned)((_NodeQuery = /*#__PURE__*/ function() {
|
|
|
116
117
|
var _$nodeQuery = null;
|
|
117
118
|
var nodeQueryNode = nodeQueryNodeQuery(assigmentNode);
|
|
118
119
|
if (nodeQueryNode !== null) {
|
|
119
|
-
var Variable = _dom.default.Variable,
|
|
120
|
-
_$nodeQuery = new NodeQuery(variable,
|
|
120
|
+
var Variable = _dom.default.Variable, expressionNode = expressionNodeQuery(nodeQueryNode), expression = _occamquery.Expression.fromExpressionNode(expressionNode), variable = Variable.fromNodeQueryNode(nodeQueryNode, context), query = _occamquery.Query.fromExpression(expression);
|
|
121
|
+
_$nodeQuery = new NodeQuery(variable, query);
|
|
121
122
|
}
|
|
122
123
|
return _$nodeQuery;
|
|
123
124
|
}
|
|
@@ -126,4 +127,4 @@ var _default = (0, _dom.domAssigned)((_NodeQuery = /*#__PURE__*/ function() {
|
|
|
126
127
|
return NodeQuery;
|
|
127
128
|
}(), _define_property(_NodeQuery, "name", "NodeQuery"), _NodeQuery));
|
|
128
129
|
|
|
129
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
130
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9kb20vcXVlcnkvbm9kZS5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IHsgUXVlcnksIEV4cHJlc3Npb24gfSBmcm9tIFwib2NjYW0tcXVlcnlcIjtcblxuaW1wb3J0IGRvbSBmcm9tIFwiLi4vLi4vZG9tXCI7XG5cbmltcG9ydCB7IG5vZGVRdWVyeSB9IGZyb20gXCIuLi8uLi91dGlsaXRpZXMvcXVlcnlcIjtcbmltcG9ydCB7IGRvbUFzc2lnbmVkIH0gZnJvbSBcIi4uLy4uL2RvbVwiO1xuXG5jb25zdCBub2RlUXVlcnlOb2RlUXVlcnkgPSBub2RlUXVlcnkoXCIvYXNzaWdubWVudC9ub2RlUXVlcnlcIiksXG4gICAgICBleHByZXNzaW9uTm9kZVF1ZXJ5ID0gbm9kZVF1ZXJ5KFwiL25vZGVzUXVlcnkvZXhwcmVzc2lvblwiKTtcblxuZXhwb3J0IGRlZmF1bHQgZG9tQXNzaWduZWQoY2xhc3MgTm9kZVF1ZXJ5IHtcbiAgZ2V0U3RyaW5nKHZhcmlhYmxlLCBxdWVyeSkge1xuICAgIHRoaXMudmFyaWFibGUgPSB2YXJpYWJsZTtcbiAgICB0aGlzLnF1ZXJ5ID0gcXVlcnk7XG4gIH1cblxuICBnZXRWYXJpYWJsZSgpIHtcbiAgICByZXR1cm4gdGhpcy52YXJpYWJsZTtcbiAgfVxuXG4gIGdldFF1ZXJ5KCkge1xuICAgIHJldHVybiB0aGlzLnF1ZXJ5O1xuICB9XG5cbiAgc3RhdGljIG5hbWUgPSBcIk5vZGVRdWVyeVwiO1xuXG4gIHN0YXRpYyBmcm9tQXNzaWdubWVudE5vZGUoYXNzaWdtZW50Tm9kZSwgY29udGV4dCkge1xuICAgIGxldCBub2RlUXVlcnkgPSBudWxsO1xuXG4gICAgY29uc3Qgbm9kZVF1ZXJ5Tm9kZSA9IG5vZGVRdWVyeU5vZGVRdWVyeShhc3NpZ21lbnROb2RlKTtcblxuICAgIGlmIChub2RlUXVlcnlOb2RlICE9PSBudWxsKSB7XG4gICAgICBjb25zdCB7IFZhcmlhYmxlIH0gPSBkb20sXG4gICAgICAgICAgICBleHByZXNzaW9uTm9kZSA9IGV4cHJlc3Npb25Ob2RlUXVlcnkobm9kZVF1ZXJ5Tm9kZSksXG4gICAgICAgICAgICBleHByZXNzaW9uID0gRXhwcmVzc2lvbi5mcm9tRXhwcmVzc2lvbk5vZGUoZXhwcmVzc2lvbk5vZGUpLFxuICAgICAgICAgICAgdmFyaWFibGUgPSBWYXJpYWJsZS5mcm9tTm9kZVF1ZXJ5Tm9kZShub2RlUXVlcnlOb2RlLCBjb250ZXh0KSxcbiAgICAgICAgICAgIHF1ZXJ5ID0gUXVlcnkuZnJvbUV4cHJlc3Npb24oZXhwcmVzc2lvbik7XG5cbiAgICAgIG5vZGVRdWVyeSA9IG5ldyBOb2RlUXVlcnkodmFyaWFibGUsIHF1ZXJ5KTtcbiAgICB9XG5cbiAgICByZXR1cm4gbm9kZVF1ZXJ5O1xuICB9XG59KTtcbiJdLCJuYW1lcyI6WyJub2RlUXVlcnlOb2RlUXVlcnkiLCJub2RlUXVlcnkiLCJleHByZXNzaW9uTm9kZVF1ZXJ5IiwiZG9tQXNzaWduZWQiLCJOb2RlUXVlcnkiLCJnZXRTdHJpbmciLCJ2YXJpYWJsZSIsInF1ZXJ5IiwiZ2V0VmFyaWFibGUiLCJnZXRRdWVyeSIsImZyb21Bc3NpZ25tZW50Tm9kZSIsImFzc2lnbWVudE5vZGUiLCJjb250ZXh0Iiwibm9kZVF1ZXJ5Tm9kZSIsIlZhcmlhYmxlIiwiZG9tIiwiZXhwcmVzc2lvbk5vZGUiLCJleHByZXNzaW9uIiwiRXhwcmVzc2lvbiIsImZyb21FeHByZXNzaW9uTm9kZSIsImZyb21Ob2RlUXVlcnlOb2RlIiwiUXVlcnkiLCJmcm9tRXhwcmVzc2lvbiIsIm5hbWUiXSwibWFwcGluZ3MiOiJBQUFBOzs7OytCQVlBOzs7ZUFBQTs7OzBCQVZrQzsyREFFbEI7cUJBRVU7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUcxQixJQUFNQSxxQkFBcUJDLElBQUFBLGdCQUFTLEVBQUMsMEJBQy9CQyxzQkFBc0JELElBQUFBLGdCQUFTLEVBQUM7SUFFdEMsV0FBZUUsSUFBQUEsZ0JBQVcsOEJBQUM7YUFBTUM7Z0NBQUFBOzs7O1lBQy9CQyxLQUFBQTttQkFBQUEsU0FBQUEsVUFBVUMsUUFBUSxFQUFFQyxLQUFLO2dCQUN2QixJQUFJLENBQUNELFFBQVEsR0FBR0E7Z0JBQ2hCLElBQUksQ0FBQ0MsS0FBSyxHQUFHQTtZQUNmOzs7WUFFQUMsS0FBQUE7bUJBQUFBLFNBQUFBO2dCQUNFLE9BQU8sSUFBSSxDQUFDRixRQUFRO1lBQ3RCOzs7WUFFQUcsS0FBQUE7bUJBQUFBLFNBQUFBO2dCQUNFLE9BQU8sSUFBSSxDQUFDRixLQUFLO1lBQ25COzs7O1lBSU9HLEtBQUFBO21CQUFQLFNBQU9BLG1CQUFtQkMsYUFBYSxFQUFFQyxPQUFPO2dCQUM5QyxJQUFJWCxjQUFZO2dCQUVoQixJQUFNWSxnQkFBZ0JiLG1CQUFtQlc7Z0JBRXpDLElBQUlFLGtCQUFrQixNQUFNO29CQUMxQixJQUFNLEFBQUVDLFdBQWFDLFlBQUcsQ0FBaEJELFVBQ0ZFLGlCQUFpQmQsb0JBQW9CVyxnQkFDckNJLGFBQWFDLHNCQUFVLENBQUNDLGtCQUFrQixDQUFDSCxpQkFDM0NWLFdBQVdRLFNBQVNNLGlCQUFpQixDQUFDUCxlQUFlRCxVQUNyREwsUUFBUWMsaUJBQUssQ0FBQ0MsY0FBYyxDQUFDTDtvQkFFbkNoQixjQUFZLElBQUlHLFVBQVVFLFVBQVVDO2dCQUN0QztnQkFFQSxPQUFPTjtZQUNUOzs7O0tBbEJBLDZCQUFPc0IsUUFBTyJ9
|
package/lib/dom/query/nodes.js
CHANGED
|
@@ -8,6 +8,7 @@ Object.defineProperty(exports, "default", {
|
|
|
8
8
|
return _default;
|
|
9
9
|
}
|
|
10
10
|
});
|
|
11
|
+
var _occamquery = require("occam-query");
|
|
11
12
|
var _dom = /*#__PURE__*/ _interop_require_wildcard(require("../../dom"));
|
|
12
13
|
var _query = require("../../utilities/query");
|
|
13
14
|
function _class_call_check(instance, Constructor) {
|
|
@@ -84,7 +85,7 @@ function _interop_require_wildcard(obj, nodeInterop) {
|
|
|
84
85
|
return newObj;
|
|
85
86
|
}
|
|
86
87
|
var _NodesQuery;
|
|
87
|
-
var nodesQueryNodeQuery = (0, _query.nodeQuery)("/assignment/nodesQuery");
|
|
88
|
+
var nodesQueryNodeQuery = (0, _query.nodeQuery)("/assignment/nodesQuery"), expressionNodeQuery = (0, _query.nodeQuery)("/nodesQuery/expression");
|
|
88
89
|
var _default = (0, _dom.domAssigned)((_NodesQuery = /*#__PURE__*/ function() {
|
|
89
90
|
function NodesQuery() {
|
|
90
91
|
_class_call_check(this, NodesQuery);
|
|
@@ -92,9 +93,9 @@ var _default = (0, _dom.domAssigned)((_NodesQuery = /*#__PURE__*/ function() {
|
|
|
92
93
|
_create_class(NodesQuery, [
|
|
93
94
|
{
|
|
94
95
|
key: "getString",
|
|
95
|
-
value: function getString(variable,
|
|
96
|
+
value: function getString(variable, query) {
|
|
96
97
|
this.variable = variable;
|
|
97
|
-
this.
|
|
98
|
+
this.query = query;
|
|
98
99
|
}
|
|
99
100
|
},
|
|
100
101
|
{
|
|
@@ -104,9 +105,9 @@ var _default = (0, _dom.domAssigned)((_NodesQuery = /*#__PURE__*/ function() {
|
|
|
104
105
|
}
|
|
105
106
|
},
|
|
106
107
|
{
|
|
107
|
-
key: "
|
|
108
|
-
value: function
|
|
109
|
-
return this.
|
|
108
|
+
key: "getQuery",
|
|
109
|
+
value: function getQuery() {
|
|
110
|
+
return this.query;
|
|
110
111
|
}
|
|
111
112
|
}
|
|
112
113
|
], [
|
|
@@ -116,8 +117,8 @@ var _default = (0, _dom.domAssigned)((_NodesQuery = /*#__PURE__*/ function() {
|
|
|
116
117
|
var nodesQuery = null;
|
|
117
118
|
var nodesQueryNode = nodesQueryNodeQuery(assigmentNode);
|
|
118
119
|
if (nodesQueryNode !== null) {
|
|
119
|
-
var Variable = _dom.default.Variable,
|
|
120
|
-
nodesQuery = new NodesQuery(variable,
|
|
120
|
+
var Variable = _dom.default.Variable, expressionNode = expressionNodeQuery(nodesQueryNode), expression = _occamquery.Expression.fromExpressionNode(expressionNode), variable = Variable.fromNodesQueryNode(nodesQueryNode, context), query = _occamquery.Query.fromExpression(expression);
|
|
121
|
+
nodesQuery = new NodesQuery(variable, query);
|
|
121
122
|
}
|
|
122
123
|
return nodesQuery;
|
|
123
124
|
}
|
|
@@ -126,4 +127,4 @@ var _default = (0, _dom.domAssigned)((_NodesQuery = /*#__PURE__*/ function() {
|
|
|
126
127
|
return NodesQuery;
|
|
127
128
|
}(), _define_property(_NodesQuery, "name", "NodesQuery"), _NodesQuery));
|
|
128
129
|
|
|
129
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
130
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9kb20vcXVlcnkvbm9kZXMuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCB7IFF1ZXJ5LCBFeHByZXNzaW9uIH0gZnJvbSBcIm9jY2FtLXF1ZXJ5XCI7XG5cbmltcG9ydCBkb20gZnJvbSBcIi4uLy4uL2RvbVwiO1xuXG5pbXBvcnQgeyBub2RlUXVlcnkgfSBmcm9tIFwiLi4vLi4vdXRpbGl0aWVzL3F1ZXJ5XCI7XG5pbXBvcnQgeyBkb21Bc3NpZ25lZCB9IGZyb20gXCIuLi8uLi9kb21cIjtcblxuY29uc3Qgbm9kZXNRdWVyeU5vZGVRdWVyeSA9IG5vZGVRdWVyeShcIi9hc3NpZ25tZW50L25vZGVzUXVlcnlcIiksXG4gICAgICBleHByZXNzaW9uTm9kZVF1ZXJ5ID0gbm9kZVF1ZXJ5KFwiL25vZGVzUXVlcnkvZXhwcmVzc2lvblwiKTtcblxuZXhwb3J0IGRlZmF1bHQgZG9tQXNzaWduZWQoY2xhc3MgTm9kZXNRdWVyeSB7XG4gIGdldFN0cmluZyh2YXJpYWJsZSwgcXVlcnkpIHtcbiAgICB0aGlzLnZhcmlhYmxlID0gdmFyaWFibGU7XG4gICAgdGhpcy5xdWVyeSA9IHF1ZXJ5O1xuICB9XG5cbiAgZ2V0VmFyaWFibGUoKSB7XG4gICAgcmV0dXJuIHRoaXMudmFyaWFibGU7XG4gIH1cblxuICBnZXRRdWVyeSgpIHtcbiAgICByZXR1cm4gdGhpcy5xdWVyeTtcbiAgfVxuXG4gIHN0YXRpYyBuYW1lID0gXCJOb2Rlc1F1ZXJ5XCI7XG5cbiAgc3RhdGljIGZyb21Bc3NpZ25tZW50Tm9kZShhc3NpZ21lbnROb2RlLCBjb250ZXh0KSB7XG4gICAgbGV0IG5vZGVzUXVlcnkgPSBudWxsO1xuXG4gICAgY29uc3Qgbm9kZXNRdWVyeU5vZGUgPSBub2Rlc1F1ZXJ5Tm9kZVF1ZXJ5KGFzc2lnbWVudE5vZGUpO1xuXG4gICAgaWYgKG5vZGVzUXVlcnlOb2RlICE9PSBudWxsKSB7XG4gICAgICBjb25zdCB7IFZhcmlhYmxlIH0gPSBkb20sXG4gICAgICAgICAgICBleHByZXNzaW9uTm9kZSA9IGV4cHJlc3Npb25Ob2RlUXVlcnkobm9kZXNRdWVyeU5vZGUpLFxuICAgICAgICAgICAgZXhwcmVzc2lvbiA9IEV4cHJlc3Npb24uZnJvbUV4cHJlc3Npb25Ob2RlKGV4cHJlc3Npb25Ob2RlKSxcbiAgICAgICAgICAgIHZhcmlhYmxlID0gVmFyaWFibGUuZnJvbU5vZGVzUXVlcnlOb2RlKG5vZGVzUXVlcnlOb2RlLCBjb250ZXh0KSxcbiAgICAgICAgICAgIHF1ZXJ5ID0gUXVlcnkuZnJvbUV4cHJlc3Npb24oZXhwcmVzc2lvbik7XG5cbiAgICAgIG5vZGVzUXVlcnkgPSBuZXcgTm9kZXNRdWVyeSh2YXJpYWJsZSwgcXVlcnkpO1xuICAgIH1cblxuICAgIHJldHVybiBub2Rlc1F1ZXJ5O1xuICB9XG59KTtcbiJdLCJuYW1lcyI6WyJub2Rlc1F1ZXJ5Tm9kZVF1ZXJ5Iiwibm9kZVF1ZXJ5IiwiZXhwcmVzc2lvbk5vZGVRdWVyeSIsImRvbUFzc2lnbmVkIiwiTm9kZXNRdWVyeSIsImdldFN0cmluZyIsInZhcmlhYmxlIiwicXVlcnkiLCJnZXRWYXJpYWJsZSIsImdldFF1ZXJ5IiwiZnJvbUFzc2lnbm1lbnROb2RlIiwiYXNzaWdtZW50Tm9kZSIsImNvbnRleHQiLCJub2Rlc1F1ZXJ5Iiwibm9kZXNRdWVyeU5vZGUiLCJWYXJpYWJsZSIsImRvbSIsImV4cHJlc3Npb25Ob2RlIiwiZXhwcmVzc2lvbiIsIkV4cHJlc3Npb24iLCJmcm9tRXhwcmVzc2lvbk5vZGUiLCJmcm9tTm9kZXNRdWVyeU5vZGUiLCJRdWVyeSIsImZyb21FeHByZXNzaW9uIiwibmFtZSJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7K0JBWUE7OztlQUFBOzs7MEJBVmtDOzJEQUVsQjtxQkFFVTs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBRzFCLElBQU1BLHNCQUFzQkMsSUFBQUEsZ0JBQVMsRUFBQywyQkFDaENDLHNCQUFzQkQsSUFBQUEsZ0JBQVMsRUFBQztJQUV0QyxXQUFlRSxJQUFBQSxnQkFBVywrQkFBQzthQUFNQztnQ0FBQUE7Ozs7WUFDL0JDLEtBQUFBO21CQUFBQSxTQUFBQSxVQUFVQyxRQUFRLEVBQUVDLEtBQUs7Z0JBQ3ZCLElBQUksQ0FBQ0QsUUFBUSxHQUFHQTtnQkFDaEIsSUFBSSxDQUFDQyxLQUFLLEdBQUdBO1lBQ2Y7OztZQUVBQyxLQUFBQTttQkFBQUEsU0FBQUE7Z0JBQ0UsT0FBTyxJQUFJLENBQUNGLFFBQVE7WUFDdEI7OztZQUVBRyxLQUFBQTttQkFBQUEsU0FBQUE7Z0JBQ0UsT0FBTyxJQUFJLENBQUNGLEtBQUs7WUFDbkI7Ozs7WUFJT0csS0FBQUE7bUJBQVAsU0FBT0EsbUJBQW1CQyxhQUFhLEVBQUVDLE9BQU87Z0JBQzlDLElBQUlDLGFBQWE7Z0JBRWpCLElBQU1DLGlCQUFpQmQsb0JBQW9CVztnQkFFM0MsSUFBSUcsbUJBQW1CLE1BQU07b0JBQzNCLElBQU0sQUFBRUMsV0FBYUMsWUFBRyxDQUFoQkQsVUFDRkUsaUJBQWlCZixvQkFBb0JZLGlCQUNyQ0ksYUFBYUMsc0JBQVUsQ0FBQ0Msa0JBQWtCLENBQUNILGlCQUMzQ1gsV0FBV1MsU0FBU00sa0JBQWtCLENBQUNQLGdCQUFnQkYsVUFDdkRMLFFBQVFlLGlCQUFLLENBQUNDLGNBQWMsQ0FBQ0w7b0JBRW5DTCxhQUFhLElBQUlULFdBQVdFLFVBQVVDO2dCQUN4QztnQkFFQSxPQUFPTTtZQUNUOzs7O0tBbEJBLDhCQUFPVyxRQUFPIn0=
|
package/lib/dom/variable.js
CHANGED
|
@@ -84,7 +84,7 @@ function _interop_require_wildcard(obj, nodeInterop) {
|
|
|
84
84
|
return newObj;
|
|
85
85
|
}
|
|
86
86
|
var _Variable;
|
|
87
|
-
var typeTerminalNodeQuery = (0, _query.nodeQuery)("/parameter/@type"), valueVariableNodeQuery = (0, _query.nodeQuery)("/value/variable"), parameterVariableNodeQuery = (0, _query.nodeQuery)("/parameter/variable"), nodeQueryVariableNodeQuery = (0, _query.nodeQuery)("/nodeQuery/variable"), nodesQueryVariableNodeQuery = (0, _query.nodeQuery)("/nodesQuery/variable"), variableNameTerminalNodeQuery = (0, _query.nodeQuery)("/variable/@name");
|
|
87
|
+
var typeTerminalNodeQuery = (0, _query.nodeQuery)("/parameter/@type"), valueVariableNodeQuery = (0, _query.nodeQuery)("/value/variable"), parameterVariableNodeQuery = (0, _query.nodeQuery)("/parameter/variable"), nodeQueryVariableNodeQuery = (0, _query.nodeQuery)("/nodeQuery/variable"), nodesQueryVariableNodeQuery = (0, _query.nodeQuery)("/nodesQuery/variable"), forEachLoopVariableNodeQuery = (0, _query.nodeQuery)("/forEachLoop/variable"), variableNameTerminalNodeQuery = (0, _query.nodeQuery)("/variable/@name");
|
|
88
88
|
var _default = (0, _dom.domAssigned)((_Variable = /*#__PURE__*/ function() {
|
|
89
89
|
function Variable(type, name, assignment) {
|
|
90
90
|
_class_call_check(this, Variable);
|
|
@@ -131,6 +131,13 @@ var _default = (0, _dom.domAssigned)((_Variable = /*#__PURE__*/ function() {
|
|
|
131
131
|
return variable;
|
|
132
132
|
}
|
|
133
133
|
},
|
|
134
|
+
{
|
|
135
|
+
key: "fromForEachLoopNode",
|
|
136
|
+
value: function fromForEachLoopNode(forEachLoopLoopNode, context) {
|
|
137
|
+
var forEachLoopVariableNode = forEachLoopVariableNodeQuery(forEachLoopLoopNode), variableNode = forEachLoopVariableNode, type = null, name = nameFromVariableNode(variableNode), assigment = null, variable = new Variable(type, name, assigment);
|
|
138
|
+
return variable;
|
|
139
|
+
}
|
|
140
|
+
},
|
|
134
141
|
{
|
|
135
142
|
key: "fromParameterNode",
|
|
136
143
|
value: function fromParameterNode(parameterNode, context) {
|
|
@@ -171,4 +178,4 @@ function typeFromParameterNode(parameterNode) {
|
|
|
171
178
|
return type;
|
|
172
179
|
}
|
|
173
180
|
|
|
174
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
181
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/dom/variable.js"],"sourcesContent":["\"use strict\";\n\nimport dom from \"../dom\";\n\nimport { nodeQuery } from \"../utilities/query\";\nimport { domAssigned } from \"../dom\";\n\nconst typeTerminalNodeQuery = nodeQuery(\"/parameter/@type\"),\n      valueVariableNodeQuery = nodeQuery(\"/value/variable\"),\n      parameterVariableNodeQuery = nodeQuery(\"/parameter/variable\"),\n      nodeQueryVariableNodeQuery = nodeQuery(\"/nodeQuery/variable\"),\n      nodesQueryVariableNodeQuery = nodeQuery(\"/nodesQuery/variable\"),\n      forEachLoopVariableNodeQuery = nodeQuery(\"/forEachLoop/variable\"),\n      variableNameTerminalNodeQuery = nodeQuery(\"/variable/@name\");\n\nexport default domAssigned(class Variable {\n  constructor(type, name, assignment) {\n    this.type = type;\n    this.name = name;\n    this.assignment = assignment;\n  }\n\n  getType() {\n    return this.type;\n  }\n\n  getName() {\n    return this.name;\n  }\n\n  getAssignment() {\n    return this.assignment;\n  }\n\n  getString() {\n    const string = `${this.type} ${this.name}`;\n\n    return string;\n  }\n\n  static name = \"Variable\";\n\n  static fromValueNode(valueNode, context) {\n    let variable = null;\n\n    const valueVariableNode = valueVariableNodeQuery(valueNode);\n\n    if (valueVariableNode !== null) {\n      const variableNode = valueVariableNode, ///\n            type = null,\n            name = nameFromVariableNode(variableNode),\n            assigment = null;\n\n      variable = new Variable(type, name, assigment);\n    }\n\n    return variable;\n  }\n\n  static fromForEachLoopNode(forEachLoopLoopNode, context) {\n    const forEachLoopVariableNode = forEachLoopVariableNodeQuery(forEachLoopLoopNode),\n          variableNode = forEachLoopVariableNode, ///\n          type = null,\n          name = nameFromVariableNode(variableNode),\n          assigment = null,\n          variable = new Variable(type, name, assigment);\n\n    return variable;\n  }\n\n  static fromParameterNode(parameterNode, context) {\n    const parameterVariableNode = parameterVariableNodeQuery(parameterNode),\n          variableNode = parameterVariableNode, ///\n          type = typeFromParameterNode(parameterNode),\n          name = nameFromVariableNode(variableNode),\n          assigment = null,\n          variable = new Variable(type, name, assigment);\n\n    return variable;\n  }\n\n  static fromNodeQueryNode(nodeQueryNode, context) {\n    const nodeQueryVariableNode = nodeQueryVariableNodeQuery(nodeQueryNode),\n          variableNode = nodeQueryVariableNode, ///\n          type = null,\n          name = nameFromVariableNode(variableNode),\n          assigment = null,\n          variable = new Variable(type, name, assigment);\n\n    return variable;\n  }\n\n  static fromNodesQueryNode(nodesQueryNode, context) {\n    const nodesQueryVariableNode = nodesQueryVariableNodeQuery(nodesQueryNode),\n          variableNode = nodesQueryVariableNode, ///\n          type = null,\n          name = nameFromVariableNode(variableNode),\n          assigment = null,\n          variable = new Variable(type, name, assigment);\n\n    return variable;\n  }\n\n  static fromTypeVariableNodeAndAssignmentNode(type, variableNode, assignmentNode) {\n    const { Assignment } = dom,\n          name = nameFromVariableNode(variableNode),\n          assignment = Assignment.fromAssignmentNode(assignmentNode),\n          variable = new Variable(type, name, assignment);\n\n    return variable;\n  }\n});\n\nfunction nameFromVariableNode(variableNode) {\n  const variableNameTerminalNode = variableNameTerminalNodeQuery(variableNode),\n        variableNameTerminalNodeContent = variableNameTerminalNode.getContent(),\n        name = variableNameTerminalNodeContent; ///\n\n  return name;\n}\n\nfunction typeFromParameterNode(parameterNode) {\n  const typeTerminalNode = typeTerminalNodeQuery(parameterNode),\n        typeTerminalNodeContent = typeTerminalNode.getContent(),\n        type = typeTerminalNodeContent; ///\n\n  return type;\n}\n"],"names":["typeTerminalNodeQuery","nodeQuery","valueVariableNodeQuery","parameterVariableNodeQuery","nodeQueryVariableNodeQuery","nodesQueryVariableNodeQuery","forEachLoopVariableNodeQuery","variableNameTerminalNodeQuery","domAssigned","Variable","type","name","assignment","getType","getName","getAssignment","getString","string","fromValueNode","valueNode","context","variable","valueVariableNode","variableNode","nameFromVariableNode","assigment","fromForEachLoopNode","forEachLoopLoopNode","forEachLoopVariableNode","fromParameterNode","parameterNode","parameterVariableNode","typeFromParameterNode","fromNodeQueryNode","nodeQueryNode","nodeQueryVariableNode","fromNodesQueryNode","nodesQueryNode","nodesQueryVariableNode","fromTypeVariableNodeAndAssignmentNode","assignmentNode","Assignment","dom","fromAssignmentNode","variableNameTerminalNode","variableNameTerminalNodeContent","getContent","typeTerminalNode","typeTerminalNodeContent"],"mappings":"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"}
|
package/lib/index.js
CHANGED
|
@@ -12,7 +12,6 @@ var _parameter = /*#__PURE__*/ _interop_require_default(require("./dom/parameter
|
|
|
12
12
|
var _reference = /*#__PURE__*/ _interop_require_default(require("./dom/reference"));
|
|
13
13
|
var _procedure = /*#__PURE__*/ _interop_require_default(require("./dom/procedure"));
|
|
14
14
|
var _node = /*#__PURE__*/ _interop_require_default(require("./dom/query/node"));
|
|
15
|
-
var _expression = /*#__PURE__*/ _interop_require_default(require("./dom/expression"));
|
|
16
15
|
var _nodes = /*#__PURE__*/ _interop_require_default(require("./dom/query/nodes"));
|
|
17
16
|
var _comparison = /*#__PURE__*/ _interop_require_default(require("./dom/comparison"));
|
|
18
17
|
var _assignment = /*#__PURE__*/ _interop_require_default(require("./dom/assignment"));
|
|
@@ -34,4 +33,4 @@ function _interop_require_default(obj) {
|
|
|
34
33
|
};
|
|
35
34
|
}
|
|
36
35
|
|
|
37
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
36
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9pbmRleC5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IFN0ZXAgZnJvbSBcIi4vZG9tL3N0ZXBcIjtcbmltcG9ydCBMYWJlbCBmcm9tIFwiLi9kb20vbGFiZWxcIjtcbmltcG9ydCBWYWx1ZSBmcm9tIFwiLi9kb20vdmFsdWVcIjtcbmltcG9ydCBCbG9jayBmcm9tIFwiLi9kb20vYmxvY2tcIjtcbmltcG9ydCBWYXJpYWJsZSBmcm9tIFwiLi9kb20vdmFyaWFibGVcIjtcbmltcG9ydCBDb25kaXRpb24gZnJvbSBcIi4vZG9tL2NvbmRpdGlvblwiO1xuaW1wb3J0IFBhcmFtZXRlciBmcm9tIFwiLi9kb20vcGFyYW1ldGVyXCI7XG5pbXBvcnQgUmVmZXJlbmNlIGZyb20gXCIuL2RvbS9yZWZlcmVuY2VcIjtcbmltcG9ydCBQcm9jZWR1cmUgZnJvbSBcIi4vZG9tL3Byb2NlZHVyZVwiO1xuaW1wb3J0IE5vZGVRdWVyeSBmcm9tIFwiLi9kb20vcXVlcnkvbm9kZVwiO1xuaW1wb3J0IE5vZGVzUXVlcnkgZnJvbSBcIi4vZG9tL3F1ZXJ5L25vZGVzXCI7XG5pbXBvcnQgQ29tcGFyaXNvbiBmcm9tIFwiLi9kb20vY29tcGFyaXNvblwiO1xuaW1wb3J0IEFzc2lnbm1lbnQgZnJvbSBcIi4vZG9tL2Fzc2lnbm1lbnRcIjtcbmltcG9ydCBSZXR1cm5CbG9jayBmcm9tIFwiLi9kb20vcmV0dXJuQmxvY2tcIjtcbmltcG9ydCBGb3JFYWNoTG9vcCBmcm9tIFwiLi9kb20vZm9yRWFjaExvb3BcIjtcbmltcG9ydCBQcm9jZWR1cmVDYWxsIGZyb20gXCIuL2RvbS9wcm9jZWR1cmVDYWxsXCI7XG5pbXBvcnQgQXJyYXlBc3NpZ21lbnQgZnJvbSBcIi4vZG9tL2Fzc2lnbm1lbnQvYXJyYXlcIjtcbmltcG9ydCBSZXR1cm5TdGF0ZW1lbnQgZnJvbSBcIi4vZG9tL3JldHVyblN0YXRlbWVudFwiO1xuaW1wb3J0IE9iamVjdEFzc2lnbm1lbnQgZnJvbSBcIi4vZG9tL2Fzc2lnbm1lbnQvb2JqZWN0XCI7XG5pbXBvcnQgQ29uZGl0aW9uYWxCbG9jayBmcm9tIFwiLi9kb20vY29uZGl0aW9uYWxCbG9ja1wiO1xuaW1wb3J0IEJpdHdpc2VDb25kaXRpb24gZnJvbSBcIi4vZG9tL2JpdHdpc2VDb25kaXRpb25cIjtcbmltcG9ydCBCcmFja2V0ZWRDb25kaXRpb24gZnJvbSBcIi4vZG9tL2JyYWNrZXRlZENvbmRpdGlvblwiO1xuaW1wb3J0IFZhcmlhYmxlc0Fzc2lnbm1lbnQgZnJvbSBcIi4vZG9tL2Fzc2lnbm1lbnQvdmFyaWFibGVzXCI7XG5pbXBvcnQgUHJvY2VkdXJlRGVjbGFyYXRpb24gZnJvbSBcIi4vZG9tL2RlY2xhcmF0aW9uL3Byb2NlZHVyZVwiO1xuaW1wb3J0IFZhcmlhYmxlc0RlY2xhcmF0aW9uIGZyb20gXCIuL2RvbS9kZWNsYXJhdGlvbi92YXJpYWJsZXNcIjtcbiJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7OzsyREFFaUI7NERBQ0M7NERBQ0E7NERBQ0E7K0RBQ0c7Z0VBQ0M7Z0VBQ0E7Z0VBQ0E7Z0VBQ0E7MkRBQ0E7NERBQ0M7aUVBQ0E7aUVBQ0E7a0VBQ0M7a0VBQ0E7b0VBQ0U7NERBQ0M7c0VBQ0M7NkRBQ0M7dUVBQ0E7dUVBQ0E7eUVBQ0U7Z0VBQ0M7aUVBQ0M7aUVBQ0EifQ==
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "occam-furtle",
|
|
3
3
|
"author": "James Smith",
|
|
4
|
-
"version": "1.0.
|
|
4
|
+
"version": "1.0.20",
|
|
5
5
|
"license": "MIT, Anti-996",
|
|
6
6
|
"homepage": "https://github.com/djalbat/occam-furtle",
|
|
7
7
|
"description": "Occam's Furtle language.",
|
|
@@ -11,7 +11,7 @@
|
|
|
11
11
|
},
|
|
12
12
|
"dependencies": {
|
|
13
13
|
"necessary": "^14.2.1",
|
|
14
|
-
"occam-grammars": "^1.3.
|
|
14
|
+
"occam-grammars": "^1.3.35",
|
|
15
15
|
"occam-query": "^4.1.10"
|
|
16
16
|
},
|
|
17
17
|
"devDependencies": {
|
package/src/dom/forEachLoop.js
CHANGED
|
@@ -1,12 +1,24 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
+
import dom from "../dom";
|
|
4
|
+
|
|
3
5
|
import { nodeQuery } from "../utilities/query";
|
|
4
6
|
import { domAssigned } from "../dom";
|
|
5
7
|
|
|
6
8
|
const forEachLoopNodeQuery = nodeQuery("/step/forEachLoop");
|
|
7
9
|
|
|
8
10
|
export default domAssigned(class ForEachLoop {
|
|
9
|
-
constructor() {
|
|
11
|
+
constructor(variable, anonymousFunction) {
|
|
12
|
+
this.variable = variable;
|
|
13
|
+
this.anonymousFunction = anonymousFunction;
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
getVariable() {
|
|
17
|
+
return this.variable;
|
|
18
|
+
}
|
|
19
|
+
|
|
20
|
+
getAnonymousFunction() {
|
|
21
|
+
return this.anonymousFunction;
|
|
10
22
|
}
|
|
11
23
|
|
|
12
24
|
getString() {
|
|
@@ -21,7 +33,11 @@ export default domAssigned(class ForEachLoop {
|
|
|
21
33
|
const forEachLoopNode = forEachLoopNodeQuery(stepNode);
|
|
22
34
|
|
|
23
35
|
if (forEachLoopNode !== null) {
|
|
24
|
-
|
|
36
|
+
const { Variable, AnonymousFunction } = dom,
|
|
37
|
+
variable = Variable.fromForEachLoopNode(forEachLoopNode, context),
|
|
38
|
+
anonymousFunction = AnonymousFunction.fromForEachLoopNode(forEachLoopNode, context);
|
|
39
|
+
|
|
40
|
+
forEachLoop = new ForEachLoop(variable, anonymousFunction);
|
|
25
41
|
}
|
|
26
42
|
|
|
27
43
|
return forEachLoop;
|
package/src/dom/query/node.js
CHANGED
|
@@ -1,22 +1,27 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
+
import { Query, Expression } from "occam-query";
|
|
4
|
+
|
|
5
|
+
import dom from "../../dom";
|
|
6
|
+
|
|
3
7
|
import { nodeQuery } from "../../utilities/query";
|
|
4
|
-
import
|
|
8
|
+
import { domAssigned } from "../../dom";
|
|
5
9
|
|
|
6
|
-
const nodeQueryNodeQuery = nodeQuery("/assignment/nodeQuery")
|
|
10
|
+
const nodeQueryNodeQuery = nodeQuery("/assignment/nodeQuery"),
|
|
11
|
+
expressionNodeQuery = nodeQuery("/nodesQuery/expression");
|
|
7
12
|
|
|
8
13
|
export default domAssigned(class NodeQuery {
|
|
9
|
-
getString(variable,
|
|
14
|
+
getString(variable, query) {
|
|
10
15
|
this.variable = variable;
|
|
11
|
-
this.
|
|
16
|
+
this.query = query;
|
|
12
17
|
}
|
|
13
18
|
|
|
14
19
|
getVariable() {
|
|
15
20
|
return this.variable;
|
|
16
21
|
}
|
|
17
22
|
|
|
18
|
-
|
|
19
|
-
return this.
|
|
23
|
+
getQuery() {
|
|
24
|
+
return this.query;
|
|
20
25
|
}
|
|
21
26
|
|
|
22
27
|
static name = "NodeQuery";
|
|
@@ -27,11 +32,13 @@ export default domAssigned(class NodeQuery {
|
|
|
27
32
|
const nodeQueryNode = nodeQueryNodeQuery(assigmentNode);
|
|
28
33
|
|
|
29
34
|
if (nodeQueryNode !== null) {
|
|
30
|
-
const { Variable
|
|
35
|
+
const { Variable } = dom,
|
|
36
|
+
expressionNode = expressionNodeQuery(nodeQueryNode),
|
|
37
|
+
expression = Expression.fromExpressionNode(expressionNode),
|
|
31
38
|
variable = Variable.fromNodeQueryNode(nodeQueryNode, context),
|
|
32
|
-
|
|
39
|
+
query = Query.fromExpression(expression);
|
|
33
40
|
|
|
34
|
-
nodeQuery = new NodeQuery(variable,
|
|
41
|
+
nodeQuery = new NodeQuery(variable, query);
|
|
35
42
|
}
|
|
36
43
|
|
|
37
44
|
return nodeQuery;
|
package/src/dom/query/nodes.js
CHANGED
|
@@ -1,24 +1,27 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
+
import { Query, Expression } from "occam-query";
|
|
4
|
+
|
|
3
5
|
import dom from "../../dom";
|
|
4
6
|
|
|
5
7
|
import { nodeQuery } from "../../utilities/query";
|
|
6
8
|
import { domAssigned } from "../../dom";
|
|
7
9
|
|
|
8
|
-
const nodesQueryNodeQuery = nodeQuery("/assignment/nodesQuery")
|
|
10
|
+
const nodesQueryNodeQuery = nodeQuery("/assignment/nodesQuery"),
|
|
11
|
+
expressionNodeQuery = nodeQuery("/nodesQuery/expression");
|
|
9
12
|
|
|
10
13
|
export default domAssigned(class NodesQuery {
|
|
11
|
-
getString(variable,
|
|
14
|
+
getString(variable, query) {
|
|
12
15
|
this.variable = variable;
|
|
13
|
-
this.
|
|
16
|
+
this.query = query;
|
|
14
17
|
}
|
|
15
18
|
|
|
16
19
|
getVariable() {
|
|
17
20
|
return this.variable;
|
|
18
21
|
}
|
|
19
22
|
|
|
20
|
-
|
|
21
|
-
return this.
|
|
23
|
+
getQuery() {
|
|
24
|
+
return this.query;
|
|
22
25
|
}
|
|
23
26
|
|
|
24
27
|
static name = "NodesQuery";
|
|
@@ -29,11 +32,13 @@ export default domAssigned(class NodesQuery {
|
|
|
29
32
|
const nodesQueryNode = nodesQueryNodeQuery(assigmentNode);
|
|
30
33
|
|
|
31
34
|
if (nodesQueryNode !== null) {
|
|
32
|
-
const { Variable
|
|
35
|
+
const { Variable } = dom,
|
|
36
|
+
expressionNode = expressionNodeQuery(nodesQueryNode),
|
|
37
|
+
expression = Expression.fromExpressionNode(expressionNode),
|
|
33
38
|
variable = Variable.fromNodesQueryNode(nodesQueryNode, context),
|
|
34
|
-
|
|
39
|
+
query = Query.fromExpression(expression);
|
|
35
40
|
|
|
36
|
-
nodesQuery = new NodesQuery(variable,
|
|
41
|
+
nodesQuery = new NodesQuery(variable, query);
|
|
37
42
|
}
|
|
38
43
|
|
|
39
44
|
return nodesQuery;
|
package/src/dom/variable.js
CHANGED
|
@@ -10,6 +10,7 @@ const typeTerminalNodeQuery = nodeQuery("/parameter/@type"),
|
|
|
10
10
|
parameterVariableNodeQuery = nodeQuery("/parameter/variable"),
|
|
11
11
|
nodeQueryVariableNodeQuery = nodeQuery("/nodeQuery/variable"),
|
|
12
12
|
nodesQueryVariableNodeQuery = nodeQuery("/nodesQuery/variable"),
|
|
13
|
+
forEachLoopVariableNodeQuery = nodeQuery("/forEachLoop/variable"),
|
|
13
14
|
variableNameTerminalNodeQuery = nodeQuery("/variable/@name");
|
|
14
15
|
|
|
15
16
|
export default domAssigned(class Variable {
|
|
@@ -56,6 +57,17 @@ export default domAssigned(class Variable {
|
|
|
56
57
|
return variable;
|
|
57
58
|
}
|
|
58
59
|
|
|
60
|
+
static fromForEachLoopNode(forEachLoopLoopNode, context) {
|
|
61
|
+
const forEachLoopVariableNode = forEachLoopVariableNodeQuery(forEachLoopLoopNode),
|
|
62
|
+
variableNode = forEachLoopVariableNode, ///
|
|
63
|
+
type = null,
|
|
64
|
+
name = nameFromVariableNode(variableNode),
|
|
65
|
+
assigment = null,
|
|
66
|
+
variable = new Variable(type, name, assigment);
|
|
67
|
+
|
|
68
|
+
return variable;
|
|
69
|
+
}
|
|
70
|
+
|
|
59
71
|
static fromParameterNode(parameterNode, context) {
|
|
60
72
|
const parameterVariableNode = parameterVariableNodeQuery(parameterNode),
|
|
61
73
|
variableNode = parameterVariableNode, ///
|
package/src/index.js
CHANGED
|
@@ -10,7 +10,6 @@ import Parameter from "./dom/parameter";
|
|
|
10
10
|
import Reference from "./dom/reference";
|
|
11
11
|
import Procedure from "./dom/procedure";
|
|
12
12
|
import NodeQuery from "./dom/query/node";
|
|
13
|
-
import Expression from "./dom/expression";
|
|
14
13
|
import NodesQuery from "./dom/query/nodes";
|
|
15
14
|
import Comparison from "./dom/comparison";
|
|
16
15
|
import Assignment from "./dom/assignment";
|
package/lib/dom/expression.js
DELETED
|
@@ -1,60 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", {
|
|
3
|
-
value: true
|
|
4
|
-
});
|
|
5
|
-
Object.defineProperty(exports, "default", {
|
|
6
|
-
enumerable: true,
|
|
7
|
-
get: function() {
|
|
8
|
-
return _default;
|
|
9
|
-
}
|
|
10
|
-
});
|
|
11
|
-
var _dom = require("../dom");
|
|
12
|
-
function _class_call_check(instance, Constructor) {
|
|
13
|
-
if (!(instance instanceof Constructor)) {
|
|
14
|
-
throw new TypeError("Cannot call a class as a function");
|
|
15
|
-
}
|
|
16
|
-
}
|
|
17
|
-
function _defineProperties(target, props) {
|
|
18
|
-
for(var i = 0; i < props.length; i++){
|
|
19
|
-
var descriptor = props[i];
|
|
20
|
-
descriptor.enumerable = descriptor.enumerable || false;
|
|
21
|
-
descriptor.configurable = true;
|
|
22
|
-
if ("value" in descriptor) descriptor.writable = true;
|
|
23
|
-
Object.defineProperty(target, descriptor.key, descriptor);
|
|
24
|
-
}
|
|
25
|
-
}
|
|
26
|
-
function _create_class(Constructor, protoProps, staticProps) {
|
|
27
|
-
if (protoProps) _defineProperties(Constructor.prototype, protoProps);
|
|
28
|
-
if (staticProps) _defineProperties(Constructor, staticProps);
|
|
29
|
-
return Constructor;
|
|
30
|
-
}
|
|
31
|
-
function _define_property(obj, key, value) {
|
|
32
|
-
if (key in obj) {
|
|
33
|
-
Object.defineProperty(obj, key, {
|
|
34
|
-
value: value,
|
|
35
|
-
enumerable: true,
|
|
36
|
-
configurable: true,
|
|
37
|
-
writable: true
|
|
38
|
-
});
|
|
39
|
-
} else {
|
|
40
|
-
obj[key] = value;
|
|
41
|
-
}
|
|
42
|
-
return obj;
|
|
43
|
-
}
|
|
44
|
-
var _Expression;
|
|
45
|
-
var _default = (0, _dom.domAssigned)((_Expression = /*#__PURE__*/ function() {
|
|
46
|
-
function Expression() {
|
|
47
|
-
_class_call_check(this, Expression);
|
|
48
|
-
}
|
|
49
|
-
_create_class(Expression, null, [
|
|
50
|
-
{
|
|
51
|
-
key: "fromNodesQueryNode",
|
|
52
|
-
value: function fromNodesQueryNode(nodesQueryNode, context) {
|
|
53
|
-
debugger;
|
|
54
|
-
}
|
|
55
|
-
}
|
|
56
|
-
]);
|
|
57
|
-
return Expression;
|
|
58
|
-
}(), _define_property(_Expression, "name", "Expression"), _Expression));
|
|
59
|
-
|
|
60
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9kb20vZXhwcmVzc2lvbi5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IHsgZG9tQXNzaWduZWQgfSBmcm9tIFwiLi4vZG9tXCI7XG5cbmV4cG9ydCBkZWZhdWx0IGRvbUFzc2lnbmVkKGNsYXNzIEV4cHJlc3Npb24ge1xuICBzdGF0aWMgbmFtZSA9IFwiRXhwcmVzc2lvblwiO1xuXG4gIHN0YXRpYyBmcm9tTm9kZXNRdWVyeU5vZGUobm9kZXNRdWVyeU5vZGUsIGNvbnRleHQpIHtcbiAgICBkZWJ1Z2dlclxuICB9XG59KTtcbiJdLCJuYW1lcyI6WyJkb21Bc3NpZ25lZCIsIkV4cHJlc3Npb24iLCJmcm9tTm9kZXNRdWVyeU5vZGUiLCJub2Rlc1F1ZXJ5Tm9kZSIsImNvbnRleHQiLCJuYW1lIl0sIm1hcHBpbmdzIjoiQUFBQTs7OzsrQkFJQTs7O2VBQUE7OzttQkFGNEI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7SUFFNUIsV0FBZUEsSUFBQUEsZ0JBQVcsK0JBQUM7YUFBTUM7Z0NBQUFBOzs7O1lBR3hCQyxLQUFBQTttQkFBUCxTQUFPQSxtQkFBbUJDLGNBQWMsRUFBRUMsT0FBTztnQkFDL0MsUUFBUTtZQUNWOzs7O0tBSkEsOEJBQU9DLFFBQU8ifQ==
|