build: flatten golden files directory (#22967)

Currently all the golden files for primary entry points are at the root which makes them easy to find, but the ones for secondary entry points are in sub-directories and all have the same name (`autocomplete/testing.d.ts`, `button/testing.d.ts` etc.) which is hard to look up and looks weird when browsing through the file system. These changes flatten the directory so that the testing files are next to their entry points. (cherry picked from commit 766b07e)
angular · Jun 16, 2021 · 8dbdd4e · 8dbdd4e
1 parent 3675a24
commit 8dbdd4e
Show file tree

Hide file tree

Showing 40 changed files with 8 additions and 4 deletions.
diff --git a/...lic_api_guard/cdk/testing/protractor.d.ts → ...lic_api_guard/cdk/testing-protractor.d.ts b/...lic_api_guard/cdk/testing/protractor.d.ts → ...lic_api_guard/cdk/testing-protractor.d.ts
diff --git a/...guard/cdk/testing/selenium-webdriver.d.ts → ...guard/cdk/testing-selenium-webdriver.d.ts b/...guard/cdk/testing/selenium-webdriver.d.ts → ...guard/cdk/testing-selenium-webdriver.d.ts
diff --git a/...public_api_guard/cdk/testing/testbed.d.ts → ...public_api_guard/cdk/testing-testbed.d.ts b/...public_api_guard/cdk/testing/testbed.d.ts → ...public_api_guard/cdk/testing-testbed.d.ts
diff --git a/tools/public_api_guard/generate-guard-tests.bzl b/tools/public_api_guard/generate-guard-tests.bzl
@@ -7,15 +7,19 @@ load("@npm//ts-api-guardian:index.bzl", "ts_api_guardian_test")
   against the associated source entry point.
 """
 
-def generate_test_targets(golden_files):
-    for golden_file in golden_files:
+def generate_test_targets(targets):
+    for target_name in targets:
         # Splits the path that is relative to the current directory into the package name and
         # entry point tail path. The package name is always the first path segment (e.g. "cdk/")
-        [package_name, entry_point_tail] = golden_file.split("/", 1)
+        [package_name, entry_point_tail] = target_name.split("/", 1)
 
         # Name of the entry-point (e.g. "a11y", "drag-drop", "platform")
         entry_point = entry_point_tail[:-len(".d.ts")]
 
+        # Name of the .d.ts file that will be produced. We replace the slashes in the entry
+        # point name with underscores so that we can get a flat directory of golden files.
+        golden_file = "%s/%s" % (package_name, entry_point_tail.replace("/", "-"))
+
         # Construct the path to the given entry-point. Note that we also need to find a way to
         # allow guards for the primary entry-point of a package. e.g. "//src/cdk:cdk" should be also
         # validated. We achieve this by checking if the package_name is equal to the entry_point name.
@@ -24,7 +28,7 @@ def generate_test_targets(golden_files):
 
         # Create the test rule that compares the build output with the golden file.
         ts_api_guardian_test(
-            name = "%s_api" % golden_file,
+            name = "%s_api" % target_name,
             actual = "angular_material/src/%s/index.d.ts" % entry_point_path,
             data = [golden_file] + [
                 "//src/%s" % (entry_point_path),

diff --git a/..._guard/material/autocomplete/testing.d.ts → ..._guard/material/autocomplete-testing.d.ts b/..._guard/material/autocomplete/testing.d.ts → ..._guard/material/autocomplete-testing.d.ts
diff --git a/...lic_api_guard/material/badge/testing.d.ts → ...lic_api_guard/material/badge-testing.d.ts b/...lic_api_guard/material/badge/testing.d.ts → ...lic_api_guard/material/badge-testing.d.ts
diff --git a/..._guard/material/bottom-sheet/testing.d.ts → ..._guard/material/bottom-sheet-testing.d.ts b/..._guard/material/bottom-sheet/testing.d.ts → ..._guard/material/bottom-sheet-testing.d.ts
diff --git a/...ic_api_guard/material/button/testing.d.ts → ...ic_api_guard/material/button-testing.d.ts b/...ic_api_guard/material/button/testing.d.ts → ...ic_api_guard/material/button-testing.d.ts
diff --git a/...guard/material/button-toggle/testing.d.ts → ...guard/material/button-toggle-testing.d.ts b/...guard/material/button-toggle/testing.d.ts → ...guard/material/button-toggle-testing.d.ts
diff --git a/...blic_api_guard/material/card/testing.d.ts → ...blic_api_guard/material/card-testing.d.ts b/...blic_api_guard/material/card/testing.d.ts → ...blic_api_guard/material/card-testing.d.ts
diff --git a/..._api_guard/material/checkbox/testing.d.ts → ..._api_guard/material/checkbox-testing.d.ts b/..._api_guard/material/checkbox/testing.d.ts → ..._api_guard/material/checkbox-testing.d.ts
diff --git a/...lic_api_guard/material/chips/testing.d.ts → ...lic_api_guard/material/chips-testing.d.ts b/...lic_api_guard/material/chips/testing.d.ts → ...lic_api_guard/material/chips-testing.d.ts
diff --git a/...blic_api_guard/material/core/testing.d.ts → ...blic_api_guard/material/core-testing.d.ts b/...blic_api_guard/material/core/testing.d.ts → ...blic_api_guard/material/core-testing.d.ts
diff --git a/...pi_guard/material/datepicker/testing.d.ts → ...pi_guard/material/datepicker-testing.d.ts b/...pi_guard/material/datepicker/testing.d.ts → ...pi_guard/material/datepicker-testing.d.ts
diff --git a/...ic_api_guard/material/dialog/testing.d.ts → ...ic_api_guard/material/dialog-testing.d.ts b/...ic_api_guard/material/dialog/testing.d.ts → ...ic_api_guard/material/dialog-testing.d.ts
diff --git a/...c_api_guard/material/divider/testing.d.ts → ...c_api_guard/material/divider-testing.d.ts b/...c_api_guard/material/divider/testing.d.ts → ...c_api_guard/material/divider-testing.d.ts
diff --git a/...api_guard/material/expansion/testing.d.ts → ...api_guard/material/expansion-testing.d.ts b/...api_guard/material/expansion/testing.d.ts → ...api_guard/material/expansion-testing.d.ts
diff --git a/.../material/form-field/testing/control.d.ts → .../material/form-field-testing-control.d.ts b/.../material/form-field/testing/control.d.ts → .../material/form-field-testing-control.d.ts
diff --git a/...pi_guard/material/form-field/testing.d.ts → ...pi_guard/material/form-field-testing.d.ts b/...pi_guard/material/form-field/testing.d.ts → ...pi_guard/material/form-field-testing.d.ts
diff --git a/...api_guard/material/grid-list/testing.d.ts → ...api_guard/material/grid-list-testing.d.ts b/...api_guard/material/grid-list/testing.d.ts → ...api_guard/material/grid-list-testing.d.ts
diff --git a/...blic_api_guard/material/icon/testing.d.ts → ...blic_api_guard/material/icon-testing.d.ts b/...blic_api_guard/material/icon/testing.d.ts → ...blic_api_guard/material/icon-testing.d.ts
diff --git a/...lic_api_guard/material/input/testing.d.ts → ...lic_api_guard/material/input-testing.d.ts b/...lic_api_guard/material/input/testing.d.ts → ...lic_api_guard/material/input-testing.d.ts
diff --git a/...blic_api_guard/material/list/testing.d.ts → ...blic_api_guard/material/list-testing.d.ts b/...blic_api_guard/material/list/testing.d.ts → ...blic_api_guard/material/list-testing.d.ts
diff --git a/...blic_api_guard/material/menu/testing.d.ts → ...blic_api_guard/material/menu-testing.d.ts b/...blic_api_guard/material/menu/testing.d.ts → ...blic_api_guard/material/menu-testing.d.ts
diff --git a/...api_guard/material/paginator/testing.d.ts → ...api_guard/material/paginator-testing.d.ts b/...api_guard/material/paginator/testing.d.ts → ...api_guard/material/paginator-testing.d.ts
diff --git a/..._guard/material/progress-bar/testing.d.ts → ..._guard/material/progress-bar-testing.d.ts b/..._guard/material/progress-bar/testing.d.ts → ..._guard/material/progress-bar-testing.d.ts
diff --git a/...rd/material/progress-spinner/testing.d.ts → ...rd/material/progress-spinner-testing.d.ts b/...rd/material/progress-spinner/testing.d.ts → ...rd/material/progress-spinner-testing.d.ts
diff --git a/...lic_api_guard/material/radio/testing.d.ts → ...lic_api_guard/material/radio-testing.d.ts b/...lic_api_guard/material/radio/testing.d.ts → ...lic_api_guard/material/radio-testing.d.ts
diff --git a/...ic_api_guard/material/select/testing.d.ts → ...ic_api_guard/material/select-testing.d.ts b/...ic_api_guard/material/select/testing.d.ts → ...ic_api_guard/material/select-testing.d.ts
diff --git a/...c_api_guard/material/sidenav/testing.d.ts → ...c_api_guard/material/sidenav-testing.d.ts b/...c_api_guard/material/sidenav/testing.d.ts → ...c_api_guard/material/sidenav-testing.d.ts
diff --git a/..._guard/material/slide-toggle/testing.d.ts → ..._guard/material/slide-toggle-testing.d.ts b/..._guard/material/slide-toggle/testing.d.ts → ..._guard/material/slide-toggle-testing.d.ts
diff --git a/...ic_api_guard/material/slider/testing.d.ts → ...ic_api_guard/material/slider-testing.d.ts b/...ic_api_guard/material/slider/testing.d.ts → ...ic_api_guard/material/slider-testing.d.ts
diff --git a/...api_guard/material/snack-bar/testing.d.ts → ...api_guard/material/snack-bar-testing.d.ts b/...api_guard/material/snack-bar/testing.d.ts → ...api_guard/material/snack-bar-testing.d.ts
diff --git a/...blic_api_guard/material/sort/testing.d.ts → ...blic_api_guard/material/sort-testing.d.ts b/...blic_api_guard/material/sort/testing.d.ts → ...blic_api_guard/material/sort-testing.d.ts
diff --git a/...c_api_guard/material/stepper/testing.d.ts → ...c_api_guard/material/stepper-testing.d.ts b/...c_api_guard/material/stepper/testing.d.ts → ...c_api_guard/material/stepper-testing.d.ts
diff --git a/...lic_api_guard/material/table/testing.d.ts → ...lic_api_guard/material/table-testing.d.ts b/...lic_api_guard/material/table/testing.d.ts → ...lic_api_guard/material/table-testing.d.ts
diff --git a/...blic_api_guard/material/tabs/testing.d.ts → ...blic_api_guard/material/tabs-testing.d.ts b/...blic_api_guard/material/tabs/testing.d.ts → ...blic_api_guard/material/tabs-testing.d.ts
diff --git a/...c_api_guard/material/toolbar/testing.d.ts → ...c_api_guard/material/toolbar-testing.d.ts b/...c_api_guard/material/toolbar/testing.d.ts → ...c_api_guard/material/toolbar-testing.d.ts
diff --git a/...c_api_guard/material/tooltip/testing.d.ts → ...c_api_guard/material/tooltip-testing.d.ts b/...c_api_guard/material/tooltip/testing.d.ts → ...c_api_guard/material/tooltip-testing.d.ts
diff --git a/...blic_api_guard/material/tree/testing.d.ts → ...blic_api_guard/material/tree-testing.d.ts b/...blic_api_guard/material/tree/testing.d.ts → ...blic_api_guard/material/tree-testing.d.ts