fix(builtin): fix regression in 1.6.0 in linker linking root package when under runfiles

internal/linker/index.js

@@ -372,6 +372,9 @@ function main(args, runfiles) {
                             if (runfilesPath.startsWith(`${bin}/`)) {
                                 runfilesPath = runfilesPath.slice(bin.length + 1);
                             }
+                            else if (runfilesPath === bin) {
+                                runfilesPath = '';
+                            }
                             const externalPrefix = 'external/';
                             if (runfilesPath.startsWith(externalPrefix)) {
                                 runfilesPath = runfilesPath.slice(externalPrefix.length);

internal/linker/link_node_modules.ts

@@ -601,6 +601,8 @@ export async function main(args: string[], runfiles: Runfiles) {
           let runfilesPath = modulePath;
           if (runfilesPath.startsWith(`${bin}/`)) {
             runfilesPath = runfilesPath.slice(bin.length + 1);
+          } else if (runfilesPath === bin) {
+            runfilesPath = '';
           }
           const externalPrefix = 'external/';
           if (runfilesPath.startsWith(externalPrefix)) {

internal/linker/test/issue_1823/BUILD.bazel

@@ -0,0 +1,30 @@
+load("@build_bazel_rules_nodejs//:index.bzl", "copy_to_bin")
+load("@npm_bazel_typescript//:index.bzl", "ts_library")
+load(":ts_jest_test.bzl", "ts_jest_test")
+
+ts_library(
+    name = "lib",
+    srcs = [
+        "lib.ts",
+    ],
+    deps = [
+    ],
+)
+
+# Shenanigans for Windows which doesn't have runfiles symlinks
+# We need the jest config to be in the output tree where the specs are
+copy_to_bin(
+    name = "jest_config",
+    srcs = ["jest.config.js"],
+)
+
+ts_jest_test(
+    name = "test",
+    srcs = [
+        "lib.test.ts",
+    ],
+    jest_config = ":jest_config",
+    deps = [
+        ":lib",
+    ],
+)

internal/linker/test/issue_1823/jest.config.js

@@ -0,0 +1,3 @@
+module.exports = {
+  testEnvironment: 'node',
+};

internal/linker/test/issue_1823/lib.test.ts

@@ -0,0 +1,7 @@
+import {doStuff} from './lib';
+
+describe('doStuff', () => {
+  it('should do some stuff', () => {
+    expect(doStuff('boom')).toContain('boom');
+  });
+});

internal/linker/test/issue_1823/lib.ts

@@ -0,0 +1,3 @@
+export function doStuff(a: string): string {
+  return a
+}

internal/linker/test/issue_1823/ts_jest_test.bzl

@@ -0,0 +1,35 @@
+"""Simple macro around jest_test"""
+
+load("@npm//jest-cli:index.bzl", _jest_test = "jest_test")
+load("@npm_bazel_typescript//:index.bzl", "ts_library")
+
+def ts_jest_test(name, srcs, jest_config, deps = [], data = [], **kwargs):
+    """A macro around the autogenerated jest_test rule that takes typescript sources
+
+Uses ts_library devmode UMD output"""
+
+    ts_library(
+        name = "%s_ts" % name,
+        srcs = srcs,
+        data = data,
+        deps = deps + ["@npm//@types/jest"],
+    )
+    native.filegroup(
+        name = "%s_umd" % name,
+        srcs = [":%s_ts" % name],
+        output_group = "es5_sources",
+    )
+
+    args = [
+        "--no-cache",
+        "--no-watchman",
+        "--ci",
+    ]
+    args.extend(["--config", "$$(rlocation $(rootpath %s))" % jest_config])
+
+    _jest_test(
+        name = name,
+        data = [jest_config, ":%s_umd" % name] + deps + data,
+        templated_args = args,
+        **kwargs
+    )

internal/linker/test/issue_1823_use_ts_library_esm/.babelrc

@@ -0,0 +1,12 @@
+{
+  "presets": [
+    [
+      "@babel/preset-env",
+      {
+        "targets": {
+          "node": "current",
+        },
+      },
+    ],
+  ]
+}

internal/linker/test/issue_1823_use_ts_library_esm/BUILD.bazel

@@ -0,0 +1,50 @@
+load("@build_bazel_rules_nodejs//:index.bzl", "copy_to_bin")
+load("@npm_bazel_typescript//:index.bzl", "ts_library")
+load(":ts_jest_test.bzl", "ts_jest_test")
+
+ts_library(
+    name = "lib",
+    srcs = [
+        "lib.ts",
+    ],
+    # NB: hacky hidden configuration setting so that es6_sources does not include tsickle
+    #     .externs.js outputs
+    runtime = "nodejs",
+    deps = [
+        "@npm//@types/node",
+    ],
+)
+
+# Shenanigans for Windows which doesn't have runfiles symlinks
+# We need the jest config to be in the output tree where the specs are
+copy_to_bin(
+    name = "jest_config",
+    srcs = [
+        "jest.config.js",
+    ],
+)
+
+# Same goes for babelrc. We can't add it to the jest_config copy_to_bin
+# since must be a file that is passed to jest in the --config arg.
+copy_to_bin(
+    name = "babel_rc",
+    srcs = [
+        ".babelrc",
+    ],
+)
+
+ts_jest_test(
+    name = "test",
+    srcs = [
+        "lib.test.ts",
+    ],
+    data = [
+        ":babel_rc",
+    ],
+    jest_config = ":jest_config",
+    deps = [
+        ":lib",
+        "@npm//@babel/preset-env",
+        "@npm//babel-jest",
+    ],
+)

internal/linker/test/issue_1823_use_ts_library_esm/jest.config.js

@@ -0,0 +1,18 @@
+const isWindows = process.platform === 'win32';
+
+module.exports = {
+  testEnvironment: 'node',
+  transform: {'^.+\\.mjs?$': 'babel-jest'},
+  // More Shenanigans for Windows where jest is running both the original .mjs & the babel
+  // transformed .js and fails. Not sure what why this is the case or exactly why changing
+  // testMatch solves it but not a priority to solve:
+  // ```
+  // PASS ../../lib.test.js
+  // FAIL ../../lib.test.mjs
+  // C:\b\swkzcapm\execroot\build_bazel_rules_nodejs\bazel-out\x64_windows-fastbuild\bin\internal\linker\test\issue_1823_use_ts_library_esm\lib.test.mjs:1
+  //     import { doStuff } from './lib';
+  //     ^^^^^^
+  // ```
+  testMatch: [isWindows ? '**/?(*.)(spec|test).js?(x)' : '**/?(*.)(spec|test).?(m)js?(x)'],
+  moduleFileExtensions: ['js', 'mjs'],
+};

internal/linker/test/issue_1823_use_ts_library_esm/lib.test.ts

@@ -0,0 +1,7 @@
+import {doStuff} from './lib';
+
+describe('doStuff', () => {
+  it('should do some stuff', () => {
+    expect(doStuff('boom')).toContain('boom');
+  });
+});

internal/linker/test/issue_1823_use_ts_library_esm/lib.ts

@@ -0,0 +1,3 @@
+export function doStuff(a: string): string {
+  return a
+}

internal/linker/test/issue_1823_use_ts_library_esm/ts_jest_test.bzl

@@ -0,0 +1,38 @@
+"""Simple macro around jest_test"""
+
+load("@npm//jest-cli:index.bzl", _jest_test = "jest_test")
+load("@npm_bazel_typescript//:index.bzl", "ts_library")
+
+def ts_jest_test(name, srcs, jest_config, deps = [], data = [], **kwargs):
+    """A macro around the autogenerated jest_test rule that takes typescript sources
+
+Uses ts_library prodmode ems output"""
+
+    ts_library(
+        name = "%s_ts" % name,
+        srcs = srcs,
+        data = data,
+        deps = deps + ["@npm//@types/jest"],
+        # NB: hacky hidden configuration setting so that es6_sources does not include tsickle
+        #     .externs.js outputs
+        runtime = "nodejs",
+    )
+    native.filegroup(
+        name = "%s_esm" % name,
+        srcs = [":%s_ts" % name],
+        output_group = "es6_sources",
+    )
+
+    args = [
+        "--no-cache",
+        "--no-watchman",
+        "--ci",
+    ]
+    args.extend(["--config", "$$(rlocation $(rootpath %s))" % jest_config])
+
+    _jest_test(
+        name = name,
+        data = [jest_config, ":%s_esm" % name] + deps + data,
+        templated_args = args,
+        **kwargs
+    )

internal/linker/test/local/fit/tsconfig.json

@@ -1,5 +1,6 @@
 {
   "compilerOptions": {
-    "declaration": true
+    "declaration": true,
+    "types": []
   }
 }

internal/node/test/lib2/tsconfig.json

@@ -1 +1,5 @@
-{}
+{
+  "compilerOptions": {
+    "types": ["node"]
+  }
+}

internal/node/test/tsconfig.json

@@ -1,3 +1,6 @@
 {
+  "compilerOptions": {
+    "types": []
+  },
   "include": ["main.ts"]
 }

internal/pkg_npm/test/linking/fub/tsconfig.json

@@ -1,5 +1,6 @@
 {
   "compilerOptions": {
-    "declaration": true
+    "declaration": true,
+    "types": []
   }
 }

internal/pkg_npm/test/linking/fuz/tsconfig.json

@@ -1,5 +1,6 @@
 {
   "compilerOptions": {
-    "declaration": true
+    "declaration": true,
+    "types": []
   }
 }

internal/pkg_npm/test/linking/tsconfig.json

@@ -1,6 +1,7 @@
 {
   "compilerOptions": {
-    "declaration": true
+    "declaration": true,
+    "types": []
   },
   "include": ["*.ts"]
 }

package.json

@@ -26,8 +26,10 @@
         "@gregmagolan/test-a": "0.0.5",
         "@types/hammerjs": "2.0.35",
         "@types/jasmine": "~3.3.13",
+        "@types/jest": "24.9.0",
         "@types/node": "^12.0.0",
         "@types/semver": "6.2.0",
+        "babel-jest": "^25.5.1",
         "bazel_workspaces": "file:./tools/npm_packages/bazel_workspaces",
         "clang-format": "1.2.2",
         "conventional-changelog-cli": "^2.0.21",

packages/rollup/test/integration/far/a/b/c/tsconfig.json

@@ -4,6 +4,7 @@
     "strict": true,
     "target": "es2015",
     "module": "esnext",
-    "moduleResolution": "node"
+    "moduleResolution": "node",
+    "types": []
   }
 }

packages/rollup/test/integration/far/a/tsconfig.json

@@ -4,7 +4,8 @@
     "strict": true,
     "target": "es2015",
     "module": "esnext",
-    "moduleResolution": "node"
+    "moduleResolution": "node",
+    "types": []
   },
   // For Windows, which is not sand-boxed, we need to limit
   // the typescript files included so the "@far/a" compilation

packages/rollup/test/integration/foo/tsconfig.json

@@ -4,6 +4,7 @@
     "strict": true,
     "target": "es2015",
     "module": "esnext",
-    "moduleResolution": "node"
+    "moduleResolution": "node",
+    "types": []
   }
 }

