parse-csv-simple - npm Package Compare versions

Comparing version 1.0.2 to 1.0.3

.mocharc.json

 {
   "require": "ts-node/register"
 }

dist/builders/iterator-builder.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.IteratorBuilder = void 0;
+const utils_1 = require("../utils");
 class IteratorBuilder {
     constructor(option) {
+        this.next = null;
+        this.tempRow = [];
+        this.isEnd = false;
+        this.fetchedRows = 0;
         this.limit = (option === null || option === void 0 ? void 0 : option.limit) || Infinity;
     }
     onEnd() {
+        this.isEnd = true;
     }
-    onCell() {
+    onCell(cell) {
+        this.tempRow.push(cell);
     }
-    onRowEnd() {
+    onRowEnd(next) {
+        this.fetchedRows++;
+        if (this.fetchedRows >= this.limit) {
+            this.isEnd = true;
+        }
+        this.next = next;
     }
     getResult() {
-        return [];
+        const self = this;
+        return {
+            *[Symbol.iterator]() {
+                while (!self.isEnd) {
+                    yield self.tempRow.slice();
+                    self.tempRow = [];
+                    self.next && self.next();
+                }
+                if (!utils_1.isArrayEmpty(self.tempRow)) {
+                    yield self.tempRow.slice();
+                }
+            }
+        };
     }
 }
 exports.IteratorBuilder = IteratorBuilder;

dist/builders/sync-builder.js

@@ -0,0 +0,0 @@ "use strict";

dist/consts/index.js

@@ -0,0 +0,0 @@ "use strict";

dist/index.js

@@ -6,17 +6,27 @@ "use strict";
 const sync_builder_1 = require("./builders/sync-builder");
-function parse(text, option) {
-    option = option || {};
-    const builder = new sync_builder_1.SyncBuilder({
-        limit: option.limit || Infinity,
-    });
+const iterator_builder_1 = require("./builders/iterator-builder");
+function _parse(text, option) {
     new parser_1.Parser({
-        builder,
+        builder: option.builder,
         delimiter: option.delimiter,
     }).parse(text);
-    return builder.getResult();
+    return option.builder.getResult();
 }
+function parse(text, option) {
+    return _parse(text, {
+        delimiter: option === null || option === void 0 ? void 0 : option.delimiter,
+        builder: new sync_builder_1.SyncBuilder({
+            limit: (option === null || option === void 0 ? void 0 : option.limit) || Infinity,
+        }),
+    });
+}
 exports.parse = parse;
-function parseIterable() {
-    // TODO: implemented based on IteratorBUilder
+function parseIterable(text, option) {
+    return _parse(text, {
+        delimiter: option === null || option === void 0 ? void 0 : option.delimiter,
+        builder: new iterator_builder_1.IteratorBuilder({
+            limit: (option === null || option === void 0 ? void 0 : option.limit) || Infinity,
+        }),
+    });
 }
 exports.parseIterable = parseIterable;

dist/interfaces/index.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });

dist/parser.js

@@ -48,13 +48,13 @@ "use strict";
         const next = () => {
-            const resut = iterator.next();
-            if (resut.done) {
+            const result = iterator.next();
+            if (result.done) {
                 builder.onEnd();
                 return;
             }
-            if (resut.value.type === 'cell') {
-                const cell = transform(resut.value.value);
+            if (result.value.type === 'cell') {
+                const cell = transform(result.value.value);
                 builder.onCell(cell);
                 next();
             }
-            else if (resut.value.type === 'row') {
+            else if (result.value.type === 'row') {
                 builder.onRowEnd(next);
@@ -61,0 +61,0 @@ }

dist/utils/index.js

@@ -0,0 +0,0 @@ "use strict";

package.json

 {
   "name": "parse-csv-simple",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "A parser for csv file.",
@@ -14,3 +14,3 @@ "main": "dist/index.js",
   },
-  "keywords": [],
+  "keywords": ["csv", "parse csv"],
   "author": "",
@@ -28,3 +28,6 @@ "license": "ISC",
     "typescript": "^4.3.5"
+  },
+  "dependencies": {
+    "ts-node": "^10.1.0"
   }
 }

README.md

@@ -0,0 +0,0 @@ # parse-csv-simple

src/__test__/parse.test.ts

 import { expect } from "chai";
-import { parse } from "..";
+import { parse, parseIterable } from "..";
 
@@ -32,2 +32,17 @@
 
+});
+
+describe('parseIterable', function() {
+
+  const csvText = "name,age,gender\nweilei,28,male";
+
+  it('should return an iterable object', function() {
+    const result = [...parseIterable(csvText)];
+    expect(result).has.lengthOf(2);
+    const row1 = result[0];
+    expect(row1).is.an('array');
+    expect(row1).has.lengthOf(3);
+    expect(row1.join(',')).equal('name,age,gender');
+  });
+
 });

src/builders/iterator-builder.ts

 import { Builder } from "../interfaces";
+import { isArrayEmpty } from "../utils";
 
@@ -8,3 +9,8 @@ interface IteratorBuilderOption {
   limit: number;
+  next: (() => void) | null = null;
 
+  tempRow: any[] = [];
+  isEnd = false;
+  fetchedRows: number = 0;
+
   constructor(option: IteratorBuilderOption) {
@@ -15,16 +21,34 @@ this.limit = option?.limit || Infinity;
   onEnd() {
-
+    this.isEnd = true;
   }
 
-  onCell() {
-
+  onCell(cell: any) {
+    this.tempRow.push(cell);
   }
 
-  onRowEnd() {
+  onRowEnd(next: () => void) {
+    this.fetchedRows++;
+    if (this.fetchedRows >= this.limit) {
+      this.isEnd = true;
+    }
 
+    this.next = next;
   }
 
   getResult() {
-    return [];
+    const self = this;
+    return {
+      *[Symbol.iterator]() {
+        while(!self.isEnd) {
+          yield self.tempRow.slice();
+          self.tempRow = [];
+          self.next && self.next();
+        }
+
+        if (!isArrayEmpty(self.tempRow)) {
+          yield self.tempRow.slice();
+        }
+      }
+    };
   }
 }

src/builders/sync-builder.ts

@@ -0,0 +0,0 @@ import { Builder } from '../interfaces';

src/consts/index.ts

@@ -0,0 +0,0 @@ export const REGEXP_META_CHARS = [

src/index.ts

 import { Parser } from "./parser";
 import { SyncBuilder } from './builders/sync-builder';
+import { Builder } from "./interfaces";
+import { IteratorBuilder } from "./builders/iterator-builder";
 
-export function parse(text: string, option?: {limit?: number, delimiter?: string}) {
-  option = option || {};
-  const builder = new SyncBuilder({
-    limit: option.limit || Infinity,
-  });
-
+function _parse(text: string, option: {delimiter?: string, builder: Builder}) {
   new Parser({
-    builder,
+    builder: option.builder,
     delimiter: option.delimiter,
   }).parse(text);
 
-  return builder.getResult();
+  return option.builder.getResult();
 }
 
-export function parseIterable() {
-  // TODO: implemented based on IteratorBUilder
+export function parse(text: string, option?: {limit?: number, delimiter?: string}) {
+  return _parse(text, {
+    delimiter: option?.delimiter,
+    builder: new SyncBuilder({
+      limit: option?.limit || Infinity,
+    }),
+  });
 }
+
+export function parseIterable(text: string, option?: {limit?: number, delimiter?: string}) {
+  return _parse(text, {
+    delimiter: option?.delimiter,
+    builder: new IteratorBuilder({
+      limit: option?.limit || Infinity,
+    }),
+  });
+}

src/interfaces/index.ts

@@ -0,0 +0,0 @@

src/parser.ts

@@ -54,4 +54,4 @@ import { ParserOption, Builder, Transformer, ParsedResult } from './interfaces';
     const next = () => {
-      const resut = iterator.next();
-      if (resut.done) {
+      const result = iterator.next();
+      if (result.done) {
         builder.onEnd();
@@ -61,7 +61,7 @@ return;
 
-      if (resut.value.type === 'cell') {
-        const cell = transform(resut.value.value);
+      if (result.value.type === 'cell') {
+        const cell = transform(result.value.value);
         builder.onCell(cell);
         next();
-      } else if (resut.value.type === 'row') {
+      } else if (result.value.type === 'row') {
         builder.onRowEnd(next);
@@ -68,0 +68,0 @@ }

src/utils/index.ts

@@ -0,0 +0,0 @@ import { REGEXP_META_CHARS } from '../consts';

tsconfig.json

@@ -0,0 +0,0 @@ {

No alert changes

Improved metrics

Total package byte prevSize

16504

increased by15.79%

Lines of code

533

increased by17.66%

Worsened metrics

Dependency count

1

increased byInfinity%

Dependency changes

• + Addedts-node@^10.1.0

• + Added@cspotcode/source-map-support@0.8.1(transitive)

• + Added@jridgewell/resolve-uri@3.1.2(transitive)

• + Added@jridgewell/sourcemap-codec@1.4.15(transitive)

• + Added@jridgewell/trace-mapping@0.3.9(transitive)

• + Added@tsconfig/node10@1.0.11(transitive)

• + Added@tsconfig/node12@1.0.11(transitive)

• + Added@tsconfig/node14@1.0.3(transitive)

• + Added@tsconfig/node16@1.0.4(transitive)

• + Added@types/node@20.14.2(transitive)

• + Addedacorn@8.11.3(transitive)

• + Addedacorn-walk@8.3.2(transitive)

• + Addedarg@4.1.3(transitive)

• + Addedcreate-require@1.1.1(transitive)

• + Addeddiff@4.0.2(transitive)

• + Addedmake-error@1.3.6(transitive)

• + Addedts-node@10.9.2(transitive)

• + Addedtypescript@5.4.5(transitive)

• + Addedundici-types@5.26.5(transitive)

• + Addedv8-compile-cache-lib@3.0.1(transitive)

• + Addedyn@3.1.1(transitive)