vite-plugin-react-deck 1.0.6 → 1.0.7

package/codegen.d.ts

@@ -1 +1,6 @@
-export declare function extractMainCodeAsChildren(source: string): Promise<string>;
+/**
+ * Extracts the main code from the MDX file and returns it as a string.
+ */
+export declare function extractMainCodeAsChildren(source: string, { isJsx }: {
+    isJsx: boolean;
+}): string;

package/index.cjs

@@ -22,42 +22,48 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 
 // src/index.ts
-var fs = __toESM(require("fs/promises"), 1);
+var fs2 = __toESM(require("fs/promises"), 1);
 
 // src/slides.ts
 var import_gray_matter = __toESM(require("gray-matter"), 1);
+var import_fs = __toESM(require("fs"), 1);
 var import_mdx = require("@mdx-js/mdx");
 
 // src/codegen.ts
-var import_core = __toESM(require("@swc/core"), 1);
-function findMainFunction(program) {
-  for (const statement of program.body) {
-    if (statement.type === "FunctionDeclaration") {
-      return statement;
-    }
-  }
-}
-async function extractMainCodeAsChildren(source) {
+var Patterns = {
+  FragmentProd: /_jsxs\(_Fragment, {\s*children:|\s*\}\);/g,
+  FragmentDev: /<>\s*|\s*<\/>;\s*$/g
+};
+function extractMainCodeAsChildren(source, {
+  isJsx
+}) {
   const start = source.indexOf("const _components = {");
   const end = source.indexOf("\n}", start);
   const components = source.slice(start, end);
-  const code = await import_core.default.parse(source);
-  const mainFunction = findMainFunction(code);
-  const extractedFunction = await import_core.default.print({ type: "Module", body: [mainFunction], span: { start: 0, end: 1e3, ctxt: 0 }, interpreter: null });
-  const body = extractedFunction.code.split("\n").slice(1, -2).join("\n");
   if (!components) {
     return "";
   }
-  const withWrapper = body.replace(
-    /};\s*return/gm,
-    "};\n  const {wrapper: MDXLayout} = _components;\nconst _content ="
-  );
-  const result = `${withWrapper}
-  return MDXLayout ? _jsx(MDXLayout, {
+  const lines = components.split("\n");
+  const returnPos = lines.findIndex((line) => line.includes("return"));
+  const header = lines.slice(0, returnPos).join("\n");
+  const footer = lines.slice(returnPos).join("\n").replace("return", "");
+  if (isJsx) {
+    const finalFooter2 = footer.replace(Patterns.FragmentDev, "");
+    return `${header}
+  const {wrapper: MDXLayout} = _components;
+  return <MDXLayout {...props}>${finalFooter2}</MDXLayout>;
+  `.trim();
+  }
+  const finalFooter = footer.match(/^\s*_jsxs?\(_Fragment,/gm) ? footer.replace(Patterns.FragmentProd, "") : footer;
+  return `
+${header}
+  const _content = ${finalFooter};
+  const {wrapper: MDXLayout} = _components;
+   return MDXLayout ? _jsx(MDXLayout, {
     ...props,
     children: _content
-  }) : _content;`;
-  return result;
+  }) : _content;
+  `.trim();
 }
 
 // src/slides.ts
@@ -98,7 +104,9 @@ ${slide}
         remarkPlugins: [import_remark_gfm.default],
         ...options
       });
