Upgrade daml2ts test to a more recent davl (#5316)

changelog_begin
changelog_end

Author: shayne-fletcher

compiler/damlc/tests/BUILD.bazel

@@ -217,7 +217,7 @@ da_haskell_test(
         "//compiler/damlc",
         "//compiler/damlc/tests:generate-simple-dalf",
         "//daml-lf/repl",
-        "@davl//:released/davl-v3.dar",
+        "@davl-v3//:released/davl-v3.dar",
         # Feel free to update this to 0.13.55 once that is frozen.
         ":dars/old-proj-0.13.55-snapshot.20200309.3401.0.6f8c3ad8-1.8.dar",
     ],

compiler/damlc/tests/src/DA/Test/Packaging.hs

@@ -34,7 +34,7 @@ main = do
     setEnv "TASTY_NUM_THREADS" "1" True
     damlc <- locateRunfiles (mainWorkspace </> "compiler" </> "damlc" </> exe "damlc")
     repl <- locateRunfiles (mainWorkspace </> "daml-lf" </> "repl" </> exe "repl")
-    davlDar <- locateRunfiles ("davl" </> "released" </> "davl-v3.dar")
+    davlDar <- locateRunfiles ("davl-v3" </> "released" </> "davl-v3.dar")
     oldProjDar <- locateRunfiles (mainWorkspace </> "compiler" </> "damlc" </> "tests" </> "dars" </> "old-proj-0.13.55-snapshot.20200309.3401.0.6f8c3ad8-1.8.dar")
     let validate dar = callProcessSilent damlc ["validate-dar", dar]
     defaultMain $ tests Tools{..}

deps.bzl

@@ -35,8 +35,14 @@ rules_haskell_version = "d59ccf9e7785553fd392924fb083d926c7e01134"
 rules_haskell_sha256 = "c29e779f512f72126c774bceb0bee5c01ca8149d30acc400058014f4b2275710"
 rules_nixpkgs_version = "c966bb8bd335f1e244c03efe6e7a1afa9784038e"
 rules_nixpkgs_sha256 = "ccafea4fc4d5fa2ddba2882f76728558bfe2c12657f7f56078ece43a31761148"
-davl_version = "51d3977be2ab22f7f4434fd4692ca2e17a7cce23"
-davl_sha256 = "e8e76e21b50fb3adab36df26045b1e8c3ee12814abc60f137d39b864d2eae166"
+
+# Recent davl.
+davl_version = "f2d7480d118f32626533d6a150a8ee7552cc0222"  # 2020-03-23, "Deploy upgrade to DAML SDK 0.13.56-snapshot.20200318",https://github.com/digital-asset/davl/pull/233/commits.
+davl_sha256 = "3e8ae2a05724093e33b7f0363381e81a7e8e9655ccb3aa47ad540ea87e814321"
+
+# Pinned davl relied on by damlc packaging tests.
+davl_v3_version = "51d3977be2ab22f7f4434fd4692ca2e17a7cce23"
+davl_v3_sha256 = "e8e76e21b50fb3adab36df26045b1e8c3ee12814abc60f137d39b864d2eae166"
 
 def daml_deps():
     if "rules_haskell" not in native.existing_rules():
@@ -256,6 +262,18 @@ def daml_deps():
             executable = True,
         )
 
+    if "davl-v3" not in native.existing_rules():
+        http_archive(
+            name = "davl-v3",
+            strip_prefix = "davl-{}".format(davl_v3_version),
+            urls = ["https://github.com/digital-asset/davl/archive/{}.tar.gz".format(davl_v3_version)],
+            sha256 = davl_v3_sha256,
+            build_file_content = """
+package(default_visibility = ["//visibility:public"])
+exports_files(["released/davl-v3.dar"])
+            """,
+        )
+
     if "davl" not in native.existing_rules():
         http_archive(
             name = "davl",
@@ -264,6 +282,6 @@ def daml_deps():
             sha256 = davl_sha256,
             build_file_content = """
 package(default_visibility = ["//visibility:public"])
-exports_files(["released/davl-v3.dar", "released/davl-v4.dar", "released/davl-v5.dar", "released/davl-upgrade-v3-v4.dar", "released/davl-upgrade-v4-v5.dar"])
+exports_files(["released/davl-v4.dar", "released/davl-v5.dar", "released/davl-upgrade-v3-v4.dar", "released/davl-upgrade-v4-v5.dar"])
             """,
         )

