@angular-devkit/build-angular 17.0.0-next.9 → 17.0.0-rc.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (244) hide show
  1. package/package.json +13 -13
  2. package/plugins/karma.js +0 -1
  3. package/src/builders/app-shell/index.js +8 -6
  4. package/src/builders/app-shell/render-worker.js +0 -1
  5. package/src/builders/app-shell/schema.js +0 -1
  6. package/src/builders/application/build-action.js +0 -1
  7. package/src/builders/application/execute-build.js +37 -14
  8. package/src/builders/application/execute-post-bundle.d.ts +1 -0
  9. package/src/builders/application/execute-post-bundle.js +5 -3
  10. package/src/builders/application/i18n.d.ts +1 -0
  11. package/src/builders/application/i18n.js +4 -2
  12. package/src/builders/application/index.js +8 -2
  13. package/src/builders/application/options.d.ts +1 -1
  14. package/src/builders/application/options.js +3 -3
  15. package/src/builders/application/schema.d.ts +15 -5
  16. package/src/builders/application/schema.js +0 -1
  17. package/src/builders/application/schema.json +10 -4
  18. package/src/builders/browser/index.js +0 -1
  19. package/src/builders/browser/schema.js +0 -1
  20. package/src/builders/browser-esbuild/builder-status-warnings.js +0 -1
  21. package/src/builders/browser-esbuild/index.js +14 -13
  22. package/src/builders/browser-esbuild/schema.js +0 -1
  23. package/src/builders/dev-server/builder.js +0 -1
  24. package/src/builders/dev-server/index.js +0 -1
  25. package/src/builders/dev-server/load-proxy-config.js +0 -1
  26. package/src/builders/dev-server/options.js +0 -1
  27. package/src/builders/dev-server/schema.js +0 -1
  28. package/src/builders/dev-server/vite-server.d.ts +5 -2
  29. package/src/builders/dev-server/vite-server.js +78 -45
  30. package/src/builders/dev-server/webpack-server.js +0 -1
  31. package/src/builders/extract-i18n/application-extraction.js +0 -1
  32. package/src/builders/extract-i18n/builder.js +0 -1
  33. package/src/builders/extract-i18n/empty-loader.js +0 -1
  34. package/src/builders/extract-i18n/index.js +0 -1
  35. package/src/builders/extract-i18n/ivy-extract-loader.js +0 -1
  36. package/src/builders/extract-i18n/options.js +0 -1
  37. package/src/builders/extract-i18n/schema.js +0 -1
  38. package/src/builders/extract-i18n/webpack-extraction.js +0 -1
  39. package/src/builders/jest/index.js +0 -1
  40. package/src/builders/jest/options.js +0 -1
  41. package/src/builders/jest/schema.js +0 -1
  42. package/src/builders/jest/test-files.js +0 -1
  43. package/src/builders/karma/find-tests-plugin.js +0 -1
  44. package/src/builders/karma/index.js +0 -1
  45. package/src/builders/karma/schema.js +0 -1
  46. package/src/builders/ng-packagr/index.js +0 -1
  47. package/src/builders/ng-packagr/schema.js +0 -1
  48. package/src/builders/prerender/index.js +2 -1
  49. package/src/builders/prerender/render-worker.js +2 -3
  50. package/src/builders/prerender/routes-extractor-worker.js +1 -2
  51. package/src/builders/prerender/schema.d.ts +4 -2
  52. package/src/builders/prerender/schema.js +0 -1
  53. package/src/builders/prerender/schema.json +2 -2
  54. package/src/builders/protractor/index.js +0 -1
  55. package/src/builders/protractor/schema.js +0 -1
  56. package/src/builders/server/index.js +0 -1
  57. package/src/builders/server/platform-server-exports-loader.js +0 -1
  58. package/src/builders/server/schema.js +0 -1
  59. package/src/builders/ssr-dev-server/index.js +0 -1
  60. package/src/builders/ssr-dev-server/schema.js +0 -1
  61. package/src/builders/ssr-dev-server/utils.js +0 -1
  62. package/src/index.js +0 -1
  63. package/src/tools/babel/plugins/adjust-static-class-members.js +0 -1
  64. package/src/tools/babel/plugins/adjust-typescript-enums.js +0 -1
  65. package/src/tools/babel/plugins/elide-angular-metadata.js +0 -1
  66. package/src/tools/babel/plugins/pure-toplevel-functions.js +0 -1
  67. package/src/tools/babel/presets/application.js +0 -1
  68. package/src/tools/babel/webpack-loader.js +0 -1
  69. package/src/tools/esbuild/angular/angular-host.js +0 -1
  70. package/src/tools/esbuild/angular/compilation/angular-compilation.d.ts +6 -3
  71. package/src/tools/esbuild/angular/compilation/angular-compilation.js +36 -9
  72. package/src/tools/esbuild/angular/compilation/aot-compilation.js +2 -1
  73. package/src/tools/esbuild/angular/compilation/factory.d.ts +16 -0
  74. package/src/tools/esbuild/angular/compilation/factory.js +56 -0
  75. package/src/tools/esbuild/angular/compilation/index.d.ts +1 -2
  76. package/src/tools/esbuild/angular/compilation/index.js +3 -6
  77. package/src/tools/esbuild/angular/compilation/jit-compilation.js +0 -1
  78. package/src/tools/esbuild/angular/compilation/noop-compilation.d.ts +1 -1
  79. package/src/tools/esbuild/angular/compilation/noop-compilation.js +0 -1
  80. package/src/tools/esbuild/angular/compilation/parallel-compilation.d.ts +42 -0
  81. package/src/tools/esbuild/angular/compilation/parallel-compilation.js +121 -0
  82. package/src/tools/esbuild/angular/compilation/parallel-worker.d.ts +32 -0
  83. package/src/tools/esbuild/angular/compilation/parallel-worker.js +90 -0
  84. package/src/tools/esbuild/angular/compilation-state.js +0 -1
  85. package/src/tools/esbuild/angular/compiler-plugin.d.ts +1 -0
  86. package/src/tools/esbuild/angular/compiler-plugin.js +111 -52
  87. package/src/tools/esbuild/angular/component-stylesheets.d.ts +3 -3
  88. package/src/tools/esbuild/angular/component-stylesheets.js +47 -32
  89. package/src/tools/esbuild/angular/diagnostics.d.ts +2 -2
  90. package/src/tools/esbuild/angular/diagnostics.js +9 -15
  91. package/src/tools/esbuild/angular/file-reference-tracker.d.ts +17 -0
  92. package/src/tools/esbuild/angular/file-reference-tracker.js +53 -0
  93. package/src/tools/esbuild/angular/jit-plugin-callbacks.d.ts +6 -3
  94. package/src/tools/esbuild/angular/jit-plugin-callbacks.js +4 -5
  95. package/src/tools/esbuild/angular/jit-resource-transformer.js +0 -1
  96. package/src/tools/esbuild/angular/source-file-cache.d.ts +1 -1
  97. package/src/tools/esbuild/angular/source-file-cache.js +3 -2
  98. package/src/tools/esbuild/angular/uri.js +0 -1
  99. package/src/tools/esbuild/angular/web-worker-transformer.js +0 -1
  100. package/src/tools/esbuild/application-code-bundle.d.ts +2 -0
  101. package/src/tools/esbuild/application-code-bundle.js +209 -150
  102. package/src/tools/esbuild/budget-stats.js +0 -1
  103. package/src/tools/esbuild/bundler-context.d.ts +12 -1
  104. package/src/tools/esbuild/bundler-context.js +105 -10
  105. package/src/tools/esbuild/bundler-execution-result.d.ts +19 -0
  106. package/src/tools/esbuild/bundler-execution-result.js +18 -3
  107. package/src/tools/esbuild/commonjs-checker.js +3 -1
  108. package/src/tools/esbuild/compiler-plugin-options.js +1 -1
  109. package/src/tools/esbuild/global-scripts.js +0 -1
  110. package/src/tools/esbuild/global-styles.js +0 -1
  111. package/src/tools/esbuild/i18n-inliner-worker.js +0 -1
  112. package/src/tools/esbuild/i18n-inliner.js +2 -1
  113. package/src/tools/esbuild/i18n-locale-plugin.js +0 -1
  114. package/src/tools/esbuild/index-html-generator.js +25 -3
  115. package/src/tools/esbuild/javascript-transfomer-plugin.d.ts +19 -0
  116. package/src/tools/esbuild/javascript-transfomer-plugin.js +51 -0
  117. package/src/tools/esbuild/javascript-transformer-worker.js +0 -1
  118. package/src/tools/esbuild/javascript-transformer.d.ts +1 -1
  119. package/src/tools/esbuild/javascript-transformer.js +5 -1
  120. package/src/tools/esbuild/license-extractor.js +0 -1
  121. package/src/tools/esbuild/load-result-cache.d.ts +2 -0
  122. package/src/tools/esbuild/load-result-cache.js +3 -1
  123. package/src/tools/esbuild/profiling.js +0 -1
  124. package/src/tools/esbuild/rxjs-esm-resolution-plugin.js +0 -1
  125. package/src/tools/esbuild/sourcemap-ignorelist-plugin.js +0 -1
  126. package/src/tools/esbuild/stylesheets/bundle-options.js +0 -1
  127. package/src/tools/esbuild/stylesheets/css-language.js +0 -1
  128. package/src/tools/esbuild/stylesheets/css-resource-plugin.js +25 -7
  129. package/src/tools/esbuild/stylesheets/less-language.js +0 -1
  130. package/src/tools/esbuild/stylesheets/sass-language.js +6 -20
  131. package/src/tools/esbuild/stylesheets/stylesheet-plugin-factory.js +25 -11
  132. package/src/tools/esbuild/utils.d.ts +4 -4
  133. package/src/tools/esbuild/utils.js +47 -34
  134. package/src/tools/esbuild/virtual-module-plugin.d.ts +3 -0
  135. package/src/tools/esbuild/virtual-module-plugin.js +3 -3
  136. package/src/tools/esbuild/watcher.js +0 -1
  137. package/src/tools/sass/lexer.js +0 -1
  138. package/src/tools/sass/rebasing-importer.d.ts +3 -8
  139. package/src/tools/sass/rebasing-importer.js +3 -52
  140. package/src/tools/sass/sass-service-legacy.js +0 -1
  141. package/src/tools/sass/sass-service.d.ts +1 -17
  142. package/src/tools/sass/sass-service.js +4 -6
  143. package/src/tools/sass/worker-legacy.js +0 -1
  144. package/src/tools/sass/worker.js +8 -2
  145. package/src/tools/vite/i18n-locale-plugin.js +0 -1
  146. package/src/tools/webpack/configs/common.js +0 -1
  147. package/src/tools/webpack/configs/dev-server.js +0 -1
  148. package/src/tools/webpack/configs/index.js +0 -1
  149. package/src/tools/webpack/configs/styles.js +6 -12
  150. package/src/tools/webpack/plugins/any-component-style-budget-checker.js +0 -1
  151. package/src/tools/webpack/plugins/builder-watch-plugin.js +0 -1
  152. package/src/tools/webpack/plugins/common-js-usage-warn-plugin.js +0 -1
  153. package/src/tools/webpack/plugins/css-optimizer-plugin.js +0 -1
  154. package/src/tools/webpack/plugins/dedupe-module-resolve-plugin.js +0 -1
  155. package/src/tools/webpack/plugins/devtools-ignore-plugin.js +0 -1
  156. package/src/tools/webpack/plugins/esbuild-executor.js +0 -1
  157. package/src/tools/webpack/plugins/hmr/hmr-accept.js +0 -1
  158. package/src/tools/webpack/plugins/hmr/hmr-loader.js +0 -1
  159. package/src/tools/webpack/plugins/index-html-webpack-plugin.js +0 -1
  160. package/src/tools/webpack/plugins/index.js +0 -1
  161. package/src/tools/webpack/plugins/javascript-optimizer-plugin.js +2 -1
  162. package/src/tools/webpack/plugins/javascript-optimizer-worker.js +0 -1
  163. package/src/tools/webpack/plugins/json-stats-plugin.js +0 -1
  164. package/src/tools/webpack/plugins/karma/karma.js +0 -1
  165. package/src/tools/webpack/plugins/named-chunks-plugin.js +0 -1
  166. package/src/tools/webpack/plugins/occurrences-plugin.js +0 -1
  167. package/src/tools/webpack/plugins/postcss-cli-resources.js +0 -1
  168. package/src/tools/webpack/plugins/progress-plugin.js +0 -1
  169. package/src/tools/webpack/plugins/remove-hash-plugin.js +0 -1
  170. package/src/tools/webpack/plugins/scripts-webpack-plugin.js +0 -1
  171. package/src/tools/webpack/plugins/service-worker-plugin.js +0 -1
  172. package/src/tools/webpack/plugins/styles-webpack-plugin.js +0 -1
  173. package/src/tools/webpack/plugins/suppress-entry-chunks-webpack-plugin.js +0 -1
  174. package/src/tools/webpack/plugins/transfer-size-plugin.js +0 -1
  175. package/src/tools/webpack/plugins/typescript.js +0 -1
  176. package/src/tools/webpack/plugins/watch-files-logs-plugin.js +0 -1
  177. package/src/tools/webpack/utils/async-chunks.js +0 -1
  178. package/src/tools/webpack/utils/helpers.js +0 -1
  179. package/src/tools/webpack/utils/stats.js +0 -1
  180. package/src/transforms.js +0 -1
  181. package/src/utils/action-executor.js +5 -2
  182. package/src/utils/build-options.js +0 -1
  183. package/src/utils/bundle-calculator.js +0 -1
  184. package/src/utils/bundle-inline-options.js +0 -1
  185. package/src/utils/check-port.js +0 -1
  186. package/src/utils/color.js +0 -1
  187. package/src/utils/copy-assets.js +0 -1
  188. package/src/utils/default-progress.js +0 -1
  189. package/src/utils/delete-output-dir.js +0 -1
  190. package/src/utils/environment-options.d.ts +1 -0
  191. package/src/utils/environment-options.js +3 -2
  192. package/src/utils/error.js +0 -1
  193. package/src/utils/i18n-inlining.js +0 -1
  194. package/src/utils/i18n-options.js +0 -1
  195. package/src/utils/index-file/augment-index-html.js +0 -1
  196. package/src/utils/index-file/html-rewriting-stream.js +0 -1
  197. package/src/utils/index-file/index-html-generator.js +0 -1
  198. package/src/utils/index-file/inline-critical-css.js +5 -3
  199. package/src/utils/index-file/inline-fonts.js +0 -1
  200. package/src/utils/index-file/style-nonce.js +0 -1
  201. package/src/utils/index.js +0 -1
  202. package/src/utils/load-esm.js +0 -1
  203. package/src/utils/load-translations.js +0 -1
  204. package/src/utils/normalize-asset-patterns.js +0 -1
  205. package/src/utils/normalize-builder-schema.js +0 -1
  206. package/src/utils/normalize-cache.js +0 -1
  207. package/src/utils/normalize-file-replacements.js +0 -1
  208. package/src/utils/normalize-optimization.js +0 -1
  209. package/src/utils/normalize-polyfills.js +0 -1
  210. package/src/utils/normalize-source-maps.js +0 -1
  211. package/src/utils/output-paths.js +0 -1
  212. package/src/utils/package-chunk-sort.js +0 -1
  213. package/src/utils/package-version.js +0 -1
  214. package/src/utils/process-bundle.js +0 -1
  215. package/src/utils/purge-cache.js +0 -1
  216. package/src/utils/read-tsconfig.js +0 -1
  217. package/src/utils/routes-extractor/extractor.d.ts +1 -1
  218. package/src/utils/routes-extractor/extractor.js +20 -8
  219. package/src/utils/run-module-as-observable-fork.js +0 -1
  220. package/src/utils/server-rendering/esm-in-memory-loader/loader-hooks.js +0 -1
  221. package/src/utils/server-rendering/esm-in-memory-loader/node-18-utils.js +0 -1
  222. package/src/utils/server-rendering/esm-in-memory-loader/register-hooks.js +0 -1
  223. package/src/utils/server-rendering/main-bundle-exports.d.ts +7 -3
  224. package/src/utils/server-rendering/main-bundle-exports.js +0 -1
  225. package/src/utils/server-rendering/prerender-server.d.ts +21 -0
  226. package/src/utils/server-rendering/prerender-server.js +102 -0
  227. package/src/utils/server-rendering/prerender.d.ts +3 -1
  228. package/src/utils/server-rendering/prerender.js +84 -22
  229. package/src/utils/server-rendering/render-page.d.ts +2 -2
  230. package/src/utils/server-rendering/render-page.js +42 -4
  231. package/src/utils/server-rendering/render-worker.d.ts +2 -0
  232. package/src/utils/server-rendering/render-worker.js +9 -3
  233. package/src/utils/server-rendering/routes-extractor-worker.d.ts +2 -0
  234. package/src/utils/server-rendering/routes-extractor-worker.js +4 -4
  235. package/src/utils/service-worker.js +0 -1
  236. package/src/utils/spinner.js +0 -1
  237. package/src/utils/strip-bom.js +0 -1
  238. package/src/utils/supported-browsers.js +0 -1
  239. package/src/utils/tailwind.js +0 -1
  240. package/src/utils/tty.js +0 -1
  241. package/src/utils/url.js +0 -1
  242. package/src/utils/version.js +0 -1
  243. package/src/utils/webpack-browser-config.js +0 -1
  244. package/src/utils/webpack-diagnostics.js +0 -1
