test(angular-rspack): add normalize-options unit tests

Author: BioPhoton

packages/angular-rspack/package.json

@@ -55,6 +55,7 @@
     "express": "4.21.1"
   },
   "devDependencies": {
+    "@ng-rspack/testing-utils": "workspace:*",
     "@ng-rspack/testing-setup": "workspace:*",
     "@ng-rspack/testing-vitest-setup": "workspace:*"
   },

packages/angular-rspack/src/lib/models/normalize-options.ts

@@ -24,6 +24,7 @@ export type HasServerOptions = Pick<
   AngularRspackPluginOptions,
   'server' | 'ssrEntry' | 'root'
 >;
+
 export function getHasServer({
   server,
   ssrEntry,
@@ -37,6 +38,22 @@ export function getHasServer({
   );
 }
 
+export const DEFAULT_NORMALIZED_OPTIONS: Omit<
+  AngularRspackPluginOptions,
+  'root' | 'tsConfig' | 'fileReplacements' | 'ssrEntry' | 'server' | 'hasServer'
+> = {
+  index: './src/index.html',
+  browser: './src/main.ts',
+  polyfills: [],
+  assets: ['./public'],
+  styles: ['./src/styles.css'],
+  scripts: [],
+  aot: true,
+  inlineStyleLanguage: 'css',
+  skipTypeChecking: false,
+  useTsProjectReferences: false,
+} as const;
+
 export function normalizeOptions(
   options: Partial<AngularRspackPluginOptions> = {}
 ): AngularRspackPluginOptions {
@@ -45,24 +62,31 @@ export function normalizeOptions(
     fileReplacements = [],
     server,
     ssrEntry,
+    ...restOptions
   } = options;
 
   return {
+    ...DEFAULT_NORMALIZED_OPTIONS,
+    ...restOptions,
     root,
-    index: options.index ?? './src/index.html',
-    browser: options.browser ?? './src/main.ts',
-    ...(server ? { server } : {}),
-    ...(ssrEntry ? { ssrEntry } : {}),
-    polyfills: options.polyfills ?? [],
-    assets: options.assets ?? ['./public'],
-    styles: options.styles ?? ['./src/styles.css'],
-    scripts: options.scripts ?? [],
-    fileReplacements: resolveFileReplacements(fileReplacements, root),
-    aot: options.aot ?? true,
-    inlineStyleLanguage: options.inlineStyleLanguage ?? 'css',
     tsConfig: options.tsConfig ?? join(root, 'tsconfig.app.json'),
-    hasServer: getHasServer({ server, ssrEntry, root }),
-    skipTypeChecking: options.skipTypeChecking ?? false,
-    useTsProjectReferences: options.useTsProjectReferences ?? false,
+    fileReplacements: resolveFileReplacements(fileReplacements, root),
+    ...normalizeOptionsServerOptions({ server, ssrEntry, root }),
+  };
+}
+
+export function normalizeOptionsServerOptions({
+  server,
+  ssrEntry,
+  root,
+}: Pick<AngularRspackPluginOptions, 'root' | 'server' | 'ssrEntry'>) {
+  if (!getHasServer({ server, ssrEntry, root })) {
+    return { hasServer: false };
+  }
+
+  return {
+    hasServer: true,
+    server,
+    ssrEntry,
   };
 }

packages/angular-rspack/src/lib/models/normalize-options.unit.test.ts

@@ -2,9 +2,13 @@ import { FileReplacement } from '@ng-rspack/compiler';
 import {
   getHasServer,
   HasServerOptions,
+  normalizeOptions,
+  normalizeOptionsServerOptions,
   resolveFileReplacements,
 } from './normalize-options';
-import { describe } from 'vitest';
+import { describe, expect } from 'vitest';
+import { vol } from 'memfs';
+import { MEMFS_VOLUME } from '@ng-rspack/testing-utils';
 
 describe('resolveFileReplacements', () => {
   it('should resolve file replacements', () => {
@@ -19,6 +23,10 @@ describe('resolveFileReplacements', () => {
 });
 
 describe('getHasServer', () => {
+  afterEach(() => {
+    vol.reset();
+  });
+
   it('should return false if server is not provided', () => {
     expect(getHasServer({ root: '' })).toBe(false);
   });
@@ -30,16 +38,116 @@ describe('getHasServer', () => {
   it('should return false if server file does not exist', () => {
     expect(
       getHasServer({
-        server: 'server',
-        ssrEntry: 'ssrEntry',
+        server: 'main.ts',
+        ssrEntry: 'server.main.ts',
         root: '/not-existing-folder',
       })
     ).toBe(false);
   });
 
-  it.todo('should return true if server and ssrEntry files exist', () => {
+  it('should return true if server and ssrEntry files exist', () => {
+    vol.fromJSON(
+      {
+        'main.ts': '',
+        'server.main.ts': '',
+      },
+      MEMFS_VOLUME
+    );
+
     expect(
-      getHasServer({ server: 'server', ssrEntry: 'ssrEntry', root: __dirname })
+      getHasServer({
+        server: 'main.ts',
+        ssrEntry: 'server.main.ts',
+        root: MEMFS_VOLUME,
+      })
     ).toBe(true);
   });
 });
+
+describe('normalizeOptionsServerOptions', () => {
+  it('should return hasServer false options if getHasServer is false', () => {
+    expect(
+      normalizeOptionsServerOptions({
+        root: MEMFS_VOLUME,
+      })
+    ).toStrictEqual({ hasServer: false });
+  });
+
+  it('should return hasServer true as well as the server and ssrEntry options if getHasServer is true', () => {
+    vol.fromJSON(
+      {
+        'main.ts': '',
+        'server.main.ts': '',
+      },
+      MEMFS_VOLUME
+    );
+
+    expect(
+      normalizeOptionsServerOptions({
+        server: 'main.ts',
+        ssrEntry: 'server.main.ts',
+        root: MEMFS_VOLUME,
+      })
+    ).toStrictEqual({
+      hasServer: true,
+      server: 'main.ts',
+      ssrEntry: 'server.main.ts',
+    });
+  });
+});
+
+describe('normalizeOptions', () => {
+  it('should normalize options default options', () => {
+    expect(normalizeOptions()).toStrictEqual({
+      root: process.cwd(),
+      aot: true,
+      hasServer: false,
+      inlineStyleLanguage: 'css',
+      skipTypeChecking: false,
+      polyfills: [],
+      index: './src/index.html',
+      browser: './src/main.ts',
+      assets: ['./public'],
+      styles: ['./src/styles.css'],
+      scripts: [],
+      fileReplacements: [],
+      tsConfig: expect.stringMatching(/tsconfig.app.json$/),
+      useTsProjectReferences: false,
+    });
+  });
+
+  it('should normalize options server options', () => {
+    vol.fromJSON(
+      {
+        'main.ts': '',
+        'server.main.ts': '',
+      },
+      MEMFS_VOLUME
+    );
+
+    expect(
+      normalizeOptions({
+        root: MEMFS_VOLUME,
+        server: 'main.ts',
+        ssrEntry: 'server.main.ts',
+      })
+    ).toStrictEqual({
+      root: MEMFS_VOLUME,
+      server: 'main.ts',
+      ssrEntry: 'server.main.ts',
+      hasServer: true,
+      aot: true,
+      inlineStyleLanguage: 'css',
+      skipTypeChecking: false,
+      polyfills: [],
+      index: './src/index.html',
+      browser: './src/main.ts',
+      assets: ['./public'],
+      styles: ['./src/styles.css'],
+      scripts: [],
+      fileReplacements: [],
+      tsConfig: expect.stringMatching(/tsconfig.app.json$/),
+      useTsProjectReferences: false,
+    });
+  });
+});

pnpm-lock.yaml

@@ -1,11 +1,4 @@
-import {
-  MockInstance,
-  afterEach,
-  beforeEach,
-  vi,
-  beforeAll,
-  afterAll,
-} from 'vitest';
+import { afterAll, afterEach, beforeAll, beforeEach, MockInstance, vi } from 'vitest';
 import { MEMFS_VOLUME } from '@ng-rspack/testing-utils';
 
 /**