refactor: add explicit types for createBuilder exports

This is necessary as with the new compilation, leveraging pnpm-linked
first party dependencies, there are cases **during migration** where
multiple locations of the same package exist. e.g.

- `@angular_devkit/architect/node_modules/@angular-devkit/core` (pnpm package output)
- `@angular_devkit/core` (plain js sources)

This is fine, and there is no risk of wrong types, and this should only
occur during migration anyway, but it causes a few type issues as
TypeScript is unable to emit proper types for inference. This is okay,
as we'd likely even want to make use of `isolatedDeclarations` at some
point, but we just add explicit types right now.

(also making `Builder` type more type safe, checking assignability
properly).

Author: devversion

.aspect/rules/external_repository_action_cache/npm_translate_lock_MzA5NzUwNzMx

@@ -2,7 +2,9 @@
 # Input hashes for repository rule npm_translate_lock(name = "npm2", pnpm_lock = "@//:pnpm-lock.yaml").
 # This file should be checked into version control along with the pnpm-lock.yaml file.
 .npmrc=-2023857461
-package.json=2030416769
-pnpm-lock.yaml=757562281
-pnpm-workspace.yaml=1711114604
-yarn.lock=-1189684420
+package.json=1373382412
+packages/angular_devkit/architect/package.json=-107274537
+packages/angular_devkit/core/package.json=339935828
+pnpm-lock.yaml=1069382541
+pnpm-workspace.yaml=-1853274682
+yarn.lock=-1457550495

WORKSPACE

