treedoc 0.3.21 → 0.3.24

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.
Files changed (49) hide show
  1. package/lib/TDNode.js +5 -1
  2. package/lib/TDNode.js.map +1 -1
  3. package/lib/TDNodeProxyHandler.d.ts +0 -1
  4. package/lib/TDNodeProxyHandler.js +7 -11
  5. package/lib/TDNodeProxyHandler.js.map +1 -1
  6. package/lib/TDPath.js +4 -1
  7. package/lib/TDPath.js.map +1 -1
  8. package/lib/TreeDoc.js +1 -1
  9. package/lib/TreeDoc.js.map +1 -1
  10. package/lib/__tests__/TDNode.spec.js +9 -1
  11. package/lib/__tests__/TDNode.spec.js.map +1 -1
  12. package/lib/__tests__/TDPath.spec.js +1 -0
  13. package/lib/__tests__/TDPath.spec.js.map +1 -1
  14. package/lib/core/CharSource.d.ts +8 -7
  15. package/lib/core/CharSource.js +31 -15
  16. package/lib/core/CharSource.js.map +1 -1
  17. package/lib/core/ListUtil.d.ts +6 -1
  18. package/lib/core/ListUtil.js +4 -1
  19. package/lib/core/ListUtil.js.map +1 -1
  20. package/lib/core/StringCharSource.d.ts +1 -1
  21. package/lib/core/StringCharSource.js +1 -1
  22. package/lib/core/StringCharSource.js.map +1 -1
  23. package/lib/core/__test__/StringCharSource.spec.d.ts +1 -0
  24. package/lib/core/__test__/StringCharSource.spec.js +18 -0
  25. package/lib/core/__test__/StringCharSource.spec.js.map +1 -0
  26. package/lib/csv/CSV.spec.js +10 -0
  27. package/lib/csv/CSV.spec.js.map +1 -1
  28. package/lib/csv/CSVParser.d.ts +1 -1
  29. package/lib/csv/CSVParser.js +15 -10
  30. package/lib/csv/CSVParser.js.map +1 -1
  31. package/lib/json/JSONPointer.js +2 -2
  32. package/lib/json/JSONPointer.js.map +1 -1
  33. package/lib/json/TDJSONParser.js +27 -28
  34. package/lib/json/TDJSONParser.js.map +1 -1
  35. package/lib/json/TDJSONParserOption.d.ts +16 -0
  36. package/lib/json/TDJSONParserOption.js +44 -0
  37. package/lib/json/TDJSONParserOption.js.map +1 -1
  38. package/lib/json/TDJSONWriter.js +4 -4
  39. package/lib/json/TDJSONWriter.js.map +1 -1
  40. package/lib/json/TDJSONWriterOption.d.ts +2 -0
  41. package/lib/json/TDJSONWriterOption.js +2 -0
  42. package/lib/json/TDJSONWriterOption.js.map +1 -1
  43. package/lib/json/__test__/CharSource.spec.js +4 -4
  44. package/lib/json/__test__/CharSource.spec.js.map +1 -1
  45. package/lib/json/__test__/JSONPointer.spec.js +1 -0
  46. package/lib/json/__test__/JSONPointer.spec.js.map +1 -1
  47. package/lib/json/__test__/TDJsonParser.spec.js +23 -1
  48. package/lib/json/__test__/TDJsonParser.spec.js.map +1 -1
  49. package/package.json +3 -2
