@0xtorch/csv 0.0.74 → 0.0.76

package/_types/streamCsvToActions.d.ts

@@ -1,6 +1,7 @@
 import type { Action, CryptoCurrency, FiatCurrency } from '@0xtorch/core';
 import type { CsvFormat } from './types';
 type StreamCsvToActionsParameters = {
+    fileId: string;
     file: File | string;
     encoding: string;
     format: CsvFormat;
@@ -17,6 +18,6 @@ type StreamCsvToActionsReturnTypes = {
     headerRow?: string[];
     ignoreRows: string[][];
 };
-export declare const streamCsvToActions: ({ file, encoding, format, cryptoes, fiats, save, chunkSize, }: StreamCsvToActionsParameters) => Promise<StreamCsvToActionsReturnTypes>;
+export declare const streamCsvToActions: ({ fileId, file, encoding, format, cryptoes, fiats, save, chunkSize, }: StreamCsvToActionsParameters) => Promise<StreamCsvToActionsReturnTypes>;
 export {};
 //# sourceMappingURL=streamCsvToActions.d.ts.map

package/_types/streamCsvToActions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"streamCsvToActions.d.ts","sourceRoot":"","sources":["../streamCsvToActions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA;AAKzE,OAAO,KAAK,EAAE,SAAS,EAAgB,MAAM,SAAS,CAAA;AAEtD,KAAK,4BAA4B,GAAG;IAClC,IAAI,EAAE,IAAI,GAAG,MAAM,CAAA;IACnB,QAAQ,EAAE,MAAM,CAAA;IAChB,MAAM,EAAE,SAAS,CAAA;IACjB,QAAQ,EAAE,SAAS,cAAc,EAAE,CAAA;IACnC,KAAK,EAAE,SAAS,YAAY,EAAE,CAAA;IAC9B,IAAI,EAAE,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,EAAE,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;IACrE,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB,CAAA;AAED,KAAK,6BAA6B,GAAG;IACnC,OAAO,EAAE,OAAO,CAAA;IAChB,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,QAAQ,EAAE,MAAM,CAAA;IAChB,cAAc,EAAE,MAAM,CAAA;IACtB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAA;IACpB,UAAU,EAAE,MAAM,EAAE,EAAE,CAAA;CACvB,CAAA;AAED,eAAO,MAAM,kBAAkB,kEAQ5B,4BAA4B,KAAG,OAAO,CAAC,6BAA6B,CAyOtE,CAAA"}
+{"version":3,"file":"streamCsvToActions.d.ts","sourceRoot":"","sources":["../streamCsvToActions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA;AAKzE,OAAO,KAAK,EAAE,SAAS,EAAgB,MAAM,SAAS,CAAA;AAEtD,KAAK,4BAA4B,GAAG;IAClC,MAAM,EAAE,MAAM,CAAA;IACd,IAAI,EAAE,IAAI,GAAG,MAAM,CAAA;IACnB,QAAQ,EAAE,MAAM,CAAA;IAChB,MAAM,EAAE,SAAS,CAAA;IACjB,QAAQ,EAAE,SAAS,cAAc,EAAE,CAAA;IACnC,KAAK,EAAE,SAAS,YAAY,EAAE,CAAA;IAC9B,IAAI,EAAE,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,EAAE,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;IACrE,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB,CAAA;AAED,KAAK,6BAA6B,GAAG;IACnC,OAAO,EAAE,OAAO,CAAA;IAChB,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,QAAQ,EAAE,MAAM,CAAA;IAChB,cAAc,EAAE,MAAM,CAAA;IACtB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAA;IACpB,UAAU,EAAE,MAAM,EAAE,EAAE,CAAA;CACvB,CAAA;AAED,eAAO,MAAM,kBAAkB,0EAS5B,4BAA4B,KAAG,OAAO,CAAC,6BAA6B,CA6OtE,CAAA"}

package/getCsvRowCount.ts

@@ -14,6 +14,7 @@ export const getCsvRowCount = async ({
     parse(file, {
       header: false,
       skipEmptyLines: true,
+      newline: '\n',
       complete: () => {
         resolve()
       },

package/hasValidHeaderRow.ts

@@ -24,6 +24,7 @@ export const hasValidHeaderRow = async ({
     parse(file, {
       header: false,
       skipEmptyLines: true,
+      newline: '\n',
       encoding,
       complete: () => {
         resolve()
@@ -42,24 +43,26 @@ export const hasValidHeaderRow = async ({
           return
         }
 
+        const cells = result.data.map((v) =>
+          typeof v === 'string'
+            ? v.replaceAll('\r', '').replaceAll('\u{65279}', '').trim()
+            : v,
+        )
+
         if (headerStartColumnRegExps !== undefined) {
           for (const [index, column] of headerStartColumnRegExps.entries()) {
-            const cell = result.data[index]
+            const cell = cells[index]
             if (typeof cell !== 'string') {
               return
             }
-            const value = cell
-              .replaceAll('\r', '')
-              .replaceAll('\u{65279}', '')
-              .trim()
-            if (!column.test(value)) {
+            if (!column.test(cell)) {
               return
             }
           }
         }
 
         for (const key of Object.keys(format.formatter)) {
-          if (!result.data.includes(key)) {
+          if (!cells.includes(key)) {
             parser.abort()
             return
           }

package/package.json

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

package/parseCsvFileToActions.ts

@@ -12,6 +12,7 @@ import { parseRowsToActions } from './parseRowsToActions'
 import type { CsvFormat } from './types'
 
 type ParseCsvFileToActionsParameters = {
+  fileId: string
   file: File
   format: CsvFormat
   cryptoes: readonly CryptoCurrency[]
@@ -27,6 +28,7 @@ type ParseCsvFileToActionsReturnTypes = {
 }
 
 export const parseCsvFileToActions = async ({
+  fileId,
   file,
   format: { service, formatter, parser, symbolAssetMap },
   cryptoes,
@@ -45,6 +47,7 @@ export const parseCsvFileToActions = async ({
     parser,
     symbolAssetMap,
     service,
+    fileId,
     cryptoes,
     fiats,
     errorLogger,

package/parseRowsToActions/allValue.ts

@@ -12,10 +12,12 @@ export const getAllValue = ({
   schema,
   rows,
   service,
+  fileId,
 }: {
   schema: z.infer<typeof allValueSchema>
   rows: readonly FormattedRow[]
   service: string
+  fileId: string
 }) => {
   if (typeof schema === 'string') {
     return schema
@@ -27,11 +29,15 @@ export const getAllValue = ({
         rows,
       })
     }
+    case 'file-id': {
+      return fileId
+    }
     case 'join': {
       return getJoinValue({
         schema,
         rows,
         service,
+        fileId,
       })
     }
     case 'match': {
@@ -39,6 +45,7 @@ export const getAllValue = ({
         schema,
         rows,
         service,
+        fileId,
       })
     }
     case 'math': {
@@ -46,6 +53,7 @@ export const getAllValue = ({
         schema,
         rows,
         service,
+        fileId,
       })
     }
     case 'service': {
@@ -56,6 +64,7 @@ export const getAllValue = ({
         schema,
         rows,
         service,
+        fileId,
       })
     }
     case 'split': {
@@ -63,6 +72,7 @@ export const getAllValue = ({
         schema,
         rows,
         service,
+        fileId,
       })
     }
   }

package/parseRowsToActions/asset.ts

@@ -17,6 +17,7 @@ export const getAsset = ({
   schema,
   rows,
   service,
+  fileId,
   symbolAssetMap,
   cryptoes,
   fiats,
@@ -24,19 +25,21 @@ export const getAsset = ({
   schema: z.infer<typeof assetSchema>
   rows: readonly FormattedRow[]
   service: string
+  fileId: string
   symbolAssetMap?: { readonly [symbol: string]: string }
   cryptoes: readonly CryptoCurrency[]
   fiats: readonly FiatCurrency[]
 }): CryptoCurrency | FiatCurrency | Nft => {
   switch (schema.type) {
     case 'id': {
-      return getAssetById({ schema, rows, service })
+      return getAssetById({ schema, rows, service, fileId })
     }
     case 'symbol': {
       return getAssetBySymbol({
         schema,
         rows,
         service,
+        fileId,
         symbolAssetMap,
         cryptoes,
         fiats,
@@ -49,16 +52,19 @@ export const getAssetById = ({
   schema,
   rows,
   service,
+  fileId,
 }: {
   schema: z.infer<typeof assetIdSchema>
   rows: readonly FormattedRow[]
   service: string
+  fileId: string
 }): CryptoCurrency | FiatCurrency | Nft => {
   const value = stringify(
     getAllValue({
       schema: schema.value,
       rows,
       service,
+      fileId,
     }),
   )
   const [type, id] = value.split(schema.splitter)
@@ -69,6 +75,7 @@ export const getAssetBySymbol = ({
   schema,
   rows,
   service,
+  fileId,
   symbolAssetMap,
   cryptoes,
   fiats,
@@ -76,6 +83,7 @@ export const getAssetBySymbol = ({
   schema: z.infer<typeof assetSymbolSchema>
   rows: readonly FormattedRow[]
   service: string
+  fileId: string
   symbolAssetMap?: { readonly [symbol: string]: string }
   cryptoes: readonly CryptoCurrency[]
   fiats: readonly FiatCurrency[]
@@ -85,6 +93,7 @@ export const getAssetBySymbol = ({
       schema: schema.value,
       rows,
       service,
+      fileId,
     }),
   ).toUpperCase()
   if (symbolAssetMap !== undefined && value in symbolAssetMap) {

package/parseRowsToActions/index.ts

@@ -10,6 +10,7 @@ type ParseRowsToActionsParameters = {
   parser: z.infer<typeof parsersWithKeySchema>
   symbolAssetMap?: { readonly [symbol: string]: string }
   service: string
+  fileId: string
   cryptoes: readonly CryptoCurrency[]
   fiats: readonly FiatCurrency[]
   errorLogger?: (error: unknown) => void
@@ -25,6 +26,7 @@ export const parseRowsToActions = ({
   parser,
   symbolAssetMap,
   service,
+  fileId,
   cryptoes,
   fiats,
   errorLogger,
@@ -41,6 +43,7 @@ export const parseRowsToActions = ({
         parsers: parser.parsers,
         symbolAssetMap,
         service,
+        fileId,
         cryptoes,
         fiats,
         errorLogger,
@@ -64,6 +67,7 @@ export const parseRowsToActions = ({
         parsers: parser.parsers,
         symbolAssetMap,
         service,
+        fileId,
         cryptoes,
         fiats,
       })
@@ -83,6 +87,7 @@ export const parseRowsToActions = ({
       parsers: parser.parsers,
       symbolAssetMap,
       service,
+      fileId,
       cryptoes,
       fiats,
     })
@@ -106,6 +111,7 @@ type ParseTargetRowsToActionsParameters = {
   parsers: readonly z.infer<typeof parserSchema>[]
   symbolAssetMap?: { readonly [symbol: string]: string }
   service: string
+  fileId: string
   cryptoes: readonly CryptoCurrency[]
   fiats: readonly FiatCurrency[]
   errorLogger?: (error: unknown) => void

package/parseRowsToActions/joinValue.ts

@@ -12,13 +12,17 @@ export const getJoinValue = ({
   schema,
   rows,
   service,
+  fileId,
 }: {
   schema: z.infer<typeof joinValueSchema>
   rows: readonly FormattedRow[]
   service: string
+  fileId: string
 }) => {
   return schema.values
-    .map((value) => stringify(getValue({ schema: value, rows, service })))
+    .map((value) =>
+      stringify(getValue({ schema: value, rows, service, fileId })),
+    )
     .join('')
 }
 
@@ -26,10 +30,12 @@ const getValue = ({
   schema,
   rows,
   service,
+  fileId,
 }: {
   schema: z.infer<typeof joinValueSchema>['values'][0]
   rows: readonly FormattedRow[]
   service: string
+  fileId: string
 }) => {
   if (typeof schema === 'string') {
     return schema
@@ -41,11 +47,15 @@ const getValue = ({
         rows,
       })
     }
+    case 'file-id': {
+      return fileId
+    }
     case 'match': {
       return getMatchValue({
         schema,
         rows,
         service,
+        fileId,
       })
     }
     case 'math': {
@@ -53,6 +63,7 @@ const getValue = ({
         schema,
         rows,
         service,
+        fileId,
       })
     }
     case 'service': {
@@ -63,6 +74,7 @@ const getValue = ({
         schema,
         rows,
         service,
+        fileId,
       })
     }
     case 'split': {
@@ -70,6 +82,7 @@ const getValue = ({
         schema,
         rows,
         service,
+        fileId,
       })
     }
   }

package/parseRowsToActions/matchValue.ts

@@ -8,11 +8,13 @@ export const getMatchValue = ({
   schema,
   rows,
   service,
+  fileId,
 }: {
   schema: z.infer<typeof matchValueSchema>
   rows: readonly FormattedRow[]
   service: string
+  fileId: string
 }) => {
-  const value = getSimpleValue({ schema: schema.value, rows, service })
+  const value = getSimpleValue({ schema: schema.value, rows, service, fileId })
   return stringify(value).match(new RegExp(schema.pattern))?.[schema.index]
 }

package/parseRowsToActions/mathValue.ts

@@ -18,13 +18,20 @@ export const getMathValue = ({
   schema,
   rows,
   service,
+  fileId,
 }: {
   schema: z.infer<typeof mathValueSchema>
   rows: readonly FormattedRow[]
   service: string
+  fileId: string
 }) => {
   const firstValue = schema.values[0]
-  let current = getBigDecimalValue({ schema: firstValue, rows, service })
+  let current = getBigDecimalValue({
+    schema: firstValue,
+    rows,
+    service,
+    fileId,
+  })
   let operator: '+' | '-' | '*' | '/' | undefined
   let args: BigDecimal[] = []
   for (const value of schema.values.slice(1)) {
@@ -60,7 +67,7 @@ export const getMathValue = ({
       operator = '/'
       continue
     }
-    args.push(getBigDecimalValue({ schema: value, rows, service }))
+    args.push(getBigDecimalValue({ schema: value, rows, service, fileId }))
   }
   if (operator !== undefined) {
     current = calculate(operator, current, args)
@@ -72,12 +79,14 @@ const getBigDecimalValue = ({
   schema,
   rows,
   service,
+  fileId,
 }: {
   schema: z.infer<typeof mathValueSchema>['values'][0]
   rows: readonly FormattedRow[]
   service: string
+  fileId: string
 }): BigDecimal => {
-  const value = getValue({ schema, rows, service })
+  const value = getValue({ schema, rows, service, fileId })
   if (value === undefined) {
     return createBigDecimal(0n)
   }
@@ -91,10 +100,12 @@ const getValue = ({
   schema,
   rows,
   service,
+  fileId,
 }: {
   schema: z.infer<typeof mathValueSchema>['values'][0]
   rows: readonly FormattedRow[]
   service: string
+  fileId: string
 }) => {
   if (typeof schema === 'string') {
     return schema
@@ -106,11 +117,15 @@ const getValue = ({
         rows,
       })
     }
+    case 'file-id': {
+      return fileId
+    }
     case 'match': {
       return getMatchValue({
         schema,
         rows,
         service,
+        fileId,
       })
     }
     case 'service': {
@@ -121,6 +136,7 @@ const getValue = ({
         schema,
         rows,
         service,
+        fileId,
       })
     }
     case 'split': {
@@ -128,6 +144,7 @@ const getValue = ({
         schema,
         rows,
         service,
+        fileId,
       })
     }
   }

package/parseRowsToActions/parse.ts

@@ -19,6 +19,7 @@ type ParseRowsToActionsByParserParameters = {
   parser: z.infer<typeof parserSchema>
   symbolAssetMap?: { readonly [symbol: string]: string }
   service: string
+  fileId: string
   cryptoes: readonly CryptoCurrency[]
   fiats: readonly FiatCurrency[]
 }
@@ -28,6 +29,7 @@ export const parseRowsToActionsByParser = ({
   parser,
   symbolAssetMap,
   service,
+  fileId,
   cryptoes,
   fiats,
 }: ParseRowsToActionsByParserParameters): readonly Action[] | undefined => {
@@ -37,6 +39,7 @@ export const parseRowsToActionsByParser = ({
       schema: condition.value,
       rows,
       service,
+      fileId,
     })
     if (
       !isMatchPattern({ value: stringify(value), pattern: condition.pattern })
@@ -49,7 +52,7 @@ export const parseRowsToActionsByParser = ({
   const actions: Action[] = []
   for (const generator of parser.generators) {
     const source = stringify(
-      getAllValue({ schema: generator.source, rows, service }),
+      getAllValue({ schema: generator.source, rows, service, fileId }),
     )
     const timestampValue = getCellValue({ schema: generator.timestamp, rows })
     const timestamp =
@@ -59,19 +62,27 @@ export const parseRowsToActionsByParser = ({
     const comment =
       generator.comment === undefined
         ? undefined
-        : stringify(getAllValue({ schema: generator.comment, rows, service }))
+        : stringify(
+            getAllValue({ schema: generator.comment, rows, service, fileId }),
+          )
     const app =
       generator.app === undefined
         ? undefined
-        : stringify(getAllValue({ schema: generator.app, rows, service }))
+        : stringify(
+            getAllValue({ schema: generator.app, rows, service, fileId }),
+          )
     const crossId =
       generator.crossId === undefined
         ? undefined
-        : stringify(getAllValue({ schema: generator.crossId, rows, service }))
+        : stringify(
+            getAllValue({ schema: generator.crossId, rows, service, fileId }),
+          )
     const loanId =
       generator.loanId === undefined
         ? undefined
-        : stringify(getAllValue({ schema: generator.loanId, rows, service }))
+        : stringify(
+            getAllValue({ schema: generator.loanId, rows, service, fileId }),
+          )
     const target =
       generator.target === undefined
         ? undefined
@@ -79,6 +90,7 @@ export const parseRowsToActionsByParser = ({
             schema: generator.target,
             rows,
             service,
+            fileId,
           })
     const action: Action = {
       source,
@@ -93,6 +105,7 @@ export const parseRowsToActionsByParser = ({
           schema: transfer,
           rows,
           service,
+          fileId,
           symbolAssetMap,
           cryptoes,
           fiats,

package/parseRowsToActions/simpleValue.ts

@@ -7,10 +7,12 @@ export const getSimpleValue = ({
   schema,
   rows,
   service,
+  fileId,
 }: {
   schema: z.infer<typeof simpleValueSchema>
   rows: readonly FormattedRow[]
   service: string
+  fileId: string
 }) => {
   if (typeof schema === 'string') {
     return schema
@@ -22,6 +24,9 @@ export const getSimpleValue = ({
         rows,
       })
     }
+    case 'file-id': {
+      return fileId
+    }
     case 'service': {
       return service
     }

package/parseRowsToActions/sliceValue.ts

@@ -9,12 +9,14 @@ export const getSliceValue = ({
   schema,
   rows,
   service,
+  fileId,
 }: {
   schema: z.infer<typeof sliceValueSchema>
   rows: readonly FormattedRow[]
   service: string
+  fileId: string
 }) => {
-  const value = getValue({ schema, rows, service })
+  const value = getValue({ schema, rows, service, fileId })
   return stringify(value).slice(schema.start, schema.end)
 }
 
@@ -22,10 +24,12 @@ const getValue = ({
   schema,
   rows,
   service,
+  fileId,
 }: {
   schema: z.infer<typeof sliceValueSchema>
   rows: readonly FormattedRow[]
   service: string
+  fileId: string
 }) => {
   if (typeof schema.value === 'string') {
     return schema.value
@@ -37,6 +41,9 @@ const getValue = ({
         rows,
       })
     }
+    case 'file-id': {
+      return fileId
+    }
     case 'service': {
       return service
     }
@@ -45,6 +52,7 @@ const getValue = ({
         schema: schema.value,
         rows,
         service,
+        fileId,
       })
     }
   }

package/parseRowsToActions/splitValue.ts

@@ -9,12 +9,14 @@ export const getSplitValue = ({
   schema,
   rows,
   service,
+  fileId,
 }: {
   schema: z.infer<typeof splitValueSchema>
   rows: readonly FormattedRow[]
   service: string
+  fileId: string
 }) => {
-  const value = getSimpleValue({ schema: schema.value, rows, service })
+  const value = getSimpleValue({ schema: schema.value, rows, service, fileId })
   const stringifyValue = stringify(value)
 
   if (typeof schema.splitter === 'string') {