@@ -38,13 +38,13 @@ const node_assert_1 = __importDefault(require("node:assert"));
38
38
  const promises_1 = require("node:fs/promises");
39
39
  const path = __importStar(require("node:path"));
40
40
  const node_url_1 = require("node:url");
41
- const typescript_1 = __importDefault(require("typescript"));
42
41
  const environment_options_1 = require("../../../utils/environment-options");
43
42
  const javascript_transformer_1 = require("../javascript-transformer");
44
43
  const profiling_1 = require("../profiling");
45
44
  const compilation_1 = require("./compilation");
46
45
  const compilation_state_1 = require("./compilation-state");
47
46
  const component_stylesheets_1 = require("./component-stylesheets");
47
+ const file_reference_tracker_1 = require("./file-reference-tracker");
48
48
  const jit_plugin_callbacks_1 = require("./jit-plugin-callbacks");
49
49
  // eslint-disable-next-line max-lines-per-function
50
50
  function createCompilerPlugin(pluginOptions, styleOptions) {
@@ -72,20 +72,20 @@ function createCompilerPlugin(pluginOptions, styleOptions) {
72
72
  // A string value indicates direct TS/NG output and a Uint8Array indicates fully transformed code.
73
73
  const typeScriptFileCache = pluginOptions.sourceFileCache?.typeScriptFileCache ??
74
74
  new Map();
75
- // The stylesheet resources from component stylesheets that will be added to the build results output files
76
- let additionalOutputFiles = [];
77
- let additionalMetafiles;
75
+ // The resources from component stylesheets and web workers that will be added to the build results output files
76
+ const additionalResults = new Map();
78
77
  // Create new reusable compilation for the appropriate mode based on the `jit` plugin option
79
78
  const compilation = pluginOptions.noopTypeScriptCompilation
80
79
  ? new compilation_1.NoopCompilation()
81
- : pluginOptions.jit
82
- ? new compilation_1.JitCompilation()
83
- : new compilation_1.AotCompilation();
80
+ : await (0, compilation_1.createAngularCompilation)(!!pluginOptions.jit);
84
81
  // Determines if TypeScript should process JavaScript files based on tsconfig `allowJs` option
85
82
  let shouldTsIgnoreJs = true;
86
83
  // Track incremental component stylesheet builds
87
- const stylesheetBundler = new component_stylesheets_1.ComponentStylesheetBundler(styleOptions, pluginOptions.loadResultCache);
84
+ const stylesheetBundler = new component_stylesheets_1.ComponentStylesheetBundler(styleOptions, pluginOptions.incremental);
88
85
  let sharedTSCompilationState;
86
+ // To fully invalidate files, track resource referenced files and their referencing source
87
+ const referencedFileTracker = new file_reference_tracker_1.FileReferenceTracker();
88
+ // eslint-disable-next-line max-lines-per-function
89
89
  build.onStart(async () => {
90
90
  sharedTSCompilationState = (0, compilation_state_1.getSharedCompilationState)();
91
91
  if (!(compilation instanceof compilation_1.NoopCompilation)) {
@@ -96,13 +96,27 @@ function createCompilerPlugin(pluginOptions, styleOptions) {
96
96
  };
97
97
  // Reset debug performance tracking
98
98
  (0, profiling_1.resetCumulativeDurations)();
99
- // Reset additional output files
100
- additionalOutputFiles = [];
101
- additionalMetafiles = [];
99
+ // Update the reference tracker and generate a full set of modified files for the
100
+ // Angular compiler which does not have direct knowledge of transitive resource
101
+ // dependencies or web worker processing.
102
+ let modifiedFiles;
103
+ if (pluginOptions.sourceFileCache?.modifiedFiles.size &&
104
+ referencedFileTracker &&
105
+ !pluginOptions.noopTypeScriptCompilation) {
106
+ // TODO: Differentiate between changed input files and stale output files
107
+ modifiedFiles = referencedFileTracker.update(pluginOptions.sourceFileCache.modifiedFiles);
108
+ pluginOptions.sourceFileCache.invalidate(modifiedFiles);
109
+ stylesheetBundler.invalidate(modifiedFiles);
110
+ }
111
+ if (!pluginOptions.noopTypeScriptCompilation &&
112
+ compilation.update &&
113
+ pluginOptions.sourceFileCache?.modifiedFiles.size) {
114
+ await compilation.update(modifiedFiles ?? pluginOptions.sourceFileCache.modifiedFiles);
115
+ }
102
116
  // Create Angular compiler host options
103
117
  const hostOptions = {
104
118
  fileReplacements: pluginOptions.fileReplacements,
105
- modifiedFiles: pluginOptions.sourceFileCache?.modifiedFiles,
119
+ modifiedFiles,
106
120
  sourceFileCache: pluginOptions.sourceFileCache,
107
121
  async transformStylesheet(data, containingFile, stylesheetFile) {
108
122
  let stylesheetResult;
@@ -113,14 +127,21 @@ function createCompilerPlugin(pluginOptions, styleOptions) {
113
127
  else {
114
128
  stylesheetResult = await stylesheetBundler.bundleInline(data, containingFile, styleOptions.inlineStyleLanguage);
115
129
  }
116
- const { contents, resourceFiles, errors, warnings } = stylesheetResult;
130
+ const { contents, resourceFiles, referencedFiles, errors, warnings } = stylesheetResult;
117
131
  if (errors) {
118
132
  (result.errors ??= []).push(...errors);
119
133
  }
120
134
  (result.warnings ??= []).push(...warnings);
121
- additionalOutputFiles.push(...resourceFiles);
122
- if (stylesheetResult.metafile) {
123
- additionalMetafiles.push(stylesheetResult.metafile);
135
+ additionalResults.set(stylesheetFile ?? containingFile, {
136
+ outputFiles: resourceFiles,
137
+ metafile: stylesheetResult.metafile,
138
+ });
139
+ if (referencedFiles) {
140
+ referencedFileTracker.add(containingFile, referencedFiles);
141
+ if (stylesheetFile) {
142
+ // Angular AOT compiler needs modified direct resource files to correctly invalidate its analysis
143
+ referencedFileTracker.add(stylesheetFile, referencedFiles);
144
+ }
124
145
  }
125
146
  return contents;
126
147
  },
@@ -129,33 +150,25 @@ function createCompilerPlugin(pluginOptions, styleOptions) {
129
150
  // The synchronous API must be used due to the TypeScript compilation currently being
130
151
  // fully synchronous and this process callback being called from within a TypeScript
131
152
  // transformer.
132
- const workerResult = build.esbuild.buildSync({
133
- platform: 'browser',
134
- write: false,
135
- bundle: true,
136
- metafile: true,
137
- format: 'esm',
138
- mainFields: ['es2020', 'es2015', 'browser', 'module', 'main'],
139
- sourcemap: pluginOptions.sourcemap,
140
- entryNames: 'worker-[hash]',
141
- entryPoints: [fullWorkerPath],
142
- absWorkingDir: build.initialOptions.absWorkingDir,
143
- outdir: build.initialOptions.outdir,
144
- minifyIdentifiers: build.initialOptions.minifyIdentifiers,
145
- minifySyntax: build.initialOptions.minifySyntax,
146
- minifyWhitespace: build.initialOptions.minifyWhitespace,
147
- target: build.initialOptions.target,
148
- });
153
+ const workerResult = bundleWebWorker(build, pluginOptions, fullWorkerPath);
149
154
  (result.warnings ??= []).push(...workerResult.warnings);
150
- additionalOutputFiles.push(...workerResult.outputFiles);
151
- if (workerResult.metafile) {
152
- additionalMetafiles.push(workerResult.metafile);
153
- }
154
155
  if (workerResult.errors.length > 0) {
155
156
  (result.errors ??= []).push(...workerResult.errors);
157
+ // Track worker file errors to allow rebuilds on changes
158
+ referencedFileTracker.add(containingFile, workerResult.errors
159
+ .map((error) => error.location?.file)
160
+ .filter((file) => !!file)
161
+ .map((file) => path.join(build.initialOptions.absWorkingDir ?? '', file)));
162
+ additionalResults.set(fullWorkerPath, { errors: result.errors });
156
163
  // Return the original path if the build failed
157
164
  return workerFile;
158
165
  }
166
+ (0, node_assert_1.default)('outputFiles' in workerResult, 'Invalid web worker bundle result.');
167
+ additionalResults.set(fullWorkerPath, {
168
+ outputFiles: workerResult.outputFiles,
169
+ metafile: workerResult.metafile,
170
+ });
171
+ referencedFileTracker.add(containingFile, Object.keys(workerResult.metafile.inputs).map((input) => path.join(build.initialOptions.absWorkingDir ?? '', input)));
159
172
  // Return bundled worker file entry name to be used in the built output
160
173
  const workerCodeFile = workerResult.outputFiles.find((file) => file.path.endsWith('.js'));
161
174
  (0, node_assert_1.default)(workerCodeFile, 'Web Worker bundled code file should always be present.');
@@ -165,12 +178,12 @@ function createCompilerPlugin(pluginOptions, styleOptions) {
165
178
  // Initialize the Angular compilation for the current build.
166
179
  // In watch mode, previous build state will be reused.
167
180
  const { compilerOptions: { allowJs }, referencedFiles, } = await compilation.initialize(tsconfigPath, hostOptions, (compilerOptions) => {
168
- if (compilerOptions.target === undefined ||
169
- compilerOptions.target < typescript_1.default.ScriptTarget.ES2022) {
181
+ // target of 9 is ES2022 (using the number avoids an expensive import of typescript just for an enum)
182
+ if (compilerOptions.target === undefined || compilerOptions.target < 9) {
170
183
  // If 'useDefineForClassFields' is already defined in the users project leave the value as is.
171
184
  // Otherwise fallback to false due to https://github.com/microsoft/TypeScript/issues/45995
172
185
  // which breaks the deprecated `@Effects` NGRX decorator and potentially other existing code as well.
173
- compilerOptions.target = typescript_1.default.ScriptTarget.ES2022;
186
+ compilerOptions.target = 9;
174
187
  compilerOptions.useDefineForClassFields ??= false;
175
188
  // Only add the warning on the initial build
176
189
  setupWarnings?.push({
@@ -185,6 +198,14 @@ function createCompilerPlugin(pluginOptions, styleOptions) {
185
198
  ],
186
199
  });
187
200
  }
201
+ if (compilerOptions.compilationMode === 'partial') {
202
+ setupWarnings?.push({
203
+ text: 'Angular partial compilation mode is not supported when building applications.',
204
+ location: null,
205
+ notes: [{ text: 'Full compilation mode will be used instead.' }],
206
+ });
207
+ compilerOptions.compilationMode = 'full';
208
+ }
188
209
  // Enable incremental compilation by default if caching is enabled
189
210
  if (pluginOptions.sourceFileCache?.persistentCachePath) {
190
211
  compilerOptions.incremental ??= true;
@@ -217,14 +238,24 @@ function createCompilerPlugin(pluginOptions, styleOptions) {
217
238
  (result.warnings ??= []).push(...diagnostics.warnings);
218
239
  }
219
240
  // Update TypeScript file output cache for all affected files
220
- (0, profiling_1.profileSync)('NG_EMIT_TS', () => {
221
- for (const { filename, contents } of compilation.emitAffectedFiles()) {
241
+ await (0, profiling_1.profileAsync)('NG_EMIT_TS', async () => {
242
+ for (const { filename, contents } of await compilation.emitAffectedFiles()) {
222
243
  typeScriptFileCache.set((0, node_url_1.pathToFileURL)(filename).href, contents);
223
244
  }
224
245
  });
246
+ // Add errors from failed additional results.
247
+ // This must be done after emit to capture latest web worker results.
248
+ for (const { errors } of additionalResults.values()) {
249
+ if (errors) {
250
+ (result.errors ??= []).push(...errors);
251
+ }
252
+ }
225
253
  // Store referenced files for updated file watching if enabled
226
254
  if (pluginOptions.sourceFileCache) {
227
- pluginOptions.sourceFileCache.referencedFiles = referencedFiles;
255
+ pluginOptions.sourceFileCache.referencedFiles = [
256
+ ...referencedFiles,
257
+ ...referencedFileTracker.referencedFiles,
258
+ ];
228
259
  }
229
260
  // Reset the setup warnings so that they are only shown during the first build.
230
261
  setupWarnings = undefined;
@@ -283,16 +314,16 @@ function createCompilerPlugin(pluginOptions, styleOptions) {
283
314
  }, true));
284
315
  // Setup bundling of component templates and stylesheets when in JIT mode
285
316
  if (pluginOptions.jit) {
286
- (0, jit_plugin_callbacks_1.setupJitPluginCallbacks)(build, stylesheetBundler, additionalOutputFiles, styleOptions.inlineStyleLanguage);
317
+ (0, jit_plugin_callbacks_1.setupJitPluginCallbacks)(build, stylesheetBundler, additionalResults, styleOptions.inlineStyleLanguage);
287
318
  }
288
319
  build.onEnd((result) => {
289
- // Add any additional output files to the main output files
290
- if (additionalOutputFiles.length) {
291
- result.outputFiles?.push(...additionalOutputFiles);
292
- }
293
- // Combine additional metafiles with main metafile
294
- if (result.metafile && additionalMetafiles.length) {
295
- for (const metafile of additionalMetafiles) {
320
+ for (const { outputFiles, metafile } of additionalResults.values()) {
321
+ // Add any additional output files to the main output files
322
+ if (outputFiles?.length) {
323
+ result.outputFiles?.push(...outputFiles);
324
+ }
325
+ // Combine additional metafiles with main metafile
326
+ if (result.metafile && metafile) {
296
327
  result.metafile.inputs = { ...result.metafile.inputs, ...metafile.inputs };
297
328
  result.metafile.outputs = { ...result.metafile.outputs, ...metafile.outputs };
298
329
  }
@@ -302,11 +333,40 @@ function createCompilerPlugin(pluginOptions, styleOptions) {
302
333
  build.onDispose(() => {
303
334
  sharedTSCompilationState?.dispose();
304
335
  void stylesheetBundler.dispose();
336
+ void compilation.close?.();
305
337
  });
306
338
  },
307
339
  };
308
340
  }
309
341
  exports.createCompilerPlugin = createCompilerPlugin;
342
+ function bundleWebWorker(build, pluginOptions, workerFile) {
343
+ try {
344
+ return build.esbuild.buildSync({
345
+ platform: 'browser',
346
+ write: false,
347
+ bundle: true,
348
+ metafile: true,
349
+ format: 'esm',
350
+ mainFields: ['es2020', 'es2015', 'browser', 'module', 'main'],
351
+ logLevel: 'silent',
352
+ sourcemap: pluginOptions.sourcemap,
353
+ entryNames: 'worker-[hash]',
354
+ entryPoints: [workerFile],
355
+ absWorkingDir: build.initialOptions.absWorkingDir,
356
+ outdir: build.initialOptions.outdir,
357
+ minifyIdentifiers: build.initialOptions.minifyIdentifiers,
358
+ minifySyntax: build.initialOptions.minifySyntax,
359
+ minifyWhitespace: build.initialOptions.minifyWhitespace,
360
+ target: build.initialOptions.target,
361
+ });
362
+ }
363
+ catch (error) {
364
+ if (error && typeof error === 'object' && 'errors' in error && 'warnings' in error) {
365
+ return error;
366
+ }
367
+ throw error;
368
+ }
369
+ }
310
370
  function createMissingFileError(request, original, root) {
311
371
  const error = {
312
372
  text: `File '${path.relative(root, request)}' is missing from the TypeScript compilation.`,
@@ -323,4 +383,3 @@ function createMissingFileError(request, original, root) {
323
383
  }
324
384
  return error;
325
385
  }
326
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"compiler-plugin.js","sourceRoot":"","sources":["../../../../../../../../../../packages/angular_devkit/build_angular/src/tools/esbuild/angular/compiler-plugin.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * @license\n * Copyright Google LLC All Rights Reserved.\n *\n * Use of this source code is governed by an MIT-style license that can be\n * found in the LICENSE file at https://angular.io/license\n */\n\nimport type {\n  Metafile,\n  OnStartResult,\n  OutputFile,\n  PartialMessage,\n  Plugin,\n  PluginBuild,\n} from 'esbuild';\nimport assert from 'node:assert';\nimport { realpath } from 'node:fs/promises';\nimport * as path from 'node:path';\nimport { pathToFileURL } from 'node:url';\nimport ts from 'typescript';\nimport { maxWorkers } from '../../../utils/environment-options';\nimport { JavaScriptTransformer } from '../javascript-transformer';\nimport { LoadResultCache } from '../load-result-cache';\nimport {\n  logCumulativeDurations,\n  profileAsync,\n  profileSync,\n  resetCumulativeDurations,\n} from '../profiling';\nimport { BundleStylesheetOptions } from '../stylesheets/bundle-options';\nimport { AngularHostOptions } from './angular-host';\nimport { AngularCompilation, AotCompilation, JitCompilation, NoopCompilation } from './compilation';\nimport { SharedTSCompilationState, getSharedCompilationState } from './compilation-state';\nimport { ComponentStylesheetBundler } from './component-stylesheets';\nimport { setupJitPluginCallbacks } from './jit-plugin-callbacks';\nimport { SourceFileCache } from './source-file-cache';\n\nexport interface CompilerPluginOptions {\n  sourcemap: boolean;\n  tsconfig: string;\n  jit?: boolean;\n  /** Skip TypeScript compilation setup. This is useful to re-use the TypeScript compilation from another plugin. */\n  noopTypeScriptCompilation?: boolean;\n  advancedOptimizations?: boolean;\n  thirdPartySourcemaps?: boolean;\n  fileReplacements?: Record<string, string>;\n  sourceFileCache?: SourceFileCache;\n  loadResultCache?: LoadResultCache;\n}\n\n// eslint-disable-next-line max-lines-per-function\nexport function createCompilerPlugin(\n  pluginOptions: CompilerPluginOptions,\n  styleOptions: BundleStylesheetOptions & { inlineStyleLanguage: string },\n): Plugin {\n  return {\n    name: 'angular-compiler',\n    // eslint-disable-next-line max-lines-per-function\n    async setup(build: PluginBuild): Promise<void> {\n      let setupWarnings: PartialMessage[] | undefined = [];\n      const preserveSymlinks = build.initialOptions.preserveSymlinks;\n\n      let tsconfigPath = pluginOptions.tsconfig;\n      if (!preserveSymlinks) {\n        // Use the real path of the tsconfig if not preserving symlinks.\n        // This ensures the TS source file paths are based on the real path of the configuration.\n        try {\n          tsconfigPath = await realpath(tsconfigPath);\n        } catch {}\n      }\n\n      // Initialize a worker pool for JavaScript transformations\n      const javascriptTransformer = new JavaScriptTransformer(pluginOptions, maxWorkers);\n\n      // Setup defines based on the values used by the Angular compiler-cli\n      build.initialOptions.define ??= {};\n      build.initialOptions.define['ngI18nClosureMode'] ??= 'false';\n\n      // The in-memory cache of TypeScript file outputs will be used during the build in `onLoad` callbacks for TS files.\n      // A string value indicates direct TS/NG output and a Uint8Array indicates fully transformed code.\n      const typeScriptFileCache =\n        pluginOptions.sourceFileCache?.typeScriptFileCache ??\n        new Map<string, string | Uint8Array>();\n\n      // The stylesheet resources from component stylesheets that will be added to the build results output files\n      let additionalOutputFiles: OutputFile[] = [];\n      let additionalMetafiles: Metafile[];\n\n      // Create new reusable compilation for the appropriate mode based on the `jit` plugin option\n      const compilation: AngularCompilation = pluginOptions.noopTypeScriptCompilation\n        ? new NoopCompilation()\n        : pluginOptions.jit\n        ? new JitCompilation()\n        : new AotCompilation();\n\n      // Determines if TypeScript should process JavaScript files based on tsconfig `allowJs` option\n      let shouldTsIgnoreJs = true;\n\n      // Track incremental component stylesheet builds\n      const stylesheetBundler = new ComponentStylesheetBundler(\n        styleOptions,\n        pluginOptions.loadResultCache,\n      );\n      let sharedTSCompilationState: SharedTSCompilationState | undefined;\n\n      build.onStart(async () => {\n        sharedTSCompilationState = getSharedCompilationState();\n        if (!(compilation instanceof NoopCompilation)) {\n          sharedTSCompilationState.markAsInProgress();\n        }\n\n        const result: OnStartResult = {\n          warnings: setupWarnings,\n        };\n\n        // Reset debug performance tracking\n        resetCumulativeDurations();\n\n        // Reset additional output files\n        additionalOutputFiles = [];\n        additionalMetafiles = [];\n\n        // Create Angular compiler host options\n        const hostOptions: AngularHostOptions = {\n          fileReplacements: pluginOptions.fileReplacements,\n          modifiedFiles: pluginOptions.sourceFileCache?.modifiedFiles,\n          sourceFileCache: pluginOptions.sourceFileCache,\n          async transformStylesheet(data, containingFile, stylesheetFile) {\n            let stylesheetResult;\n\n            // Stylesheet file only exists for external stylesheets\n            if (stylesheetFile) {\n              stylesheetResult = await stylesheetBundler.bundleFile(stylesheetFile);\n            } else {\n              stylesheetResult = await stylesheetBundler.bundleInline(\n                data,\n                containingFile,\n                styleOptions.inlineStyleLanguage,\n              );\n            }\n\n            const { contents, resourceFiles, errors, warnings } = stylesheetResult;\n            if (errors) {\n              (result.errors ??= []).push(...errors);\n            }\n            (result.warnings ??= []).push(...warnings);\n            additionalOutputFiles.push(...resourceFiles);\n            if (stylesheetResult.metafile) {\n              additionalMetafiles.push(stylesheetResult.metafile);\n            }\n\n            return contents;\n          },\n          processWebWorker(workerFile, containingFile) {\n            const fullWorkerPath = path.join(path.dirname(containingFile), workerFile);\n            // The synchronous API must be used due to the TypeScript compilation currently being\n            // fully synchronous and this process callback being called from within a TypeScript\n            // transformer.\n            const workerResult = build.esbuild.buildSync({\n              platform: 'browser',\n              write: false,\n              bundle: true,\n              metafile: true,\n              format: 'esm',\n              mainFields: ['es2020', 'es2015', 'browser', 'module', 'main'],\n              sourcemap: pluginOptions.sourcemap,\n              entryNames: 'worker-[hash]',\n              entryPoints: [fullWorkerPath],\n              absWorkingDir: build.initialOptions.absWorkingDir,\n              outdir: build.initialOptions.outdir,\n              minifyIdentifiers: build.initialOptions.minifyIdentifiers,\n              minifySyntax: build.initialOptions.minifySyntax,\n              minifyWhitespace: build.initialOptions.minifyWhitespace,\n              target: build.initialOptions.target,\n            });\n\n            (result.warnings ??= []).push(...workerResult.warnings);\n            additionalOutputFiles.push(...workerResult.outputFiles);\n            if (workerResult.metafile) {\n              additionalMetafiles.push(workerResult.metafile);\n            }\n\n            if (workerResult.errors.length > 0) {\n              (result.errors ??= []).push(...workerResult.errors);\n\n              // Return the original path if the build failed\n              return workerFile;\n            }\n\n            // Return bundled worker file entry name to be used in the built output\n            const workerCodeFile = workerResult.outputFiles.find((file) =>\n              file.path.endsWith('.js'),\n            );\n            assert(workerCodeFile, 'Web Worker bundled code file should always be present.');\n\n            return path.relative(build.initialOptions.outdir ?? '', workerCodeFile.path);\n          },\n        };\n\n        // Initialize the Angular compilation for the current build.\n        // In watch mode, previous build state will be reused.\n        const {\n          compilerOptions: { allowJs },\n          referencedFiles,\n        } = await compilation.initialize(tsconfigPath, hostOptions, (compilerOptions) => {\n          if (\n            compilerOptions.target === undefined ||\n            compilerOptions.target < ts.ScriptTarget.ES2022\n          ) {\n            // If 'useDefineForClassFields' is already defined in the users project leave the value as is.\n            // Otherwise fallback to false due to https://github.com/microsoft/TypeScript/issues/45995\n            // which breaks the deprecated `@Effects` NGRX decorator and potentially other existing code as well.\n            compilerOptions.target = ts.ScriptTarget.ES2022;\n            compilerOptions.useDefineForClassFields ??= false;\n\n            // Only add the warning on the initial build\n            setupWarnings?.push({\n              text:\n                'TypeScript compiler options \"target\" and \"useDefineForClassFields\" are set to \"ES2022\" and ' +\n                '\"false\" respectively by the Angular CLI.',\n              location: { file: pluginOptions.tsconfig },\n              notes: [\n                {\n                  text:\n                    'To control ECMA version and features use the Browerslist configuration. ' +\n                    'For more information, see https://angular.io/guide/build#configuring-browser-compatibility',\n                },\n              ],\n            });\n          }\n\n          // Enable incremental compilation by default if caching is enabled\n          if (pluginOptions.sourceFileCache?.persistentCachePath) {\n            compilerOptions.incremental ??= true;\n            // Set the build info file location to the configured cache directory\n            compilerOptions.tsBuildInfoFile = path.join(\n              pluginOptions.sourceFileCache?.persistentCachePath,\n              '.tsbuildinfo',\n            );\n          } else {\n            compilerOptions.incremental = false;\n          }\n\n          return {\n            ...compilerOptions,\n            noEmitOnError: false,\n            inlineSources: pluginOptions.sourcemap,\n            inlineSourceMap: pluginOptions.sourcemap,\n            mapRoot: undefined,\n            sourceRoot: undefined,\n            preserveSymlinks,\n          };\n        });\n        shouldTsIgnoreJs = !allowJs;\n\n        if (compilation instanceof NoopCompilation) {\n          await sharedTSCompilationState.waitUntilReady;\n\n          return result;\n        }\n\n        const diagnostics = await compilation.diagnoseFiles();\n        if (diagnostics.errors) {\n          (result.errors ??= []).push(...diagnostics.errors);\n        }\n        if (diagnostics.warnings) {\n          (result.warnings ??= []).push(...diagnostics.warnings);\n        }\n\n        // Update TypeScript file output cache for all affected files\n        profileSync('NG_EMIT_TS', () => {\n          for (const { filename, contents } of compilation.emitAffectedFiles()) {\n            typeScriptFileCache.set(pathToFileURL(filename).href, contents);\n          }\n        });\n\n        // Store referenced files for updated file watching if enabled\n        if (pluginOptions.sourceFileCache) {\n          pluginOptions.sourceFileCache.referencedFiles = referencedFiles;\n        }\n\n        // Reset the setup warnings so that they are only shown during the first build.\n        setupWarnings = undefined;\n\n        sharedTSCompilationState.markAsReady();\n\n        return result;\n      });\n\n      build.onLoad({ filter: /\\.[cm]?[jt]sx?$/ }, async (args) => {\n        const request = pluginOptions.fileReplacements?.[args.path] ?? args.path;\n\n        // Skip TS load attempt if JS TypeScript compilation not enabled and file is JS\n        if (shouldTsIgnoreJs && /\\.[cm]?js$/.test(request)) {\n          return undefined;\n        }\n\n        // The filename is currently used as a cache key. Since the cache is memory only,\n        // the options cannot change and do not need to be represented in the key. If the\n        // cache is later stored to disk, then the options that affect transform output\n        // would need to be added to the key as well as a check for any change of content.\n        let contents = typeScriptFileCache.get(pathToFileURL(request).href);\n\n        if (contents === undefined) {\n          // No TS result indicates the file is not part of the TypeScript program.\n          // If allowJs is enabled and the file is JS then defer to the next load hook.\n          if (!shouldTsIgnoreJs && /\\.[cm]?js$/.test(request)) {\n            return undefined;\n          }\n\n          // Otherwise return an error\n          return {\n            errors: [\n              createMissingFileError(request, args.path, build.initialOptions.absWorkingDir ?? ''),\n            ],\n          };\n        } else if (typeof contents === 'string') {\n          // A string indicates untransformed output from the TS/NG compiler\n          contents = await javascriptTransformer.transformData(\n            request,\n            contents,\n            true /* skipLinker */,\n          );\n\n          // Store as the returned Uint8Array to allow caching the fully transformed code\n          typeScriptFileCache.set(pathToFileURL(request).href, contents);\n        }\n\n        return {\n          contents,\n          loader: 'js',\n        };\n      });\n\n      build.onLoad({ filter: /\\.[cm]?js$/ }, (args) =>\n        profileAsync(\n          'NG_EMIT_JS*',\n          async () => {\n            // The filename is currently used as a cache key. Since the cache is memory only,\n            // the options cannot change and do not need to be represented in the key. If the\n            // cache is later stored to disk, then the options that affect transform output\n            // would need to be added to the key as well as a check for any change of content.\n            let contents = pluginOptions.sourceFileCache?.babelFileCache.get(args.path);\n            if (contents === undefined) {\n              contents = await javascriptTransformer.transformFile(args.path, pluginOptions.jit);\n              pluginOptions.sourceFileCache?.babelFileCache.set(args.path, contents);\n            }\n\n            return {\n              contents,\n              loader: 'js',\n            };\n          },\n          true,\n        ),\n      );\n\n      // Setup bundling of component templates and stylesheets when in JIT mode\n      if (pluginOptions.jit) {\n        setupJitPluginCallbacks(\n          build,\n          stylesheetBundler,\n          additionalOutputFiles,\n          styleOptions.inlineStyleLanguage,\n        );\n      }\n\n      build.onEnd((result) => {\n        // Add any additional output files to the main output files\n        if (additionalOutputFiles.length) {\n          result.outputFiles?.push(...additionalOutputFiles);\n        }\n\n        // Combine additional metafiles with main metafile\n        if (result.metafile && additionalMetafiles.length) {\n          for (const metafile of additionalMetafiles) {\n            result.metafile.inputs = { ...result.metafile.inputs, ...metafile.inputs };\n            result.metafile.outputs = { ...result.metafile.outputs, ...metafile.outputs };\n          }\n        }\n\n        logCumulativeDurations();\n      });\n\n      build.onDispose(() => {\n        sharedTSCompilationState?.dispose();\n        void stylesheetBundler.dispose();\n      });\n    },\n  };\n}\n\nfunction createMissingFileError(request: string, original: string, root: string): PartialMessage {\n  const error = {\n    text: `File '${path.relative(root, request)}' is missing from the TypeScript compilation.`,\n    notes: [\n      {\n        text: `Ensure the file is part of the TypeScript program via the 'files' or 'include' property.`,\n      },\n    ],\n  };\n\n  if (request !== original) {\n    error.notes.push({\n      text: `File is requested from a file replacement of '${path.relative(root, original)}'.`,\n    });\n  }\n\n  return error;\n}\n"]}
@@ -6,7 +6,6 @@
6
6
  * found in the LICENSE file at https://angular.io/license
7
7
  */
8
8
  import { OutputFile } from 'esbuild';
9
- import { LoadResultCache } from '../load-result-cache';
10
9
  import { BundleStylesheetOptions } from '../stylesheets/bundle-options';
11
10
  /**
12
11
  * Bundles component stylesheets. A stylesheet can be either an inline stylesheet that
@@ -16,13 +15,13 @@ import { BundleStylesheetOptions } from '../stylesheets/bundle-options';
16
15
  export declare class ComponentStylesheetBundler {
17
16
  #private;
18
17
  private readonly options;
19
- private readonly cache?;
18
+ private readonly incremental;
20
19
  /**
21
20
  *
22
21
  * @param options An object containing the stylesheet bundling options.
23
22
  * @param cache A load result cache to use when bundling.
24
23
  */
25
- constructor(options: BundleStylesheetOptions, cache?: LoadResultCache | undefined);
24
+ constructor(options: BundleStylesheetOptions, incremental: boolean);
26
25
  bundleFile(entry: string): Promise<{
27
26
  errors: import("esbuild").Message[] | undefined;
28
27
  warnings: import("esbuild").Message[];
@@ -43,5 +42,6 @@ export declare class ComponentStylesheetBundler {
43
42
  metafile: import("esbuild").Metafile | undefined;
44
43
  referencedFiles: Set<string> | undefined;
45
44
  }>;
45
+ invalidate(files: Iterable<string>): void;
46
46
  dispose(): Promise<void>;
47
47
  }
@@ -32,7 +32,7 @@ class BundlerContextCache extends Map {
32
32
  */
33
33
  class ComponentStylesheetBundler {
34
34
  options;
35
- cache;
35
+ incremental;
36
36
  #fileContexts = new BundlerContextCache();
37
37
  #inlineContexts = new BundlerContextCache();
38
38
  /**
@@ -40,15 +40,17 @@ class ComponentStylesheetBundler {
40
40
  * @param options An object containing the stylesheet bundling options.
41
41
  * @param cache A load result cache to use when bundling.
42
42
  */
43
- constructor(options, cache) {
43
+ constructor(options, incremental) {
44
44
  this.options = options;
45
- this.cache = cache;
45
+ this.incremental = incremental;
46
46
  }
47
47
  async bundleFile(entry) {
48
48
  const bundlerContext = this.#fileContexts.getOrCreate(entry, () => {
49
- const buildOptions = (0, bundle_options_1.createStylesheetBundleOptions)(this.options, this.cache);
50
- buildOptions.entryPoints = [entry];
51
- return new bundler_context_1.BundlerContext(this.options.workspaceRoot, true, buildOptions);
49
+ return new bundler_context_1.BundlerContext(this.options.workspaceRoot, this.incremental, (loadCache) => {
50
+ const buildOptions = (0, bundle_options_1.createStylesheetBundleOptions)(this.options, loadCache);
51
+ buildOptions.entryPoints = [entry];
52
+ return buildOptions;
53
+ });
52
54
  });
53
55
  return extractResult(await bundlerContext.bundle(), bundlerContext.watchFiles);
54
56
  }
@@ -60,36 +62,50 @@ class ComponentStylesheetBundler {
60
62
  const entry = [language, id, filename].join(';');
61
63
  const bundlerContext = this.#inlineContexts.getOrCreate(entry, () => {
62
64
  const namespace = 'angular:styles/component';
63
- const buildOptions = (0, bundle_options_1.createStylesheetBundleOptions)(this.options, this.cache, {
64
- [entry]: data,
65
- });
66
- buildOptions.entryPoints = [`${namespace};${entry}`];
67
- buildOptions.plugins.push({
68
- name: 'angular-component-styles',
69
- setup(build) {
70
- build.onResolve({ filter: /^angular:styles\/component;/ }, (args) => {
71
- if (args.kind !== 'entry-point') {
72
- return null;
73
- }
74
- return {
75
- path: entry,
76
- namespace,
77
- };
78
- });
79
- build.onLoad({ filter: /^css;/, namespace }, async () => {
80
- return {
81
- contents: data,
82
- loader: 'css',
83
- resolveDir: node_path_1.default.dirname(filename),
84
- };
85
- });
86
- },
65
+ return new bundler_context_1.BundlerContext(this.options.workspaceRoot, this.incremental, (loadCache) => {
66
+ const buildOptions = (0, bundle_options_1.createStylesheetBundleOptions)(this.options, loadCache, {
67
+ [entry]: data,
68
+ });
69
+ buildOptions.entryPoints = [`${namespace};${entry}`];
70
+ buildOptions.plugins.push({
71
+ name: 'angular-component-styles',
72
+ setup(build) {
73
+ build.onResolve({ filter: /^angular:styles\/component;/ }, (args) => {
74
+ if (args.kind !== 'entry-point') {
75
+ return null;
76
+ }
77
+ return {
78
+ path: entry,
79
+ namespace,
80
+ };
81
+ });
82
+ build.onLoad({ filter: /^css;/, namespace }, async () => {
83
+ return {
84
+ contents: data,
85
+ loader: 'css',
86
+ resolveDir: node_path_1.default.dirname(filename),
87
+ };
88
+ });
89
+ },
90
+ });
91
+ return buildOptions;
87
92
  });
88
- return new bundler_context_1.BundlerContext(this.options.workspaceRoot, true, buildOptions);
89
93
  });
90
94
  // Extract the result of the bundling from the output files
91
95
  return extractResult(await bundlerContext.bundle(), bundlerContext.watchFiles);
92
96
  }
97
+ invalidate(files) {
98
+ if (!this.incremental) {
99
+ return;
100
+ }
101
+ const normalizedFiles = [...files].map(node_path_1.default.normalize);
102
+ for (const bundler of this.#fileContexts.values()) {
103
+ bundler.invalidate(normalizedFiles);
104
+ }
105
+ for (const bundler of this.#inlineContexts.values()) {
106
+ bundler.invalidate(normalizedFiles);
107
+ }
108
+ }
93
109
  async dispose() {
94
110
  const contexts = [...this.#fileContexts.values(), ...this.#inlineContexts.values()];
95
111
  this.#fileContexts.clear();
@@ -144,4 +160,3 @@ function extractResult(result, referencedFiles) {
144
160
  referencedFiles,
145
161
  };
146
162
  }
147
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"component-stylesheets.js","sourceRoot":"","sources":["../../../../../../../../../../packages/angular_devkit/build_angular/src/tools/esbuild/angular/component-stylesheets.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * @license\n * Copyright Google LLC All Rights Reserved.\n *\n * Use of this source code is governed by an MIT-style license that can be\n * found in the LICENSE file at https://angular.io/license\n */\n\nimport { OutputFile } from 'esbuild';\nimport { createHash } from 'node:crypto';\nimport path from 'node:path';\nimport { BuildOutputFileType, BundleContextResult, BundlerContext } from '../bundler-context';\nimport { LoadResultCache } from '../load-result-cache';\nimport {\n  BundleStylesheetOptions,\n  createStylesheetBundleOptions,\n} from '../stylesheets/bundle-options';\n\nclass BundlerContextCache extends Map<string, BundlerContext> {\n  getOrCreate(key: string, creator: () => BundlerContext): BundlerContext {\n    let value = this.get(key);\n\n    if (value === undefined) {\n      value = creator();\n      this.set(key, value);\n    }\n\n    return value;\n  }\n}\n\n/**\n * Bundles component stylesheets. A stylesheet can be either an inline stylesheet that\n * is contained within the Component's metadata definition or an external file referenced\n * from the Component's metadata definition.\n */\nexport class ComponentStylesheetBundler {\n  readonly #fileContexts = new BundlerContextCache();\n  readonly #inlineContexts = new BundlerContextCache();\n\n  /**\n   *\n   * @param options An object containing the stylesheet bundling options.\n   * @param cache A load result cache to use when bundling.\n   */\n  constructor(\n    private readonly options: BundleStylesheetOptions,\n    private readonly cache?: LoadResultCache,\n  ) {}\n\n  async bundleFile(entry: string) {\n    const bundlerContext = this.#fileContexts.getOrCreate(entry, () => {\n      const buildOptions = createStylesheetBundleOptions(this.options, this.cache);\n      buildOptions.entryPoints = [entry];\n\n      return new BundlerContext(this.options.workspaceRoot, true, buildOptions);\n    });\n\n    return extractResult(await bundlerContext.bundle(), bundlerContext.watchFiles);\n  }\n\n  async bundleInline(data: string, filename: string, language: string) {\n    // Use a hash of the inline stylesheet content to ensure a consistent identifier. External stylesheets will resolve\n    // to the actual stylesheet file path.\n    // TODO: Consider xxhash instead for hashing\n    const id = createHash('sha256').update(data).digest('hex');\n    const entry = [language, id, filename].join(';');\n\n    const bundlerContext = this.#inlineContexts.getOrCreate(entry, () => {\n      const namespace = 'angular:styles/component';\n      const buildOptions = createStylesheetBundleOptions(this.options, this.cache, {\n        [entry]: data,\n      });\n      buildOptions.entryPoints = [`${namespace};${entry}`];\n      buildOptions.plugins.push({\n        name: 'angular-component-styles',\n        setup(build) {\n          build.onResolve({ filter: /^angular:styles\\/component;/ }, (args) => {\n            if (args.kind !== 'entry-point') {\n              return null;\n            }\n\n            return {\n              path: entry,\n              namespace,\n            };\n          });\n          build.onLoad({ filter: /^css;/, namespace }, async () => {\n            return {\n              contents: data,\n              loader: 'css',\n              resolveDir: path.dirname(filename),\n            };\n          });\n        },\n      });\n\n      return new BundlerContext(this.options.workspaceRoot, true, buildOptions);\n    });\n\n    // Extract the result of the bundling from the output files\n    return extractResult(await bundlerContext.bundle(), bundlerContext.watchFiles);\n  }\n\n  async dispose(): Promise<void> {\n    const contexts = [...this.#fileContexts.values(), ...this.#inlineContexts.values()];\n    this.#fileContexts.clear();\n    this.#inlineContexts.clear();\n\n    await Promise.allSettled(contexts.map((context) => context.dispose()));\n  }\n}\n\nfunction extractResult(result: BundleContextResult, referencedFiles?: Set<string>) {\n  let contents = '';\n  let map;\n  let outputPath;\n  const resourceFiles: OutputFile[] = [];\n  if (!result.errors) {\n    for (const outputFile of result.outputFiles) {\n      const filename = path.basename(outputFile.path);\n      if (outputFile.type === BuildOutputFileType.Media) {\n        // The output files could also contain resources (images/fonts/etc.) that were referenced\n        resourceFiles.push(outputFile);\n      } else if (filename.endsWith('.css')) {\n        outputPath = outputFile.path;\n        contents = outputFile.text;\n      } else if (filename.endsWith('.css.map')) {\n        map = outputFile.text;\n      } else {\n        throw new Error(\n          `Unexpected non CSS/Media file \"${filename}\" outputted during component stylesheet processing.`,\n        );\n      }\n    }\n  }\n\n  let metafile;\n  if (!result.errors) {\n    metafile = result.metafile;\n    // Remove entryPoint fields from outputs to prevent the internal component styles from being\n    // treated as initial files. Also mark the entry as a component resource for stat reporting.\n    Object.values(metafile.outputs).forEach((output) => {\n      delete output.entryPoint;\n      // eslint-disable-next-line @typescript-eslint/no-explicit-any\n      (output as any)['ng-component'] = true;\n    });\n  }\n\n  return {\n    errors: result.errors,\n    warnings: result.warnings,\n    contents,\n    map,\n    path: outputPath,\n    resourceFiles,\n    metafile,\n    referencedFiles,\n  };\n}\n"]}
@@ -6,10 +6,10 @@
6
6
  * found in the LICENSE file at https://angular.io/license
7
7
  */
8
8
  import type { PartialMessage } from 'esbuild';
9
- import { Diagnostic } from 'typescript';
9
+ import type ts from 'typescript';
10
10
  /**
11
11
  * Converts a TypeScript Diagnostic message into an esbuild compatible message object.
12
12
  * @param diagnostic The TypeScript diagnostic to convert.
13
13
  * @returns An esbuild diagnostic message as a PartialMessage object
14
14
  */
15
- export declare function convertTypeScriptDiagnostic(diagnostic: Diagnostic): PartialMessage;
15
+ export declare function convertTypeScriptDiagnostic(typescript: typeof ts, diagnostic: ts.Diagnostic): PartialMessage;
@@ -9,7 +9,6 @@
9
9
  Object.defineProperty(exports, "__esModule", { value: true });
10
10
  exports.convertTypeScriptDiagnostic = void 0;
11
11
  const node_os_1 = require("node:os");
12
- const typescript_1 = require("typescript");
13
12
  /**
14
13
  * Converts TypeScript Diagnostic related information into an esbuild compatible note object.
15
14
  * Related information is a subset of a full TypeScript Diagnostic and also used for diagnostic
@@ -17,9 +16,9 @@ const typescript_1 = require("typescript");
17
16
  * @param info The TypeScript diagnostic relative information to convert.
18
17
  * @returns An esbuild diagnostic message as a PartialMessage object
19
18
  */
20
- function convertTypeScriptDiagnosticInfo(info, textPrefix) {
19
+ function convertTypeScriptDiagnosticInfo(typescript, info, textPrefix) {
21
20
  const newLine = (0, node_os_1.platform)() === 'win32' ? '\r\n' : '\n';
22
- let text = (0, typescript_1.flattenDiagnosticMessageText)(info.messageText, newLine);
21
+ let text = typescript.flattenDiagnosticMessageText(info.messageText, newLine);
23
22
  if (textPrefix) {
24
23
  text = textPrefix + text;
25
24
  }
@@ -31,17 +30,17 @@ function convertTypeScriptDiagnosticInfo(info, textPrefix) {
31
30
  };
32
31
  // Calculate the line/column location and extract the full line text that has the diagnostic
33
32
  if (info.start) {
34
- const { line, character } = (0, typescript_1.getLineAndCharacterOfPosition)(info.file, info.start);
33
+ const { line, character } = typescript.getLineAndCharacterOfPosition(info.file, info.start);
35
34
  note.location.line = line + 1;
36
35
  note.location.column = character;
37
36
  // The start position for the slice is the first character of the error line
38
- const lineStartPosition = (0, typescript_1.getPositionOfLineAndCharacter)(info.file, line, 0);
37
+ const lineStartPosition = typescript.getPositionOfLineAndCharacter(info.file, line, 0);
39
38
  // The end position for the slice is the first character of the next line or the length of
40
39
  // the entire file if the line is the last line of the file (getPositionOfLineAndCharacter
41
40
  // will error if a nonexistent line is passed).
42
- const { line: lastLineOfFile } = (0, typescript_1.getLineAndCharacterOfPosition)(info.file, info.file.text.length - 1);
41
+ const { line: lastLineOfFile } = typescript.getLineAndCharacterOfPosition(info.file, info.file.text.length - 1);
43
42
  const lineEndPosition = line < lastLineOfFile
44
- ? (0, typescript_1.getPositionOfLineAndCharacter)(info.file, line + 1, 0)
43
+ ? typescript.getPositionOfLineAndCharacter(info.file, line + 1, 0)
45
44
  : info.file.text.length;
46
45
  note.location.lineText = info.file.text.slice(lineStartPosition, lineEndPosition).trimEnd();
47
46
  }
@@ -53,7 +52,7 @@ function convertTypeScriptDiagnosticInfo(info, textPrefix) {
53
52
  * @param diagnostic The TypeScript diagnostic to convert.
54
53
  * @returns An esbuild diagnostic message as a PartialMessage object
55
54
  */
56
- function convertTypeScriptDiagnostic(diagnostic) {
55
+ function convertTypeScriptDiagnostic(typescript, diagnostic) {
57
56
  let codePrefix = 'TS';
58
57
  let code = `${diagnostic.code}`;
59
58
  if (diagnostic.source === 'ngtsc') {
@@ -61,15 +60,10 @@ function convertTypeScriptDiagnostic(diagnostic) {
61
60
  // Remove `-99` Angular prefix from diagnostic code
62
61
  code = code.slice(3);
63
62
  }
64
- const message = {
65
- ...convertTypeScriptDiagnosticInfo(diagnostic, `${codePrefix}${code}: `),
66
- // Store original diagnostic for reference if needed downstream
67
- detail: diagnostic,
68
- };
63
+ const message = convertTypeScriptDiagnosticInfo(typescript, diagnostic, `${codePrefix}${code}: `);
69
64
  if (diagnostic.relatedInformation?.length) {
70
- message.notes = diagnostic.relatedInformation.map((info) => convertTypeScriptDiagnosticInfo(info));
65
+ message.notes = diagnostic.relatedInformation.map((info) => convertTypeScriptDiagnosticInfo(typescript, info));
71
66
  }
72
67
  return message;
73
68
  }
74
69
  exports.convertTypeScriptDiagnostic = convertTypeScriptDiagnostic;
75
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGlhZ25vc3RpY3MuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi9wYWNrYWdlcy9hbmd1bGFyX2RldmtpdC9idWlsZF9hbmd1bGFyL3NyYy90b29scy9lc2J1aWxkL2FuZ3VsYXIvZGlhZ25vc3RpY3MudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBOzs7Ozs7R0FNRzs7O0FBR0gscUNBQW1DO0FBQ25DLDJDQU1vQjtBQUVwQjs7Ozs7O0dBTUc7QUFDSCxTQUFTLCtCQUErQixDQUN0QyxJQUFrQyxFQUNsQyxVQUFtQjtJQUVuQixNQUFNLE9BQU8sR0FBRyxJQUFBLGtCQUFRLEdBQUUsS0FBSyxPQUFPLENBQUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDO0lBQ3ZELElBQUksSUFBSSxHQUFHLElBQUEseUNBQTRCLEVBQUMsSUFBSSxDQUFDLFdBQVcsRUFBRSxPQUFPLENBQUMsQ0FBQztJQUNuRSxJQUFJLFVBQVUsRUFBRTtRQUNkLElBQUksR0FBRyxVQUFVLEdBQUcsSUFBSSxDQUFDO0tBQzFCO0lBRUQsTUFBTSxJQUFJLEdBQWdCLEVBQUUsSUFBSSxFQUFFLENBQUM7SUFFbkMsSUFBSSxJQUFJLENBQUMsSUFBSSxFQUFFO1FBQ2IsSUFBSSxDQUFDLFFBQVEsR0FBRztZQUNkLElBQUksRUFBRSxJQUFJLENBQUMsSUFBSSxDQUFDLFFBQVE7WUFDeEIsTUFBTSxFQUFFLElBQUksQ0FBQyxNQUFNO1NBQ3BCLENBQUM7UUFFRiw0RkFBNEY7UUFDNUYsSUFBSSxJQUFJLENBQUMsS0FBSyxFQUFFO1lBQ2QsTUFBTSxFQUFFLElBQUksRUFBRSxTQUFTLEVBQUUsR0FBRyxJQUFBLDBDQUE2QixFQUFDLElBQUksQ0FBQyxJQUFJLEVBQUUsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDO1lBQ2pGLElBQUksQ0FBQyxRQUFRLENBQUMsSUFBSSxHQUFHLElBQUksR0FBRyxDQUFDLENBQUM7WUFDOUIsSUFBSSxDQUFDLFFBQVEsQ0FBQyxNQUFNLEdBQUcsU0FBUyxDQUFDO1lBRWpDLDRFQUE0RTtZQUM1RSxNQUFNLGlCQUFpQixHQUFHLElBQUEsMENBQTZCLEVBQUMsSUFBSSxDQUFDLElBQUksRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFDLENBQUM7WUFFNUUsMEZBQTBGO1lBQzFGLDBGQUEwRjtZQUMxRiwrQ0FBK0M7WUFDL0MsTUFBTSxFQUFFLElBQUksRUFBRSxjQUFjLEVBQUUsR0FBRyxJQUFBLDBDQUE2QixFQUM1RCxJQUFJLENBQUMsSUFBSSxFQUNULElBQUksQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLE1BQU0sR0FBRyxDQUFDLENBQzFCLENBQUM7WUFDRixNQUFNLGVBQWUsR0FDbkIsSUFBSSxHQUFHLGNBQWM7Z0JBQ25CLENBQUMsQ0FBQyxJQUFBLDBDQUE2QixFQUFDLElBQUksQ0FBQyxJQUFJLEVBQUUsSUFBSSxHQUFHLENBQUMsRUFBRSxDQUFDLENBQUM7Z0JBQ3ZELENBQUMsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUM7WUFFNUIsSUFBSSxDQUFDLFFBQVEsQ0FBQyxRQUFRLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLGlCQUFpQixFQUFFLGVBQWUsQ0FBQyxDQUFDLE9BQU8sRUFBRSxDQUFDO1NBQzdGO0tBQ0Y7SUFFRCxPQUFPLElBQUksQ0FBQztBQUNkLENBQUM7QUFFRDs7OztHQUlHO0FBQ0gsU0FBZ0IsMkJBQTJCLENBQUMsVUFBc0I7SUFDaEUsSUFBSSxVQUFVLEdBQUcsSUFBSSxDQUFDO0lBQ3RCLElBQUksSUFBSSxHQUFHLEdBQUcsVUFBVSxDQUFDLElBQUksRUFBRSxDQUFDO0lBQ2hDLElBQUksVUFBVSxDQUFDLE1BQU0sS0FBSyxPQUFPLEVBQUU7UUFDakMsVUFBVSxHQUFHLElBQUksQ0FBQztRQUNsQixtREFBbUQ7UUFDbkQsSUFBSSxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUM7S0FDdEI7SUFFRCxNQUFNLE9BQU8sR0FBbUI7UUFDOUIsR0FBRywrQkFBK0IsQ0FBQyxVQUFVLEVBQUUsR0FBRyxVQUFVLEdBQUcsSUFBSSxJQUFJLENBQUM7UUFDeEUsK0RBQStEO1FBQy9ELE1BQU0sRUFBRSxVQUFVO0tBQ25CLENBQUM7SUFFRixJQUFJLFVBQVUsQ0FBQyxrQkFBa0IsRUFBRSxNQUFNLEVBQUU7UUFDekMsT0FBTyxDQUFDLEtBQUssR0FBRyxVQUFVLENBQUMsa0JBQWtCLENBQUMsR0FBRyxDQUFDLENBQUMsSUFBSSxFQUFFLEVBQUUsQ0FDekQsK0JBQStCLENBQUMsSUFBSSxDQUFDLENBQ3RDLENBQUM7S0FDSDtJQUVELE9BQU8sT0FBTyxDQUFDO0FBQ2pCLENBQUM7QUF0QkQsa0VBc0JDIiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiBAbGljZW5zZVxuICogQ29weXJpZ2h0IEdvb2dsZSBMTEMgQWxsIFJpZ2h0cyBSZXNlcnZlZC5cbiAqXG4gKiBVc2Ugb2YgdGhpcyBzb3VyY2UgY29kZSBpcyBnb3Zlcm5lZCBieSBhbiBNSVQtc3R5bGUgbGljZW5zZSB0aGF0IGNhbiBiZVxuICogZm91bmQgaW4gdGhlIExJQ0VOU0UgZmlsZSBhdCBodHRwczovL2FuZ3VsYXIuaW8vbGljZW5zZVxuICovXG5cbmltcG9ydCB0eXBlIHsgUGFydGlhbE1lc3NhZ2UsIFBhcnRpYWxOb3RlIH0gZnJvbSAnZXNidWlsZCc7XG5pbXBvcnQgeyBwbGF0Zm9ybSB9IGZyb20gJ25vZGU6b3MnO1xuaW1wb3J0IHtcbiAgRGlhZ25vc3RpYyxcbiAgRGlhZ25vc3RpY1JlbGF0ZWRJbmZvcm1hdGlvbixcbiAgZmxhdHRlbkRpYWdub3N0aWNNZXNzYWdlVGV4dCxcbiAgZ2V0TGluZUFuZENoYXJhY3Rlck9mUG9zaXRpb24sXG4gIGdldFBvc2l0aW9uT2ZMaW5lQW5kQ2hhcmFjdGVyLFxufSBmcm9tICd0eXBlc2NyaXB0JztcblxuLyoqXG4gKiBDb252ZXJ0cyBUeXBlU2NyaXB0IERpYWdub3N0aWMgcmVsYXRlZCBpbmZvcm1hdGlvbiBpbnRvIGFuIGVzYnVpbGQgY29tcGF0aWJsZSBub3RlIG9iamVjdC5cbiAqIFJlbGF0ZWQgaW5mb3JtYXRpb24gaXMgYSBzdWJzZXQgb2YgYSBmdWxsIFR5cGVTY3JpcHQgRGlhZ25vc3RpYyBhbmQgYWxzbyB1c2VkIGZvciBkaWFnbm9zdGljXG4gKiBub3RlcyBhc3NvY2lhdGVkIHdpdGggdGhlIG1haW4gRGlhZ25vc3RpYy5cbiAqIEBwYXJhbSBpbmZvIFRoZSBUeXBlU2NyaXB0IGRpYWdub3N0aWMgcmVsYXRpdmUgaW5mb3JtYXRpb24gdG8gY29udmVydC5cbiAqIEByZXR1cm5zIEFuIGVzYnVpbGQgZGlhZ25vc3RpYyBtZXNzYWdlIGFzIGEgUGFydGlhbE1lc3NhZ2Ugb2JqZWN0XG4gKi9cbmZ1bmN0aW9uIGNvbnZlcnRUeXBlU2NyaXB0RGlhZ25vc3RpY0luZm8oXG4gIGluZm86IERpYWdub3N0aWNSZWxhdGVkSW5mb3JtYXRpb24sXG4gIHRleHRQcmVmaXg/OiBzdHJpbmcsXG4pOiBQYXJ0aWFsTm90ZSB7XG4gIGNvbnN0IG5ld0xpbmUgPSBwbGF0Zm9ybSgpID09PSAnd2luMzInID8gJ1xcclxcbicgOiAnXFxuJztcbiAgbGV0IHRleHQgPSBmbGF0dGVuRGlhZ25vc3RpY01lc3NhZ2VUZXh0KGluZm8ubWVzc2FnZVRleHQsIG5ld0xpbmUpO1xuICBpZiAodGV4dFByZWZpeCkge1xuICAgIHRleHQgPSB0ZXh0UHJlZml4ICsgdGV4dDtcbiAgfVxuXG4gIGNvbnN0IG5vdGU6IFBhcnRpYWxOb3RlID0geyB0ZXh0IH07XG5cbiAgaWYgKGluZm8uZmlsZSkge1xuICAgIG5vdGUubG9jYXRpb24gPSB7XG4gICAgICBmaWxlOiBpbmZvLmZpbGUuZmlsZU5hbWUsXG4gICAgICBsZW5ndGg6IGluZm8ubGVuZ3RoLFxuICAgIH07XG5cbiAgICAvLyBDYWxjdWxhdGUgdGhlIGxpbmUvY29sdW1uIGxvY2F0aW9uIGFuZCBleHRyYWN0IHRoZSBmdWxsIGxpbmUgdGV4dCB0aGF0IGhhcyB0aGUgZGlhZ25vc3RpY1xuICAgIGlmIChpbmZvLnN0YXJ0KSB7XG4gICAgICBjb25zdCB7IGxpbmUsIGNoYXJhY3RlciB9ID0gZ2V0TGluZUFuZENoYXJhY3Rlck9mUG9zaXRpb24oaW5mby5maWxlLCBpbmZvLnN0YXJ0KTtcbiAgICAgIG5vdGUubG9jYXRpb24ubGluZSA9IGxpbmUgKyAxO1xuICAgICAgbm90ZS5sb2NhdGlvbi5jb2x1bW4gPSBjaGFyYWN0ZXI7XG5cbiAgICAgIC8vIFRoZSBzdGFydCBwb3NpdGlvbiBmb3IgdGhlIHNsaWNlIGlzIHRoZSBmaXJzdCBjaGFyYWN0ZXIgb2YgdGhlIGVycm9yIGxpbmVcbiAgICAgIGNvbnN0IGxpbmVTdGFydFBvc2l0aW9uID0gZ2V0UG9zaXRpb25PZkxpbmVBbmRDaGFyYWN0ZXIoaW5mby5maWxlLCBsaW5lLCAwKTtcblxuICAgICAgLy8gVGhlIGVuZCBwb3NpdGlvbiBmb3IgdGhlIHNsaWNlIGlzIHRoZSBmaXJzdCBjaGFyYWN0ZXIgb2YgdGhlIG5leHQgbGluZSBvciB0aGUgbGVuZ3RoIG9mXG4gICAgICAvLyB0aGUgZW50aXJlIGZpbGUgaWYgdGhlIGxpbmUgaXMgdGhlIGxhc3QgbGluZSBvZiB0aGUgZmlsZSAoZ2V0UG9zaXRpb25PZkxpbmVBbmRDaGFyYWN0ZXJcbiAgICAgIC8vIHdpbGwgZXJyb3IgaWYgYSBub25leGlzdGVudCBsaW5lIGlzIHBhc3NlZCkuXG4gICAgICBjb25zdCB7IGxpbmU6IGxhc3RMaW5lT2ZGaWxlIH0gPSBnZXRMaW5lQW5kQ2hhcmFjdGVyT2ZQb3NpdGlvbihcbiAgICAgICAgaW5mby5maWxlLFxuICAgICAgICBpbmZvLmZpbGUudGV4dC5sZW5ndGggLSAxLFxuICAgICAgKTtcbiAgICAgIGNvbnN0IGxpbmVFbmRQb3NpdGlvbiA9XG4gICAgICAgIGxpbmUgPCBsYXN0TGluZU9mRmlsZVxuICAgICAgICAgID8gZ2V0UG9zaXRpb25PZkxpbmVBbmRDaGFyYWN0ZXIoaW5mby5maWxlLCBsaW5lICsgMSwgMClcbiAgICAgICAgICA6IGluZm8uZmlsZS50ZXh0Lmxlbmd0aDtcblxuICAgICAgbm90ZS5sb2NhdGlvbi5saW5lVGV4dCA9IGluZm8uZmlsZS50ZXh0LnNsaWNlKGxpbmVTdGFydFBvc2l0aW9uLCBsaW5lRW5kUG9zaXRpb24pLnRyaW1FbmQoKTtcbiAgICB9XG4gIH1cblxuICByZXR1cm4gbm90ZTtcbn1cblxuLyoqXG4gKiBDb252ZXJ0cyBhIFR5cGVTY3JpcHQgRGlhZ25vc3RpYyBtZXNzYWdlIGludG8gYW4gZXNidWlsZCBjb21wYXRpYmxlIG1lc3NhZ2Ugb2JqZWN0LlxuICogQHBhcmFtIGRpYWdub3N0aWMgVGhlIFR5cGVTY3JpcHQgZGlhZ25vc3RpYyB0byBjb252ZXJ0LlxuICogQHJldHVybnMgQW4gZXNidWlsZCBkaWFnbm9zdGljIG1lc3NhZ2UgYXMgYSBQYXJ0aWFsTWVzc2FnZSBvYmplY3RcbiAqL1xuZXhwb3J0IGZ1bmN0aW9uIGNvbnZlcnRUeXBlU2NyaXB0RGlhZ25vc3RpYyhkaWFnbm9zdGljOiBEaWFnbm9zdGljKTogUGFydGlhbE1lc3NhZ2Uge1xuICBsZXQgY29kZVByZWZpeCA9ICdUUyc7XG4gIGxldCBjb2RlID0gYCR7ZGlhZ25vc3RpYy5jb2RlfWA7XG4gIGlmIChkaWFnbm9zdGljLnNvdXJjZSA9PT0gJ25ndHNjJykge1xuICAgIGNvZGVQcmVmaXggPSAnTkcnO1xuICAgIC8vIFJlbW92ZSBgLTk5YCBBbmd1bGFyIHByZWZpeCBmcm9tIGRpYWdub3N0aWMgY29kZVxuICAgIGNvZGUgPSBjb2RlLnNsaWNlKDMpO1xuICB9XG5cbiAgY29uc3QgbWVzc2FnZTogUGFydGlhbE1lc3NhZ2UgPSB7XG4gICAgLi4uY29udmVydFR5cGVTY3JpcHREaWFnbm9zdGljSW5mbyhkaWFnbm9zdGljLCBgJHtjb2RlUHJlZml4fSR7Y29kZX06IGApLFxuICAgIC8vIFN0b3JlIG9yaWdpbmFsIGRpYWdub3N0aWMgZm9yIHJlZmVyZW5jZSBpZiBuZWVkZWQgZG93bnN0cmVhbVxuICAgIGRldGFpbDogZGlhZ25vc3RpYyxcbiAgfTtcblxuICBpZiAoZGlhZ25vc3RpYy5yZWxhdGVkSW5mb3JtYXRpb24/Lmxlbmd0aCkge1xuICAgIG1lc3NhZ2Uubm90ZXMgPSBkaWFnbm9zdGljLnJlbGF0ZWRJbmZvcm1hdGlvbi5tYXAoKGluZm8pID0+XG4gICAgICBjb252ZXJ0VHlwZVNjcmlwdERpYWdub3N0aWNJbmZvKGluZm8pLFxuICAgICk7XG4gIH1cblxuICByZXR1cm4gbWVzc2FnZTtcbn1cbiJdfQ==