@tasenor/common-plugins 1.11.60 → 1.11.62

package/.turbo/turbo-build.log

@@ -1,4 +1,4 @@
 
-> @tasenor/common-plugins@1.11.59 build /home/ci/tasenor-qa/tasenor-bookkeeper/packages/tasenor-common-plugins
+> @tasenor/common-plugins@1.11.61 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.59 ci /home/ci/tasenor-qa/tasenor-bookkeeper/packages/tasenor-common-plugins
+> @tasenor/common-plugins@1.11.61 ci /home/ci/tasenor-qa/tasenor-bookkeeper/packages/tasenor-common-plugins
 > pnpm run lint
 
 
-> @tasenor/common-plugins@1.11.59 lint /home/ci/tasenor-qa/tasenor-bookkeeper/packages/tasenor-common-plugins
+> @tasenor/common-plugins@1.11.61 lint /home/ci/tasenor-qa/tasenor-bookkeeper/packages/tasenor-common-plugins
 > eslint 'src/**/*.{ts,tsx}' 'data/**/*.mjs'
 

package/dist/CoinbaseImport/backend/CoinbaseHandler.d.ts

@@ -10,4 +10,5 @@ export declare class CoinbaseHandler extends TransactionImportHandler {
     init(files: ProcessFile[]): Promise<ProcessFile[]>;
     segmentId(line: TextFileLine): SegmentId | typeof NO_SEGMENT;
     time(line: TextFileLine): Date | undefined;
+    segmentationColumnPostProcess(columns: Record<string, string>): Promise<Record<string, string>>;
 }

package/dist/CoinbaseImport/backend/CoinbaseHandler.js

@@ -79,5 +79,17 @@ export class CoinbaseHandler extends TransactionImportHandler {
         }
         throw new Error(`Coinbase import handler does not implement time() for version ${this.version}.`);
     }
+    async segmentationColumnPostProcess(columns) {
+        if (columns.type === 'Convert') {
+            const match = /Converted ([0-9.]+) (\w+) to ([0-9.]+) (\w+)/.exec(columns.Notes);
+            if (match) {
+                columns.giveAmount = match[1];
+                columns.giveAsset = match[2];
+                columns.takeAmount = match[3];
+                columns.takeAsset = match[4];
+            }
+        }
+        return columns;
+    }
 }
 //# 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":"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"}
+{"version":3,"file":"CoinbaseHandler.js","sourceRoot":"","sources":["../../../src/CoinbaseImport/backend/CoinbaseHandler.ts"],"names":[],"mappings":"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"}

package/dist/CoinbaseImport/backend/index.js

@@ -5,7 +5,7 @@ class CoinbaseImportPlugin extends ImportPlugin {
         super(new CoinbaseHandler());
         this.code = 'CoinbaseImport';
         this.title = 'Import for Coinbase';
-        this.version = '1.0.22';
+        this.version = '1.0.23';
         this.icon = '<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="#000000"><path d="M0 0h24v24H0V0z" fill="none"/><path d="M5 6.99h3V14h2V6.99h3L9 3zM14 10v7.01h-3L15 21l4-3.99h-3V10z"/></svg>';
         this.releaseDate = '2022-10-24';
         this.use = 'backend';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tasenor/common-plugins",
-  "version": "1.11.60",
+  "version": "1.11.62",
   "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": "1.11.60",
-    "@tasenor/common-node": "1.11.60",
-    "@tasenor/common-ui": "1.11.60"
+    "@tasenor/common-node": "1.11.62",
+    "@tasenor/common": "1.11.62",
+    "@tasenor/common-ui": "1.11.62"
   },
   "devDependencies": {
     "@mui/icons-material": "^5.14.1",
@@ -31,8 +31,8 @@
     "react-i18next": "^14.0.5",
     "react-router-dom": "^6.14.1",
     "typescript": "^5.1.6",
-    "eslint-config-tasenor": "0.0.0",
-    "@tasenor/config": "1.11.60"
+    "@tasenor/config": "1.11.62",
+    "eslint-config-tasenor": "0.0.0"
   },
   "peerDependencies": {
     "@mui/icons-material": "^5.14.1",

package/src/CoinbaseImport/backend/CoinbaseHandler.ts

@@ -89,4 +89,17 @@ export class CoinbaseHandler extends TransactionImportHandler {
     }
     throw new Error(`Coinbase import handler does not implement time() for version ${this.version}.`)
   }
