@roots/bud-compiler 2023.11.28-7 → 2023.11.29-7

package/lib/service/index.d.ts

@@ -26,7 +26,7 @@ declare class Compiler extends Service implements BudCompiler {
     /**
      * {@link BudCompiler.onError}
      */
-    onError(error: Error): void;
+    onError(error: Error | undefined): void;
     /**
      * {@link BudCompiler.onStats}
      */

package/lib/service/index.js

@@ -3,10 +3,10 @@ import { jsx as _jsx } from "@roots/bud-support/jsx-runtime";
 import { cpus } from 'node:os';
 import process from 'node:process';
 import { pathToFileURL } from 'node:url';
-import { Error as DisplayError } from '@roots/bud-dashboard/components/error';
+import { Display as DisplayError } from '@roots/bud-dashboard/components/error';
 import { Service } from '@roots/bud-framework/service';
 import { bind } from '@roots/bud-support/decorators/bind';
-import { BudError } from '@roots/bud-support/errors';
+import { BudError, CompilerError } from '@roots/bud-support/errors';
 import isNull from '@roots/bud-support/lodash/isNull';
 import isNumber from '@roots/bud-support/lodash/isNumber';
 import isString from '@roots/bud-support/lodash/isString';
@@ -31,17 +31,16 @@ class Compiler extends Service {
         if (!error)
             return;
         this.app.server?.appliedMiddleware?.hot?.publish({ error });
+        const normalized = CompilerError.normalize(error, {
+            thrownBy: import.meta.url,
+        });
+        normalized.details = undefined;
         this.app.notifier?.notify({
             group: this.app.label,
-            message: error.message,
-            subtitle: error.name,
+            message: normalized.message,
+            subtitle: normalized.name,
         });
-        if (`isBudError` in error) {
-            this.app.context.render(_jsx(DisplayError, { error: error }));
-        }
-        else {
-            this.app.context.render(_jsx(DisplayError, { error: BudError.normalize(error) }));
-        }
+        this.app.context.render(_jsx(DisplayError, { error: error }));
     }
     /**
      * {@link BudCompiler.onStats}
@@ -109,26 +108,24 @@ class Compiler extends Service {
     async compile(bud) {
         const config = !bud.hasChildren
             ? [await bud.build.make()]
-            : await Promise.all(Object.values(bud.children).map(async (child) => child.build.make().catch(error => {
+            : await Promise.all(Object.values(bud.children).map(async (child) => await child.build.make().catch(error => {
                 throw error;
             })));
         this.config = config?.filter(Boolean);
-        this.config.parallelism = Math.max(cpus().length - 1, 1);
-        this.logger.info(`parallel compilations: ${this.config.parallelism}`);
+        if (this.config.length > 1) {
+            this.config.parallelism = Math.max(cpus().length - 1, 1);
+            this.logger.info(`parallel compilations: ${this.config.parallelism}`);
+        }
         await bud.hooks.fire(`compiler.before`, bud).catch(error => {
             throw error;
         });
         this.logger.timeEnd(`initialize`);
-        try {
-            this.instance = this.implementation(this.config);
-        }
-        catch (error) {
-            const normalError = error instanceof Error ? error : BudError.normalize(error);
-            this.onError(normalError);
-        }
+        this.instance = this.implementation(this.config);
         this.instance.hooks.done.tap(bud.label, (stats) => {
             this.onStats(stats);
-            bud.hooks.fire(`compiler.done`, bud, this.stats).catch(this.onError);
+            bud.hooks
+                .fire(`compiler.done`, bud, this.stats)
+                .catch(this.app.catch);
         });
         return this.instance;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@roots/bud-compiler",
-  "version": "2023.11.28-7",
+  "version": "2023.11.29-7",
   "description": "Compilation handler",
   "engines": {
     "node": ">=16"
@@ -65,15 +65,15 @@
   "types": "./lib/index.d.ts",
   "module": "./lib/index.js",
   "devDependencies": {
-    "@roots/bud-api": "2023.11.28-7",
+    "@roots/bud-api": "2023.11.29-7",
     "@skypack/package-check": "0.2.2",
     "@types/node": "20.9.0",
     "@types/react": "18.2.37"
   },
   "dependencies": {
-    "@roots/bud-dashboard": "2023.11.28-7",
-    "@roots/bud-framework": "2023.11.28-7",
-    "@roots/bud-support": "2023.11.28-7",
+    "@roots/bud-dashboard": "2023.11.29-7",
+    "@roots/bud-framework": "2023.11.29-7",
+    "@roots/bud-support": "2023.11.29-7",
     "react": "18.2.0",
     "tslib": "2.6.2"
   },

package/src/service/index.tsx

@@ -17,10 +17,10 @@ import {cpus} from 'node:os'
 import process from 'node:process'
 import {pathToFileURL} from 'node:url'
 
-import {Error as DisplayError} from '@roots/bud-dashboard/components/error'
+import {Display as DisplayError} from '@roots/bud-dashboard/components/error'
 import {Service} from '@roots/bud-framework/service'
 import {bind} from '@roots/bud-support/decorators/bind'
-import {BudError} from '@roots/bud-support/errors'
+import {BudError, CompilerError} from '@roots/bud-support/errors'
 import isNull from '@roots/bud-support/lodash/isNull'
 import isNumber from '@roots/bud-support/lodash/isNumber'
 import isString from '@roots/bud-support/lodash/isString'
@@ -54,26 +54,27 @@ class Compiler extends Service implements BudCompiler {
    * {@link BudCompiler.onError}
    */
   @bind
-  public onError(error: Error) {
+  public onError(error: Error | undefined) {
     process.exitCode = 1
     if (!error) return
 
     this.app.server?.appliedMiddleware?.hot?.publish({error})
 
+    const normalized = CompilerError.normalize(error, {
+      thrownBy: import.meta.url,
+    })
+
+    normalized.details = undefined
+
     this.app.notifier?.notify({
       group: this.app.label,
-      message: error.message,
-      subtitle: error.name,
+      message: normalized.message,
+      subtitle: normalized.name,
     })
 
-    if (`isBudError` in error) {
-      this.app.context.render(<DisplayError error={error} />)
-    } else {
-      this.app.context.render(
-        <DisplayError error={BudError.normalize(error)} />,
-      )
-    }
+    this.app.context.render(<DisplayError error={error} />)
   }
+
   /**
    * {@link BudCompiler.onStats}
    */
@@ -152,17 +153,20 @@ class Compiler extends Service implements BudCompiler {
     const config = !bud.hasChildren
       ? [await bud.build.make()]
       : await Promise.all(
-          Object.values(bud.children).map(async (child: Bud) =>
-            child.build.make().catch(error => {
-              throw error
-            }),
+          Object.values(bud.children).map(
+            async (child: Bud) =>
+              await child.build.make().catch(error => {
+                throw error
+              }),
           ),
         )
 
     this.config = config?.filter(Boolean)
 
-    this.config.parallelism = Math.max(cpus().length - 1, 1)
-    this.logger.info(`parallel compilations: ${this.config.parallelism}`)
+    if (this.config.length > 1) {
+      this.config.parallelism = Math.max(cpus().length - 1, 1)
+      this.logger.info(`parallel compilations: ${this.config.parallelism}`)
+    }
 
     await bud.hooks.fire(`compiler.before`, bud).catch(error => {
       throw error
@@ -170,17 +174,13 @@ class Compiler extends Service implements BudCompiler {
 
     this.logger.timeEnd(`initialize`)
 
-    try {
-      this.instance = this.implementation(this.config)
-    } catch (error: unknown) {
-      const normalError =
-        error instanceof Error ? error : BudError.normalize(error)
-      this.onError(normalError)
-    }
+    this.instance = this.implementation(this.config)
 
     this.instance.hooks.done.tap(bud.label, (stats: any) => {
       this.onStats(stats)
-      bud.hooks.fire(`compiler.done`, bud, this.stats).catch(this.onError)
+      bud.hooks
+        .fire(`compiler.done`, bud, this.stats)
+        .catch(this.app.catch)
     })
 
     return this.instance