flipstone · OwenGraves · Dec 20, 2024 · Dec 19, 2024
diff --git a/json-fleece-codegen-util/codegen-prelude.dhall b/json-fleece-codegen-util/codegen-prelude.dhall
@@ -32,6 +32,7 @@ let
     { defaultTypeOptions = TypeOptions.default
     , typeOptions = [] : List SpecificTypeOptions
     , strictAdditionalProperties = True
+    , useOptionalNullable = False
     }
 
 in

diff --git a/json-fleece-codegen-util/json-fleece-codegen-util.cabal b/json-fleece-codegen-util/json-fleece-codegen-util.cabal
@@ -1,11 +1,11 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.36.0.
+-- This file has been generated from package.yaml by hpack version 0.37.0.
 --
 -- see: https://github.com/sol/hpack
 
 name:           json-fleece-codegen-util
-version:        0.11.0.0
+version:        0.12.0.0
 description:    Please see the README on GitHub at <https://github.com/githubuser/json-fleece-codegen-util#readme>
 homepage:       https://github.com/flipstone/json-fleece#readme
 bug-reports:    https://github.com/flipstone/json-fleece/issues

diff --git a/json-fleece-codegen-util/package.yaml b/json-fleece-codegen-util/package.yaml
@@ -1,5 +1,5 @@
 name:                json-fleece-codegen-util
-version:             0.11.0.0
+version:             0.12.0.0
 github:              "flipstone/json-fleece/json-fleece-codegen-util"
 license:             BSD3
 author:              "Author name here"

diff --git a/json-fleece-codegen-util/src/Fleece/CodeGenUtil.hs b/json-fleece-codegen-util/src/Fleece/CodeGenUtil.hs
@@ -93,6 +93,7 @@ data CodeGenOptions = CodeGenOptions
   , defaultTypeOptions :: TypeOptions
   , typeOptionsMap :: Map.Map T.Text TypeOptions
   , strictAdditionalProperties :: Bool
+  , useOptionalNullable :: Bool
   }
 
 data TypeOptions = TypeOptions
@@ -1659,6 +1660,7 @@ generateFleeceObject typeMap references typeName rawCodeGenFields mbAdditionalPr
     traverse (mkFleeceSchemaField typeMap moduleName) codeGenFields
 
   mbAdditionalPropertiesSchemaTypeInfo <- mapM (schemaInfoOrRefToSchemaTypeInfo typeMap . codeGenAdditionalPropertiesSchemaInfoOrRef) mbAdditionalProperties
+  useOptionalNullableBool <- asks useOptionalNullable
 
   let
     additionalPropsFieldNameAndType =
@@ -1685,7 +1687,7 @@ generateFleeceObject typeMap references typeName rawCodeGenFields mbAdditionalPr
     fleeceField field =
       HC.addReferences [HC.VarReference "Fleece.Core" Nothing "(#+)"] $
         "#+ "
-          <> fleeceFieldFunction field
+          <> fleeceFieldFunction field useOptionalNullableBool
           <> " "
           <> HC.stringLiteral (fieldJSONName field)
           <> " "
@@ -1792,11 +1794,11 @@ fieldFleeceSchemaCode :: FleeceSchemaField -> HC.HaskellCode
 fieldFleeceSchemaCode =
   schemaTypeSchema . fieldBaseSchemaTypeInfo
 
-fleeceFieldFunction :: FleeceSchemaField -> HC.HaskellCode
-fleeceFieldFunction field =
-  if fieldRequired field
-    then fleeceCoreVar "required"
-    else fleeceCoreVar "optional"
+fleeceFieldFunction :: FleeceSchemaField -> Bool -> HC.HaskellCode
+fleeceFieldFunction field useOptionalNullableBool
+  | fieldRequired field = fleeceCoreVar "required"
+  | useOptionalNullableBool = fleeceCoreVar "optionalNullable"
+  | otherwise = fleeceCoreVar "optional"
 
 mkFleeceSchemaField ::
   CodeGenMap ->

diff --git a/json-fleece-codegen-util/src/Fleece/CodeGenUtil/Config.hs b/json-fleece-codegen-util/src/Fleece/CodeGenUtil/Config.hs
@@ -27,6 +27,7 @@ decoder =
                 <*> Dhall.field "defaultTypeOptions" typeOptionsDecoder
                 <*> Dhall.field "typeOptions" typeOptionsMapDecoder
                 <*> Dhall.field "strictAdditionalProperties" Dhall.bool
