astro 5.16.0 → 5.16.2

package/dist/cli/infra/passthrough-text-styler.js

@@ -1,13 +1,23 @@
-function createPassthroughTextStyler() {
-  return {
-    bgWhite: (msg) => msg,
-    black: (msg) => msg,
-    dim: (msg) => msg,
-    green: (msg) => msg,
-    bold: (msg) => msg,
-    bgGreen: (msg) => msg
-  };
+class PassthroughTextStyler {
+  bgWhite(msg) {
+    return msg;
+  }
+  black(msg) {
+    return msg;
+  }
+  dim(msg) {
+    return msg;
+  }
+  green(msg) {
+    return msg;
+  }
+  bold(msg) {
+    return msg;
+  }
+  bgGreen(msg) {
+    return msg;
+  }
 }
 export {
-  createPassthroughTextStyler
+  PassthroughTextStyler
 };

package/dist/cli/infra/piccolore-text-styler.d.ts

@@ -1,2 +1,2 @@
 import type { TextStyler } from '../definitions.js';
-export declare function createPiccoloreTextStyler(): TextStyler;
+export declare const piccoloreTextStyler: TextStyler;

package/dist/cli/infra/piccolore-text-styler.js

@@ -1,7 +1,5 @@
 import colors from "piccolore";
-function createPiccoloreTextStyler() {
-  return colors;
-}
+const piccoloreTextStyler = colors;
 export {
-  createPiccoloreTextStyler
+  piccoloreTextStyler
 };

package/dist/cli/infra/process-operating-system-provider.d.ts

@@ -1,2 +1,6 @@
 import type { OperatingSystemProvider } from '../definitions.js';
-export declare function createProcessOperatingSystemProvider(): OperatingSystemProvider;
+export declare class ProcessOperatingSystemProvider implements OperatingSystemProvider {
+    #private;
+    readonly name: NodeJS.Platform;
+    readonly displayName: string;
+}

package/dist/cli/infra/process-operating-system-provider.js

@@ -1,20 +1,12 @@
-const PLATFORM_TO_OS = {
-  darwin: "macOS",
-  win32: "Windows",
-  linux: "Linux"
-};
-function createProcessOperatingSystemProvider() {
-  const platform = process.platform;
-  return {
-    get name() {
-      return platform;
-    },
-    get displayName() {
-      const system = PLATFORM_TO_OS[platform] ?? platform;
-      return `${system} (${process.arch})`;
-    }
+class ProcessOperatingSystemProvider {
+  #platformToOs = {
+    darwin: "macOS",
+    win32: "Windows",
+    linux: "Linux"
   };
+  name = process.platform;
+  displayName = `${this.#platformToOs[this.name] ?? this.name} (${process.arch})`;
 }
 export {
-  createProcessOperatingSystemProvider
+  ProcessOperatingSystemProvider
 };

package/dist/cli/infra/tinyexec-command-executor.d.ts

@@ -1,2 +1,6 @@
-import type { CommandExecutor } from '../definitions.js';
-export declare function createTinyexecCommandExecutor(): CommandExecutor;
+import type { CommandExecutor, CommandExecutorOptions } from '../definitions.js';
+export declare class TinyexecCommandExecutor implements CommandExecutor {
+    execute(command: string, args?: Array<string>, options?: CommandExecutorOptions): Promise<{
+        stdout: string;
+    }>;
+}

package/dist/cli/infra/tinyexec-command-executor.js

@@ -1,36 +1,34 @@
 import { NonZeroExitError, x } from "tinyexec";
-function createTinyexecCommandExecutor() {
-  return {
-    async execute(command, args, options) {
-      const proc = x(command, args, {
-        throwOnError: true,
-        nodeOptions: {
-          cwd: options?.cwd,
-          env: options?.env,
-          shell: options?.shell,
-          stdio: options?.stdio
-        }
-      });
-      if (options?.input) {
-        proc.process?.stdin?.end(options.input);
+class TinyexecCommandExecutor {
+  async execute(command, args, options) {
+    const proc = x(command, args, {
+      throwOnError: true,
+      nodeOptions: {
+        cwd: options?.cwd,
+        env: options?.env,
+        shell: options?.shell,
+        stdio: options?.stdio
       }
-      return await proc.then(
-        (o) => o,
-        (e) => {
-          if (e instanceof NonZeroExitError) {
-            const fullCommand = args?.length ? `${command} ${args.map((a) => a.includes(" ") ? `"${a}"` : a).join(" ")}` : command;
-            const message = `The command \`${fullCommand}\` exited with code ${e.exitCode}`;
-            const newError = new Error(message, e.cause ? { cause: e.cause } : void 0);
-            newError.stderr = e.output?.stderr;
-            newError.stdout = e.output?.stdout;
-            throw newError;
-          }
-          throw e;
-        }
-      );
+    });
+    if (options?.input) {
+      proc.process?.stdin?.end(options.input);
     }
-  };
+    return await proc.then(
+      (o) => o,
+      (e) => {
+        if (e instanceof NonZeroExitError) {
+          const fullCommand = args?.length ? `${command} ${args.map((a) => a.includes(" ") ? `"${a}"` : a).join(" ")}` : command;
+          const message = `The command \`${fullCommand}\` exited with code ${e.exitCode}`;
+          const newError = new Error(message, e.cause ? { cause: e.cause } : void 0);
+          newError.stderr = e.output?.stderr;
+          newError.stdout = e.output?.stdout;
+          throw newError;
+        }
+        throw e;
+      }
+    );
+  }
 }
 export {
-  createTinyexecCommandExecutor
+  TinyexecCommandExecutor
 };

package/dist/content/content-layer.js

@@ -164,7 +164,7 @@ ${contentConfig.error.message}`);
       logger.info("Content config changed");
       shouldClear = true;
     }
-    if (previousAstroVersion && previousAstroVersion !== "5.16.0") {
+    if (previousAstroVersion && previousAstroVersion !== "5.16.2") {
       logger.info("Astro version changed");
       shouldClear = true;
     }
@@ -172,8 +172,8 @@ ${contentConfig.error.message}`);
       logger.info("Clearing content store");
       this.#store.clearAll();
     }
-    if ("5.16.0") {
-      await this.#store.metaStore().set("astro-version", "5.16.0");
+    if ("5.16.2") {
+      await this.#store.metaStore().set("astro-version", "5.16.2");
     }
     if (currentConfigDigest) {
       await this.#store.metaStore().set("content-config-digest", currentConfigDigest);

package/dist/content/utils.d.ts

@@ -96,6 +96,7 @@ declare const collectionConfigParser: z.ZodUnion<[z.ZodObject<{
         schema: z.ZodOptional<z.ZodAny>;
         render: z.ZodOptional<z.ZodFunction<z.ZodTuple<[z.ZodAny], null>, z.ZodUnknown>>;
     }, "strip", z.ZodTypeAny, {
+        name: string;
         load: (args_0: {
             collection: string;
             generateDigest: (args_0: any) => unknown;
@@ -109,10 +110,10 @@ declare const collectionConfigParser: z.ZodUnion<[z.ZodObject<{
             renderMarkdown?: any;
             refreshContextData?: Record<string, unknown> | undefined;
         }) => unknown;
-        name: string;
         schema?: any;
         render?: ((args_0: any) => unknown) | undefined;
     }, {
+        name: string;
         load: (args_0: {
             collection: string;
             generateDigest: (args_0: any) => unknown;
@@ -126,7 +127,6 @@ declare const collectionConfigParser: z.ZodUnion<[z.ZodObject<{
             renderMarkdown?: any;
             refreshContextData?: Record<string, unknown> | undefined;
         }) => unknown;
-        name: string;
         schema?: any;
         render?: ((args_0: any) => unknown) | undefined;
     }>]>;
@@ -135,6 +135,7 @@ declare const collectionConfigParser: z.ZodUnion<[z.ZodObject<{
 }, "strip", z.ZodTypeAny, {
     type: "content_layer";
     loader: ((...args: unknown[]) => unknown) | {
+        name: string;
         load: (args_0: {
             collection: string;
             generateDigest: (args_0: any) => unknown;
@@ -148,7 +149,6 @@ declare const collectionConfigParser: z.ZodUnion<[z.ZodObject<{
             renderMarkdown?: any;
             refreshContextData?: Record<string, unknown> | undefined;
         }) => unknown;
-        name: string;
         schema?: any;
         render?: ((args_0: any) => unknown) | undefined;
     };
@@ -157,6 +157,7 @@ declare const collectionConfigParser: z.ZodUnion<[z.ZodObject<{
 }, {
     type: "content_layer";
     loader: ((...args: unknown[]) => unknown) | {
+        name: string;
         load: (args_0: {
             collection: string;
             generateDigest: (args_0: any) => unknown;
@@ -170,7 +171,6 @@ declare const collectionConfigParser: z.ZodUnion<[z.ZodObject<{
             renderMarkdown?: any;
             refreshContextData?: Record<string, unknown> | undefined;
         }) => unknown;
-        name: string;
         schema?: any;
         render?: ((args_0: any) => unknown) | undefined;
     };
@@ -253,6 +253,7 @@ declare const contentConfigParser: z.ZodObject<{
             schema: z.ZodOptional<z.ZodAny>;
             render: z.ZodOptional<z.ZodFunction<z.ZodTuple<[z.ZodAny], null>, z.ZodUnknown>>;
         }, "strip", z.ZodTypeAny, {
+            name: string;
             load: (args_0: {
                 collection: string;
                 generateDigest: (args_0: any) => unknown;
@@ -266,10 +267,10 @@ declare const contentConfigParser: z.ZodObject<{
                 renderMarkdown?: any;
                 refreshContextData?: Record<string, unknown> | undefined;
             }) => unknown;
-            name: string;
             schema?: any;
             render?: ((args_0: any) => unknown) | undefined;
         }, {
+            name: string;
             load: (args_0: {
                 collection: string;
                 generateDigest: (args_0: any) => unknown;
@@ -283,7 +284,6 @@ declare const contentConfigParser: z.ZodObject<{
                 renderMarkdown?: any;
                 refreshContextData?: Record<string, unknown> | undefined;
             }) => unknown;
-            name: string;
             schema?: any;
             render?: ((args_0: any) => unknown) | undefined;
         }>]>;
@@ -292,6 +292,7 @@ declare const contentConfigParser: z.ZodObject<{
     }, "strip", z.ZodTypeAny, {
         type: "content_layer";
         loader: ((...args: unknown[]) => unknown) | {
+            name: string;
             load: (args_0: {
                 collection: string;
                 generateDigest: (args_0: any) => unknown;
@@ -305,7 +306,6 @@ declare const contentConfigParser: z.ZodObject<{
                 renderMarkdown?: any;
                 refreshContextData?: Record<string, unknown> | undefined;
             }) => unknown;
-            name: string;
             schema?: any;
             render?: ((args_0: any) => unknown) | undefined;
         };
@@ -314,6 +314,7 @@ declare const contentConfigParser: z.ZodObject<{
     }, {
         type: "content_layer";
         loader: ((...args: unknown[]) => unknown) | {
+            name: string;
             load: (args_0: {
                 collection: string;
                 generateDigest: (args_0: any) => unknown;
@@ -327,7 +328,6 @@ declare const contentConfigParser: z.ZodObject<{
                 renderMarkdown?: any;
                 refreshContextData?: Record<string, unknown> | undefined;
             }) => unknown;
-            name: string;
             schema?: any;
             render?: ((args_0: any) => unknown) | undefined;
         };
@@ -356,6 +356,7 @@ declare const contentConfigParser: z.ZodObject<{
     } | {
         type: "content_layer";
         loader: ((...args: unknown[]) => unknown) | {
+            name: string;
             load: (args_0: {
                 collection: string;
                 generateDigest: (args_0: any) => unknown;
@@ -369,7 +370,6 @@ declare const contentConfigParser: z.ZodObject<{
                 renderMarkdown?: any;
                 refreshContextData?: Record<string, unknown> | undefined;
             }) => unknown;
-            name: string;
             schema?: any;
             render?: ((args_0: any) => unknown) | undefined;
         };
@@ -390,6 +390,7 @@ declare const contentConfigParser: z.ZodObject<{
     } | {
         type: "content_layer";
         loader: ((...args: unknown[]) => unknown) | {
+            name: string;
             load: (args_0: {
                 collection: string;
                 generateDigest: (args_0: any) => unknown;
@@ -403,7 +404,6 @@ declare const contentConfigParser: z.ZodObject<{
                 renderMarkdown?: any;
                 refreshContextData?: Record<string, unknown> | undefined;
             }) => unknown;
-            name: string;
             schema?: any;
             render?: ((args_0: any) => unknown) | undefined;
         };

package/dist/core/app/index.js

@@ -390,7 +390,9 @@ class App {
     } finally {
       await session?.[PERSIST_SYMBOL]();
     }
-    if (REROUTABLE_STATUS_CODES.includes(response.status) && response.headers.get(REROUTE_DIRECTIVE_HEADER) !== "no") {
+    if (REROUTABLE_STATUS_CODES.includes(response.status) && // If the body isn't null, that means the user sets the 404 status
+    // but uses the current route to handle the 404
+    response.body === null && response.headers.get(REROUTE_DIRECTIVE_HEADER) !== "no") {
       return this.#renderError(request, {
         locals,
         response,