feat: add toml parsing to superposition_core

.github/workflows/ci_check_pr.yaml

@@ -134,7 +134,7 @@ jobs:
             - name: Install postgres libs
               run: |
                   sudo apt update
-                  sudo apt-get -y install postgresql libpq-dev
+                  sudo apt-get -y install postgresql libpq-dev libgmp-dev
 
             - name: Install Bun
               uses: oven-sh/setup-bun@v2
@@ -155,6 +155,24 @@ jobs:
               shell: bash
               run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
 
+            - name: Set up JDK
+              uses: actions/setup-java@v4
+              with:
+                java-version: '17'
+                distribution: 'temurin'
+
+            - name: Setup Gradle
+              uses: gradle/actions/setup-gradle@v3
+
+            - name: Setup Haskell environment (GHC and Cabal)
+              uses: haskell-actions/setup@v2
+              with:
+                ghc-version: '9.6.7' # Specify the GHC version (e.g., '9.2' or 'latest')
+                cabal-version: '3.16' # Specify the Cabal version (e.g., '3.8' or 'latest')
+
+            - name: Update Cabal package database
+              run: cabal update
+
             - name: run tests
               shell: bash
               run: |

.gitignore

@@ -30,7 +30,7 @@ backend/.env
 /result
 /result-*
 clients/haskell/result
-clients/haskell/dist-newstyle
+dist-newstyle
 # dev
 bacon.toml
 docker-compose/localstack/export_cyphers.sh
@@ -68,3 +68,8 @@ clients/generated/smithy/typescript/tsconfig.*
 
 .npmrc
 .zed
+
+# Dynamic libraries copied for testing
+*.dylib
+*.so
+*.dll

Cargo.toml

@@ -27,6 +27,7 @@ members = [
     "examples/experimentation_client_integration_example",
     "examples/cac_client_integration_example",
     "examples/superposition-demo-app",
+    "examples/superposition_toml_example",
 ]
 
 [[workspace.metadata.leptos]]
@@ -45,6 +46,7 @@ anyhow = "1.0.75"
 aws-sdk-kms = { version = "1.38.0" }
 base64 = "0.21.2"
 bigdecimal = { version = "0.3.1", features = ["serde"] }
+blake3 = "1.3.3"
 cfg-if = "1.0.0"
 chrono = { version = "0.4.26", features = ["serde"] }
 derive_more = "^0.99"

clients/haskell/superposition-bindings/lib/FFI/Superposition.hs