language-support/ts/codegen/README.md

@@ -40,6 +40,31 @@ trinity of shell scripts, all in parallel and each in its own terminal:
 All these steps only check that everything compiles. They do _not_ run any
 tests. To run the tests suite, you need to issue the command above.
 
+### How to run daml2ts on a set of DARs from bazel
+
+Running the code-generator outside of the SDK means having to take
+into account the dependency of daml2ts generated packages on a version
+of `daml-types` that is not available on NPM. The folllowing recipe
+shows how it's done (obviously you'll need to adapt paths in the below
+to your own environment).
+```bash
+mkdir -p ~/tmp/davl
+cd ~/tmp/davl
+cat > package.json<<EOF
+{
+  "private": true,
+  "workspaces": ["daml2ts"],
+  "resolutions": {
+    "@daml/types": "file:daml-types"
+  }
+}
+EOF
+cd ~/project/daml.git
+bazel build //language-support/ts/daml-types:npm_package
+cp -R bazel-bin/language-support/ts/daml-types/npm_package ~/tmp/davl/daml-types
+bazel run //language-support/ts/codegen:daml2ts -- -o ~/tmp/davl/daml2ts ~/project/davl.git/released/*.dar
+```
+
 ## What `daml2ts` generates
 
 The DAML SDK documentation contains [a page](https://github.com/digital-asset/daml/tree/master/docs/source/daml2ts) on `daml2ts`. It is recommended that you start with this. The remainder of this section contains additional detail (mostly about serialization code). The code that `daml2ts` generates uses the  [@daml/types](https://github.com/digital-asset/daml/tree/master/language-support/ts/daml-types) and [@mojotech/json-type-validation](https://github.com/mojotech/json-type-validation) libraries. All TypeScript modules generated by `daml2ts` begin with the following fragment:

language-support/ts/codegen/tests/BUILD.bazel

@@ -149,9 +149,7 @@ da_haskell_test(
         "//compiler/damlc",
         "//language-support/ts/codegen:daml2ts",
         "//language-support/ts/daml-types:npm_package",
-        "@davl//:released/davl-upgrade-v3-v4.dar",
         "@davl//:released/davl-upgrade-v4-v5.dar",
-        "@davl//:released/davl-v3.dar",
         "@davl//:released/davl-v4.dar",
         "@davl//:released/davl-v5.dar",
     ],

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

@@ -202,9 +202,22 @@ tests damlTypes yarn damlc daml2ts davl = testGroup "daml2ts tests"
           , davl </> "davl-v5.dar"
           , davl </> "davl-upgrade-v4-v5.dar" ] ++
           ["-o", daml2tsDir]
-        mapM_ (assertTsFileExists (daml2tsDir </> "davl-0.0.4")) [ "index", "DAVL" </> "module" ]
-        mapM_ (assertTsFileExists (daml2tsDir </> "davl-0.0.5")) [ "index", "DAVL" </> "module" ]
-        mapM_ (assertTsFileExists (daml2tsDir </> "davl-upgrade-v4-v5-0.0.5")) [ "index", "Upgrade" </> "module" ]
+        mapM_ (assertTsFileExists (daml2tsDir </> "davl-0.0.4"))
+          [ "index"
+          , "DAVL" </> "index"
+          , "DAVL" </> "module"
+          ]
+        mapM_ (assertTsFileExists (daml2tsDir </> "davl-0.0.5"))
+          [ "index"
+          , "DAVL" </> "index"
+          , "DAVL" </> "V5" </> "index"
+          , "DAVL" </> "V5" </> "module"
+          ]
+        mapM_ (assertTsFileExists (daml2tsDir </> "davl-upgrade-v4-v5-0.0.5"))
+          [ "index"
+          , "Upgrade" </> "index"
+          , "Upgrade" </> "module"
+          ]
       step "eslint..."
       withCurrentDirectory daml2tsDir $ do
         pkgs <- (\\ ["package.json", "node_modules"]) <$> listDirectory daml2tsDir