occam-parsers 23.0.6 → 23.0.8
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/example.js +56 -38
- package/lib/constants.js +17 -4
- package/lib/node/bnf/terminalSymbol.js +10 -2
- package/package.json +2 -2
- package/src/constants.js +2 -0
- package/src/node/bnf/terminalSymbol.js +15 -2
package/lib/constants.js
CHANGED
|
@@ -2,12 +2,25 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", {
|
|
3
3
|
value: true
|
|
4
4
|
});
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
5
|
+
function _export(target, all) {
|
|
6
|
+
for(var name in all)Object.defineProperty(target, name, {
|
|
7
|
+
enumerable: true,
|
|
8
|
+
get: all[name]
|
|
9
|
+
});
|
|
10
|
+
}
|
|
11
|
+
_export(exports, {
|
|
12
|
+
EMPTY_STRING: function() {
|
|
8
13
|
return EMPTY_STRING;
|
|
14
|
+
},
|
|
15
|
+
ESCAPED_BACKSLASH: function() {
|
|
16
|
+
return ESCAPED_BACKSLASH;
|
|
17
|
+
},
|
|
18
|
+
ESCAPED_DOUBLE_QUOTE: function() {
|
|
19
|
+
return ESCAPED_DOUBLE_QUOTE;
|
|
9
20
|
}
|
|
10
21
|
});
|
|
11
22
|
var EMPTY_STRING = "";
|
|
23
|
+
var ESCAPED_BACKSLASH = "\\";
|
|
24
|
+
var ESCAPED_DOUBLE_QUOTE = "\"";
|
|
12
25
|
|
|
13
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
26
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9jb25zdGFudHMuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmV4cG9ydCBjb25zdCBFTVBUWV9TVFJJTkcgPSBcIlwiO1xuZXhwb3J0IGNvbnN0IEVTQ0FQRURfQkFDS1NMQVNIID1cIlxcXFxcIjtcbmV4cG9ydCBjb25zdCBFU0NBUEVEX0RPVUJMRV9RVU9URSA9IFwiXFxcIlwiO1xuIl0sIm5hbWVzIjpbIkVNUFRZX1NUUklORyIsIkVTQ0FQRURfQkFDS1NMQVNIIiwiRVNDQVBFRF9ET1VCTEVfUVVPVEUiXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7Ozs7OztJQUVhQSxZQUFZO2VBQVpBOztJQUNBQyxpQkFBaUI7ZUFBakJBOztJQUNBQyxvQkFBb0I7ZUFBcEJBOzs7QUFGTixJQUFNRixlQUFlO0FBQ3JCLElBQU1DLG9CQUFtQjtBQUN6QixJQUFNQyx1QkFBdUIifQ==
|
|
@@ -11,6 +11,7 @@ Object.defineProperty(exports, "default", {
|
|
|
11
11
|
var _necessary = require("necessary");
|
|
12
12
|
var _nonTerminal = /*#__PURE__*/ _interop_require_default(require("../../node/nonTerminal"));
|
|
13
13
|
var _terminalSymbol = /*#__PURE__*/ _interop_require_default(require("../../part/terminal/terminalSymbol"));
|
|
14
|
+
var _constants = require("../../constants");
|
|
14
15
|
function _assert_this_initialized(self) {
|
|
15
16
|
if (self === void 0) {
|
|
16
17
|
throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
|
|
@@ -136,7 +137,10 @@ var TerminalSymbolBNFNode = /*#__PURE__*/ function(NonTerminalNode) {
|
|
|
136
137
|
{
|
|
137
138
|
key: "getContent",
|
|
138
139
|
value: function getContent() {
|
|
139
|
-
var
|
|
140
|
+
var content;
|
|
141
|
+
var childNodes = this.getChildNodes(), firstChildNode = first(childNodes), terminalNode = firstChildNode, terminalNodeContent = terminalNode.getContent(), matches = terminalNodeContent.match(this.regularExpression), secondMatch = second(matches);
|
|
142
|
+
content = secondMatch; ///
|
|
143
|
+
content = sanitiseContent(content);
|
|
140
144
|
return content;
|
|
141
145
|
}
|
|
142
146
|
}
|
|
@@ -150,5 +154,9 @@ var TerminalSymbolBNFNode = /*#__PURE__*/ function(NonTerminalNode) {
|
|
|
150
154
|
]);
|
|
151
155
|
return TerminalSymbolBNFNode;
|
|
152
156
|
}(_nonTerminal.default);
|
|
157
|
+
function sanitiseContent(content) {
|
|
158
|
+
content = content.replace(/\\\\/g, _constants.ESCAPED_BACKSLASH).replace(/\\"/g, _constants.ESCAPED_DOUBLE_QUOTE);
|
|
159
|
+
return content;
|
|
160
|
+
}
|
|
153
161
|
|
|
154
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
162
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9ub2RlL2JuZi90ZXJtaW5hbFN5bWJvbC5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IHsgYXJyYXlVdGlsaXRpZXMgfSBmcm9tIFwibmVjZXNzYXJ5XCI7XG5cbmltcG9ydCBOb25UZXJtaW5hbE5vZGUgZnJvbSBcIi4uLy4uL25vZGUvbm9uVGVybWluYWxcIjtcbmltcG9ydCBUZXJtaW5hbFN5bWJvbFBhcnQgZnJvbSBcIi4uLy4uL3BhcnQvdGVybWluYWwvdGVybWluYWxTeW1ib2xcIjtcblxuaW1wb3J0IHsgRVNDQVBFRF9CQUNLU0xBU0gsIEVTQ0FQRURfRE9VQkxFX1FVT1RFIH0gZnJvbSBcIi4uLy4uL2NvbnN0YW50c1wiO1xuXG5jb25zdCB7IGZpcnN0LCBzZWNvbmQgfSA9IGFycmF5VXRpbGl0aWVzO1xuXG5leHBvcnQgZGVmYXVsdCBjbGFzcyBUZXJtaW5hbFN5bWJvbEJORk5vZGUgZXh0ZW5kcyBOb25UZXJtaW5hbE5vZGUge1xuICByZWd1bGFyRXhwcmVzc2lvbiA9IC9eXCIoKD86XFxcXC58W15cIlxcXFxdKSopXCIkLztcblxuICBnZW5lcmF0ZVBhcnQobG9va0FoZWFkKSB7XG4gICAgY29uc3QgY29udGVudCA9IHRoaXMuZ2V0Q29udGVudCgpLFxuICAgICAgICAgIHRlcm1pbmFsU3ltYm9sUGFydCA9IFRlcm1pbmFsU3ltYm9sUGFydC5mcm9tQ29udGVudChjb250ZW50KTtcblxuICAgIHJldHVybiB0ZXJtaW5hbFN5bWJvbFBhcnQ7XG4gIH1cblxuICBnZXRDb250ZW50KCkge1xuICAgIGxldCBjb250ZW50O1xuICAgIGNvbnN0IGNoaWxkTm9kZXMgPSB0aGlzLmdldENoaWxkTm9kZXMoKSxcbiAgICAgICAgICBmaXJzdENoaWxkTm9kZSA9IGZpcnN0KGNoaWxkTm9kZXMpLFxuICAgICAgICAgIHRlcm1pbmFsTm9kZSA9IGZpcnN0Q2hpbGROb2RlLCAgLy8vXG4gICAgICAgICAgdGVybWluYWxOb2RlQ29udGVudCA9IHRlcm1pbmFsTm9kZS5nZXRDb250ZW50KCksXG4gICAgICAgICAgbWF0Y2hlcyA9IHRlcm1pbmFsTm9kZUNvbnRlbnQubWF0Y2godGhpcy5yZWd1bGFyRXhwcmVzc2lvbiksXG4gICAgICAgICAgc2Vjb25kTWF0Y2ggPSBzZWNvbmQobWF0Y2hlcyk7XG5cbiAgICBjb250ZW50ID0gc2Vjb25kTWF0Y2g7ICAvLy9cblxuICAgIGNvbnRlbnQgPSBzYW5pdGlzZUNvbnRlbnQoY29udGVudCk7XG5cbiAgICByZXR1cm4gY29udGVudDtcbiAgfVxuXG4gIHN0YXRpYyBmcm9tUnVsZU5hbWVDaGlsZE5vZGVzQW5kT3BhY2l0eShydWxlTmFtZSwgY2hpbGROb2Rlcywgb3BhY2l0eSkgeyByZXR1cm4gTm9uVGVybWluYWxOb2RlLmZyb21SdWxlTmFtZUNoaWxkTm9kZXNBbmRPcGFjaXR5KFRlcm1pbmFsU3ltYm9sQk5GTm9kZSwgcnVsZU5hbWUsIGNoaWxkTm9kZXMsIG9wYWNpdHkpOyB9XG59XG5cbmZ1bmN0aW9uIHNhbml0aXNlQ29udGVudChjb250ZW50KSB7XG4gIGNvbnRlbnQgPSBjb250ZW50XG4gICAgICAgICAgICAgIC5yZXBsYWNlKC9cXFxcXFxcXC9nLCBFU0NBUEVEX0JBQ0tTTEFTSClcbiAgICAgICAgICAgICAgLnJlcGxhY2UoL1xcXFxcIi9nLCBFU0NBUEVEX0RPVUJMRV9RVU9URSk7XG5cbiAgcmV0dXJuIGNvbnRlbnQ7XG59XG4iXSwibmFtZXMiOlsiVGVybWluYWxTeW1ib2xCTkZOb2RlIiwiZmlyc3QiLCJhcnJheVV0aWxpdGllcyIsInNlY29uZCIsInJlZ3VsYXJFeHByZXNzaW9uIiwiZ2VuZXJhdGVQYXJ0IiwibG9va0FoZWFkIiwiY29udGVudCIsImdldENvbnRlbnQiLCJ0ZXJtaW5hbFN5bWJvbFBhcnQiLCJUZXJtaW5hbFN5bWJvbFBhcnQiLCJmcm9tQ29udGVudCIsImNoaWxkTm9kZXMiLCJnZXRDaGlsZE5vZGVzIiwiZmlyc3RDaGlsZE5vZGUiLCJ0ZXJtaW5hbE5vZGUiLCJ0ZXJtaW5hbE5vZGVDb250ZW50IiwibWF0Y2hlcyIsIm1hdGNoIiwic2Vjb25kTWF0Y2giLCJzYW5pdGlzZUNvbnRlbnQiLCJmcm9tUnVsZU5hbWVDaGlsZE5vZGVzQW5kT3BhY2l0eSIsInJ1bGVOYW1lIiwib3BhY2l0eSIsIk5vblRlcm1pbmFsTm9kZSIsInJlcGxhY2UiLCJFU0NBUEVEX0JBQ0tTTEFTSCIsIkVTQ0FQRURfRE9VQkxFX1FVT1RFIl0sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7OztlQVdxQkE7Ozt5QkFUVTtrRUFFSDtxRUFDRzt5QkFFeUI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBRXhELElBQVFDLFFBQWtCQyx5QkFBYyxDQUFoQ0QsT0FBT0UsU0FBV0QseUJBQWMsQ0FBekJDO0FBRUEsSUFBQSxBQUFNSCxzQ0FBRCxBQUFMO2NBQU1BOytCQUFBQTthQUFBQTtnQ0FBQUE7OztRQUNuQkksa0RBQUFBLHFCQUFvQjs7O2tCQURESjs7WUFHbkJLLEtBQUFBO21CQUFBQSxTQUFBQSxhQUFhQyxTQUFTO2dCQUNwQixJQUFNQyxVQUFVLElBQUksQ0FBQ0MsVUFBVSxJQUN6QkMscUJBQXFCQyx1QkFBa0IsQ0FBQ0MsV0FBVyxDQUFDSjtnQkFFMUQsT0FBT0U7WUFDVDs7O1lBRUFELEtBQUFBO21CQUFBQSxTQUFBQTtnQkFDRSxJQUFJRDtnQkFDSixJQUFNSyxhQUFhLElBQUksQ0FBQ0MsYUFBYSxJQUMvQkMsaUJBQWlCYixNQUFNVyxhQUN2QkcsZUFBZUQsZ0JBQ2ZFLHNCQUFzQkQsYUFBYVAsVUFBVSxJQUM3Q1MsVUFBVUQsb0JBQW9CRSxLQUFLLENBQUMsSUFBSSxDQUFDZCxpQkFBaUIsR0FDMURlLGNBQWNoQixPQUFPYztnQkFFM0JWLFVBQVVZLGFBQWMsR0FBRztnQkFFM0JaLFVBQVVhLGdCQUFnQmI7Z0JBRTFCLE9BQU9BO1lBQ1Q7Ozs7WUFFT2MsS0FBQUE7bUJBQVAsU0FBT0EsaUNBQWlDQyxRQUFRLEVBQUVWLFVBQVUsRUFBRVcsT0FBTztnQkFBSSxPQUFPQyxvQkFBZSxDQUFDSCxnQ0FBZ0MsQ0ExQjdHckIsdUJBMEJxSXNCLFVBQVVWLFlBQVlXO1lBQVU7OztXQTFCckt2QjtFQUE4QndCLG9CQUFlO0FBNkJsRSxTQUFTSixnQkFBZ0JiLE9BQU87SUFDOUJBLFVBQVVBLFFBQ0drQixPQUFPLENBQUMsU0FBU0MsNEJBQWlCLEVBQ2xDRCxPQUFPLENBQUMsUUFBUUUsK0JBQW9CO0lBRWpELE9BQU9wQjtBQUNUIn0=
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "occam-parsers",
|
|
3
3
|
"author": "James Smith",
|
|
4
|
-
"version": "23.0.
|
|
4
|
+
"version": "23.0.8",
|
|
5
5
|
"license": "MIT, Anti-996",
|
|
6
6
|
"homepage": "https://github.com/djalbat/occam-parsers",
|
|
7
7
|
"description": "Occam's parsers.",
|
|
@@ -16,7 +16,7 @@
|
|
|
16
16
|
"devDependencies": {
|
|
17
17
|
"@swc/core": "^1.5.6",
|
|
18
18
|
"easy": "^19.0.4",
|
|
19
|
-
"easy-layout": "^6.0.
|
|
19
|
+
"easy-layout": "^6.0.181",
|
|
20
20
|
"easy-with-style": "^3.0.396",
|
|
21
21
|
"esbuild": "^0.9.6",
|
|
22
22
|
"express": "^4.17.1",
|
package/src/constants.js
CHANGED
|
@@ -5,6 +5,8 @@ import { arrayUtilities } from "necessary";
|
|
|
5
5
|
import NonTerminalNode from "../../node/nonTerminal";
|
|
6
6
|
import TerminalSymbolPart from "../../part/terminal/terminalSymbol";
|
|
7
7
|
|
|
8
|
+
import { ESCAPED_BACKSLASH, ESCAPED_DOUBLE_QUOTE } from "../../constants";
|
|
9
|
+
|
|
8
10
|
const { first, second } = arrayUtilities;
|
|
9
11
|
|
|
10
12
|
export default class TerminalSymbolBNFNode extends NonTerminalNode {
|
|
@@ -18,13 +20,17 @@ export default class TerminalSymbolBNFNode extends NonTerminalNode {
|
|
|
18
20
|
}
|
|
19
21
|
|
|
20
22
|
getContent() {
|
|
23
|
+
let content;
|
|
21
24
|
const childNodes = this.getChildNodes(),
|
|
22
25
|
firstChildNode = first(childNodes),
|
|
23
26
|
terminalNode = firstChildNode, ///
|
|
24
27
|
terminalNodeContent = terminalNode.getContent(),
|
|
25
28
|
matches = terminalNodeContent.match(this.regularExpression),
|
|
26
|
-
secondMatch = second(matches)
|
|
27
|
-
|
|
29
|
+
secondMatch = second(matches);
|
|
30
|
+
|
|
31
|
+
content = secondMatch; ///
|
|
32
|
+
|
|
33
|
+
content = sanitiseContent(content);
|
|
28
34
|
|
|
29
35
|
return content;
|
|
30
36
|
}
|
|
@@ -32,3 +38,10 @@ export default class TerminalSymbolBNFNode extends NonTerminalNode {
|
|
|
32
38
|
static fromRuleNameChildNodesAndOpacity(ruleName, childNodes, opacity) { return NonTerminalNode.fromRuleNameChildNodesAndOpacity(TerminalSymbolBNFNode, ruleName, childNodes, opacity); }
|
|
33
39
|
}
|
|
34
40
|
|
|
41
|
+
function sanitiseContent(content) {
|
|
42
|
+
content = content
|
|
43
|
+
.replace(/\\\\/g, ESCAPED_BACKSLASH)
|
|
44
|
+
.replace(/\\"/g, ESCAPED_DOUBLE_QUOTE);
|
|
45
|
+
|
|
46
|
+
return content;
|
|
47
|
+
}
|