@@ -1,16 +1,26 @@
 {-# LANGUAGE RecordWildCards #-}
 {-# OPTIONS_GHC -Wno-name-shadowing #-}
 
-module FFI.Superposition (getResolvedConfig, ResolveConfigParams (..), defaultResolveParams, MergeStrategy (..)) where
+module FFI.Superposition (getResolvedConfig, ResolveConfigParams (..), defaultResolveParams, MergeStrategy (..), parseTomlConfig) where
 
 import Control.Monad (when)
+import Data.Aeson (Value, eitherDecodeStrict')
+import Data.ByteString (packCString)
+import Data.Either (fromRight)
 import Data.Foldable (traverse_)
 import Data.Maybe (fromMaybe)
+import Data.Text (unpack)
+import qualified Data.Text as T
+import Data.Text.Encoding (decodeUtf8')
 import Foreign (callocBytes, nullPtr)
 import Foreign.C.String (CString, newCString, peekCAString)
+import Foreign.ForeignPtr (newForeignPtr, withForeignPtr)
+import Foreign.Ptr (FunPtr)
 import Foreign.Marshal (free)
-import Prelude
 
+type BufferSize = Int
+errorBufferSize :: BufferSize
+errorBufferSize = 2048
 
 foreign import capi "superposition_core.h core_get_resolved_config"
   get_resolved_config ::
@@ -20,7 +30,7 @@ foreign import capi "superposition_core.h core_get_resolved_config"
     CString ->
     -- | overrides_json
     CString ->
-    -- | dimenson_info_json
+    -- | dimension_info_json
     CString ->
     -- | query_data_json
     CString ->
@@ -35,6 +45,18 @@ foreign import capi "superposition_core.h core_get_resolved_config"
     -- | resolved config json
     IO CString
 
+foreign import capi "superposition_core.h core_parse_toml_config"
+  parse_toml_config ::
+    -- | toml_content
+    CString ->
+    -- | error-buffer
+    CString ->
+    -- | parsed config json
+    IO CString
+
+foreign import capi "superposition_core.h &core_free_string"
+  p_free_string :: FunPtr (CString -> IO ())
+
 data MergeStrategy = Merge | Replace
 
 instance Show MergeStrategy where
@@ -67,7 +89,7 @@ defaultResolveParams =
 
 getResolvedConfig :: ResolveConfigParams -> IO (Either String String)
 getResolvedConfig params = do
-  ebuf <- callocBytes 256
+  ebuf <- callocBytes errorBufferSize
   let ResolveConfigParams {..} = params
       newOrNull = maybe (pure nullPtr) newCString
       freeNonNull p = when (p /= nullPtr) (free p)
@@ -94,8 +116,36 @@ getResolvedConfig params = do
         exp
         ebuf
   err <- peekCAString ebuf
-  traverse_ freeNonNull [dc, ctx, ovrs, qry, mergeS, pfltr, exp, ebuf]
+  traverse_ freeNonNull [dc, ctx, ovrs, di, qry, mergeS, pfltr, exp, ebuf]
   pure $ case (res, err) of
     (Just cfg, []) -> Right cfg
     (Nothing, []) -> Left "null pointer returned"
     _ -> Left err
+
+-- | Parse TOML configuration string into structured format
+-- Returns JSON matching the Config type with:
+--   - contexts: array of context objects with id, condition, priority, weight, override_with_keys
+--   - overrides: object mapping override IDs to override key-value pairs
+--   - default_configs: object with configuration key-value pairs
+--   - dimensions: object mapping dimension names to dimension info (schema, position, etc.)
+parseTomlConfig :: String -> IO (Either String Value)
+parseTomlConfig tomlContent = do
+  ebuf <- callocBytes errorBufferSize
+  tomlStr <- newCString tomlContent
+  res <- parse_toml_config tomlStr ebuf
+  errBytes <- packCString ebuf
+  let errText = fromRight mempty $ decodeUtf8' errBytes
+  result <- if res /= nullPtr
+    then do
+      resFptr <- newForeignPtr p_free_string res
+      -- Registers p_free_string as the finalizer (for automatic cleanup)
+      withForeignPtr resFptr $ fmap Just . packCString
+    else pure Nothing
+  free tomlStr
+  free ebuf
+  pure $ case (result, errText) of
+    (Just cfg, t) | T.null t -> case eitherDecodeStrict' cfg of
+      Right val -> Right val
+      Left e    -> Left $ "JSON parse error: " ++ e
+    (Nothing, t) | T.null t -> Left "null pointer returned"
+    _ -> Left (unpack errText)

clients/haskell/superposition-bindings/superposition-bindings.cabal

@@ -21,11 +21,15 @@ library
     exposed-modules:  FFI.Superposition
     -- other-modules:
     -- other-extensions:
-    build-depends:    base ^>=4.18.2.0
+    build-depends:    base >=4.17 && <5,
+                      aeson,
+                      bytestring,
+                      text
     hs-source-dirs:   lib
     default-language: GHC2021
     default-extensions: CApiFFI
     extra-libraries: superposition_core
+    include-dirs: ../../../target/include
 
 test-suite superposition-bindings-test
     import:           warnings
@@ -36,7 +40,9 @@ test-suite superposition-bindings-test
     hs-source-dirs:   test
     main-is:          Main.hs
     build-depends:
-        base ^>=4.18.2.0,
+        base >=4.17 && <5,
         HUnit,
         async,
+        aeson,
+        bytestring,
         superposition-bindings