daml-types.ts: Lint tests as well (digital-asset#4208)

* daml-types.ts: Lint tests as well Also simplify file selection a bit. CHANGELOG_BEGIN CHANGELOG_END * Fix build command in test script CHANGELOG_BEGIN CHANGELOG_END
axman6 · Jan 25, 2020 · 8b7878f · 8b7878f
1 parent 2160ad5
commit 8b7878f
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 12 deletions.
diff --git a/language-support/ts/codegen/tests/build-and-lint.sh b/language-support/ts/codegen/tests/build-and-lint.sh
@@ -48,7 +48,7 @@ cd $TMP_DIR
 $DAML2TS -o generated/src/daml --main-package-name daml-tests $DAR
 sed -i "s/0.0.0-SDKVERSION/${VERSION}/" generated/package.json
 $YARN install --frozen-lockfile
-$YARN workspaces run build
 cd generated
+$YARN build
 $YARN lint
 JAVA=$JAVA SANDBOX=$SANDBOX JSON_API=$JSON_API DAR=$DAR $YARN test
diff --git a/language-support/ts/daml-types/BUILD.bazel b/language-support/ts/daml-types/BUILD.bazel
@@ -12,10 +12,7 @@ load("@sdk_version//:sdk_version.bzl", "sdk_version")
 
 ts_library(
     name = "daml-types",
-    srcs = glob(
-        ["**/*.ts"],
-        exclude = ["**/*.test.ts"],
-    ),
+    srcs = glob(["**/*.ts"]),
     data = [
         ":LICENSE",
         ":package.json",
@@ -42,8 +39,10 @@ eslint_test(
     name = "lint",
     srcs = glob(
         ["**/*.ts"],
-        exclude = ["**/*.test.ts"],
+        exclude = ["lib/**/*"],
     ),
+    data = ["tsconfig.json"],
+    tsconfig = "tsconfig.eslint.json",
 )
 
 pkg_npm(

diff --git a/language-support/ts/daml-types/package.json b/language-support/ts/daml-types/package.json
@@ -26,7 +26,7 @@
     ],
     "parser": "@typescript-eslint/parser",
     "parserOptions": {
-      "project": "./tsconfig.json"
+      "project": "./tsconfig.eslint.json"
     },
     "plugins": [
       "@typescript-eslint"

diff --git a/language-support/ts/daml-types/tsconfig.eslint.json b/language-support/ts/daml-types/tsconfig.eslint.json
@@ -0,0 +1,7 @@
+{
+  "extends": "./tsconfig.json",
+  "files": [
+    "index.ts",
+    "index.test.ts"
+  ]
+}
diff --git a/language-support/ts/daml-types/tsconfig.json b/language-support/ts/daml-types/tsconfig.json
@@ -15,9 +15,5 @@
     "declaration": true,
     "sourceMap": true
   },
-  "include": ["**/*.ts"],
-  "exclude": [
-    "**/*.test.ts",
-    "lib/**/*"
-  ]
+  "files": ["index.ts"]
 }