astro 2.9.7 → 3.0.0-beta.0

package/dist/core/endpoint/dev/index.js

@@ -10,7 +10,7 @@ async function call(options) {
     env,
     mod: preload
   });
-  return await callEndpoint(endpointHandler, env, ctx, middleware == null ? void 0 : middleware.onRequest);
+  return await callEndpoint(endpointHandler, env, ctx, middleware?.onRequest);
 }
 export {
   call

package/dist/core/endpoint/index.js

@@ -59,7 +59,6 @@ function createAPIContext({
   return context;
 }
 async function callEndpoint(mod, env, ctx, onRequest) {
-  var _a;
   const context = createAPIContext({
     request: ctx.request,
     params: ctx.params,
@@ -74,11 +73,11 @@ async function callEndpoint(mod, env, ctx, onRequest) {
       onRequest,
       context,
       async () => {
-        return await renderEndpoint(mod, context, env.ssr);
+        return await renderEndpoint(mod, context, env.ssr, env.logging);
       }
     );
   } else {
-    response = await renderEndpoint(mod, context, env.ssr);
+    response = await renderEndpoint(mod, context, env.ssr, env.logging);
   }
   if (response instanceof Response) {
     attachToResponse(response, context.cookies);
@@ -87,7 +86,7 @@ async function callEndpoint(mod, env, ctx, onRequest) {
       response
     };
   }
-  if (env.ssr && !((_a = ctx.route) == null ? void 0 : _a.prerender)) {
+  if (env.ssr && !ctx.route?.prerender) {
     if (response.hasOwnProperty("headers")) {
       warn(
         env.logging,

package/dist/core/errors/dev/utils.js

@@ -12,7 +12,6 @@ import { normalizeLF } from "../utils.js";
 function collectErrorMetadata(e, rootFolder) {
   const err = AggregateError.is(e) || Array.isArray(e.errors) ? e.errors : [e];
   err.forEach((error) => {
-    var _a, _b;
     if (e.stack) {
       const stackInfo = collectInfoFromStacktrace(e);
       error.stack = stackInfo.stack;
@@ -20,9 +19,9 @@ function collectErrorMetadata(e, rootFolder) {
       error.plugin = stackInfo.plugin;
       error.pluginCode = stackInfo.pluginCode;
     }
-    const normalizedFile = normalizePath(((_a = error.loc) == null ? void 0 : _a.file) || "");
-    const normalizedRootFolder = removeLeadingForwardSlashWindows((rootFolder == null ? void 0 : rootFolder.pathname) || "");
-    if (((_b = error.loc) == null ? void 0 : _b.file) && rootFolder && (!(normalizedFile == null ? void 0 : normalizedFile.startsWith(normalizedRootFolder)) || !isAbsolute(normalizedFile))) {
+    const normalizedFile = normalizePath(error.loc?.file || "");
+    const normalizedRootFolder = removeLeadingForwardSlashWindows(rootFolder?.pathname || "");
+    if (error.loc?.file && rootFolder && (!normalizedFile?.startsWith(normalizedRootFolder) || !isAbsolute(normalizedFile))) {
       error.loc.file = join(fileURLToPath(rootFolder), error.loc.file);
     }
     if (error.loc && (!error.frame || !error.fullCode)) {
@@ -42,22 +41,21 @@ function collectErrorMetadata(e, rootFolder) {
   });
   if (!AggregateError.is(e) && Array.isArray(e.errors)) {
     e.errors.forEach((buildError, i) => {
-      var _a;
       const { location, pluginName, text } = buildError;
       if (text) {
         err[i].message = text;
       }
       if (location) {
         err[i].loc = { file: location.file, line: location.line, column: location.column };
-        err[i].id = err[0].id || (location == null ? void 0 : location.file);
+        err[i].id = err[0].id || location?.file;
       }
       if (err[i].frame) {
-        const errorLines = (_a = err[i].frame) == null ? void 0 : _a.trim().split("\n");
+        const errorLines = err[i].frame?.trim().split("\n");
         if (errorLines) {
-          err[i].frame = !/^\d/.test(errorLines[0]) ? errorLines == null ? void 0 : errorLines.slice(1).join("\n") : err[i].frame;
+          err[i].frame = !/^\d/.test(errorLines[0]) ? errorLines?.slice(1).join("\n") : err[i].frame;
         }
       }
-      const possibleFilePath = (location == null ? void 0 : location.file) ?? err[i].id;
+      const possibleFilePath = location?.file ?? err[i].id;
       if (possibleFilePath && err[i].loc && (!err[i].frame || !err[i].fullCode)) {
         try {
           const fileContents = fs.readFileSync(possibleFilePath, "utf8");
@@ -78,14 +76,13 @@ function collectErrorMetadata(e, rootFolder) {
   return err[0];
 }
 function generateHint(err) {
-  var _a, _b;
   const commonBrowserAPIs = ["document", "window"];
   if (/Unknown file extension \"\.(jsx|vue|svelte|astro|css)\" for /.test(err.message)) {
     return "You likely need to add this package to `vite.ssr.noExternal` in your astro config file.";
   } else if (commonBrowserAPIs.some((api) => err.toString().includes(api))) {
     const hint = `Browser APIs are not available on the server.
 
-${((_b = (_a = err.loc) == null ? void 0 : _a.file) == null ? void 0 : _b.endsWith(".astro")) ? "Move your code to a <script> tag outside of the frontmatter, so the code runs on the client." : "If the code is in a framework component, try to access these objects after rendering using lifecycle methods or use a `client:only` directive to make the component exclusively run on the client."}
+${err.loc?.file?.endsWith(".astro") ? "Move your code to a <script> tag outside of the frontmatter, so the code runs on the client." : "If the code is in a framework component, try to access these objects after rendering using lifecycle methods or use a `client:only` directive to make the component exclusively run on the client."}
 
 See https://docs.astro.build/en/guides/troubleshooting/#document-or-window-is-not-defined for more information.
 		`;
@@ -94,7 +91,6 @@ See https://docs.astro.build/en/guides/troubleshooting/#document-or-window-is-no
   return err.hint;
 }
 function collectInfoFromStacktrace(error) {
-  var _a, _b, _c;
   let stackInfo = {
     stack: error.stack,
     plugin: error.plugin,
@@ -104,10 +100,10 @@ function collectInfoFromStacktrace(error) {
   stackInfo.stack = normalizeLF(error.stack);
   const stackText = stripAnsi(error.stack);
   if (!stackInfo.loc || !stackInfo.loc.column && !stackInfo.loc.line) {
-    const possibleFilePath = ((_a = error.loc) == null ? void 0 : _a.file) || error.pluginCode || error.id || // TODO: this could be better, `src` might be something else
+    const possibleFilePath = error.loc?.file || error.pluginCode || error.id || // TODO: this could be better, `src` might be something else
     stackText.split("\n").find((ln) => ln.includes("src") || ln.includes("node_modules"));
-    const source = possibleFilePath == null ? void 0 : possibleFilePath.replace(/^[^(]+\(([^)]+).*$/, "$1").replace(/^\s+at\s+/, "");
-    let file = source == null ? void 0 : source.replace(/(:[0-9]+)/g, "");
+    const source = possibleFilePath?.replace(/^[^(]+\(([^)]+).*$/, "$1").replace(/^\s+at\s+/, "");
+    let file = source?.replace(/(:[0-9]+)/g, "");
     const location = /:([0-9]+):([0-9]+)/g.exec(source) ?? [];
     const line = location[1];
     const column = location[2];
@@ -124,7 +120,7 @@ function collectInfoFromStacktrace(error) {
     }
   }
   if (!stackInfo.plugin) {
-    stackInfo.plugin = ((_b = /withastro\/astro\/packages\/integrations\/([\w-]+)/gim.exec(stackText)) == null ? void 0 : _b.at(1)) || ((_c = /(@astrojs\/[\w-]+)\/(server|client|index)/gim.exec(stackText)) == null ? void 0 : _c.at(1)) || void 0;
+    stackInfo.plugin = /withastro\/astro\/packages\/integrations\/([\w-]+)/gim.exec(stackText)?.at(1) || /(@astrojs\/[\w-]+)\/(server|client|index)/gim.exec(stackText)?.at(1) || void 0;
   }
   stackInfo.stack = cleanErrorStack(error.stack);
   return stackInfo;

package/dist/core/errors/dev/vite.js

@@ -11,7 +11,6 @@ function enhanceViteSSRError({
   loader,
   renderers
 }) {
-  var _a, _b, _c, _d, _e;
   let safeError = createSafeError(error);
   if (loader) {
     try {
@@ -24,14 +23,14 @@ function enhanceViteSSRError({
     const content = fs.readFileSync(path).toString();
     const lns = content.split("\n");
     let importName;
-    if (importName = (_a = safeError.message.match(/Failed to load url (.*?) \(resolved id:/)) == null ? void 0 : _a[1]) {
+    if (importName = safeError.message.match(/Failed to load url (.*?) \(resolved id:/)?.[1]) {
       safeError.title = AstroErrorData.FailedToLoadModuleSSR.title;
       safeError.name = "FailedToLoadModuleSSR";
       safeError.message = AstroErrorData.FailedToLoadModuleSSR.message(importName);
       safeError.hint = AstroErrorData.FailedToLoadModuleSSR.hint;
       const line = lns.findIndex((ln) => ln.includes(importName));
       if (line !== -1) {
-        const column = (_b = lns[line]) == null ? void 0 : _b.indexOf(importName);
+        const column = lns[line]?.indexOf(importName);
         safeError.loc = {
           file: path,
           line: line + 1,
@@ -39,8 +38,8 @@ function enhanceViteSSRError({
         };
       }
     }
-    const fileId = safeError.id ?? ((_c = safeError.loc) == null ? void 0 : _c.file);
-    if (!(renderers == null ? void 0 : renderers.find((r) => r.name === "@astrojs/mdx")) && safeError.message.match(/Syntax error/) && (fileId == null ? void 0 : fileId.match(/\.mdx$/))) {
+    const fileId = safeError.id ?? safeError.loc?.file;
+    if (!renderers?.find((r) => r.name === "@astrojs/mdx") && safeError.message.match(/Syntax error/) && fileId?.match(/\.mdx$/)) {
       safeError = new AstroError({
         ...AstroErrorData.MdxIntegrationMissingError,
         message: AstroErrorData.MdxIntegrationMissingError.message(JSON.stringify(fileId)),
@@ -49,7 +48,7 @@ function enhanceViteSSRError({
       });
     }
     if (/Invalid glob/.test(safeError.message)) {
-      const globPattern = (_d = safeError.message.match(/glob: "(.+)" \(/)) == null ? void 0 : _d[1];
+      const globPattern = safeError.message.match(/glob: "(.+)" \(/)?.[1];
       if (globPattern) {
         safeError.message = AstroErrorData.InvalidGlob.message(globPattern);
         safeError.name = "InvalidGlob";
@@ -57,7 +56,7 @@ function enhanceViteSSRError({
         safeError.title = AstroErrorData.InvalidGlob.title;
         const line = lns.findIndex((ln) => ln.includes(globPattern));
         if (line !== -1) {
-          const column = (_e = lns[line]) == null ? void 0 : _e.indexOf(globPattern);
+          const column = lns[line]?.indexOf(globPattern);
           safeError.loc = {
             file: path,
             line: line + 1,
@@ -72,7 +71,6 @@ function enhanceViteSSRError({
 const ALTERNATIVE_JS_EXTS = ["cjs", "mjs"];
 const ALTERNATIVE_MD_EXTS = ["mdoc"];
 async function getViteErrorPayload(err) {
-  var _a, _b, _c, _d, _e, _f;
   let plugin = err.plugin;
   if (!plugin && err.hint) {
     plugin = "astro";
@@ -82,7 +80,7 @@ async function getViteErrorPayload(err) {
   const hasDocs = err.name in AstroErrorData;
   const docslink = hasDocs ? `https://docs.astro.build/en/reference/errors/${getKebabErrorName(err.name)}/` : void 0;
   const highlighter = await getHighlighter({ theme: "css-variables" });
-  let highlighterLang = (_b = (_a = err.loc) == null ? void 0 : _a.file) == null ? void 0 : _b.split(".").pop();
+  let highlighterLang = err.loc?.file?.split(".").pop();
   if (ALTERNATIVE_JS_EXTS.includes(highlighterLang ?? "")) {
     highlighterLang = "js";
   }
@@ -91,7 +89,7 @@ async function getViteErrorPayload(err) {
   }
   const highlightedCode = err.fullCode ? highlighter.codeToHtml(err.fullCode, {
     lang: highlighterLang,
-    lineOptions: ((_c = err.loc) == null ? void 0 : _c.line) ? [{ line: err.loc.line, classes: ["error-line"] }] : void 0
+    lineOptions: err.loc?.line ? [{ line: err.loc.line, classes: ["error-line"] }] : void 0
   }) : void 0;
   return {
     type: "error",
@@ -105,9 +103,9 @@ async function getViteErrorPayload(err) {
       highlightedCode,
       docslink,
       loc: {
-        file: (_d = err.loc) == null ? void 0 : _d.file,
-        line: (_e = err.loc) == null ? void 0 : _e.line,
-        column: (_f = err.loc) == null ? void 0 : _f.column
+        file: err.loc?.file,
+        line: err.loc?.line,
+        column: err.loc?.column
       },
       plugin,
       stack: err.stack,

package/dist/core/errors/errors-data.d.ts

@@ -191,6 +191,27 @@ export declare const AstroErrorData: {
         readonly message: (paramType: any) => string;
         readonly hint: "See https://docs.astro.build/en/reference/api-reference/#getstaticpaths for more information on getStaticPaths.";
     };
+    /**
+     * @docs
+     * @see
+     * - [`getStaticPaths()`](https://docs.astro.build/en/reference/api-reference/#getstaticpaths)
+     * @description
+     * `getStaticPaths`'s return value must be an array of objects. In most cases, this error happens because an array of array was returned. Using [`.flatMap()`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/flatMap) or a [`.flat()`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/flat) call may be useful.
+     *
+     * ```ts title="pages/blog/[id].astro"
+     * export async function getStaticPaths() {
+     *	return [ // <-- Array
+     *		{ params: { slug: "blog" } }, // <-- Object
+     * 		{ params: { slug: "about" } }
+     * 	];
+     *}
+     * ```
+     */
+    readonly InvalidGetStaticPathsEntry: {
+        readonly title: "Invalid entry inside getStaticPath's return value";
+        readonly message: (entryType: any) => string;
+        readonly hint: "If you're using a `.map` call, you might be looking for `.flatMap()` instead. See https://docs.astro.build/en/reference/api-reference/#getstaticpaths for more information on getStaticPaths.";
+    };
     /**
      * @docs
      * @see

package/dist/core/errors/errors-data.js

@@ -191,6 +191,27 @@ See https://docs.astro.build/en/core-concepts/framework-components/ for more inf
     message: (paramType) => `Invalid params given to \`getStaticPaths\` path. Expected an \`object\`, got \`${paramType}\``,
     hint: "See https://docs.astro.build/en/reference/api-reference/#getstaticpaths for more information on getStaticPaths."
   },
+  /**
+   * @docs
+   * @see
+   * - [`getStaticPaths()`](https://docs.astro.build/en/reference/api-reference/#getstaticpaths)
+   * @description
+   * `getStaticPaths`'s return value must be an array of objects. In most cases, this error happens because an array of array was returned. Using [`.flatMap()`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/flatMap) or a [`.flat()`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/flat) call may be useful.
+   *
+   * ```ts title="pages/blog/[id].astro"
+   * export async function getStaticPaths() {
+   *	return [ // <-- Array
+   *		{ params: { slug: "blog" } }, // <-- Object
+   * 		{ params: { slug: "about" } }
+   * 	];
+   *}
+   * ```
+   */
+  InvalidGetStaticPathsEntry: {
+    title: "Invalid entry inside getStaticPath's return value",
+    message: (entryType) => `Invalid entry returned by getStaticPaths. Expected an object, got \`${entryType}\``,
+    hint: "If you're using a `.map` call, you might be looking for `.flatMap()` instead. See https://docs.astro.build/en/reference/api-reference/#getstaticpaths for more information on getStaticPaths."
+  },
   /**
    * @docs
    * @see

package/dist/core/errors/errors.js

@@ -4,16 +4,19 @@ function isAstroError(e) {
   return e instanceof Error && e.type === "AstroError";
 }
 class AstroError extends Error {
+  loc;
+  title;
+  hint;
+  frame;
+  type = "AstroError";
   constructor(props, ...params) {
-    var _a;
     super(...params);
-    this.type = "AstroError";
     const { name, title, message, stack, location, hint, frame } = props;
     this.title = title;
     if (name && name !== "Error") {
       this.name = name;
     } else if (this.title) {
-      const errorData = (_a = getErrorDataByTitle(this.title)) == null ? void 0 : _a.name;
+      const errorData = getErrorDataByTitle(this.title)?.name;
       if (errorData) {
         this.name = errorData;
       }
@@ -45,9 +48,9 @@ class AstroError extends Error {
   }
 }
 class CompilerError extends AstroError {
+  type = "CompilerError";
   constructor(props, ...params) {
     super(props, ...params);
-    this.type = "CompilerError";
     this.name = "CompilerError";
   }
   static is(err) {
@@ -55,38 +58,30 @@ class CompilerError extends AstroError {
   }
 }
 class CSSError extends AstroError {
-  constructor() {
-    super(...arguments);
-    this.type = "CSSError";
-  }
+  type = "CSSError";
   static is(err) {
     return err.type === "CSSError";
   }
 }
 class MarkdownError extends AstroError {
-  constructor() {
-    super(...arguments);
-    this.type = "MarkdownError";
-  }
+  type = "MarkdownError";
   static is(err) {
     return err.type === "MarkdownError";
   }
 }
 class InternalError extends AstroError {
-  constructor() {
-    super(...arguments);
-    this.type = "InternalError";
-  }
+  type = "InternalError";
   static is(err) {
     return err.type === "InternalError";
   }
 }
 class AggregateError extends AstroError {
+  type = "AggregateError";
+  errors;
   // Despite being a collection of errors, AggregateError still needs to have a main error attached to it
   // This is because Vite expects every thrown errors handled during HMR to be, well, Error and have a message
   constructor(props, ...params) {
     super(props, ...params);
-    this.type = "AggregateError";
     this.errors = props.errors;
   }
   static is(err) {

package/dist/core/errors/overlay.js

@@ -579,6 +579,7 @@ const openNewWindowIcon = (
 const { HTMLElement = class {
 } } = globalThis;
 class ErrorOverlay extends HTMLElement {
+  root;
   constructor(err) {
     super();
     this.root = this.attachShadow({ mode: "open" });
@@ -586,15 +587,15 @@ class ErrorOverlay extends HTMLElement {
     this.dir = "ltr";
     const themeToggle = this.root.querySelector(".theme-toggle-checkbox");
     if (localStorage.astroErrorOverlayTheme === "dark" || !("astroErrorOverlayTheme" in localStorage) && window.matchMedia("(prefers-color-scheme: dark)").matches) {
-      this == null ? void 0 : this.classList.add("astro-dark");
+      this?.classList.add("astro-dark");
       themeToggle.checked = true;
     } else {
-      this == null ? void 0 : this.classList.remove("astro-dark");
+      this?.classList.remove("astro-dark");
       themeToggle.checked = false;
     }
-    themeToggle == null ? void 0 : themeToggle.addEventListener("click", () => {
+    themeToggle?.addEventListener("click", () => {
       const isDark = localStorage.astroErrorOverlayTheme === "dark";
-      this == null ? void 0 : this.classList.toggle("astro-dark", !isDark);
+      this?.classList.toggle("astro-dark", !isDark);
       localStorage.astroErrorOverlayTheme = isDark ? "light" : "dark";
     });
     this.text("#name", err.name);
@@ -641,10 +642,9 @@ class ErrorOverlay extends HTMLElement {
       if (codeContent && err.highlightedCode) {
         codeContent.innerHTML = err.highlightedCode;
         window.requestAnimationFrame(() => {
-          var _a;
           const errorLine = this.root.querySelector(".error-line");
           if (errorLine) {
-            if ((_a = errorLine.parentElement) == null ? void 0 : _a.parentElement) {
+            if (errorLine.parentElement?.parentElement) {
               errorLine.parentElement.parentElement.scrollTop = errorLine.offsetTop - errorLine.parentElement.parentElement.offsetTop - 8;
             }
             if (err.loc.column) {
@@ -695,8 +695,7 @@ class ErrorOverlay extends HTMLElement {
     return linkContainer;
   }
   close() {
-    var _a;
-    (_a = this.parentNode) == null ? void 0 : _a.removeChild(this);
+    this.parentNode?.removeChild(this);
   }
 }
 function getOverlayCode() {

package/dist/core/errors/utils.js

@@ -59,7 +59,7 @@ function formatYAMLException(e) {
   };
 }
 function createSafeError(err) {
-  if (err instanceof Error || (err == null ? void 0 : err.name) && err.message) {
+  if (err instanceof Error || err?.name && err.message) {
     return err;
   } else {
     const error = new Error(JSON.stringify(err));

package/dist/core/fs/index.js

@@ -28,7 +28,7 @@ function emptyDir(_dir, skip) {
   if (!fs.existsSync(dir))
     return void 0;
   for (const file of fs.readdirSync(dir)) {
-    if (skip == null ? void 0 : skip.has(file)) {
+    if (skip?.has(file)) {
       continue;
     }
     const p = path.resolve(dir, file);

package/dist/core/logger/console.js

@@ -10,7 +10,7 @@ const consoleLogDestination = {
     }
     function getPrefix() {
       let prefix = "";
-      let type = event.type;
+      let type = event.label;
       if (type) {
         prefix += dim(dateTimeFormat.format(/* @__PURE__ */ new Date()) + " ");
         if (event.level === "info") {

package/dist/core/logger/core.d.ts

@@ -2,30 +2,50 @@ interface LogWritable<T> {
     write: (chunk: T) => boolean;
 }
 export type LoggerLevel = 'debug' | 'info' | 'warn' | 'error' | 'silent';
-export type LoggerEvent = 'info' | 'warn' | 'error';
 export interface LogOptions {
     dest: LogWritable<LogMessage>;
     level: LoggerLevel;
 }
 export declare const dateTimeFormat: Intl.DateTimeFormat;
 export interface LogMessage {
-    type: string | null;
+    label: string | null;
     level: LoggerLevel;
     message: string;
 }
 export declare const levels: Record<LoggerLevel, number>;
 /** Full logging API */
-export declare function log(opts: LogOptions, level: LoggerLevel, type: string | null, message: string): void;
+export declare function log(opts: LogOptions, level: LoggerLevel, label: string | null, message: string): void;
 /** Emit a user-facing message. Useful for UI and other console messages. */
-export declare function info(opts: LogOptions, type: string | null, message: string): void;
+export declare function info(opts: LogOptions, label: string | null, message: string): void;
 /** Emit a warning message. Useful for high-priority messages that aren't necessarily errors. */
-export declare function warn(opts: LogOptions, type: string | null, message: string): void;
+export declare function warn(opts: LogOptions, label: string | null, message: string): void;
 /** Emit a error message, Useful when Astro can't recover from some error. */
-export declare function error(opts: LogOptions, type: string | null, message: string): void;
+export declare function error(opts: LogOptions, label: string | null, message: string): void;
 type LogFn = typeof info | typeof warn | typeof error;
 export declare function table(opts: LogOptions, columns: number[]): (logFn: LogFn, ...input: Array<any>) => void;
 export declare function debug(...args: any[]): void;
 export declare let defaultLogLevel: LoggerLevel;
 /** Print out a timer message for debug() */
 export declare function timerMessage(message: string, startTime?: number): string;
+export declare class Logger {
+    options: LogOptions;
+    constructor(options: LogOptions);
+    info(label: string, message: string): void;
+    warn(label: string, message: string): void;
+    error(label: string, message: string): void;
+    debug(label: string, message: string): void;
+}
+export declare class AstroIntegrationLogger {
+    options: LogOptions;
+    label: string;
+    constructor(logging: LogOptions, label: string);
+    /**
+     * Creates a new logger instance with a new label, but the same log options.
+     */
+    fork(label: string): AstroIntegrationLogger;
+    info(message: string): void;
+    warn(message: string): void;
+    error(message: string): void;
+    debug(message: string): void;
+}
 export {};

package/dist/core/logger/core.js

@@ -12,11 +12,11 @@ const levels = {
   error: 50,
   silent: 90
 };
-function log(opts, level, type, message) {
+function log(opts, level, label, message) {
   const logLevel = opts.level;
   const dest = opts.dest;
   const event = {
-    type,
+    label,
     level,
     message
   };
@@ -25,14 +25,14 @@ function log(opts, level, type, message) {
   }
   dest.write(event);
 }
-function info(opts, type, message) {
-  return log(opts, "info", type, message);
+function info(opts, label, message) {
+  return log(opts, "info", label, message);
 }
-function warn(opts, type, message) {
-  return log(opts, "warn", type, message);
+function warn(opts, label, message) {
+  return log(opts, "warn", label, message);
 }
-function error(opts, type, message) {
-  return log(opts, "error", type, message);
+function error(opts, label, message) {
+  return log(opts, "error", label, message);
 }
 function table(opts, columns) {
   return function logTable(logFn, ...input) {
@@ -75,7 +75,53 @@ function timerMessage(message, startTime = Date.now()) {
   let timeDisplay = timeDiff < 750 ? `${Math.round(timeDiff)}ms` : `${(timeDiff / 1e3).toFixed(1)}s`;
   return `${message}   ${dim(timeDisplay)}`;
 }
+class Logger {
+  options;
+  constructor(options) {
+    this.options = options;
+  }
+  info(label, message) {
+    info(this.options, label, message);
+  }
+  warn(label, message) {
+    warn(this.options, label, message);
+  }
+  error(label, message) {
+    error(this.options, label, message);
+  }
+  debug(label, message) {
+    debug(this.options, label, message);
+  }
+}
+class AstroIntegrationLogger {
+  options;
+  label;
+  constructor(logging, label) {
+    this.options = logging;
+    this.label = label;
+  }
+  /**
+   * Creates a new logger instance with a new label, but the same log options.
+   */
+  fork(label) {
+    return new AstroIntegrationLogger(this.options, label);
+  }
+  info(message) {
+    info(this.options, this.label, message);
+  }
+  warn(message) {
+    warn(this.options, this.label, message);
+  }
+  error(message) {
+    error(this.options, this.label, message);
+  }
+  debug(message) {
+    debug(this.options, this.label, message);
+  }
+}
 export {
+  AstroIntegrationLogger,
+  Logger,
   dateTimeFormat,
   debug,
   defaultLogLevel,

package/dist/core/logger/node.d.ts

@@ -12,7 +12,7 @@ export interface LogOptions {
 }
 export declare const nodeLogOptions: Required<LogOptions>;
 export interface LogMessage {
-    type: string | null;
+    label: string | null;
     level: LoggerLevel;
     message: string;
 }
@@ -25,9 +25,9 @@ export declare const levels: Record<LoggerLevel, number>;
  */
 export declare function debug(type: string, ...messages: Array<any>): any;
 export declare const logger: {
-    info: (type: string | null, message: string) => void;
-    warn: (type: string | null, message: string) => void;
-    error: (type: string | null, message: string) => void;
+    info: (label: string | null, message: string) => void;
+    warn: (label: string | null, message: string) => void;
+    error: (label: string | null, message: string) => void;
 };
 export declare function enableVerboseLogging(): void;
 export {};

package/dist/core/logger/node.js

@@ -15,17 +15,17 @@ const nodeLogDestination = new Writable({
     }
     function getPrefix() {
       let prefix = "";
-      let type = event.type;
-      if (type) {
+      let label = event.label;
+      if (label) {
         prefix += dim(dateTimeFormat.format(/* @__PURE__ */ new Date()) + " ");
         if (event.level === "info") {
-          type = bold(cyan(`[${type}]`));
+          label = bold(cyan(`[${label}]`));
         } else if (event.level === "warn") {
-          type = bold(yellow(`[${type}]`));
+          label = bold(yellow(`[${label}]`));
         } else if (event.level === "error") {
-          type = bold(red(`[${type}]`));
+          label = bold(red(`[${label}]`));
         }
-        prefix += `${type} `;
+        prefix += `${label} `;
       }
       return reset(prefix);
     }