chore: normalize "lib" vs "pkg" terminology in tests

examples/BUILD.bazel

@@ -2,26 +2,26 @@ load("@aspect_rules_js//npm:defs.bzl", "npm_link_package")
 load("@bazel_skylib//rules:build_test.bzl", "build_test")
 load("@npm//:defs.bzl", "npm_link_all_packages")
 
-# Building this target results in bazel-bin/examples/node_modules/@myorg/js_lib, so that
+# Building this target results in bazel-bin/examples/node_modules/@myorg/js_pkg, so that
 # TypeScript and other node programs beneath bazel-bin/examples are able to resolve its location.
 npm_link_package(
-    name = "node_modules/@myorg/js_lib",
-    src = "//examples/js_lib:pkg",
+    name = "node_modules/@myorg/js_pkg",
+    src = "//examples/js_pkg:pkg",
     root_package = "examples",
     visibility = ["//examples:__subpackages__"],
 )
 
 npm_link_package(
-    name = "node_modules/@myorg/js_lib_pkg",
-    src = "//examples/js_lib_pkg:pkg",
-    package = "@myorg/js_lib_pkg",
+    name = "node_modules/@myorg/js_lib",
+    src = "//examples/js_lib:pkg",
+    package = "@myorg/js_lib",
     root_package = "examples",
     visibility = ["//examples:__subpackages__"],
 )
 
 npm_link_package(
-    name = "node_modules/@myorg/dts_lib",
-    src = "//examples/dts_lib:pkg",
+    name = "node_modules/@myorg/dts_pkg",
+    src = "//examples/dts_pkg:pkg",
     root_package = "examples",
     visibility = ["//examples:__subpackages__"],
 )
@@ -35,15 +35,15 @@ npm_link_package(
 )
 
 npm_link_package(
-    name = "node_modules/@myorg/deps_lib",
-    src = "//examples/deps_lib:pkg",
+    name = "node_modules/@myorg/deps_pkg",
+    src = "//examples/deps_pkg:pkg",
     root_package = "examples",
     visibility = ["//examples:__subpackages__"],
 )
 
 npm_link_package(
-    name = "node_modules/@myorg/deps_lib_transpiler",
-    src = "//examples/deps_lib_transpiler:pkg",
+    name = "node_modules/@myorg/deps_pkg_transpiler",
+    src = "//examples/deps_pkg_transpiler:pkg",
     root_package = "examples",
     visibility = ["//examples:__subpackages__"],
 )

examples/deps_lib/BUILD.bazel → examples/deps_pkg/BUILD.bazel

@@ -18,7 +18,7 @@ ts_project(
     declaration = True,
     deps = [
         "//examples:node_modules/date-fns",
-        "//examples/deps_lib/b",
+        "//examples/deps_pkg/b",
     ],
 )
 
@@ -27,7 +27,7 @@ npm_package(
     srcs = [
         ":lib",
     ],
-    package = "@myorg/deps_lib",
+    package = "@myorg/deps_pkg",
     visibility = ["//examples:__subpackages__"],
 )
 
@@ -45,6 +45,6 @@ ts_project(
     srcs = ["importer_linked.ts"],
     declaration = True,
     deps = [
-        "//examples:node_modules/@myorg/deps_lib",
+        "//examples:node_modules/@myorg/deps_pkg",
     ],
 )

examples/deps_lib/b/BUILD.bazel → examples/deps_pkg/b/BUILD.bazel

@@ -4,6 +4,6 @@ ts_project(
     name = "b",
     srcs = ["index.ts"],
     declaration = True,
-    tsconfig = "//examples/deps_lib:tsconfig",
-    visibility = ["//examples/deps_lib:__subpackages__"],
+    tsconfig = "//examples/deps_pkg:tsconfig",
+    visibility = ["//examples/deps_pkg:__subpackages__"],
 )

examples/deps_lib/importer_linked.ts → examples/deps_pkg/importer_linked.ts

