Merge branch 'feat/code-samples-runs' into feat/code-samples-storages

apify-api/openapi/code_samples/javascript/act_runs_post.js

@@ -5,6 +5,6 @@ const apifyClient = new ApifyClient({
 });
 const run = await apifyClient
     .actor('<ACTOR ID>')
-    .start({ /** <ACTOR INPUT> */ });
+    .start({ 'foo': 'bar' });
 
 console.log(run);

apify-api/openapi/code_samples/javascript/actorTask_input_put.js

@@ -5,6 +5,6 @@ const apifyClient = new ApifyClient({
 });
 const updatedInput = await apifyClient
     .task('<TASK ID>')
-    .updateInput({ /** NEW INPUT */ });
+    .updateInput({ 'foo': 'baz' });
 
 console.log(updatedInput);

apify-docs-theme/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@apify/docs-theme",
-    "version": "1.0.146",
+    "version": "1.0.148",
     "description": "",
     "main": "./src/index.js",
     "files": [
@@ -26,7 +26,11 @@
         "babel-loader": "^9.1.3",
         "docusaurus-gtm-plugin": "^0.0.2",
         "postcss-preset-env": "^9.3.0",
-        "prism-react-renderer": "^2.0.6"
+        "prism-react-renderer": "^2.0.6",
+        "remark-parse": "^11.0.0",
+        "remark-stringify": "^11.0.0",
+        "unified": "^11.0.5",
+        "unist-util-visit-parents": "^3.1.1"
     },
     "peerDependencies": {
         "clsx": "*",

apify-docs-theme/src/markdown.js

@@ -1,33 +1,132 @@
+const remarkParse = require('remark-parse');
+const remarkStringify = require('remark-stringify');
+const { unified } = require('unified');
+const visitParents = require('unist-util-visit-parents');
+
+/**
+ * Updates the markdown content for better UX and compatibility with Docusaurus v3.
+ * @param {string} changelog The markdown content.
+ * @returns {string} The updated markdown content.
+ */
 function updateChangelog(changelog) {
+    const pipeline = unified()
+        .use(remarkParse)
+        .use(incrementHeadingLevels)
+        .use(prettifyPRLinks)
+        .use(linkifyUserTags)
+        .use(remarkStringify);
+
+    changelog = pipeline.processSync(changelog).toString();
     changelog = addFrontmatter(changelog);
-    changelog = pushHeadings(changelog);
-    changelog = fixUserLinks(changelog);
-    changelog = fixPRLinks(changelog);
     changelog = escapeMDXCharacters(changelog);
     return changelog;
 }
 
-function addFrontmatter(changelog, header = 'Changelog') {
-    return `---
-title: ${header}
-sidebar_label: ${header}
-toc_max_heading_level: 2
----
-${changelog}`;
-}
+/**
+ * Bumps the headings levels in the markdown content. This function increases the depth
+ * of all headings in the content by 1. This is useful when the content is included in
+ * another markdown file with a higher-level heading.
+ * @param {*} tree Remark AST tree.
+ * @returns {void} Nothing. This function modifies the tree in place.
+ */
+const incrementHeadingLevels = () => (tree) => {
+    visitParents(tree, 'heading', (node) => {
+        node.depth += 1;
+    });
+};
 
-function pushHeadings(changelog) {
-    return changelog.replaceAll(/\n#[^#]/g, '\n## ');
-}
+/**
+ * Links user tags in the markdown content. This function replaces the user tags
+ * (e.g. `@username`) with a link to the user's GitHub profile (just like GitHub's UI).
+ * @param {*} tree Remark AST tree.
+ * @returns {void} Nothing. This function modifies the tree in place.
+ */
+const linkifyUserTags = () => (tree) => {
+    visitParents(tree, 'text', (node, parents) => {
+        const userTagRegex = /@([a-zA-Z0-9-]+)(\s|$)/g;
+        const match = userTagRegex.exec(node.value);
 
-function fixUserLinks(changelog) {
-    return changelog.replaceAll(/by @([a-zA-Z0-9-]+)/g, 'by [@$1](https://github.com/$1)');
-}
+        if (!match) return;
+
+        const directParent = parents[parents.length - 1];
+        const nodeIndexInParent = directParent.children.findIndex((x) => x === node);
+
+        const username = match[1];
+        const ending = match[2] === ' ' ? ' ' : '';
+        const before = node.value.slice(0, match.index);
+        const after = node.value.slice(userTagRegex.lastIndex);
 
-function fixPRLinks(changelog) {
-    return changelog.replaceAll(/(((https?:\/\/)?(www.)?)?github.com\/[^\s]*?\/pull\/([0-9]+))/g, '[#$5]($1)');
+        const link = {
+            type: 'link',
+            url: `https://github.com/${username}`,
+            children: [{ type: 'text', value: `@${username}` }],
+        };
+        node.value = before;
+        directParent.children.splice(nodeIndexInParent + 1, 0, link);
+
+        if (!after) return nodeIndexInParent + 2;
+
+        directParent.children.splice(nodeIndexInParent + 2, 0, { type: 'text', value: `${ending}${after}` });
+        return nodeIndexInParent + 3;
+    });
+};
+
+/**
+ * Prettifies PR links in the markdown content. Just like GitHub's UI, this function
+ * replaces the full PR URL with a link represented by the PR number (prefixed by a hashtag).
+ * @param {*} tree Remark AST tree.
+ * @returns {void} Nothing. This function modifies the tree in place.
+ */
+const prettifyPRLinks = () => (tree) => {
+    visitParents(tree, 'text', (node, parents) => {
+        const prLinkRegex = /https:\/\/github.com\/[^\s]+\/pull\/(\d+)/g;
+        const match = prLinkRegex.exec(node.value);
+
+        if (!match) return;
+
+        const directParent = parents[parents.length - 1];
+        const nodeIndexInParent = directParent.children.findIndex((x) => x === node);
+
+        const prNumber = match[1];
+        const before = node.value.slice(0, match.index);
+        const after = node.value.slice(prLinkRegex.lastIndex);
+
+        const link = {
+            type: 'link',
+            url: match[0],
+            children: [{ type: 'text', value: `#${prNumber}` }],
+        };
+        node.value = before;
+
+        directParent.children.splice(nodeIndexInParent + 1, 0, link);
+        if (!after) return nodeIndexInParent + 1;
+
+        directParent.children.splice(nodeIndexInParent + 2, 0, { type: 'text', value: after });
+        return nodeIndexInParent + 2;
+    });
+};
+
+/**
+ * Adds frontmatter to the markdown content.
+ * @param {string} changelog The markdown content.
+ * @param {string} title The frontmatter title.
+ * @returns {string} The markdown content with frontmatter.
+ */
+function addFrontmatter(changelog, title = 'Changelog') {
+    return `---
+title: ${title}
+sidebar_label: ${title}
+toc_max_heading_level: 3
+---
+${changelog}`;
 }
 
+/**
+ * Escapes the MDX-related characters in the markdown content.
+ * This is required by Docusaurus v3 and its dependencies (see the v3 [migration guide](https://docusaurus.io/docs/migration/v3#common-mdx-problems)).
+ * @param {string} changelog The markdown content.
+ * @returns {string} The markdown content with escaped MDX characters.
+ */
 function escapeMDXCharacters(changelog) {
     return changelog.replaceAll(/<|>/g, (match) => {
         return match === '<' ? '&lt;' : '&gt;';