@0xtorch/csv 0.0.50 → 0.0.52

package/parseRowsToActions/mathValue.ts

@@ -10,6 +10,7 @@ import type { z } from 'zod'
 import type { mathValueSchema } from '../schemas/parser'
 import type { FormattedRow } from '../types'
 import { getCellValue } from './cellValue'
+import { getMatchValue } from './matchValue'
 import { getSliceValue } from './sliceValue'
 import { getSplitValue } from './splitValue'
 
@@ -105,6 +106,13 @@ const getValue = ({
         rows,
       })
     }
+    case 'match': {
+      return getMatchValue({
+        schema,
+        rows,
+        service,
+      })
+    }
     case 'service': {
       return service
     }

package/parseRowsToActions/splitValue.ts

@@ -2,6 +2,7 @@ import { stringify } from '@0xtorch/core'
 import type { z } from 'zod'
 import type { splitValueSchema } from '../schemas/parser'
 import type { FormattedRow } from '../types'
+import { getCellValue } from './cellValue'
 import { getSimpleValue } from './simpleValue'
 
 export const getSplitValue = ({
@@ -14,5 +15,20 @@ export const getSplitValue = ({
   service: string
 }) => {
   const value = getSimpleValue({ schema: schema.value, rows, service })
-  return stringify(value).split(schema.splitter)[schema.index]
+  const stringifyValue = stringify(value)
+
+  if (typeof schema.splitter === 'string') {
+    return stringifyValue.split(schema.splitter)[schema.index]
+  }
+
+  switch (schema.splitter.type) {
+    case 'cell': {
+      const splitter = getCellValue({ schema: schema.splitter, rows })
+      return stringifyValue.split(stringify(splitter))[schema.index]
+    }
+    case 'reg-exp': {
+      const splitter = new RegExp(schema.splitter.pattern)
+      return stringifyValue.split(splitter)[schema.index]
+    }
+  }
 }

package/schemas/parser.ts

@@ -22,10 +22,22 @@ export const simpleValueSchema = z.union([
   serviceValueSchema,
 ])
 
+const splitterSchema = z.union([
+  // string
+  z.string(),
+  // reg-exp
+  z.object({
+    type: z.literal('reg-exp'),
+    pattern: z.string(),
+  }),
+  // cell
+  cellValueSchema,
+])
+
 export const splitValueSchema = z.object({
   type: z.literal('split'),
   value: simpleValueSchema,
-  splitter: z.string(),
+  splitter: splitterSchema,
   index: indexSchema,
 })
 
@@ -36,6 +48,13 @@ export const sliceValueSchema = z.object({
   end: z.number().int().optional(),
 })
 
+export const matchValueSchema = z.object({
+  type: z.literal('match'),
+  value: simpleValueSchema,
+  pattern: z.string(),
+  index: indexSchema,
+})
+
 export const mathValueSchema = z.object({
   type: z.literal('math'),
   values: z
@@ -48,6 +67,7 @@ export const mathValueSchema = z.object({
         simpleValueSchema,
         splitValueSchema,
         sliceValueSchema,
+        matchValueSchema,
       ]),
     )
     .min(3),
@@ -61,6 +81,7 @@ export const joinValueSchema = z.object({
         simpleValueSchema,
         splitValueSchema,
         sliceValueSchema,
+        matchValueSchema,
         mathValueSchema,
       ]),
     )
@@ -71,6 +92,7 @@ export const allValueSchema = z.union([
   simpleValueSchema,
   splitValueSchema,
   sliceValueSchema,
+  matchValueSchema,
   mathValueSchema,
   joinValueSchema,
 ])