+                <*> Dhall.field "useOptionalNullable" Dhall.bool
             )
         <*> Dhall.field "inputFileName" Dhall.string
         <*> Dhall.field "destination" Dhall.string

diff --git a/json-fleece-openapi3/json-fleece-openapi3.cabal b/json-fleece-openapi3/json-fleece-openapi3.cabal
@@ -2058,7 +2058,7 @@ library
     , base >=4.7 && <5
     , containers ==0.6.*
     , insert-ordered-containers ==0.2.*
-    , json-fleece-codegen-util ==0.11.*
+    , json-fleece-codegen-util ==0.12.*
     , mtl >=2.2 && <2.4
     , non-empty-text ==0.2.*
     , openapi3 ==3.2.*
@@ -2078,7 +2078,7 @@ executable fleece-openapi3
   ghc-options: -rtsopts -threaded
   build-depends:
       base >=4.7 && <5
-    , json-fleece-codegen-util ==0.11.*
+    , json-fleece-codegen-util ==0.12.*
     , json-fleece-openapi3
   default-language: Haskell2010
   if flag(strict)
@@ -2099,7 +2099,7 @@ test-suite json-fleece-openapi3-test
     , bytestring >=0.11 && <0.13
     , file-embed >=0.0.15 && <0.0.17
     , hedgehog
-    , json-fleece-codegen-util ==0.11.*
+    , json-fleece-codegen-util ==0.12.*
     , json-fleece-openapi3
     , yaml ==0.11.*
   default-language: Haskell2010

diff --git a/json-fleece-openapi3/package.yaml b/json-fleece-openapi3/package.yaml
@@ -45,7 +45,7 @@ when:
 
 dependencies:
   - base >= 4.7 && < 5
-  - json-fleece-codegen-util >= 0.11 && < 0.12
+  - json-fleece-codegen-util >= 0.12 && < 0.13
 
 extra-source-files:
   - examples/star-trek/codegen.dhall

diff --git a/json-fleece-swagger2/json-fleece-swagger2.cabal b/json-fleece-swagger2/json-fleece-swagger2.cabal
@@ -85,7 +85,7 @@ library
   build-depends:
       base >=4.7 && <5
     , insert-ordered-containers ==0.2.*
-    , json-fleece-codegen-util ==0.11.*
+    , json-fleece-codegen-util ==0.12.*
     , json-fleece-openapi3 ==0.4.*
     , openapi3 ==3.2.*
     , swagger2 ==2.8.*
@@ -105,7 +105,7 @@ executable fleece-swagger2
   ghc-options: -rtsopts -threaded
   build-depends:
       base >=4.7 && <5
-    , json-fleece-codegen-util ==0.11.*
+    , json-fleece-codegen-util ==0.12.*
     , json-fleece-swagger2
   default-language: Haskell2010
   if flag(strict)
@@ -127,7 +127,7 @@ test-suite json-fleece-swagger2-test
     , bytestring >=0.11 && <0.13
     , file-embed >=0.0.15 && <0.0.17
     , hedgehog
-    , json-fleece-codegen-util ==0.11.*
+    , json-fleece-codegen-util ==0.12.*
     , json-fleece-swagger2
   default-language: Haskell2010
   if flag(strict)

diff --git a/json-fleece-swagger2/package.yaml b/json-fleece-swagger2/package.yaml
@@ -17,7 +17,7 @@ description:         Please see the README on GitHub at <https://github.com/gith
 
 dependencies:
 - base >= 4.7 && < 5
-- json-fleece-codegen-util >= 0.11 && < 0.12
+- json-fleece-codegen-util >= 0.12 && < 0.13
 
 flags:
   strict:

diff --git a/scripts/lib/run-in-container.sh b/scripts/lib/run-in-container.sh
@@ -3,5 +3,5 @@ if [ "$IN_DEV_CONTAINER" ]; then
   :
 else
   docker compose build
-  exec docker compose run dev $0 "$@"
+  exec docker compose run --rm dev $0 "$@"
 fi