@rspress/shared 2.0.0-alpha.3 → 2.0.0-alpha.4

package/dist/index.js

@@ -190,13 +190,15 @@ const parseUrl = (url)=>{
 function normalizeHref(url, cleanUrls = false) {
     if (!url) return '/';
     if (isExternalUrl(url)) return url;
+    if (url.startsWith('#')) return url;
     let { url: cleanUrl, hash } = parseUrl(decodeURIComponent(url));
-    if (!cleanUrls && !cleanUrl.endsWith('.html')) {
+    if (cleanUrls) {
+        if (cleanUrl.endsWith('.html')) cleanUrl = cleanUrl.replace(/\.html$/, '');
+        if (cleanUrls && cleanUrl.endsWith('/index')) cleanUrl = cleanUrl.replace(/\/index$/, '/');
+    } else if (!cleanUrl.endsWith('.html')) {
         if (cleanUrl.endsWith('/')) cleanUrl += 'index.html';
         else cleanUrl += '.html';
     }
-    if (cleanUrls && cleanUrl.endsWith('/')) cleanUrl += 'index';
-    if (cleanUrls && cleanUrl.endsWith('.html')) cleanUrl = cleanUrl.replace(/\.html$/, '');
     return addLeadingSlash(hash ? `${cleanUrl}#${hash}` : cleanUrl);
 }
 function withoutLang(path, langs) {

package/dist/index.mjs

@@ -132,13 +132,15 @@ const parseUrl = (url)=>{
 function normalizeHref(url, cleanUrls = false) {
     if (!url) return '/';
     if (isExternalUrl(url)) return url;
+    if (url.startsWith('#')) return url;
     let { url: cleanUrl, hash } = parseUrl(decodeURIComponent(url));
-    if (!cleanUrls && !cleanUrl.endsWith('.html')) {
+    if (cleanUrls) {
+        if (cleanUrl.endsWith('.html')) cleanUrl = cleanUrl.replace(/\.html$/, '');
+        if (cleanUrls && cleanUrl.endsWith('/index')) cleanUrl = cleanUrl.replace(/\/index$/, '/');
+    } else if (!cleanUrl.endsWith('.html')) {
         if (cleanUrl.endsWith('/')) cleanUrl += 'index.html';
         else cleanUrl += '.html';
     }
-    if (cleanUrls && cleanUrl.endsWith('/')) cleanUrl += 'index';
-    if (cleanUrls && cleanUrl.endsWith('.html')) cleanUrl = cleanUrl.replace(/\.html$/, '');
     return addLeadingSlash(hash ? `${cleanUrl}#${hash}` : cleanUrl);
 }
 function withoutLang(path, langs) {

package/dist/node-utils.d.ts

@@ -1,4 +1,6 @@
-import { MdxJsxAttributeValueExpression } from 'mdast-util-mdx-jsx';
+import type { MdxJsxAttribute } from 'mdast-util-mdx-jsx';
+import type { MdxJsxAttributeValueExpression } from 'mdast-util-mdx-jsx';
+import type { MdxJsxExpressionAttribute } from 'mdast-util-mdx-jsx';
 import type { MdxJsxFlowElement } from 'mdast-util-mdx-jsx';
 import type { MdxJsxTextElement } from 'mdast-util-mdx-jsx';
 import type { PluggableList } from 'unified';
@@ -204,7 +206,9 @@ declare interface FrontMatterMeta {
     [key: string]: unknown;
 }
 
-export declare const getNodeAttribute: (node: MdxJsxFlowElement | MdxJsxTextElement, attrName: string) => string | MdxJsxAttributeValueExpression | null | undefined;
+export declare function getNodeAttribute(node: MdxJsxFlowElement | MdxJsxTextElement, attrName: string, attribute?: false): string | MdxJsxAttributeValueExpression | null | undefined;
+
+export declare function getNodeAttribute(node: MdxJsxFlowElement | MdxJsxTextElement, attrName: string, attribute: true): MdxJsxAttribute | MdxJsxExpressionAttribute | undefined;
 
 declare interface Header {
     id: string;

package/dist/node-utils.js

@@ -66,7 +66,10 @@ var __webpack_exports__ = {};
             customId
         ];
     };
-    const getNodeAttribute = (node, attrName)=>node.attributes.find((attr)=>'name' in attr && attr.name === attrName)?.value;
+    function getNodeAttribute(node, attrName, attribute) {
+        const found = node.attributes.find((attr)=>'name' in attr && attr.name === attrName);
+        return attribute ? found : found?.value;
+    }
     const external_node_path_namespaceObject = require("node:path");
     var external_node_path_default = /*#__PURE__*/ __webpack_require__.n(external_node_path_namespaceObject);
     const external_gray_matter_namespaceObject = require("gray-matter");

package/dist/node-utils.mjs

@@ -14,7 +14,10 @@ const extractTextAndId = (title)=>{
         customId
     ];
 };
-const getNodeAttribute = (node, attrName)=>node.attributes.find((attr)=>'name' in attr && attr.name === attrName)?.value;
+function getNodeAttribute(node, attrName, attribute) {
+    const found = node.attributes.find((attr)=>'name' in attr && attr.name === attrName);
+    return attribute ? found : found?.value;
+}
 function loadFrontMatter(source, filepath, root, outputWarning = false) {
     try {
         const { content, data } = (0, __WEBPACK_EXTERNAL_MODULE_gray_matter_90c6cd0b__["default"])(source);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rspress/shared",
-  "version": "2.0.0-alpha.3",
+  "version": "2.0.0-alpha.4",
   "repository": {
     "type": "git",
     "url": "https://github.com/web-infra-dev/rspress",