@0xtorch/csv 0.0.91 → 0.0.93

package/package.json

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

package/parseRowsToActions/parse.ts

@@ -1,7 +1,11 @@
 import {
   type Action,
+  type ActionCrossType,
+  type ActionEvidence,
+  type ActionType,
   type CryptoCurrency,
   type FiatCurrency,
+  actionTypes,
   checkIfActionsIsValid,
   stringify,
 } from '@0xtorch/core'
@@ -10,6 +14,7 @@ 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'
 
@@ -53,6 +58,18 @@ export const parseRowsToActionsByParser = ({
     const source = stringify(
       getAllValue({ schema: generator.source, rows, service, fileId }),
     )
+    const type =
+      typeof generator.type === 'string'
+        ? generator.type
+        : stringify(
+            getCellValue({
+              schema: generator.type,
+              rows,
+            }),
+          )
+    if (!isActionType(type)) {
+      continue
+    }
     const timestampValue = getAllValue({
       schema: generator.timestamp,
       rows,
@@ -63,6 +80,15 @@ export const parseRowsToActionsByParser = ({
       typeof timestampValue === 'number'
         ? timestampValue
         : new Date(stringify(timestampValue)).getTime()
+    const evidence =
+      generator.evidence === undefined
+        ? 'system-rule'
+        : typeof generator.evidence === 'string'
+          ? generator.evidence
+          : stringify(getCellValue({ schema: generator.evidence, rows }))
+    if (!isActionEvidence(evidence)) {
+      continue
+    }
     const comment =
       generator.comment === undefined
         ? undefined
@@ -81,6 +107,15 @@ export const parseRowsToActionsByParser = ({
         : stringify(
             getAllValue({ schema: generator.crossId, rows, service, fileId }),
           )
+    const crossType =
+      generator.crossType === undefined
+        ? undefined
+        : typeof generator.crossType === 'string'
+          ? generator.crossType
+          : stringify(getCellValue({ schema: generator.crossType, rows }))
+    if (crossType !== undefined && !isActionCrossType(crossType)) {
+      continue
+    }
     const loanId =
       generator.loanId === undefined
         ? undefined
@@ -99,9 +134,9 @@ export const parseRowsToActionsByParser = ({
     const action: Action = {
       source,
       order: 0,
-      type: generator.type,
+      type,
       timestamp,
-      evidence: generator.evidence ?? 'system-rule',
+      evidence,
       comment,
       app,
       transfers: generator.transfers.flatMap((transfer) =>
@@ -116,7 +151,7 @@ export const parseRowsToActionsByParser = ({
         }),
       ),
       crossId,
-      crossType: generator.crossType,
+      crossType,
       loanId,
       target:
         target === undefined || target.type !== 'Nft' ? undefined : target,
@@ -128,3 +163,14 @@ export const parseRowsToActionsByParser = ({
   }
   return actions
 }
+
+const isActionType = (value: string): value is ActionType =>
+  actionTypes.includes(value as ActionType)
+
+const isActionEvidence = (value: string): value is ActionEvidence =>
+  ['contract', 'system-rule', 'user-rule', 'manual-check', 'none'].includes(
+    value,
+  )
+
+const isActionCrossType = (value: string): value is ActionCrossType =>
+  ['start', 'middle', 'end'].includes(value)

package/parseRowsToActions/pattern.ts

@@ -46,5 +46,8 @@ export const isMatchPattern = ({
     case 'nonnegative': {
       return Number(trimmedValue.replaceAll('"', '')) >= 0
     }
+    case 'zero': {
+      return Number(trimmedValue.replaceAll('"', '')) === 0
+    }
   }
 }

package/schemas/parser.ts

@@ -145,6 +145,10 @@ export const patternSchema = z.union([
   z.object({
     type: z.literal('nonnegative'),
   }),
+  // zero
+  z.object({
+    type: z.literal('zero'),
+  }),
 ])
 
 export const conditionSchema = z.object({
@@ -197,14 +201,14 @@ export const transferComponentSchema = z.object({
 })
 
 const generatorSchema = z.object({
-  type: actionTypeUnionSchema,
+  type: z.union([actionTypeUnionSchema, cellValueSchema]),
   source: allValueSchema,
-  evidence: actionEvidenceUnionSchema.optional(),
+  evidence: z.union([actionEvidenceUnionSchema, cellValueSchema]).optional(),
   timestamp: allValueSchema,
   comment: allValueSchema.optional(),
   app: allValueSchema.optional(),
   crossId: allValueSchema.optional(),
-  crossType: actionCrossTypeUnionSchema.optional(),
+  crossType: z.union([actionCrossTypeUnionSchema, cellValueSchema]).optional(),
   loanId: allValueSchema.optional(),
   target: assetIdSchema.optional(),
   transfers: z.array(transferComponentSchema),