@@ -1,4 +1,4 @@
-import { b, format } from '@myorg/deps_lib'
+import { b, format } from '@myorg/deps_pkg'
 
 export const a: string = `number: 1, date: ${format(
     new Date(2014, 1, 11),

examples/deps_lib_transpiler/BUILD.bazel → examples/deps_pkg_transpiler/BUILD.bazel

@@ -20,7 +20,7 @@ ts_project(
     transpiler = babel,
     deps = [
         "//examples:node_modules/date-fns",
-        "//examples/deps_lib_transpiler/b",
+        "//examples/deps_pkg_transpiler/b",
     ],
 )
 
@@ -29,7 +29,7 @@ npm_package(
     srcs = [
         ":lib",
     ],
-    package = "@myorg/deps_lib_transpiler",
+    package = "@myorg/deps_pkg_transpiler",
     visibility = ["//examples:__subpackages__"],
 )
 
@@ -49,6 +49,6 @@ ts_project(
     declaration = True,
     transpiler = babel,
     deps = [
-        "//examples:node_modules/@myorg/deps_lib_transpiler",
+        "//examples:node_modules/@myorg/deps_pkg_transpiler",
     ],
 )

examples/deps_lib_transpiler/b/BUILD.bazel → examples/deps_pkg_transpiler/b/BUILD.bazel

@@ -6,6 +6,6 @@ ts_project(
     srcs = ["index.ts"],
     declaration = True,
     transpiler = babel,
-    tsconfig = "//examples/deps_lib_transpiler:tsconfig",
-    visibility = ["//examples/deps_lib_transpiler:__subpackages__"],
+    tsconfig = "//examples/deps_pkg_transpiler:tsconfig",
+    visibility = ["//examples/deps_pkg_transpiler:__subpackages__"],
 )

examples/deps_lib_transpiler/importer_linked.ts → examples/deps_pkg_transpiler/importer_linked.ts

@@ -1,4 +1,4 @@
-import { b, format } from '@myorg/deps_lib_transpiler'
+import { b, format } from '@myorg/deps_pkg_transpiler'
 
 export const a: string = `number: 1, date: ${format(
     new Date(2014, 1, 11),

examples/dts_lib/BUILD.bazel → examples/dts_pkg/BUILD.bazel

@@ -16,7 +16,7 @@ ts_project(
 npm_package(
     name = "pkg",
     srcs = [":lib"],
-    package = "@myorg/dts_lib",
+    package = "@myorg/dts_pkg",
     visibility = ["//examples:__subpackages__"],
 )
 
@@ -34,7 +34,7 @@ ts_project(
     srcs = ["importer_linked.ts"],
     declaration = True,
     deps = [
-        "//examples:node_modules/@myorg/dts_lib",
+        "//examples:node_modules/@myorg/dts_pkg",
     ],
 )
 

examples/dts_pkg/importer_linked.ts

@@ -0,0 +1,4 @@
+import { A, B } from '@myorg/dts_pkg'
+
+export const a: A = 42
+export const b: B = 'Forty Two'

examples/dts_lib/importer_rel.ts → examples/dts_pkg/importer_rel.ts

@@ -1,4 +1,4 @@
 import { A, B } from './index'
 
 export const a: A = 42
-export const b: B = 'Forty Two'
+export const b: B = 'Forty Two'

examples/dts_pkg/index.ts

@@ -0,0 +1,2 @@
+export * from './lib_types'
+export * from './lib_types_2.mjs'

examples/dts_pkg/lib_types.d.ts

@@ -0,0 +1 @@
+export type A = number

examples/dts_pkg/lib_types_2.d.mts

@@ -0,0 +1 @@
+export type B = string

examples/js_lib/BUILD.bazel

@@ -1,17 +1,15 @@
 load("@aspect_rules_js//js:defs.bzl", "js_library")
-load("@aspect_rules_js//npm:defs.bzl", "npm_package")
 
-npm_package(
-    name = "pkg",
-    srcs = ["index.js"],
-    package = "@myorg/js_lib",
-    visibility = ["//examples:__subpackages__"],
-)
+# A package only using js_library() instead of npm_package()
 
 js_library(
-    name = "lib",
-    # Provide index.js as types available to downstream type checking rules
-    # since it has no corresponding .d.ts file.
-    types = ["index.js"],
+    name = "pkg",
+    srcs = [
+        # A typescript file is required to ensure types will exist within the `JsInfo(types)`
+        # that can be passed along the package linking chain. Otherwise no files will be copied
+        # into the sandbox for type-checking (even though tsc would pass if only the .js was there).
+        "index.d.ts",
+        "index.js",
+    ],
     visibility = ["//examples:__subpackages__"],
 )

examples/js_pkg/BUILD.bazel

@@ -0,0 +1,17 @@
+load("@aspect_rules_js//js:defs.bzl", "js_library")
+load("@aspect_rules_js//npm:defs.bzl", "npm_package")
+
+npm_package(
+    name = "pkg",
+    srcs = ["index.js"],
+    package = "@myorg/js_pkg",
+    visibility = ["//examples:__subpackages__"],
+)
+
+js_library(
+    name = "lib",
+    # Provide index.js as types available to downstream type checking rules
+    # since it has no corresponding .d.ts file.
+    types = ["index.js"],
+    visibility = ["//examples:__subpackages__"],
+)

examples/path_mappings/BUILD.bazel

@@ -13,8 +13,8 @@ ts_project(
     declaration = True,
     validate = False,
     deps = [
-        "//examples/dts_lib:lib",
-        "//examples/js_lib:lib",
+        "//examples/dts_pkg:lib",
+        "//examples/js_pkg:lib",
     ],
 )
 

examples/path_mappings/foo.ts

@@ -1,5 +1,5 @@
-import num from '@myorg/js_lib'
-import { A } from '@myorg/dts_lib'
+import num from '@myorg/js_pkg'
+import { A } from '@myorg/dts_pkg'
 
 export const a: A = 123
 export const b: string = `number: ${num}`

examples/simple/BUILD.bazel

@@ -18,9 +18,9 @@ ts_project(
     deps = [
         # Two dependencies are linked from first-party code in this repo
         # by the npm_link_package calls in /examples/BUILD.bazel
+        "//examples:node_modules/@myorg/js_pkg",
         "//examples:node_modules/@myorg/js_lib",
-        "//examples:node_modules/@myorg/js_lib_pkg",
-        "//examples:node_modules/@myorg/dts_lib",
+        "//examples:node_modules/@myorg/dts_pkg",
         # Two dependencies are linked from third-party npm packages
         # by the npm_link_all_packages call in /examples/BUILD.bazel
         "//examples:node_modules/@types/node",
@@ -33,7 +33,7 @@ ts_project(
 assert_contains(
     name = "test_js",
     actual = "foo.js",
-    expected = """var js_lib_1 = require("@myorg/js_lib")""",
+    expected = """var js_pkg_1 = require("@myorg/js_pkg")""",
 )
 
 assert_contains(

examples/simple/foo.ts

@@ -1,6 +1,6 @@
-import num from '@myorg/js_lib'
-import num2 from '@myorg/js_lib_pkg'
-import { A } from '@myorg/dts_lib'
+import num from '@myorg/js_pkg'
+import num2 from '@myorg/js_lib'
+import { A } from '@myorg/dts_pkg'
 import { format } from 'date-fns'
 
 export const a: A = 123