treedoc 0.3.45 → 0.3.47
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/core/CharSource.d.ts +1 -1
- package/lib/core/CharSource.js +3 -3
- package/lib/core/CharSource.js.map +1 -1
- package/lib/core/ParseRuntimeException.d.ts +3 -1
- package/lib/core/ParseRuntimeException.js +3 -1
- package/lib/core/ParseRuntimeException.js.map +1 -1
- package/lib/csv/CSVParser.d.ts +1 -1
- package/lib/csv/CSVParser.js +5 -5
- package/lib/csv/CSVParser.js.map +1 -1
- package/lib/json/TDJSONOption.d.ts +1 -0
- package/lib/json/TDJSONOption.js +2 -1
- package/lib/json/TDJSONOption.js.map +1 -1
- package/lib/json/TDJSONParser.js +15 -6
- package/lib/json/TDJSONParser.js.map +1 -1
- package/lib/json/TDJSONWriter.js +2 -0
- package/lib/json/TDJSONWriter.js.map +1 -1
- package/lib/json/TDJSONWriterOption.d.ts +1 -0
- package/lib/json/TDJSONWriterOption.js +1 -0
- package/lib/json/TDJSONWriterOption.js.map +1 -1
- package/lib/json/__test__/TDJsonWriter.spec.js +36 -21
- package/lib/json/__test__/TDJsonWriter.spec.js.map +1 -1
- package/lib/json/__test__/TestData.js +1 -1
- package/lib/json/__test__/TestData.js.map +1 -1
- package/package.json +1 -1
package/lib/core/CharSource.d.ts
CHANGED
|
@@ -43,5 +43,5 @@ export declare abstract class CharSource {
|
|
|
43
43
|
readQuotedToString(sb: StringBuilder, quote: string): StringBuilder;
|
|
44
44
|
private readOctNumber;
|
|
45
45
|
private isOctDigit;
|
|
46
|
-
createParseRuntimeException(message: string): ParseRuntimeException;
|
|
46
|
+
createParseRuntimeException(message: string, partialObj?: any, cause?: Error): ParseRuntimeException;
|
|
47
47
|
}
|
package/lib/core/CharSource.js
CHANGED
|
@@ -131,7 +131,7 @@ var CharSource = /** @class */ (function () {
|
|
|
131
131
|
var c = this.read();
|
|
132
132
|
if (c === quote)
|
|
133
133
|
break;
|
|
134
|
-
// c should be '/',
|
|
134
|
+
// c should be '/', it's a escape sequence
|
|
135
135
|
c = this.read();
|
|
136
136
|
switch (c) {
|
|
137
137
|
case 'b':
|
|
@@ -186,8 +186,8 @@ var CharSource = /** @class */ (function () {
|
|
|
186
186
|
CharSource.prototype.isOctDigit = function (c) {
|
|
187
187
|
return '0' <= c && c <= '8';
|
|
188
188
|
};
|
|
189
|
-
CharSource.prototype.createParseRuntimeException = function (message) {
|
|
190
|
-
return new ParseRuntimeException_1.ParseRuntimeException(message, this.getBookmark(), this.peekString(10));
|
|
189
|
+
CharSource.prototype.createParseRuntimeException = function (message, partialObj, cause) {
|
|
190
|
+
return new ParseRuntimeException_1.ParseRuntimeException(message, this.getBookmark(), this.peekString(10), cause, partialObj);
|
|
191
191
|
};
|
|
192
192
|
CharSource.MAX_STRING_LEN = 20000;
|
|
193
193
|
// HTML will be converted to \u00a0, that's why it need to be supported here
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CharSource.js","sourceRoot":"","sources":["../../src/core/CharSource.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"CharSource.js","sourceRoot":"","sources":["../../src/core/CharSource.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,8 @@ import { Bookmark } from '../Bookmark';
|
|
|
2
2
|
export declare class ParseRuntimeException extends Error {
|
|
3
3
|
readonly bookmark: Bookmark;
|
|
4
4
|
readonly digest: string;
|
|
5
|
-
|
|
5
|
+
readonly partialObject?: any;
|
|
6
|
+
readonly causedBy?: Error;
|
|
7
|
+
constructor(message: string, bookmark: Bookmark, digest: string, cause?: Error, partialObject?: any);
|
|
6
8
|
getBookmark(): Bookmark;
|
|
7
9
|
}
|
|
@@ -16,12 +16,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
16
16
|
exports.ParseRuntimeException = void 0;
|
|
17
17
|
var ParseRuntimeException = /** @class */ (function (_super) {
|
|
18
18
|
__extends(ParseRuntimeException, _super);
|
|
19
|
-
function ParseRuntimeException(message, bookmark, digest) {
|
|
19
|
+
function ParseRuntimeException(message, bookmark, digest, cause, partialObject) {
|
|
20
20
|
var _this = _super.call(this, message + ', ' + bookmark + ', digest:' + digest) || this;
|
|
21
21
|
_this.bookmark = bookmark;
|
|
22
22
|
_this.digest = digest;
|
|
23
23
|
_this.bookmark = bookmark;
|
|
24
24
|
_this.digest = digest;
|
|
25
|
+
_this.partialObject = partialObject;
|
|
26
|
+
_this.causedBy = cause;
|
|
25
27
|
return _this;
|
|
26
28
|
}
|
|
27
29
|
ParseRuntimeException.prototype.getBookmark = function () {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ParseRuntimeException.js","sourceRoot":"","sources":["../../src/core/ParseRuntimeException.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAEA;IAA2C,yCAAK;
|
|
1
|
+
{"version":3,"file":"ParseRuntimeException.js","sourceRoot":"","sources":["../../src/core/ParseRuntimeException.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAEA;IAA2C,yCAAK;IAI9C,+BACE,OAAe,EACC,QAAkB,EAClB,MAAc,EAC9B,KAAa,EACb,aAAmB;QALrB,YAOE,kBAAM,OAAO,GAAG,IAAI,GAAG,QAAQ,GAAG,WAAW,GAAG,MAAM,CAAC,SAKxD;QAViB,cAAQ,GAAR,QAAQ,CAAU;QAClB,YAAM,GAAN,MAAM,CAAQ;QAK9B,KAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,KAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,KAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,KAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;;IACxB,CAAC;IAEM,2CAAW,GAAlB;QACE,OAAO,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;IAC/B,CAAC;IACH,4BAAC;AAAD,CAAC,AArBD,CAA2C,KAAK,GAqB/C;AArBY,sDAAqB"}
|
package/lib/csv/CSVParser.d.ts
CHANGED
|
@@ -9,5 +9,5 @@ export declare class CSVParser {
|
|
|
9
9
|
private readRecordToTDNode;
|
|
10
10
|
readNonEmptyRecord(src: CharSource, opt: CSVOption): any[];
|
|
11
11
|
readRecord(src: CharSource, opt: CSVOption): any[];
|
|
12
|
-
readField(src: CharSource, opt: CSVOption): ValueType;
|
|
12
|
+
readField(src: CharSource, opt: CSVOption, row?: TDNode): ValueType;
|
|
13
13
|
}
|
package/lib/csv/CSVParser.js
CHANGED
|
@@ -44,11 +44,11 @@ var CSVParser = /** @class */ (function () {
|
|
|
44
44
|
if (!src.skipChars(SPACE_CHARS))
|
|
45
45
|
break;
|
|
46
46
|
var start = src.getBookmark();
|
|
47
|
-
var val = this.readField(src, opt);
|
|
47
|
+
var val = this.readField(src, opt, row);
|
|
48
48
|
var key = void 0;
|
|
49
49
|
if (fields != null) {
|
|
50
50
|
if (i >= fields.length)
|
|
51
|
-
throw src.createParseRuntimeException("The row has more columns than headers");
|
|
51
|
+
throw src.createParseRuntimeException("The row has more columns than headers", row);
|
|
52
52
|
key = fields[i++];
|
|
53
53
|
if (key === TDNode_1.TDNode.COLUMN_KEY) {
|
|
54
54
|
row.setKey(val.toString());
|
|
@@ -77,13 +77,13 @@ var CSVParser = /** @class */ (function () {
|
|
|
77
77
|
while (!src.isEof() && src.peek() !== opt.recordSep) {
|
|
78
78
|
if (!src.skipChars(SPACE_CHARS))
|
|
79
79
|
break;
|
|
80
|
-
result.push(this.readField(src, opt));
|
|
80
|
+
result.push(this.readField(src, opt, undefined));
|
|
81
81
|
}
|
|
82
82
|
if (!src.isEof())
|
|
83
83
|
src.read(); // Skip the recordSep
|
|
84
84
|
return result;
|
|
85
85
|
};
|
|
86
|
-
CSVParser.prototype.readField = function (src, opt) {
|
|
86
|
+
CSVParser.prototype.readField = function (src, opt, row) {
|
|
87
87
|
var sb = new StringBuilder_1.StringBuilder();
|
|
88
88
|
if (src.isEof())
|
|
89
89
|
return sb.toString();
|
|
@@ -101,7 +101,7 @@ var CSVParser = /** @class */ (function () {
|
|
|
101
101
|
var col = src.bookmark.col;
|
|
102
102
|
src.readUntilTerminatorToString(sb, opt.quoteChar);
|
|
103
103
|
if (src.isEof())
|
|
104
|
-
throw src.createParseRuntimeException("Can't find matching quote at position:" + pos + ";line:" + line + ";col:" + col);
|
|
104
|
+
throw src.createParseRuntimeException("Can't find matching quote at position:" + pos + ";line:" + line + ";col:" + col, row);
|
|
105
105
|
src.skip();
|
|
106
106
|
if (src.isEof())
|
|
107
107
|
break;
|
package/lib/csv/CSVParser.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CSVParser.js","sourceRoot":"","sources":["../../src/csv/CSVParser.ts"],"names":[],"mappings":";;;AAAA,oCAA0D;AAC1D,yCAAwC;AAExC,uDAAsD;AACtD,sCAAqC;AACrC,wBAAsC;AACtC,+CAA8C;AAG9C,IAAM,WAAW,GAAG,KAAK,CAAC;AAE1B;IAAA;IAwHA,CAAC;IArHe,aAAG,GAAjB,cAAsB,OAAO,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC;IAEpC,eAAK,GAAnB,UAAoB,GAAwB,EAAE,GAAc;QAC1D,OAAO,SAAS,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IACzC,CAAC;IAEM,yBAAK,GAAZ,UAAa,GAAwB,EAAE,GAAgC,EAAE,IAA+B;QAAjE,oBAAA,EAAA,UAAqB,qBAAS,EAAE;QAAE,qBAAA,EAAA,OAAO,IAAI,iBAAO,CAAC,MAAM,CAAC,CAAC,IAAI;QACtG,IAAI,OAAO,GAAG,KAAK,QAAQ;YACzB,GAAG,GAAG,IAAI,oBAAgB,CAAC,GAAG,CAAC,CAAC;QAClC,IAAI,MAA4B,CAAC;QACjC,IAAI,CAAC,OAAO,CAAC,mBAAU,CAAC,KAAK,CAAC,CAAC;QAC/B,IAAI,GAAG,CAAC,aAAa,EAAE;YACrB,MAAM,GAAG,IAAI,CAAC,kBAAkB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC,UAAA,CAAC,IAAI,OAAA,EAAE,GAAG,CAAC,EAAN,CAAM,CAAC,CAAC;YAC5D,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;gBACrB,OAAO,IAAI,CAAC;YACd,IAAI,MAAM,CAAC,CAAC,CAAC,KAAK,eAAM,CAAC,UAAU;gBACjC,IAAI,CAAC,OAAO,CAAC,mBAAU,CAAC,GAAG,CAAC,CAAC;SAChC;QAED,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE;YACnB,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,WAAW,CAAC;gBAC7B,MAAM;YACR,IAAI,CAAC,kBAAkB,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;SACjD;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,sCAAkB,GAA1B,UAA2B,GAAe,EAAE,GAAc,EAAE,IAAY,EAAE,MAAiB;QACzF,IAAM,GAAG,GAAG,IAAI,eAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,MAAM,IAAI,IAAI,CAAC,CAAC,CAAC,mBAAU,CAAC,KAAK,CAAA,CAAC,CAAC,mBAAU,CAAC,GAAG,CAAC,CAAC;QAC5F,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC;QAChC,IAAI,CAAC,GAAG,CAAC,CAAC;QACV,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,GAAG,CAAC,IAAI,EAAE,KAAK,GAAG,CAAC,SAAS,EAAE;YACnD,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,WAAW,CAAC;gBAC7B,MAAM;YACR,IAAM,KAAK,GAAG,GAAG,CAAC,WAAW,EAAE,CAAC;YAChC,IAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"CSVParser.js","sourceRoot":"","sources":["../../src/csv/CSVParser.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,6 +7,7 @@ export declare class TDJSONOption {
|
|
|
7
7
|
deliminatorObjectEnd: string;
|
|
8
8
|
deliminatorArrayStart: string;
|
|
9
9
|
deliminatorArrayEnd: string;
|
|
10
|
+
commentStartChar: string;
|
|
10
11
|
/**
|
|
11
12
|
* QuoteChar can have multiple value. When multiple value is provided, it will dynamically choose the best one
|
|
12
13
|
* to minimize the escape. For example "\"\'", if the string contains a lot of single quote, it will use double quote.
|
package/lib/json/TDJSONOption.js
CHANGED
|
@@ -11,6 +11,7 @@ var TDJSONOption = /** @class */ (function () {
|
|
|
11
11
|
this.deliminatorObjectEnd = "}";
|
|
12
12
|
this.deliminatorArrayStart = "[";
|
|
13
13
|
this.deliminatorArrayEnd = "]";
|
|
14
|
+
this.commentStartChar = "/#";
|
|
14
15
|
/**
|
|
15
16
|
* QuoteChar can have multiple value. When multiple value is provided, it will dynamically choose the best one
|
|
16
17
|
* to minimize the escape. For example "\"\'", if the string contains a lot of single quote, it will use double quote.
|
|
@@ -47,7 +48,7 @@ var TDJSONOption = /** @class */ (function () {
|
|
|
47
48
|
this._termValueInMap = this._termValue + this.deliminatorObjectEnd + this.deliminatorArrayEnd; // It's possible object end is omitted for path compression. e.g [a:b:c]
|
|
48
49
|
this._termValueInMap = this._termValue + this.deliminatorObjectEnd;
|
|
49
50
|
this._termValueInArray = this._termValue + this.deliminatorArrayEnd;
|
|
50
|
-
this._quoteNeededChars = this._termValue + this._termKey + this.deliminatorObjectEnd + this.deliminatorObjectEnd + this.deliminatorArrayEnd + this.deliminatorKey + this.deliminatorValue + this.quoteChars;
|
|
51
|
+
this._quoteNeededChars = this._termValue + this._termKey + this.deliminatorObjectEnd + this.deliminatorObjectEnd + this.deliminatorArrayEnd + this.deliminatorKey + this.deliminatorValue + this.quoteChars + this.commentStartChar;
|
|
51
52
|
};
|
|
52
53
|
return TDJSONOption;
|
|
53
54
|
}());
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TDJSONOption.js","sourceRoot":"","sources":["../../src/json/TDJSONOption.ts"],"names":[],"mappings":";;;AAEA;IAAA;QACE,WAAM,GAAG,KAAK,CAAC;QACf,aAAQ,GAAG,OAAO,CAAC;QACnB,mBAAc,GAAG,GAAG,CAAC;QACrB,qBAAgB,GAAG,GAAG,CAAC;QACvB,2BAAsB,GAAG,GAAG,CAAC;QAC7B,yBAAoB,GAAG,GAAG,CAAC;QAC3B,0BAAqB,GAAG,GAAG,CAAC;QAC5B,wBAAmB,GAAG,GAAG,CAAC;QAC1B;;;WAGG;QACI,eAAU,GAAG,GAAG,CAAC;QAGtB,gCAAgC;QAChC,eAAU,GAAG,EAAE,CAAC;QAChB,oBAAe,GAAG,EAAE,CAAC;QACrB,sBAAiB,GAAG,EAAE,CAAC;QACvB,aAAQ,GAAG,EAAE,CAAC;QACd,gDAAgD;QAChD,sBAAiB,GAAG,EAAE,CAAC;QACvB,mBAAc,GAAa,EAAE,CAAC;QAC9B,iBAAY,GAAa,EAAE,CAAC;IAwBhC,CAAC;IAlCQ,oCAAa,GAApB,UAAqB,UAAkB,IAAI,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC,CAAC,OAAO,IAAI,CAAC,CAAC,CAAC;IAYrF,iCAAU,GAAV;QACE,IAAI,CAAC,UAAU,GAAG,MAAM,GAAG,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,sBAAsB,CAAC,CAAE,4FAA4F;QAC3K,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,sBAAsB,GAAG,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC,qBAAqB,CAAC;QACrG,IAAI,CAAC,cAAc,GAAG,EAAE,CAAC;QACzB,IAAI,CAAC,YAAY,GAAG,EAAE,CAAC;QACvB,IAAI,IAAI,CAAC,gBAAgB,CAAC,MAAM,KAAK,CAAC,EAAE,EAAG,8DAA8D;YACvG,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,gBAAgB,CAAC;YACzC,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,gBAAgB,CAAC;SACxC;aAAM;YACL,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;YAChD,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;SAC/C;QACD,IAAI,IAAI,CAAC,cAAc,CAAC,MAAM,KAAK,CAAC;YAClC,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,cAAc,CAAC;;YAErC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAE9C,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC,mBAAmB,CAAC,CAAC,wEAAwE;QACvK,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,oBAAoB,CAAC;QACnE,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,mBAAmB,CAAC;QACpE,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC,mBAAmB,GAAG,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"TDJSONOption.js","sourceRoot":"","sources":["../../src/json/TDJSONOption.ts"],"names":[],"mappings":";;;AAEA;IAAA;QACE,WAAM,GAAG,KAAK,CAAC;QACf,aAAQ,GAAG,OAAO,CAAC;QACnB,mBAAc,GAAG,GAAG,CAAC;QACrB,qBAAgB,GAAG,GAAG,CAAC;QACvB,2BAAsB,GAAG,GAAG,CAAC;QAC7B,yBAAoB,GAAG,GAAG,CAAC;QAC3B,0BAAqB,GAAG,GAAG,CAAC;QAC5B,wBAAmB,GAAG,GAAG,CAAC;QAC1B,qBAAgB,GAAG,IAAI,CAAC;QAExB;;;WAGG;QACI,eAAU,GAAG,GAAG,CAAC;QAGtB,gCAAgC;QAChC,eAAU,GAAG,EAAE,CAAC;QAChB,oBAAe,GAAG,EAAE,CAAC;QACrB,sBAAiB,GAAG,EAAE,CAAC;QACvB,aAAQ,GAAG,EAAE,CAAC;QACd,gDAAgD;QAChD,sBAAiB,GAAG,EAAE,CAAC;QACvB,mBAAc,GAAa,EAAE,CAAC;QAC9B,iBAAY,GAAa,EAAE,CAAC;IAwBhC,CAAC;IAlCQ,oCAAa,GAApB,UAAqB,UAAkB,IAAI,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC,CAAC,OAAO,IAAI,CAAC,CAAC,CAAC;IAYrF,iCAAU,GAAV;QACE,IAAI,CAAC,UAAU,GAAG,MAAM,GAAG,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,sBAAsB,CAAC,CAAE,4FAA4F;QAC3K,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,sBAAsB,GAAG,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC,qBAAqB,CAAC;QACrG,IAAI,CAAC,cAAc,GAAG,EAAE,CAAC;QACzB,IAAI,CAAC,YAAY,GAAG,EAAE,CAAC;QACvB,IAAI,IAAI,CAAC,gBAAgB,CAAC,MAAM,KAAK,CAAC,EAAE,EAAG,8DAA8D;YACvG,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,gBAAgB,CAAC;YACzC,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,gBAAgB,CAAC;SACxC;aAAM;YACL,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;YAChD,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;SAC/C;QACD,IAAI,IAAI,CAAC,cAAc,CAAC,MAAM,KAAK,CAAC;YAClC,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,cAAc,CAAC;;YAErC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAE9C,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC,mBAAmB,CAAC,CAAC,wEAAwE;QACvK,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,oBAAoB,CAAC;QACnE,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,mBAAmB,CAAC;QACpE,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC,mBAAmB,GAAG,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,gBAAgB,CAAC;IACtO,CAAC;IACL,mBAAC;AAAD,CAAC,AAlDD,IAkDC;AAlDY,oCAAY"}
|
package/lib/json/TDJSONParser.js
CHANGED
|
@@ -3,6 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.TDJSONParser = void 0;
|
|
4
4
|
var TDNode_1 = require("../TDNode");
|
|
5
5
|
var TDJSONParserOption_1 = require("./TDJSONParserOption");
|
|
6
|
+
var EOFRuntimeException_1 = require("../core/EOFRuntimeException");
|
|
7
|
+
var ParseRuntimeException_1 = require("../core/ParseRuntimeException");
|
|
6
8
|
var StringCharSource_1 = require("../core/StringCharSource");
|
|
7
9
|
var StringBuilder_1 = require("../core/StringBuilder");
|
|
8
10
|
var TreeDoc_1 = require("../TreeDoc");
|
|
@@ -61,8 +63,15 @@ var TDJSONParser = /** @class */ (function () {
|
|
|
61
63
|
if (c === '"' || c === "'" || c === '`') {
|
|
62
64
|
src.read();
|
|
63
65
|
var sb = new StringBuilder_1.StringBuilder();
|
|
64
|
-
|
|
65
|
-
|
|
66
|
+
try {
|
|
67
|
+
src.readQuotedToString(sb, c);
|
|
68
|
+
this.readContinuousString(src, sb);
|
|
69
|
+
}
|
|
70
|
+
catch (e) {
|
|
71
|
+
if (e instanceof EOFRuntimeException_1.EOFRuntimeException || e instanceof ParseRuntimeException_1.ParseRuntimeException)
|
|
72
|
+
throw src.createParseRuntimeException("Error read quoted string", node.setValue(sb.toString()), e);
|
|
73
|
+
throw e;
|
|
74
|
+
}
|
|
66
75
|
return node.setValue(sb.toString());
|
|
67
76
|
}
|
|
68
77
|
if (isRoot && opt.defaultRootType === TDNode_1.TDNodeType.SIMPLE) {
|
|
@@ -138,7 +147,7 @@ var TDJSONParser = /** @class */ (function () {
|
|
|
138
147
|
var c = TDJSONParser.skipSpaceAndComments(src);
|
|
139
148
|
if (c === EOF) {
|
|
140
149
|
if (withStartBracket)
|
|
141
|
-
throw src.createParseRuntimeException("EOF while expecting matching '}' with '{' at " + node.start);
|
|
150
|
+
throw src.createParseRuntimeException("EOF while expecting matching '}' with '{' at " + node.start, node);
|
|
142
151
|
break;
|
|
143
152
|
}
|
|
144
153
|
if (this.contains(opt.deliminatorObjectEnd, c)) {
|
|
@@ -163,12 +172,12 @@ var TDJSONParser = /** @class */ (function () {
|
|
|
163
172
|
&& !this.contains(opt.deliminatorArrayStart, c)
|
|
164
173
|
&& !this.contains(opt.deliminatorValue, c)
|
|
165
174
|
&& !this.contains(opt.deliminatorObjectEnd, c))
|
|
166
|
-
throw src.createParseRuntimeException("No '" + opt.deliminatorKey + "' after key:" + key);
|
|
175
|
+
throw src.createParseRuntimeException("No '" + opt.deliminatorKey + "' after key:" + key, node);
|
|
167
176
|
}
|
|
168
177
|
else {
|
|
169
178
|
key = src.readUntilTerminator(opt._termKey, opt._termKeyStrs, 1, Number.MAX_VALUE).trim();
|
|
170
179
|
if (src.isEof())
|
|
171
|
-
throw src.createParseRuntimeException("No '" + opt.deliminatorKey + "' after key:" + key);
|
|
180
|
+
throw src.createParseRuntimeException("No '" + opt.deliminatorKey + "' after key:" + key, node);
|
|
172
181
|
c = src.peek();
|
|
173
182
|
}
|
|
174
183
|
if (src.startsWith(opt.deliminatorKey))
|
|
@@ -202,7 +211,7 @@ var TDJSONParser = /** @class */ (function () {
|
|
|
202
211
|
var c = TDJSONParser.skipSpaceAndComments(src);
|
|
203
212
|
if (c === EOF) {
|
|
204
213
|
if (withStartBracket)
|
|
205
|
-
throw src.createParseRuntimeException("EOF while expecting matching ']' with '[' at " + node.start);
|
|
214
|
+
throw src.createParseRuntimeException("EOF while expecting matching ']' with '[' at " + node.start, node);
|
|
206
215
|
break;
|
|
207
216
|
}
|
|
208
217
|
if (this.contains(opt.deliminatorArrayEnd, c)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TDJSONParser.js","sourceRoot":"","sources":["../../src/json/TDJSONParser.ts"],"names":[],"mappings":";;;AAAA,oCAA+C;AAC/C,2DAA0D;AAE1D,6DAA4D;AAC5D,uDAAsD;AACtD,sCAAqC;AACrC,+CAA8C;AAE9C,wBAA8B;AAE9B,IAAM,GAAG,GAAG,QAAQ,CAAC;AAErB;IAAA;
|
|
1
|
+
{"version":3,"file":"TDJSONParser.js","sourceRoot":"","sources":["../../src/json/TDJSONParser.ts"],"names":[],"mappings":";;;AAAA,oCAA+C;AAC/C,2DAA0D;AAE1D,mEAAkE;AAClE,uEAAsE;AACtE,6DAA4D;AAC5D,uDAAsD;AACtD,sCAAqC;AACrC,+CAA8C;AAE9C,wBAA8B;AAE9B,IAAM,GAAG,GAAG,QAAQ,CAAC;AAErB;IAAA;IA6OA,CAAC;IA3Oe,gBAAG,GAAjB;QACE,OAAO,YAAY,CAAC,QAAQ,CAAC;IAC/B,CAAC;IAED,kHAAkH;IAC3G,+BAAQ,GAAf,UAAgB,GAAwB,EACpC,MAAuE,EACvE,IAA2C,EAAE,MAAa;QAD1D,uBAAA,EAAA,aAAmD,uCAAkB,EAAE;QACvE,qBAAA,EAAA,OAAO,IAAI,iBAAO,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI;QAAE,uBAAA,EAAA,aAAa;QAC5D,IAAM,GAAG,GAAG,MAAM,YAAY,uCAAkB,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,YAAQ,CAAC,SAAS,CAAC,IAAI,uCAAkB,EAAE,EAAE,MAAM,CAAC,CAAC;QACjH,GAAG,CAAC,kBAAkB,CAAC,mBAAU,CAAC,GAAG,CAAC,CAAC;QAEvC,IAAI,OAAO,GAAG,KAAK,QAAQ;YACzB,GAAG,GAAG,IAAI,mCAAgB,CAAC,GAAG,CAAC,CAAC;QAElC,IAAM,GAAG,GAAG,iBAAO,CAAC,OAAO,EAAE,CAAC;QAC9B,IAAI,KAAK,GAAG,CAAC,CAAC;QACd,OAAM,GAAG,CAAC,6BAA6B,EAAE;YACvC,YAAY,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC,EAAE,GAAG,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;QAC/E,OAAO,GAAG,CAAC,IAAI,CAAC;IAClB,CAAC;IAEO,+BAAQ,GAAhB,UAAiB,GAAW,EAAE,CAAS;QACrC,OAAO,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IAC7B,CAAC;IAEM,4BAAK,GAAZ,UAAa,GAAwB,EACjC,MAAuE,EACvE,IAA2C,EAAE,MAAa;QAD1D,uBAAA,EAAA,aAAmD,uCAAkB,EAAE;QACvE,qBAAA,EAAA,OAAO,IAAI,iBAAO,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI;QAAE,uBAAA,EAAA,aAAa;QAC5D,IAAM,GAAG,GAAG,MAAM,YAAY,uCAAkB,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,YAAQ,CAAC,SAAS,CAAC,IAAI,uCAAkB,EAAE,EAAE,MAAM,CAAC,CAAC;QACjH,GAAG,CAAC,UAAU,EAAE,CAAC;QAEjB,IAAI,OAAO,GAAG,KAAK,QAAQ;YACzB,GAAG,GAAG,IAAI,mCAAgB,CAAC,GAAG,CAAC,CAAC;QAElC,IAAM,CAAC,GAAG,YAAY,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC;QACjD,IAAI,CAAC,KAAK,GAAG;YACX,OAAO,IAAI,CAAC;QAEd,IAAI;YACF,IAAI,CAAC,KAAK,GAAG,GAAG,CAAC,WAAW,EAAE,CAAC;YAE/B,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,sBAAsB,EAAE,CAAC,CAAC;gBAC9C,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;YAE7C,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,qBAAqB,EAAE,CAAC,CAAC;gBAC7C,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;YAE/C,IAAI,IAAI,CAAC,MAAM,EAAE,IAAI,GAAG,CAAC,eAAe,KAAK,SAAS,EAAE;gBACtD,QAAQ,GAAG,CAAC,eAAe,EAAE;oBAC3B,KAAK,mBAAU,CAAC,GAAG;wBACjB,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;oBAC9C,KAAK,mBAAU,CAAC,KAAK;wBACnB,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;iBACjD;aACF;YAED,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,GAAG,EAAE;gBACvC,GAAG,CAAC,IAAI,EAAE,CAAC;gBACX,IAAM,EAAE,GAAG,IAAI,6BAAa,EAAE,CAAC;gBAC/B,IAAI;oBACF,GAAG,CAAC,kBAAkB,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;oBAC9B,IAAI,CAAC,oBAAoB,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;iBACpC;gBAAC,OAAO,CAAC,EAAE;oBACV,IAAI,CAAC,YAAY,yCAAmB,IAAI,CAAC,YAAY,6CAAqB;wBACxE,MAAM,GAAG,CAAC,2BAA2B,CAAC,0BAA0B,EAAE,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;oBACrG,MAAM,CAAC,CAAC;iBACT;gBACD,OAAO,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC;aACrC;YAED,IAAI,MAAM,IAAI,GAAG,CAAC,eAAe,KAAK,mBAAU,CAAC,MAAM,EAAE;gBACvD,OAAO,IAAI,CAAC,QAAQ,CAAC,qBAAS,CAAC,cAAc,CAAC,GAAG,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;aACjF;YAED,IAAI,IAAI,GAAG,GAAG,CAAC,UAAU,CAAC;YAC1B,IAAI,IAAI,CAAC,MAAM,IAAI,IAAI;gBACrB,0CAA0C;gBAC1C,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,mBAAU,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC,CAAC,GAAG,CAAC,eAAe,CAAC;YAE7F,IAAM,GAAG,GAAG,GAAG,CAAC,mBAAmB,CAAC,IAAI,EAAE,GAAG,CAAC,cAAc,CAAC,CAAC,IAAI,EAAE,CAAC;YACrE,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,cAAc,EAAE,GAAG,CAAC,IAAI,EAAE,CAAC,EAAE,EAAG,4DAA4D;gBAChI,GAAG,CAAC,IAAI,EAAE,CAAC;gBACX,IAAI,CAAC,OAAO,CAAC,mBAAU,CAAC,GAAG,CAAC,CAAC;gBAC7B,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,KAAK,CAAC,CAAC;gBACnD,OAAO,IAAI,CAAC;aACb;YAED,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,sBAAsB,EAAE,GAAG,CAAC,IAAI,EAAE,CAAC,EAAE;gBACzE,8EAA8E;gBAC9E,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;gBAC7C,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;aAC5C;YAED,iBAAiB;YACjB,IAAI,CAAC,QAAQ,CAAC,qBAAS,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC;YAC7C,OAAO,IAAI,CAAC;SAEb;gBAAS;YACR,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC,WAAW,EAAE,CAAC;SAC9B;IACH,CAAC;IAEO,2CAAoB,GAA5B,UAA6B,GAAe,EAAE,EAAiB;QAC7D,IAAI,CAAC,CAAC;QACN,OAAO,CAAC,CAAC,GAAG,YAAY,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC,KAAK,GAAG,EAAE;YAC3D,IAAI,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC;gBACvB,MAAM;YACR,GAAG,CAAC,IAAI,EAAE,CAAC;YACX,GAAG,CAAC,kBAAkB,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;SAC/B;IACH,CAAC;IAED;;OAEG;IACW,iCAAoB,GAAlC,UAAmC,GAAe;QAChD,OAAO,GAAG,CAAC,oBAAoB,EAAE,EAAE;YACjC,IAAM,CAAC,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC;YACrB,IAAI,CAAC,KAAK,GAAG,EAAE;gBACb,IAAI,GAAG,CAAC,mBAAmB,CAAC,IAAI,CAAC;oBAC/B,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBACd,SAAS;aACV;YAED,IAAI,CAAC,KAAK,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC;gBAAE,OAAO,CAAC,CAAC;YACxC,IAAM,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACvB,QAAQ,EAAE,EAAE;gBACV,KAAK,GAAG,EAAE,gBAAgB;oBACxB,IAAI,GAAG,CAAC,mBAAmB,CAAC,IAAI,CAAC;wBAC/B,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;oBACd,MAAM;gBACR,KAAK,GAAG,EAAE,iBAAiB;oBACzB,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;oBACZ,GAAG,CAAC,cAAc,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;oBAC/B,MAAM;gBACR;oBACE,OAAO,EAAE,CAAC;aACb;SACF;QACD,OAAO,GAAG,CAAC;IACb,CAAC;IAEM,+BAAQ,GAAf,UAAgB,GAAe,EAAE,GAAuB,EAAE,IAAY,EAAE,gBAAyB;QAC/F,IAAI,CAAC,IAAI,GAAG,mBAAU,CAAC,GAAG,CAAC;QAC3B,IAAI,gBAAgB;YAClB,GAAG,CAAC,IAAI,EAAE,CAAC;QAEb,KAAK,IAAI,CAAC,GAAG,CAAC,IAAM;YAClB,IAAI,CAAC,GAAG,YAAY,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC;YAC/C,IAAI,CAAC,KAAK,GAAG,EAAE;gBACb,IAAI,gBAAgB;oBAClB,MAAM,GAAG,CAAC,2BAA2B,CAAC,+CAA+C,GAAG,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;gBAC5G,MAAM;aACP;YAED,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,oBAAoB,EAAE,CAAC,CAAC,EAAE;gBAC9C,GAAG,CAAC,IAAI,EAAE,CAAC;gBACX,MAAM;aACP;YAED,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,gBAAgB,CAAC,EAAE,EAAE,SAAS;gBACnD,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;gBACtC,SAAS;aACV;YAED,IAAI,GAAG,SAAA,CAAC;YACR,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,GAAG,EAAE;gBACvC,GAAG,CAAC,IAAI,EAAE,CAAC;gBACX,GAAG,GAAG,GAAG,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC;gBAC9B,CAAC,GAAG,YAAY,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC;gBAC3C,iBAAiB;gBACjB,WAAW;gBACnB,uBAAuB;gBACvB,kBAAkB;gBACV,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,cAAc,CAAC;uBAChC,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,sBAAsB,EAAE,CAAC,CAAC;uBAC7C,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,qBAAqB,EAAE,CAAC,CAAC;uBAC5C,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC,CAAC;uBACvC,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,oBAAoB,EAAE,CAAC,CAAC;oBAChD,MAAM,GAAG,CAAC,2BAA2B,CAAC,SAAO,GAAG,CAAC,cAAc,oBAAe,GAAK,EAAE,IAAI,CAAC,CAAC;aAC9F;iBAAM;gBACL,GAAG,GAAG,GAAG,CAAC,mBAAmB,CAAC,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,YAAY,EAAE,CAAC,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC,IAAI,EAAE,CAAC;gBAC1F,IAAI,GAAG,CAAC,KAAK,EAAE;oBACb,MAAM,GAAG,CAAC,2BAA2B,CAAC,SAAO,GAAG,CAAC,cAAc,oBAAe,GAAK,EAAE,IAAI,CAAC,CAAC;gBAC7F,CAAC,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC;aAChB;YACD,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,cAAc,CAAC;gBACpC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;YAEtC,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,gBAAgB,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,oBAAoB,EAAE,CAAC,CAAC,EAAG,6DAA6D;gBACpJ,IAAI,CAAC,WAAW,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;iBACpC;gBACH,IAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,KAAK,CAAC,CAAC;gBACrE,IAAI,GAAG,CAAC,MAAM,KAAK,GAAG,IAAI,SAAS,CAAC,IAAI,KAAK,mBAAU,CAAC,MAAM,EAAE;oBAC9D,IAAI,EAAE,GAAG,SAAS,CAAC,KAAK,GAAG,EAAE,CAAC;oBAC9B,IAAI,GAAG,CAAC,KAAK,KAAK,SAAS,EAAE;wBAC3B,EAAE,IAAI,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC;wBACtB,SAAS,CAAC,KAAK,GAAG,EAAE,CAAC;qBACtB;oBACD,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC;iBAC3B;qBAAM,IAAI,eAAM,CAAC,OAAO,KAAK,GAAG,IAAI,SAAS,CAAC,IAAI,KAAK,mBAAU,CAAC,MAAM,EAAE;oBACzE,IAAI,GAAG,CAAC,KAAK,KAAK,SAAS;wBACzB,SAAS,CAAC,KAAK,IAAI,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC;iBACtC;aACF;YACD,CAAC,EAAE,CAAC;SACL;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,iCAAU,GAAlB,UAAmB,GAAe,EAAE,GAAuB,EAAE,IAAY,EAAE,gBAAyB;QAClG,IAAI,CAAC,IAAI,GAAG,mBAAU,CAAC,KAAK,CAAC;QAC7B,IAAI,gBAAgB;YAClB,GAAG,CAAC,IAAI,EAAE,CAAC;QACb,OAAO,IAAI,EAAE;YACX,IAAI,CAAC,GAAG,YAAY,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC;YAC/C,IAAI,CAAC,KAAK,GAAG,EAAE;gBACb,IAAI,gBAAgB;oBAClB,MAAM,GAAG,CAAC,2BAA2B,CAAC,+CAA+C,GAAG,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;gBAC5G,MAAM;aACP;YAED,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,mBAAmB,EAAE,CAAC,CAAC,EAAE;gBAC7C,GAAG,CAAC,IAAI,EAAE,CAAC;gBACX,MAAM;aACP;YAED,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,WAAW,EAAE,EAAE,KAAK,CAAC,CAAC;YAChD,CAAC,GAAG,YAAY,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC;YAC3C,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,gBAAgB,CAAC,EAAE;gBACxC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;aACvC;SACF;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IA3OsB,qBAAQ,GAAG,IAAI,YAAY,EAAE,CAAC;IA4OvD,mBAAC;CAAA,AA7OD,IA6OC;AA7OY,oCAAY"}
|
package/lib/json/TDJSONWriter.js
CHANGED
|
@@ -35,6 +35,8 @@ var TDJSONWriter = /** @class */ (function () {
|
|
|
35
35
|
if (option === void 0) { option = {}; }
|
|
36
36
|
if (indentStr === void 0) { indentStr = ''; }
|
|
37
37
|
var opt = option instanceof TDJSONWriterOption_1.TDJSONWriterOption ? option : LangUtil_1.LangUtil.mergeDeep(new TDJSONWriterOption_1.TDJSONWriterOption(), option);
|
|
38
|
+
opt.buildTerms();
|
|
39
|
+
// console.log("TDJSONWriter.write: opt=", opt);
|
|
38
40
|
if (!node)
|
|
39
41
|
return out.append(opt.deco("null", NON_STRING));
|
|
40
42
|
var childIndentStr = '';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TDJSONWriter.js","sourceRoot":"","sources":["../../src/json/TDJSONWriter.ts"],"names":[],"mappings":";;;AAAA,2DAAoE;AACpE,oCAA+C;AAC/C,uDAAsD;AAEtD,iDAAgD;AAChD,6CAA4C;AAE5C,IAAM,UAAU,GAAG,6BAAQ,CAAC,UAAU,CAAC;AACvC,IAAM,MAAM,GAAG,6BAAQ,CAAC,MAAM,CAAC;AAC/B,IAAM,GAAG,GAAG,6BAAQ,CAAC,GAAG,CAAC;AACzB,IAAM,QAAQ,GAAG,6BAAQ,CAAC,QAAQ,CAAC;AAEnC;IAAA;
|
|
1
|
+
{"version":3,"file":"TDJSONWriter.js","sourceRoot":"","sources":["../../src/json/TDJSONWriter.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,7 @@ export declare enum TextType {
|
|
|
10
10
|
}
|
|
11
11
|
export declare class TDJSONWriterOption extends TDJSONOption {
|
|
12
12
|
static ofIndentFactor(factor: number): TDJSONWriterOption;
|
|
13
|
+
static ofCompact(): TDJSONWriterOption;
|
|
13
14
|
private mIndentFactor;
|
|
14
15
|
alwaysQuoteKey: boolean;
|
|
15
16
|
alwaysQuoteValue: boolean;
|
|
@@ -39,6 +39,7 @@ var TDJSONWriterOption = /** @class */ (function (_super) {
|
|
|
39
39
|
return _this;
|
|
40
40
|
}
|
|
41
41
|
TDJSONWriterOption.ofIndentFactor = function (factor) { return new TDJSONWriterOption().setIndentFactor(factor); };
|
|
42
|
+
TDJSONWriterOption.ofCompact = function () { return new TDJSONWriterOption().setAlwaysQuoteKey(false).setAlwaysQuoteValue(false).setIndentFactor(0); };
|
|
42
43
|
Object.defineProperty(TDJSONWriterOption.prototype, "indentFactor", {
|
|
43
44
|
get: function () { return this.mIndentFactor; },
|
|
44
45
|
set: function (indentFactor) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TDJSONWriterOption.js","sourceRoot":"","sources":["../../src/json/TDJSONWriterOption.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAGA,+CAA8C;AAE9C,IAAY,QAAkD;AAA9D,WAAY,QAAQ;IAAE,+CAAQ,CAAA;IAAE,qCAAG,CAAA;IAAE,2CAAM,CAAA;IAAE,mDAAU,CAAA;IAAE,uCAAI,CAAA;AAAA,CAAC,EAAlD,QAAQ,GAAR,gBAAQ,KAAR,gBAAQ,QAA0C;AAE9D;IAAwC,sCAAY;
|
|
1
|
+
{"version":3,"file":"TDJSONWriterOption.js","sourceRoot":"","sources":["../../src/json/TDJSONWriterOption.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,52 +5,67 @@ var TDJSONWriter_1 = require("../../json/TDJSONWriter");
|
|
|
5
5
|
var TDJSONWriterOption_1 = require("../../json/TDJSONWriterOption");
|
|
6
6
|
var TestData_1 = require("./TestData");
|
|
7
7
|
var NodeFilter_1 = require("../../json/NodeFilter");
|
|
8
|
+
var __1 = require("../..");
|
|
8
9
|
var testData = new TestData_1.TestData();
|
|
9
10
|
describe('TDJsonWriter', function () {
|
|
10
11
|
test('testWriterWithNodeFilter', function () {
|
|
11
12
|
var node = TDJSONParser_1.TDJSONParser.get().parse(testData.testData);
|
|
12
|
-
var opt = new TDJSONWriterOption_1.TDJSONWriterOption()
|
|
13
|
-
.
|
|
14
|
-
.addNodeFilter(NodeFilter_1.NodeFilter.
|
|
13
|
+
var opt = new TDJSONWriterOption_1.TDJSONWriterOption()
|
|
14
|
+
.setIndentFactor(2)
|
|
15
|
+
.addNodeFilter(NodeFilter_1.NodeFilter.mask('.*/address', '.*/ip'))
|
|
16
|
+
.addNodeFilter(NodeFilter_1.NodeFilter.exclude('.*/\\$id'));
|
|
15
17
|
var str = TDJSONWriter_1.TDJSONWriter.get().writeAsString(node, opt);
|
|
16
18
|
console.log(str);
|
|
17
19
|
expect(str).toMatchSnapshot();
|
|
18
20
|
node = TDJSONParser_1.TDJSONParser.get().parse(str);
|
|
19
|
-
expect(node.getValueByPath(
|
|
20
|
-
expect(node.getValueByPath(
|
|
21
|
-
expect(node.getValueByPath(
|
|
21
|
+
expect(node.getValueByPath('/data/0/$id')).toBeNull();
|
|
22
|
+
expect(node.getValueByPath('/data/0/ip')).toEqual('<Masked:len=10>');
|
|
23
|
+
expect(node.getValueByPath('/data/0/address')).toEqual('{Masked:size=2}');
|
|
22
24
|
});
|
|
23
25
|
test('testQuote', function () {
|
|
24
26
|
var node = TDJSONParser_1.TDJSONParser.get().parse(testData.testQuote);
|
|
25
|
-
var opt = TDJSONWriterOption_1.TDJSONWriterOption.ofIndentFactor(2)
|
|
26
|
-
|
|
27
|
+
var opt = TDJSONWriterOption_1.TDJSONWriterOption.ofIndentFactor(2)
|
|
28
|
+
.setQuoteChars('"\'')
|
|
29
|
+
.setAlwaysQuoteKey(false)
|
|
30
|
+
.setAlwaysQuoteValue(false);
|
|
31
|
+
var result = __1.TD.stringify(node.toObject(), { jsonOption: opt }) + '\n';
|
|
27
32
|
expect(result).toMatchSnapshot();
|
|
33
|
+
expect(TDJSONParser_1.TDJSONParser.get()
|
|
34
|
+
.parse(result)
|
|
35
|
+
.toString()).toEqual(node.toString());
|
|
36
|
+
});
|
|
37
|
+
test('testQuote1', function () {
|
|
38
|
+
var obj = { name: 'test', columns: [{ field: '#' }, { field2: 'val2' }] };
|
|
39
|
+
var result = __1.TD.stringify(obj, { jsonOption: { alwaysQuoteKey: false, alwaysQuoteValue: false } });
|
|
40
|
+
expect(result).toMatchInlineSnapshot("\"{name:test,columns:[{field:\\\"#\\\"},{field2:val2}]}\"");
|
|
28
41
|
});
|
|
29
42
|
test('testWriterWithTextDeco', function () {
|
|
30
43
|
var node = TDJSONParser_1.TDJSONParser.get().parse(testData.testData);
|
|
31
|
-
var opt = new TDJSONWriterOption_1.TDJSONWriterOption().setIndentFactor(2)
|
|
32
|
-
.setTextDecorator(function (s, type) {
|
|
44
|
+
var opt = new TDJSONWriterOption_1.TDJSONWriterOption().setIndentFactor(2).setTextDecorator(function (s, type) {
|
|
33
45
|
switch (type) {
|
|
34
|
-
case TDJSONWriterOption_1.TextType.KEY:
|
|
35
|
-
|
|
46
|
+
case TDJSONWriterOption_1.TextType.KEY:
|
|
47
|
+
return '<b>' + s + '</b>';
|
|
48
|
+
case TDJSONWriterOption_1.TextType.OPERATOR:
|
|
49
|
+
return '<font color=red>' + s + '</font>';
|
|
36
50
|
case TDJSONWriterOption_1.TextType.NON_STRING:
|
|
37
|
-
return
|
|
51
|
+
return '<font color=green>' + s + '</font>';
|
|
38
52
|
case TDJSONWriterOption_1.TextType.STRING:
|
|
39
|
-
default:
|
|
53
|
+
default:
|
|
54
|
+
return s;
|
|
40
55
|
}
|
|
41
56
|
});
|
|
42
57
|
var str = TDJSONWriter_1.TDJSONWriter.get().writeAsString(node, opt);
|
|
43
58
|
console.log(str);
|
|
44
59
|
expect(str).toMatchSnapshot();
|
|
45
|
-
expect(str).toContain(
|
|
46
|
-
expect(str).toContain(
|
|
47
|
-
expect(str).toContain(
|
|
60
|
+
expect(str).toContain('<b>total</b>');
|
|
61
|
+
expect(str).toContain('<font color=red>:</font>');
|
|
62
|
+
expect(str).toContain('<font color=green>9007199254740991</font>');
|
|
48
63
|
});
|
|
49
64
|
test('testWriterWithTypeWrapper', function () {
|
|
50
|
-
var node = TDJSONParser_1.TDJSONParser.get().parse(
|
|
51
|
-
var opt = TDJSONWriterOption_1.TDJSONWriterOption.ofIndentFactor(
|
|
52
|
-
var str = TDJSONWriter_1.TDJSONWriter.get().writeAsString(node, opt)
|
|
53
|
-
expect(str).
|
|
65
|
+
var node = TDJSONParser_1.TDJSONParser.get().parse('{key:113, $type: someType}');
|
|
66
|
+
var opt = TDJSONWriterOption_1.TDJSONWriterOption.ofIndentFactor(0).setUseTypeWrapper(true);
|
|
67
|
+
var str = TDJSONWriter_1.TDJSONWriter.get().writeAsString(node, opt);
|
|
68
|
+
expect(str).toMatchInlineSnapshot("\"someType{\\\"key\\\":113,}\"");
|
|
54
69
|
});
|
|
55
70
|
});
|
|
56
71
|
//# sourceMappingURL=TDJsonWriter.spec.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TDJsonWriter.spec.js","sourceRoot":"","sources":["../../../src/json/__test__/TDJsonWriter.spec.ts"],"names":[],"mappings":";;AAAA,wDAAuD;AACvD,
|
|
1
|
+
{"version":3,"file":"TDJsonWriter.spec.js","sourceRoot":"","sources":["../../../src/json/__test__/TDJsonWriter.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,7 @@ var TestData = /** @class */ (function () {
|
|
|
7
7
|
this.proto = "\nn: {\n n1: {\n n11: 1\n # Duplicated key; ':' is emitted before '{'\n n11 {\n n111: false\n }\n n12: \"2\"\n }\n # Multi-line comments\n # Line2\n ########\n n1: {\n n11: \"abcd\"\n # Extension keys\n [d.e.f]: 4\n n11: \"multiline 1\n\"\n 'line2'\n }\n n2: [1,2,3]\n n2 [3,4,5] # ':' is emitted before '['\n \"n3\" [6, 7, 8, 9]\n noVal:\n}";
|
|
8
8
|
this.JSON5 = "\n // https://spec.json5.org/\n {\n // comments\n unquoted: 'and you can quote me on that',\n singleQuotes: 'I can use \"double quotes\" here',\n lineBreaks: \"Look, Mom! No \\n's!\",\n hexadecimal: 0xdecaf,\n leadingDecimalPoint: .8675309, andTrailing: 8675309.,\n positiveSign: +1,\n trailingComma: 'in objects', andIn: ['arrays',],\n \"backwardsCompatible\": \"with JSON\",\n }";
|
|
9
9
|
this.stream = "\n{\"a\": 1, \"obj\": {\"$id\": 1}, \"ref\": {\"$ref\": \"#1\"}}\n{\"b\": 2, \"obj\": {\"$id\": 1}, \"ref\": {\"$ref\": \"#1\"}},\na:1\nb:2\n";
|
|
10
|
-
this.testQuote = "{\n \"key with space\": \"value contains special chars: [\",\n \"normalKey\": \"normal Value\",\n \"keyWith:\": \"value has quotes: \" \", '\",\n \"keyWIth\n\": \"value with\n newline\",\n \"$type\": \"TestQuote\"\n}\n";
|
|
10
|
+
this.testQuote = "{\n \"key with space\": \"value contains special chars: [\",\n \"normalKey\": \"normal Value\",\n \"keyWith:\": \"value has quotes: \" \", '\",\n \"keyWIth\n\": \"value with\n newline\",\n \"keyWith#\": \"#\",\n \"$type\": \"TestQuote\"\n}\n";
|
|
11
11
|
}
|
|
12
12
|
return TestData;
|
|
13
13
|
}());
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TestData.js","sourceRoot":"","sources":["../../../src/json/__test__/TestData.ts"],"names":[],"mappings":";;;AAAA;IAAA;QACA,aAAQ,GAAG,4xBAkCT,CAAC;QAEH,UAAK,GAAG,uYAwBN,CAAC;QAEH,UAAK,GAAG,8ZAaJ,CAAC;QAEL,WAAM,GAAG,mJAKR,CAAA;QAED,cAAS,GAAG,
|
|
1
|
+
{"version":3,"file":"TestData.js","sourceRoot":"","sources":["../../../src/json/__test__/TestData.ts"],"names":[],"mappings":";;;AAAA;IAAA;QACA,aAAQ,GAAG,4xBAkCT,CAAC;QAEH,UAAK,GAAG,uYAwBN,CAAC;QAEH,UAAK,GAAG,8ZAaJ,CAAC;QAEL,WAAM,GAAG,mJAKR,CAAA;QAED,cAAS,GAAG,yPAQX,CAAA;IACD,CAAC;IAAD,eAAC;AAAD,CAAC,AA9FD,IA8FC;AA9FY,4BAAQ"}
|