@astrojs/markdoc 1.0.0-beta.1 → 1.0.0-beta.3

package/dist/html/css/parse-inline-css-to-react.js

@@ -11,7 +11,7 @@ function parseInlineCSSToReactLikeObject(css) {
   return void 0;
 }
 function convertCssDirectiveNameToReactCamelCase(original) {
-  const replaced = original.replace(/-([a-z0-9])/gi, (_match, char) => {
+  const replaced = original.replace(/-([a-z\d])/gi, (_match, char) => {
     return char.toUpperCase();
   });
   return replaced;

package/dist/html/css/parse-inline-styles.js

@@ -14,9 +14,9 @@
 const COMMENT_REGEX = /\/\*[^*]*\*+([^/*][^*]*\*+)*\//g;
 const NEWLINE_REGEX = /\n/g;
 const WHITESPACE_REGEX = /^\s*/;
-const PROPERTY_REGEX = /^(\*?[-#/*\\\w]+(\[[0-9a-z_-]+\])?)\s*/;
+const PROPERTY_REGEX = /^([-#/*\\\w]+(\[[\da-z_-]+\])?)\s*/;
 const COLON_REGEX = /^:\s*/;
-const VALUE_REGEX = /^((?:'(?:\\'|.)*?'|"(?:\\"|.)*?"|\([^)]*?\)|[^};])+)/;
+const VALUE_REGEX = /^((?:'(?:\\'|.)*?'|"(?:\\"|.)*?"|\([^)]*\)|[^};])+)/;
 const SEMICOLON_REGEX = /^[;\s]*/;
 const TRIM_REGEX = /^\s+|\s+$/g;
 const NEWLINE = "\n";
@@ -29,15 +29,13 @@ function parseInlineStyles(style, options) {
   if (typeof style !== "string") {
     throw new TypeError("First argument must be a string");
   }
-  if (!style)
-    return [];
+  if (!style) return [];
   options = options || {};
   let lineno = 1;
   let column = 1;
   function updatePosition(str) {
     let lines = str.match(NEWLINE_REGEX);
-    if (lines)
-      lineno += lines.length;
+    if (lines) lineno += lines.length;
     let i = str.lastIndexOf(NEWLINE);
     column = ~i ? str.length - i : column + str.length;
   }
@@ -71,8 +69,7 @@ function parseInlineStyles(style, options) {
   }
   function match(re) {
     const m = re.exec(style);
-    if (!m)
-      return;
+    if (!m) return;
     const str = m[0];
     updatePosition(str);
     style = style.slice(str.length);
@@ -93,8 +90,7 @@ function parseInlineStyles(style, options) {
   }
   function comment() {
     const pos = position();
-    if (FORWARD_SLASH != style.charAt(0) || ASTERISK != style.charAt(1))
-      return;
+    if (FORWARD_SLASH != style.charAt(0) || ASTERISK != style.charAt(1)) return;
     let i = 2;
     while (EMPTY_STRING != style.charAt(i) && (ASTERISK != style.charAt(i) || FORWARD_SLASH != style.charAt(i + 1))) {
       ++i;
@@ -116,11 +112,9 @@ function parseInlineStyles(style, options) {
   function declaration() {
     const pos = position();
     const prop = match(PROPERTY_REGEX);
-    if (!prop)
-      return;
+    if (!prop) return;
     comment();
-    if (!match(COLON_REGEX))
-      return error("property missing ':'");
+    if (!match(COLON_REGEX)) return error("property missing ':'");
     const val = match(VALUE_REGEX);
     const ret = pos({
       type: TYPE_DECLARATION,

package/dist/html/tagdefs/html.tag.js

@@ -1,4 +1,34 @@
 import Markdoc from "@markdoc/markdoc";
+const booleanAttributes = /* @__PURE__ */ new Set([
+  "allowfullscreen",
+  "async",
+  "autofocus",
+  "autoplay",
+  "checked",
+  "controls",
+  "default",
+  "defer",
+  "disabled",
+  "disablepictureinpicture",
+  "disableremoteplayback",
+  "download",
+  "formnovalidate",
+  "hidden",
+  "inert",
+  "ismap",
+  "itemscope",
+  "loop",
+  "multiple",
+  "muted",
+  "nomodule",
+  "novalidate",
+  "open",
+  "playsinline",
+  "readonly",
+  "required",
+  "reversed",
+  "selected"
+]);
 import { parseInlineCSSToReactLikeObject } from "../css/parse-inline-css-to-react.js";
 const htmlTag = {
   attributes: {
@@ -9,6 +39,11 @@ const htmlTag = {
     const { name, attrs: unsafeAttributes } = node.attributes;
     const children = node.transformChildren(config);
     const { style, ...safeAttributes } = unsafeAttributes;
+    for (const [key, value] of Object.entries(safeAttributes)) {
+      if (booleanAttributes.has(key)) {
+        safeAttributes[key] = value === "" || value === true || value === "true";
+      }
+    }
     if (typeof style === "string") {
       const styleObject = parseInlineCSSToReactLikeObject(style);
       safeAttributes.style = styleObject;

package/dist/html/transform/html-token-transform.d.ts

@@ -1,3 +1,4 @@
+/** biome-ignore-all lint/correctness/noUnusedImports: not correctly detected because type isn't exported */
 import type { Tokenizer } from '@markdoc/markdoc';
 import type * as Token from 'markdown-it/lib/token';
 export declare function htmlTokenTransform(tokenizer: Tokenizer, tokens: Token[]): Token[];

package/dist/index.js

@@ -1,7 +1,7 @@
 import { getContentEntryType } from "./content-entry-type.js";
 import {
-  SUPPORTED_MARKDOC_CONFIG_FILES,
-  loadMarkdocConfig
+  loadMarkdocConfig,
+  SUPPORTED_MARKDOC_CONFIG_FILES
 } from "./load-config.js";
 function markdocIntegration(options) {
   let markdocConfigResult;
@@ -25,7 +25,7 @@ function markdocIntegration(options) {
         });
       },
       "astro:server:setup": async ({ server }) => {
-        server.watcher.on("all", (event, entry) => {
+        server.watcher.on("all", (_event, entry) => {
           if (SUPPORTED_MARKDOC_CONFIG_FILES.some((f) => entry.endsWith(f))) {
             server.restart();
           }

package/dist/load-config.js

@@ -1,6 +1,6 @@
-import { build as esbuild } from "esbuild";
 import * as fs from "node:fs";
 import { fileURLToPath } from "node:url";
+import { build as esbuild } from "esbuild";
 import { MarkdocError } from "./utils.js";
 const SUPPORTED_MARKDOC_CONFIG_FILES = [
   "markdoc.config.js",
@@ -12,13 +12,11 @@ async function loadMarkdocConfig(astroConfig) {
   let markdocConfigUrl;
   for (const filename of SUPPORTED_MARKDOC_CONFIG_FILES) {
     const filePath = new URL(filename, astroConfig.root);
-    if (!fs.existsSync(filePath))
-      continue;
+    if (!fs.existsSync(filePath)) continue;
     markdocConfigUrl = filePath;
     break;
   }
-  if (!markdocConfigUrl)
-    return;
+  if (!markdocConfigUrl) return;
   const { code } = await bundleConfigFile({
     markdocConfigUrl,
     astroConfig
@@ -65,8 +63,7 @@ async function bundleConfigFile({
       }
     ]
   });
-  if (markdocError)
-    throw markdocError;
+  if (markdocError) throw markdocError;
   const { text } = result.outputFiles[0];
   return {
     code: text,

package/dist/options.d.ts

@@ -1,3 +1,5 @@
 export interface MarkdocIntegrationOptions {
     allowHTML?: boolean;
+    ignoreIndentation?: boolean;
+    typographer?: boolean;
 }

package/dist/{experimental-assets-config.d.ts → runtime-assets-config.d.ts}

@@ -1,2 +1,2 @@
 import type { Config as MarkdocConfig } from '@markdoc/markdoc';
-export declare const experimentalAssetsConfig: MarkdocConfig;
+export declare const assetsConfig: MarkdocConfig;

package/dist/{experimental-assets-config.js → runtime-assets-config.js}

@@ -1,6 +1,6 @@
-import Markdoc from "@markdoc/markdoc";
 import { Image } from "astro:assets";
-const experimentalAssetsConfig = {
+import Markdoc from "@markdoc/markdoc";
+const assetsConfig = {
   nodes: {
     image: {
       attributes: {
@@ -21,5 +21,5 @@ const experimentalAssetsConfig = {
   }
 };
 export {
-  experimentalAssetsConfig
+  assetsConfig
 };

package/dist/runtime.js

@@ -64,13 +64,11 @@ function mergeConfig(configA, configB) {
 function resolveComponentImports(markdocConfig, tagComponentMap, nodeComponentMap) {
   for (const [tag, render] of Object.entries(tagComponentMap)) {
     const config = markdocConfig.tags[tag];
-    if (config)
-      config.render = render;
+    if (config) config.render = render;
   }
   for (const [node, render] of Object.entries(nodeComponentMap)) {
     const config = markdocConfig.nodes[node];
-    if (config)
-      config.render = render;
+    if (config) config.render = render;
   }
   return markdocConfig;
 }
@@ -88,8 +86,7 @@ function getTextContent(childNodes) {
 const headingLevels = [1, 2, 3, 4, 5, 6];
 function collectHeadings(children, collectedHeadings) {
   for (const node of children) {
-    if (typeof node !== "object" || !Markdoc.Tag.isTag(node))
-      continue;
+    if (typeof node !== "object" || !Markdoc.Tag.isTag(node)) continue;
     if (node.attributes.__collectHeading === true && typeof node.attributes.level === "number") {
       collectedHeadings.push({
         slug: node.attributes.id,

package/dist/tokenizer.js

@@ -11,6 +11,12 @@ function getMarkdocTokenizer(options) {
       tokenizerOptions.allowIndentation = true;
       tokenizerOptions.html = true;
     }
+    if (options?.ignoreIndentation) {
+      tokenizerOptions.allowIndentation = true;
+    }
+    if (options?.typographer) {
+      tokenizerOptions.typographer = options.typographer;
+    }
     _cachedMarkdocTokenizers[key] = new Markdoc.Tokenizer(tokenizerOptions);
   }
   return _cachedMarkdocTokenizers[key];

package/dist/utils.d.ts

@@ -31,15 +31,6 @@ interface ErrorProperties {
  */
 export declare function prependForwardSlash(str: string): string;
 export declare function isValidUrl(str: string): boolean;
-/**
- * Identifies Astro components with propagated assets
- * @see 'packages/astro/src/content/consts.ts'
- */
-export declare const PROPAGATED_ASSET_FLAG = "astroPropagatedAssets";
-/**
- * @see 'packages/astro/src/content/utils.ts'
- */
-export declare function hasContentFlag(viteId: string, flag: string): boolean;
 /** Identifier for components imports passed as `tags` or `nodes` configuration. */
 export declare const componentConfigSymbol: unique symbol;
 export declare function isComponentConfig(value: unknown): value is ComponentConfig;

package/dist/utils.js

@@ -8,8 +8,7 @@ class MarkdocError extends Error {
     super(...params);
     const { title = "MarkdocError", message, stack, location, hint, frame } = props;
     this.title = title;
-    if (message)
-      this.message = message;
+    if (message) this.message = message;
     this.stack = stack ? stack : this.stack;
     this.loc = location;
     this.hint = hint;
@@ -27,20 +26,13 @@ function isValidUrl(str) {
     return false;
   }
 }
-const PROPAGATED_ASSET_FLAG = "astroPropagatedAssets";
-function hasContentFlag(viteId, flag) {
-  const flags = new URLSearchParams(viteId.split("?")[1] ?? "");
-  return flags.has(flag);
-}
 const componentConfigSymbol = Symbol.for("@astrojs/markdoc/component-config");
 function isComponentConfig(value) {
   return typeof value === "object" && value !== null && componentConfigSymbol in value;
 }
 export {
   MarkdocError,
-  PROPAGATED_ASSET_FLAG,
   componentConfigSymbol,
-  hasContentFlag,
   isComponentConfig,
   isValidUrl,
   prependForwardSlash

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@astrojs/markdoc",
   "description": "Add support for Markdoc in your Astro site",
-  "version": "1.0.0-beta.1",
+  "version": "1.0.0-beta.3",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "withastro",
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "https://github.com/withastro/astro.git",
+    "url": "git+https://github.com/withastro/astro.git",
     "directory": "packages/integrations/markdoc"
   },
   "keywords": [
@@ -34,7 +34,7 @@
     ".": "./dist/index.js",
     "./components": "./components/index.ts",
     "./runtime": "./dist/runtime.js",
-    "./experimental-assets-config": "./dist/experimental-assets-config.js",
+    "./runtime-assets-config": "./dist/runtime-assets-config.js",
     "./package.json": "./package.json"
   },
   "typesVersions": {
@@ -56,43 +56,35 @@
     "template"
   ],
   "dependencies": {
-    "@markdoc/markdoc": "^0.3.0",
-    "esbuild": "^0.18.16",
+    "@markdoc/markdoc": "^0.5.4",
+    "esbuild": "^0.25.0",
     "github-slugger": "^2.0.0",
-    "gray-matter": "^4.0.3",
-    "htmlparser2": "^9.0.0",
-    "kleur": "^4.1.5",
-    "shiki": "^0.14.1",
-    "zod": "^3.17.3",
-    "@astrojs/internal-helpers": "0.2.0-beta.1",
-    "@astrojs/prism": "3.0.0-beta.0"
+    "htmlparser2": "^10.0.0",
+    "@astrojs/internal-helpers": "0.7.5",
+    "@astrojs/markdown-remark": "7.0.0-alpha.0",
+    "@astrojs/prism": "4.0.0-alpha.0"
   },
   "peerDependencies": {
-    "astro": "^3.0.0-beta.2"
+    "astro": "^6.0.0-alpha.0"
   },
   "devDependencies": {
-    "@types/chai": "^4.3.5",
-    "@types/html-escaper": "^3.0.0",
-    "@types/markdown-it": "^12.2.3",
-    "@types/mocha": "^9.1.1",
-    "chai": "^4.3.7",
-    "devalue": "^4.3.2",
-    "linkedom": "^0.14.26",
-    "mocha": "^9.2.2",
-    "rollup": "^3.25.1",
-    "vite": "^4.4.6",
-    "@astrojs/markdown-remark": "3.0.0-beta.0",
-    "astro": "3.0.0-beta.2",
+    "@types/markdown-it": "^14.1.2",
+    "devalue": "^5.6.1",
+    "linkedom": "^0.18.12",
+    "vite": "^7.1.7",
+    "astro": "6.0.0-beta.0",
     "astro-scripts": "0.0.14"
   },
   "engines": {
-    "node": ">=18.14.1"
+    "node": "^20.19.5 || >=22.12.0"
+  },
+  "publishConfig": {
+    "provenance": true
   },
   "scripts": {
     "build": "astro-scripts build \"src/**/*.ts\" && tsc",
     "build:ci": "astro-scripts build \"src/**/*.ts\"",
     "dev": "astro-scripts dev \"src/**/*.ts\"",
-    "test": "mocha --exit --timeout 20000",
-    "test:match": "mocha --timeout 20000 -g"
+    "test": "astro-scripts test --timeout 100000 \"test/**/*.test.js\""
   }
 }

package/dist/html/index.d.ts

@@ -1,2 +0,0 @@
-export { htmlTag } from './tagdefs/html.tag';
-export { htmlTokenTransform } from './transform/html-token-transform';

package/dist/html/index.js

@@ -1,6 +0,0 @@
-import { htmlTag } from "./tagdefs/html.tag";
-import { htmlTokenTransform } from "./transform/html-token-transform";
-export {
-  htmlTag,
-  htmlTokenTransform
-};