diff --git a/.github/workflows/aeson-typescript.yml b/.github/workflows/aeson-typescript.yml index 76ae386..a3e30fb 100644 --- a/.github/workflows/aeson-typescript.yml +++ b/.github/workflows/aeson-typescript.yml @@ -30,7 +30,7 @@ jobs: ghc: 9.0.2 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v7 - uses: haskell-actions/setup@v2 id: setup-haskell-cabal @@ -43,7 +43,7 @@ jobs: run: | cabal freeze - - uses: actions/cache@v3 + - uses: actions/cache@v6 name: Cache ~/.cabal/store with: path: ${{ steps.setup-haskell-cabal.outputs.cabal-store }} @@ -90,7 +90,7 @@ jobs: yaml: "stack-9.12.4.yaml" steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v7 - uses: haskell-actions/setup@v2 name: Setup Haskell Stack @@ -99,7 +99,7 @@ jobs: enable-stack: true stack-version: "latest" - - uses: actions/cache@v3 + - uses: actions/cache@v6 name: Cache ~/.stack with: path: ~/.stack diff --git a/src/Data/Aeson/TypeScript/Instances.hs b/src/Data/Aeson/TypeScript/Instances.hs index 86f3695..18baa8c 100644 --- a/src/Data/Aeson/TypeScript/Instances.hs +++ b/src/Data/Aeson/TypeScript/Instances.hs @@ -113,7 +113,7 @@ instance {-# OVERLAPPING #-} TypeScript [Char] where getTypeScriptType _ = "string" instance (TypeScript a, TypeScript b) => TypeScript (Either a b) where - getTypeScriptType _ = [i|Either<#{getTypeScriptType (Proxy :: Proxy a)}, #{getTypeScriptType (Proxy :: Proxy b)}>|] + getTypeScriptType _ = [i|Either<#{getTypeScriptType @a Proxy}, #{getTypeScriptType @b Proxy}>|] getTypeScriptDeclarations _ = [TSTypeAlternatives "Either" ["T1", "T2"] ["Left", "Right"] Nothing , TSInterfaceDeclaration "Left" ["T"] [TSField False "Left" "T" Nothing] Nothing , TSInterfaceDeclaration "Right" ["T"] [TSField False "Right" "T" Nothing] Nothing @@ -170,7 +170,7 @@ instance (TypeScript a, TypeScript b, A.ToJSONKey a) => TypeScript (HashMap a b) #if MIN_VERSION_aeson(2,0,0) instance (TypeScript a) => TypeScript (A.KeyMap a) where - getTypeScriptType _ = [i|{[k: string]: #{getTypeScriptType (Proxy :: Proxy a)}}|] + getTypeScriptType _ = [i|{[k: string]: #{getTypeScriptType @a Proxy}}|] getParentTypes _ = L.nub [TSType (Proxy :: Proxy a)] #endif