The -p flag to daml2ts is mandatory; create package.json if not there (#5001)

changelog_begin
changelog_end

language-support/ts/codegen/src/TsCodeGenMain.hs

@@ -78,7 +78,7 @@ newtype Script = Script {unScript :: T.Text}
 data Options = Options
     { optInputDars :: [FilePath]
     , optOutputDir :: FilePath
-    , optInputPackageJson :: Maybe FilePath
+    , optInputPackageJson :: FilePath
     , optScope :: Scope -- Defaults to 'daml.js'.
     }
 
@@ -93,11 +93,12 @@ optionsParser = Options
         <> metavar "DIR"
         <> help "Output directory for the generated packages"
         )
-    <*> optional (strOption
+    <*> strOption
         (  short 'p'
         <> metavar "PACKAGE-JSON"
-        <> help "Path to an existing 'package.json' to update"
-        ))
+        <> value "package.json"
+        <> help "Path to a 'package.json' to update (or create if missing)"
+        )
     <*> (Scope . ("@" <>) <$> strOption
         (  short 's'
         <> metavar "SCOPE"
@@ -172,7 +173,7 @@ main = do
                      asName = if pkgName == id then "itself" else pkgName
                  T.putStrLn $ "Generating " <> id <> " as " <> asName
                  daml2ts Daml2TsParams{..}
-        whenJust optInputPackageJson $ setupWorkspace optOutputDir dependencies
+        setupWorkspace optInputPackageJson optOutputDir dependencies
 
 packageNameText :: PackageId -> Maybe PackageName -> T.Text
 packageNameText pkgId mbPkgIdent = maybe (unPackageId pkgId) unPackageName mbPkgIdent
@@ -727,8 +728,17 @@ instance ToJSON PackageJson where
 
 -- Read the provided 'package.json'; transform it to include the
 -- provided workspaces; write it back to disk.
-setupWorkspace :: FilePath -> [(T.Text, [Dependency])] -> FilePath -> IO ()
-setupWorkspace optOutputDir dependencies file = do
+setupWorkspace :: FilePath -> FilePath -> [(T.Text, [Dependency])] -> IO ()
+setupWorkspace optInputPackageJson optOutputDir dependencies = do
+  -- If the file designated by 'optInputPackageJson' doesn't yet
+  -- exist, create it.
+  packageJsonExists <- doesFileExist optInputPackageJson
+  when (not packageJsonExists) $ do
+    BSL.writeFile optInputPackageJson $
+      encodePretty (object
+                    [ "private" .= True
+                    , "workspaces" .= ([] :: [T.Text])
+                    ])
   let (g, nodeFromVertex) = graphFromEdges'
         (map (\(a, ds) -> (a, a, map unDependency ds)) dependencies)
       ps = map (fst3 . nodeFromVertex) $ reverse (topSort g)
@@ -736,9 +746,9 @@ setupWorkspace optOutputDir dependencies file = do
       outBaseDir = T.pack $ takeFileName optOutputDir
         -- The leaf directory of the output directory (e.g. often 'daml2ts').
   let ourWorkspaces = map ((outBaseDir <> "/") <>) ps
-  bytes <- BSL.readFile file
+  bytes <- BSL.readFile optInputPackageJson
   case decode bytes :: Maybe PackageJson of
-    Nothing -> fail $ "Error decoding JSON from '" <> file <> "'"
+    Nothing -> fail $ "Error decoding JSON from '" <> optInputPackageJson <> "'"
     Just oldPackageJson -> transformAndWrite ourWorkspaces outBaseDir oldPackageJson
   where
     transformAndWrite :: [T.Text] -> T.Text -> PackageJson -> IO ()
@@ -747,5 +757,5 @@ setupWorkspace optOutputDir dependencies file = do
             -- Old versions of our packages should be removed.
           allWorkspaces = ourWorkspaces ++ keepWorkspaces
             -- Our packages need to come before any other existing packages.
-      BSL.writeFile file $ encodePretty oldPackageJson{workspaces=allWorkspaces}
-      putStrLn $ "'" <> file <> "' updated."
+      BSL.writeFile optInputPackageJson $ encodePretty oldPackageJson{workspaces=allWorkspaces}
+      putStrLn $ "'" <> optInputPackageJson <> "' created or updated."

language-support/ts/codegen/tests/src/DA/Test/Daml2Ts.hs

@@ -167,13 +167,25 @@ tests damlTypes yarn damlc daml2ts davl = testGroup "daml2ts tests"
   , testCaseSteps "DAVL test" $ \step -> withTempDir $ \here -> do
       let daml2tsDir = here </> "daml2ts"
       withCurrentDirectory here $ do
-        setupWorkspace
         step "daml2ts..."
+        -- Call daml2ts once without a 'package.json'.
         callProcessSilent daml2ts $
           [ davl </> "davl-v4.dar"
           , davl </> "davl-v5.dar"
           , davl </> "davl-upgrade-v4-v5.dar" ] ++
-          ["-o", daml2tsDir, "-p", here </> "package.json"]
+          ["-o", daml2tsDir]
+        assertFileExists (here </> "package.json")
+        -- Overwrite the 'package.json' that daml2ts generated because
+        -- we need to adjust module resolution for @daml/types and
+        -- @daml/ledger.
+        setupWorkspace
+        -- Call daml2ts again which will this time update 'package.json'.
+        callProcessSilent daml2ts $
+          [ davl </> "davl-v4.dar"
+          , davl </> "davl-v5.dar"
+          , davl </> "davl-upgrade-v4-v5.dar" ] ++
+          ["-o", daml2tsDir] -- There's no need to pass '-p
+                             -- here/package.json' but we could and it would mean the same.
         assertFileExists (daml2tsDir </> "davl-0.0.4" </> "src" </> "DAVL.ts")
         assertFileExists (daml2tsDir </> "davl-0.0.5" </> "src" </> "DAVL.ts")
         assertFileExists (daml2tsDir </> "davl-upgrade-v4-v5-0.0.5" </> "src" </> "Upgrade.ts")