packages/rollup/test/integration/foo_a/tsconfig.json

@@ -4,6 +4,7 @@
     "strict": true,
     "target": "es2015",
     "module": "esnext",
-    "moduleResolution": "node"
+    "moduleResolution": "node",
+    "types": []
   }
 }

packages/rollup/test/integration/foo_aaa/tsconfig.json

@@ -4,6 +4,7 @@
     "strict": true,
     "target": "es2015",
     "module": "esnext",
-    "moduleResolution": "node"
+    "moduleResolution": "node",
+    "types": []
   }
 }

packages/typescript/src/checked_in_ts_project.bzl

@@ -31,6 +31,7 @@ def checked_in_ts_project(name, src, checked_in_js = None, **kwargs):
                 module = "commonjs",
                 removeComments = True,
                 declaration = True,
+                skipLibCheck = True,
             ),
             files = ["/".join([workspace_root, native.package_name(), src])],
         ).to_json()],

packages/typescript/test/ts_project/b/tsconfig-test.json

@@ -1,5 +1,8 @@
 {
     "extends": "../tsconfig-base.json",
+    "compilerOptions": {
+        "types": ["jasmine", "node"]
+    },
     "references": [
         {"path": "./"}
     ],

packages/typescript/test/ts_project/empty_intermediate/tsconfig-a.json

@@ -1,3 +1,6 @@
 {
-    "files": ["a.d.ts"]
+    "files": ["a.d.ts"],
+    "compilerOptions": {
+        "types": []
+    }
 }

packages/typescript/test/ts_project/empty_intermediate/tsconfig-b.json

@@ -1,3 +1,6 @@
 {
-    "files": []
+    "files": [],
+    "compilerOptions": {
+        "types": []
+    }
 }

packages/typescript/test/ts_project/empty_intermediate/tsconfig-c.json

@@ -11,5 +11,6 @@
             "../../../../../bazel-out/k8-dbg/bin/packages/typescript/test/ts_project/empty_intermediate",
             "../../../../../bazel-out/x64_windows-dbg/bin/packages/typescript/test/ts_project/empty_intermediate",
         ],
+        "types": []
     }
 }

packages/typescript/test/ts_project/rootdir/tsconfig.json

@@ -1 +1,5 @@
-{}
+{
+    "compilerOptions": {
+        "types": []
+    }
+}