@dra2020/baseclient 1.0.59 → 1.0.60

package/dist/baseclient.js

@@ -223,6 +223,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.ParseOne = void 0;
 const Util = __importStar(__webpack_require__(/*! ../util/all */ "./lib/util/all.ts"));
 // Parse CSV. 
 //    Fields are separated by commas or pipe symbol (census uses pipe separators.
@@ -248,6 +249,8 @@ class ParseOne {
         this.coder = coder;
         if (line)
             this.set(line);
+        else
+            this.fields = [];
     }
     set(line) {
         this.fields = [];
@@ -258,31 +261,37 @@ class ParseOne {
         this.infield = false;
         this.nwhite = 0;
         this.quote = 0;
+        this.force = false;
         this.parse();
     }
     get length() { return this.fields.length; }
-    pushtok(force) {
+    pushtok() {
         // Trim trailing whitespace
-        if (!force)
-            this.toklen -= this.nwhite;
-        if (this.toklen || force) {
+        this.toklen -= this.nwhite;
+        if (this.toklen || this.force) {
             this.fields.push(Util.u82s(this.coder, this.tok, 0, this.toklen));
             this.toklen = 0;
         }
         this.infield = false;
         this.nwhite = 0;
         this.quote = 0;
+        this.force = false;
     }
     parse() {
         while (this.n < this.buf.length) {
             let c = this.buf[this.n++];
-            if (this.quote && c === this.quote)
-                this.pushtok(true);
-            else if (c === Comma || c === Pipe)
-                this.pushtok(true);
+            if (this.quote && c === this.quote) {
+                this.quote = 0;
+                this.nwhite = 0;
+            }
+            else if (c === Comma || c === Pipe) {
+                this.force = true;
+                this.pushtok();
+                this.force = true;
+            }
             else if (this.infield) {
                 this.tok[this.toklen++] = c;
-                if (isWhite(c))
+                if (!this.quote && isWhite(c))
                     this.nwhite++;
                 else
                     this.nwhite = 0;
@@ -292,15 +301,18 @@ class ParseOne {
             else if (c === SingleQuote || c === DoubleQuote) {
                 this.quote = c;
                 this.infield = true;
+                this.force = true;
             }
             else {
                 this.infield = true;
                 this.tok[this.toklen++] = c;
+                this.force = true;
             }
         }
-        this.pushtok(false);
+        this.pushtok();
     }
 }
+exports.ParseOne = ParseOne;
 
 
 /***/ }),