Skip to content

Commit

Permalink
feat: promote js_library to public API
Browse files Browse the repository at this point in the history
  • Loading branch information
Alex Eagle committed Sep 10, 2020
1 parent 9ff4508 commit a9e580c
Show file tree
Hide file tree
Showing 45 changed files with 185 additions and 88 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ jobs:
close-issue-message: >
This issue was automatically closed because it went two weeks without a reply
since it was labelled "Can Close?"
since it was labeled "Can Close?"
close-pr-message: >
This PR was automatically closed because it went two weeks without a reply
since it was labelled "Can Close?"
since it was labeled "Can Close?"
1 change: 1 addition & 0 deletions BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ bzl_library(
deps = [
"//internal/common:bzl",
"//internal/generated_file_test:bzl",
"//internal/js_library:bzl",
"//internal/linker:bzl",
"//internal/pkg_npm:bzl",
"//internal/pkg_web:bzl",
Expand Down
2 changes: 1 addition & 1 deletion e2e/nodejs_image/foolib/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
load("@build_bazel_rules_nodejs//internal/js_library:js_library.bzl", "js_library")
load("@build_bazel_rules_nodejs//:index.bzl", "js_library")

js_library(
name = "foolib",
Expand Down
2 changes: 2 additions & 0 deletions index.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ load("//internal/common:check_version.bzl", "check_version")
load("//internal/common:copy_to_bin.bzl", _copy_to_bin = "copy_to_bin")
load("//internal/common:params_file.bzl", _params_file = "params_file")
load("//internal/generated_file_test:generated_file_test.bzl", _generated_file_test = "generated_file_test")
load("//internal/js_library:js_library.bzl", _js_library = "js_library")
load(
"//internal/node:node.bzl",
_nodejs_binary = "nodejs_binary",
Expand All @@ -44,6 +45,7 @@ pkg_web = _pkg_web
copy_to_bin = _copy_to_bin
params_file = _params_file
generated_file_test = _generated_file_test
js_library = _js_library
# ANY RULES ADDED HERE SHOULD BE DOCUMENTED, see index.for_docs.bzl

# Allows us to avoid a transitive dependency on bazel_skylib from leaking to users
Expand Down
2 changes: 2 additions & 0 deletions index.for_docs.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ load("//internal/common:check_bazel_version.bzl", _check_bazel_version = "check_
load("//internal/common:copy_to_bin.bzl", _copy_to_bin = "copy_to_bin")
load("//internal/common:params_file.bzl", _params_file = "params_file")
load("//internal/generated_file_test:generated_file_test.bzl", _generated_file_test = "generated_file_test")
load("//internal/js_library:js_library.bzl", _js_library = "js_library")
load("//internal/node:node.bzl", _nodejs_binary = "nodejs_binary", _nodejs_test = "nodejs_test")
load("//internal/node:node_repositories.bzl", _node_repositories = "node_repositories_rule")
load("//internal/node:npm_package_bin.bzl", _npm_bin = "npm_package_bin")
Expand All @@ -39,4 +40,5 @@ yarn_install = _yarn_install
npm_package_bin = _npm_bin
pkg_web = _pkg_web
generated_file_test = _generated_file_test
js_library = _js_library
# ANY RULES ADDED HERE SHOULD BE DOCUMENTED, run yarn stardoc to verify
140 changes: 98 additions & 42 deletions internal/js_library/js_library.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,33 @@ load(
"copy_cmd",
)

_AMD_NAMES_DOC = """Mapping from require module names to global variables.
This allows devmode JS sources to load unnamed UMD bundles from third-party libraries."""
_ATTRS = {
"amd_names": attr.string_dict(
doc = """Non-public legacy API, not recommended to make new usages.
Mapping from require module names to global variables.
This allows devmode JS sources to load unnamed UMD bundles from third-party libraries.""",
),
"deps": attr.label_list(),
"is_windows": attr.bool(
doc = "Internal use only. Automatically set by macro",
mandatory = True,
),
# module_name for legacy ts_library module_mapping support
# which is still being used in a couple of tests
# TODO: remove once legacy module_mapping is removed
"module_name": attr.string(
doc = "Internal use only. It will be removed soon.",
),
"named_module_srcs": attr.label_list(
doc = """Non-public legacy API, not recommended to make new usages.
A subset of srcs that are javascript named-UMD or
named-AMD for use in rules such as ts_devserver.
They will be copied into the package bin folder if needed.""",
allow_files = True,
),
"package_name": attr.string(),
"srcs": attr.label_list(allow_files = True),
}

AmdNamesInfo = provider(
doc = "provide access to the amd_names attribute of js_library",
Expand All @@ -48,7 +73,7 @@ def write_amd_names_shim(actions, amd_names_shim, targets):
These are collected from our bootstrap deps (the only place global scripts should appear)
Args:
actions: skylark rule execution context.actions
actions: starlark rule execution context.actions
amd_names_shim: File where the shim is written
targets: dependencies to be scanned for AmdNamesInfo providers
"""
Expand Down Expand Up @@ -199,57 +224,88 @@ def _impl(ctx):

_js_library = rule(
implementation = _impl,
attrs = {
"amd_names": attr.string_dict(
doc = _AMD_NAMES_DOC,
),
"deps": attr.label_list(
doc = """Transitive dependencies of the package.
It should include fine grained npm dependencies from the sources
or other targets we want to include in the library but also propagate their own deps.""",
),
"is_windows": attr.bool(
doc = "Automatically set by macro",
mandatory = True,
),
# module_name for legacy ts_library module_mapping support
# which is still being used in a couple of tests
# TODO: remove once legacy module_mapping is removed
"module_name": attr.string(
doc = "Internal use only. It will be removed soon.",
),
"named_module_srcs": attr.label_list(
doc = """A subset of srcs that are javascript named-UMD or
named-AMD for use in rules such as ts_devserver.
They will be copied into the package bin folder if needed.""",
allow_files = True,
),
"package_name": attr.string(
doc = """Optional package_name that this package may be imported as.""",
),
"srcs": attr.label_list(
doc = """The list of files that comprise the package.
They will be copied into the package bin folder if needed.""",
allow_files = True,
),
},
doc = "Defines a js_library package",
attrs = _ATTRS,
)

def js_library(
name,
srcs = [],
amd_names = {},
package_name = None,
deps = [],
named_module_srcs = [],
**kwargs):
"""Internal use only yet. It will be released into a public API in a future release."""
"""Groups JavaScript code so that it can be depended on like an npm package.
### Behavior
This rule doesn't perform any build steps ("actions") so it is similar to a `filegroup`.
However it produces several Bazel "Providers" for interop with other rules.
> Compare this to `pkg_npm` which just produces a directory output, and therefore can't expose individual
> files to downstream targets and causes a cascading re-build of all transitive dependencies when any file
> changes
These providers are:
- DeclarationInfo so this target can be a dependency of a TypeScript rule
- NpmPackageInfo so this target can interop with rules that expect third-party npm packages
- LinkablePackageInfo for use with our "linker" that makes this package importable (similar to `npm link`)
- JsModuleInfo so rules like bundlers can collect the transitive set of .js files
`js_library` also copies any source files into the bazel-out folder.
This is the same behavior as the `copy_to_bin` rule.
By copying the complete package to the output tree, we ensure that the linker (our `npm link` equivalent)
will make your source files available in the node_modules tree where resolvers expect them.
It also means you can have relative imports between the files
rather than being forced to use Bazel's "Runfiles" semantics where any program might need a helper library
to resolve files between the logical union of the source tree and the output tree.
### Usage
`js_library` is intended to be used internally within Bazel, such as between two libraries in your monorepo.
> Compare this to `pkg_npm` which is intended to publish your code for external usage outside of Bazel, like
> by publishing to npm or artifactory.
The typical example usage of `js_library` is to expose some sources with a package name:
```python
ts_project(
name = "compile_ts",
srcs = glob(["*.ts"]),
)
js_library(
name = "my_pkg",
# Code that depends on this target can import from "@myco/mypkg"
package_name = "@myco/mypkg",
# Consumers might need fields like "main" or "typings"
srcs = ["package.json"],
# The .js and .d.ts outputs from above will be part of the package
deps = [":compile_ts"],
)
```
To help work with "named AMD" modules as required by `ts_devserver` and other Google-style "concatjs" rules,
`js_library` has some undocumented advanced features you can find in the source code or in our examples.
These should not be considered a public API and aren't subject to our usual support and semver guarantees.
Args:
name: a name for the target
srcs: the list of files that comprise the package
package_name: the name it will be imported by. Should match the "name" field in the package.json file.
deps: other targets that provide JavaScript code
**kwargs: used for undocumented legacy features
"""

# Undocumented features
amd_names = kwargs.pop("amd_names", {})
module_name = kwargs.pop("module_name", None)
named_module_srcs = kwargs.pop("named_module_srcs", [])

if module_name:
fail("use package_name instead of module_name in target //%s:%s" % (native.package_name(), name))
if kwargs.pop("is_windows", None):
fail("is_windows is set by the js_library macro and should not be set explicitely")
fail("is_windows is set by the js_library macro and should not be set explicitly")

_js_library(
name = name,
amd_names = amd_names,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
load("//internal/js_library:js_library.bzl", "js_library")
load("//:index.bzl", "js_library")

package(default_visibility = ["//internal/linker/test:__subpackages__"])

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
load("//internal/js_library:js_library.bzl", "js_library")
load("//:index.bzl", "js_library")

package(default_visibility = ["//internal/linker/test:__subpackages__"])

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
load("@build_bazel_rules_nodejs//:index.bzl", "copy_to_bin")
load("//internal/js_library:js_library.bzl", "js_library")
load("//:index.bzl", "js_library")

package(default_visibility = ["//internal/linker/test:__subpackages__"])

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
load("//internal/js_library:js_library.bzl", "js_library")
load("//:index.bzl", "js_library")

package(default_visibility = ["//internal/linker/test:__subpackages__"])

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
load("//internal/js_library:js_library.bzl", "js_library")
load("//:index.bzl", "js_library")

package(default_visibility = ["//internal/linker/test:__subpackages__"])

Expand Down
2 changes: 1 addition & 1 deletion internal/node/test/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
load("@build_bazel_rules_nodejs//:index.bzl", "generated_file_test", "nodejs_binary", "nodejs_test", "npm_package_bin")
load("@npm//typescript:index.bzl", "tsc")
load("//internal/js_library:js_library.bzl", "js_library")
load("//:index.bzl", "js_library")
load("//internal/node:node_repositories.bzl", "BUILT_IN_NODE_PLATFORMS")
load("//packages/jasmine:index.bzl", "jasmine_node_test")
load("//third_party/github.com/bazelbuild/bazel-skylib:rules/copy_file.bzl", "copy_file")
Expand Down
2 changes: 1 addition & 1 deletion internal/node/test/lib1/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
load("//internal/js_library:js_library.bzl", "js_library")
load("//:index.bzl", "js_library")

package(default_visibility = ["//internal:__subpackages__"])

Expand Down
2 changes: 1 addition & 1 deletion internal/node/test/lib2/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
load("//internal/js_library:js_library.bzl", "js_library")
load("//:index.bzl", "js_library")
load("//packages/typescript:index.bzl", "ts_project")

package(default_visibility = ["//internal:__subpackages__"])
Expand Down
7 changes: 3 additions & 4 deletions internal/npm_install/generate_build_file.ts
Original file line number Diff line number Diff line change
Expand Up @@ -157,8 +157,7 @@ function generateRootBuildFile(pkgs: Dep[]) {
`;
})});

let buildFile = BUILD_FILE_HEADER +
`load("@build_bazel_rules_nodejs//internal/js_library:js_library.bzl", "js_library")
let buildFile = BUILD_FILE_HEADER + `load("@build_bazel_rules_nodejs//:index.bzl", "js_library")
exports_files([
${exportsStarlark}])
Expand Down Expand Up @@ -919,7 +918,7 @@ function printPackage(pkg: Dep) {
const depsStarlark =
deps.map(dep => `"//${dep._dir}:${dep._name}__contents",`).join('\n ');

let result = `load("@build_bazel_rules_nodejs//internal/js_library:js_library.bzl", "js_library")
let result = `load("@build_bazel_rules_nodejs//:index.bzl", "js_library")
# Generated targets for npm package "${pkg._dir}"
${printJson(pkg)}
Expand Down Expand Up @@ -1167,7 +1166,7 @@ function printScope(scope: string, pkgs: Dep[]) {
],`;
}

return `load("@build_bazel_rules_nodejs//internal/js_library:js_library.bzl", "js_library")
return `load("@build_bazel_rules_nodejs//:index.bzl", "js_library")
# Generated target for npm scope ${scope}
js_library(
Expand Down
6 changes: 3 additions & 3 deletions internal/npm_install/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ function generateRootBuildFile(pkgs) {
});
});
let buildFile = BUILD_FILE_HEADER +
`load("@build_bazel_rules_nodejs//internal/js_library:js_library.bzl", "js_library")
`load("@build_bazel_rules_nodejs//:index.bzl", "js_library")
exports_files([
${exportsStarlark}])
Expand Down Expand Up @@ -529,7 +529,7 @@ function printPackage(pkg) {
'';
const deps = [pkg].concat(pkg._dependencies.filter(dep => dep !== pkg && !dep._isNested));
const depsStarlark = deps.map(dep => `"//${dep._dir}:${dep._name}__contents",`).join('\n ');
let result = `load("@build_bazel_rules_nodejs//internal/js_library:js_library.bzl", "js_library")
let result = `load("@build_bazel_rules_nodejs//:index.bzl", "js_library")
# Generated targets for npm package "${pkg._dir}"
${printJson(pkg)}
Expand Down Expand Up @@ -732,7 +732,7 @@ function printScope(scope, pkgs) {
${list}
],`;
}
return `load("@build_bazel_rules_nodejs//internal/js_library:js_library.bzl", "js_library")
return `load("@build_bazel_rules_nodejs//:index.bzl", "js_library")
# Generated target for npm scope ${scope}
js_library(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

package(default_visibility = ["//visibility:public"])
load("@build_bazel_rules_nodejs//internal/js_library:js_library.bzl", "js_library")
load("@build_bazel_rules_nodejs//:index.bzl", "js_library")
filegroup(
name = "core__files",
srcs = [
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

package(default_visibility = ["//visibility:public"])
load("@build_bazel_rules_nodejs//internal/js_library:js_library.bzl", "js_library")
load("@build_bazel_rules_nodejs//:index.bzl", "js_library")
js_library(
name = "@gregmagolan",
srcs = [
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

package(default_visibility = ["//visibility:public"])
load("@build_bazel_rules_nodejs//internal/js_library:js_library.bzl", "js_library")
load("@build_bazel_rules_nodejs//:index.bzl", "js_library")
filegroup(
name = "test-a__files",
srcs = [
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

package(default_visibility = ["//visibility:public"])
load("@build_bazel_rules_nodejs//internal/js_library:js_library.bzl", "js_library")
load("@build_bazel_rules_nodejs//:index.bzl", "js_library")
filegroup(
name = "test-b__files",
srcs = [
Expand Down
4 changes: 2 additions & 2 deletions internal/npm_install/test/golden/BUILD.bazel.golden
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

package(default_visibility = ["//visibility:public"])
load("@build_bazel_rules_nodejs//internal/js_library:js_library.bzl", "js_library")
load("@build_bazel_rules_nodejs//:index.bzl", "js_library")
exports_files([
"node_modules/ajv/.tonic_example.js",
"node_modules/ajv/LICENSE",
Expand Down Expand Up @@ -4792,4 +4792,4 @@ filegroup(
"//unidiff:BUILD.bazel",
"//zone.js:BUILD.bazel",
],
)
)
2 changes: 1 addition & 1 deletion internal/npm_install/test/golden/ajv/BUILD.bazel.golden
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

package(default_visibility = ["//visibility:public"])
load("@build_bazel_rules_nodejs//internal/js_library:js_library.bzl", "js_library")
load("@build_bazel_rules_nodejs//:index.bzl", "js_library")
filegroup(
name = "ajv__files",
srcs = [
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

package(default_visibility = ["//visibility:public"])
load("@build_bazel_rules_nodejs//internal/js_library:js_library.bzl", "js_library")
load("@build_bazel_rules_nodejs//:index.bzl", "js_library")
filegroup(
name = "jasmine__files",
srcs = [
Expand Down
Loading

0 comments on commit a9e580c

Please sign in to comment.