-      const mainCode = await extractMainCodeAsChildren(result.value.toString());
+      const mainCode = extractMainCodeAsChildren(result.value.toString(), {
+        isJsx: !isProd
+      });
       return {
         ...slide,
         mdxContent: mainCode
@@ -133,6 +141,7 @@ Deck.slides = [
   `,
     inlineModules
   );
+  import_fs.default.writeFileSync("slides.js", output);
   return output;
 }
 var MOD_REG = /\\`|`(?:\\`|[^`])*`|(^(?:import|export).*$)/gm;
@@ -206,7 +215,7 @@ var glob = __toESM(require("glob"), 1);
 var import_node_path = __toESM(require("path"), 1);
 async function checkIfDirectoryExists(path2) {
   try {
-    await fs.access(path2);
+    await fs2.access(path2);
     return true;
   } catch {
     return false;
@@ -280,7 +289,7 @@ var src_default = (options) => {
       if (!id.endsWith("deck.mdx")) {
         return;
       }
-      const content = await fs.readFile(id, "utf-8");
+      const content = await fs2.readFile(id, "utf-8");
       const data = await transformSlidesMdxToReact(content, {
         production: isProd,
         ...options

package/index.mjs

@@ -1,40 +1,46 @@
 // src/index.ts
-import * as fs from "fs/promises";
+import * as fs2 from "fs/promises";
 
 // src/slides.ts
 import matter from "gray-matter";
+import fs from "fs";
 import { compile } from "@mdx-js/mdx";
 
 // src/codegen.ts
-import swc from "@swc/core";
-function findMainFunction(program) {
-  for (const statement of program.body) {
-    if (statement.type === "FunctionDeclaration") {
-      return statement;
-    }
-  }
-}
-async function extractMainCodeAsChildren(source) {
+var Patterns = {
+  FragmentProd: /_jsxs\(_Fragment, {\s*children:|\s*\}\);/g,
+  FragmentDev: /<>\s*|\s*<\/>;\s*$/g
+};
+function extractMainCodeAsChildren(source, {
+  isJsx
+}) {
   const start = source.indexOf("const _components = {");
   const end = source.indexOf("\n}", start);
   const components = source.slice(start, end);
-  const code = await swc.parse(source);
-  const mainFunction = findMainFunction(code);
-  const extractedFunction = await swc.print({ type: "Module", body: [mainFunction], span: { start: 0, end: 1e3, ctxt: 0 }, interpreter: null });
-  const body = extractedFunction.code.split("\n").slice(1, -2).join("\n");
   if (!components) {
     return "";
   }
-  const withWrapper = body.replace(
-    /};\s*return/gm,
-    "};\n  const {wrapper: MDXLayout} = _components;\nconst _content ="
-  );
-  const result = `${withWrapper}
-  return MDXLayout ? _jsx(MDXLayout, {
+  const lines = components.split("\n");
+  const returnPos = lines.findIndex((line) => line.includes("return"));
+  const header = lines.slice(0, returnPos).join("\n");
+  const footer = lines.slice(returnPos).join("\n").replace("return", "");
+  if (isJsx) {
+    const finalFooter2 = footer.replace(Patterns.FragmentDev, "");
+    return `${header}
+  const {wrapper: MDXLayout} = _components;
+  return <MDXLayout {...props}>${finalFooter2}</MDXLayout>;
+  `.trim();
+  }
+  const finalFooter = footer.match(/^\s*_jsxs?\(_Fragment,/gm) ? footer.replace(Patterns.FragmentProd, "") : footer;
+  return `
+${header}
+  const _content = ${finalFooter};
+  const {wrapper: MDXLayout} = _components;
+   return MDXLayout ? _jsx(MDXLayout, {
     ...props,
     children: _content
-  }) : _content;`;
-  return result;
+  }) : _content;
+  `.trim();
 }
 
 // src/slides.ts
@@ -75,7 +81,9 @@ ${slide}
         remarkPlugins: [remarkGfm],
         ...options
       });
-      const mainCode = await extractMainCodeAsChildren(result.value.toString());
+      const mainCode = extractMainCodeAsChildren(result.value.toString(), {
+        isJsx: !isProd
+      });
       return {
         ...slide,
         mdxContent: mainCode
@@ -110,6 +118,7 @@ Deck.slides = [
   `,
     inlineModules
   );
+  fs.writeFileSync("slides.js", output);
   return output;
 }
 var MOD_REG = /\\`|`(?:\\`|[^`])*`|(^(?:import|export).*$)/gm;
@@ -183,7 +192,7 @@ import * as glob from "glob";
 import path from "path";
 async function checkIfDirectoryExists(path2) {
   try {
-    await fs.access(path2);
+    await fs2.access(path2);
     return true;
   } catch {
     return false;
@@ -257,7 +266,7 @@ var src_default = (options) => {
       if (!id.endsWith("deck.mdx")) {
         return;
       }
-      const content = await fs.readFile(id, "utf-8");
+      const content = await fs2.readFile(id, "utf-8");
       const data = await transformSlidesMdxToReact(content, {
         production: isProd,
         ...options

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite-plugin-react-deck",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "license": "MIT",
   "type": "module",
   "main": "index.cjs",