@tasenor/common-plugins 1.11.58 → 1.11.59

package/.turbo/turbo-build.log

@@ -1,4 +1,4 @@
 
-> @tasenor/common-plugins@1.11.57 build /home/ci/tasenor-qa/tasenor-bookkeeper/packages/tasenor-common-plugins
+> @tasenor/common-plugins@1.11.58 build /home/ci/tasenor-qa/tasenor-bookkeeper/packages/tasenor-common-plugins
 > rm -fr dist && tsc
 

package/.turbo/turbo-ci.log

@@ -1,8 +1,8 @@
 
-> @tasenor/common-plugins@1.11.57 ci /home/ci/tasenor-qa/tasenor-bookkeeper/packages/tasenor-common-plugins
+> @tasenor/common-plugins@1.11.58 ci /home/ci/tasenor-qa/tasenor-bookkeeper/packages/tasenor-common-plugins
 > pnpm run lint
 
 
-> @tasenor/common-plugins@1.11.57 lint /home/ci/tasenor-qa/tasenor-bookkeeper/packages/tasenor-common-plugins
+> @tasenor/common-plugins@1.11.58 lint /home/ci/tasenor-qa/tasenor-bookkeeper/packages/tasenor-common-plugins
 > eslint 'src/**/*.{ts,tsx}' 'data/**/*.mjs'
 

package/dist/CoinbaseImport/backend/CoinbaseHandler.js

