@nx/angular-rspack-compiler 23.2.0-beta.4 → 23.2.0-beta.5

package/dist/compilation/setup-with-angular-compilation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"setup-with-angular-compilation.d.ts","sourceRoot":"","sources":["../../src/compilation/setup-with-angular-compilation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAEnD,OAAO,EAEL,kBAAkB,EAClB,eAAe,EAEhB,MAAM,WAAW,CAAC;AACnB,OAAO,EAGL,uBAAuB,EACxB,MAAM,qBAAqB,CAAC;AAE7B;;;GAGG;AACH,MAAM,WAAW,wBAAwB;IACvC,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE;QAAE,aAAa,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CACnD;AAED,wBAAsB,sCAAsC,CAC1D,MAAM,EAAE,IAAI,CAAC,aAAa,EAAE,QAAQ,CAAC,EACrC,OAAO,EAAE,uBAAuB,EAChC,eAAe,CAAC,EAAE,eAAe,EACjC,kBAAkB,CAAC,EAAE,kBAAkB,EACvC,aAAa,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC;;;cA0DoB,MAAM;cAAQ,MAAM;;;;;;GA8GpE"}
+{"version":3,"file":"setup-with-angular-compilation.d.ts","sourceRoot":"","sources":["../../src/compilation/setup-with-angular-compilation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAEnD,OAAO,EAEL,kBAAkB,EAClB,eAAe,EAEhB,MAAM,WAAW,CAAC;AACnB,OAAO,EAGL,uBAAuB,EACxB,MAAM,qBAAqB,CAAC;AAE7B;;;GAGG;AACH,MAAM,WAAW,wBAAwB;IACvC,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE;QAAE,aAAa,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CACnD;AAED,wBAAsB,sCAAsC,CAC1D,MAAM,EAAE,IAAI,CAAC,aAAa,EAAE,QAAQ,CAAC,EACrC,OAAO,EAAE,uBAAuB,EAChC,eAAe,CAAC,EAAE,eAAe,EACjC,kBAAkB,CAAC,EAAE,kBAAkB,EACvC,aAAa,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC;;;cA0DoB,MAAM;cAAQ,MAAM;;;;;;GA+GpE"}

package/dist/compilation/setup-with-angular-compilation.js

@@ -104,8 +104,9 @@ async function setupCompilationWithAngularCompilation(config, options, sourceFil
     }
     // The compiler already tracks each source file's template and stylesheet
     // dependencies; re-key them like the emit cache so loaders can register
-    // watch dependencies without re-parsing sources. AOT only: JIT compilations
-    // do not report them and fall back to the URL resolvers.
+    // watch dependencies without re-parsing sources. JIT compilations do not
+    // report them, and neither does @angular/build 20 in any mode, so both fall
+    // back to the URL resolvers.
     let resourceDependencies;
     if (componentResourcesDependencies) {
         resourceDependencies = new Map();

package/dist/utils/component-resolvers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"component-resolvers.d.ts","sourceRoot":"","sources":["../../src/utils/component-resolvers.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAYH,qBAAa,iBAAiB;IAK5B,OAAO,CAAC,QAAQ,CAAC,cAAc,CAA0C;IAEzE,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,MAAM,EAAE,CA6B1C;CACF;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,YASxC;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,YAO3C;AAED,MAAM,WAAW,sBAAsB;IACrC,IAAI,EAAE,MAAM,CAAC;IACb,gBAAgB,EAAE,MAAM,EAAE,CAAC;CAC5B;AAED,qBAAa,oBAAoB;IAC/B,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAG9B;IAEJ,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,MAAM,EAAE,CAa1C;CACF"}
+{"version":3,"file":"component-resolvers.d.ts","sourceRoot":"","sources":["../../src/utils/component-resolvers.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAWH,qBAAa,iBAAiB;IAC5B,OAAO,CAAC,QAAQ,CAAC,cAAc,CAA0C;IAEzE,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,MAAM,EAAE,CAoB1C;CACF;AAgFD,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAGnD;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAEtD;AAED,MAAM,WAAW,sBAAsB;IACrC,IAAI,EAAE,MAAM,CAAC;IACb,gBAAgB,EAAE,MAAM,EAAE,CAAC;CAC5B;AAED,qBAAa,oBAAoB;IAC/B,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAG9B;IAEJ,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,MAAM,EAAE,CAa1C;CACF"}

package/dist/utils/component-resolvers.js

@@ -27,29 +27,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TemplateUrlsResolver = exports.StyleUrlsResolver = void 0;
 exports.getStyleUrls = getStyleUrls;
 exports.getTemplateUrls = getTemplateUrls;
+const tslib_1 = require("tslib");
 const node_path_1 = require("node:path");
-const ts_morph_1 = require("ts-morph");
+const ts = tslib_1.__importStar(require("typescript"));
 const path_1 = require("path");
-const utils_1 = require("./utils");
 class StyleUrlsResolver {
     constructor() {
-        // These resolvers may be called multiple times during the same
-        // compilation for the same files. Caching is required because these
-        // resolvers use synchronous system calls to the filesystem, which can
-        // degrade performance when running compilations for multiple files.
         this.styleUrlsCache = new Map();
     }
     resolve(code, id) {
-        // Given the code is the following:
-        // @Component({
-        //   styleUrls: [
-        //     './app.component.scss'
-        //   ]
-        // })
-        // The `matchedStyleUrls` would result in: `styleUrls: [\n    './app.component.scss'\n  ]`.
-        const matchedStyleUrls = getStyleUrls(code)
-            // for type narrowing
-            .filter((v) => v !== undefined);
+        const matchedStyleUrls = getStyleUrls(code);
         const entry = this.styleUrlsCache.get(id);
         // We're using `matchedStyleUrls` as a key because the code may be changing continuously,
         // resulting in the resolver being called multiple times. While the code changes, the
@@ -67,19 +54,69 @@ class StyleUrlsResolver {
     }
 }
 exports.StyleUrlsResolver = StyleUrlsResolver;
+let lastScan;
+// These resolvers run only when the Angular compilation did not report the
+// component's resource dependencies, so they follow @angular/build's JIT
+// resource transformer: a resource becomes a module only when its URL is a
+// plain string literal, and anything else names no file to watch. Empty is
+// skipped for all three properties because it resolves to the component's own
+// directory rather than a file; Angular skips it for `templateUrl` and
+// `styleUrls` entries but not for `styleUrl`.
+function collectUrl(urls, node) {
+    if (ts.isStringLiteralLike(node) && node.text) {
+        urls.push(node.text);
+    }
+}
+// Both resolvers run back to back on the same source in the rspack loader, so
+// the last scan is memoized to parse each file once instead of twice.
+function scanComponentResources(code) {
+    if (lastScan !== undefined && lastScan.code === code) {
+        return lastScan.resources;
+    }
+    const sourceFile = ts.createSourceFile('cmp.ts', code, ts.ScriptTarget.Latest, 
+    // parent pointers are unused: every value below is read off the node itself
+    false, ts.ScriptKind.TS);
+    const styleUrl = [];
+    const styleUrls = [];
+    const templateUrl = [];
+    // Every property assignment in the file is considered, not just the ones in a
+    // @Component decorator: Angular identifies that decorator by resolving its
+    // symbol to @angular/core, which needs a type checker this parse has no
+    // program for.
+    const visit = (node) => {
+        if (ts.isPropertyAssignment(node) &&
+            // identifier and quoted keys name the same property, computed ones are
+            // dropped, matching how Angular reflects @Component metadata
+            (ts.isIdentifier(node.name) || ts.isStringLiteral(node.name))) {
+            const name = node.name.text;
+            if (name === 'styleUrl') {
+                collectUrl(styleUrl, node.initializer);
+            }
+            else if (name === 'templateUrl') {
+                collectUrl(templateUrl, node.initializer);
+            }
+            else if (name === 'styleUrls' &&
+                ts.isArrayLiteralExpression(node.initializer)) {
+                for (const element of node.initializer.elements) {
+                    collectUrl(styleUrls, element);
+                }
+            }
+        }
+        ts.forEachChild(node, visit);
+    };
+    ts.forEachChild(sourceFile, visit);
+    const resources = { styleUrl, styleUrls, templateUrl };
+    lastScan = { code, resources };
+    return resources;
+}
+// the explicit return types keep the memoized `readonly string[]` arrays from
+// being handed to callers unspread
 function getStyleUrls(code) {
-    const project = new ts_morph_1.Project({ useInMemoryFileSystem: true });
-    const sourceFile = project.createSourceFile('cmp.ts', code);
-    const properties = sourceFile.getDescendantsOfKind(ts_morph_1.SyntaxKind.PropertyAssignment);
-    const styleUrl = (0, utils_1.getTextByProperty)('styleUrl', properties);
-    const styleUrls = (0, utils_1.getAllTextByProperty)('styleUrls', properties);
+    const { styleUrl, styleUrls } = scanComponentResources(code);
     return [...styleUrls, ...styleUrl];
 }
 function getTemplateUrls(code) {
-    const project = new ts_morph_1.Project({ useInMemoryFileSystem: true });
-    const sourceFile = project.createSourceFile('cmp.ts', code);
-    const properties = sourceFile.getDescendantsOfKind(ts_morph_1.SyntaxKind.PropertyAssignment);
-    return (0, utils_1.getTextByProperty)('templateUrl', properties);
+    return [...scanComponentResources(code).templateUrl];
 }
 class TemplateUrlsResolver {
     constructor() {

package/dist/utils/utils.d.ts

@@ -1,8 +1,4 @@
-import { PropertyAssignment } from 'ts-morph';
 export declare const isUsingWindows: () => boolean;
-export declare function getTextByProperty(name: string, properties: PropertyAssignment[]): string[];
-export declare function getAllTextByProperty(name: string, properties: PropertyAssignment[]): string[];
-export declare function normalizeQuotes(str?: string): string;
 export declare function isPresent(variable: string | undefined): variable is string;
 export declare function parseMaxWorkers(value: string | undefined): number | null;
 export declare const maxWorkers: () => number;

package/dist/utils/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/utils/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAA0B,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAGtE,eAAO,MAAM,cAAc,eAA+B,CAAC;AAE3D,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,kBAAkB,EAAE,YAMjC;AAED,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,kBAAkB,EAAE,YAQjC;AAED,wBAAgB,eAAe,CAAC,GAAG,CAAC,EAAE,MAAM,UAE3C;AAED,wBAAgB,SAAS,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,GAAG,QAAQ,IAAI,MAAM,CAE1E;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,IAAI,CAIxE;AAED,eAAO,MAAM,UAAU,cAKtB,CAAC"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/utils/utils.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,cAAc,eAA+B,CAAC;AAE3D,wBAAgB,SAAS,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,GAAG,QAAQ,IAAI,MAAM,CAE1E;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,IAAI,CAIxE;AAED,eAAO,MAAM,UAAU,cAKtB,CAAC"}

package/dist/utils/utils.js

@@ -1,30 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.maxWorkers = exports.isUsingWindows = void 0;
-exports.getTextByProperty = getTextByProperty;
-exports.getAllTextByProperty = getAllTextByProperty;
-exports.normalizeQuotes = normalizeQuotes;
 exports.isPresent = isPresent;
 exports.parseMaxWorkers = parseMaxWorkers;
 const node_os_1 = require("node:os");
 const constants_1 = require("./constants");
 const isUsingWindows = () => (0, node_os_1.platform)() === 'win32';
 exports.isUsingWindows = isUsingWindows;
-function getTextByProperty(name, properties) {
-    return properties
-        .filter((property) => property.getName() === name)
-        .map((property) => normalizeQuotes(property.getInitializer()?.getText()))
-        .filter((url) => url !== undefined);
-}
-function getAllTextByProperty(name, properties) {
-    return properties
-        .filter((property) => property.getName() === name)
-        .map((property) => property.getInitializer())
-        .flatMap((array) => array.getElements().map((el) => normalizeQuotes(el.getText())));
-}
-function normalizeQuotes(str) {
-    return str ? str.replace(/['"`]/g, '') : str;
-}
 function isPresent(variable) {
     return typeof variable === 'string' && variable.trim() !== '';
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@nx/angular-rspack-compiler",
   "private": false,
-  "version": "23.2.0-beta.4",
+  "version": "23.2.0-beta.5",
   "publishConfig": {
     "access": "public"
   },
@@ -42,10 +42,9 @@
   "dependencies": {
     "sass-embedded": "^1.97.2",
     "semver": "^7.6.3",
-    "ts-morph": "^28.0.0",
     "tslib": "^2.3.0",
     "typescript": "~6.0.3",
-    "@nx/devkit": "23.2.0-beta.4"
+    "@nx/devkit": "23.2.0-beta.5"
   },
   "devDependencies": {
     "jsonc-eslint-parser": "^2.4.0",