@dra2020/baseclient 1.0.136 → 1.0.138

package/dist/csv/all.d.ts

@@ -1 +1,2 @@
 export * from './csv';
+export * from './csvparseline';

package/dist/csv/csvparseline.d.ts

@@ -0,0 +1 @@
+export declare function csvParseLine(s: string): string[];

package/lib/csv/all.ts

@@ -1 +1,2 @@
 export * from './csv';
+export * from './csvparseline';

package/lib/csv/csvparseline.ts

@@ -0,0 +1,35 @@
+const reField = /^\s*("([^"]*(?:""[^"]*)*)"|[^,|]*)\s*[|,]?/;
+const reQuote = /^"/;
+const reAddOne = /[|,]$/;
+
+export function csvParseLine(s: string): string[]
+{
+  let fields: string[] = [];
+
+  s = s.trim();
+  let addOne = reAddOne.test(s);
+  while (s)
+  {
+    const match = reField.exec(s);
+    if (match)
+    {
+      let field = match[1];
+      if (reQuote.test(field))
+      {
+        // if quoted string, convert quoted double-quotes to single quote
+        field = field.slice(1, -1).replace(/""/g, '"');
+        // and remove optional start and end double quote
+        field = field.replace(/^["]?/, '').replace(/["]?$/, '');
+      }
+      fields.push(field);
+      s = s.substring(match[0].length);
+    }
+    else
+      s = null;
+  }
+  // Handle trailing separator
+  if (addOne)
+    fields.push('');
+  return fields;
+}
+

package/lib/filterexpr/filterexpr.ts

@@ -32,6 +32,13 @@ function isWhite(c: number): boolean
   return c === Space || c === Newline || c === Tab || c == CR;
 }
 
+function toString(a: any): string
+{
+  if (typeof a === 'object' && a && typeof a.value === 'string')
+    return a.value;
+  return String(a);
+}
+
 enum TokType
 {
   Text,
@@ -637,7 +644,7 @@ export class FilterExpr
       case TokType.Text:
         for (let p in o) if (o.hasOwnProperty(p) && (prop == null || p.toLowerCase() === prop))
         {
-          let s = String(o[p]);
+          let s = toString(o[p]);
           if (s)
           {
             let t = types ? types[p] : undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dra2020/baseclient",
-  "version": "1.0.136",
+  "version": "1.0.138",
   "description": "Utility functions for Javascript projects.",
   "main": "dist/baseclient.js",
   "types": "./dist/all/all.d.ts",