astro 5.14.7 → 5.14.8

package/dist/cli/create-key/core/create-key.d.ts

@@ -1,8 +1,17 @@
 import type { Logger } from '../../../core/logger/core.js';
 import type { KeyGenerator } from '../definitions.js';
-interface CreateKeyOptions {
+interface Options {
     logger: Logger;
     keyGenerator: KeyGenerator;
 }
-export declare function createKey({ logger, keyGenerator }: CreateKeyOptions): Promise<void>;
+export declare const createKeyCommand: {
+    help: {
+        commandName: string;
+        tables: {
+            Flags: [string, string][];
+        };
+        description: string;
+    };
+    run({ logger, keyGenerator }: Options): Promise<void>;
+};
 export {};

package/dist/cli/create-key/core/create-key.js

@@ -1,12 +1,22 @@
-async function createKey({ logger, keyGenerator }) {
-  const key = await keyGenerator.generate();
-  logger.info(
-    "crypto",
-    `Generated a key to encrypt props passed to server islands. To reuse the same key across builds, set this value as ASTRO_KEY in an environment variable on your build server.
+import { defineCommand } from "../../domain/command.js";
+const createKeyCommand = defineCommand({
+  help: {
+    commandName: "astro create-key",
+    tables: {
+      Flags: [["--help (-h)", "See all available flags."]]
+    },
+    description: "Generates a key to encrypt props passed to server islands."
+  },
+  async run({ logger, keyGenerator }) {
+    const key = await keyGenerator.generate();
+    logger.info(
+      "crypto",
+      `Generated a key to encrypt props passed to server islands. To reuse the same key across builds, set this value as ASTRO_KEY in an environment variable on your build server.
 
 ASTRO_KEY=${key}`
-  );
-}
+    );
+  }
+});
 export {
-  createKey
+  createKeyCommand
 };

package/dist/cli/definitions.d.ts

@@ -0,0 +1,20 @@
+import type { AnyCommand } from './domain/command.js';
+import type { HelpPayload } from './domain/help-payload.js';
+export interface HelpDisplay {
+    shouldFire: () => boolean;
+    show: (payload: HelpPayload) => void;
+}
+export interface TextStyler {
+    bgWhite: (msg: string) => string;
+    black: (msg: string) => string;
+    dim: (msg: string) => string;
+    green: (msg: string) => string;
+    bold: (msg: string) => string;
+    bgGreen: (msg: string) => string;
+}
+export interface AstroVersionProvider {
+    getVersion: () => string;
+}
+export interface CommandRunner {
+    run: <T extends AnyCommand>(command: T, ...args: Parameters<T['run']>) => ReturnType<T['run']>;
+}

package/dist/cli/domain/command.d.ts

@@ -0,0 +1,8 @@
+import type { HelpPayload } from './help-payload.js';
+interface Command<T extends (...args: Array<any>) => any> {
+    help: HelpPayload;
+    run: T;
+}
+export type AnyCommand = Command<(...args: Array<any>) => any>;
+export declare function defineCommand<T extends AnyCommand>(command: T): T;
+export {};

package/dist/cli/domain/command.js

@@ -0,0 +1,6 @@
+function defineCommand(command) {
+  return command;
+}
+export {
+  defineCommand
+};

package/dist/cli/domain/help-payload.d.ts

@@ -0,0 +1,7 @@
+export interface HelpPayload {
+    commandName: string;
+    headline?: string;
+    usage?: string;
+    tables?: Record<string, [command: string, help: string][]>;
+    description?: string;
+}

package/dist/cli/help/index.d.ts

@@ -0,0 +1,2 @@
+import type { HelpPayload } from '../domain/help-payload.js';
+export declare const DEFAULT_HELP_PAYLOAD: HelpPayload;

package/dist/cli/help/index.js

@@ -0,0 +1,34 @@
+const DEFAULT_HELP_PAYLOAD = {
+  commandName: "astro",
+  usage: "[command] [...flags]",
+  headline: "Build faster websites.",
+  tables: {
+    Commands: [
+      ["add", "Add an integration."],
+      ["build", "Build your project and write it to disk."],
+      ["check", "Check your project for errors."],
+      ["create-key", "Create a cryptography key"],
+      ["db", "Manage your Astro database."],
+      ["dev", "Start the development server."],
+      ["docs", "Open documentation in your web browser."],
+      ["info", "List info about your current Astro setup."],
+      ["preview", "Preview your build locally."],
+      ["sync", "Generate content collection types."],
+      ["preferences", "Configure user preferences."],
+      ["telemetry", "Configure telemetry settings."]
+    ],
+    "Global Flags": [
+      ["--config <path>", "Specify your config file."],
+      ["--root <path>", "Specify your project root folder."],
+      ["--site <url>", "Specify your project site."],
+      ["--base <pathname>", "Specify your project base."],
+      ["--verbose", "Enable verbose logging."],
+      ["--silent", "Disable all logging."],
+      ["--version", "Show the version number and exit."],
+      ["--help", "Show this help message."]
+    ]
+  }
+};
+export {
+  DEFAULT_HELP_PAYLOAD
+};

package/dist/cli/index.js

@@ -1,40 +1,6 @@
 import * as colors from "kleur/colors";
 import yargs from "yargs-parser";
 import { ASTRO_VERSION } from "../core/constants.js";
-async function printAstroHelp() {
-  const { printHelp } = await import("../core/messages.js");
-  printHelp({
-    commandName: "astro",
-    usage: "[command] [...flags]",
-    headline: "Build faster websites.",
-    tables: {
-      Commands: [
-        ["add", "Add an integration."],
-        ["build", "Build your project and write it to disk."],
-        ["check", "Check your project for errors."],
-        ["create-key", "Create a cryptography key"],
-        ["db", "Manage your Astro database."],
-        ["dev", "Start the development server."],
-        ["docs", "Open documentation in your web browser."],
-        ["info", "List info about your current Astro setup."],
-        ["preview", "Preview your build locally."],
-        ["sync", "Generate content collection types."],
-        ["preferences", "Configure user preferences."],
-        ["telemetry", "Configure telemetry settings."]
-      ],
-      "Global Flags": [
-        ["--config <path>", "Specify your config file."],
-        ["--root <path>", "Specify your project root folder."],
-        ["--site <url>", "Specify your project site."],
-        ["--base <pathname>", "Specify your project base."],
-        ["--verbose", "Enable verbose logging."],
-        ["--silent", "Disable all logging."],
-        ["--version", "Show the version number and exit."],
-        ["--help", "Show this help message."]
-      ]
-    }
-  });
-}
 function printVersion() {
   console.log();
   console.log(`  ${colors.bgGreen(colors.black(` astro `))} ${colors.green(`v${ASTRO_VERSION}`)}`);
@@ -66,28 +32,52 @@ function resolveCommand(flags) {
   return "help";
 }
 async function runCommand(cmd, flags) {
+  const [
+    { createLoggerFromFlags },
+    { createKleurTextStyler },
+    { createBuildTimeAstroVersionProvider },
+    { createLoggerHelpDisplay },
+    { createCliCommandRunner }
+  ] = await Promise.all([
+    import("./flags.js"),
+    import("./infra/kleur-text-styler.js"),
+    import("./infra/build-time-astro-version-provider.js"),
+    import("./infra/logger-help-display.js"),
+    import("./infra/cli-command-runner.js")
+  ]);
+  const logger = createLoggerFromFlags(flags);
+  const textStyler = createKleurTextStyler();
+  const astroVersionProvider = createBuildTimeAstroVersionProvider();
+  const helpDisplay = createLoggerHelpDisplay({
+    logger,
+    flags,
+    textStyler,
+    astroVersionProvider
+  });
+  const runner = createCliCommandRunner({ helpDisplay });
   switch (cmd) {
-    case "help":
-      await printAstroHelp();
+    /** Display --help flag */
+    case "help": {
+      const { DEFAULT_HELP_PAYLOAD } = await import("./help/index.js");
+      helpDisplay.show(DEFAULT_HELP_PAYLOAD);
       return;
-    case "version":
+    }
+    case "version": {
       printVersion();
       return;
+    }
     case "info": {
       const { printInfo } = await import("./info/index.js");
       await printInfo({ flags });
       return;
     }
     case "create-key": {
-      const [{ createKey }, { createLoggerFromFlags }, { createCryptoKeyGenerator }] = await Promise.all([
-        import("./create-key/core/create-key.js"),
-        import("./flags.js"),
-        import("./create-key/infra/crypto-key-generator.js")
+      const [{ createCryptoKeyGenerator }, { createKeyCommand }] = await Promise.all([
+        import("./create-key/infra/crypto-key-generator.js"),
+        import("./create-key/core/create-key.js")
       ]);
-      const logger = createLoggerFromFlags(flags);
       const keyGenerator = createCryptoKeyGenerator();
-      await createKey({ logger, keyGenerator });
-      return;
+      return await runner.run(createKeyCommand, { logger, keyGenerator });
     }
     case "docs": {
       const { docs } = await import("./docs/index.js");

package/dist/cli/infra/build-time-astro-version-provider.d.ts

@@ -0,0 +1,2 @@
+import type { AstroVersionProvider } from '../definitions.js';
+export declare function createBuildTimeAstroVersionProvider(): AstroVersionProvider;

package/dist/cli/infra/build-time-astro-version-provider.js

@@ -0,0 +1,10 @@
+function createBuildTimeAstroVersionProvider() {
+  return {
+    getVersion() {
+      return "5.14.8";
+    }
+  };
+}
+export {
+  createBuildTimeAstroVersionProvider
+};

package/dist/cli/infra/cli-command-runner.d.ts

@@ -0,0 +1,6 @@
+import type { CommandRunner, HelpDisplay } from '../definitions.js';
+interface Options {
+    helpDisplay: HelpDisplay;
+}
+export declare function createCliCommandRunner({ helpDisplay }: Options): CommandRunner;
+export {};

package/dist/cli/infra/cli-command-runner.js

@@ -0,0 +1,14 @@
+function createCliCommandRunner({ helpDisplay }) {
+  return {
+    run(command, ...args) {
+      if (helpDisplay.shouldFire()) {
+        helpDisplay.show(command.help);
+        return;
+      }
+      return command.run(...args);
+    }
+  };
+}
+export {
+  createCliCommandRunner
+};

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

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

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

@@ -0,0 +1,7 @@
+import * as colors from "kleur/colors";
+function createKleurTextStyler() {
+  return colors;
+}
+export {
+  createKleurTextStyler
+};

package/dist/cli/infra/logger-help-display.d.ts

@@ -0,0 +1,11 @@
+import type { Logger } from '../../core/logger/core.js';
+import type { AstroVersionProvider, HelpDisplay, TextStyler } from '../definitions.js';
+import type { Flags } from '../flags.js';
+interface Options {
+    logger: Logger;
+    textStyler: TextStyler;
+    astroVersionProvider: AstroVersionProvider;
+    flags: Flags;
+}
+export declare function createLoggerHelpDisplay({ logger, flags, textStyler, astroVersionProvider, }: Options): HelpDisplay;
+export {};

package/dist/cli/infra/logger-help-display.js

@@ -0,0 +1,60 @@
+function createLoggerHelpDisplay({
+  logger,
+  flags,
+  textStyler,
+  astroVersionProvider
+}) {
+  return {
+    shouldFire() {
+      return !!(flags.help || flags.h);
+    },
+    show({ commandName, description, headline, tables, usage }) {
+      const linebreak = () => "";
+      const title = (label) => `  ${textStyler.bgWhite(textStyler.black(` ${label} `))}`;
+      const table = (rows, { padding }) => {
+        const split = process.stdout.columns < 60;
+        let raw = "";
+        for (const row of rows) {
+          if (split) {
+            raw += `    ${row[0]}
+    `;
+          } else {
+            raw += `${`${row[0]}`.padStart(padding)}`;
+          }
+          raw += "  " + textStyler.dim(row[1]) + "\n";
+        }
+        return raw.slice(0, -1);
+      };
+      let message = [];
+      if (headline) {
+        message.push(
+          linebreak(),
+          `  ${textStyler.bgGreen(textStyler.black(` ${commandName} `))} ${textStyler.green(
+            `v${astroVersionProvider.getVersion()}`
+          )} ${headline}`
+        );
+      }
+      if (usage) {
+        message.push(linebreak(), `  ${textStyler.green(commandName)} ${textStyler.bold(usage)}`);
+      }
+      if (tables) {
+        let calculateTablePadding2 = function(rows) {
+          return rows.reduce((val, [first]) => Math.max(val, first.length), 0) + 2;
+        };
+        var calculateTablePadding = calculateTablePadding2;
+        const tableEntries = Object.entries(tables);
+        const padding = Math.max(...tableEntries.map(([, rows]) => calculateTablePadding2(rows)));
+        for (const [tableTitle, tableRows] of tableEntries) {
+          message.push(linebreak(), title(tableTitle), table(tableRows, { padding }));
+        }
+      }
+      if (description) {
+        message.push(linebreak(), `${description}`);
+      }
+      logger.info("SKIP_FORMAT", message.join("\n") + "\n");
+    }
+  };
+}
+export {
+  createLoggerHelpDisplay
+};

package/dist/content/content-layer.js

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

package/dist/content/utils.js

@@ -127,8 +127,12 @@ async function getEntryDataAndImages(entry, collectionConfig, shouldEmitFile, ex
     } else if (collectionConfig.type === CONTENT_LAYER_TYPE) {
       schema = schema({
         image: () => z.string().transform((val) => {
-          imageImports.add(val);
-          return `${IMAGE_IMPORT_PREFIX}${val}`;
+          let normalizedPath = val;
+          if (val && !val.startsWith("./") && !val.startsWith("../") && !val.startsWith("/") && !val.startsWith("~") && !val.startsWith("@") && !val.includes("://")) {
+            normalizedPath = `./${val}`;
+          }
+          imageImports.add(normalizedPath);
+          return `${IMAGE_IMPORT_PREFIX}${normalizedPath}`;
         })
       });
     }

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "5.14.7";
+const ASTRO_VERSION = "5.14.8";
 const REROUTE_DIRECTIVE_HEADER = "X-Astro-Reroute";
 const REWRITE_DIRECTIVE_HEADER_KEY = "X-Astro-Rewrite";
 const REWRITE_DIRECTIVE_HEADER_VALUE = "yes";

package/dist/core/dev/dev.js

@@ -22,7 +22,7 @@ async function dev(inlineConfig) {
   await telemetry.record([]);
   const restart = await createContainerWithAutomaticRestart({ inlineConfig, fs });
   const logger = restart.container.logger;
-  const currentVersion = "5.14.7";
+  const currentVersion = "5.14.8";
   const isPrerelease = currentVersion.includes("-");
   if (!isPrerelease) {
     try {

package/dist/core/messages.d.ts

@@ -47,6 +47,7 @@ export declare function actionRequired(message: string): string;
 export declare function cancelled(message: string, tip?: string): string;
 export declare function formatConfigErrorMessage(err: ZodError): string;
 export declare function formatErrorMessage(err: ErrorWithMetadata, showFullStacktrace: boolean): string;
+/** @deprecated Migrate to HelpDisplay */
 export declare function printHelp({ commandName, headline, usage, tables, description, }: {
     commandName: string;
     headline?: string;

package/dist/core/messages.js

@@ -37,7 +37,7 @@ function serverStart({
   host,
   base
 }) {
-  const version = "5.14.7";
+  const version = "5.14.8";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
   const emptyPrefix = " ".repeat(11);
@@ -274,7 +274,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"5.14.7"}`
+        `v${"5.14.8"}`
       )} ${headline}`
     );
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "5.14.7",
+  "version": "5.14.8",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",