@vercel/microfrontends 1.1.1-canary.2 → 1.1.1-canary.3

package/dist/microfrontends/server.js

@@ -220,6 +220,10 @@ var MicrofrontendConfigClient = class {
 
 // src/config/microfrontends-config/isomorphic/validation.ts
 import { pathToRegexp as pathToRegexp2, parse as parsePathRegexp } from "path-to-regexp";
+var LIST_FORMATTER = new Intl.ListFormat("en", {
+  style: "long",
+  type: "conjunction"
+});
 var validateConfigPaths = (applicationConfigsById) => {
   if (!applicationConfigsById) {
     return;
@@ -352,15 +356,15 @@ var validateConfigDefaultApplication = (applicationConfigsById) => {
   if (!applicationConfigsById) {
     return;
   }
-  const applicationsWithRouting = Object.entries(applicationConfigsById).filter(
-    ([, app]) => !isDefaultApp(app)
-  );
-  const applicationsWithRoutingNames = applicationsWithRouting.map(
-    ([key]) => key
+  const applicationsWithoutRouting = Object.entries(
+    applicationConfigsById
+  ).filter(([, app]) => isDefaultApp(app));
+  const numApplicationsWithoutRouting = applicationsWithoutRouting.reduce(
+    (acc) => {
+      return acc + 1;
+    },
+    0
   );
-  const numApplications = Object.keys(applicationConfigsById).length;
-  const numApplicationsWithRouting = applicationsWithRoutingNames.length;
-  const numApplicationsWithoutRouting = numApplications - numApplicationsWithRouting;
   if (numApplicationsWithoutRouting === 0) {
     throw new MicrofrontendError(
       "No default application found. At least one application needs to be the default by omitting routing.",
@@ -368,8 +372,11 @@ var validateConfigDefaultApplication = (applicationConfigsById) => {
     );
   }
   if (numApplicationsWithoutRouting > 1) {
+    const applicationNamesMissingRouting = applicationsWithoutRouting.map(
+      ([name]) => name
+    );
     throw new MicrofrontendError(
-      `Only one application can omit "routing". Found ${applicationsWithRoutingNames.length - Object.keys(applicationConfigsById).length > 1}.`,
+      `All applications except for the default app must contain the "routing" field. Applications that are missing routing: ${LIST_FORMATTER.format(applicationNamesMissingRouting)}.`,
       { type: "config", subtype: "multiple_default_applications" }
     );
   }
@@ -938,14 +945,20 @@ var Microfrontends = class {
 import fs from "node:fs";
 import path from "node:path";
 var GIT_DIRECTORY = ".git";
+function hasGitDirectory(dir) {
+  const gitPath = path.join(dir, GIT_DIRECTORY);
+  return fs.existsSync(gitPath) && fs.statSync(gitPath).isDirectory();
+}
+function hasPnpmWorkspaces(dir) {
+  return fs.existsSync(path.join(dir, "pnpm-workspace.yaml"));
+}
 function findRepositoryRoot(startDir) {
   if (process.env.NX_WORKSPACE_ROOT) {
     return process.env.NX_WORKSPACE_ROOT;
   }
   let currentDir = startDir || process.cwd();
   while (currentDir !== path.parse(currentDir).root) {
-    const gitPath = path.join(currentDir, GIT_DIRECTORY);
-    if (fs.existsSync(gitPath) && fs.statSync(gitPath).isDirectory()) {
+    if (hasGitDirectory(currentDir) || hasPnpmWorkspaces(currentDir)) {
       return currentDir;
     }
     currentDir = path.dirname(currentDir);
@@ -1056,7 +1069,7 @@ function findDefaultMicrofrontendsPackages({
     }
     if (matchingPaths.length > 1) {
       throw new Error(
-        `Found multiple default applications referencing "${applicationName}" in the repository, this is not yet supported.
+        `Found multiple default applications referencing "${applicationName}" in the repository, but only one is allowed.
 ${matchingPaths.join("\n  \u2022 ")}`
       );
     }
@@ -1498,13 +1511,54 @@ var schema_default = {
 var SCHEMA = schema_default;
 
 // src/config/microfrontends/server/validation.ts
-function filterAjvErrors(errors) {
+var LIST_FORMATTER2 = new Intl.ListFormat("en", {
+  style: "long",
+  type: "disjunction"
+});
+function formatAjvErrors(errors) {
   if (!errors) {
     return [];
   }
-  return errors.filter((error) => {
-    return error.keyword === "additionalProperties" || error.keyword === "required";
-  });
+  const errorMessages = [];
+  for (const error of errors) {
+    if (error.instancePath === "" && (error.keyword === "anyOf" || error.keyword === "required" && error.params.missingProperty === "partOf")) {
+      continue;
+    }
+    const instancePath = error.instancePath.slice(1);
+    const formattedInstancePath = instancePath === "" ? "at the root" : `in field ${instancePath}`;
+    if (error.keyword === "required" && error.params.missingProperty === "routing" && instancePath.split("/").length === 2) {
+      errorMessages.push(
+        `Unable to infer if ${instancePath} is the default app or a child app. This usually means that there is another error in the configuration.`
+      );
+    } else if (error.keyword === "anyOf" && instancePath.split("/").length > 2) {
+      const anyOfErrors = errors.filter(
+        (e) => e.instancePath === error.instancePath && e.keyword !== "anyOf"
+      );
+      if (anyOfErrors.every((e) => e.keyword === "type")) {
+        const allowedTypes = LIST_FORMATTER2.format(
+          anyOfErrors.map((e) => {
+            return e.keyword === "type" ? String(e.params.type) : "unknown";
+          })
+        );
+        errorMessages.push(
+          `Incorrect type for ${instancePath}. Must be one of ${allowedTypes}`
+        );
+      } else {
+        errorMessages.push(
+          `Invalid field for ${instancePath}. Possible error messages are ${LIST_FORMATTER2.format(anyOfErrors.map((e) => e.message ?? ""))}`
+        );
+      }
+    } else if (error.keyword === "additionalProperties" && !(error.params.additionalProperty === "routing" && instancePath.split("/").length === 2)) {
+      errorMessages.push(
+        `Property '${error.params.additionalProperty}' is not allowed ${formattedInstancePath}`
+      );
+    } else if (error.keyword === "required") {
+      errorMessages.push(
+        `Property '${error.params.missingProperty}' is required ${formattedInstancePath}`
+      );
+    }
+  }
+  return errorMessages;
 }
 function validateSchema(configString) {
   const parsedConfig = parse3(configString);
@@ -1513,8 +1567,10 @@ function validateSchema(configString) {
   const isValid = validate(parsedConfig);
   if (!isValid) {
     throw new MicrofrontendError(
-      `Invalid microfrontends config:
- - ${ajv.errorsText(filterAjvErrors(validate.errors), { separator: "\n - " })}
+      `Invalid microfrontends config:${formatAjvErrors(validate.errors).map((error) => `
+ - ${error}`).join(
+        ""
+      )}
 
 See https://openapi.vercel.sh/microfrontends.json for the schema.`,
       { type: "config", subtype: "does_not_match_schema" }
@@ -1649,6 +1705,9 @@ var MicrofrontendsServer = class extends Microfrontends {
       }
       throw new Error("Unable to infer");
     } catch (e) {
+      if (e instanceof MicrofrontendError) {
+        throw e;
+      }
       throw new MicrofrontendError(
         "Unable to locate and parse microfrontends configuration",
         { cause: e, type: "config", subtype: "inference_failed" }