diff --git a/e2e/pnpm_lockfiles/v54/snapshots/defs.bzl b/e2e/pnpm_lockfiles/v54/snapshots/defs.bzl index 250432eb5..7b124a0e5 100644 --- a/e2e/pnpm_lockfiles/v54/snapshots/defs.bzl +++ b/e2e/pnpm_lockfiles/v54/snapshots/defs.bzl @@ -87,7 +87,9 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): new_link_targets, new_scope_targets = link_fn(name) link_targets.extend(new_link_targets) for _scope, _targets in new_scope_targets.items(): - scope_targets[_scope] = scope_targets[_scope] + _targets if _scope in scope_targets else _targets + if _scope not in scope_targets: + scope_targets[_scope] = [] + scope_targets[_scope].extend(_targets) if is_root: store_0(name = "{}/ansi-regex".format(name)) @@ -153,39 +155,66 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): if bazel_package == "": link_4(name = "{}/@aspect-test-a-bad-scope".format(name)) link_targets.append("//{}:{}/@aspect-test-a-bad-scope".format(bazel_package, name)) - scope_targets["@aspect-test-a-bad-scop"] = scope_targets["@aspect-test-a-bad-scop"] + [link_targets[-1]] if "@aspect-test-a-bad-scop" in scope_targets else [link_targets[-1]] + if "@aspect-test-a-bad-scop" not in scope_targets: + scope_targets["@aspect-test-a-bad-scop"] = [link_targets[-1]] + else: + scope_targets["@aspect-test-a-bad-scop"].append(link_targets[-1]) link_4(name = "{}/@aspect-test-custom-scope/a".format(name)) link_targets.append("//{}:{}/@aspect-test-custom-scope/a".format(bazel_package, name)) - scope_targets["@aspect-test-custom-scope"] = scope_targets["@aspect-test-custom-scope"] + [link_targets[-1]] if "@aspect-test-custom-scope" in scope_targets else [link_targets[-1]] + if "@aspect-test-custom-scope" not in scope_targets: + scope_targets["@aspect-test-custom-scope"] = [link_targets[-1]] + else: + scope_targets["@aspect-test-custom-scope"].append(link_targets[-1]) link_4(name = "{}/@aspect-test/a".format(name)) link_targets.append("//{}:{}/@aspect-test/a".format(bazel_package, name)) - scope_targets["@aspect-test"] = scope_targets["@aspect-test"] + [link_targets[-1]] if "@aspect-test" in scope_targets else [link_targets[-1]] + if "@aspect-test" not in scope_targets: + scope_targets["@aspect-test"] = [link_targets[-1]] + else: + scope_targets["@aspect-test"].append(link_targets[-1]) link_4(name = "{}/@aspect-test/a2".format(name)) link_targets.append("//{}:{}/@aspect-test/a2".format(bazel_package, name)) - scope_targets["@aspect-test"] = scope_targets["@aspect-test"] + [link_targets[-1]] if "@aspect-test" in scope_targets else [link_targets[-1]] + if "@aspect-test" not in scope_targets: + scope_targets["@aspect-test"] = [link_targets[-1]] + else: + scope_targets["@aspect-test"].append(link_targets[-1]) link_4(name = "{}/aspect-test-a-no-scope".format(name)) link_targets.append("//{}:{}/aspect-test-a-no-scope".format(bazel_package, name)) link_4(name = "{}/aspect-test-a/no-at".format(name)) link_targets.append("//{}:{}/aspect-test-a/no-at".format(bazel_package, name)) link_5(name = "{}/@aspect-test/b".format(name)) link_targets.append("//{}:{}/@aspect-test/b".format(bazel_package, name)) - scope_targets["@aspect-test"] = scope_targets["@aspect-test"] + [link_targets[-1]] if "@aspect-test" in scope_targets else [link_targets[-1]] + if "@aspect-test" not in scope_targets: + scope_targets["@aspect-test"] = [link_targets[-1]] + else: + scope_targets["@aspect-test"].append(link_targets[-1]) link_6(name = "{}/@aspect-test/c".format(name)) link_targets.append("//{}:{}/@aspect-test/c".format(bazel_package, name)) - scope_targets["@aspect-test"] = scope_targets["@aspect-test"] + [link_targets[-1]] if "@aspect-test" in scope_targets else [link_targets[-1]] + if "@aspect-test" not in scope_targets: + scope_targets["@aspect-test"] = [link_targets[-1]] + else: + scope_targets["@aspect-test"].append(link_targets[-1]) link_9(name = "{}/jsonify".format(name)) link_targets.append("//{}:{}/jsonify".format(bazel_package, name)) link_10(name = "{}/@isaacs/cliui".format(name)) link_targets.append("//{}:{}/@isaacs/cliui".format(bazel_package, name)) - scope_targets["@isaacs"] = scope_targets["@isaacs"] + [link_targets[-1]] if "@isaacs" in scope_targets else [link_targets[-1]] + if "@isaacs" not in scope_targets: + scope_targets["@isaacs"] = [link_targets[-1]] + else: + scope_targets["@isaacs"].append(link_targets[-1]) link_11(name = "{}/rollup-plugin-with-peers".format(name)) link_targets.append("//{}:{}/rollup-plugin-with-peers".format(bazel_package, name)) link_13(name = "{}/@types/archiver".format(name)) link_targets.append("//{}:{}/@types/archiver".format(bazel_package, name)) - scope_targets["@types"] = scope_targets["@types"] + [link_targets[-1]] if "@types" in scope_targets else [link_targets[-1]] + if "@types" not in scope_targets: + scope_targets["@types"] = [link_targets[-1]] + else: + scope_targets["@types"].append(link_targets[-1]) link_17(name = "{}/@types/node".format(name)) link_targets.append("//{}:{}/@types/node".format(bazel_package, name)) - scope_targets["@types"] = scope_targets["@types"] + [link_targets[-1]] if "@types" in scope_targets else [link_targets[-1]] + if "@types" not in scope_targets: + scope_targets["@types"] = [link_targets[-1]] + else: + scope_targets["@types"].append(link_targets[-1]) link_17(name = "{}/alias-types-node".format(name)) link_targets.append("//{}:{}/alias-types-node".format(bazel_package, name)) link_18(name = "{}/alias-only-sizzle".format(name)) @@ -252,7 +281,10 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): tags = ["manual"], ) link_targets.append(":{}/@scoped/c".format(name)) - scope_targets["@scoped"] = scope_targets["@scoped"] + [link_targets[-1]] if "@scoped" in scope_targets else [link_targets[-1]] + if "@scoped" not in scope_targets: + scope_targets["@scoped"] = [link_targets[-1]] + else: + scope_targets["@scoped"].append(link_targets[-1]) if is_root: _npm_package_store( @@ -296,7 +328,10 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): tags = ["manual"], ) link_targets.append(":{}/@scoped/a".format(name)) - scope_targets["@scoped"] = scope_targets["@scoped"] + [link_targets[-1]] if "@scoped" in scope_targets else [link_targets[-1]] + if "@scoped" not in scope_targets: + scope_targets["@scoped"] = [link_targets[-1]] + else: + scope_targets["@scoped"].append(link_targets[-1]) if is_root: _npm_package_store( @@ -331,7 +366,10 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): tags = ["manual"], ) link_targets.append(":{}/@scoped/b".format(name)) - scope_targets["@scoped"] = scope_targets["@scoped"] + [link_targets[-1]] if "@scoped" in scope_targets else [link_targets[-1]] + if "@scoped" not in scope_targets: + scope_targets["@scoped"] = [link_targets[-1]] + else: + scope_targets["@scoped"].append(link_targets[-1]) if is_root: _npm_package_store( @@ -366,7 +404,10 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): tags = ["manual"], ) link_targets.append(":{}/@scoped/d".format(name)) - scope_targets["@scoped"] = scope_targets["@scoped"] + [link_targets[-1]] if "@scoped" in scope_targets else [link_targets[-1]] + if "@scoped" not in scope_targets: + scope_targets["@scoped"] = [link_targets[-1]] + else: + scope_targets["@scoped"].append(link_targets[-1]) if is_root: _npm_package_store( diff --git a/e2e/pnpm_lockfiles/v60/snapshots/defs.bzl b/e2e/pnpm_lockfiles/v60/snapshots/defs.bzl index 81b6e159b..c0a360423 100644 --- a/e2e/pnpm_lockfiles/v60/snapshots/defs.bzl +++ b/e2e/pnpm_lockfiles/v60/snapshots/defs.bzl @@ -88,7 +88,9 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): new_link_targets, new_scope_targets = link_fn(name) link_targets.extend(new_link_targets) for _scope, _targets in new_scope_targets.items(): - scope_targets[_scope] = scope_targets[_scope] + _targets if _scope in scope_targets else _targets + if _scope not in scope_targets: + scope_targets[_scope] = [] + scope_targets[_scope].extend(_targets) if is_root: store_0(name = "{}/ansi-regex".format(name)) @@ -155,42 +157,72 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): if bazel_package == "": link_4(name = "{}/@aspect-test-a-bad-scope".format(name)) link_targets.append("//{}:{}/@aspect-test-a-bad-scope".format(bazel_package, name)) - scope_targets["@aspect-test-a-bad-scop"] = scope_targets["@aspect-test-a-bad-scop"] + [link_targets[-1]] if "@aspect-test-a-bad-scop" in scope_targets else [link_targets[-1]] + if "@aspect-test-a-bad-scop" not in scope_targets: + scope_targets["@aspect-test-a-bad-scop"] = [link_targets[-1]] + else: + scope_targets["@aspect-test-a-bad-scop"].append(link_targets[-1]) link_4(name = "{}/@aspect-test-custom-scope/a".format(name)) link_targets.append("//{}:{}/@aspect-test-custom-scope/a".format(bazel_package, name)) - scope_targets["@aspect-test-custom-scope"] = scope_targets["@aspect-test-custom-scope"] + [link_targets[-1]] if "@aspect-test-custom-scope" in scope_targets else [link_targets[-1]] + if "@aspect-test-custom-scope" not in scope_targets: + scope_targets["@aspect-test-custom-scope"] = [link_targets[-1]] + else: + scope_targets["@aspect-test-custom-scope"].append(link_targets[-1]) link_4(name = "{}/@aspect-test/a".format(name)) link_targets.append("//{}:{}/@aspect-test/a".format(bazel_package, name)) - scope_targets["@aspect-test"] = scope_targets["@aspect-test"] + [link_targets[-1]] if "@aspect-test" in scope_targets else [link_targets[-1]] + if "@aspect-test" not in scope_targets: + scope_targets["@aspect-test"] = [link_targets[-1]] + else: + scope_targets["@aspect-test"].append(link_targets[-1]) link_4(name = "{}/@aspect-test/a2".format(name)) link_targets.append("//{}:{}/@aspect-test/a2".format(bazel_package, name)) - scope_targets["@aspect-test"] = scope_targets["@aspect-test"] + [link_targets[-1]] if "@aspect-test" in scope_targets else [link_targets[-1]] + if "@aspect-test" not in scope_targets: + scope_targets["@aspect-test"] = [link_targets[-1]] + else: + scope_targets["@aspect-test"].append(link_targets[-1]) link_4(name = "{}/aspect-test-a-no-scope".format(name)) link_targets.append("//{}:{}/aspect-test-a-no-scope".format(bazel_package, name)) link_4(name = "{}/aspect-test-a/no-at".format(name)) link_targets.append("//{}:{}/aspect-test-a/no-at".format(bazel_package, name)) link_5(name = "{}/@aspect-test/b".format(name)) link_targets.append("//{}:{}/@aspect-test/b".format(bazel_package, name)) - scope_targets["@aspect-test"] = scope_targets["@aspect-test"] + [link_targets[-1]] if "@aspect-test" in scope_targets else [link_targets[-1]] + if "@aspect-test" not in scope_targets: + scope_targets["@aspect-test"] = [link_targets[-1]] + else: + scope_targets["@aspect-test"].append(link_targets[-1]) link_6(name = "{}/@aspect-test/c".format(name)) link_targets.append("//{}:{}/@aspect-test/c".format(bazel_package, name)) - scope_targets["@aspect-test"] = scope_targets["@aspect-test"] + [link_targets[-1]] if "@aspect-test" in scope_targets else [link_targets[-1]] + if "@aspect-test" not in scope_targets: + scope_targets["@aspect-test"] = [link_targets[-1]] + else: + scope_targets["@aspect-test"].append(link_targets[-1]) link_9(name = "{}/@aspect-test/e".format(name)) link_targets.append("//{}:{}/@aspect-test/e".format(bazel_package, name)) - scope_targets["@aspect-test"] = scope_targets["@aspect-test"] + [link_targets[-1]] if "@aspect-test" in scope_targets else [link_targets[-1]] + if "@aspect-test" not in scope_targets: + scope_targets["@aspect-test"] = [link_targets[-1]] + else: + scope_targets["@aspect-test"].append(link_targets[-1]) link_10(name = "{}/jsonify".format(name)) link_targets.append("//{}:{}/jsonify".format(bazel_package, name)) link_11(name = "{}/@isaacs/cliui".format(name)) link_targets.append("//{}:{}/@isaacs/cliui".format(bazel_package, name)) - scope_targets["@isaacs"] = scope_targets["@isaacs"] + [link_targets[-1]] if "@isaacs" in scope_targets else [link_targets[-1]] + if "@isaacs" not in scope_targets: + scope_targets["@isaacs"] = [link_targets[-1]] + else: + scope_targets["@isaacs"].append(link_targets[-1]) link_12(name = "{}/rollup-plugin-with-peers".format(name)) link_targets.append("//{}:{}/rollup-plugin-with-peers".format(bazel_package, name)) link_14(name = "{}/@types/archiver".format(name)) link_targets.append("//{}:{}/@types/archiver".format(bazel_package, name)) - scope_targets["@types"] = scope_targets["@types"] + [link_targets[-1]] if "@types" in scope_targets else [link_targets[-1]] + if "@types" not in scope_targets: + scope_targets["@types"] = [link_targets[-1]] + else: + scope_targets["@types"].append(link_targets[-1]) link_18(name = "{}/@types/node".format(name)) link_targets.append("//{}:{}/@types/node".format(bazel_package, name)) - scope_targets["@types"] = scope_targets["@types"] + [link_targets[-1]] if "@types" in scope_targets else [link_targets[-1]] + if "@types" not in scope_targets: + scope_targets["@types"] = [link_targets[-1]] + else: + scope_targets["@types"].append(link_targets[-1]) link_18(name = "{}/alias-types-node".format(name)) link_targets.append("//{}:{}/alias-types-node".format(bazel_package, name)) link_19(name = "{}/alias-only-sizzle".format(name)) @@ -257,7 +289,10 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): tags = ["manual"], ) link_targets.append(":{}/@scoped/c".format(name)) - scope_targets["@scoped"] = scope_targets["@scoped"] + [link_targets[-1]] if "@scoped" in scope_targets else [link_targets[-1]] + if "@scoped" not in scope_targets: + scope_targets["@scoped"] = [link_targets[-1]] + else: + scope_targets["@scoped"].append(link_targets[-1]) if is_root: _npm_package_store( @@ -301,7 +336,10 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): tags = ["manual"], ) link_targets.append(":{}/@scoped/a".format(name)) - scope_targets["@scoped"] = scope_targets["@scoped"] + [link_targets[-1]] if "@scoped" in scope_targets else [link_targets[-1]] + if "@scoped" not in scope_targets: + scope_targets["@scoped"] = [link_targets[-1]] + else: + scope_targets["@scoped"].append(link_targets[-1]) if is_root: _npm_package_store( @@ -336,7 +374,10 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): tags = ["manual"], ) link_targets.append(":{}/@scoped/b".format(name)) - scope_targets["@scoped"] = scope_targets["@scoped"] + [link_targets[-1]] if "@scoped" in scope_targets else [link_targets[-1]] + if "@scoped" not in scope_targets: + scope_targets["@scoped"] = [link_targets[-1]] + else: + scope_targets["@scoped"].append(link_targets[-1]) if is_root: _npm_package_store( @@ -371,7 +412,10 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): tags = ["manual"], ) link_targets.append(":{}/@scoped/d".format(name)) - scope_targets["@scoped"] = scope_targets["@scoped"] + [link_targets[-1]] if "@scoped" in scope_targets else [link_targets[-1]] + if "@scoped" not in scope_targets: + scope_targets["@scoped"] = [link_targets[-1]] + else: + scope_targets["@scoped"].append(link_targets[-1]) if is_root: _npm_package_store( diff --git a/e2e/pnpm_lockfiles/v61/snapshots/defs.bzl b/e2e/pnpm_lockfiles/v61/snapshots/defs.bzl index 81b6e159b..c0a360423 100644 --- a/e2e/pnpm_lockfiles/v61/snapshots/defs.bzl +++ b/e2e/pnpm_lockfiles/v61/snapshots/defs.bzl @@ -88,7 +88,9 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): new_link_targets, new_scope_targets = link_fn(name) link_targets.extend(new_link_targets) for _scope, _targets in new_scope_targets.items(): - scope_targets[_scope] = scope_targets[_scope] + _targets if _scope in scope_targets else _targets + if _scope not in scope_targets: + scope_targets[_scope] = [] + scope_targets[_scope].extend(_targets) if is_root: store_0(name = "{}/ansi-regex".format(name)) @@ -155,42 +157,72 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): if bazel_package == "": link_4(name = "{}/@aspect-test-a-bad-scope".format(name)) link_targets.append("//{}:{}/@aspect-test-a-bad-scope".format(bazel_package, name)) - scope_targets["@aspect-test-a-bad-scop"] = scope_targets["@aspect-test-a-bad-scop"] + [link_targets[-1]] if "@aspect-test-a-bad-scop" in scope_targets else [link_targets[-1]] + if "@aspect-test-a-bad-scop" not in scope_targets: + scope_targets["@aspect-test-a-bad-scop"] = [link_targets[-1]] + else: + scope_targets["@aspect-test-a-bad-scop"].append(link_targets[-1]) link_4(name = "{}/@aspect-test-custom-scope/a".format(name)) link_targets.append("//{}:{}/@aspect-test-custom-scope/a".format(bazel_package, name)) - scope_targets["@aspect-test-custom-scope"] = scope_targets["@aspect-test-custom-scope"] + [link_targets[-1]] if "@aspect-test-custom-scope" in scope_targets else [link_targets[-1]] + if "@aspect-test-custom-scope" not in scope_targets: + scope_targets["@aspect-test-custom-scope"] = [link_targets[-1]] + else: + scope_targets["@aspect-test-custom-scope"].append(link_targets[-1]) link_4(name = "{}/@aspect-test/a".format(name)) link_targets.append("//{}:{}/@aspect-test/a".format(bazel_package, name)) - scope_targets["@aspect-test"] = scope_targets["@aspect-test"] + [link_targets[-1]] if "@aspect-test" in scope_targets else [link_targets[-1]] + if "@aspect-test" not in scope_targets: + scope_targets["@aspect-test"] = [link_targets[-1]] + else: + scope_targets["@aspect-test"].append(link_targets[-1]) link_4(name = "{}/@aspect-test/a2".format(name)) link_targets.append("//{}:{}/@aspect-test/a2".format(bazel_package, name)) - scope_targets["@aspect-test"] = scope_targets["@aspect-test"] + [link_targets[-1]] if "@aspect-test" in scope_targets else [link_targets[-1]] + if "@aspect-test" not in scope_targets: + scope_targets["@aspect-test"] = [link_targets[-1]] + else: + scope_targets["@aspect-test"].append(link_targets[-1]) link_4(name = "{}/aspect-test-a-no-scope".format(name)) link_targets.append("//{}:{}/aspect-test-a-no-scope".format(bazel_package, name)) link_4(name = "{}/aspect-test-a/no-at".format(name)) link_targets.append("//{}:{}/aspect-test-a/no-at".format(bazel_package, name)) link_5(name = "{}/@aspect-test/b".format(name)) link_targets.append("//{}:{}/@aspect-test/b".format(bazel_package, name)) - scope_targets["@aspect-test"] = scope_targets["@aspect-test"] + [link_targets[-1]] if "@aspect-test" in scope_targets else [link_targets[-1]] + if "@aspect-test" not in scope_targets: + scope_targets["@aspect-test"] = [link_targets[-1]] + else: + scope_targets["@aspect-test"].append(link_targets[-1]) link_6(name = "{}/@aspect-test/c".format(name)) link_targets.append("//{}:{}/@aspect-test/c".format(bazel_package, name)) - scope_targets["@aspect-test"] = scope_targets["@aspect-test"] + [link_targets[-1]] if "@aspect-test" in scope_targets else [link_targets[-1]] + if "@aspect-test" not in scope_targets: + scope_targets["@aspect-test"] = [link_targets[-1]] + else: + scope_targets["@aspect-test"].append(link_targets[-1]) link_9(name = "{}/@aspect-test/e".format(name)) link_targets.append("//{}:{}/@aspect-test/e".format(bazel_package, name)) - scope_targets["@aspect-test"] = scope_targets["@aspect-test"] + [link_targets[-1]] if "@aspect-test" in scope_targets else [link_targets[-1]] + if "@aspect-test" not in scope_targets: + scope_targets["@aspect-test"] = [link_targets[-1]] + else: + scope_targets["@aspect-test"].append(link_targets[-1]) link_10(name = "{}/jsonify".format(name)) link_targets.append("//{}:{}/jsonify".format(bazel_package, name)) link_11(name = "{}/@isaacs/cliui".format(name)) link_targets.append("//{}:{}/@isaacs/cliui".format(bazel_package, name)) - scope_targets["@isaacs"] = scope_targets["@isaacs"] + [link_targets[-1]] if "@isaacs" in scope_targets else [link_targets[-1]] + if "@isaacs" not in scope_targets: + scope_targets["@isaacs"] = [link_targets[-1]] + else: + scope_targets["@isaacs"].append(link_targets[-1]) link_12(name = "{}/rollup-plugin-with-peers".format(name)) link_targets.append("//{}:{}/rollup-plugin-with-peers".format(bazel_package, name)) link_14(name = "{}/@types/archiver".format(name)) link_targets.append("//{}:{}/@types/archiver".format(bazel_package, name)) - scope_targets["@types"] = scope_targets["@types"] + [link_targets[-1]] if "@types" in scope_targets else [link_targets[-1]] + if "@types" not in scope_targets: + scope_targets["@types"] = [link_targets[-1]] + else: + scope_targets["@types"].append(link_targets[-1]) link_18(name = "{}/@types/node".format(name)) link_targets.append("//{}:{}/@types/node".format(bazel_package, name)) - scope_targets["@types"] = scope_targets["@types"] + [link_targets[-1]] if "@types" in scope_targets else [link_targets[-1]] + if "@types" not in scope_targets: + scope_targets["@types"] = [link_targets[-1]] + else: + scope_targets["@types"].append(link_targets[-1]) link_18(name = "{}/alias-types-node".format(name)) link_targets.append("//{}:{}/alias-types-node".format(bazel_package, name)) link_19(name = "{}/alias-only-sizzle".format(name)) @@ -257,7 +289,10 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): tags = ["manual"], ) link_targets.append(":{}/@scoped/c".format(name)) - scope_targets["@scoped"] = scope_targets["@scoped"] + [link_targets[-1]] if "@scoped" in scope_targets else [link_targets[-1]] + if "@scoped" not in scope_targets: + scope_targets["@scoped"] = [link_targets[-1]] + else: + scope_targets["@scoped"].append(link_targets[-1]) if is_root: _npm_package_store( @@ -301,7 +336,10 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): tags = ["manual"], ) link_targets.append(":{}/@scoped/a".format(name)) - scope_targets["@scoped"] = scope_targets["@scoped"] + [link_targets[-1]] if "@scoped" in scope_targets else [link_targets[-1]] + if "@scoped" not in scope_targets: + scope_targets["@scoped"] = [link_targets[-1]] + else: + scope_targets["@scoped"].append(link_targets[-1]) if is_root: _npm_package_store( @@ -336,7 +374,10 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): tags = ["manual"], ) link_targets.append(":{}/@scoped/b".format(name)) - scope_targets["@scoped"] = scope_targets["@scoped"] + [link_targets[-1]] if "@scoped" in scope_targets else [link_targets[-1]] + if "@scoped" not in scope_targets: + scope_targets["@scoped"] = [link_targets[-1]] + else: + scope_targets["@scoped"].append(link_targets[-1]) if is_root: _npm_package_store( @@ -371,7 +412,10 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): tags = ["manual"], ) link_targets.append(":{}/@scoped/d".format(name)) - scope_targets["@scoped"] = scope_targets["@scoped"] + [link_targets[-1]] if "@scoped" in scope_targets else [link_targets[-1]] + if "@scoped" not in scope_targets: + scope_targets["@scoped"] = [link_targets[-1]] + else: + scope_targets["@scoped"].append(link_targets[-1]) if is_root: _npm_package_store( diff --git a/e2e/pnpm_lockfiles/v90/snapshots/defs.bzl b/e2e/pnpm_lockfiles/v90/snapshots/defs.bzl index 490907986..e123d17de 100644 --- a/e2e/pnpm_lockfiles/v90/snapshots/defs.bzl +++ b/e2e/pnpm_lockfiles/v90/snapshots/defs.bzl @@ -88,7 +88,9 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): new_link_targets, new_scope_targets = link_fn(name) link_targets.extend(new_link_targets) for _scope, _targets in new_scope_targets.items(): - scope_targets[_scope] = scope_targets[_scope] + _targets if _scope in scope_targets else _targets + if _scope not in scope_targets: + scope_targets[_scope] = [] + scope_targets[_scope].extend(_targets) if is_root: store_0(name = "{}/ansi-regex".format(name)) @@ -155,42 +157,72 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): if bazel_package == "": link_4(name = "{}/@aspect-test-a-bad-scope".format(name)) link_targets.append("//{}:{}/@aspect-test-a-bad-scope".format(bazel_package, name)) - scope_targets["@aspect-test-a-bad-scop"] = scope_targets["@aspect-test-a-bad-scop"] + [link_targets[-1]] if "@aspect-test-a-bad-scop" in scope_targets else [link_targets[-1]] + if "@aspect-test-a-bad-scop" not in scope_targets: + scope_targets["@aspect-test-a-bad-scop"] = [link_targets[-1]] + else: + scope_targets["@aspect-test-a-bad-scop"].append(link_targets[-1]) link_4(name = "{}/@aspect-test-custom-scope/a".format(name)) link_targets.append("//{}:{}/@aspect-test-custom-scope/a".format(bazel_package, name)) - scope_targets["@aspect-test-custom-scope"] = scope_targets["@aspect-test-custom-scope"] + [link_targets[-1]] if "@aspect-test-custom-scope" in scope_targets else [link_targets[-1]] + if "@aspect-test-custom-scope" not in scope_targets: + scope_targets["@aspect-test-custom-scope"] = [link_targets[-1]] + else: + scope_targets["@aspect-test-custom-scope"].append(link_targets[-1]) link_4(name = "{}/@aspect-test/a".format(name)) link_targets.append("//{}:{}/@aspect-test/a".format(bazel_package, name)) - scope_targets["@aspect-test"] = scope_targets["@aspect-test"] + [link_targets[-1]] if "@aspect-test" in scope_targets else [link_targets[-1]] + if "@aspect-test" not in scope_targets: + scope_targets["@aspect-test"] = [link_targets[-1]] + else: + scope_targets["@aspect-test"].append(link_targets[-1]) link_4(name = "{}/@aspect-test/a2".format(name)) link_targets.append("//{}:{}/@aspect-test/a2".format(bazel_package, name)) - scope_targets["@aspect-test"] = scope_targets["@aspect-test"] + [link_targets[-1]] if "@aspect-test" in scope_targets else [link_targets[-1]] + if "@aspect-test" not in scope_targets: + scope_targets["@aspect-test"] = [link_targets[-1]] + else: + scope_targets["@aspect-test"].append(link_targets[-1]) link_4(name = "{}/aspect-test-a-no-scope".format(name)) link_targets.append("//{}:{}/aspect-test-a-no-scope".format(bazel_package, name)) link_4(name = "{}/aspect-test-a/no-at".format(name)) link_targets.append("//{}:{}/aspect-test-a/no-at".format(bazel_package, name)) link_5(name = "{}/@aspect-test/b".format(name)) link_targets.append("//{}:{}/@aspect-test/b".format(bazel_package, name)) - scope_targets["@aspect-test"] = scope_targets["@aspect-test"] + [link_targets[-1]] if "@aspect-test" in scope_targets else [link_targets[-1]] + if "@aspect-test" not in scope_targets: + scope_targets["@aspect-test"] = [link_targets[-1]] + else: + scope_targets["@aspect-test"].append(link_targets[-1]) link_6(name = "{}/@aspect-test/c".format(name)) link_targets.append("//{}:{}/@aspect-test/c".format(bazel_package, name)) - scope_targets["@aspect-test"] = scope_targets["@aspect-test"] + [link_targets[-1]] if "@aspect-test" in scope_targets else [link_targets[-1]] + if "@aspect-test" not in scope_targets: + scope_targets["@aspect-test"] = [link_targets[-1]] + else: + scope_targets["@aspect-test"].append(link_targets[-1]) link_9(name = "{}/@aspect-test/e".format(name)) link_targets.append("//{}:{}/@aspect-test/e".format(bazel_package, name)) - scope_targets["@aspect-test"] = scope_targets["@aspect-test"] + [link_targets[-1]] if "@aspect-test" in scope_targets else [link_targets[-1]] + if "@aspect-test" not in scope_targets: + scope_targets["@aspect-test"] = [link_targets[-1]] + else: + scope_targets["@aspect-test"].append(link_targets[-1]) link_10(name = "{}/jsonify".format(name)) link_targets.append("//{}:{}/jsonify".format(bazel_package, name)) link_11(name = "{}/@isaacs/cliui".format(name)) link_targets.append("//{}:{}/@isaacs/cliui".format(bazel_package, name)) - scope_targets["@isaacs"] = scope_targets["@isaacs"] + [link_targets[-1]] if "@isaacs" in scope_targets else [link_targets[-1]] + if "@isaacs" not in scope_targets: + scope_targets["@isaacs"] = [link_targets[-1]] + else: + scope_targets["@isaacs"].append(link_targets[-1]) link_12(name = "{}/rollup-plugin-with-peers".format(name)) link_targets.append("//{}:{}/rollup-plugin-with-peers".format(bazel_package, name)) link_14(name = "{}/@types/archiver".format(name)) link_targets.append("//{}:{}/@types/archiver".format(bazel_package, name)) - scope_targets["@types"] = scope_targets["@types"] + [link_targets[-1]] if "@types" in scope_targets else [link_targets[-1]] + if "@types" not in scope_targets: + scope_targets["@types"] = [link_targets[-1]] + else: + scope_targets["@types"].append(link_targets[-1]) link_18(name = "{}/@types/node".format(name)) link_targets.append("//{}:{}/@types/node".format(bazel_package, name)) - scope_targets["@types"] = scope_targets["@types"] + [link_targets[-1]] if "@types" in scope_targets else [link_targets[-1]] + if "@types" not in scope_targets: + scope_targets["@types"] = [link_targets[-1]] + else: + scope_targets["@types"].append(link_targets[-1]) link_18(name = "{}/alias-types-node".format(name)) link_targets.append("//{}:{}/alias-types-node".format(bazel_package, name)) link_19(name = "{}/alias-only-sizzle".format(name)) @@ -257,7 +289,10 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): tags = ["manual"], ) link_targets.append(":{}/@scoped/c".format(name)) - scope_targets["@scoped"] = scope_targets["@scoped"] + [link_targets[-1]] if "@scoped" in scope_targets else [link_targets[-1]] + if "@scoped" not in scope_targets: + scope_targets["@scoped"] = [link_targets[-1]] + else: + scope_targets["@scoped"].append(link_targets[-1]) if is_root: _npm_package_store( @@ -301,7 +336,10 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): tags = ["manual"], ) link_targets.append(":{}/@scoped/a".format(name)) - scope_targets["@scoped"] = scope_targets["@scoped"] + [link_targets[-1]] if "@scoped" in scope_targets else [link_targets[-1]] + if "@scoped" not in scope_targets: + scope_targets["@scoped"] = [link_targets[-1]] + else: + scope_targets["@scoped"].append(link_targets[-1]) if is_root: _npm_package_store( @@ -336,7 +374,10 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): tags = ["manual"], ) link_targets.append(":{}/@scoped/b".format(name)) - scope_targets["@scoped"] = scope_targets["@scoped"] + [link_targets[-1]] if "@scoped" in scope_targets else [link_targets[-1]] + if "@scoped" not in scope_targets: + scope_targets["@scoped"] = [link_targets[-1]] + else: + scope_targets["@scoped"].append(link_targets[-1]) if is_root: _npm_package_store( @@ -371,7 +412,10 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): tags = ["manual"], ) link_targets.append(":{}/@scoped/d".format(name)) - scope_targets["@scoped"] = scope_targets["@scoped"] + [link_targets[-1]] if "@scoped" in scope_targets else [link_targets[-1]] + if "@scoped" not in scope_targets: + scope_targets["@scoped"] = [link_targets[-1]] + else: + scope_targets["@scoped"].append(link_targets[-1]) if is_root: _npm_package_store( diff --git a/npm/private/npm_import.bzl b/npm/private/npm_import.bzl index d21fbda51..641a31251 100644 --- a/npm/private/npm_import.bzl +++ b/npm/private/npm_import.bzl @@ -633,7 +633,9 @@ def _npm_import_links_rule_impl(rctx): package_store_name = package_store_name, package_store_root = utils.package_store_root, ) - ref_deps[dep_store_target] = ref_deps[dep_store_target] + [dep_name] if dep_store_target in ref_deps else [dep_name] + if not dep_store_target in ref_deps: + ref_deps[dep_store_target] = [] + ref_deps[dep_store_target].append(dep_name) transitive_closure_pattern = len(rctx.attr.transitive_closure) > 0 if transitive_closure_pattern: @@ -667,8 +669,13 @@ def _npm_import_links_rule_impl(rctx): package_store_root = utils.package_store_root, ) - lc_deps[lc_dep_store_target] = lc_deps[lc_dep_store_target] + [dep_name] if lc_dep_store_target in lc_deps else [dep_name] - deps[dep_store_target] = deps[dep_store_target] + [dep_name] if dep_store_target in deps else [dep_name] + if lc_dep_store_target not in lc_deps: + lc_deps[lc_dep_store_target] = [] + lc_deps[lc_dep_store_target].append(dep_name) + + if dep_store_target not in deps: + deps[dep_store_target] = [] + deps[dep_store_target].append(dep_name) else: for (dep_name, dep_version) in rctx.attr.deps.items(): if dep_version.startswith("link:") or dep_version.startswith("file:"): @@ -680,8 +687,14 @@ def _npm_import_links_rule_impl(rctx): package_store_name = utils.package_store_name(dep_name, dep_version), package_store_root = utils.package_store_root, ) - lc_deps[dep_store_target] = lc_deps[dep_store_target] + [dep_name] if dep_store_target in lc_deps else [dep_name] - deps[dep_store_target] = deps[dep_store_target] + [dep_name] if dep_store_target in deps else [dep_name] + + if dep_store_target not in lc_deps: + lc_deps[dep_store_target] = [] + lc_deps[dep_store_target].append(dep_name) + + if dep_store_target not in deps: + deps[dep_store_target] = [] + deps[dep_store_target].append(dep_name) package_store_name = utils.package_store_name(rctx.attr.package, rctx.attr.version) diff --git a/npm/private/npm_translate_lock_generate.bzl b/npm/private/npm_translate_lock_generate.bzl index de09cf681..b85445ae1 100644 --- a/npm/private/npm_translate_lock_generate.bzl +++ b/npm/private/npm_translate_lock_generate.bzl @@ -78,6 +78,12 @@ _BZL_LIBRARY_TMPL = \ ) """ +_ADD_SCOPE_TARGET = """\ + if "{package_scope}" not in scope_targets: + scope_targets["{package_scope}"] = [link_targets[-1]] + else: + scope_targets["{package_scope}"].append(link_targets[-1])""" + _PACKAGE_JSON_BZL_FILENAME = "package_json.bzl" _RESOLVED_JSON_FILENAME = "resolved.json" @@ -228,7 +234,9 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): new_link_targets, new_scope_targets = link_fn(name) link_targets.extend(new_link_targets) for _scope, _targets in new_scope_targets.items(): - scope_targets[_scope] = scope_targets[_scope] + _targets if _scope in scope_targets else _targets + if _scope not in scope_targets: + scope_targets[_scope] = [] + scope_targets[_scope].extend(_targets) """.format( defs_bzl_file = "@{}//:{}".format(rctx.name, rctx.attr.defs_bzl_filename), link_packages_comma_separated = "\"'\" + \"', '\".join(_LINK_PACKAGES) + \"'\"" if len(link_packages) else "\"\"", @@ -292,8 +300,7 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): links_targets_bzl[link_package].append(add_to_link_targets) package_scope = link_alias[:link_alias.find("/", 1)] if link_alias[0] == "@" else None if package_scope: - add_to_scoped_targets = """ scope_targets["{package_scope}"] = scope_targets["{package_scope}"] + [link_targets[-1]] if "{package_scope}" in scope_targets else [link_targets[-1]]""".format(package_scope = package_scope) - links_bzl[link_package].append(add_to_scoped_targets) + links_bzl[link_package].append(_ADD_SCOPE_TARGET.format(package_scope = package_scope)) # the resolved.json for this alias of the package resolved_json_rel_path = "{}/{}".format(link_alias, _RESOLVED_JSON_FILENAME) @@ -406,10 +413,7 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): npm_link_all_packages_bzl.append(add_to_link_targets) package_scope = fp_package[:fp_package.find("/", 1)] if fp_package[0] == "@" else None if package_scope: - add_to_scoped_targets = """ scope_targets["{package_scope}"] = scope_targets["{package_scope}"] + [link_targets[-1]] if "{package_scope}" in scope_targets else [link_targets[-1]]""".format( - package_scope = package_scope, - ) - npm_link_all_packages_bzl.append(add_to_scoped_targets) + npm_link_all_packages_bzl.append(_ADD_SCOPE_TARGET.format(package_scope = package_scope)) # Generate catch all & scoped js_library targets npm_link_all_packages_bzl.append(""" diff --git a/npm/private/test/snapshots/bzlmod/npm_defs.bzl b/npm/private/test/snapshots/bzlmod/npm_defs.bzl index 5b2012866..368b4ca5c 100644 --- a/npm/private/test/snapshots/bzlmod/npm_defs.bzl +++ b/npm/private/test/snapshots/bzlmod/npm_defs.bzl @@ -1009,7 +1009,9 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): new_link_targets, new_scope_targets = link_fn(name) link_targets.extend(new_link_targets) for _scope, _targets in new_scope_targets.items(): - scope_targets[_scope] = scope_targets[_scope] + _targets if _scope in scope_targets else _targets + if _scope not in scope_targets: + scope_targets[_scope] = [] + scope_targets[_scope].extend(_targets) if is_root: store_0(name = "{}/abbrev".format(name)) @@ -1999,25 +2001,46 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): link_targets.append("//{}:{}/abortcontroller-polyfill".format(bazel_package, name)) link_134(name = "{}/@rollup/plugin-commonjs".format(name)) link_targets.append("//{}:{}/@rollup/plugin-commonjs".format(bazel_package, name)) - scope_targets["@rollup"] = scope_targets["@rollup"] + [link_targets[-1]] if "@rollup" in scope_targets else [link_targets[-1]] + if "@rollup" not in scope_targets: + scope_targets["@rollup"] = [link_targets[-1]] + else: + scope_targets["@rollup"].append(link_targets[-1]) link_136(name = "{}/@rollup/plugin-json".format(name)) link_targets.append("//{}:{}/@rollup/plugin-json".format(bazel_package, name)) - scope_targets["@rollup"] = scope_targets["@rollup"] + [link_targets[-1]] if "@rollup" in scope_targets else [link_targets[-1]] + if "@rollup" not in scope_targets: + scope_targets["@rollup"] = [link_targets[-1]] + else: + scope_targets["@rollup"].append(link_targets[-1]) link_138(name = "{}/@rollup/plugin-node-resolve".format(name)) link_targets.append("//{}:{}/@rollup/plugin-node-resolve".format(bazel_package, name)) - scope_targets["@rollup"] = scope_targets["@rollup"] + [link_targets[-1]] if "@rollup" in scope_targets else [link_targets[-1]] + if "@rollup" not in scope_targets: + scope_targets["@rollup"] = [link_targets[-1]] + else: + scope_targets["@rollup"].append(link_targets[-1]) link_140(name = "{}/@rollup/plugin-terser".format(name)) link_targets.append("//{}:{}/@rollup/plugin-terser".format(bazel_package, name)) - scope_targets["@rollup"] = scope_targets["@rollup"] + [link_targets[-1]] if "@rollup" in scope_targets else [link_targets[-1]] + if "@rollup" not in scope_targets: + scope_targets["@rollup"] = [link_targets[-1]] + else: + scope_targets["@rollup"].append(link_targets[-1]) link_141(name = "{}/@rollup/plugin-typescript".format(name)) link_targets.append("//{}:{}/@rollup/plugin-typescript".format(bazel_package, name)) - scope_targets["@rollup"] = scope_targets["@rollup"] + [link_targets[-1]] if "@rollup" in scope_targets else [link_targets[-1]] + if "@rollup" not in scope_targets: + scope_targets["@rollup"] = [link_targets[-1]] + else: + scope_targets["@rollup"].append(link_targets[-1]) link_163(name = "{}/@types/google-protobuf".format(name)) link_targets.append("//{}:{}/@types/google-protobuf".format(bazel_package, name)) - scope_targets["@types"] = scope_targets["@types"] + [link_targets[-1]] if "@types" in scope_targets else [link_targets[-1]] + if "@types" not in scope_targets: + scope_targets["@types"] = [link_targets[-1]] + else: + scope_targets["@types"].append(link_targets[-1]) link_172(name = "{}/@types/node".format(name)) link_targets.append("//{}:{}/@types/node".format(bazel_package, name)) - scope_targets["@types"] = scope_targets["@types"] + [link_targets[-1]] if "@types" in scope_targets else [link_targets[-1]] + if "@types" not in scope_targets: + scope_targets["@types"] = [link_targets[-1]] + else: + scope_targets["@types"].append(link_targets[-1]) link_487(name = "{}/google-protobuf".format(name)) link_targets.append("//{}:{}/google-protobuf".format(bazel_package, name)) link_813(name = "{}/rollup".format(name)) @@ -2031,16 +2054,28 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): link_targets.append("//{}:{}/acorn".format(bazel_package, name)) link_42(name = "{}/@aspect-test/a".format(name)) link_targets.append("//{}:{}/@aspect-test/a".format(bazel_package, name)) - scope_targets["@aspect-test"] = scope_targets["@aspect-test"] + [link_targets[-1]] if "@aspect-test" in scope_targets else [link_targets[-1]] + if "@aspect-test" not in scope_targets: + scope_targets["@aspect-test"] = [link_targets[-1]] + else: + scope_targets["@aspect-test"].append(link_targets[-1]) link_44(name = "{}/@aspect-test/c".format(name)) link_targets.append("//{}:{}/@aspect-test/c".format(bazel_package, name)) - scope_targets["@aspect-test"] = scope_targets["@aspect-test"] + [link_targets[-1]] if "@aspect-test" in scope_targets else [link_targets[-1]] + if "@aspect-test" not in scope_targets: + scope_targets["@aspect-test"] = [link_targets[-1]] + else: + scope_targets["@aspect-test"].append(link_targets[-1]) link_102(name = "{}/@gregmagolan/test-b".format(name)) link_targets.append("//{}:{}/@gregmagolan/test-b".format(bazel_package, name)) - scope_targets["@gregmagolan"] = scope_targets["@gregmagolan"] + [link_targets[-1]] if "@gregmagolan" in scope_targets else [link_targets[-1]] + if "@gregmagolan" not in scope_targets: + scope_targets["@gregmagolan"] = [link_targets[-1]] + else: + scope_targets["@gregmagolan"].append(link_targets[-1]) link_133(name = "{}/@rollup/plugin-commonjs".format(name)) link_targets.append("//{}:{}/@rollup/plugin-commonjs".format(bazel_package, name)) - scope_targets["@rollup"] = scope_targets["@rollup"] + [link_targets[-1]] if "@rollup" in scope_targets else [link_targets[-1]] + if "@rollup" not in scope_targets: + scope_targets["@rollup"] = [link_targets[-1]] + else: + scope_targets["@rollup"].append(link_targets[-1]) link_328(name = "{}/debug".format(name)) link_targets.append("//{}:{}/debug".format(bazel_package, name)) link_620(name = "{}/meaning-of-life".format(name)) @@ -2078,37 +2113,64 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): elif bazel_package == "examples/linked_lib": link_46(name = "{}/@aspect-test/e".format(name)) link_targets.append("//{}:{}/@aspect-test/e".format(bazel_package, name)) - scope_targets["@aspect-test"] = scope_targets["@aspect-test"] + [link_targets[-1]] if "@aspect-test" in scope_targets else [link_targets[-1]] + if "@aspect-test" not in scope_targets: + scope_targets["@aspect-test"] = [link_targets[-1]] + else: + scope_targets["@aspect-test"].append(link_targets[-1]) link_46(name = "{}/alias-e".format(name)) link_targets.append("//{}:{}/alias-e".format(bazel_package, name)) link_47(name = "{}/@aspect-test/f".format(name)) link_targets.append("//{}:{}/@aspect-test/f".format(bazel_package, name)) - scope_targets["@aspect-test"] = scope_targets["@aspect-test"] + [link_targets[-1]] if "@aspect-test" in scope_targets else [link_targets[-1]] + if "@aspect-test" not in scope_targets: + scope_targets["@aspect-test"] = [link_targets[-1]] + else: + scope_targets["@aspect-test"].append(link_targets[-1]) link_173(name = "{}/@types/node".format(name)) link_targets.append("//{}:{}/@types/node".format(bazel_package, name)) - scope_targets["@types"] = scope_targets["@types"] + [link_targets[-1]] if "@types" in scope_targets else [link_targets[-1]] + if "@types" not in scope_targets: + scope_targets["@types"] = [link_targets[-1]] + else: + scope_targets["@types"].append(link_targets[-1]) elif bazel_package == "examples/linked_pkg": link_46(name = "{}/@aspect-test/e".format(name)) link_targets.append("//{}:{}/@aspect-test/e".format(bazel_package, name)) - scope_targets["@aspect-test"] = scope_targets["@aspect-test"] + [link_targets[-1]] if "@aspect-test" in scope_targets else [link_targets[-1]] + if "@aspect-test" not in scope_targets: + scope_targets["@aspect-test"] = [link_targets[-1]] + else: + scope_targets["@aspect-test"].append(link_targets[-1]) link_46(name = "{}/alias-e".format(name)) link_targets.append("//{}:{}/alias-e".format(bazel_package, name)) link_47(name = "{}/@aspect-test/f".format(name)) link_targets.append("//{}:{}/@aspect-test/f".format(bazel_package, name)) - scope_targets["@aspect-test"] = scope_targets["@aspect-test"] + [link_targets[-1]] if "@aspect-test" in scope_targets else [link_targets[-1]] + if "@aspect-test" not in scope_targets: + scope_targets["@aspect-test"] = [link_targets[-1]] + else: + scope_targets["@aspect-test"].append(link_targets[-1]) link_173(name = "{}/@types/node".format(name)) link_targets.append("//{}:{}/@types/node".format(bazel_package, name)) - scope_targets["@types"] = scope_targets["@types"] + [link_targets[-1]] if "@types" in scope_targets else [link_targets[-1]] + if "@types" not in scope_targets: + scope_targets["@types"] = [link_targets[-1]] + else: + scope_targets["@types"].append(link_targets[-1]) elif bazel_package == "npm/private/test": link_98(name = "{}/@figma/nodegit".format(name)) link_targets.append("//{}:{}/@figma/nodegit".format(bazel_package, name)) - scope_targets["@figma"] = scope_targets["@figma"] + [link_targets[-1]] if "@figma" in scope_targets else [link_targets[-1]] + if "@figma" not in scope_targets: + scope_targets["@figma"] = [link_targets[-1]] + else: + scope_targets["@figma"].append(link_targets[-1]) link_112(name = "{}/@kubernetes/client-node".format(name)) link_targets.append("//{}:{}/@kubernetes/client-node".format(bazel_package, name)) - scope_targets["@kubernetes"] = scope_targets["@kubernetes"] + [link_targets[-1]] if "@kubernetes" in scope_targets else [link_targets[-1]] + if "@kubernetes" not in scope_targets: + scope_targets["@kubernetes"] = [link_targets[-1]] + else: + scope_targets["@kubernetes"].append(link_targets[-1]) link_130(name = "{}/@plotly/regl".format(name)) link_targets.append("//{}:{}/@plotly/regl".format(bazel_package, name)) - scope_targets["@plotly"] = scope_targets["@plotly"] + [link_targets[-1]] if "@plotly" in scope_targets else [link_targets[-1]] + if "@plotly" not in scope_targets: + scope_targets["@plotly"] = [link_targets[-1]] + else: + scope_targets["@plotly"].append(link_targets[-1]) link_130(name = "{}/regl".format(name)) link_targets.append("//{}:{}/regl".format(bazel_package, name)) link_236(name = "{}/bufferutil".format(name)) @@ -2153,22 +2215,40 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): elif bazel_package == "js/private/image": link_134(name = "{}/@rollup/plugin-commonjs".format(name)) link_targets.append("//{}:{}/@rollup/plugin-commonjs".format(bazel_package, name)) - scope_targets["@rollup"] = scope_targets["@rollup"] + [link_targets[-1]] if "@rollup" in scope_targets else [link_targets[-1]] + if "@rollup" not in scope_targets: + scope_targets["@rollup"] = [link_targets[-1]] + else: + scope_targets["@rollup"].append(link_targets[-1]) link_138(name = "{}/@rollup/plugin-node-resolve".format(name)) link_targets.append("//{}:{}/@rollup/plugin-node-resolve".format(bazel_package, name)) - scope_targets["@rollup"] = scope_targets["@rollup"] + [link_targets[-1]] if "@rollup" in scope_targets else [link_targets[-1]] + if "@rollup" not in scope_targets: + scope_targets["@rollup"] = [link_targets[-1]] + else: + scope_targets["@rollup"].append(link_targets[-1]) link_141(name = "{}/@rollup/plugin-typescript".format(name)) link_targets.append("//{}:{}/@rollup/plugin-typescript".format(bazel_package, name)) - scope_targets["@rollup"] = scope_targets["@rollup"] + [link_targets[-1]] if "@rollup" in scope_targets else [link_targets[-1]] + if "@rollup" not in scope_targets: + scope_targets["@rollup"] = [link_targets[-1]] + else: + scope_targets["@rollup"].append(link_targets[-1]) link_154(name = "{}/@types/archiver".format(name)) link_targets.append("//{}:{}/@types/archiver".format(bazel_package, name)) - scope_targets["@types"] = scope_targets["@types"] + [link_targets[-1]] if "@types" in scope_targets else [link_targets[-1]] + if "@types" not in scope_targets: + scope_targets["@types"] = [link_targets[-1]] + else: + scope_targets["@types"].append(link_targets[-1]) link_171(name = "{}/@types/node".format(name)) link_targets.append("//{}:{}/@types/node".format(bazel_package, name)) - scope_targets["@types"] = scope_targets["@types"] + [link_targets[-1]] if "@types" in scope_targets else [link_targets[-1]] + if "@types" not in scope_targets: + scope_targets["@types"] = [link_targets[-1]] + else: + scope_targets["@types"].append(link_targets[-1]) link_177(name = "{}/@types/tar-stream".format(name)) link_targets.append("//{}:{}/@types/tar-stream".format(bazel_package, name)) - scope_targets["@types"] = scope_targets["@types"] + [link_targets[-1]] if "@types" in scope_targets else [link_targets[-1]] + if "@types" not in scope_targets: + scope_targets["@types"] = [link_targets[-1]] + else: + scope_targets["@types"].append(link_targets[-1]) link_813(name = "{}/rollup".format(name)) link_targets.append("//{}:{}/rollup".format(bazel_package, name)) link_886(name = "{}/tar-stream".format(name)) @@ -2180,13 +2260,22 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): elif bazel_package == "js/private/coverage/bundle": link_135(name = "{}/@rollup/plugin-commonjs".format(name)) link_targets.append("//{}:{}/@rollup/plugin-commonjs".format(bazel_package, name)) - scope_targets["@rollup"] = scope_targets["@rollup"] + [link_targets[-1]] if "@rollup" in scope_targets else [link_targets[-1]] + if "@rollup" not in scope_targets: + scope_targets["@rollup"] = [link_targets[-1]] + else: + scope_targets["@rollup"].append(link_targets[-1]) link_137(name = "{}/@rollup/plugin-json".format(name)) link_targets.append("//{}:{}/@rollup/plugin-json".format(bazel_package, name)) - scope_targets["@rollup"] = scope_targets["@rollup"] + [link_targets[-1]] if "@rollup" in scope_targets else [link_targets[-1]] + if "@rollup" not in scope_targets: + scope_targets["@rollup"] = [link_targets[-1]] + else: + scope_targets["@rollup"].append(link_targets[-1]) link_139(name = "{}/@rollup/plugin-node-resolve".format(name)) link_targets.append("//{}:{}/@rollup/plugin-node-resolve".format(bazel_package, name)) - scope_targets["@rollup"] = scope_targets["@rollup"] + [link_targets[-1]] if "@rollup" in scope_targets else [link_targets[-1]] + if "@rollup" not in scope_targets: + scope_targets["@rollup"] = [link_targets[-1]] + else: + scope_targets["@rollup"].append(link_targets[-1]) link_239(name = "{}/c8".format(name)) link_targets.append("//{}:{}/c8".format(bazel_package, name)) link_814(name = "{}/rollup".format(name)) @@ -2194,7 +2283,10 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): elif bazel_package == "": link_170(name = "{}/@types/node".format(name)) link_targets.append("//{}:{}/@types/node".format(bazel_package, name)) - scope_targets["@types"] = scope_targets["@types"] + [link_targets[-1]] if "@types" in scope_targets else [link_targets[-1]] + if "@types" not in scope_targets: + scope_targets["@types"] = [link_targets[-1]] + else: + scope_targets["@types"].append(link_targets[-1]) link_251(name = "{}/chalk".format(name)) link_targets.append("//{}:{}/chalk".format(bazel_package, name)) link_525(name = "{}/inline-fixtures".format(name)) @@ -2206,16 +2298,25 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): elif bazel_package == "js/private/test/js_run_devserver": link_170(name = "{}/@types/node".format(name)) link_targets.append("//{}:{}/@types/node".format(bazel_package, name)) - scope_targets["@types"] = scope_targets["@types"] + [link_targets[-1]] if "@types" in scope_targets else [link_targets[-1]] + if "@types" not in scope_targets: + scope_targets["@types"] = [link_targets[-1]] + else: + scope_targets["@types"].append(link_targets[-1]) link_568(name = "{}/jasmine".format(name)) link_targets.append("//{}:{}/jasmine".format(bazel_package, name)) elif bazel_package == "examples/webpack_cli": link_183(name = "{}/@vanilla-extract/css".format(name)) link_targets.append("//{}:{}/@vanilla-extract/css".format(bazel_package, name)) - scope_targets["@vanilla-extract"] = scope_targets["@vanilla-extract"] + [link_targets[-1]] if "@vanilla-extract" in scope_targets else [link_targets[-1]] + if "@vanilla-extract" not in scope_targets: + scope_targets["@vanilla-extract"] = [link_targets[-1]] + else: + scope_targets["@vanilla-extract"].append(link_targets[-1]) link_187(name = "{}/@vanilla-extract/webpack-plugin".format(name)) link_targets.append("//{}:{}/@vanilla-extract/webpack-plugin".format(bazel_package, name)) - scope_targets["@vanilla-extract"] = scope_targets["@vanilla-extract"] + [link_targets[-1]] if "@vanilla-extract" in scope_targets else [link_targets[-1]] + if "@vanilla-extract" not in scope_targets: + scope_targets["@vanilla-extract"] = [link_targets[-1]] + else: + scope_targets["@vanilla-extract"].append(link_targets[-1]) link_301(name = "{}/css-loader".format(name)) link_targets.append("//{}:{}/css-loader".format(bazel_package, name)) link_618(name = "{}/mathjs".format(name)) @@ -2336,7 +2437,10 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): tags = ["manual"], ) link_targets.append(":{}/@lib/test".format(name)) - scope_targets["@lib"] = scope_targets["@lib"] + [link_targets[-1]] if "@lib" in scope_targets else [link_targets[-1]] + if "@lib" not in scope_targets: + scope_targets["@lib"] = [link_targets[-1]] + else: + scope_targets["@lib"].append(link_targets[-1]) if is_root: _npm_package_store( @@ -2371,7 +2475,10 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): tags = ["manual"], ) link_targets.append(":{}/@lib/test2".format(name)) - scope_targets["@lib"] = scope_targets["@lib"] + [link_targets[-1]] if "@lib" in scope_targets else [link_targets[-1]] + if "@lib" not in scope_targets: + scope_targets["@lib"] = [link_targets[-1]] + else: + scope_targets["@lib"].append(link_targets[-1]) if is_root: _npm_package_store( @@ -2407,7 +2514,10 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): tags = ["manual"], ) link_targets.append(":{}/@mycorp/pkg-d".format(name)) - scope_targets["@mycorp"] = scope_targets["@mycorp"] + [link_targets[-1]] if "@mycorp" in scope_targets else [link_targets[-1]] + if "@mycorp" not in scope_targets: + scope_targets["@mycorp"] = [link_targets[-1]] + else: + scope_targets["@mycorp"].append(link_targets[-1]) if is_root: _npm_package_store( @@ -2442,7 +2552,10 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): tags = ["manual"], ) link_targets.append(":{}/@mycorp/pkg-e".format(name)) - scope_targets["@mycorp"] = scope_targets["@mycorp"] + [link_targets[-1]] if "@mycorp" in scope_targets else [link_targets[-1]] + if "@mycorp" not in scope_targets: + scope_targets["@mycorp"] = [link_targets[-1]] + else: + scope_targets["@mycorp"].append(link_targets[-1]) if is_root: _npm_package_store( diff --git a/npm/private/test/snapshots/wksp/npm_defs.bzl b/npm/private/test/snapshots/wksp/npm_defs.bzl index 08f6ebd4b..fd2245fb7 100644 --- a/npm/private/test/snapshots/wksp/npm_defs.bzl +++ b/npm/private/test/snapshots/wksp/npm_defs.bzl @@ -1009,7 +1009,9 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): new_link_targets, new_scope_targets = link_fn(name) link_targets.extend(new_link_targets) for _scope, _targets in new_scope_targets.items(): - scope_targets[_scope] = scope_targets[_scope] + _targets if _scope in scope_targets else _targets + if _scope not in scope_targets: + scope_targets[_scope] = [] + scope_targets[_scope].extend(_targets) if is_root: store_0(name = "{}/abbrev".format(name)) @@ -1999,25 +2001,46 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): link_targets.append("//{}:{}/abortcontroller-polyfill".format(bazel_package, name)) link_134(name = "{}/@rollup/plugin-commonjs".format(name)) link_targets.append("//{}:{}/@rollup/plugin-commonjs".format(bazel_package, name)) - scope_targets["@rollup"] = scope_targets["@rollup"] + [link_targets[-1]] if "@rollup" in scope_targets else [link_targets[-1]] + if "@rollup" not in scope_targets: + scope_targets["@rollup"] = [link_targets[-1]] + else: + scope_targets["@rollup"].append(link_targets[-1]) link_136(name = "{}/@rollup/plugin-json".format(name)) link_targets.append("//{}:{}/@rollup/plugin-json".format(bazel_package, name)) - scope_targets["@rollup"] = scope_targets["@rollup"] + [link_targets[-1]] if "@rollup" in scope_targets else [link_targets[-1]] + if "@rollup" not in scope_targets: + scope_targets["@rollup"] = [link_targets[-1]] + else: + scope_targets["@rollup"].append(link_targets[-1]) link_138(name = "{}/@rollup/plugin-node-resolve".format(name)) link_targets.append("//{}:{}/@rollup/plugin-node-resolve".format(bazel_package, name)) - scope_targets["@rollup"] = scope_targets["@rollup"] + [link_targets[-1]] if "@rollup" in scope_targets else [link_targets[-1]] + if "@rollup" not in scope_targets: + scope_targets["@rollup"] = [link_targets[-1]] + else: + scope_targets["@rollup"].append(link_targets[-1]) link_140(name = "{}/@rollup/plugin-terser".format(name)) link_targets.append("//{}:{}/@rollup/plugin-terser".format(bazel_package, name)) - scope_targets["@rollup"] = scope_targets["@rollup"] + [link_targets[-1]] if "@rollup" in scope_targets else [link_targets[-1]] + if "@rollup" not in scope_targets: + scope_targets["@rollup"] = [link_targets[-1]] + else: + scope_targets["@rollup"].append(link_targets[-1]) link_141(name = "{}/@rollup/plugin-typescript".format(name)) link_targets.append("//{}:{}/@rollup/plugin-typescript".format(bazel_package, name)) - scope_targets["@rollup"] = scope_targets["@rollup"] + [link_targets[-1]] if "@rollup" in scope_targets else [link_targets[-1]] + if "@rollup" not in scope_targets: + scope_targets["@rollup"] = [link_targets[-1]] + else: + scope_targets["@rollup"].append(link_targets[-1]) link_163(name = "{}/@types/google-protobuf".format(name)) link_targets.append("//{}:{}/@types/google-protobuf".format(bazel_package, name)) - scope_targets["@types"] = scope_targets["@types"] + [link_targets[-1]] if "@types" in scope_targets else [link_targets[-1]] + if "@types" not in scope_targets: + scope_targets["@types"] = [link_targets[-1]] + else: + scope_targets["@types"].append(link_targets[-1]) link_172(name = "{}/@types/node".format(name)) link_targets.append("//{}:{}/@types/node".format(bazel_package, name)) - scope_targets["@types"] = scope_targets["@types"] + [link_targets[-1]] if "@types" in scope_targets else [link_targets[-1]] + if "@types" not in scope_targets: + scope_targets["@types"] = [link_targets[-1]] + else: + scope_targets["@types"].append(link_targets[-1]) link_487(name = "{}/google-protobuf".format(name)) link_targets.append("//{}:{}/google-protobuf".format(bazel_package, name)) link_813(name = "{}/rollup".format(name)) @@ -2031,16 +2054,28 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): link_targets.append("//{}:{}/acorn".format(bazel_package, name)) link_42(name = "{}/@aspect-test/a".format(name)) link_targets.append("//{}:{}/@aspect-test/a".format(bazel_package, name)) - scope_targets["@aspect-test"] = scope_targets["@aspect-test"] + [link_targets[-1]] if "@aspect-test" in scope_targets else [link_targets[-1]] + if "@aspect-test" not in scope_targets: + scope_targets["@aspect-test"] = [link_targets[-1]] + else: + scope_targets["@aspect-test"].append(link_targets[-1]) link_44(name = "{}/@aspect-test/c".format(name)) link_targets.append("//{}:{}/@aspect-test/c".format(bazel_package, name)) - scope_targets["@aspect-test"] = scope_targets["@aspect-test"] + [link_targets[-1]] if "@aspect-test" in scope_targets else [link_targets[-1]] + if "@aspect-test" not in scope_targets: + scope_targets["@aspect-test"] = [link_targets[-1]] + else: + scope_targets["@aspect-test"].append(link_targets[-1]) link_102(name = "{}/@gregmagolan/test-b".format(name)) link_targets.append("//{}:{}/@gregmagolan/test-b".format(bazel_package, name)) - scope_targets["@gregmagolan"] = scope_targets["@gregmagolan"] + [link_targets[-1]] if "@gregmagolan" in scope_targets else [link_targets[-1]] + if "@gregmagolan" not in scope_targets: + scope_targets["@gregmagolan"] = [link_targets[-1]] + else: + scope_targets["@gregmagolan"].append(link_targets[-1]) link_133(name = "{}/@rollup/plugin-commonjs".format(name)) link_targets.append("//{}:{}/@rollup/plugin-commonjs".format(bazel_package, name)) - scope_targets["@rollup"] = scope_targets["@rollup"] + [link_targets[-1]] if "@rollup" in scope_targets else [link_targets[-1]] + if "@rollup" not in scope_targets: + scope_targets["@rollup"] = [link_targets[-1]] + else: + scope_targets["@rollup"].append(link_targets[-1]) link_328(name = "{}/debug".format(name)) link_targets.append("//{}:{}/debug".format(bazel_package, name)) link_620(name = "{}/meaning-of-life".format(name)) @@ -2078,37 +2113,64 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): elif bazel_package == "examples/linked_lib": link_46(name = "{}/@aspect-test/e".format(name)) link_targets.append("//{}:{}/@aspect-test/e".format(bazel_package, name)) - scope_targets["@aspect-test"] = scope_targets["@aspect-test"] + [link_targets[-1]] if "@aspect-test" in scope_targets else [link_targets[-1]] + if "@aspect-test" not in scope_targets: + scope_targets["@aspect-test"] = [link_targets[-1]] + else: + scope_targets["@aspect-test"].append(link_targets[-1]) link_46(name = "{}/alias-e".format(name)) link_targets.append("//{}:{}/alias-e".format(bazel_package, name)) link_47(name = "{}/@aspect-test/f".format(name)) link_targets.append("//{}:{}/@aspect-test/f".format(bazel_package, name)) - scope_targets["@aspect-test"] = scope_targets["@aspect-test"] + [link_targets[-1]] if "@aspect-test" in scope_targets else [link_targets[-1]] + if "@aspect-test" not in scope_targets: + scope_targets["@aspect-test"] = [link_targets[-1]] + else: + scope_targets["@aspect-test"].append(link_targets[-1]) link_173(name = "{}/@types/node".format(name)) link_targets.append("//{}:{}/@types/node".format(bazel_package, name)) - scope_targets["@types"] = scope_targets["@types"] + [link_targets[-1]] if "@types" in scope_targets else [link_targets[-1]] + if "@types" not in scope_targets: + scope_targets["@types"] = [link_targets[-1]] + else: + scope_targets["@types"].append(link_targets[-1]) elif bazel_package == "examples/linked_pkg": link_46(name = "{}/@aspect-test/e".format(name)) link_targets.append("//{}:{}/@aspect-test/e".format(bazel_package, name)) - scope_targets["@aspect-test"] = scope_targets["@aspect-test"] + [link_targets[-1]] if "@aspect-test" in scope_targets else [link_targets[-1]] + if "@aspect-test" not in scope_targets: + scope_targets["@aspect-test"] = [link_targets[-1]] + else: + scope_targets["@aspect-test"].append(link_targets[-1]) link_46(name = "{}/alias-e".format(name)) link_targets.append("//{}:{}/alias-e".format(bazel_package, name)) link_47(name = "{}/@aspect-test/f".format(name)) link_targets.append("//{}:{}/@aspect-test/f".format(bazel_package, name)) - scope_targets["@aspect-test"] = scope_targets["@aspect-test"] + [link_targets[-1]] if "@aspect-test" in scope_targets else [link_targets[-1]] + if "@aspect-test" not in scope_targets: + scope_targets["@aspect-test"] = [link_targets[-1]] + else: + scope_targets["@aspect-test"].append(link_targets[-1]) link_173(name = "{}/@types/node".format(name)) link_targets.append("//{}:{}/@types/node".format(bazel_package, name)) - scope_targets["@types"] = scope_targets["@types"] + [link_targets[-1]] if "@types" in scope_targets else [link_targets[-1]] + if "@types" not in scope_targets: + scope_targets["@types"] = [link_targets[-1]] + else: + scope_targets["@types"].append(link_targets[-1]) elif bazel_package == "npm/private/test": link_98(name = "{}/@figma/nodegit".format(name)) link_targets.append("//{}:{}/@figma/nodegit".format(bazel_package, name)) - scope_targets["@figma"] = scope_targets["@figma"] + [link_targets[-1]] if "@figma" in scope_targets else [link_targets[-1]] + if "@figma" not in scope_targets: + scope_targets["@figma"] = [link_targets[-1]] + else: + scope_targets["@figma"].append(link_targets[-1]) link_112(name = "{}/@kubernetes/client-node".format(name)) link_targets.append("//{}:{}/@kubernetes/client-node".format(bazel_package, name)) - scope_targets["@kubernetes"] = scope_targets["@kubernetes"] + [link_targets[-1]] if "@kubernetes" in scope_targets else [link_targets[-1]] + if "@kubernetes" not in scope_targets: + scope_targets["@kubernetes"] = [link_targets[-1]] + else: + scope_targets["@kubernetes"].append(link_targets[-1]) link_130(name = "{}/@plotly/regl".format(name)) link_targets.append("//{}:{}/@plotly/regl".format(bazel_package, name)) - scope_targets["@plotly"] = scope_targets["@plotly"] + [link_targets[-1]] if "@plotly" in scope_targets else [link_targets[-1]] + if "@plotly" not in scope_targets: + scope_targets["@plotly"] = [link_targets[-1]] + else: + scope_targets["@plotly"].append(link_targets[-1]) link_130(name = "{}/regl".format(name)) link_targets.append("//{}:{}/regl".format(bazel_package, name)) link_236(name = "{}/bufferutil".format(name)) @@ -2153,22 +2215,40 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): elif bazel_package == "js/private/image": link_134(name = "{}/@rollup/plugin-commonjs".format(name)) link_targets.append("//{}:{}/@rollup/plugin-commonjs".format(bazel_package, name)) - scope_targets["@rollup"] = scope_targets["@rollup"] + [link_targets[-1]] if "@rollup" in scope_targets else [link_targets[-1]] + if "@rollup" not in scope_targets: + scope_targets["@rollup"] = [link_targets[-1]] + else: + scope_targets["@rollup"].append(link_targets[-1]) link_138(name = "{}/@rollup/plugin-node-resolve".format(name)) link_targets.append("//{}:{}/@rollup/plugin-node-resolve".format(bazel_package, name)) - scope_targets["@rollup"] = scope_targets["@rollup"] + [link_targets[-1]] if "@rollup" in scope_targets else [link_targets[-1]] + if "@rollup" not in scope_targets: + scope_targets["@rollup"] = [link_targets[-1]] + else: + scope_targets["@rollup"].append(link_targets[-1]) link_141(name = "{}/@rollup/plugin-typescript".format(name)) link_targets.append("//{}:{}/@rollup/plugin-typescript".format(bazel_package, name)) - scope_targets["@rollup"] = scope_targets["@rollup"] + [link_targets[-1]] if "@rollup" in scope_targets else [link_targets[-1]] + if "@rollup" not in scope_targets: + scope_targets["@rollup"] = [link_targets[-1]] + else: + scope_targets["@rollup"].append(link_targets[-1]) link_154(name = "{}/@types/archiver".format(name)) link_targets.append("//{}:{}/@types/archiver".format(bazel_package, name)) - scope_targets["@types"] = scope_targets["@types"] + [link_targets[-1]] if "@types" in scope_targets else [link_targets[-1]] + if "@types" not in scope_targets: + scope_targets["@types"] = [link_targets[-1]] + else: + scope_targets["@types"].append(link_targets[-1]) link_171(name = "{}/@types/node".format(name)) link_targets.append("//{}:{}/@types/node".format(bazel_package, name)) - scope_targets["@types"] = scope_targets["@types"] + [link_targets[-1]] if "@types" in scope_targets else [link_targets[-1]] + if "@types" not in scope_targets: + scope_targets["@types"] = [link_targets[-1]] + else: + scope_targets["@types"].append(link_targets[-1]) link_177(name = "{}/@types/tar-stream".format(name)) link_targets.append("//{}:{}/@types/tar-stream".format(bazel_package, name)) - scope_targets["@types"] = scope_targets["@types"] + [link_targets[-1]] if "@types" in scope_targets else [link_targets[-1]] + if "@types" not in scope_targets: + scope_targets["@types"] = [link_targets[-1]] + else: + scope_targets["@types"].append(link_targets[-1]) link_813(name = "{}/rollup".format(name)) link_targets.append("//{}:{}/rollup".format(bazel_package, name)) link_886(name = "{}/tar-stream".format(name)) @@ -2180,13 +2260,22 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): elif bazel_package == "js/private/coverage/bundle": link_135(name = "{}/@rollup/plugin-commonjs".format(name)) link_targets.append("//{}:{}/@rollup/plugin-commonjs".format(bazel_package, name)) - scope_targets["@rollup"] = scope_targets["@rollup"] + [link_targets[-1]] if "@rollup" in scope_targets else [link_targets[-1]] + if "@rollup" not in scope_targets: + scope_targets["@rollup"] = [link_targets[-1]] + else: + scope_targets["@rollup"].append(link_targets[-1]) link_137(name = "{}/@rollup/plugin-json".format(name)) link_targets.append("//{}:{}/@rollup/plugin-json".format(bazel_package, name)) - scope_targets["@rollup"] = scope_targets["@rollup"] + [link_targets[-1]] if "@rollup" in scope_targets else [link_targets[-1]] + if "@rollup" not in scope_targets: + scope_targets["@rollup"] = [link_targets[-1]] + else: + scope_targets["@rollup"].append(link_targets[-1]) link_139(name = "{}/@rollup/plugin-node-resolve".format(name)) link_targets.append("//{}:{}/@rollup/plugin-node-resolve".format(bazel_package, name)) - scope_targets["@rollup"] = scope_targets["@rollup"] + [link_targets[-1]] if "@rollup" in scope_targets else [link_targets[-1]] + if "@rollup" not in scope_targets: + scope_targets["@rollup"] = [link_targets[-1]] + else: + scope_targets["@rollup"].append(link_targets[-1]) link_239(name = "{}/c8".format(name)) link_targets.append("//{}:{}/c8".format(bazel_package, name)) link_814(name = "{}/rollup".format(name)) @@ -2194,7 +2283,10 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): elif bazel_package == "": link_170(name = "{}/@types/node".format(name)) link_targets.append("//{}:{}/@types/node".format(bazel_package, name)) - scope_targets["@types"] = scope_targets["@types"] + [link_targets[-1]] if "@types" in scope_targets else [link_targets[-1]] + if "@types" not in scope_targets: + scope_targets["@types"] = [link_targets[-1]] + else: + scope_targets["@types"].append(link_targets[-1]) link_251(name = "{}/chalk".format(name)) link_targets.append("//{}:{}/chalk".format(bazel_package, name)) link_525(name = "{}/inline-fixtures".format(name)) @@ -2206,16 +2298,25 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): elif bazel_package == "js/private/test/js_run_devserver": link_170(name = "{}/@types/node".format(name)) link_targets.append("//{}:{}/@types/node".format(bazel_package, name)) - scope_targets["@types"] = scope_targets["@types"] + [link_targets[-1]] if "@types" in scope_targets else [link_targets[-1]] + if "@types" not in scope_targets: + scope_targets["@types"] = [link_targets[-1]] + else: + scope_targets["@types"].append(link_targets[-1]) link_568(name = "{}/jasmine".format(name)) link_targets.append("//{}:{}/jasmine".format(bazel_package, name)) elif bazel_package == "examples/webpack_cli": link_183(name = "{}/@vanilla-extract/css".format(name)) link_targets.append("//{}:{}/@vanilla-extract/css".format(bazel_package, name)) - scope_targets["@vanilla-extract"] = scope_targets["@vanilla-extract"] + [link_targets[-1]] if "@vanilla-extract" in scope_targets else [link_targets[-1]] + if "@vanilla-extract" not in scope_targets: + scope_targets["@vanilla-extract"] = [link_targets[-1]] + else: + scope_targets["@vanilla-extract"].append(link_targets[-1]) link_187(name = "{}/@vanilla-extract/webpack-plugin".format(name)) link_targets.append("//{}:{}/@vanilla-extract/webpack-plugin".format(bazel_package, name)) - scope_targets["@vanilla-extract"] = scope_targets["@vanilla-extract"] + [link_targets[-1]] if "@vanilla-extract" in scope_targets else [link_targets[-1]] + if "@vanilla-extract" not in scope_targets: + scope_targets["@vanilla-extract"] = [link_targets[-1]] + else: + scope_targets["@vanilla-extract"].append(link_targets[-1]) link_301(name = "{}/css-loader".format(name)) link_targets.append("//{}:{}/css-loader".format(bazel_package, name)) link_618(name = "{}/mathjs".format(name)) @@ -2336,7 +2437,10 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): tags = ["manual"], ) link_targets.append(":{}/@lib/test".format(name)) - scope_targets["@lib"] = scope_targets["@lib"] + [link_targets[-1]] if "@lib" in scope_targets else [link_targets[-1]] + if "@lib" not in scope_targets: + scope_targets["@lib"] = [link_targets[-1]] + else: + scope_targets["@lib"].append(link_targets[-1]) if is_root: _npm_package_store( @@ -2371,7 +2475,10 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): tags = ["manual"], ) link_targets.append(":{}/@lib/test2".format(name)) - scope_targets["@lib"] = scope_targets["@lib"] + [link_targets[-1]] if "@lib" in scope_targets else [link_targets[-1]] + if "@lib" not in scope_targets: + scope_targets["@lib"] = [link_targets[-1]] + else: + scope_targets["@lib"].append(link_targets[-1]) if is_root: _npm_package_store( @@ -2407,7 +2514,10 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): tags = ["manual"], ) link_targets.append(":{}/@mycorp/pkg-d".format(name)) - scope_targets["@mycorp"] = scope_targets["@mycorp"] + [link_targets[-1]] if "@mycorp" in scope_targets else [link_targets[-1]] + if "@mycorp" not in scope_targets: + scope_targets["@mycorp"] = [link_targets[-1]] + else: + scope_targets["@mycorp"].append(link_targets[-1]) if is_root: _npm_package_store( @@ -2442,7 +2552,10 @@ def npm_link_all_packages(name = "node_modules", imported_links = []): tags = ["manual"], ) link_targets.append(":{}/@mycorp/pkg-e".format(name)) - scope_targets["@mycorp"] = scope_targets["@mycorp"] + [link_targets[-1]] if "@mycorp" in scope_targets else [link_targets[-1]] + if "@mycorp" not in scope_targets: + scope_targets["@mycorp"] = [link_targets[-1]] + else: + scope_targets["@mycorp"].append(link_targets[-1]) if is_root: _npm_package_store(