astro 1.6.0 → 1.6.2

package/dist/core/errors/utils.js

@@ -0,0 +1,84 @@
+import eol from "eol";
+import stripAnsi from "strip-ansi";
+function collectInfoFromStacktrace(error) {
+  var _a, _b, _c;
+  if (!error.stack)
+    return error;
+  error.stack = eol.lf(error.stack);
+  const stackText = stripAnsi(error.stack);
+  if (!error.loc || !error.loc.column && !error.loc.line) {
+    const possibleFilePath = ((_a = error.loc) == null ? void 0 : _a.file) || error.pluginCode || error.id || 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+/, "");
+    const [file, line, column] = (source == null ? void 0 : source.split(":")) ?? [];
+    if (line && column) {
+      error.loc = {
+        file,
+        line: Number.parseInt(line),
+        column: Number.parseInt(column)
+      };
+    }
+  }
+  if (!error.plugin) {
+    error.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;
+  }
+  error.stack = cleanErrorStack(error.stack);
+  return error;
+}
+function cleanErrorStack(stack) {
+  return stack.split(/\n/g).map((l) => l.replace(/\/@fs\//g, "/")).join("\n");
+}
+function positionAt(offset, text) {
+  const lineOffsets = getLineOffsets(text);
+  offset = Math.max(0, Math.min(text.length, offset));
+  let low = 0;
+  let high = lineOffsets.length;
+  if (high === 0) {
+    return {
+      line: 0,
+      column: offset
+    };
+  }
+  while (low <= high) {
+    const mid = Math.floor((low + high) / 2);
+    const lineOffset = lineOffsets[mid];
+    if (lineOffset === offset) {
+      return {
+        line: mid,
+        column: 0
+      };
+    } else if (offset > lineOffset) {
+      low = mid + 1;
+    } else {
+      high = mid - 1;
+    }
+  }
+  const line = low - 1;
+  return { line, column: offset - lineOffsets[line] };
+}
+function getLineOffsets(text) {
+  const lineOffsets = [];
+  let isLineStart = true;
+  for (let i = 0; i < text.length; i++) {
+    if (isLineStart) {
+      lineOffsets.push(i);
+      isLineStart = false;
+    }
+    const ch = text.charAt(i);
+    isLineStart = ch === "\r" || ch === "\n";
+    if (ch === "\r" && i + 1 < text.length && text.charAt(i + 1) === "\n") {
+      i++;
+    }
+  }
+  if (isLineStart && text.length > 0) {
+    lineOffsets.push(text.length);
+  }
+  return lineOffsets;
+}
+function createSafeError(err) {
+  return err instanceof Error || err && err.name && err.message ? err : new Error(JSON.stringify(err));
+}
+export {
+  collectInfoFromStacktrace,
+  createSafeError,
+  positionAt
+};

package/dist/core/messages.d.ts

@@ -2,7 +2,7 @@
 import type { AddressInfo } from 'net';
 import { ResolvedServerUrls } from 'vite';
 import { ZodError } from 'zod';
-import { ErrorWithMetadata } from './errors.js';
+import { ErrorWithMetadata } from './errors/index.js';
 /** Display  */
 export declare function req({ url, statusCode, reqTime, }: {
     url: string;

package/dist/core/messages.js

@@ -47,7 +47,7 @@ function serverStart({
   site,
   isRestart = false
 }) {
-  const version = "1.6.0";
+  const version = "1.6.2";
   const rootPath = site ? site.pathname : "/";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
@@ -200,14 +200,19 @@ ${errorList.join(
   )}`;
 }
 function formatErrorMessage(err, args = []) {
+  var _a, _b, _c;
   args.push(`${bgRed(black(` error `))}${red(bold(padMultilineString(err.message)))}`);
   if (err.hint) {
     args.push(`  ${bold("Hint:")}`);
     args.push(yellow(padMultilineString(err.hint, 4)));
   }
-  if (err.id) {
+  if (err.id || ((_a = err.loc) == null ? void 0 : _a.file)) {
     args.push(`  ${bold("File:")}`);
-    args.push(red(`    ${err.id}`));
+    args.push(
+      red(
+        `    ${err.id ?? ((_b = err.loc) == null ? void 0 : _b.file)}${((_c = err.loc) == null ? void 0 : _c.line) && err.loc.column ? `:${err.loc.line}:${err.loc.column}` : ""}`
+      )
+    );
   }
   if (err.frame) {
     args.push(`  ${bold("Code:")}`);
@@ -250,7 +255,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"1.6.0"}`
+        `v${"1.6.2"}`
       )} ${headline}`
     );
   }

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

@@ -1,5 +1,7 @@
 import { fileURLToPath } from "url";
 import { PAGE_SCRIPT_ID } from "../../../vite-plugin-scripts/index.js";
+import { enhanceViteSSRError } from "../../errors/dev/index.js";
+import { AggregateError, CSSError, MarkdownError } from "../../errors/index.js";
 import { isPage, resolveIdToUrl } from "../../util.js";
 import { createRenderContext, renderPage as coreRenderPage } from "../index.js";
 import { filterFoundRenderers, loadRenderer } from "../renderer.js";
@@ -16,8 +18,15 @@ async function preload({
   filePath
 }) {
   const renderers = await loadRenderers(env.viteServer, env.settings);
-  const mod = await env.viteServer.ssrLoadModule(fileURLToPath(filePath));
-  return [renderers, mod];
+  try {
+    const mod = await env.viteServer.ssrLoadModule(fileURLToPath(filePath));
+    return [renderers, mod];
+  } catch (err) {
+    if (MarkdownError.is(err) || CSSError.is(err) || AggregateError.is(err)) {
+      throw err;
+    }
+    throw enhanceViteSSRError(err, filePath, env.viteServer);
+  }
 }
 async function getScriptsAndStyles({ env, filePath }) {
   const scripts = await getScriptsForURL(filePath, env.viteServer);

package/dist/core/util.d.ts

@@ -1,4 +1,4 @@
-import { ErrorPayload, ViteDevServer } from 'vite';
+import { ViteDevServer } from 'vite';
 import type { AstroConfig, AstroSettings, RouteType } from '../@types/astro';
 /** Returns true if argument is an object of any prototype/class (but not null). */
 export declare function isObject(value: unknown): value is Record<string, any>;
@@ -24,10 +24,6 @@ export declare function parseNpmName(spec: string): {
     name: string;
     subpath?: string;
 } | undefined;
-/** Coalesce any throw variable to an Error instance. */
-export declare function createSafeError(err: any): Error;
-/** generate code frame from esbuild error */
-export declare function codeFrame(src: string, loc: ErrorPayload['err']['loc']): string;
 export declare function resolveDependency(dep: string, projectRoot: URL): string;
 /**
  * Convert file URL to ID for viteServer.moduleGraph.idToModuleMap.get(:viteID)
@@ -54,4 +50,3 @@ export declare function resolveJsToTs(filePath: string): string;
  * Resolve the hydration paths so that it can be imported in the client
  */
 export declare function resolvePath(specifier: string, importer: string): string;
-export declare const AggregateError: any;

package/dist/core/util.js

@@ -1,4 +1,3 @@
-import eol from "eol";
 import fs from "fs";
 import path from "path";
 import resolve from "resolve";
@@ -67,38 +66,6 @@ function parseNpmName(spec) {
     subpath
   };
 }
-function createSafeError(err) {
-  return err instanceof Error || err && err.name && err.message ? err : new Error(JSON.stringify(err));
-}
-function codeFrame(src, loc) {
-  if (!loc)
-    return "";
-  const lines = eol.lf(src).split("\n").map((ln) => ln.replace(/\t/g, "  "));
-  const visibleLines = [];
-  for (let n = -2; n <= 2; n++) {
-    if (lines[loc.line + n])
-      visibleLines.push(loc.line + n);
-  }
-  let gutterWidth = 0;
-  for (const lineNo of visibleLines) {
-    let w = `> ${lineNo}`;
-    if (w.length > gutterWidth)
-      gutterWidth = w.length;
-  }
-  let output = "";
-  for (const lineNo of visibleLines) {
-    const isFocusedLine = lineNo === loc.line - 1;
-    output += isFocusedLine ? "> " : "  ";
-    output += `${lineNo + 1} | ${lines[lineNo]}
-`;
-    if (isFocusedLine)
-      output += `${Array.from({ length: gutterWidth }).join(" ")}  | ${Array.from({
-        length: loc.column
-      }).join(" ")}^
-`;
-  }
-  return output;
-}
 function resolveDependency(dep, projectRoot) {
   const resolved = resolve.sync(dep, {
     basedir: fileURLToPath(projectRoot)
@@ -194,19 +161,9 @@ function resolvePath(specifier, importer) {
     return specifier;
   }
 }
-const AggregateError = typeof globalThis.AggregateError !== "undefined" ? globalThis.AggregateError : class extends Error {
-  constructor(errors, message) {
-    super(message);
-    this.errors = [];
-    this.errors = Array.from(errors);
-  }
-};
 export {
-  AggregateError,
   VALID_ID_PREFIX,
   arraify,
-  codeFrame,
-  createSafeError,
   emoji,
   getLocalAddress,
   getOutputFilename,

package/dist/events/error.d.ts

@@ -1,5 +1,5 @@
 import { ZodError } from 'zod';
-import { ErrorWithMetadata } from '../core/errors.js';
+import { ErrorWithMetadata } from '../core/errors/index.js';
 interface ErrorEventPayload {
     code: number | undefined;
     isFatal: boolean;

package/dist/events/error.js

@@ -1,4 +1,4 @@
-import { AstroErrorCodes } from "../core/errors.js";
+import { AstroErrorCodes } from "../core/errors/index.js";
 const EVENT_ERROR = "ASTRO_CLI_ERROR";
 const ANONYMIZE_MESSAGE_REGEX = /^(\w| )+/;
 function anonymizeErrorMessage(msg) {

package/dist/runtime/server/render/astro.js

@@ -36,7 +36,7 @@ function isAstroComponent(obj) {
   return typeof obj === "object" && Object.prototype.toString.call(obj) === "[object AstroComponent]";
 }
 function isAstroComponentFactory(obj) {
-  return obj == null ? false : !!obj.isAstroComponentFactory;
+  return obj == null ? false : obj.isAstroComponentFactory === true;
 }
 async function* renderAstroComponent(component) {
   for await (const value of component) {

package/dist/runtime/server/render/component.js

@@ -41,7 +41,7 @@ function getComponentType(Component) {
 }
 async function renderComponent(result, displayName, Component, _props, slots = {}) {
   var _a;
-  Component = await Component;
+  Component = await Component ?? Component;
   switch (getComponentType(Component)) {
     case "fragment": {
       const children2 = await renderSlot(result, slots == null ? void 0 : slots.default);
@@ -92,7 +92,12 @@ Did you mean to add ${formatList(probableRendererNames.map((r) => "`" + r + "`")
   const { children, slotInstructions } = await renderSlots(result, slots);
   let renderer;
   if (metadata.hydrate !== "only") {
-    if (Component && Component[Renderer]) {
+    let isTagged = false;
+    try {
+      isTagged = Component && Component[Renderer];
+    } catch {
+    }
+    if (isTagged) {
       const rendererName = Component[Renderer];
       renderer = renderers.find(({ name }) => name === rendererName);
     }

package/dist/vite-plugin-astro/index.js

@@ -249,7 +249,7 @@ if (import.meta.hot) { import.meta.hot.decline() }`;
             throw frontmatterErr;
           }
         }
-        if (err.stack.includes("wasm-function")) {
+        if (err.stack && err.stack.includes("wasm-function")) {
           const search = new URLSearchParams({
             labels: "compiler",
             title: "\u{1F41B} BUG: `@astrojs/compiler` panic",

package/dist/vite-plugin-astro-server/index.js

@@ -2,11 +2,8 @@ import mime from "mime";
 import { Readable } from "stream";
 import { attachToResponse, getSetCookiesFromResponse } from "../core/cookies/index.js";
 import { call as callEndpoint } from "../core/endpoint/dev/index.js";
-import {
-  collectErrorMetadata,
-  fixViteErrorMessage,
-  getViteErrorPayload
-} from "../core/errors.js";
+import { collectErrorMetadata, getViteErrorPayload } from "../core/errors/dev/index.js";
+import { createSafeError } from "../core/errors/index.js";
 import { error, info, warn } from "../core/logger/core.js";
 import * as msg from "../core/messages.js";
 import { appendForwardSlash } from "../core/path.js";
@@ -200,13 +197,11 @@ async function handleRequest(env, manifest, req, res) {
     });
     body = Buffer.concat(bytes);
   }
-  let filePath;
   try {
     const matchedRoute = await matchRoute(pathname, env, manifest);
-    filePath = matchedRoute == null ? void 0 : matchedRoute.filePath;
     return await handleRoute(matchedRoute, url, pathname, body, origin, env, manifest, req, res);
   } catch (_err) {
-    const err = fixViteErrorMessage(_err, viteServer, filePath);
+    const err = createSafeError(_err);
     const errorWithMetadata = collectErrorMetadata(err);
     error(env.logging, null, msg.formatErrorMessage(errorWithMetadata));
     handle500Response(viteServer, origin, req, res, errorWithMetadata);

package/dist/vite-plugin-markdown/index.js

@@ -3,16 +3,32 @@ import fs from "fs";
 import matter from "gray-matter";
 import { fileURLToPath } from "node:url";
 import { normalizePath } from "vite";
-import { collectErrorMetadata } from "../core/errors.js";
+import { AstroErrorCodes, MarkdownError } from "../core/errors/index.js";
 import { warn } from "../core/logger/core.js";
 import { isMarkdownFile } from "../core/util.js";
 import { getFileInfo, safelyGetAstroData } from "../vite-plugin-utils/index.js";
 function safeMatter(source, id) {
   try {
     return matter(source);
-  } catch (e) {
-    e.id = id;
-    throw collectErrorMetadata(e);
+  } catch (err) {
+    const markdownError = new MarkdownError({
+      errorCode: AstroErrorCodes.GenericMarkdownError,
+      message: err.message,
+      stack: err.stack,
+      location: {
+        file: id
+      }
+    });
+    if (err.name === "YAMLException") {
+      markdownError.setErrorCode(AstroErrorCodes.MarkdownFrontmatterParseError);
+      markdownError.setLocation({
+        file: id,
+        line: err.mark.line,
+        column: err.mark.column
+      });
+      markdownError.setMessage(err.reason);
+    }
+    throw markdownError;
   }
 }
 const astroJsxRuntimeModulePath = normalizePath(

package/dist/vite-plugin-markdown-legacy/index.js

@@ -6,7 +6,7 @@ import matter from "gray-matter";
 import { fileURLToPath } from "url";
 import { pagesVirtualModuleId } from "../core/app/index.js";
 import { cachedCompilation } from "../core/compile/index.js";
-import { collectErrorMetadata } from "../core/errors.js";
+import { AstroErrorCodes, MarkdownError } from "../core/errors/index.js";
 import { isMarkdownFile } from "../core/util.js";
 import { getFileInfo } from "../vite-plugin-utils/index.js";
 import {
@@ -18,9 +18,25 @@ const MARKDOWN_CONTENT_FLAG = "?content";
 function safeMatter(source, id) {
   try {
     return matter(source);
-  } catch (e) {
-    e.id = id;
-    throw collectErrorMetadata(e);
+  } catch (err) {
+    const markdownError = new MarkdownError({
+      errorCode: AstroErrorCodes.GenericMarkdownError,
+      message: err.message,
+      stack: err.stack,
+      location: {
+        file: id
+      }
+    });
+    if (err.name === "YAMLException") {
+      markdownError.setErrorCode(AstroErrorCodes.MarkdownFrontmatterParseError);
+      markdownError.setLocation({
+        file: id,
+        line: err.mark.line,
+        column: err.mark.column
+      });
+      markdownError.setMessage(err.reason);
+    }
+    throw markdownError;
   }
 }
 function markdown({ settings }) {

package/dist/vite-plugin-utils/index.js

@@ -4,7 +4,7 @@ function getFileInfo(id, config) {
     config.site ? new URL(config.base, config.site).pathname : config.base
   );
   const fileId = id.split("?")[0];
-  let fileUrl = fileId.includes("/pages/") ? fileId.replace(/^.*?\/pages\//, sitePathname).replace(/(\/index)?\.(md|astro)$/, "") : void 0;
+  let fileUrl = fileId.includes("/pages/") ? fileId.replace(/^.*?\/pages\//, sitePathname).replace(/(\/index)?\.(md|markdown|mdown|mkdn|mkd|mdwn|md|astro)$/, "") : void 0;
   if (fileUrl && config.trailingSlash === "always") {
     fileUrl = appendForwardSlash(fileUrl);
   }

package/dist/vite-style-transform/style-transform.js

@@ -1,5 +1,9 @@
 import { fileURLToPath } from "url";
 import { createTransformStyleWithViteFn } from "./transform-with-vite.js";
+import { readFileSync } from "fs";
+import { AstroErrorCodes } from "../core/errors/codes.js";
+import { CSSError } from "../core/errors/errors.js";
+import { positionAt } from "../core/errors/index.js";
 function createViteStyleTransformer(viteConfig) {
   return {
     transformStyleWithVite: createTransformStyleWithViteFn(viteConfig)
@@ -16,13 +20,57 @@ function getNormalizedIDForPostCSS(filename) {
 function createTransformStyles(viteStyleTransformer, filename, ssr, pluginContext) {
   const normalizedID = getNormalizedIDForPostCSS(filename);
   return async function(styleSource, lang) {
-    const result = await viteStyleTransformer.transformStyleWithVite.call(pluginContext, {
-      id: normalizedID,
-      source: styleSource,
-      lang,
-      ssr,
-      viteDevServer: viteStyleTransformer.viteDevServer
-    });
+    var _a;
+    let result;
+    try {
+      result = await viteStyleTransformer.transformStyleWithVite.call(pluginContext, {
+        id: normalizedID,
+        source: styleSource,
+        lang,
+        ssr,
+        viteDevServer: viteStyleTransformer.viteDevServer
+      });
+    } catch (err) {
+      const fileContent = readFileSync(filename).toString();
+      const styleTagBeginning = fileContent.indexOf(((_a = err.input) == null ? void 0 : _a.source) ?? err.code);
+      if (err.name === "CssSyntaxError") {
+        const errorLine = positionAt(styleTagBeginning, fileContent).line + (err.line ?? 0);
+        throw new CSSError({
+          errorCode: AstroErrorCodes.CssSyntaxError,
+          message: err.reason,
+          location: {
+            file: filename,
+            line: errorLine,
+            column: err.column
+          }
+        });
+      }
+      if (err.line && err.column) {
+        const errorLine = positionAt(styleTagBeginning, fileContent).line + (err.line ?? 0);
+        throw new CSSError({
+          errorCode: AstroErrorCodes.CssUnknownError,
+          message: err.message,
+          location: {
+            file: filename,
+            line: errorLine,
+            column: err.column
+          },
+          frame: err.frame
+        });
+      }
+      const errorPosition = positionAt(styleTagBeginning, fileContent);
+      errorPosition.line += 1;
+      throw new CSSError({
+        errorCode: AstroErrorCodes.CssUnknownError,
+        message: err.message,
+        location: {
+          file: filename,
+          line: errorPosition.line,
+          column: 0
+        },
+        frame: err.frame
+      });
+    }
     return result;
   };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "1.6.0",
+  "version": "1.6.2",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -82,15 +82,16 @@
     "client-base.d.ts",
     "import-meta.d.ts",
     "astro-jsx.d.ts",
+    "types.d.ts",
     "README.md",
     "vendor"
   ],
   "dependencies": {
-    "@astrojs/compiler": "^0.28.0",
+    "@astrojs/compiler": "^0.29.5",
     "@astrojs/language-server": "^0.26.2",
     "@astrojs/markdown-remark": "^1.1.3",
     "@astrojs/telemetry": "^1.0.1",
-    "@astrojs/webapi": "^1.1.0",
+    "@astrojs/webapi": "^1.1.1",
     "@babel/core": "^7.18.2",
     "@babel/generator": "^7.18.2",
     "@babel/parser": "^7.18.4",
@@ -132,7 +133,7 @@
     "recast": "^0.20.5",
     "rehype": "^12.0.1",
     "resolve": "^1.22.0",
-    "rollup": "~2.78.0",
+    "rollup": "^2.79.1",
     "semver": "^7.3.7",
     "shiki": "^0.11.1",
     "sirv": "^2.0.2",
@@ -144,7 +145,7 @@
     "typescript": "*",
     "unist-util-visit": "^4.1.0",
     "vfile": "^5.3.2",
-    "vite": "~3.1.3",
+    "vite": "~3.2.1",
     "vitefu": "^0.1.0",
     "yargs-parser": "^21.0.1",
     "zod": "^3.17.3"
@@ -172,7 +173,7 @@
     "@types/send": "^0.17.1",
     "@types/unist": "^2.0.6",
     "ast-types": "^0.14.2",
-    "astro-scripts": "0.0.8",
+    "astro-scripts": "0.0.9",
     "chai": "^4.3.6",
     "cheerio": "^1.0.0-rc.11",
     "mocha": "^9.2.2",

package/types.d.ts

@@ -0,0 +1,14 @@
+import './astro-jsx';
+import { AstroBuiltinAttributes } from './dist/@types/astro';
+
+/** Any supported HTML or SVG element name, as defined by the HTML specification */
+export type HTMLTag = keyof astroHTML.JSX.DefinedIntrinsicElements;
+/** The built-in attributes for any known HTML or SVG element name */
+export type HTMLAttributes<Tag extends HTMLTag> = Omit<
+	astroHTML.JSX.IntrinsicElements[Tag],
+	keyof AstroBuiltinAttributes
+>;
+
+// TODO: Enable generic/polymorphic types once compiler output stabilizes in the Language Server
+// type PolymorphicAttributes<P extends { as: HTMLTag }> = Omit<(P & HTMLAttributes<P['as']>), 'as'> & { as?: P['as'] };
+// export type Polymorphic<P extends { as: HTMLTag }> = PolymorphicAttributes<Omit<P, 'as'> & { as: NonNullable<P['as']>}>;

package/dist/core/errors.d.ts

@@ -1,36 +0,0 @@
-import type { ErrorPayload, Logger, LogLevel, ViteDevServer } from 'vite';
-export declare enum AstroErrorCodes {
-    UnknownError = 1000,
-    ConfigError = 1001,
-    UnknownCompilerError = 2000,
-    UnknownCompilerCSSError = 2001
-}
-export interface ErrorWithMetadata {
-    [name: string]: any;
-    message: string;
-    stack: string;
-    code?: number;
-    hint?: string;
-    id?: string;
-    frame?: string;
-    plugin?: string;
-    pluginCode?: string;
-    loc?: {
-        file?: string;
-        line: number;
-        column: number;
-    };
-}
-export declare function cleanErrorStack(stack: string): string;
-/**
- * Update the error message to correct any vite-isms that we don't want to expose to the user.
- * The `server` is required if the error may come from `server.ssrLoadModule()`.
- */
-export declare function fixViteErrorMessage(_err: unknown, server?: ViteDevServer, filePath?: URL): Error;
-export declare function createCustomViteLogger(logLevel: LogLevel): Logger;
-/**
- * Takes any error-like object and returns a standardized Error + metadata object.
- * Useful for consistent reporting regardless of where the error surfaced from.
- */
-export declare function collectErrorMetadata(e: any, filePath?: URL): ErrorWithMetadata;
-export declare function getViteErrorPayload(err: ErrorWithMetadata): ErrorPayload;