treedoc 0.3.48 → 0.3.49
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/csv/CSV.spec.js +3 -3
- package/lib/csv/CSV.spec.js.map +1 -1
- package/lib/csv/CSVParser.js +12 -6
- package/lib/csv/CSVParser.js.map +1 -1
- package/package.json +1 -1
package/lib/csv/CSV.spec.js
CHANGED
|
@@ -4,9 +4,9 @@ var CSVParser_1 = require("./CSVParser");
|
|
|
4
4
|
var CSVOption_1 = require("./CSVOption");
|
|
5
5
|
var CSVWriter_1 = require("./CSVWriter");
|
|
6
6
|
var __1 = require("..");
|
|
7
|
-
var testCsv = "
|
|
8
|
-
var testObj = "\
|
|
9
|
-
var csvWithJson = "
|
|
7
|
+
var testCsv = "field1,field2,field3,field4\nv11,v12,\"\",1\nv21, \"v2l1,\nV2l2\" ,v23,true\n\"v31\"\"v31\",\"v32\"\"\"\"v32\",v33,\"3\"\nv41,v42,v43,\n";
|
|
8
|
+
var testObj = "\"@key\",\"field1\",\"field2\"\nk1,v11,v12\nk2,v21,v22\n";
|
|
9
|
+
var csvWithJson = "val,count,percent\n\"[{\"\"kind\"\":\"\"exact\"\",\"\"field_path\"\":\"\"k8s_environment\"\",\"\"value\"\":\"\"production\"\"}]\",73,0.24333333333333335\n\"[{\"\"kind\"\":\"\"exact\"\",\"\"field_path\"\":\"\"k8s_environment\"\",\"\"value\"\":\"\"production\"\"},{\"\"kind\"\":\"\"regex\"\",\"\"field_path\"\":\"\"k8s_namespace\"\"}]\",61,0.20333333333333334\n";
|
|
10
10
|
describe('CSVParser and CSVWriter', function () {
|
|
11
11
|
function testParseAndWrite(opt, csv) {
|
|
12
12
|
var node = CSVParser_1.CSVParser.get().parse(csv, opt);
|
package/lib/csv/CSV.spec.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CSV.spec.js","sourceRoot":"","sources":["../../src/csv/CSV.spec.ts"],"names":[],"mappings":";;AAAA,yCAAwC;AACxC,yCAAwC;AACxC,yCAAwC;AACxC,wBAAoD;AAEpD,IAAM,OAAO,
|
|
1
|
+
{"version":3,"file":"CSV.spec.js","sourceRoot":"","sources":["../../src/csv/CSV.spec.ts"],"names":[],"mappings":";;AAAA,yCAAwC;AACxC,yCAAwC;AACxC,yCAAwC;AACxC,wBAAoD;AAEpD,IAAM,OAAO,GACb,0IAMC,CAAC;AAEF,IAAM,OAAO,GACb,0DAGC,CAAA;AAED,IAAM,WAAW,GACjB,yWAGC,CAAA;AAED,QAAQ,CAAC,yBAAyB,EAAE;IAClC,SAAS,iBAAiB,CAAC,GAAc,EAAE,GAAW;QACpD,IAAM,IAAI,GAAG,qBAAS,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QAC7C,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,eAAe,EAAE,CAAC;QAC1C,IAAM,GAAG,GAAG,qBAAS,CAAC,GAAG,EAAE,CAAC,aAAa,CAAC,IAAI,EAAE,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC;QACtE,MAAM,CAAC,GAAG,CAAC,CAAC,eAAe,EAAE,CAAC;QAC9B,IAAM,KAAK,GAAG,qBAAS,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QAC9C,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;IACjD,CAAC;IAED,IAAI,CAAC,4BAA4B,EAAE,cAAM,OAAA,iBAAiB,CAAC,IAAI,qBAAS,EAAE,CAAC,gBAAgB,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,EAAnE,CAAmE,CAAC,CAAC;IAC9G,IAAI,CAAC,yBAAyB,EAAE,cAAM,OAAA,iBAAiB,CAAC,IAAI,qBAAS,EAAE,EAAE,OAAO,CAAC,EAA3C,CAA2C,CAAC,CAAC;IACnF,IAAI,CAAC,kBAAkB,EAAE,cAAM,OAAA,iBAAiB,CAAC,IAAI,qBAAS,EAAE,EAAE,OAAO,CAAC,EAA3C,CAA2C,CAAC,CAAC;IAE5E,IAAI,CAAC,uBAAuB,EAAE,cAAM,OAAA,iBAAiB,CAAC,IAAI,qBAAS,EAAE,EAAE,WAAW,CAAC,EAA/C,CAA+C,CAAC,CAAC;IAErF,IAAI,CAAC,WAAW,EAAE;QAChB,IAAM,IAAI,GAAG,wCAAwC,CAAC;QACtD,MAAM,CAAC,qBAAS,CAAC,GAAG,EAAE,CAAC,aAAa,CAAC,gBAAY,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,eAAe,EAAE,CAAC;IAC1F,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,uBAAuB,EAAE;QAC5B,IAAM,IAAI,GAAG,kCAAkC,CAAC;QAChD,MAAM,CAAC,qBAAS,CAAC,GAAG,EAAE,CAAC,aAAa,CAAC,gBAAY,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,eAAe,EAAE,CAAC;IAC1F,CAAC,CAAC,CAAC;IAGH,IAAI,CAAC,eAAe,EAAE;QACpB,MAAM,CAAC,qBAAS,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,IAAI,oBAAgB,CAAC,UAAU,CAAC,EAAE,IAAI,qBAAS,EAAE,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CACzG,OAAO,CACR,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,2BAA2B,EAAE;QAChC,IAAI,KAAK,GAAG,EAAE,CAAC;QACf,IAAI;YACF,qBAAS,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,IAAI,oBAAgB,CAAC,SAAS,CAAC,EAAE,IAAI,qBAAS,EAAE,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC;SAC/F;QAAC,OAAO,CAAM,EAAE;YACf,KAAK,GAAG,CAAC,CAAC,OAAO,CAAC;SACnB;QACD,MAAM,CAAC,KAAK,CAAC,CAAC,qBAAqB,CACjC,mGAAiG,CAClG,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
package/lib/csv/CSVParser.js
CHANGED
|
@@ -40,11 +40,15 @@ var CSVParser = /** @class */ (function () {
|
|
|
40
40
|
var row = new TDNode_1.TDNode(root.doc).setType(fields == null ? TDNode_1.TDNodeType.ARRAY : TDNode_1.TDNodeType.MAP);
|
|
41
41
|
row.setStart(src.getBookmark());
|
|
42
42
|
var i = 0;
|
|
43
|
-
|
|
43
|
+
var endOfRecord = false;
|
|
44
|
+
while (!endOfRecord) {
|
|
44
45
|
if (!src.skipChars(SPACE_CHARS))
|
|
45
46
|
break;
|
|
46
47
|
var start = src.getBookmark();
|
|
47
48
|
var val = this.readField(src, opt, row);
|
|
49
|
+
endOfRecord = src.isEof() || src.peek() === opt.recordSep;
|
|
50
|
+
if (!endOfRecord)
|
|
51
|
+
src.skip();
|
|
48
52
|
var key = void 0;
|
|
49
53
|
if (fields != null) {
|
|
50
54
|
if (i >= fields.length)
|
|
@@ -62,7 +66,7 @@ var CSVParser = /** @class */ (function () {
|
|
|
62
66
|
if (row.hasChildren())
|
|
63
67
|
root.addChild(row);
|
|
64
68
|
if (!src.isEof())
|
|
65
|
-
src.
|
|
69
|
+
src.skip(); // Skip the recordSep
|
|
66
70
|
};
|
|
67
71
|
CSVParser.prototype.readNonEmptyRecord = function (src, opt) {
|
|
68
72
|
while (!src.isEof()) {
|
|
@@ -74,13 +78,17 @@ var CSVParser = /** @class */ (function () {
|
|
|
74
78
|
};
|
|
75
79
|
CSVParser.prototype.readRecord = function (src, opt) {
|
|
76
80
|
var result = [];
|
|
77
|
-
|
|
81
|
+
var endOfRecord = false;
|
|
82
|
+
while (!endOfRecord) {
|
|
78
83
|
if (!src.skipChars(SPACE_CHARS))
|
|
79
84
|
break;
|
|
80
85
|
result.push(this.readField(src, opt, undefined));
|
|
86
|
+
endOfRecord = src.isEof() || src.peek() === opt.recordSep;
|
|
87
|
+
if (!endOfRecord)
|
|
88
|
+
src.skip();
|
|
81
89
|
}
|
|
82
90
|
if (!src.isEof())
|
|
83
|
-
src.
|
|
91
|
+
src.skip(); // Skip the recordSep
|
|
84
92
|
return result;
|
|
85
93
|
};
|
|
86
94
|
CSVParser.prototype.readField = function (src, opt, row) {
|
|
@@ -115,8 +123,6 @@ var CSVParser = /** @class */ (function () {
|
|
|
115
123
|
}
|
|
116
124
|
src.skipChars(" \t");
|
|
117
125
|
}
|
|
118
|
-
if (!src.isEof() && src.peek() === opt.fieldSep)
|
|
119
|
-
src.skip(); // Skip fieldSep
|
|
120
126
|
var str = sb.toString();
|
|
121
127
|
return isString ? str : ClassUtil_1.ClassUtil.toSimpleObject(str);
|
|
122
128
|
};
|
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;
|
|
1
|
+
{"version":3,"file":"CSVParser.js","sourceRoot":"","sources":["../../src/csv/CSVParser.ts"],"names":[],"mappings":"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"}
|