@@ -35,36 +35,49 @@ export class CoinbaseHandler extends TransactionImportHandler {
         if (file.firstLineMatch(/"You can use this transaction report/)) {
             return 2;
         }
+        if (file.firstLineMatch(/^$/) && file.secondLineMatch(/^Transactions$/)) {
+            return 3;
+        }
         return 0;
     }
     async init(files) {
-        if (this.version === 2) {
+        if (this.version === 1) {
+            return files;
+        }
+        if (this.version === 2 || this.version === 3) {
             // Clean up trash from the beginning.
             for (const file of files) {
                 const data = file.decode();
-                const lines = data.split('\n').splice(7);
+                const lines = data.split('\n').splice(this.version === 2 ? 7 : 3);
                 if (!/^Timestamp,Transaction Type,Asset,Quantity Transacted,Spot Price Currency,Spot Price at Transaction,Subtotal,Total/.test(lines[0])) {
                     throw new Error('Coinbase parser is not able to understand the format.');
                 }
                 file.set(lines.join('\n'));
             }
+            return files;
         }
-        return files;
+        throw new Error(`Coinbase import handler does not implement init() for version ${this.version}.`);
     }
     segmentId(line) {
-        if (this.version === 2) {
+        if (this.version === 2 || this.version === 3) {
             return super.segmentId(line);
         }
-        if (['deposit', 'withdrawal'].includes(line.columns.type)) {
-            return line.columns['transfer id'];
+        if (this.version === 1) {
+            if (['deposit', 'withdrawal'].includes(line.columns.type)) {
+                return line.columns['transfer id'];
+            }
+            return line.columns['trade id'];
         }
-        return line.columns['trade id'];
+        throw new Error(`Coinbase import handler does not implement segmentId() for version ${this.version}.`);
     }
     time(line) {
-        if (this.version === 2) {
+        if (this.version === 2 || this.version === 3) {
             return line.columns.Timestamp ? new Date(line.columns.Timestamp) : undefined;
         }
-        return line.columns.time ? new Date(line.columns.time) : undefined;
+        if (this.version === 1) {
+            return line.columns.time ? new Date(line.columns.time) : undefined;
+        }
+        throw new Error(`Coinbase import handler does not implement time() for version ${this.version}.`);
     }
 }
 //# sourceMappingURL=CoinbaseHandler.js.map

package/dist/CoinbaseImport/backend/CoinbaseHandler.js.map

@@ -1 +1 @@
-{"version":3,"file":"CoinbaseHandler.js","sourceRoot":"","sources":["../../../src/CoinbaseImport/backend/CoinbaseHandler.ts"],"names":[],"mappings":"AACA,OAAO,EAAe,wBAAwB,EAAE,MAAM,sBAAsB,CAAA;AAE5E;;GAEG;AACH,MAAM,OAAO,eAAgB,SAAQ,wBAAwB;IAE3D;QACE,KAAK,CAAC,gBAAgB,CAAC,CAAA;QACvB,IAAI,CAAC,aAAa,GAAG;YACnB,MAAM,EAAE,KAAK;YACb,aAAa,EAAE,CAAC,QAAQ,EAAE,SAAS,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,CAAC;YACtF,cAAc,EAAE,EAAE;YAClB,SAAS,EAAE,MAAM;YACjB,gBAAgB,EAAE,QAAQ;YAC1B,GAAG,EAAE,EAAE,oBAAoB,EAAE,IAAI,EAAE;YACnC,cAAc,EAAE;gBACd,KAAK;gBACL,qBAAqB,EAAE,MAAM;gBAC7B,KAAK;gBACL,kBAAkB,EAAE,MAAM;gBAC1B,qBAAqB,EAAE,UAAU;gBACjC,qBAAqB,EAAE,UAAU;gBACjC,2BAA2B,EAAE,OAAO;gBACpC,yCAAyC,EAAE,OAAO;gBAClD,oBAAoB,EAAE,MAAM;aAC7B;SACF,CAAA;IACH,CAAC;IAED,IAAI,IAAI;QACN,OAAO,SAA0B,CAAA;IACnC,CAAC;IAED,SAAS,CAAC,IAAiB;QACzB,IAAI,IAAI,CAAC,cAAc,CAAC,0FAA0F,CAAC,EAAE;YACnH,OAAO,CAAC,CAAA;SACT;QACD,IAAI,IAAI,CAAC,cAAc,CAAC,sCAAsC,CAAC,EAAE;YAC/D,OAAO,CAAC,CAAA;SACT;QAED,OAAO,CAAC,CAAA;IACV,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,KAAoB;QAC7B,IAAI,IAAI,CAAC,OAAO,KAAK,CAAC,EAAE;YACtB,qCAAqC;YACrC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;gBACxB,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,EAAE,CAAA;gBAC1B,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;gBACxC,IAAI,CAAC,oHAAoH,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE;oBACxI,MAAM,IAAI,KAAK,CAAC,uDAAuD,CAAC,CAAA;iBACzE;gBACD,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;aAC3B;SACF;QACD,OAAO,KAAK,CAAA;IACd,CAAC;IAED,SAAS,CAAC,IAAkB;QAC1B,IAAI,IAAI,CAAC,OAAO,KAAK,CAAC,EAAE;YACtB,OAAO,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;SAC7B;QACD,IAAI,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YACzD,OAAO,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,CAAA;SACnC;QACD,OAAO,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAA;IACjC,CAAC;IAED,IAAI,CAAC,IAAkB;QACrB,IAAI,IAAI,CAAC,OAAO,KAAK,CAAC,EAAE;YACtB,OAAO,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;SAC7E;QACD,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IACpE,CAAC;CACF"}
+{"version":3,"file":"CoinbaseHandler.js","sourceRoot":"","sources":["../../../src/CoinbaseImport/backend/CoinbaseHandler.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tasenor/common-plugins",
-  "version": "1.11.58",
+  "version": "1.11.59",
   "description": "Shared common plugins of Tasenor project",
   "repository": "git@github.com:dataplugoy/tasenor-bookkeeper.git",
   "author": "Tommi Ronkainen <tommi.ronkainen@gmail.com>",
@@ -13,9 +13,9 @@
     "dayjs": "1.10.8",
     "sprintf-js": "^1.1.2",
     "tsx": "^4.7.0",
-    "@tasenor/common-node": "1.11.58",
-    "@tasenor/common-ui": "1.11.58",
-    "@tasenor/common": "1.11.58"
+    "@tasenor/common": "1.11.59",
+    "@tasenor/common-node": "1.11.59",
+    "@tasenor/common-ui": "1.11.59"
   },
   "devDependencies": {
     "@mui/icons-material": "^5.14.1",
@@ -31,7 +31,7 @@
     "react-i18next": "^14.0.5",
     "react-router-dom": "^6.14.1",
     "typescript": "^5.1.6",
-    "@tasenor/config": "1.11.58",
+    "@tasenor/config": "1.11.59",
     "eslint-config-tasenor": "0.0.0"
   },
   "peerDependencies": {

package/src/CoinbaseImport/backend/CoinbaseHandler.ts

@@ -40,39 +40,53 @@ export class CoinbaseHandler extends TransactionImportHandler {
     if (file.firstLineMatch(/"You can use this transaction report/)) {
       return 2
     }
+    if (file.firstLineMatch(/^$/) && file.secondLineMatch(/^Transactions$/)) {
+      return 3
+    }
 
     return 0
   }
 
   async init(files: ProcessFile[]): Promise<ProcessFile[]> {
-    if (this.version === 2) {
+    if (this.version === 1) {
+      return files
+    }
+    if (this.version === 2 || this.version === 3) {
       // Clean up trash from the beginning.
       for (const file of files) {
         const data = file.decode()
-        const lines = data.split('\n').splice(7)
+        const lines = data.split('\n').splice(this.version === 2 ? 7 : 3)
         if (!/^Timestamp,Transaction Type,Asset,Quantity Transacted,Spot Price Currency,Spot Price at Transaction,Subtotal,Total/.test(lines[0])) {
           throw new Error('Coinbase parser is not able to understand the format.')
         }
         file.set(lines.join('\n'))
       }
+      return files
     }
-    return files
+
+    throw new Error(`Coinbase import handler does not implement init() for version ${this.version}.`)
   }
 
   segmentId(line: TextFileLine): SegmentId | typeof NO_SEGMENT {
-    if (this.version === 2) {
+    if (this.version === 2 || this.version === 3) {
       return super.segmentId(line)
     }
-    if (['deposit', 'withdrawal'].includes(line.columns.type)) {
-      return line.columns['transfer id']
+    if (this.version === 1) {
+      if (['deposit', 'withdrawal'].includes(line.columns.type)) {
+        return line.columns['transfer id']
+      }
+      return line.columns['trade id']
     }
-    return line.columns['trade id']
+    throw new Error(`Coinbase import handler does not implement segmentId() for version ${this.version}.`)
   }
 
   time(line: TextFileLine): Date | undefined {
-    if (this.version === 2) {
+    if (this.version === 2 || this.version === 3) {
       return line.columns.Timestamp ? new Date(line.columns.Timestamp) : undefined
     }
-    return line.columns.time ? new Date(line.columns.time) : undefined
+    if (this.version === 1) {
+      return line.columns.time ? new Date(line.columns.time) : undefined
+    }
+    throw new Error(`Coinbase import handler does not implement time() for version ${this.version}.`)
   }
 }