@wasp.sh/wasp-cli-darwin-arm64-unknown 0.24.0 → 0.25.0

package/data/packages/spec/dist/src/spec-pipeline/loadWaspTsSpec.js

@@ -1,5 +1,5 @@
 import { unrun } from "unrun";
-import { SpecUserError } from "../spec/specUserError.js";
+import { WaspSpecUserError } from "../spec/waspSpecUserError.js";
 import { transformWaspTsSpecFilesPlugin } from "./transformWaspTsSpecFilesPlugin/index.js";
 import { typecheckPlugin } from "./typecheckPlugin/index.js";
 export async function loadWaspTsSpecDefaultExport({ specPath, tsconfigPath, }) {
@@ -16,26 +16,29 @@ export async function loadWaspTsSpecDefaultExport({ specPath, tsconfigPath, }) {
         // https://gugustinette.github.io/unrun/advanced/presets.html
         preset: "bundle-require",
     }).catch((error) => {
-        // When a plugin throws, the bundler wraps the original error in an
-        // aggregate build error and exposes the originals on `.errors`. We dig out
-        // the `SpecUserError` so it reaches the top-level handler in `run.ts` as a
-        // clean user error instead of an internal crash.
-        throw getSpecUserError(error) ?? error;
+        throw findWaspSpecUserError(error) ?? error;
     });
     return getDefaultExport(specModule);
 }
-function getSpecUserError(error) {
-    if (
-    // Checks to convince TypeScript that we can access `error.errors[0]`.
-    error instanceof Error &&
+/*
+ Errors can get wrapped into other errors. This walks Error.cause and
+ AggregateError.errors (only if a single item) to find an underlying
+ `WaspSpecUserError` if it exists.
+*/
+function findWaspSpecUserError(error) {
+    if (error instanceof WaspSpecUserError) {
+        return error;
+    }
+    // unrun doesn't throw actual `AggregateError`s, but it adds an `errors`
+    // property to the error object.
+    if (error instanceof Error &&
         "errors" in error &&
         Array.isArray(error.errors) &&
-        error.errors.length === 1 &&
-        error.errors[0] instanceof SpecUserError) {
-        return error.errors[0];
+        error.errors.length === 1) {
+        return findWaspSpecUserError(error.errors[0]);
     }
-    else {
-        return undefined;
+    if (error instanceof Error && error.cause) {
+        return findWaspSpecUserError(error.cause);
     }
 }
 function getDefaultExport(loadedModule) {

package/data/packages/spec/dist/src/spec-pipeline/transformWaspTsSpecFilesPlugin/imports/apply.js

@@ -1,4 +1,4 @@
-import { SpecUserError } from "../../../spec/specUserError.js";
+import { WaspSpecUserError } from "../../../spec/waspSpecUserError.js";
 import { buildImportStatement, PUBLIC_REF_HELPER_IMPORT_NAME, PUBLIC_REF_HELPER_IMPORT_SOURCE, } from "../util.js";
 export function applyTransformImportsPlan_mutate(magicString, { refImports, safeRefHelperName }) {
     for (const { removeImport } of refImports) {
@@ -23,7 +23,7 @@ function getLoweredImportSource(ref, ctx) {
         case "default":
             return getRefObjectBindingSource(ref.refObject.importDefault, ref.refObject, ctx);
         case "namespace":
-            throw new SpecUserError([
+            throw new WaspSpecUserError([
                 "Namespace imports are not supported for reference imports.",
                 `Replace \`import * as ${ref.alias} from "${ref.from}" with { type: "ref" }\` with a named or default reference import.`,
             ].join("\n"));

package/data/packages/spec/dist/src/spec-pipeline/transformWaspTsSpecFilesPlugin/imports/check.js

@@ -1,9 +1,9 @@
-import { SpecUserError } from "../../../spec/specUserError.js";
+import { WaspSpecUserError } from "../../../spec/waspSpecUserError.js";
 import { getStringValue } from "../util.js";
 export function assertCanTransformImports(ast) {
     const hasRefExports = ast.body.some(isRefExportDeclaration);
     if (hasRefExports) {
-        throw new SpecUserError("Re-exporting refs is not supported. First import the reference and then re-export it if needed.");
+        throw new WaspSpecUserError("Re-exporting refs is not supported. First import the reference and then re-export it if needed.");
     }
 }
 function isRefExportDeclaration(node) {

package/data/packages/spec/dist/src/spec-pipeline/transformWaspTsSpecFilesPlugin/imports/plan.js

@@ -1,4 +1,4 @@
-import { SpecUserError } from "../../../spec/specUserError.js";
+import { WaspSpecUserError } from "../../../spec/waspSpecUserError.js";
 import { getStringValue, getTopLevelBindings, makeSafeName, PUBLIC_REF_HELPER_IMPORT_NAME, } from "../util.js";
 export function planTransformImports(ast) {
     const refImports = findRefImports(ast);
@@ -13,7 +13,7 @@ function findRefImports(ast) {
     return ast.body.filter(isRefImportDeclaration).map((node) => {
         const importSource = getStringValue(node.source);
         if (node.specifiers.length === 0) {
-            throw new SpecUserError(`Ref import from ${JSON.stringify(importSource)} must import at least one binding.`);
+            throw new WaspSpecUserError(`Ref import from ${JSON.stringify(importSource)} must import at least one binding.`);
         }
         return {
             references: node.specifiers.map((specifier) => makeRefObject(importSource, specifier)),

package/data/packages/spec/dist/src/spec-pipeline/transformWaspTsSpecFilesPlugin/refHelper/check.js

@@ -1,9 +1,9 @@
-import { SpecUserError } from "../../../spec/specUserError.js";
+import { WaspSpecUserError } from "../../../spec/waspSpecUserError.js";
 import { PUBLIC_REF_HELPER_IMPORT_SOURCE } from "../util.js";
 export function assertCanTransformRefHelper(ast) {
     const hasRefHelperExports = ast.body.some(isRefHelperExportDeclaration);
     if (hasRefHelperExports) {
-        throw new SpecUserError(`Re-exporting from the ${PUBLIC_REF_HELPER_IMPORT_SOURCE} package is not supported. First import it and then re-export it if needed.`);
+        throw new WaspSpecUserError(`Re-exporting from the ${PUBLIC_REF_HELPER_IMPORT_SOURCE} package is not supported. First import it and then re-export it if needed.`);
     }
 }
 function isRefHelperExportDeclaration(node) {

package/data/packages/spec/dist/src/spec-pipeline/typecheckPlugin/index.js

@@ -1,6 +1,6 @@
 import assert from "node:assert/strict";
 import ts from "typescript";
-import { SpecUserError } from "../../spec/specUserError.js";
+import { WaspSpecUserError } from "../../spec/waspSpecUserError.js";
 import { WASP_SPEC_FILE_REGEX } from "../common.js";
 import { typecheckProject } from "./project.js";
 export function typecheckPlugin({ tsconfigPath, }) {
@@ -28,7 +28,7 @@ export function typecheckPlugin({ tsconfigPath, }) {
                 : undefined;
             const hasErrorDiagnostic = diagnostics.some((d) => d.category === ts.DiagnosticCategory.Error);
             if (hasErrorDiagnostic) {
-                throw new SpecUserError(formattedDiagnostics);
+                throw new WaspSpecUserError(formattedDiagnostics);
             }
             else if (formattedDiagnostics) {
                 console.warn(formattedDiagnostics);