Try to get package name from manifest (if not provided) (digital-asse…

…t#4476) Also, mark `build-and-lint` "exclusive". changelog_begin changelog_end
FlashSheridan · Feb 11, 2020 · a334e21 · a334e21
1 parent 943b430
commit a334e21
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/language-support/ts/codegen/src/TsCodeGenMain.hs b/language-support/ts/codegen/src/TsCodeGenMain.hs
@@ -56,8 +56,11 @@ main :: IO ()
 main = do
     opts@Options{..} <- execParser optionsParserInfo
     dar <- B.readFile optInputDar
-    dalfs <- either fail pure $ DAR.readDalfs $ Zip.toArchive $ BSL.fromStrict dar
-    forM_ ((DAR.mainDalf dalfs, optMainPackageName) : map (, Nothing) (DAR.dalfs dalfs)) $ \(dalf, mbPkgName) -> do
+    let archive = Zip.toArchive $ BSL.fromStrict dar
+    dalfs <- either fail pure $ DAR.readDalfs archive
+    DAR.DalfManifest{packageName, ..} <- either fail pure $ DAR.readDalfManifest archive
+    packageName <- pure $ optMainPackageName <|> packageName
+    forM_ ((DAR.mainDalf dalfs, packageName) : map (, Nothing) (DAR.dalfs dalfs)) $ \(dalf, mbPkgName) -> do
         (pkgId, pkg) <- either (fail . show)  pure $ Archive.decodeArchive Archive.DecodeAsMain (BSL.toStrict dalf)
         daml2ts opts pkgId pkg mbPkgName
 

diff --git a/language-support/ts/codegen/tests/BUILD.bazel b/language-support/ts/codegen/tests/BUILD.bazel
@@ -59,6 +59,9 @@ sh_test(
             "ts/generated/src/daml/**",
         ],
     ),
+    tags = [
+        "exclusive",  # Due to the use of hardcoded ports in 'build-and-lint.sh'.
+    ],
     deps = [
         "@bazel_tools//tools/bash/runfiles",
     ],