fix orgx tests

Author: xiaoxinghu

packages/orgx/src/evaluate.ts

@@ -2,6 +2,7 @@ import type { VFileCompatible } from 'vfile'
 import { compile, compileSync } from './compile.js'
 import { ProcessorOptions } from './processor.js'
 import { OrgaContent } from './types.js'
+import { run, runSync } from './run'
 
 export interface ExportMap extends Record<string, unknown> {
   default: OrgaContent
@@ -45,15 +46,13 @@ export const evaluate = async (
   options: EvaluateOptions
 ): Promise<ExportMap> => {
   const { compiletime, runtime } = resolveOptions(options)
-  const code = await compile(file, compiletime)
-  return new Function(String(code))(runtime)
+  return run(await compile(file, compiletime), runtime)
 }
 
 export const evaluateSync = (
   file: VFileCompatible,
   options: EvaluateOptions
 ): ExportMap => {
   const { compiletime, runtime } = resolveOptions(options)
-  const code = compileSync(file, compiletime)
-  return new Function(String(code))(runtime)
+  return runSync(compileSync(file, compiletime), runtime)
 }

packages/orgx/src/plugin/estree-document.ts

@@ -58,8 +58,7 @@ export const estreeDocument: Plugin<
   const baseUrl = options_.baseUrl || undefined
   const useDynamicImport = options_.useDynamicImport || undefined
   const outputFormat = options_.outputFormat || 'program'
-  const pragma =
-    options_.pragma === undefined ? 'React.createElement' : options_.pragma
+  const pragma = options_.pragma || 'React.createElement'
   const pragmaFrag =
     options_.pragmaFrag === undefined ? 'React.Fragment' : options_.pragmaFrag
   const pragmaImportSource = options_.pragmaImportSource || 'react'

packages/orgx/src/plugin/estree-jsx-build.ts

@@ -1,8 +1,8 @@
 import { buildJsx } from 'estree-util-build-jsx'
 import type { Program } from 'estree'
 import type { Plugin } from 'unified'
-import { specifiersToDeclarations } from '../estree/specifiers-to-declarations'
-import { toIdOrMemberExpression } from '../estree/to-id-or-member-expression'
+import { specifiersToDeclarations } from '../estree/specifiers-to-declarations.js'
+import { toIdOrMemberExpression } from '../estree/to-id-or-member-expression.js'
 
 export interface Options {
   outputFormat?: 'program' | 'function-body'

packages/orgx/src/processor.ts

@@ -87,7 +87,7 @@ export function createProcessor(
     .use(reorgRehype, options)
     .use(options.rehypePlugins)
     .use(rehypeEstree, { ...options, handlers })
-    .use(estreeDocument, options)
+    .use(estreeDocument, { ...options, outputFormat })
     .use(options.estreePlugins)
     .use(estreeJsxRewrite, options)
 

packages/orgx/src/run.ts

@@ -0,0 +1,16 @@
+/** @type {new (code: string, ...args: Array<unknown>) => Function} **/
+const AsyncFunction = Object.getPrototypeOf(run).constructor
+
+/**
+ * Asynchronously run code.
+ */
+export async function run(file: { toString(): string }, options: unknown) {
+  return new AsyncFunction(String(file))(options)
+}
+
+/**
+ * Synchronously run code.
+ */
+export function runSync(file: { toString(): string }, options: unknown) {
+  return new Function(String(file))(options)
+}

packages/orgx/tests/compile.test.ts

@@ -6,16 +6,20 @@ const fixture = `
 #+title: Hello World
 * Hi
 `
-const code = `/*@jsxRuntime classic @jsx createElement @jsxFrag Fragment*/
-import {createElement, Fragment} from "react";
+const code = `
+/*@jsxRuntime classic @jsx React.createElement @jsxFrag React.Fragment*/
+import React from "react";
 export const title = 'Hello World';
-function OrgaContent(props = {}) {
+function _createOrgaContent(props) {
   const _components = Object.assign({
     div: "div",
     h1: "h1"
-  }, props.components), {wrapper: OrgaLayout} = _components;
-  const _content = <><_components.div className="section"><_components.h1>{"Hi"}{" "}</_components.h1></_components.div></>;
-  return OrgaLayout ? <OrgaLayout title={title} {...props}>{_content}</OrgaLayout> : _content;
+  }, props.components);
+  return <_components.div className="section"><_components.h1>{"Hi"}{" "}</_components.h1></_components.div>;
+}
+function OrgaContent(props = {}) {
+  const {wrapper: OrgaLayout} = props.components || ({});
+  return OrgaLayout ? <OrgaLayout {...props}><_createOrgaContent {...props} /></OrgaLayout> : _createOrgaContent(props);
 }
 export default OrgaContent;
 `
@@ -26,10 +30,8 @@ describe('compile', () => {
       jsxRuntime: 'classic',
       jsx: true,
       outputFormat: 'program',
-      pragma: { name: 'createElement', source: 'react' },
-      pragmaFrag: { name: 'Fragment', source: 'react' },
     })
 
-    assert.strictEqual(`${result}`, code)
+    assert.strictEqual(`${result}`.trim(), code.trim())
   })
 })

packages/orgx/tests/evaluate.test.ts

@@ -8,11 +8,10 @@ import * as runtime from 'react/jsx-runtime'
 describe('evaluate', () => {
   it('can evaluate org file', async () => {
     const text = `
-#+title: hello
-* hello
+* hi
 `
     const Content = (await evaluate(text, runtime)).default
     const rendered = renderToStaticMarkup(createElement(Content))
-    assert.equal(rendered, '<div class="section"><h1>hello </h1></div>')
+    assert.equal(rendered, '<div class="section"><h1>hi </h1></div>')
   })
 })