@@ -186,6 +186,8 @@ npm_translate_lock(
     data = [
         "//:package.json",
         "//:pnpm-workspace.yaml",
+        "//packages/angular_devkit/architect:package.json",
+        "//packages/angular_devkit/core:package.json",
     ],
     npmrc = "//:.npmrc",
     patches = {
@@ -225,3 +227,15 @@ http_file(
     sha256 = "5a5c46846ecda83e05b9da26f1672ad51c59bce08fed88419850d0e29c993b30",
     urls = ["https://raw.githubusercontent.com/devversion/rules_angular/4b7532ba2b29078d005899cd15b415593d03cceb/dist/worker.mjs"],
 )
+
+http_archive(
+    name = "aspect_rules_jasmine",
+    sha256 = "0d2f9c977842685895020cac721d8cc4f1b37aae15af46128cf619741dc61529",
+    strip_prefix = "rules_jasmine-2.0.0",
+    url = "https://github.com/aspect-build/rules_jasmine/releases/download/v2.0.0/rules_jasmine-v2.0.0.tar.gz",
+)
+
+load("@aspect_rules_jasmine//jasmine:dependencies.bzl", "rules_jasmine_dependencies")
+
+# Fetch dependencies which users need as well
+rules_jasmine_dependencies()

package.json

@@ -91,6 +91,7 @@
     "@types/http-proxy": "^1.17.4",
     "@types/ini": "^4.0.0",
     "@types/jasmine": "~5.1.0",
+    "@types/jasmine-reporters": "^2",
     "@types/karma": "^6.3.0",
     "@types/less": "^3.0.3",
     "@types/loader-utils": "^2.0.0",
@@ -141,6 +142,7 @@
     "istanbul-lib-instrument": "6.0.3",
     "jasmine": "^5.0.0",
     "jasmine-core": "~5.5.0",
+    "jasmine-reporters": "^2.5.2",
     "jasmine-spec-reporter": "~7.0.0",
     "jsonc-parser": "3.3.1",
     "karma": "~6.4.0",

packages/angular/build/src/builders/application/index.ts

@@ -259,4 +259,6 @@ function generateFullPath(
   return fullFilePath;
 }
 
-export default createBuilder(buildApplication);
+export default createBuilder(buildApplication) as ReturnType<
+  typeof createBuilder<ApplicationBuilderOptions>
+> as ReturnType<typeof createBuilder<ApplicationBuilderOptions>>;

packages/angular/build/src/builders/dev-server/index.ts

@@ -16,7 +16,9 @@ export {
   type DevServerBuilderOutput,
   execute as executeDevServerBuilder,
 };
-export default createBuilder<DevServerBuilderOptions, DevServerBuilderOutput>(execute);
+export default createBuilder<DevServerBuilderOptions, DevServerBuilderOutput>(
+  execute,
+) as ReturnType<typeof createBuilder<DevServerBuilderOptions, DevServerBuilderOutput>>;
 
 // Temporary export to support specs
 export { execute as executeDevServer };

packages/angular/build/src/builders/extract-i18n/index.ts

@@ -11,4 +11,6 @@ import { execute } from './builder';
 import type { Schema as ExtractI18nBuilderOptions } from './schema';
 
 export { ExtractI18nBuilderOptions, execute };
-export default createBuilder<ExtractI18nBuilderOptions>(execute);
+export default createBuilder<ExtractI18nBuilderOptions>(execute) as ReturnType<
+  typeof createBuilder<ExtractI18nBuilderOptions>
+>;

packages/angular/build/src/builders/ng-packagr/index.ts

@@ -11,4 +11,6 @@ import { execute } from './builder';
 import type { Schema as NgPackagrBuilderOptions } from './schema';
 
 export { type NgPackagrBuilderOptions, execute };
-export default createBuilder<NgPackagrBuilderOptions>(execute);
+export default createBuilder<NgPackagrBuilderOptions>(execute) as ReturnType<
+  typeof createBuilder<NgPackagrBuilderOptions>
+>;

packages/angular_devkit/architect/BUILD.bazel

@@ -4,13 +4,15 @@
 # found in the LICENSE file at https://angular.dev/license
 
 load("@npm//@angular/build-tooling/bazel/api-golden:index.bzl", "api_golden_test_npm_package")
-load("@npm//@bazel/jasmine:index.bzl", "jasmine_node_test")
-load("//tools:defaults2.bzl", "npm_package", "ts_project")
+load("@npm2//:defs.bzl", "npm_link_all_packages")
+load("//tools:defaults2.bzl", "jasmine_test", "npm_package", "ts_project")
 load("//tools:ts_json_schema.bzl", "ts_json_schema")
 
+package(default_visibility = ["//visibility:public"])
+
 licenses(["notice"])
 
-package(default_visibility = ["//visibility:public"])
+npm_link_all_packages()
 
 ts_json_schema(
     name = "builder_input_schema",
@@ -66,10 +68,9 @@ ts_project(
     data = JSON_FILES,
     module_name = "@angular-devkit/architect",
     deps = [
+        ":node_modules/@angular-devkit/core",
         "//:node_modules/@types/node",
         "//:node_modules/rxjs",
-        "//packages/angular_devkit/core:core_rjs",
-        "//packages/angular_devkit/core/node:node_rjs",
     ],
 )
 
@@ -79,16 +80,16 @@ ts_project(
     srcs = glob(["src/**/*_spec.ts"]),
     deps = [
         ":architect_rjs",
+        ":node_modules/@angular-devkit/core",
         "//:node_modules/@types/jasmine",
         "//:node_modules/rxjs",
         "//packages/angular_devkit/architect/testing:testing_rjs",
-        "//packages/angular_devkit/core:core_rjs",
     ],
 )
 
-jasmine_node_test(
+jasmine_test(
     name = "architect_test",
-    srcs = [":architect_test_lib"],
+    data = [":architect_test_lib_rjs"],
 )
 
 # @external_begin

packages/angular_devkit/architect/src/create-builder.ts

@@ -252,6 +252,8 @@ export function createBuilder<OptT = json.JsonObject, OutT extends BuilderOutput
     handler,
     [BuilderSymbol]: true,
     [BuilderVersionSymbol]: require('../package.json').version,
+    // Only needed for type safety around `Builder` types.
+    __OptionT: null!,
   };
 }
 

packages/angular_devkit/architect/src/internal.ts

@@ -57,6 +57,7 @@ export interface Builder<OptionT extends json.JsonObject = json.JsonObject> {
   // Metadata associated with this builder.
   [BuilderSymbol]: true;
   [BuilderVersionSymbol]: string;
+  __OptionT: OptionT;
 }
 
 export interface ArchitectHost<BuilderInfoT extends BuilderInfo = BuilderInfo> {