Merge pull request #17 from siaeyy/15-object-problem-sirutilsseql

Ejson implementation and object transformation (Issue #15)

Author: giveerr

.github/workflows/ci.yml

@@ -1,10 +1,8 @@
 name: "Pipeline"
-
 on:
   push:
   pull_request:
   workflow_dispatch:
-
 jobs:
   ci:
     name: "CI"
@@ -22,4 +20,4 @@ jobs:
         if: success() || failure()
         with:
           access-token: ${{ secrets.GITHUB_TOKEN }}
-          matrix: ${{ toJSON(matrix) }}
+          matrix: ${{ toJSON(matrix) }}

.github/workflows/docs.yml

@@ -5,7 +5,6 @@ on:
 permissions:
   id-token: write
   contents: read
-
 jobs:
   ci:
     name: "Docs CD"
@@ -29,4 +28,4 @@ jobs:
         with:
           project: sirutils
           entrypoint: server/index.ts
-          root: apps/docs/.output
+          root: apps/docs/.output

packages/driver-scylla/src/utils/plugin.ts

@@ -1,7 +1,7 @@
 import pkg from '../../package.json'
 
 import { createPlugin, getCircularReplacer, group } from '@sirutils/core'
-import { isRawObject, traverse } from '@sirutils/safe-toolbox'
+import { isRawObject, traverse, safeEjsonParse, safeEjsonStringify } from '@sirutils/safe-toolbox'
 import { createAdapter } from '@sirutils/seql'
 import { Client, types } from 'cassandra-driver'
 
@@ -40,19 +40,30 @@ export const createScyllaDriver = createPlugin<
         parameterPattern: () => '?',
         transformData: <T>(data: T) => {
           if (isRawObject(data)) {
-            return data as T
-          }
+            const ejsonStr = safeEjsonStringify(data)
 
+            // Transform raw object to string if it can be
+            if(ejsonStr.isOk()) {
+              return ejsonStr.value as T
+            }
+          }
           return data
         },
         transformResponse: <T>(data: T) => {
           // biome-ignore lint/complexity/noForEach: <explanation>
           traverse(data).forEach(function (value) {
             if (value instanceof types.Integer) {
               this.update(+value)
+            }else if (typeof value === "string") {
+              // If field value's type is string and it's format is matched with ejson,
+              // transform to object
+              const ejsonData = safeEjsonParse(value)
+
+              if (ejsonData.isOk()) {
+                this.update(ejsonData.value)
+              }
             }
           })
-
           return data
         },
       }),

packages/safe-toolbox/package.json

@@ -1,7 +1,6 @@
 {
   "name": "@sirutils/safe-toolbox",
   "version": "0.1.1",
-
   "type": "module",
   "files": ["dist"],
   "exports": {
@@ -10,16 +9,17 @@
       "types": "./dist/index.d.ts"
     }
   },
-
   "devDependencies": {
     "@sirutils/builder": "workspace:*",
     "@types/deepmerge": "^2.2.0",
     "@types/traverse": "^0.6.37"
   },
   "dependencies": {
     "@sirutils/core": "workspace:*",
+    "@types/ejson": "^2.2.2",
     "dayjs": "^1.11.13",
     "deepmerge": "^4.3.1",
+    "ejson": "^2.2.3",
     "evt": "^2.5.7",
     "traverse": "^0.6.9",
     "ulidx": "^2.4.1"

packages/safe-toolbox/src/index.ts

@@ -7,6 +7,7 @@ export * from './utils/types'
 export * from './utils/merge'
 export * from './utils/proxy'
 export * from './utils/json'
+export * from './utils/ejson'
 
 export * from './tag'
 
@@ -25,9 +26,11 @@ import utc from 'dayjs/plugin/utc'
 import deepmerge from 'deepmerge'
 // biome-ignore lint/nursery/noExportedImports: Redundant
 import traverse from 'traverse'
+// biome-ignore lint/nursery/noExportedImports: Redundant
+import ejson from "ejson";
 
 dayjs.extend(duration)
 dayjs.extend(customParseFormat)
 dayjs.extend(utc)
 
-export { dayjs, customParseFormat, duration, utc, deepmerge, traverse }
+export { dayjs, customParseFormat, duration, utc, deepmerge, traverse, ejson }

packages/safe-toolbox/src/tag.ts

@@ -11,6 +11,9 @@ export const safeToolboxTags = {
   toUrl: createTag('to-url'),
   safeJsonParse: createTag('safe-json-parse'),
   safeJsonStringify: createTag('safe-json-stringify'),
+  
+  safeEjsonParse: createTag('safe-ejson-parse'),
+  safeEjsonStringify: createTag('safe-ejson-stringify'),
 
   // utils/object-like
   extractKeys: createTag('extract-keys'),

packages/safe-toolbox/src/utils/ejson.ts

@@ -0,0 +1,12 @@
+import { ProjectError, Result } from '@sirutils/core'
+import { safeToolboxTags } from '../tag'
+
+import EJSON from "ejson";
+
+export const safeEjsonParse = Result.fromThrowable(EJSON.parse, e =>
+  ProjectError.create(safeToolboxTags.safeEjsonParse, `${e}`)
+)
+
+export const safeEjsonStringify = Result.fromThrowable(EJSON.stringify, e =>
+  ProjectError.create(safeToolboxTags.safeEjsonStringify, `${e}`)
+)