yini-parser 1.4.0-beta → 1.4.1-beta
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/CHANGELOG.md +6 -0
- package/README.md +4 -2
- package/dist/YINI.js +1 -1
- package/dist/YINI.js.map +1 -1
- package/dist/core/astBuilder.js +102 -56
- package/dist/core/astBuilder.js.map +1 -1
- package/dist/core/errorDataHandler.d.ts +4 -2
- package/dist/core/errorDataHandler.js +26 -26
- package/dist/core/errorDataHandler.js.map +1 -1
- package/dist/core/internalTypes.d.ts +5 -0
- package/dist/core/internalTypes.js +1 -13
- package/dist/core/internalTypes.js.map +1 -1
- package/dist/core/parsingRules/modeFromRulesMatcher.js +1 -1
- package/dist/core/parsingRules/modeFromRulesMatcher.js.map +1 -1
- package/dist/core/pipeline/errorListeners.js +16 -57
- package/dist/core/pipeline/errorListeners.js.map +1 -1
- package/dist/core/pipeline/pipeline.js +3 -3
- package/dist/core/pipeline/pipeline.js.map +1 -1
- package/dist/dev/main.js +27 -12
- package/dist/dev/main.js.map +1 -1
- package/dist/parsers/extractHeaderParts.js +2 -1
- package/dist/parsers/extractHeaderParts.js.map +1 -1
- package/dist/parsers/parseSectionHeader.js +9 -8
- package/dist/parsers/parseSectionHeader.js.map +1 -1
- package/dist/parsers/parseString.d.ts +3 -0
- package/dist/parsers/parseString.js +18 -10
- package/dist/parsers/parseString.js.map +1 -1
- package/package.json +1 -1
|
@@ -1,5 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.CYiniStringParseError = void 0;
|
|
4
|
+
class CYiniStringParseError extends Error {
|
|
5
|
+
constructor(message) {
|
|
6
|
+
super(message);
|
|
7
|
+
this.name = 'YiniStringParseError';
|
|
8
|
+
}
|
|
9
|
+
}
|
|
10
|
+
exports.CYiniStringParseError = CYiniStringParseError;
|
|
3
11
|
const isHex = (c) => /^[0-9a-fA-F]$/.test(c);
|
|
4
12
|
const isOctal = (c) => /^[0-7]$/.test(c);
|
|
5
13
|
function normalizeHyperWhitespace(input) {
|
|
@@ -13,7 +21,7 @@ const parseClassicEscapes = (input) => {
|
|
|
13
21
|
// Control character enforcement (U+0000–U+001F except tab).
|
|
14
22
|
const code = ch.charCodeAt(0);
|
|
15
23
|
if (code < 0x20 && ch !== '\t') {
|
|
16
|
-
throw new
|
|
24
|
+
throw new CYiniStringParseError(`Unescaped control character U+${code
|
|
17
25
|
.toString(16)
|
|
18
26
|
.padStart(4, '0')}`);
|
|
19
27
|
}
|
|
@@ -23,7 +31,7 @@ const parseClassicEscapes = (input) => {
|
|
|
23
31
|
// Escape sequence.
|
|
24
32
|
const next = input[++i];
|
|
25
33
|
if (!next)
|
|
26
|
-
throw new
|
|
34
|
+
throw new CYiniStringParseError('Invalid escape sequence at end of string');
|
|
27
35
|
switch (next) {
|
|
28
36
|
case '\\':
|
|
29
37
|
result += '\\';
|
|
@@ -67,7 +75,7 @@ const parseClassicEscapes = (input) => {
|
|
|
67
75
|
case 'x': {
|
|
68
76
|
const hex = input.slice(i + 1, i + 3);
|
|
69
77
|
if (hex.length !== 2 || ![...hex].every(isHex)) {
|
|
70
|
-
throw new
|
|
78
|
+
throw new CYiniStringParseError(`Invalid \\x escape`);
|
|
71
79
|
}
|
|
72
80
|
result += String.fromCharCode(parseInt(hex, 16));
|
|
73
81
|
i += 2;
|
|
@@ -76,7 +84,7 @@ const parseClassicEscapes = (input) => {
|
|
|
76
84
|
case 'u': {
|
|
77
85
|
const hex = input.slice(i + 1, i + 5);
|
|
78
86
|
if (hex.length !== 4 || ![...hex].every(isHex)) {
|
|
79
|
-
throw new
|
|
87
|
+
throw new CYiniStringParseError(`Invalid \\u escape`);
|
|
80
88
|
}
|
|
81
89
|
result += String.fromCharCode(parseInt(hex, 16));
|
|
82
90
|
i += 4;
|
|
@@ -85,7 +93,7 @@ const parseClassicEscapes = (input) => {
|
|
|
85
93
|
case 'U': {
|
|
86
94
|
const hex = input.slice(i + 1, i + 9);
|
|
87
95
|
if (hex.length !== 8 || ![...hex].every(isHex)) {
|
|
88
|
-
throw new
|
|
96
|
+
throw new CYiniStringParseError(`Invalid \\U escape`);
|
|
89
97
|
}
|
|
90
98
|
const codePoint = parseInt(hex, 16);
|
|
91
99
|
result += String.fromCodePoint(codePoint);
|
|
@@ -102,21 +110,21 @@ const parseClassicEscapes = (input) => {
|
|
|
102
110
|
j++;
|
|
103
111
|
}
|
|
104
112
|
if (oct.length === 0) {
|
|
105
|
-
throw new
|
|
113
|
+
throw new CYiniStringParseError(`Invalid \\o escape`);
|
|
106
114
|
}
|
|
107
115
|
const value = parseInt(oct, 8);
|
|
108
116
|
if (value > 0o377) {
|
|
109
|
-
throw new
|
|
117
|
+
throw new CYiniStringParseError(`Octal escape out of range`);
|
|
110
118
|
}
|
|
111
119
|
result += String.fromCharCode(value);
|
|
112
120
|
i += oct.length;
|
|
113
121
|
if (j < input.length && /[0-9]/.test(input[j])) {
|
|
114
|
-
throw new
|
|
122
|
+
throw new CYiniStringParseError(`Invalid \\o escape`);
|
|
115
123
|
}
|
|
116
124
|
break;
|
|
117
125
|
}
|
|
118
126
|
default:
|
|
119
|
-
throw new
|
|
127
|
+
throw new CYiniStringParseError(`Invalid escape sequence \\${next}`);
|
|
120
128
|
}
|
|
121
129
|
}
|
|
122
130
|
return result;
|
|
@@ -132,7 +140,7 @@ const parseStringLiteral = ({ strKind, value }) => {
|
|
|
132
140
|
case 'hyper':
|
|
133
141
|
return normalizeHyperWhitespace(value);
|
|
134
142
|
default:
|
|
135
|
-
throw new
|
|
143
|
+
throw new CYiniStringParseError(`Unknown string kind: ${strKind}`);
|
|
136
144
|
}
|
|
137
145
|
};
|
|
138
146
|
exports.default = parseStringLiteral;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parseString.js","sourceRoot":"","sources":["../../src/parsers/parseString.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"parseString.js","sourceRoot":"","sources":["../../src/parsers/parseString.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "yini-parser",
|
|
3
|
-
"version": "1.4.
|
|
3
|
+
"version": "1.4.1-beta",
|
|
4
4
|
"description": "TypeScript/JavaScript parser for YINI — an INI-inspired configuration format with real structure, comments, nested sections and predictable parsing.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"yini",
|