+
+  async segmentationColumnPostProcess(columns: Record<string, string>): Promise<Record<string, string>> {
+    if (columns.type === 'Convert') {
+      const match = /Converted ([0-9.]+) (\w+) to ([0-9.]+) (\w+)/.exec(columns.Notes)
+      if (match) {
+        columns.giveAmount = match[1]
+        columns.giveAsset = match[2]
+        columns.takeAmount = match[3]
+        columns.takeAsset = match[4]
+      }
+    }
+    return columns
+  }
 }

package/src/CoinbaseImport/backend/index.ts

@@ -9,7 +9,7 @@ class CoinbaseImportPlugin extends ImportPlugin {
 
     this.code = 'CoinbaseImport' as PluginCode
     this.title = 'Import for Coinbase'
-    this.version = '1.0.22' as Version
+    this.version = '1.0.23' as Version
     this.icon = '<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="#000000"><path d="M0 0h24v24H0V0z" fill="none"/><path d="M5 6.99h3V14h2V6.99h3L9 3zM14 10v7.01h-3L15 21l4-3.99h-3V10z"/></svg>'
     this.releaseDate = '2022-10-24'
     this.use = 'backend'

package/src/CoinbaseImport/backend/rules.json

@@ -137,6 +137,86 @@
           "reason": "'trade'"
         }
       ]
+    },
+    {
+      "name": "Send (v2)",
+      "filter": "type == 'Send'",
+      "result": [
+        {
+          "data": {
+            "text": "Notes",
+            "currency": "Currency",
+            "currencyValue": "-Total",
+            "rates": "rates(Currency, Price)"
+          },
+          "type": "'crypto'",
+          "asset": "Asset",
+          "amount": "-Quantity",
+          "reason": "'expense'"
+        },
+        {
+          "data": {
+            "text": "Notes",
+            "currency": "Currency",
+            "currencyValue": "Total"
+          },
+          "type": "'statement'",
+          "asset": "'NEEDS_MANUAL_INSPECTION'",
+          "amount": "Total",
+          "reason": "'expense'"
+        }
+      ]
+    },
+    {
+      "name": "Receive (v2)",
+      "filter": "type == 'Receive'",
+      "result": [
+        {
+          "data": {
+            "text": "Notes",
+            "currency": "Currency",
+            "currencyValue": "Total",
+            "rates": "rates(Currency, Price)"
+          },
+          "type": "'crypto'",
+          "asset": "Asset",
+          "amount": "Quantity",
+          "reason": "'income'"
+        },
+        {
+          "data": {
+            "currency": "Currency",
+            "currencyValue": "Total"
+          },
+          "type": "'statement'",
+          "asset": "'NEEDS_MANUAL_INSPECTION'",
+          "amount": "Total",
+          "reason": "'income'"
+        }
+      ]
+    },
+    {
+      "name": "Convert (v2)",
+      "filter": "type == 'Convert'",
+      "result": [
+        {
+          "data": {
+            "text": "Notes",
+            "currency": "Currency",
+            "currencyValue": "-Total * 100"
+          },
+          "type": "'crypto'",
+          "asset": "giveAsset",
+          "amount": "-giveAmount",
+          "reason": "'trade'"
+        },
+        {
+          "type": "'crypto'",
+          "asset": "takeAsset",
+          "amount": "takeAmount",
+          "reason": "'trade'"
+        }
+      ]
     }
   ]
 }