Encoders of the primary class don't need a suffix

This was fixed with external references but not when internally
referencing the primary class

src/Ccap/Codegen/Scala.purs

@@ -9,7 +9,8 @@ import Ccap.Codegen.Parser.Export as Export
 import Ccap.Codegen.Shared (DelimitedLiteralDir(..), OutputSpec, delimitedLiteral, indented, modulesInScope)
 import Ccap.Codegen.Types (Annotations, Exports, Module, ModuleName, Primitive(..), RecordProp, TRef, TopType(..), Type(..), TypeDecl(..), ValidatedModule, isRecord, typeDeclName, typeDeclTopType)
 import Ccap.Codegen.Util (fromMaybeT, maybeT)
-import Control.Monad.Maybe.Trans (MaybeT(..))
+import Control.Alt (alt)
+import Control.Monad.Maybe.Trans (MaybeT(..), runMaybeT)
 import Control.Monad.Reader (Reader, ask, asks, runReader)
 import Data.Array ((:))
 import Data.Array as Array
@@ -347,17 +348,29 @@ decoder annots = case _ of
   Primitive p -> pure $ (text $ "Decoder" <> jsonPrimitive p) <<>> decoderValidations annots
 
 jsonRef :: String -> String -> String
-jsonRef which typ = "json" <> which <> typ
+jsonRef which typ = "json" <> which <> typ -- should be blank if it is the primary class
 
 jsonTypeRef :: String -> TRef -> Codegen String
 jsonTypeRef which { mod, typ } =
-  fromMaybeT (jsonRef which typ) do
-    modName <- maybeT mod
-    extMod <- MaybeT $ askModule modName
-    extTypeDecl <- maybeT $ lookupTypeDecl typ extMod
-    let
-      path = Array.snoc (Array.fromFoldable $ packageAnnotation extMod) modName
-    pure $ prefix path $ jsonRef which $ guard (needsQualifier modName extTypeDecl) typ
+  let
+    externalJson =
+      runMaybeT do
+        modName <- maybeT mod
+        extMod <- MaybeT $ askModule modName
+        extTypeDecl <- maybeT $ lookupTypeDecl typ extMod
+        let
+          path = Array.snoc (Array.fromFoldable $ packageAnnotation extMod) modName
+        pure $ prefix path $ jsonRef which $ guard (needsQualifier modName extTypeDecl) typ
+
+    internalJson =
+      runMaybeT do
+        thisMod <- MaybeT $ Just <$> asks _.currentModule
+        decl <- maybeT $ lookupTypeDecl typ thisMod
+        pure $ jsonRef which $ guard (needsQualifier thisMod.name decl) typ
+
+    default = jsonRef which typ
+  in
+    alt <$> internalJson <*> externalJson <#> fromMaybe default
 
 jsonList :: Box -> Box
 jsonList json = json <<>> text ".list"

test/Ccap/Codegen/Prefix.purs

@@ -33,6 +33,8 @@ specs =
           $ check "prefixInternalRef:" "  prefixInternalRef: Prefix.CustomType,"
         it "Don't need prefixes if defined in the companion object"
           $ check "customInternalRef:" "    customInternalRef: CustomType,"
+        it "Don't use the type suffix for encoders if they are the file's class"
+          $ check "\"prefix\" ->" "      \"prefix\" -> jsonEncoder.encode(x.prefix),"
       describe "type references" do
         it "Are defined in the companion object and don't need prefixes"
           $ check "type InternalRef" "  type InternalRef = CustomType"

test/resources/prefix/Prefix.tmpl

@@ -20,3 +20,7 @@ type CustomRec: {
 type Prefix: {
   prefixInternalRef: CustomType
 }
+
+type SelfRef: {
+  prefix: Prefix
+}