package/lib/TDNode.js CHANGED
@@ -213,7 +213,11 @@ var TDNode = /** @class */ (function () {
213
213
  if (useCache === void 0) { useCache = true; }
214
214
  if (useCache && this.tData.proxy)
215
215
  return this.tData.proxy;
216
- return this.tData.proxy = new Proxy(this, new TDNodeProxyHandler_1.TDNodeProxyHandler(useCache));
216
+ var res = new Proxy(this, new TDNodeProxyHandler_1.TDNodeProxyHandler(useCache));
217
+ // res.toString = this.toString; // Without this, the proxy.toString will return
218
+ if (useCache)
219
+ this.tData.proxy = res;
220
+ return res;
217
221
  };
218
222
  Object.defineProperty(TDNode.prototype, "pathAsString", {
219
223
  get: function () {
package/lib/TDNode.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"TDNode.js","sourceRoot":"","sources":["../src/TDNode.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"TDNode.js","sourceRoot":"","sources":["../src/TDNode.ts"],"names":[],"mappings":"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"}
@@ -4,5 +4,4 @@ export declare class TDNodeProxyHandler<T extends TDNode> implements ProxyHandle
4
4
  useCache: boolean;
5
5
  constructor(useCache: boolean);
6
6
  get?(target: T, prop: string | symbol, receiver: any): any;
7
- ownKeys?(target: T): Array<string | symbol>;
8
7
  }
@@ -11,6 +11,7 @@ var TDNodeProxyHandler = /** @class */ (function () {
11
11
  this.useCache = useCache;
12
12
  }
13
13
  TDNodeProxyHandler.prototype.get = function (target, prop, receiver) {
14
+ // console.log(`prop: ${prop.toString()}`);
14
15
  if (prop === Symbol.toPrimitive) {
15
16
  return target.toString();
16
17
  }
@@ -36,17 +37,12 @@ var TDNodeProxyHandler = /** @class */ (function () {
36
37
  // TODO: Support reference objects of $ref
37
38
  return c.toProxy(this.useCache);
38
39
  }
39
- return target[prop];
40
- };
41
- // Doesn't work for Object.keys(), not sure why
42
- TDNodeProxyHandler.prototype.ownKeys = function (target) {
43
- // console.log(`ownKeys: target=${target.pathAsString}`);
44
- var res = [TARGET, KEY];
45
- if (target.type === TDNode_1.TDNodeType.MAP)
46
- target.children.forEach(function (n) { return res.push(n.key); });
47
- else if (target.type === TDNode_1.TDNodeType.ARRAY)
48
- res.push("length");
49
- return res;
40
+ // Prevent: Function Proxy .toString() Errors
41
+ // https://stackoverflow.com/questions/38259885/function-proxy-tostring-errors
42
+ var res = target[prop];
43
+ // return res;
44
+ // console.log(`prop: ${prop}, res:${res}, typeof res=${typeof res}`);
45
+ return (typeof res === 'function') ? res.bind(target) : res;
50
46
  };
51
47
  return TDNodeProxyHandler;
52
48
  }());
@@ -1 +1 @@
1
- {"version":3,"file":"TDNodeProxyHandler.js","sourceRoot":"","sources":["../src/TDNodeProxyHandler.ts"],"names":[],"mappings":";;;AACA,4CAAiE;AACjE,mCAAsC;AAEtC,IAAM,MAAM,GAAG,SAAS,CAAC;AACzB,IAAM,GAAG,GAAG,MAAM,CAAC;AACN,QAAA,kCAAkC,GAAG,iBAAiB,CAAC;AAEpE;IACE,4BAAmB,QAAiB;QAAjB,aAAQ,GAAR,QAAQ,CAAS;IAAG,CAAC;IAExC,gCAAG,GAAH,UAAK,MAAS,EAAE,IAAqB,EAAE,QAAa;QAClD,IAAI,IAAI,KAAK,MAAM,CAAC,WAAW,EAAE;YAC/B,OAAO,MAAM,CAAC,QAAQ,EAAE,CAAC;SAC1B;QAED,IAAI,OAAM,CAAC,IAAI,CAAC,KAAK,QAAQ,EAAE;YAC7B,OAAO,CAAC,GAAG,CAAC,8BAA4B,IAAI,CAAC,QAAQ,EAAI,CAAC,CAAC;YAC3D,OAAQ,MAAc,CAAC,IAAI,CAAC,CAAC;SAC9B;QAED,6DAA6D;QAC7D,IAAI,IAAI,KAAK,QAAQ;YACnB,OAAO,MAAM,CAAC,eAAe,EAAE,CAAC;QAElC,IAAI,IAAI,KAAK,MAAM;YACjB,OAAO,MAAM,CAAC;QAEhB,IAAI,IAAI,KAAK,GAAG;YACd,OAAO,MAAM,CAAC,GAAG,CAAC;QAEpB,IAAM,cAAc,GAAG,MAAM,CAAC,KAAK,CAAC,0CAAkC,CAAmB,CAAC;QAC1F,IAAI,cAAc,IAAI,cAAc,CAAC,IAAI,CAAC;YACxC,OAAO,cAAc,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,CAAC;QAExC,IAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;QACzB,IAAM,CAAC,GAAG,mBAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAChF,IAAI,CAAC,EAAE;YACL,IAAI,CAAC,CAAC,IAAI,KAAK,mBAAU,CAAC,MAAM;gBAC9B,OAAO,CAAC,CAAC,KAAK,CAAC;YACjB,0CAA0C;YAC1C,OAAO,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SACjC;QAED,OAAQ,MAAc,CAAC,IAAI,CAAC,CAAC;IAC/B,CAAC;IAED,+CAA+C;IAC/C,oCAAO,GAAP,UAAS,MAAS;QAChB,yDAAyD;QACzD,IAAM,GAAG,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QAC1B,IAAI,MAAM,CAAC,IAAI,KAAK,mBAAU,CAAC,GAAG;YAChC,MAAM,CAAC,QAAS,CAAC,OAAO,CAAC,UAAA,CAAC,IAAI,OAAA,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,GAAI,CAAC,EAAhB,CAAgB,CAAC,CAAC;aAC7C,IAAI,MAAM,CAAC,IAAI,KAAK,mBAAU,CAAC,KAAK;YACvC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QACpB,OAAO,GAAG,CAAC;IACb,CAAC;IACH,yBAAC;AAAD,CAAC,AAjDD,IAiDC;AAjDY,gDAAkB"}
1
+ {"version":3,"file":"TDNodeProxyHandler.js","sourceRoot":"","sources":["../src/TDNodeProxyHandler.ts"],"names":[],"mappings":";;;AACA,4CAAiE;AACjE,mCAAsC;AAEtC,IAAM,MAAM,GAAG,SAAS,CAAC;AACzB,IAAM,GAAG,GAAG,MAAM,CAAC;AACN,QAAA,kCAAkC,GAAG,iBAAiB,CAAC;AAEpE;IACE,4BAAmB,QAAiB;QAAjB,aAAQ,GAAR,QAAQ,CAAS;IAAG,CAAC;IAExC,gCAAG,GAAH,UAAK,MAAS,EAAE,IAAqB,EAAE,QAAa;QAClD,2CAA2C;QAE3C,IAAI,IAAI,KAAK,MAAM,CAAC,WAAW,EAAE;YAC/B,OAAO,MAAM,CAAC,QAAQ,EAAE,CAAC;SAC1B;QAED,IAAI,OAAM,CAAC,IAAI,CAAC,KAAK,QAAQ,EAAE;YAC7B,OAAO,CAAC,GAAG,CAAC,8BAA4B,IAAI,CAAC,QAAQ,EAAI,CAAC,CAAC;YAC3D,OAAQ,MAAc,CAAC,IAAI,CAAC,CAAC;SAC9B;QAED,6DAA6D;QAC7D,IAAI,IAAI,KAAK,QAAQ;YACnB,OAAO,MAAM,CAAC,eAAe,EAAE,CAAC;QAElC,IAAI,IAAI,KAAK,MAAM;YACjB,OAAO,MAAM,CAAC;QAEhB,IAAI,IAAI,KAAK,GAAG;YACd,OAAO,MAAM,CAAC,GAAG,CAAC;QAEpB,IAAM,cAAc,GAAG,MAAM,CAAC,KAAK,CAAC,0CAAkC,CAAmB,CAAC;QAC1F,IAAI,cAAc,IAAI,cAAc,CAAC,IAAI,CAAC;YACxC,OAAO,cAAc,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,CAAC;QAExC,IAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;QACzB,IAAM,CAAC,GAAG,mBAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAChF,IAAI,CAAC,EAAE;YACL,IAAI,CAAC,CAAC,IAAI,KAAK,mBAAU,CAAC,MAAM;gBAC9B,OAAO,CAAC,CAAC,KAAK,CAAC;YACjB,0CAA0C;YAC1C,OAAO,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SACjC;QAED,6CAA6C;QAC7C,8EAA8E;QAC9E,IAAM,GAAG,GAAI,MAAc,CAAC,IAAI,CAAC,CAAC;QAClC,cAAc;QACd,sEAAsE;QACtE,OAAO,CAAC,OAAO,GAAG,KAAK,UAAU,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAA;IAC7D,CAAC;IAYH,yBAAC;AAAD,CAAC,AAxDD,IAwDC;AAxDY,gDAAkB"}
package/lib/TDPath.js CHANGED
@@ -58,8 +58,11 @@ var TDPath = /** @class */ (function () {
58
58
  return this;
59
59
  };
60
60
  TDPath.parse = function (str) {
61
- if (typeof str === 'string')
61
+ if (typeof str === 'string') {
62
+ if (str.length > 1 && str.endsWith('/'))
63
+ str = str.substring(0, str.length - 1);
62
64
  str = str.split('/');
65
+ }
63
66
  if (str.length === 0)
64
67
  return new TDPath().addParts(Part.ofRelative(0));
65
68
  var path = new TDPath();
package/lib/TDPath.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"TDPath.js","sourceRoot":"","sources":["../src/TDPath.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"TDPath.js","sourceRoot":"","sources":["../src/TDPath.ts"],"names":[],"mappings":"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"}
package/lib/TreeDoc.js CHANGED
@@ -49,7 +49,7 @@ var TreeDoc = /** @class */ (function () {
49
49
  for (var _i = 0, nodes_1 = nodes; _i < nodes_1.length; _i++) {
50
50
  var node = nodes_1[_i];
51
51
  node.setKey(undefined);
52
- result.idMap = __assign(__assign({}, result.idMap), ListUtil_1.ListUtil.mapKey(node.doc.idMap, function (k) { return k + "_" + docId; }));
52
+ result.idMap = __assign(__assign({}, result.idMap), ListUtil_1.ListUtil.mapKeys(node.doc.idMap, function (k) { return k + "_" + docId; }));
53
53
  node.foreach(function (n) {
54
54
  n.doc = result;
55
55
  LangUtil_1.LangUtil.doIfNotNull(n.getChild(TDNode_1.TDNode.REF_KEY), function (nRef) { return nRef.value += "_" + docId; });
@@ -1 +1 @@
1
- {"version":3,"file":"TreeDoc.js","sourceRoot":"","sources":["../src/TreeDoc.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"TreeDoc.js","sourceRoot":"","sources":["../src/TreeDoc.ts"],"names":[],"mappings":"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"}
@@ -4,6 +4,7 @@ var __1 = require("..");
4
4
  var TDJSONParser_1 = require("../json/TDJSONParser");
5
5
  describe('TDNode', function () {
6
6
  var testData = "\n {\n \"a\": 1\n \"b\": [1,2,3]\n \"c\": \"str\"\n }\n ";
7
+ var testData1 = "\n {\n \"log\": {\n \"version\": \"1.2\",\n \"creator\": {\n \"name\": \"WebInspector\",\n \"version\": \"537.36\"\n }\n }\n }";
7
8
  var testJson = __1.TD.parse(testData);
8
9
  test('testToObject', function () {
9
10
  var node = TDJSONParser_1.TDJSONParser.get().parse(testData);
@@ -18,9 +19,16 @@ describe('TDNode', function () {
18
19
  expect(proxy.a).toBe(1);
19
20
  expect(proxy.b.length).toBe(testJson.b.length);
20
21
  expect(proxy.b[2]).toBe(3);
21
- expect(proxy.c).toBe("str");
22
+ expect(proxy.c).toBe('str');
23
+ expect(proxy.toString()).toMatchInlineSnapshot("\"{a: 1, b: [1, 2, 3], c: 'str'}\"");
22
24
  // expect(Object.keys(proxy.b)).toBe(["@target"]);
23
25
  expect(__1.TD.stringify(proxy, { jsonOption: { quoteChar: "'" } })).toMatchSnapshot();
24
26
  });
27
+ test('testToProxy1', function () {
28
+ var node = TDJSONParser_1.TDJSONParser.get().parse(testData1);
29
+ var proxy = node.getByPath('log/creator').toProxy();
30
+ expect(proxy.toString()).toMatchInlineSnapshot("\"creator: {name: 'WebInspector', version: '537.36'}\"");
31
+ expect(__1.TD.stringify(proxy, { jsonOption: { quoteChar: "'" } })).toMatchSnapshot();
32
+ });
25
33
  });
26
34
  //# sourceMappingURL=TDNode.spec.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"TDNode.spec.js","sourceRoot":"","sources":["../../src/__tests__/TDNode.spec.ts"],"names":[],"mappings":";;AAAA,wBAAwB;AACxB,qDAAoD;AAEpD,QAAQ,CAAC,QAAQ,EAAE;IACjB,IAAM,QAAQ,GAAG,sEAMhB,CAAC;IAEF,IAAM,QAAQ,GAAG,MAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;IAEpC,IAAI,CAAC,cAAc,EAAE;QACnB,IAAM,IAAI,GAAG,2BAAY,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAChD,IAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAChC,MAAM,CAAC,MAAE,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,EAAC,UAAU,EAAE,EAAC,SAAS,EAAE,GAAG,EAAC,EAAC,CAAC,CAAC,CAAC,eAAe,EAAE,CAAC;QAChF,MAAM,CAAC,MAAE,CAAC,SAAS,CAAC,GAAG,EAAE,EAAC,UAAU,EAAE,EAAC,SAAS,EAAE,GAAG,EAAC,EAAC,CAAC,CAAC,CAAC,eAAe,EAAE,CAAC;IAC9E,CAAC,CAAC;QAEF,IAAI,CAAC,aAAa,EAAE;YAClB,IAAM,IAAI,GAAG,2BAAY,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;YAChD,IAAM,KAAK,GAAG,IAAI,CAAC,OAAO,EAAS,CAAC;YACpC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAC7B,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACxB,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;YAC/C,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAC3B,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAC5B,kDAAkD;YAClD,MAAM,CAAC,MAAE,CAAC,SAAS,CAAC,KAAK,EAAE,EAAC,UAAU,EAAE,EAAC,SAAS,EAAE,GAAG,EAAC,EAAC,CAAC,CAAC,CAAC,eAAe,EAAE,CAAC;QAChF,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"TDNode.spec.js","sourceRoot":"","sources":["../../src/__tests__/TDNode.spec.ts"],"names":[],"mappings":";;AAAA,wBAAwB;AACxB,qDAAoD;AAEpD,QAAQ,CAAC,QAAQ,EAAE;IACjB,IAAM,QAAQ,GAAG,sEAMhB,CAAC;IAEF,IAAM,SAAS,GAAG,qKAShB,CAAC;IAEH,IAAM,QAAQ,GAAG,MAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;IAEpC,IAAI,CAAC,cAAc,EAAE;QACnB,IAAM,IAAI,GAAG,2BAAY,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAChD,IAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAChC,MAAM,CAAC,MAAE,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,UAAU,EAAE,EAAE,SAAS,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC,eAAe,EAAE,CAAC;QACpF,MAAM,CAAC,MAAE,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,UAAU,EAAE,EAAE,SAAS,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC,eAAe,EAAE,CAAC;IAClF,CAAC,CAAC;QACA,IAAI,CAAC,aAAa,EAAE;YAClB,IAAM,IAAI,GAAG,2BAAY,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;YAChD,IAAM,KAAK,GAAG,IAAI,CAAC,OAAO,EAAS,CAAC;YACpC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAC7B,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACxB,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;YAC/C,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAC3B,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAC5B,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC,qBAAqB,CAAC,oCAAkC,CAAC,CAAC;YAEnF,kDAAkD;YAClD,MAAM,CAAC,MAAE,CAAC,SAAS,CAAC,KAAK,EAAE,EAAE,UAAU,EAAE,EAAE,SAAS,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC,eAAe,EAAE,CAAC;QACpF,CAAC,CAAC,CAAC;IAEL,IAAI,CAAC,cAAc,EAAE;QACnB,IAAM,IAAI,GAAG,2BAAY,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QACjD,IAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,aAAa,CAAE,CAAC,OAAO,EAAS,CAAC;QAC9D,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC,qBAAqB,CAAC,wDAAsD,CAAC,CAAC;QACvG,MAAM,CAAC,MAAE,CAAC,SAAS,CAAC,KAAK,EAAE,EAAE,UAAU,EAAE,EAAE,SAAS,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC,eAAe,EAAE,CAAC;IACpF,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
@@ -9,6 +9,7 @@ describe('TDPath', function () {
9
9
  expect(TDPath_1.TDPath.parse('./p1/p2')).toEqual(new TDPath_1.TDPath().addParts(__1.Part.ofRelative(0), __1.Part.ofChild('p1'), __1.Part.ofChild('p2')));
10
10
  expect(TDPath_1.TDPath.parse('#100/p1/p2')).toEqual(new TDPath_1.TDPath().addParts(__1.Part.ofChildOrId('#100', '100'), __1.Part.ofChild('p1'), __1.Part.ofChild('p2')));
11
11
  expect(TDPath_1.TDPath.parse('#/p1/p2')).toEqual(new TDPath_1.TDPath().addParts(__1.Part.ofRoot(), __1.Part.ofChild('p1'), __1.Part.ofChild('p2')));
12
+ expect(TDPath_1.TDPath.parse('../')).toEqual(new TDPath_1.TDPath().addParts(__1.Part.ofRelative(1)));
12
13
  });
13
14
  });
14
15
  //# sourceMappingURL=TDPath.spec.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"TDPath.spec.js","sourceRoot":"","sources":["../../src/__tests__/TDPath.spec.ts"],"names":[],"mappings":";;AAIA,oCAAmC;AACnC,wBAA0B;AAE1B,QAAQ,CAAC,QAAQ,EAAE;IACjB,IAAI,CAAC,OAAO,EAAE;QACZ,MAAM,CAAC,eAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CACpC,IAAI,eAAM,EAAE,CAAC,QAAQ,CAAC,QAAI,CAAC,MAAM,EAAE,EAAE,QAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,QAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAC7E,CAAC;QACF,MAAM,CAAC,eAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,OAAO,CACtC,IAAI,eAAM,EAAE,CAAC,QAAQ,CAAC,QAAI,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,QAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,QAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAClF,CAAC;QACF,MAAM,CAAC,eAAM,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CACrC,IAAI,eAAM,EAAE,CAAC,QAAQ,CAAC,QAAI,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,QAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,QAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAClF,CAAC;QACF,MAAM,CAAC,eAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,OAAO,CACxC,IAAI,eAAM,EAAE,CAAC,QAAQ,CAAC,QAAI,CAAC,WAAW,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE,QAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,QAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAC/F,CAAC;QACF,MAAM,CAAC,eAAM,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CACrC,IAAI,eAAM,EAAE,CAAC,QAAQ,CAAC,QAAI,CAAC,MAAM,EAAE,EAAE,QAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,QAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAC7E,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"TDPath.spec.js","sourceRoot":"","sources":["../../src/__tests__/TDPath.spec.ts"],"names":[],"mappings":";;AAIA,oCAAmC;AACnC,wBAA0B;AAE1B,QAAQ,CAAC,QAAQ,EAAE;IACjB,IAAI,CAAC,OAAO,EAAE;QACZ,MAAM,CAAC,eAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CACpC,IAAI,eAAM,EAAE,CAAC,QAAQ,CAAC,QAAI,CAAC,MAAM,EAAE,EAAE,QAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,QAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAC7E,CAAC;QACF,MAAM,CAAC,eAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,OAAO,CACtC,IAAI,eAAM,EAAE,CAAC,QAAQ,CAAC,QAAI,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,QAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,QAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAClF,CAAC;QACF,MAAM,CAAC,eAAM,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CACrC,IAAI,eAAM,EAAE,CAAC,QAAQ,CAAC,QAAI,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,QAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,QAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAClF,CAAC;QACF,MAAM,CAAC,eAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,OAAO,CACxC,IAAI,eAAM,EAAE,CAAC,QAAQ,CAAC,QAAI,CAAC,WAAW,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE,QAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,QAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAC/F,CAAC;QACF,MAAM,CAAC,eAAM,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CACrC,IAAI,eAAM,EAAE,CAAC,QAAQ,CAAC,QAAI,CAAC,MAAM,EAAE,EAAE,QAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,QAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAC7E,CAAC;QACF,MAAM,CAAC,eAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CACjC,IAAI,eAAM,EAAE,CAAC,QAAQ,CAAC,QAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAC1C,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
@@ -6,7 +6,7 @@ export declare abstract class CharSource {
6
6
  private static readonly MAX_STRING_LEN;
7
7
  private static readonly SPACE_RETURN_CHARS;
8
8
  private static readonly SPACE_RETURN_COMMA_CHARS;
9
- protected readonly bookmark: Bookmark;
9
+ readonly bookmark: Bookmark;
10
10
  abstract read(): string;
11
11
  peek(i?: number): string;
12
12
  isEof(i?: number): boolean;
@@ -17,12 +17,12 @@ export declare abstract class CharSource {
17
17
  *
18
18
  * @return true The terminate condition matches. otherwise, could be EOF or length matches
19
19
  */
20
- abstract readUntil(predicate: Predicate<CharSource>, target: StringBuilder | null, minLen?: number, maxLen?: number): boolean;
20
+ abstract readUntil(target: StringBuilder | null, predicate: Predicate<CharSource>, minLen?: number, maxLen?: number): boolean;
21
21
  skipUntil(predicate: Predicate<CharSource>): boolean;
22
22
  /** @return true Terminal conditions matches */
23
- readUntilTerminatorToString(chars: string, target: StringBuilder | null, include?: boolean, minLen?: number, maxLen?: number): boolean;
23
+ readUntilTerminatorToString(target: StringBuilder | null, chars: string, strs?: string[] | null, include?: boolean, minLen?: number, maxLen?: number): boolean;
24
24
  /** @return true Terminal conditions matches */
25
- readUntilTerminator(chars: string, minLen?: number, maxLen?: number): string;
25
+ readUntilTerminator(chars: string, strs?: string[] | null, minLen?: number, maxLen?: number): string;
26
26
  /** @return true Terminal conditions matches */
27
27
  skipUntilTerminator(chars: string, include?: boolean): boolean;
28
28
  /** @return true Indicates more character in the stream */
@@ -33,13 +33,14 @@ export declare abstract class CharSource {
33
33
  readToString(target: StringBuilder | null, len: number): boolean;
34
34
  readString(len: number): string;
35
35
  skip(len?: number): boolean;
36
- readUntilMatch(str: string, skipStr: boolean, target: StringBuilder | null, minLen?: number, maxLen?: number): boolean;
36
+ readUntilMatch(target: StringBuilder | null, str: string, skipStr: boolean, minLen?: number, maxLen?: number): boolean;
37
37
  skipUntilMatch(str: string, skipStr: boolean): boolean;
38
38
  peekString(len: number): string;
39
- startsWidth(str: string): boolean;
39
+ startsWithAny(strs: string[] | null): boolean;
40
+ startsWith(str: string): boolean;
40
41
  private getTermStrWithQuoteAndEscape;
41
42
  readQuotedString(quote: string): string;
42
- readQuotedToString(quote: string, sb: StringBuilder): StringBuilder;
43
+ readQuotedToString(sb: StringBuilder, quote: string): StringBuilder;
43
44
  private readOctNumber;
44
45
  private isOctDigit;
45
46
  createParseRuntimeException(message: string): ParseRuntimeException;
@@ -21,27 +21,30 @@ var CharSource = /** @class */ (function () {
21
21
  return this.bookmark.clone();
22
22
  };
23
23
  CharSource.prototype.skipUntil = function (predicate) {
24
- return this.readUntil(predicate, null);
24
+ return this.readUntil(null, predicate);
25
25
  };
26
26
  /** @return true Terminal conditions matches */
27
- CharSource.prototype.readUntilTerminatorToString = function (chars, target, include, minLen, maxLen) {
27
+ CharSource.prototype.readUntilTerminatorToString = function (target, chars, strs, include, minLen, maxLen) {
28
+ var _this = this;
29
+ if (strs === void 0) { strs = null; }
28
30
  if (include === void 0) { include = true; }
29
31
  if (minLen === void 0) { minLen = 0; }
30
32
  if (maxLen === void 0) { maxLen = Number.MAX_VALUE; }
31
- return this.readUntil(function (s) { return chars.indexOf(s.peek(0)) >= 0 === include; }, target, minLen, maxLen);
33
+ return this.readUntil(target, function (s) { return (chars.indexOf(s.peek(0)) >= 0 || _this.startsWithAny(strs)) === include; }, minLen, maxLen);
32
34
  };
33
35
  /** @return true Terminal conditions matches */
34
- CharSource.prototype.readUntilTerminator = function (chars, minLen, maxLen) {
36
+ CharSource.prototype.readUntilTerminator = function (chars, strs, minLen, maxLen) {
37
+ if (strs === void 0) { strs = null; }
35
38
  if (minLen === void 0) { minLen = 0; }
36
39
  if (maxLen === void 0) { maxLen = Number.MAX_VALUE; }
37
40
  var sb = new StringBuilder_1.StringBuilder();
38
- this.readUntilTerminatorToString(chars, sb, true, minLen, maxLen);
41
+ this.readUntilTerminatorToString(sb, chars, strs, true, minLen, maxLen);
39
42
  return sb.toString();
40
43
  };
41
44
  /** @return true Terminal conditions matches */
42
45
  CharSource.prototype.skipUntilTerminator = function (chars, include) {
43
46
  if (include === void 0) { include = true; }
44
- return this.readUntilTerminatorToString(chars, null, include);
47
+ return this.readUntilTerminatorToString(null, chars, null, include);
45
48
  };
46
49
  /** @return true Indicates more character in the stream */
47
50
  CharSource.prototype.skipSpacesAndReturns = function () { return this.skipUntilTerminator(CharSource.SPACE_RETURN_CHARS, false); };
@@ -49,7 +52,7 @@ var CharSource = /** @class */ (function () {
49
52
  /** @return true Indicates more character in the stream */
50
53
  CharSource.prototype.skipChars = function (chars) { return this.skipUntilTerminator(chars, false); };
51
54
  CharSource.prototype.readToString = function (target, len) {
52
- return this.readUntil(function (s) { return false; }, target, len, len);
55
+ return this.readUntil(target, function (s) { return false; }, len, len);
53
56
  };
54
57
  CharSource.prototype.readString = function (len) {
55
58
  var sb = new StringBuilder_1.StringBuilder();
@@ -60,16 +63,16 @@ var CharSource = /** @class */ (function () {
60
63
  if (len === void 0) { len = 1; }
61
64
  return this.readToString(null, len);
62
65
  };
63
- CharSource.prototype.readUntilMatch = function (str, skipStr, target, minLen, maxLen) {
66
+ CharSource.prototype.readUntilMatch = function (target, str, skipStr, minLen, maxLen) {
64
67
  if (minLen === void 0) { minLen = 0; }
65
68
  if (maxLen === void 0) { maxLen = CharSource.MAX_STRING_LEN; }
66
- var matches = this.readUntil(function (s) { return s.startsWidth(str); }, target, minLen, maxLen);
69
+ var matches = this.readUntil(target, function (s) { return s.startsWith(str); }, minLen, maxLen);
67
70
  if (matches && skipStr)
68
71
  this.skip(str.length);
69
72
  return matches;
70
73
  };
71
74
  CharSource.prototype.skipUntilMatch = function (str, skipStr) {
72
- return this.readUntilMatch(str, skipStr, null);
75
+ return this.readUntilMatch(null, str, skipStr);
73
76
  };
74
77
  // TODO: performance optimization with string.substr()
75
78
  CharSource.prototype.peekString = function (len) {
@@ -81,7 +84,17 @@ var CharSource = /** @class */ (function () {
81
84
  }
82
85
  return sb.toString();
83
86
  };
84
- CharSource.prototype.startsWidth = function (str) {
87
+ CharSource.prototype.startsWithAny = function (strs) {
88
+ if (strs != null) {
89
+ for (var _i = 0, strs_1 = strs; _i < strs_1.length; _i++) {
90
+ var s = strs_1[_i];
91
+ if (this.startsWith(s))
92
+ return true;
93
+ }
94
+ }
95
+ return false;
96
+ };
97
+ CharSource.prototype.startsWith = function (str) {
85
98
  if (this.isEof(str.length))
86
99
  return false;
87
100
  for (var i = 0; i < str.length; i++) {
@@ -104,14 +117,17 @@ var CharSource = /** @class */ (function () {
104
117
  }
105
118
  };
106
119
  CharSource.prototype.readQuotedString = function (quote) {
107
- return this.readQuotedToString(quote, new StringBuilder_1.StringBuilder()).toString();
120
+ return this.readQuotedToString(new StringBuilder_1.StringBuilder(), quote).toString();
108
121
  };
109
- CharSource.prototype.readQuotedToString = function (quote, sb) {
122
+ CharSource.prototype.readQuotedToString = function (sb, quote) {
110
123
  var terminator = this.getTermStrWithQuoteAndEscape(quote);
124
+ // Not calling getBookmark() to avoid clone an object
111
125
  var pos = this.bookmark.pos;
126
+ var line = this.bookmark.line;
127
+ var col = this.bookmark.col;
112
128
  while (true) {
113
- if (!this.readUntilTerminatorToString(terminator, sb))
114
- throw new EOFRuntimeException_1.EOFRuntimeException("Can't find matching quote at position:" + pos);
129
+ if (!this.readUntilTerminatorToString(sb, terminator))
130
+ throw new EOFRuntimeException_1.EOFRuntimeException("Can't find matching quote at position:" + pos + ";line:" + line + ";col:" + col);
115
131
  var c = this.read();
116
132
  if (c === quote)
117
133
  break;
@@ -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":";;;AAAA,wCAAuC;AAEvC,iDAAgD;AAChD,6DAA4D;AAC5D,iEAAgE;AAEhE;IAAA;QAMW,aAAQ,GAAG,IAAI,mBAAQ,EAAE,CAAC;IAiMrC,CAAC;IA9LqB,yBAAI,GAAxB,UAAyB,CAAK;QAAL,kBAAA,EAAA,KAAK;QAC5B,OAAO,EAAE,CAAC;IACZ,CAAC;IACmB,0BAAK,GAAzB,UAA0B,CAAK;QAAL,kBAAA,EAAA,KAAK;QAC7B,OAAO,KAAK,CAAC;IACf,CAAC;IAEM,gCAAW,GAAlB;QACE,OAAO,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;IAC/B,CAAC;IASM,8BAAS,GAAhB,UAAiB,SAAgC;QAC/C,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;IACzC,CAAC;IAEC,gDAAgD;IAC3C,gDAA2B,GAAlC,UAAmC,MAA4B,EAAE,KAAa,EAAE,IAA4B,EAAE,OAAc,EAAE,MAAU,EAAE,MAAyB;QAAnK,iBAEC;QAF+E,qBAAA,EAAA,WAA4B;QAAE,wBAAA,EAAA,cAAc;QAAE,uBAAA,EAAA,UAAU;QAAE,uBAAA,EAAA,SAAS,MAAM,CAAC,SAAS;QACjK,OAAO,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,UAAA,CAAC,IAAI,OAAA,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,KAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,KAAK,OAAO,EAAvE,CAAuE,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9H,CAAC;IAED,gDAAgD;IACzC,wCAAmB,GAA1B,UAA2B,KAAa,EAAE,IAA4B,EAAE,MAAU,EAAE,MAAyB;QAAnE,qBAAA,EAAA,WAA4B;QAAE,uBAAA,EAAA,UAAU;QAAE,uBAAA,EAAA,SAAS,MAAM,CAAC,SAAS;QAC3G,IAAM,EAAE,GAAG,IAAI,6BAAa,EAAE,CAAC;QAC/B,IAAI,CAAC,2BAA2B,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;QACxE,OAAO,EAAE,CAAC,QAAQ,EAAE,CAAC;IACvB,CAAC;IAED,gDAAgD;IACzC,wCAAmB,GAA1B,UAA2B,KAAa,EAAE,OAAc;QAAd,wBAAA,EAAA,cAAc;QACtD,OAAO,IAAI,CAAC,2BAA2B,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;IACtE,CAAC;IACD,2DAA2D;IACpD,yCAAoB,GAA3B,cAAyC,OAAO,IAAI,CAAC,mBAAmB,CAAC,UAAU,CAAC,kBAAkB,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;IAC1G,kDAA6B,GAApC,cAAkD,OAAO,IAAI,CAAC,mBAAmB,CAAC,UAAU,CAAC,wBAAwB,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;IAChI,2DAA2D;IACpD,8BAAS,GAAhB,UAAiB,KAAa,IAAa,OAAO,IAAI,CAAC,mBAAmB,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;IAEpF,iCAAY,GAAnB,UAAoB,MAA4B,EAAE,GAAW;QAC3D,OAAO,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,UAAA,CAAC,IAAI,OAAA,KAAK,EAAL,CAAK,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;IACtD,CAAC;IAEM,+BAAU,GAAjB,UAAkB,GAAW;QAC3B,IAAM,EAAE,GAAG,IAAI,6BAAa,EAAE,CAAC;QAC/B,IAAI,CAAC,YAAY,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;QAC3B,OAAO,EAAE,CAAC,QAAQ,EAAE,CAAC;IACvB,CAAC;IAEM,yBAAI,GAAX,UAAY,GAAO;QAAP,oBAAA,EAAA,OAAO;QACjB,OAAO,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IACtC,CAAC;IAEM,mCAAc,GAArB,UAAsB,MAA4B,EAAE,GAAW,EAAE,OAAgB,EAAE,MAAU,EAAE,MAAkC;QAA9C,uBAAA,EAAA,UAAU;QAAE,uBAAA,EAAA,SAAS,UAAU,CAAC,cAAc;QAC/H,IAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,UAAA,CAAC,IAAI,OAAA,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,EAAjB,CAAiB,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;QAC/E,IAAI,OAAO,IAAI,OAAO;YACpB,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACxB,OAAO,OAAO,CAAC;IACjB,CAAC;IAEM,mCAAc,GAArB,UAAsB,GAAW,EAAE,OAAgB;QACjD,OAAO,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC;IACjD,CAAC;IAED,sDAAsD;IAC/C,+BAAU,GAAjB,UAAkB,GAAW;QAC3B,IAAM,EAAE,GAAG,IAAI,6BAAa,EAAE,CAAC;QAC/B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,EAAE,CAAC,EAAE,EAAE;YAC5B,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;gBACf,MAAM;YACR,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;SACzB;QACD,OAAO,EAAE,CAAC,QAAQ,EAAE,CAAC;IACvB,CAAC;IAEM,kCAAa,GAApB,UAAqB,IAAqB;QACxC,IAAI,IAAI,IAAI,IAAI,EAAE;YAChB,KAAgB,UAAI,EAAJ,aAAI,EAAJ,kBAAI,EAAJ,IAAI;gBAAf,IAAM,CAAC,aAAA;gBACV,IAAI,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC;oBACpB,OAAO,IAAI,CAAC;aAAA;SACjB;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAEM,+BAAU,GAAjB,UAAkB,GAAW;QAC3B,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC;YACxB,OAAO,KAAK,CAAC;QACf,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACnC,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;gBAChC,OAAO,KAAK,CAAC;SAChB;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,2DAA2D;IACnD,iDAA4B,GAApC,UAAqC,KAAa;QAChD,QAAQ,KAAK,EAAE;YACb,KAAK,GAAG;gBACN,OAAO,KAAK,CAAC;YACf,KAAK,GAAG;gBACN,OAAO,KAAK,CAAC;YACf,KAAK,GAAG;gBACN,OAAO,KAAK,CAAC;YACf;gBACE,OAAO,IAAI,CAAC;SACf;IACH,CAAC;IAEM,qCAAgB,GAAvB,UAAwB,KAAa;QACnC,OAAO,IAAI,CAAC,kBAAkB,CAAC,IAAI,6BAAa,EAAE,EAAE,KAAK,CAAC,CAAC,QAAQ,EAAE,CAAC;IACxE,CAAC;IAEM,uCAAkB,GAAzB,UAA0B,EAAiB,EAAE,KAAa;QACxD,IAAM,UAAU,GAAG,IAAI,CAAC,4BAA4B,CAAC,KAAK,CAAC,CAAC;QAC5D,qDAAqD;QACrD,IAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC;QAC9B,IAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;QAChC,IAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC;QAC9B,OAAO,IAAI,EAAE;YACX,IAAI,CAAC,IAAI,CAAC,2BAA2B,CAAC,EAAE,EAAE,UAAU,CAAC;gBACnD,MAAM,IAAI,yCAAmB,CAAC,2CAAyC,GAAG,cAAS,IAAI,aAAQ,GAAK,CAAC,CAAC;YACxG,IAAI,CAAC,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;YACpB,IAAI,CAAC,KAAK,KAAK;gBACb,MAAM;YAER,0CAA0C;YAC1C,CAAC,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;YAChB,QAAQ,CAAC,EAAE;gBACT,KAAK,GAAG;oBACN,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;oBAChB,MAAM;gBACR,KAAK,GAAG;oBACN,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;oBAChB,MAAM;gBACR,KAAK,GAAG;oBACN,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;oBAChB,MAAM;gBACR,KAAK,GAAG;oBACN,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;oBAChB,MAAM;gBACR,KAAK,GAAG;oBACN,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;oBAChB,MAAM;gBACR,KAAK,GAAG;oBACN,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;oBACpB,MAAM;gBACR,KAAK,GAAG;oBACN,IAAM,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;oBAC9C,IAAI,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC;wBACpB,MAAM,IAAI,CAAC,2BAA2B,CAAC,uCAAuC,GAAG,IAAI,CAAC,CAAC;oBACzF,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC;oBACrC,MAAM;gBACR,KAAK,IAAI,CAAC;gBACV,KAAK,IAAI;oBACP,MAAM,CAAC,kCAAkC;gBAC3C;oBACE,IAAI,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC;wBACpB,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;;wBAC3D,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;aACrB;SACF;QACD,OAAO,EAAE,CAAC;IACZ,CAAC;IAEO,kCAAa,GAArB,UAAsB,GAAW;QAC/B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE;YAC1B,IAAM,CAAC,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;YACtB,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC;gBACrB,MAAM;YACR,IAAM,MAAM,GAAG,GAAG,GAAG,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;YACnC,IAAI,MAAM,GAAG,GAAG;gBACd,MAAM;YACR,GAAG,GAAG,MAAM,CAAC;YACb,IAAI,CAAC,IAAI,EAAE,CAAC;SACb;QACD,OAAO,GAAG,CAAC;IACb,CAAC;IAEO,+BAAU,GAAlB,UAAmB,CAAS;QAC1B,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC;IAC9B,CAAC;IAEM,gDAA2B,GAAlC,UAAmC,OAAe;QAChD,OAAO,IAAI,6CAAqB,CAAC,OAAO,EAAE,IAAI,CAAC,WAAW,EAAE,EAAE,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC;IACrF,CAAC;IArMuB,yBAAc,GAAG,KAAK,CAAC;IAC/C,mFAAmF;IAC3D,6BAAkB,GAAG,eAAe,CAAC;IACrC,mCAAwB,GAAG,UAAU,CAAC,kBAAkB,GAAG,GAAG,CAAC;IAmMzF,iBAAC;CAAA,AAvMD,IAuMC;AAvMqB,gCAAU"}
@@ -6,7 +6,12 @@ export declare class ListUtil {
6
6
  } | null, keyFunc: (k: string) => string, valFunc: (v: V) => TV): {
7
7
  [key: string]: TV;
8
8
  } | null;
9
- static mapKey<V>(source: {
9
+ static mapKeys<V>(source: {
10
+ [key: string]: V;
11
+ } | null, keyFunc: (k: string) => string): {
12
+ [key: string]: V;
13
+ } | null;
14
+ static mapValues<V>(source: {
10
15
  [key: string]: V;
11
16
  } | null, keyFunc: (k: string) => string): {
12
17
  [key: string]: V;
@@ -26,7 +26,10 @@ var ListUtil = /** @class */ (function () {
26
26
  }
27
27
  return result;
28
28
  };
29
- ListUtil.mapKey = function (source, keyFunc) {
29
+ ListUtil.mapKeys = function (source, keyFunc) {
30
+ return this.map(source, keyFunc, function (v) { return v; });
31
+ };
32
+ ListUtil.mapValues = function (source, keyFunc) {
30
33
  return this.map(source, keyFunc, function (v) { return v; });
31
34
  };
32
35
  return ListUtil;
@@ -1 +1 @@
1
- {"version":3,"file":"ListUtil.js","sourceRoot":"","sources":["../../src/core/ListUtil.ts"],"names":[],"mappings":";;;AAAA;IAAA;IAyBA,CAAC;IAxBe,eAAM,GAApB,UAAwB,MAAW,EAAE,IAAuB;QAC1D,OAAO,MAAM,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC,KAAK,SAAS,CAAC;IACzE,CAAC;IAEa,cAAK,GAAnB,UAAuB,MAAW,EAAE,IAAuB;QACzD,IAAI,MAAM,IAAI,IAAI;YAChB,KAAgB,UAAM,EAAN,iBAAM,EAAN,oBAAM,EAAN,IAAM;gBAAjB,IAAM,CAAC,eAAA;gBACV,IAAI,IAAI,CAAC,CAAC,CAAC;oBACT,OAAO,CAAC,CAAC;aAAA;QACf,OAAO,SAAS,CAAC;IACnB,CAAC;IAEa,YAAG,GAAjB,UAAyB,MAAmC,EAAE,OAA8B,EAAE,OAAqB;QACjH,IAAI,MAAM,IAAI,IAAI;YAChB,OAAO,IAAI,CAAC;QACd,IAAM,MAAM,GAA0B,EAAE,CAAC;QACzC,KAAgB,UAAmB,EAAnB,KAAA,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAnB,cAAmB,EAAnB,IAAmB;YAA9B,IAAM,CAAC,SAAA;YACV,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;SAAA;QAC1C,OAAO,MAAM,CAAC;IAChB,CAAC;IAEa,eAAM,GAApB,UAAwB,MAAmC,EAAE,OAA8B;QACzF,OAAO,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,OAAO,EAAE,UAAA,CAAC,IAAI,OAAA,CAAC,EAAD,CAAC,CAAC,CAAC;IAC3C,CAAC;IACH,eAAC;AAAD,CAAC,AAzBD,IAyBC;AAzBY,4BAAQ"}
1
+ {"version":3,"file":"ListUtil.js","sourceRoot":"","sources":["../../src/core/ListUtil.ts"],"names":[],"mappings":";;;AAAA;IAAA;IA6BA,CAAC;IA5Be,eAAM,GAApB,UAAwB,MAAW,EAAE,IAAuB;QAC1D,OAAO,MAAM,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC,KAAK,SAAS,CAAC;IACzE,CAAC;IAEa,cAAK,GAAnB,UAAuB,MAAW,EAAE,IAAuB;QACzD,IAAI,MAAM,IAAI,IAAI;YAChB,KAAgB,UAAM,EAAN,iBAAM,EAAN,oBAAM,EAAN,IAAM;gBAAjB,IAAM,CAAC,eAAA;gBACV,IAAI,IAAI,CAAC,CAAC,CAAC;oBACT,OAAO,CAAC,CAAC;aAAA;QACf,OAAO,SAAS,CAAC;IACnB,CAAC;IAEa,YAAG,GAAjB,UAAyB,MAAmC,EAAE,OAA8B,EAAE,OAAqB;QACjH,IAAI,MAAM,IAAI,IAAI;YAChB,OAAO,IAAI,CAAC;QACd,IAAM,MAAM,GAA0B,EAAE,CAAC;QACzC,KAAgB,UAAmB,EAAnB,KAAA,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAnB,cAAmB,EAAnB,IAAmB;YAA9B,IAAM,CAAC,SAAA;YACV,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;SAAA;QAC1C,OAAO,MAAM,CAAC;IAChB,CAAC;IAEa,gBAAO,GAArB,UAAyB,MAAmC,EAAE,OAA8B;QAC1F,OAAO,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,OAAO,EAAE,UAAA,CAAC,IAAI,OAAA,CAAC,EAAD,CAAC,CAAC,CAAC;IAC3C,CAAC;IAEa,kBAAS,GAAvB,UAA2B,MAAmC,EAAE,OAA8B;QAC5F,OAAO,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,OAAO,EAAE,UAAA,CAAC,IAAI,OAAA,CAAC,EAAD,CAAC,CAAC,CAAC;IAC3C,CAAC;IACH,eAAC;AAAD,CAAC,AA7BD,IA6BC;AA7BY,4BAAQ"}
@@ -7,5 +7,5 @@ export declare class StringCharSource extends CharSource {
7
7
  read(): string;
8
8
  peek(i?: number): string;
9
9
  isEof(idx?: number): boolean;
10
- readUntil(predicate: Predicate<CharSource>, target: StringBuilder | null, minLen?: number, maxLen?: number): boolean;
10
+ readUntil(target: StringBuilder | null, predicate: Predicate<CharSource>, minLen?: number, maxLen?: number): boolean;
11
11
  }
@@ -38,7 +38,7 @@ var StringCharSource = /** @class */ (function (_super) {
38
38
  if (idx === void 0) { idx = 0; }
39
39
  return this.bookmark.pos + idx >= this.str.length;
40
40
  };
41
- StringCharSource.prototype.readUntil = function (predicate, target, minLen, maxLen) {
41
+ StringCharSource.prototype.readUntil = function (target, predicate, minLen, maxLen) {
42
42
  if (minLen === void 0) { minLen = 0; }
43
43
  if (maxLen === void 0) { maxLen = Number.MAX_VALUE; }
44
44
  var startPos = this.bookmark.pos;
@@ -1 +1 @@
1
- {"version":3,"file":"StringCharSource.js","sourceRoot":"","sources":["../../src/core/StringCharSource.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAA0C;AAC1C,6DAA4D;AAI5D;IAAsC,oCAAU;IAC9C,0BAAmC,GAAW;QAA9C,YACE,iBAAO,SACR;QAFkC,SAAG,GAAH,GAAG,CAAQ;;IAE9C,CAAC;IAEM,+BAAI,GAAX;QACE,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;YACf,MAAM,IAAI,yCAAmB,EAAE,CAAC;QAClC,OAAO,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;IAClE,CAAC;IAEM,+BAAI,GAAX,UAAY,CAAK;QAAL,kBAAA,EAAA,KAAK;QACf,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;YACf,MAAM,IAAI,yCAAmB,EAAE,CAAC;QAClC,OAAO,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC;IAChD,CAAC;IAEM,gCAAK,GAAZ,UAAa,GAAO;QAAP,oBAAA,EAAA,OAAO;QAClB,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,GAAG,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC;IACpD,CAAC;IAEM,oCAAS,GAAhB,UACE,SAAgC,EAChC,MAA4B,EAC5B,MAAU,EACV,MAAyB;QADzB,uBAAA,EAAA,UAAU;QACV,uBAAA,EAAA,SAAS,MAAM,CAAC,SAAS;QAEzB,IAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC;QACnC,IAAI,GAAG,GAAG,CAAC,CAAC;QACZ,IAAI,OAAO,GAAG,KAAK,CAAC;QACpB,OAAO,GAAG,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,GAAG,EAAE,EAAE;YAC3C,OAAO,GAAG,GAAG,IAAI,MAAM,IAAI,SAAS,CAAC,IAAI,CAAC,CAAC;YAC3C,IAAI,OAAO;gBACT,MAAM;YACR,IAAI,CAAC,IAAI,EAAE,CAAC;SACb;QACD,IAAI,MAAM,IAAI,IAAI;YAChB,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC;QAChD,OAAO,OAAO,CAAC;IACjB,CAAC;IACH,uBAAC;AAAD,CAAC,AAxCD,CAAsC,uBAAU,GAwC/C;AAxCY,4CAAgB"}
1
+ {"version":3,"file":"StringCharSource.js","sourceRoot":"","sources":["../../src/core/StringCharSource.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAA0C;AAC1C,6DAA4D;AAI5D;IAAsC,oCAAU;IAC9C,0BAAmC,GAAW;QAA9C,YACE,iBAAO,SACR;QAFkC,SAAG,GAAH,GAAG,CAAQ;;IAE9C,CAAC;IAEM,+BAAI,GAAX;QACE,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;YACf,MAAM,IAAI,yCAAmB,EAAE,CAAC;QAClC,OAAO,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;IAClE,CAAC;IAEM,+BAAI,GAAX,UAAY,CAAK;QAAL,kBAAA,EAAA,KAAK;QACf,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;YACf,MAAM,IAAI,yCAAmB,EAAE,CAAC;QAClC,OAAO,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC;IAChD,CAAC;IAEM,gCAAK,GAAZ,UAAa,GAAO;QAAP,oBAAA,EAAA,OAAO;QAClB,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,GAAG,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC;IACpD,CAAC;IAEM,oCAAS,GAAhB,UAAiB,MAA4B,EAAE,SAAgC,EAAE,MAAU,EAAE,MAAyB;QAArC,uBAAA,EAAA,UAAU;QAAE,uBAAA,EAAA,SAAS,MAAM,CAAC,SAAS;QACpH,IAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC;QACnC,IAAI,GAAG,GAAG,CAAC,CAAC;QACZ,IAAI,OAAO,GAAG,KAAK,CAAC;QACpB,OAAO,GAAG,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,GAAG,EAAE,EAAE;YAC3C,OAAO,GAAG,GAAG,IAAI,MAAM,IAAI,SAAS,CAAC,IAAI,CAAC,CAAC;YAC3C,IAAI,OAAO;gBACT,MAAM;YACR,IAAI,CAAC,IAAI,EAAE,CAAC;SACb;QACD,IAAI,MAAM,IAAI,IAAI;YAChB,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC;QAChD,OAAO,OAAO,CAAC;IACjB,CAAC;IACH,uBAAC;AAAD,CAAC,AAnCD,CAAsC,uBAAU,GAmC/C;AAnCY,4CAAgB"}
@@ -0,0 +1 @@
1
+ export {};
@@ -0,0 +1,18 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ var StringCharSource_1 = require("../StringCharSource");
4
+ describe('StringCharSource', function () {
5
+ test('testReadQuotedStringError', function () {
6
+ var cs = new StringCharSource_1.StringCharSource("'Missing closing quote");
7
+ var c = cs.read(); // skip first quote
8
+ try {
9
+ cs.readQuotedString(c);
10
+ fail("Should throw error");
11
+ }
12
+ catch (e) {
13
+ expect(e.message).toBe("Can't find matching quote at position:1;line:0;col:1");
14
+ // e.printStackTrace();
15
+ }
16
+ });
17
+ });
18
+ //# sourceMappingURL=StringCharSource.spec.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"StringCharSource.spec.js","sourceRoot":"","sources":["../../../src/core/__test__/StringCharSource.spec.ts"],"names":[],"mappings":";;AAAA,wDAAuD;AAEvD,QAAQ,CAAC,kBAAkB,EAAE;IAE3B,IAAI,CAAC,2BAA2B,EAAE;QAChC,IAAM,EAAE,GAAG,IAAI,mCAAgB,CAAC,wBAAwB,CAAC,CAAC;QAC1D,IAAM,CAAC,GAAG,EAAE,CAAC,IAAI,EAAE,CAAC,CAAE,mBAAmB;QACzC,IAAI;YACF,EAAE,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC;YACvB,IAAI,CAAC,oBAAoB,CAAC,CAAC;SAC5B;QAAC,OAAM,CAAM,EAAE;YACd,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,sDAAsD,CAAC,CAAC;YAC/E,uBAAuB;SACxB;IACH,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
@@ -19,5 +19,15 @@ describe('CSVParser and CSVWriter', function () {
19
19
  test('testReadField', function () {
20
20
  expect(CSVParser_1.CSVParser.get().readField(new __1.StringCharSource("'ab''cd'"), new CSVOption_1.CSVOption().setQuoteChar('\''))).toBe("ab'cd");
21
21
  });
22
+ test("testReadFieldMissingQuote", function () {
23
+ var error = "";
24
+ try {
25
+ CSVParser_1.CSVParser.get().readField(new __1.StringCharSource("'ab''cd"), new CSVOption_1.CSVOption().setQuoteChar('\''));
26
+ }
27
+ catch (e) {
28
+ error = e.message;
29
+ }
30
+ expect(error).toBe("Can't find matching quote at position:4;line:0;col:4");
31
+ });
22
32
  });
23
33
  //# sourceMappingURL=CSV.spec.js.map
@@ -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,wBAAsC;AAEtC,IAAM,OAAO,GAAG,4HAMf,CAAC;AAEF,QAAQ,CAAC,yBAAyB,EAAE;IAClC,IAAI,CAAC,oBAAoB,EAAE;QACzB,IAAM,IAAI,GAAG,qBAAS,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAC5C,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,eAAe,EAAE,CAAC;QAE1C,IAAM,GAAG,GAAG,IAAI,qBAAS,EAAE,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;QAC7C,IAAM,GAAG,GAAG,qBAAS,CAAC,GAAG,EAAE,CAAC,aAAa,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QACrD,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,eAAe,EAAE,CAAC;QAC3C,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;IACpD,CAAC,CAAC,CAAC;IAEH,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,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACxH,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"CSV.spec.js","sourceRoot":"","sources":["../../src/csv/CSV.spec.ts"],"names":[],"mappings":";;AAAA,yCAAwC;AACxC,yCAAwC;AACxC,yCAAwC;AACxC,wBAAsC;AAEtC,IAAM,OAAO,GAAG,4HAMf,CAAC;AAEF,QAAQ,CAAC,yBAAyB,EAAE;IAClC,IAAI,CAAC,oBAAoB,EAAE;QACzB,IAAM,IAAI,GAAG,qBAAS,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAC5C,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,eAAe,EAAE,CAAC;QAE1C,IAAM,GAAG,GAAG,IAAI,qBAAS,EAAE,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;QAC7C,IAAM,GAAG,GAAG,qBAAS,CAAC,GAAG,EAAE,CAAC,aAAa,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QACrD,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,eAAe,EAAE,CAAC;QAC3C,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;IACpD,CAAC,CAAC,CAAC;IAEH,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,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACxH,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,IAAI,CAAC,CAAC,CAAC;SAChG;QAAC,OAAO,CAAM,EAAE;YACf,KAAK,GAAG,CAAC,CAAC,OAAO,CAAC;SACnB;QACD,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,sDAAsD,CAAC,CAAC;IAC7E,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAC"}
@@ -7,5 +7,5 @@ export declare class CSVParser {
7
7
  static parse(src: CharSource | string, opt: CSVOption): TDNode;
8
8
  parse(src: CharSource | string, opt?: CSVOption, root?: TDNode): TDNode;
9
9
  readRecord(src: CharSource, opt: CSVOption, root: TDNode): void;
10
- readField(source: CharSource, opt: CSVOption): ValueType;
10
+ readField(src: CharSource, opt: CSVOption): ValueType;
11
11
  }
@@ -7,6 +7,7 @@ var StringBuilder_1 = require("../core/StringBuilder");
7
7
  var TreeDoc_1 = require("../TreeDoc");
8
8
  var __1 = require("..");
9
9
  var ClassUtil_1 = require("../core/ClassUtil");
10
+ var EOFRuntimeException_1 = require("../core/EOFRuntimeException");
10
11
  var SPACE_CHARS = " \r";
11
12
  var CSVParser = /** @class */ (function () {
12
13
  function CSVParser() {
@@ -44,28 +45,32 @@ var CSVParser = /** @class */ (function () {
44
45
  if (!src.isEof())
45
46
  src.read(); // Skip the recordSep
46
47
  };
47
- CSVParser.prototype.readField = function (source, opt) {
48
+ CSVParser.prototype.readField = function (src, opt) {
48
49
  var sb = new StringBuilder_1.StringBuilder();
49
50
  var previousQuoted = false;
50
51
  var isString = false;
51
- while (!source.isEof() && source.peek() !== opt.fieldSep && source.peek() !== opt.recordSep) {
52
- if (source.peek() === opt.quoteChar) {
52
+ while (!src.isEof() && src.peek() !== opt.fieldSep && src.peek() !== opt.recordSep) {
53
+ if (src.peek() === opt.quoteChar) {
53
54
  isString = true;
54
55
  if (previousQuoted)
55
56
  sb.append(opt.quoteChar);
56
- source.skip(); // for "", we will keep one quote
57
- source.readUntilTerminatorToString(opt.quoteChar, sb);
58
- if (source.peek() === opt.quoteChar)
59
- source.skip();
57
+ // Not calling getBookmark() to avoid clone an object
58
+ var _a = src.bookmark, pos = _a.pos, line = _a.line, col = _a.col;
59
+ src.skip(); // for "", we will keep one quote
60
+ src.readUntilTerminatorToString(sb, opt.quoteChar);
61
+ if (src.isEof())
62
+ throw new EOFRuntimeException_1.EOFRuntimeException("Can't find matching quote at position:" + pos + ";line:" + line + ";col:" + col);
63
+ if (src.peek() === opt.quoteChar)
64
+ src.skip();
60
65
  previousQuoted = true;
61
66
  }
62
67
  else {
63
- sb.append(source.readUntilTerminator(opt.fieldSep + opt.recordSep).trim());
68
+ sb.append(src.readUntilTerminator(opt.fieldSep + opt.recordSep).trim());
64
69
  previousQuoted = false;
65
70
  }
66
71
  }
67
- if (!source.isEof() && source.peek() === opt.fieldSep)
68
- source.skip(); // Skip fieldSep
72
+ if (!src.isEof() && src.peek() === opt.fieldSep)
73
+ src.skip(); // Skip fieldSep
69
74
  var str = sb.toString();
70
75
  return isString ? str : ClassUtil_1.ClassUtil.toSimpleObject(str);
71
76
  };