@0xtorch/csv 0.0.79 → 0.0.81

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@0xtorch/csv",
-  "version": "0.0.79",
+  "version": "0.0.81",
   "description": "Cryptorch CSV extension",
   "keywords": [
     "cryptorch",

package/parseRowsToActions/parse.ts

@@ -10,7 +10,6 @@ import type { parserSchema } from '../schemas/parser'
 import type { FormattedRow } from '../types'
 import { getAllValue } from './allValue'
 import { getAssetById } from './asset'
-import { getCellValue } from './cellValue'
 import { isMatchPattern } from './pattern'
 import { createTransfers } from './transfer'
 
@@ -54,7 +53,12 @@ export const parseRowsToActionsByParser = ({
     const source = stringify(
       getAllValue({ schema: generator.source, rows, service, fileId }),
     )
-    const timestampValue = getCellValue({ schema: generator.timestamp, rows })
+    const timestampValue = getAllValue({
+      schema: generator.timestamp,
+      rows,
+      service,
+      fileId,
+    })
     const timestamp =
       typeof timestampValue === 'number'
         ? timestampValue

package/schemas/formatterTypes.ts

@@ -183,7 +183,7 @@ export const datetimeTextSchema = z
   .string()
   // Dec 31 2024, 12:53 AM EST
   .regex(
-    /^[A-Za-z]{3}\s+\d{1,2}\s+\d{4},\s+\d{1,2}:\d{2}\s+(AM|PM)\s+[A-Z]{3}$/,
+    /^[A-Za-z]{3}\s+\d{1,2},?\s+\d{4},\s+\d{1,2}:\d{2}(?::\d{2})?\s+(?:AM|PM)(?:\s+[A-Z]{2,4})?$/,
   )
   .transform((v) => new Date(v).getTime())
 

package/schemas/parser.ts

@@ -200,7 +200,7 @@ const generatorSchema = z.object({
   type: actionTypeUnionSchema,
   source: allValueSchema,
   evidence: actionEvidenceUnionSchema.optional(),
-  timestamp: cellValueSchema,
+  timestamp: allValueSchema,
   comment: allValueSchema.optional(),
   app: allValueSchema.optional(),
   crossId: allValueSchema.optional(),

package/tests/gemini-transaction.csv

@@ -0,0 +1,3 @@
+Date,Time (UTC),Type,Symbol,Specification,Liquidity Indicator,Trading Fee Rate (bps),USD Amount USD,Fee (USD) USD,USD Balance USD,BTC Amount BTC,Fee (BTC) BTC,BTC Balance BTC,ETH Amount ETH,Fee (ETH) ETH,ETH Balance ETH,GUSD Amount GUSD,Fee (GUSD) GUSD,GUSD Balance GUSD,DAI Amount DAI,Fee (DAI) DAI,DAI Balance DAI,SGD Amount SGD,Fee (SGD) SGD,SGD Balance SGD,USDC Amount USDC,Fee (USDC) USDC,USDC Balance USDC,USDT Amount USDT,Fee (USDT) USDT,USDT Balance USDT,Trade ID,Order ID,Order Date,Order Time,Client Order ID,API Session,Tx Hash,Deposit Destination,Deposit Tx Output,Withdrawal Destination,Withdrawal Tx Output
+2022-03-08,12:37:56.017,Credit,DAI,Deposit (DAI),,,,,$0.00 ,,,0.0 BTC ,,,0.0 ETH ,,,0.0 GUSD ,100.0 DAI ,0.0 DAI ,100.0 DAI ,,,$0.00 ,,,0.0 USDC ,,,0.0 USDT ,,,,,,,3accf72636b0cd58f7896b1abde78b39d018d005f8b36500ffbf576f492e9e65,0x47AE17ed6c75A6793a894A62ea3c5f942E9561aA,0,,
+,,,,,,,,$0.00 ,$0.00 ,,0.0 BTC ,0.0 BTC ,,0.0 ETH ,0.0 ETH ,,0.0 GUSD ,0.0 GUSD ,,0.0 DAI ,0.0 DAI ,,$0.00 ,$0.01 ,,0.0 USDC ,0.0 USDC ,,0.0 USDT ,0.0 USDT ,,,,,,,,,,,

package/tests/gemini.ts

@@ -0,0 +1,72 @@
+import type { CsvFormat } from '../types'
+
+export const geminiTransactionFormat = {
+  id: 'gemini-transaction',
+  service: 'gemini',
+  ignoreStartColumns: [['', '', '', '']],
+  formatter: {
+    Date: ['blank', 'string'],
+    'Time (UTC)': ['blank', 'string'],
+    Type: ['blank', 'string'],
+    Symbol: ['blank', 'string'],
+    Specification: ['blank', 'string'],
+    'USD Amount USD': ['blank', 'string'],
+    'Fee (USD) USD': ['blank', 'string'],
+    'BTC Amount BTC': ['blank', 'string'],
+    'Fee (BTC) BTC': ['blank', 'string'],
+    'ETH Amount ETH': ['blank', 'string'],
+    'Fee (ETH) ETH': ['blank', 'string'],
+    'GUSD Amount GUSD': ['blank', 'string'],
+    'Fee (GUSD) GUSD': ['blank', 'string'],
+    'DAI Amount DAI': ['blank', 'string'],
+    'Fee (DAI) DAI': ['blank', 'string'],
+    'SGD Amount SGD': ['blank', 'string'],
+    'Fee (SGD) SGD': ['blank', 'string'],
+    'USDC Amount USDC': ['blank', 'string'],
+    'Fee (USDC) USDC': ['blank', 'string'],
+    'USDT Amount USDT': ['blank', 'string'],
+    'Fee (USDT) USDT': ['blank', 'string'],
+  },
+  parser: {
+    parsers: [
+      {
+        conditions: [
+          {
+            value: {
+              type: 'cell',
+              column: 'Type',
+              row: 0,
+            },
+            pattern: 'Credit',
+          },
+        ],
+        generators: [
+          {
+            type: 'ignore',
+            source: {
+              type: 'join',
+              values: [
+                { type: 'service' },
+                '_',
+                { type: 'file-id' },
+                '_',
+                { type: 'cell', column: 'Date', row: 0 },
+                '_',
+                { type: 'cell', column: 'Time (UTC)', row: 0 },
+              ],
+            },
+            timestamp: {
+              type: 'join',
+              values: [
+                { type: 'cell', column: 'Date', row: 0 },
+                ' ',
+                { type: 'cell', column: 'Time (UTC)', row: 0 },
+              ],
+            },
+            transfers: [],
+          },
+        ],
+      },
+    ],
+  },
+} satisfies CsvFormat