@0xtorch/csv 0.0.74 → 0.0.76

package/parseRowsToActions/transfer.ts

@@ -24,6 +24,7 @@ export const createTransfers = ({
   schema,
   rows,
   service,
+  fileId,
   symbolAssetMap,
   cryptoes,
   fiats,
@@ -31,6 +32,7 @@ export const createTransfers = ({
   schema: z.infer<typeof transferComponentSchema>
   rows: readonly FormattedRow[]
   service: string
+  fileId: string
   symbolAssetMap?: { readonly [symbol: string]: string }
   cryptoes: readonly CryptoCurrency[]
   fiats: readonly FiatCurrency[]
@@ -40,6 +42,7 @@ export const createTransfers = ({
       schema,
       rows,
       service,
+      fileId,
       symbolAssetMap,
       cryptoes,
       fiats,
@@ -59,6 +62,7 @@ export const createTransfers = ({
         schema,
         rows: [targetRow],
         service,
+        fileId,
         symbolAssetMap,
         cryptoes,
         fiats,
@@ -95,6 +99,7 @@ const createSingleTransfer = ({
   schema,
   rows,
   service,
+  fileId,
   symbolAssetMap,
   cryptoes,
   fiats,
@@ -102,6 +107,7 @@ const createSingleTransfer = ({
   schema: z.infer<typeof transferComponentSchema>
   rows: readonly FormattedRow[]
   service: string
+  fileId: string
   symbolAssetMap?: { readonly [symbol: string]: string }
   cryptoes: readonly CryptoCurrency[]
   fiats: readonly FiatCurrency[]
@@ -109,15 +115,15 @@ const createSingleTransfer = ({
   const from =
     schema.from === undefined
       ? undefined
-      : stringify(getAllValue({ schema: schema.from, rows, service }))
+      : stringify(getAllValue({ schema: schema.from, rows, service, fileId }))
   const to =
     schema.to === undefined
       ? undefined
-      : stringify(getAllValue({ schema: schema.to, rows, service }))
+      : stringify(getAllValue({ schema: schema.to, rows, service, fileId }))
   const priceValue =
     schema.price === undefined
       ? undefined
-      : getAllValue({ schema: schema.price, rows, service })
+      : getAllValue({ schema: schema.price, rows, service, fileId })
   let price: BigDecimal | undefined
   if (typeof priceValue === 'string') {
     if (priceValue.length === 0) {
@@ -140,6 +146,7 @@ const createSingleTransfer = ({
       schema: schema.asset,
       rows,
       service,
+      fileId,
       symbolAssetMap,
       cryptoes,
       fiats,
@@ -149,6 +156,7 @@ const createSingleTransfer = ({
         schema: schema.amount,
         rows,
         service,
+        fileId,
       }),
     ),
     price,
@@ -159,15 +167,17 @@ const createAmount = ({
   schema,
   rows,
   service,
+  fileId,
 }: {
   schema: z.infer<typeof amountSchema>
   rows: readonly FormattedRow[]
   service: string
+  fileId: string
 }): BigDecimal => {
   switch (schema.type) {
     case 'decimal': {
       const baseValue = stringify(
-        getAllValue({ schema: schema.value, rows, service }),
+        getAllValue({ schema: schema.value, rows, service, fileId }),
       )
       let value: bigint
       if (baseValue === stringify(undefined)) {
@@ -183,7 +193,7 @@ const createAmount = ({
       }
     }
     case 'text': {
-      const value = getAllValue({ schema: schema.value, rows, service })
+      const value = getAllValue({ schema: schema.value, rows, service, fileId })
       if (value === undefined) {
         return createBigDecimal(0n)
       }

package/schemas/parser.ts

@@ -13,6 +13,10 @@ export const cellValueSchema = z.object({
   row: indexSchema.optional().transform((v) => v ?? 0),
 })
 
+export const fileIdValueSchema = z.object({
+  type: z.literal('file-id'),
+})
+
 export const serviceValueSchema = z.object({
   type: z.literal('service'),
 })
@@ -20,6 +24,7 @@ export const serviceValueSchema = z.object({
 export const simpleValueSchema = z.union([
   z.string(),
   cellValueSchema,
+  fileIdValueSchema,
   serviceValueSchema,
 ])
 

package/streamCsvToActions.ts

@@ -6,6 +6,7 @@ import { createKeyValue } from './parseRowsToActions/key'
 import type { CsvFormat, FormattedRow } from './types'
 
 type StreamCsvToActionsParameters = {
+  fileId: string
   file: File | string
   encoding: string
   format: CsvFormat
@@ -25,6 +26,7 @@ type StreamCsvToActionsReturnTypes = {
 }
 
 export const streamCsvToActions = async ({
+  fileId,
   file,
   encoding,
   format,
@@ -55,6 +57,7 @@ export const streamCsvToActions = async ({
     parse(file, {
       header: false,
       skipEmptyLines: true,
+      newline: '\n',
       encoding,
       complete: () => {
         resolve()
@@ -153,6 +156,7 @@ export const streamCsvToActions = async ({
             parsers: format.parser.parsers,
             symbolAssetMap: format.symbolAssetMap,
             service: format.service,
+            fileId,
             cryptoes,
             fiats,
           })
@@ -176,6 +180,7 @@ export const streamCsvToActions = async ({
               parsers: format.parser.parsers,
               symbolAssetMap: format.symbolAssetMap,
               service: format.service,
+              fileId,
               cryptoes,
               fiats,
             })
@@ -237,6 +242,7 @@ export const streamCsvToActions = async ({
       parsers: format.parser.parsers,
       symbolAssetMap: format.symbolAssetMap,
       service: format.service,
+      fileId,
       cryptoes,
       fiats,
     })

package/tests/okx-trade-jst-backup.csv

@@ -1,18 +0,0 @@
-UID:,Account Type:,Time Zone:UTC+9
-id,Order id,Time,Trade Type,Symbol,Action,Amount,Trading Unit,Filled Price,PnL,Fee,Fee Unit,Position Change,Position Balance,Balance Change,Balance,Balance Unit
-667165099547201542,667165099534618642,2024-01-16 01:35:55,Spot,ETH-USDT,Buy,0.06301100,ETH,2519.40000000,0E-8,-0.00003151,ETH,0E-8,0E-8,0.06297949,8.34093237,ETH
-667165099547201543,667165099534618642,2024-01-16 01:35:55,Spot,ETH-USDT,Sell,158.74991340,ETH,2519.40000000,0E-8,0E-8,USDT,0E-8,0E-8,-158.74991340,17202.73187832,USDT
-667166838446919694,667166838433615872,2024-01-16 01:42:49,Transfer,,Transfer in,0,cont,0E-8,0E-8,0E-8,USDT,0E-8,0E-8,3.87864514,17206.61052346,USDT
-667156126383247364,0,2024-01-16 01:00:15,Swap,ETH-USDT-SWAP,Funding fee income,10,cont,2515.07000000,0.45640796,0E-8,USDT,0E-8,0E-8,0.45640796,17156.08193268,USDT
-667035278628392989,529436909564100616,2024-01-15 17:00:03,Swap,AXS-USDT-SWAP,Funding fee expense,20000,cont,7.90200000,-6.69940146,0E-8,USDT,0E-8,0E-8,-6.69940146,17012.18748172,USDT
-665676914052861960,0,2024-01-11 23:02:23,Swap,AXS-USDT-SWAP,Manual margin increase,500,cont,0E-8,0E-8,0E-8,USDT,500.00000000,7831.00572500,-500.00000000,16523.01856039,USDT
-663776891149000707,0,2024-01-06 17:12:23,Swap,SLP-USDT-SWAP,Manual margin decrease,2000,cont,0E-8,0E-8,0E-8,USDT,-2000.00000000,9121.74769750,2000.00000000,16300.49863796,USDT
-662758029959929856,662758029951541258,2024-01-03 21:43:47,Swap,SUI-USDT-SWAP,Buy,449,cont,0.78400000,-78.60636183,-0.10560480,USDT,-276.84278373,836.69411475,198.13081711,12990.45785307,USDT
-662758029959929863,662758029951541258,2024-01-03 21:43:47,Swap,SUI-USDT-SWAP,Buy,81,cont,0.78410000,-14.18875771,-0.01905363,USDT,-49.94268482,0E-8,35.73487348,13589.22490604,USDT
-662758029959929859,662758029951541258,2024-01-03 21:43:47,Swap,SUI-USDT-SWAP,Buy,330,cont,0.78400000,-57.77304990,-0.07761600,USDT,-203.47019740,234.91559154,145.61953151,13421.13864928,USDT
-662758029959929861,662758029951541258,2024-01-03 21:43:47,Swap,SUI-USDT-SWAP,Buy,300,cont,0.78410000,-52.55095445,-0.07056900,USDT,-184.97290672,49.94268482,132.35138328,13553.49003255,USDT
-662758029959929857,662758029951541258,2024-01-03 21:43:47,Swap,SUI-USDT-SWAP,Buy,646,cont,0.78400000,-113.09512191,-0.15193920,USDT,-398.30832581,438.38578894,285.06126470,13275.51911777,USDT
-662758029955735578,662758029951541258,2024-01-03 21:43:47,Swap,SUI-USDT-SWAP,Buy,257,cont,0.78400000,-44.99295098,-0.06044640,USDT,-158.46012343,1271.99702191,113.40672605,12678.92030991,USDT
-662758029955735568,662758029951541258,2024-01-03 21:43:47,Swap,SUI-USDT-SWAP,Buy,300,cont,0.78390000,-52.49095445,-0.07055100,USDT,-184.97290672,1707.91650542,132.41140128,12366.94149544,USDT
-662758029955735576,662758029951541258,2024-01-03 21:43:47,Swap,SUI-USDT-SWAP,Buy,450,cont,0.78400000,-78.78143168,-0.10584000,USDT,-277.45936009,1430.45714534,198.57208842,12565.51358386,USDT
-662758029955735582,662758029951541258,2024-01-03 21:43:47,Swap,SUI-USDT-SWAP,Buy,257,cont,0.78400000,-44.99295098,-0.06044640,USDT,-158.46012343,1113.53689848,113.40672605,12792.32703596,USDT

package/tests/okx-trade-jst.csv

@@ -1,3 +0,0 @@
-UID:469514189849931987,Account Type:Sub,Time Zone:UTC+9
-id,Order id,Time,Trade Type,Symbol,Action,Amount,Trading Unit,Filled Price,PnL,Fee,Fee Unit,Position Change,Position Balance,Balance Change,Balance,Balance Unit
-684488648108486666,684488648086896640,2024-03-03 20:53:30,Transfer,,Transfer out,0,cont,0E-8,0E-8,0E-8,WLD,0E-8,0E-8,-0.00015600,0E-8,WLD

package/tests/okx.ts

@@ -1,275 +0,0 @@
-import type { CsvFormat } from '../types'
-
-export const okxTradeJstFormat = {
-  id: 'okx-trade-jst',
-  service: 'okx',
-  headerStartColumns: ['^.*id$'],
-  headerCheckRowSize: 4,
-  formatter: {
-    'Order id': ['string'],
-    Time: ['iso8601-jp'],
-    'Trade Type': ['string'],
-    Symbol: ['string'],
-    Action: ['string'],
-    PnL: ['big-decimal'],
-    Fee: ['big-decimal'],
-    'Fee Unit': ['string'],
-    'Balance Change': ['big-decimal'],
-    'Balance Unit': ['string'],
-  },
-  parser: {
-    key: ['Order id', 'Time'],
-    parsers: [
-      {
-        conditions: [
-          {
-            value: { type: 'cell', column: 'Trade Type', row: 0 },
-            pattern: 'Swap',
-          },
-          {
-            value: { type: 'cell', column: 'Action', row: 0 },
-            pattern: {
-              type: 'in',
-              values: ['Buy', 'Sell'],
-            },
-          },
-        ],
-        generators: [
-          {
-            type: 'realize-profit',
-            source: {
-              type: 'join',
-              values: [
-                { type: 'service' },
-                '_trade_',
-                { type: 'cell', column: 'Order id', row: 0 },
-                '_',
-                { type: 'cell', column: 'Time', row: 0 },
-              ],
-            },
-            timestamp: {
-              type: 'cell',
-              column: 'Time',
-              row: 0,
-            },
-            comment: {
-              type: 'join',
-              values: [
-                'Trade Type: ',
-                { type: 'cell', column: 'Trade Type', row: 0 },
-                ' / Symbol: ',
-                { type: 'cell', column: 'Symbol', row: 0 },
-                ' / Action: ',
-                { type: 'cell', column: 'Action', row: 0 },
-              ],
-            },
-            transfers: [
-              {
-                target: [
-                  {
-                    column: 'PnL',
-                    pattern: { type: 'positive' },
-                  },
-                ],
-                direction: 'in',
-                amount: {
-                  type: 'text',
-                  value: { type: 'cell', column: 'PnL', row: 0 },
-                },
-                asset: {
-                  type: 'symbol',
-                  value: { type: 'cell', column: 'Fee Unit', row: 0 },
-                },
-              },
-            ],
-          },
-          {
-            type: 'realize-loss',
-            source: {
-              type: 'join',
-              values: [
-                { type: 'service' },
-                '_trade_',
-                { type: 'cell', column: 'Order id', row: 0 },
-                '_',
-                { type: 'cell', column: 'Time', row: 0 },
-              ],
-            },
-            timestamp: {
-              type: 'cell',
-              column: 'Time',
-              row: 0,
-            },
-            comment: {
-              type: 'join',
-              values: [
-                'Trade Type: ',
-                { type: 'cell', column: 'Trade Type', row: 0 },
-                ' / Symbol: ',
-                { type: 'cell', column: 'Symbol', row: 0 },
-                ' / Action: ',
-                { type: 'cell', column: 'Action', row: 0 },
-              ],
-            },
-            transfers: [
-              {
-                target: [
-                  {
-                    column: 'PnL',
-                    pattern: { type: 'negative' },
-                  },
-                ],
-                direction: 'out',
-                amount: {
-                  type: 'text',
-                  value: { type: 'cell', column: 'PnL', row: 0 },
-                },
-                asset: {
-                  type: 'symbol',
-                  value: { type: 'cell', column: 'Fee Unit', row: 0 },
-                },
-              },
-            ],
-          },
-          {
-            type: 'fee',
-            source: {
-              type: 'join',
-              values: [
-                { type: 'service' },
-                '_trade_',
-                { type: 'cell', column: 'Order id', row: 0 },
-                '_',
-                { type: 'cell', column: 'Time', row: 0 },
-              ],
-            },
-            timestamp: {
-              type: 'cell',
-              column: 'Time',
-              row: 0,
-            },
-            comment: {
-              type: 'join',
-              values: [
-                'Trade Type: ',
-                { type: 'cell', column: 'Trade Type', row: 0 },
-                ' / Symbol: ',
-                { type: 'cell', column: 'Symbol', row: 0 },
-                ' / Action: ',
-                { type: 'cell', column: 'Action', row: 0 },
-              ],
-            },
-            transfers: [
-              {
-                target: [
-                  {
-                    column: 'Fee',
-                    pattern: { type: 'negative' },
-                  },
-                ],
-                direction: 'out',
-                amount: {
-                  type: 'text',
-                  value: { type: 'cell', column: 'Fee', row: 0 },
-                },
-                asset: {
-                  type: 'symbol',
-                  value: { type: 'cell', column: 'Fee Unit', row: 0 },
-                },
-              },
-            ],
-          },
-        ],
-      },
-      {
-        conditions: [
-          {
-            value: { type: 'cell', column: 'Trade Type', row: 0 },
-            pattern: 'Swap',
-          },
-          {
-            value: { type: 'cell', column: 'Action', row: 0 },
-            pattern: {
-              type: 'in',
-              values: ['Manual margin increase', 'Manual margin decrease'],
-            },
-          },
-        ],
-        generators: [
-          {
-            type: 'ignore',
-            source: {
-              type: 'join',
-              values: [
-                { type: 'service' },
-                '_trade_',
-                { type: 'cell', column: 'Order id', row: 0 },
-                '_',
-                { type: 'cell', column: 'Time', row: 0 },
-              ],
-            },
-            timestamp: {
-              type: 'cell',
-              column: 'Time',
-              row: 0,
-            },
-            comment: {
-              type: 'join',
-              values: [
-                'Trade Type: ',
-                { type: 'cell', column: 'Trade Type', row: 0 },
-                ' / Action: ',
-                { type: 'cell', column: 'Action', row: 0 },
-                ' / Balance Change: ',
-                { type: 'cell', column: 'Balance Change', row: 0 },
-                { type: 'cell', column: 'Balance Unit', row: 0 },
-              ],
-            },
-            transfers: [],
-          },
-        ],
-      },
-      {
-        conditions: [
-          {
-            value: { type: 'cell', column: 'Trade Type', row: 0 },
-            pattern: 'Transfer',
-          },
-        ],
-        generators: [
-          {
-            type: 'ignore',
-            source: {
-              type: 'join',
-              values: [
-                { type: 'service' },
-                '_trade_',
-                { type: 'cell', column: 'Order id', row: 0 },
-                '_',
-                { type: 'cell', column: 'Time', row: 0 },
-              ],
-            },
-            timestamp: {
-              type: 'cell',
-              column: 'Time',
-              row: 0,
-            },
-            comment: {
-              type: 'join',
-              values: [
-                'Trade Type: ',
-                { type: 'cell', column: 'Trade Type', row: 0 },
-                ' / Action: ',
-                { type: 'cell', column: 'Action', row: 0 },
-                ' / Balance Change: ',
-                { type: 'cell', column: 'Balance Change', row: 0 },
-                { type: 'cell', column: 'Balance Unit', row: 0 },
-              ],
-            },
-            transfers: [],
-          },
-        ],
-      },
-    ],
-  },
-} satisfies CsvFormat