@orgajs/orgx 2.2.1 → 2.3.0

package/dist/index.d.ts

@@ -1,11 +1,11 @@
 export { createProcessor } from "./lib/core.js";
-export type ProcessorOptions = import('./lib/core.js').ProcessorOptions;
-export type CompileOptions = import('./lib/compile.js').CompileOptions;
-export type EvaluateOptions = import('./lib/evaluate.js').EvaluateOptions;
-export type OrgComponents = import('./lib/types.js').OrgComponents;
-export type OrgContent = import('./lib/types.js').OrgContent;
-export type OrgModule = import('./lib/types.js').OrgModule;
-export type OrgProps = import('./lib/types.js').OrgProps;
+export type ProcessorOptions = import("./lib/core.js").ProcessorOptions;
+export type CompileOptions = import("./lib/compile.js").CompileOptions;
+export type EvaluateOptions = import("./lib/evaluate.js").EvaluateOptions;
+export type OrgComponents = import("./lib/types.js").OrgComponents;
+export type OrgContent = import("./lib/types.js").OrgContent;
+export type OrgModule = import("./lib/types.js").OrgModule;
+export type OrgProps = import("./lib/types.js").OrgProps;
 export { compile, compileSync } from "./lib/compile.js";
 export { evaluate, evaluateSync } from "./lib/evaluate.js";
 export { run, runSync } from "./lib/run.js";

package/dist/lib/compile.d.ts

@@ -22,14 +22,14 @@ export function compile(vfileCompatible: VFileCompatible, compileOptions?: Compi
  *   File.
  */
 export function compileSync(vfileCompatible: VFileCompatible, compileOptions?: CompileOptions | null | undefined): VFile;
-export type VFile = import('vfile').VFile;
-export type VFileCompatible = import('vfile').VFileCompatible;
-export type PluginOptions = import('./core.js').PluginOptions;
-export type BaseProcessorOptions = import('./core.js').BaseProcessorOptions;
+export type VFile = import("vfile").VFile;
+export type VFileCompatible = import("vfile").VFileCompatible;
+export type PluginOptions = import("./core.js").PluginOptions;
+export type BaseProcessorOptions = import("./core.js").BaseProcessorOptions;
 /**
  * Core configuration.
  */
-export type CoreProcessorOptions = Omit<BaseProcessorOptions, 'format'>;
+export type CoreProcessorOptions = Omit<BaseProcessorOptions, "format">;
 /**
  * Extra configuration.
  */
@@ -37,7 +37,7 @@ export type ExtraOptions = {
     /**
      * Format of `file`.
      */
-    format?: 'detect' | 'mdx' | 'md' | null | undefined;
+    format?: "detect" | "mdx" | "md" | null | undefined;
 };
 /**
  * Configuration.

package/dist/lib/core.d.ts

@@ -5,18 +5,17 @@
  * 2. Transform through reorg (oast), rehype (hast), and recma (esast)
  * 3. Serialize as JavaScript
  *
- * @param {ProcessorOptions | null | undefined} [options]
+ * @param {Readonly<ProcessorOptions> | null | undefined} [options]
  *   Configuration.
- * @return {Processor}
+ * @return {Processor<Document, Program, Program, Program, string>}
  *   Processor.
+
  */
-export function createProcessor(options?: ProcessorOptions | null | undefined): Processor;
-export type PluggableList = import('unified').PluggableList;
-export type Processor = import('unified').Processor;
-export type RehypeRecmaOptions = import('./plugin/rehype-recma.js').Options;
-export type RecmaDocumentOptions = import('./plugin/recma-document.js').RecmaDocumentOptions;
-export type RecmaStringifyOptions = import('./plugin/recma-stringify.js').RecmaStringifyOptions;
-export type RecmaJsxRewriteOptions = import('./plugin/recma-jsx-rewrite.js').RecmaJsxRewriteOptions;
+export function createProcessor(options?: Readonly<ProcessorOptions> | null | undefined): Processor<Document, Program, Program, Program, string>;
+export type RehypeRecmaOptions = import("./plugin/rehype-recma.js").Options;
+export type RecmaDocumentOptions = import("./plugin/recma-document.js").RecmaDocumentOptions;
+export type RecmaStringifyOptions = import("recma-stringify").Options;
+export type RecmaJsxRewriteOptions = import("./plugin/recma-jsx-rewrite.js").RecmaJsxRewriteOptions;
 /**
  * Base configuration.
  */
@@ -33,25 +32,28 @@ export type BaseProcessorOptions = {
     /**
      * List of recma (esast, JavaScript) plugins.
      */
-    recmaPlugins?: import("unified").PluggableList | null | undefined;
+    recmaPlugins?: PluggableList | null | undefined;
     /**
      * List of remark (mdast, markdown) plugins.
      */
-    reorgPlugins?: import("unified").PluggableList | null | undefined;
+    reorgPlugins?: PluggableList | null | undefined;
     /**
      * List of rehype (hast, HTML) plugins.
      */
-    rehypePlugins?: import("unified").PluggableList | null | undefined;
+    rehypePlugins?: PluggableList | null | undefined;
     /**
      * Options to pass through to `reorg-rehype`.
      */
-    reorgRehypeOptions?: import('@orgajs/reorg-rehype').Options | null | undefined;
+    reorgRehypeOptions?: import("@orgajs/reorg-rehype").Options | null | undefined;
 };
 /**
  * Configuration for internal plugins.
  */
-export type PluginOptions = Omit<RehypeRecmaOptions & RecmaDocumentOptions & RecmaStringifyOptions & RecmaJsxRewriteOptions, 'outputFormat'>;
+export type PluginOptions = Omit<RehypeRecmaOptions & RecmaDocumentOptions & RecmaStringifyOptions & RecmaJsxRewriteOptions, "outputFormat">;
 /**
  * Configuration for processor.
  */
 export type ProcessorOptions = BaseProcessorOptions & PluginOptions;
+import type { Program } from 'estree-jsx';
+import type { Processor } from 'unified';
+import type { PluggableList } from 'unified';

package/dist/lib/evaluate.d.ts

@@ -22,6 +22,6 @@ export function evaluate(vfileCompatible: VFileCompatible, evaluateOptions: Eval
  *   Export map.
  */
 export function evaluateSync(vfileCompatible: VFileCompatible, evaluateOptions: EvaluateOptions): ExportMap;
-export type ExportMap = import('./types.js').OrgModule;
-export type VFileCompatible = import('vfile').VFileCompatible;
-export type EvaluateOptions = import('./util/resolve-evaluate-options.js').EvaluateOptions;
+export type ExportMap = import("./types.js").OrgModule;
+export type VFileCompatible = import("vfile").VFileCompatible;
+export type EvaluateOptions = import("./util/resolve-evaluate-options.js").EvaluateOptions;

package/dist/lib/plugin/recma-build-jsx-transform.d.ts

@@ -0,0 +1,20 @@
+/**
+ * Plugin to change the tree after compiling JSX away.
+ *
+ * @param {Readonly<Options> | null | undefined} [options]
+ *   Configuration (optional).
+ * @returns
+ *   Transform.
+ */
+export function recmaBuildJsxTransform(options?: Readonly<Options> | null | undefined): (tree: Program) => undefined;
+/**
+ * Configuration for internal plugin `recma-build-jsx-transform`.
+ */
+export type Options = {
+    /**
+     * Whether to keep the import of the automatic runtime or get it from
+     * `arguments[0]` instead (default: `'program'`).
+     */
+    outputFormat?: "function-body" | "program" | null | undefined;
+};
+import type { Program } from 'estree-jsx';

package/dist/lib/plugin/recma-document.d.ts

@@ -1,25 +1,25 @@
-export function recmaDocument(this: import("unified").Processor<void, import("estree").Program, void, void>, ...settings: [] | [RecmaDocumentOptions | null | undefined]): void | import("unified").Transformer<import("estree").Program, import("estree").Program>;
-export type Directive = import('estree-jsx').Directive;
-export type ExportAllDeclaration = import('estree-jsx').ExportAllDeclaration;
-export type ExportDefaultDeclaration = import('estree-jsx').ExportDefaultDeclaration;
-export type ExportNamedDeclaration = import('estree-jsx').ExportNamedDeclaration;
-export type ExportSpecifier = import('estree-jsx').ExportSpecifier;
-export type Expression = import('estree-jsx').Expression;
-export type FunctionDeclaration = import('estree-jsx').FunctionDeclaration;
-export type ImportDeclaration = import('estree-jsx').ImportDeclaration;
-export type ImportDefaultSpecifier = import('estree-jsx').ImportDefaultSpecifier;
-export type ImportExpression = import('estree-jsx').ImportExpression;
-export type ImportSpecifier = import('estree-jsx').ImportSpecifier;
-export type Literal = import('estree-jsx').Literal;
-export type JSXElement = import('estree-jsx').JSXElement;
-export type ModuleDeclaration = import('estree-jsx').ModuleDeclaration;
-export type Node = import('estree-jsx').Node;
-export type Program = import('estree-jsx').Program;
-export type Property = import('estree-jsx').Property;
-export type SimpleLiteral = import('estree-jsx').SimpleLiteral;
-export type SpreadElement = import('estree-jsx').SpreadElement;
-export type Statement = import('estree-jsx').Statement;
-export type VariableDeclarator = import('estree-jsx').VariableDeclarator;
+export function recmaDocument(this: import("unified").Processor, ...parameters: [] | [RecmaDocumentOptions | null | undefined]): void | import("unified").Transformer<import("estree").Program, import("estree").Program> | undefined;
+export type Directive = import("estree-jsx").Directive;
+export type ExportAllDeclaration = import("estree-jsx").ExportAllDeclaration;
+export type ExportDefaultDeclaration = import("estree-jsx").ExportDefaultDeclaration;
+export type ExportNamedDeclaration = import("estree-jsx").ExportNamedDeclaration;
+export type ExportSpecifier = import("estree-jsx").ExportSpecifier;
+export type Expression = import("estree-jsx").Expression;
+export type FunctionDeclaration = import("estree-jsx").FunctionDeclaration;
+export type ImportDeclaration = import("estree-jsx").ImportDeclaration;
+export type ImportDefaultSpecifier = import("estree-jsx").ImportDefaultSpecifier;
+export type ImportExpression = import("estree-jsx").ImportExpression;
+export type ImportSpecifier = import("estree-jsx").ImportSpecifier;
+export type Literal = import("estree-jsx").Literal;
+export type JSXElement = import("estree-jsx").JSXElement;
+export type ModuleDeclaration = import("estree-jsx").ModuleDeclaration;
+export type Node = import("estree-jsx").Node;
+export type Program = import("estree-jsx").Program;
+export type Property = import("estree-jsx").Property;
+export type SimpleLiteral = import("estree-jsx").SimpleLiteral;
+export type SpreadElement = import("estree-jsx").SpreadElement;
+export type Statement = import("estree-jsx").Statement;
+export type VariableDeclarator = import("estree-jsx").VariableDeclarator;
 /**
  * Configuration for internal plugin `recma-document`.
  */
@@ -29,7 +29,7 @@ export type RecmaDocumentOptions = {
      * (and optionally provider) and export the content, or get values from
      * `arguments` and return things.
      */
-    outputFormat?: 'function-body' | 'program' | null | undefined;
+    outputFormat?: "function-body" | "program" | null | undefined;
     /**
      * Whether to keep `import` (and `export … from`) statements or compile them
      * to dynamic `import()` instead.
@@ -59,5 +59,5 @@ export type RecmaDocumentOptions = {
     /**
      * JSX runtime to use.
      */
-    jsxRuntime?: 'automatic' | 'classic' | null | undefined;
+    jsxRuntime?: "automatic" | "classic" | null | undefined;
 };

package/dist/lib/plugin/recma-jsx-rewrite.d.ts

@@ -1,17 +1,17 @@
-export function recmaJsxRewrite(this: import("unified").Processor<void, import("estree").Program, void, void>, ...settings: [] | [RecmaJsxRewriteOptions | null | undefined]): void | import("unified").Transformer<import("estree").Program, import("estree").Program>;
-export type Expression = import('estree-jsx').Expression;
-export type EstreeFunction = import('estree-jsx').Function;
-export type Identifier = import('estree-jsx').Identifier;
-export type ImportSpecifier = import('estree-jsx').ImportSpecifier;
-export type JSXElement = import('estree-jsx').JSXElement;
-export type ModuleDeclaration = import('estree-jsx').ModuleDeclaration;
-export type Node = import('estree-jsx').Node;
-export type ObjectPattern = import('estree-jsx').ObjectPattern;
-export type Program = import('estree-jsx').Program;
-export type Property = import('estree-jsx').Property;
-export type Statement = import('estree-jsx').Statement;
-export type VariableDeclarator = import('estree-jsx').VariableDeclarator;
-export type Scope = import('periscopic').Scope & {
+export function recmaJsxRewrite(this: import("unified").Processor, ...parameters: [] | [RecmaJsxRewriteOptions | null | undefined]): void | import("unified").Transformer<import("estree").Program, import("estree").Program> | undefined;
+export type Expression = import("estree-jsx").Expression;
+export type EstreeFunction = import("estree-jsx").Function;
+export type Identifier = import("estree-jsx").Identifier;
+export type ImportSpecifier = import("estree-jsx").ImportSpecifier;
+export type JSXElement = import("estree-jsx").JSXElement;
+export type ModuleDeclaration = import("estree-jsx").ModuleDeclaration;
+export type Node = import("estree-jsx").Node;
+export type ObjectPattern = import("estree-jsx").ObjectPattern;
+export type Program = import("estree-jsx").Program;
+export type Property = import("estree-jsx").Property;
+export type Statement = import("estree-jsx").Statement;
+export type VariableDeclarator = import("estree-jsx").VariableDeclarator;
+export type Scope = import("periscopic").Scope & {
     node: Node;
 };
 /**
@@ -21,7 +21,7 @@ export type RecmaJsxRewriteOptions = {
     /**
      * Whether to use an import statement or `arguments[0]` to get the provider.
      */
-    outputFormat?: 'function-body' | 'program' | null | undefined;
+    outputFormat?: "function-body" | "program" | null | undefined;
     /**
      * Place to import a provider from.
      */

package/dist/lib/plugin/rehype-recma.d.ts

@@ -1,49 +1,14 @@
-export function rehypeRecma(this: import("unified").Processor<void, import("hast").Root, void, void>, ...settings: [] | [Options | undefined]): void | import("unified").Transformer<import("hast").Root, import("estree").Program>;
-export type Program = import('estree-jsx').Program;
-export type Expression = import('estree-jsx').Expression;
-export type ModuleDeclaration = import('estree-jsx').ModuleDeclaration;
-export type Root = import('hast').Root;
-export type Handle = import('hast-util-to-estree').Handle;
-export type HastToEstreeOptions = import('hast-util-to-estree').Options;
 /**
- * Specify casing to use for attribute names.
+ * Plugin to transform HTML (hast) to JS (estree).
  *
- * HTML casing is for example `class`, `stroke-linecap`, `xml:lang`.
- * React casing is for example `className`, `strokeLinecap`, `xmlLang`.
+ * @param {Options | null | undefined} [options]
+ *   Configuration (optional).
+ * @returns
+ *   Transform.
  */
-export type ElementAttributeNameCase = 'html' | 'react';
-/**
- * Casing to use for property names in `style` objects.
- *
- * CSS casing is for example `background-color` and `-webkit-line-clamp`.
- * DOM casing is for example `backgroundColor` and `WebkitLineClamp`.
- */
-export type StylePropertyNameCase = 'css' | 'dom';
-/**
- * Configuration for internal plugin `rehype-recma`.
- */
-export type MoreOptions = {
-    /**
-     * Specify casing to use for attribute names.
-     *
-     * This casing is used for hast elements, not for embedded Org JSX nodes
-     * (components that someone authored manually).
-     */
-    elementAttributeNameCase?: ElementAttributeNameCase | undefined | null;
-    /**
-     * Specify casing to use for property names in `style` objects.
-     *
-     * This casing is used for hast elements, not for embedded Org JSX nodes
-     * (components that someone authored manually).
-     */
-    stylePropertyNameCase?: StylePropertyNameCase | undefined | null;
-    /**
-     * - Whether to skip imports
-     */
-    skipImport?: boolean | undefined;
-    /**
-     * - Specify which hast properties to parse as JSX.
-     */
-    parseJSX?: string[] | undefined;
-};
-export type Options = HastToEstreeOptions & MoreOptions;
+export default function rehypeRecma(options?: Options | null | undefined): (tree: Root) => Program;
+/** @type {import("hast-util-to-estree").Handle} */
+export const handleJsx: import("hast-util-to-estree").Handle;
+export type Options = import("hast-util-to-estree").Options;
+import type { Program } from 'estree';
+import type { Root } from 'hast';

package/dist/lib/types.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 type FunctionComponent<Props> = (props: Props) => JSX.Element | null;
 type ClassComponent<Props> = new (props: Props) => JSX.ElementClass;
 type Component<Props> = FunctionComponent<Props> | ClassComponent<Props> | keyof JSX.IntrinsicElements;

package/dist/lib/util/estree-util-create.d.ts

@@ -10,4 +10,4 @@
  *   Nothing.
  */
 export function create(from: Node, to: Node): void;
-export type Node = import('estree-jsx').Node;
+export type Node = import("estree-jsx").Node;

package/dist/lib/util/estree-util-declaration-to-expression.d.ts

@@ -15,5 +15,5 @@
  *   Expression.
  */
 export function declarationToExpression(declaration: Declaration): Expression;
-export type Declaration = import('estree-jsx').Declaration;
-export type Expression = import('estree-jsx').Expression;
+export type Declaration = import("estree-jsx").Declaration;
+export type Expression = import("estree-jsx").Expression;

package/dist/lib/util/estree-util-is-declaration.d.ts

@@ -10,6 +10,6 @@
  * @returns {node is Declaration}
  *   Whether `node` is a declaration.
  */
-export function isDeclaration(node: Node): node is import("estree").Declaration;
-export type Node = import('estree-jsx').Node;
-export type Declaration = import('estree-jsx').Declaration;
+export function isDeclaration(node: Node): node is Declaration;
+export type Node = import("estree-jsx").Node;
+export type Declaration = import("estree-jsx").Declaration;

package/dist/lib/util/estree-util-specifiers-to-declarations.d.ts

@@ -4,11 +4,11 @@
  * @returns {Array<VariableDeclarator>}
  */
 export function specifiersToDeclarations(specifiers: Array<ImportSpecifier | ImportDefaultSpecifier | ImportNamespaceSpecifier | ExportSpecifier>, init: Expression): Array<VariableDeclarator>;
-export type AssignmentProperty = import('estree-jsx').AssignmentProperty;
-export type ExportSpecifier = import('estree-jsx').ExportSpecifier;
-export type Expression = import('estree-jsx').Expression;
-export type Identifier = import('estree-jsx').Identifier;
-export type ImportDefaultSpecifier = import('estree-jsx').ImportDefaultSpecifier;
-export type ImportNamespaceSpecifier = import('estree-jsx').ImportNamespaceSpecifier;
-export type ImportSpecifier = import('estree-jsx').ImportSpecifier;
-export type VariableDeclarator = import('estree-jsx').VariableDeclarator;
+export type AssignmentProperty = import("estree-jsx").AssignmentProperty;
+export type ExportSpecifier = import("estree-jsx").ExportSpecifier;
+export type Expression = import("estree-jsx").Expression;
+export type Identifier = import("estree-jsx").Identifier;
+export type ImportDefaultSpecifier = import("estree-jsx").ImportDefaultSpecifier;
+export type ImportNamespaceSpecifier = import("estree-jsx").ImportNamespaceSpecifier;
+export type ImportSpecifier = import("estree-jsx").ImportSpecifier;
+export type VariableDeclarator = import("estree-jsx").VariableDeclarator;

package/dist/lib/util/estree-util-to-binary-addition.d.ts

@@ -5,4 +5,4 @@
  * @param {Array<Expression>} expressions
  */
 export function toBinaryAddition(expressions: Array<Expression>): import("estree").Expression;
-export type Expression = import('estree-jsx').Expression;
+export type Expression = import("estree-jsx").Expression;

package/dist/lib/util/estree-util-to-id-or-member-expression.d.ts

@@ -3,9 +3,9 @@
  * @returns {Identifier | MemberExpression}
  */
 export function toIdOrMemberExpression(ids: Array<string | number>): Identifier | MemberExpression;
-export function toJsxIdOrMemberExpression(ids: Array<string | number>): JSXIdentifier | JSXMemberExpression;
-export type Identifier = import('estree-jsx').Identifier;
-export type JSXIdentifier = import('estree-jsx').JSXIdentifier;
-export type JSXMemberExpression = import('estree-jsx').JSXMemberExpression;
-export type Literal = import('estree-jsx').Literal;
-export type MemberExpression = import('estree-jsx').MemberExpression;
+export const toJsxIdOrMemberExpression: (ids: Array<string | number>) => JSXIdentifier | JSXMemberExpression;
+export type Identifier = import("estree-jsx").Identifier;
+export type JSXIdentifier = import("estree-jsx").JSXIdentifier;
+export type JSXMemberExpression = import("estree-jsx").JSXMemberExpression;
+export type Literal = import("estree-jsx").Literal;
+export type MemberExpression = import("estree-jsx").MemberExpression;

package/dist/lib/util/render-error.d.ts

@@ -1,2 +1,2 @@
-declare function _default(error: SyntaxError, bg?: string, color?: string): import('estree-jsx').Program;
+declare function _default(error: SyntaxError, bg?: string, color?: string): import("estree-jsx").Program;
 export default _default;

package/dist/lib/util/resolve-evaluate-options.d.ts

@@ -30,7 +30,7 @@ export function resolveEvaluateOptions(options: EvaluateOptions | null | undefin
     compiletime: ProcessorOptions;
     runtime: RunnerOptions;
 };
-export type ProcessorOptions = import('../core.js').ProcessorOptions;
+export type ProcessorOptions = import("../core.js").ProcessorOptions;
 /**
  * Configuration with JSX runtime.
  */
@@ -59,7 +59,7 @@ export type RunnerOptions = {
 /**
  * Compile configuration without JSX options for evaluation.
  */
-export type EvaluateProcessorOptions = Omit<ProcessorOptions, 'jsx' | 'jsxImportSource' | 'jsxRuntime' | 'pragma' | 'pragmaFrag' | 'pragmaImportSource' | 'providerImportSource' | 'outputFormat'>;
+export type EvaluateProcessorOptions = Omit<ProcessorOptions, "jsx" | "jsxImportSource" | "jsxRuntime" | "pragma" | "pragmaFrag" | "pragmaImportSource" | "providerImportSource" | "outputFormat">;
 /**
  * Configuration for evaluation.
  */

package/dist/lib/util/resolve-file-and-options.d.ts

@@ -10,7 +10,7 @@ export function resolveFileAndOptions(vfileCompatible: VFileCompatible, options?
     file: VFile;
     options: ProcessorOptions;
 };
-export type VFileCompatible = import('vfile').VFileCompatible;
-export type ProcessorOptions = import('../core.js').ProcessorOptions;
-export type CompileOptions = import('../compile.js').CompileOptions;
+export type VFileCompatible = import("vfile").VFileCompatible;
+export type ProcessorOptions = import("../core.js").ProcessorOptions;
+export type CompileOptions = import("../compile.js").CompileOptions;
 import { VFile } from 'vfile';

package/dist/tsconfig.tsbuildinfo

@@ -0,0 +1 @@
+{"root":["../lib/compile.js","../lib/core.js","../lib/evaluate.js","../lib/run.js","../lib/types.ts","../lib/plugin/recma-build-jsx-transform.js","../lib/plugin/recma-document.js","../lib/plugin/recma-jsx-rewrite.js","../lib/plugin/rehype-recma.js","../lib/util/estree-util-create.js","../lib/util/estree-util-declaration-to-expression.js","../lib/util/estree-util-is-declaration.js","../lib/util/estree-util-specifiers-to-declarations.js","../lib/util/estree-util-to-binary-addition.js","../lib/util/estree-util-to-id-or-member-expression.js","../lib/util/render-error.js","../lib/util/resolve-evaluate-options.js","../lib/util/resolve-file-and-options.js","../index.js"],"version":"5.7.3"}

package/lib/core.js

@@ -1,9 +1,9 @@
 /**
- * @typedef {import('unified').PluggableList} PluggableList
- * @typedef {import('unified').Processor} Processor
+ * @import {Program} from 'estree-jsx'
+ * @import {PluggableList, Processor} from 'unified'
  * @typedef {import('./plugin/rehype-recma.js').Options} RehypeRecmaOptions
  * @typedef {import('./plugin/recma-document.js').RecmaDocumentOptions} RecmaDocumentOptions
- * @typedef {import('./plugin/recma-stringify.js').RecmaStringifyOptions} RecmaStringifyOptions
+ * @typedef {import('recma-stringify').Options} RecmaStringifyOptions
  * @typedef {import('./plugin/recma-jsx-rewrite.js').RecmaJsxRewriteOptions} RecmaJsxRewriteOptions
  */
 
@@ -33,14 +33,14 @@
 
 import { unified } from 'unified'
 import reorgParse from '@orgajs/reorg-parse'
+import recmaBuildJsx from 'recma-build-jsx'
+import recmaJsx from 'recma-jsx'
+import recmaStringify from 'recma-stringify'
 import reorgRehype from '@orgajs/reorg-rehype'
-import { recmaJsxBuild } from './plugin/recma-jsx-build.js'
 import { recmaDocument } from './plugin/recma-document.js'
 import { recmaJsxRewrite } from './plugin/recma-jsx-rewrite.js'
-import { recmaStringify } from './plugin/recma-stringify.js'
-import { rehypeRecma } from './plugin/rehype-recma.js'
-// import { remarkMarkAndUnravel } from './plugin/remark-mark-and-unravel.js'
-import { development as defaultDevelopment } from './condition.js'
+import rehypeRecma from './plugin/rehype-recma.js'
+import { recmaBuildJsxTransform } from './plugin/recma-build-jsx-transform.js'
 
 /**
  * Pipeline to:
@@ -49,10 +49,11 @@ import { development as defaultDevelopment } from './condition.js'
  * 2. Transform through reorg (oast), rehype (hast), and recma (esast)
  * 3. Serialize as JavaScript
  *
- * @param {ProcessorOptions | null | undefined} [options]
+ * @param {Readonly<ProcessorOptions> | null | undefined} [options]
  *   Configuration.
- * @return {Processor}
+ * @return {Processor<Document, Program, Program, Program, string>}
  *   Processor.
+
  */
 export function createProcessor(options) {
   const {
@@ -69,10 +70,7 @@ export function createProcessor(options) {
     SourceMapGenerator,
     ...rest
   } = options || {}
-  const dev =
-    development === null || development === undefined
-      ? defaultDevelopment
-      : development
+  const dev = development ?? false
 
   const pipeline = unified()
     .use(reorgParse)
@@ -91,10 +89,16 @@ export function createProcessor(options) {
     })
 
   if (!jsx) {
-    pipeline.use(recmaJsxBuild, { development: dev, outputFormat })
+    pipeline
+      .use(recmaBuildJsx, { development: dev, outputFormat })
+      .use(recmaBuildJsxTransform, { outputFormat })
   }
 
-  pipeline.use(recmaStringify, { SourceMapGenerator }).use(recmaPlugins || [])
+  pipeline
+    .use(recmaJsx)
+    .use(recmaStringify, { SourceMapGenerator })
+    .use(recmaPlugins || [])
 
+  // @ts-expect-error: TS doesn’t get the plugins we added with if-statements.
   return pipeline
 }

package/lib/plugin/recma-build-jsx-transform.js

@@ -0,0 +1,80 @@
+/**
+ * @import {Program} from 'estree-jsx'
+ */
+
+/**
+ * @typedef Options
+ *   Configuration for internal plugin `recma-build-jsx-transform`.
+ * @property {'function-body' | 'program' | null | undefined} [outputFormat='program']
+ *   Whether to keep the import of the automatic runtime or get it from
+ *   `arguments[0]` instead (default: `'program'`).
+ */
+
+import {specifiersToDeclarations} from '../util/estree-util-specifiers-to-declarations.js'
+import {toIdOrMemberExpression} from '../util/estree-util-to-id-or-member-expression.js'
+
+/**
+ * Plugin to change the tree after compiling JSX away.
+ *
+ * @param {Readonly<Options> | null | undefined} [options]
+ *   Configuration (optional).
+ * @returns
+ *   Transform.
+ */
+export function recmaBuildJsxTransform(options) {
+  /* c8 ignore next -- always given in `@mdx-js/mdx` */
+  const {outputFormat} = options || {}
+
+  /**
+   * @param {Program} tree
+   *   Tree.
+   * @returns {undefined}
+   *   Nothing.
+   */
+  return function (tree) {
+    // Remove the pragma comment that we injected ourselves as it is no longer
+    // needed.
+    // if (tree.comments) {
+    //   tree.comments = tree.comments.filter(function (d) {
+    //     return !d.data?._mdxIsPragmaComment
+    //   })
+    // }
+
+    // When compiling to a function body, replace the import that was just
+    // generated, and get `jsx`, `jsxs`, and `Fragment` from `arguments[0]`
+    // instead.
+    if (outputFormat === 'function-body') {
+      let index = 0
+
+      // Skip directives: JS currently only has `use strict`, but Acorn allows
+      // arbitrary ones.
+      // Practically things like `use client` could be used?
+      while (index < tree.body.length) {
+        const child = tree.body[index]
+        if ('directive' in child && child.directive) {
+          index++
+        } else {
+          break
+        }
+      }
+
+      const declaration = tree.body[index]
+
+      if (
+        declaration &&
+        declaration.type === 'ImportDeclaration' &&
+        typeof declaration.source.value === 'string' &&
+        /\/jsx-(dev-)?runtime$/.test(declaration.source.value)
+      ) {
+        tree.body[index] = {
+          type: 'VariableDeclaration',
+          kind: 'const',
+          declarations: specifiersToDeclarations(
+            declaration.specifiers,
+            toIdOrMemberExpression(['arguments', 0])
+          )
+        }
+      }
+    }
+  }
+}

package/lib/plugin/recma-document.js

@@ -161,6 +161,7 @@ export function recmaDocument(options) {
             {
               type: 'VariableDeclarator',
               id: { type: 'Identifier', name: 'OrgLayout' },
+              // @ts-expect-error
               init: isDeclaration(child.declaration)
                 ? declarationToExpression(child.declaration)
                 : child.declaration,
@@ -176,6 +177,7 @@ export function recmaDocument(options) {
 
         // Remove `default` or `as default`, but not `default as`, specifier.
         child.specifiers = child.specifiers.filter((specifier) => {
+          // @ts-expect-error
           if (specifier.exported.name === 'default') {
             if (layout) {
               file.fail(
@@ -194,6 +196,7 @@ export function recmaDocument(options) {
             const specifiers = []
 
             // Default as default / something else as default.
+            // @ts-expect-error
             if (specifier.local.name === 'default') {
               specifiers.push({
                 type: 'ImportDefaultSpecifier',
@@ -247,7 +250,6 @@ export function recmaDocument(options) {
         handleEsm(child)
       } else if (
         child.type === 'ExpressionStatement' &&
-        // @ts-expect-error types are wrong: `JSXFragment` is an `Expression`.
         (child.expression.type === 'JSXFragment' ||
           child.expression.type === 'JSXElement')
       ) {
@@ -364,6 +366,7 @@ export function recmaDocument(options) {
         // export {a, b as c} from 'd'
         // ```
         for (child of node.specifiers) {
+          // @ts-expect-error
           exportedIdentifiers.push(child.exported.name)
         }
       }
@@ -473,8 +476,10 @@ export function recmaDocument(options) {
           replace = node.declaration
         } else {
           /** @type {Array<VariableDeclarator>} */
+          // @ts-expect-error
           const declarators = node.specifiers
             .filter(
+              // @ts-expect-error
               (specifier) => specifier.local.name !== specifier.exported.name
             )
             .map((specifier) => ({
@@ -566,14 +571,10 @@ export function recmaDocument(options) {
     // Unwrap a fragment of a single element.
     if (
       argument &&
-      // @ts-expect-error: fine.
       argument.type === 'JSXFragment' &&
-      // @ts-expect-error: fine.
       argument.children.length === 1 &&
-      // @ts-expect-error: fine.
       argument.children[0].type === 'JSXElement'
     ) {
-      // @ts-expect-error: fine.
       argument = argument.children[0]
     }
 

package/lib/plugin/rehype-recma.js

@@ -1,43 +1,7 @@
 /**
- * @typedef {import('estree-jsx').Program} Program
- * @typedef {import('estree-jsx').Expression} Expression
- * @typedef {import('estree-jsx').ModuleDeclaration} ModuleDeclaration
- * @typedef {import('hast').Root} Root
- * @typedef {import('hast-util-to-estree').Handle} Handle
- * @typedef {import('hast-util-to-estree').Options} HastToEstreeOptions
- */
-
-/**
- * @typedef {'html' | 'react'} ElementAttributeNameCase
- *   Specify casing to use for attribute names.
- *
- *   HTML casing is for example `class`, `stroke-linecap`, `xml:lang`.
- *   React casing is for example `className`, `strokeLinecap`, `xmlLang`.
- *
- * @typedef {'css' | 'dom'} StylePropertyNameCase
- *   Casing to use for property names in `style` objects.
- *
- *   CSS casing is for example `background-color` and `-webkit-line-clamp`.
- *   DOM casing is for example `backgroundColor` and `WebkitLineClamp`.
- */
-
-/**
- * @typedef MoreOptions
- *   Configuration for internal plugin `rehype-recma`.
- * @property {ElementAttributeNameCase | undefined | null} [elementAttributeNameCase='react']
- *   Specify casing to use for attribute names.
- *
- *   This casing is used for hast elements, not for embedded Org JSX nodes
- *   (components that someone authored manually).
- * @property {StylePropertyNameCase | undefined | null} [stylePropertyNameCase='dom']
- *   Specify casing to use for property names in `style` objects.
- *
- *   This casing is used for hast elements, not for embedded Org JSX nodes
- *   (components that someone authored manually).
- * @property {boolean} [skipImport=false] - Whether to skip imports
- * @property {string[]} [parseJSX=['jsx.value']] - Specify which hast properties to parse as JSX.
- *
- * @typedef {HastToEstreeOptions & MoreOptions} Options
+ * @import {Root} from 'hast'
+ * @import {Program, Expression, ModuleDeclaration} from 'estree'
+ * @typedef {import('hast-util-to-estree').Options} Options
  */
 
 import { toEstree } from 'hast-util-to-estree'
@@ -46,76 +10,68 @@ import jsx from 'acorn-jsx'
 import renderError from '../util/render-error.js'
 
 /**
- * A plugin to transform an HTML (hast) tree to a JS (estree).
- * `hast-util-to-estree` does all the work for us!
+ * Plugin to transform HTML (hast) to JS (estree).
  *
- * @type {import('unified').Plugin<[Options | undefined] | [], Root, Program>}
+ * @param {Options | null | undefined} [options]
+ *   Configuration (optional).
+ * @returns
+ *   Transform.
  */
-export function rehypeRecma(options = {}) {
-  const {
-    skipImport = false,
-    parseJSX = ['jsx.value'],
-    ...otherOptions
-  } = options
-  const handlers = options.handlers || {}
-
-  for (const p of parseJSX) {
-    const [key, ...rest] = p.split('.')
-    if (!key) {
-      throw new Error('somethings wrong')
-    }
-    const path = rest.length > 0 ? rest.join('.') : 'value'
-    handlers[key] = jsxHandle(path, skipImport)
-  }
-
-  return (tree) => {
+export default function rehypeRecma(options) {
+  /**
+   * @param {Root} tree
+   *   Tree (hast).
+   * @returns {Program}
+   *   Program (esast).
+   */
+  return function (tree) {
     const data = tree.data || {}
-    const { layout, ...otherData } = data
     /** @type {ModuleDeclaration[]} */
     const prepand = []
-    if (typeof layout === 'string') {
-      prepand.push({
-        type: 'ImportDeclaration',
-        specifiers: [
-          {
-            type: 'ImportDefaultSpecifier',
-            local: {
-              type: 'Identifier',
-              name: 'OrgLayout',
+    Object.entries(data).forEach(([k, v]) => {
+      if (k === 'layout') {
+        prepand.push({
+          type: 'ImportDeclaration',
+          specifiers: [
+            {
+              type: 'ImportDefaultSpecifier',
+              local: {
+                type: 'Identifier',
+                name: 'OrgLayout',
+              },
             },
+          ],
+          source: {
+            type: 'Literal',
+            value: `${v}`,
+            raw: `'${v}'`,
           },
-        ],
-        source: {
-          type: 'Literal',
-          value: `${layout}`,
-          raw: `'${layout}'`,
-        },
-      })
-    }
-    Object.entries(otherData).forEach(([k, v]) => {
-      prepand.push(createExport(k, v))
+        })
+      } else {
+        prepand.push(createExport(k, v))
+      }
     })
-    const estree = toEstree(tree, { ...otherOptions, handlers })
+
+    const estree = toEstree(tree, { ...options, handlers: { jsx: handleJsx } })
     estree.body.unshift(...prepand)
     return estree
   }
 }
 
+const jsxParser = Parser.extend(jsx())
+
 /**
- * @param {string} p
- * @param {any} o
- * @returns {any}
+ * @param {import('acorn').Node | Program} node
+ * @returns {node is Program}
  */
-function deepGet(p, o) {
-  return p.split('.').reduce((a, v) => a[v], o)
+function isProgram(node) {
+  return node.type === 'Program'
 }
 
-const jsxParser = Parser.extend(jsx())
-
 /**
  * @param {string} code
  */
-const parse = (code) => {
+function parse(code) {
   try {
     return jsxParser.parse(code, {
       sourceType: 'module',
@@ -127,50 +83,37 @@ const parse = (code) => {
   }
 }
 
-/**
- * @param {import('acorn').Node | Program} node
- * @returns {node is Program}
- */
-function isProgram(node) {
-  return node.type === 'Program'
-}
+/** @type {import("hast-util-to-estree").Handle} */
+export const handleJsx = (node, state) => {
+  let skipImport = false
+  const estree = parse(node.value)
 
-/**
- *
- * @param {string} path
- * @param {boolean} skipImport
- * @returns {Handle}
- */
-function jsxHandle(path, skipImport) {
-  /** @type {Handle} */
-  const handle = (node, state) => {
-    const estree = parse(deepGet(path, node))
-    /** @type {Expression[]} */
-    const expressions = []
-    if (isProgram(estree)) {
-      estree.body.forEach((child) => {
-        if (child.type === 'ImportDeclaration') {
-          if (!skipImport) {
-            state.esm.push(child)
-          }
-          return false
-        } else if (child.type === 'ExpressionStatement') {
-          expressions.push(child.expression)
-        } else if (
-          child.type === 'ExportDefaultDeclaration' ||
-          child.type === 'ExportNamedDeclaration'
-        ) {
+  /** @type {Expression[]} */
+  const expressions = []
+
+  if (isProgram(estree)) {
+    estree.body.forEach((child) => {
+      if (child.type === 'ImportDeclaration') {
+        if (!skipImport) {
           state.esm.push(child)
-        } else {
-          throw new Error(`unexpected node: ${child.type}`)
         }
-      })
-    }
-
-    // @ts-ignore it works
-    return expressions
+        return false
+      } else if (child.type === 'ExpressionStatement') {
+        expressions.push(child.expression)
+      } else if (
+        child.type === 'ExportDefaultDeclaration' ||
+        child.type === 'ExportNamedDeclaration'
+      ) {
+        state.esm.push(child)
+      } else {
+        throw new Error(`unexpected node: ${child.type}`)
+      }
+    })
   }
-  return handle
+
+  // @ts-expect-error: array works
+  // https://github.com/syntax-tree/hast-util-to-estree/blob/c0c4bd33583abade25c4f4e248a06cb1ec8c3aff/lib/state.js#L215
+  return expressions
 }
 
 /**

package/lib/util/estree-util-specifiers-to-declarations.js

@@ -53,6 +53,7 @@ export function specifiersToDeclarations(specifiers, init) {
       type: 'ObjectPattern',
       properties: otherSpecifiers.map((specifier) => {
         /** @type {Identifier} */
+        // @ts-expect-error: fine.
         let key =
           specifier.type === 'ImportSpecifier'
             ? specifier.imported
@@ -64,6 +65,7 @@ export function specifiersToDeclarations(specifiers, init) {
         // Switch them around if we’re exporting.
         if (specifier.type === 'ExportSpecifier') {
           value = key
+          // @ts-expect-error: fine.
           key = specifier.local
         }
 
@@ -71,10 +73,12 @@ export function specifiersToDeclarations(specifiers, init) {
         const property = {
           type: 'Property',
           kind: 'init',
+          // @ts-expect-error: fine.
           shorthand: key.name === value.name,
           method: false,
           computed: false,
           key,
+          // @ts-expect-error: fine.
           value
         }
         create(specifier, property)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orgajs/orgx",
-  "version": "2.2.1",
+  "version": "2.3.0",
   "description": "orga compiler with jsx support",
   "author": "Xiaoxing Hu <hi@xiaoxing.dev>",
   "license": "MIT",
@@ -11,43 +11,48 @@
     "directory": "packages/orgx"
   },
   "type": "module",
-  "main": "index.js",
+  "exports": {
+    ".": "./index.js"
+  },
   "types": "dist/index.d.ts",
   "browser": {
     "./lib/condition.js": "./lib/condition.browser.js"
   },
   "files": [
-    "lib",
+    "lib/",
     "dist",
     "index.js",
     "types.d.ts"
   ],
   "devDependencies": {
-    "@types/estree": "^1.0.1",
-    "@types/estree-jsx": "^1.0.0",
-    "@types/hast": "^2.3.5",
+    "@types/estree": "^1.0.6",
+    "@types/estree-jsx": "^1.0.5",
+    "@types/hast": "^3.0.4",
     "@types/node": "^20.5.7",
     "@types/react": "^18.2.21",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
   "dependencies": {
-    "acorn": "^8.10.0",
+    "acorn": "^8.14.0",
     "acorn-jsx": "^5.3.2",
     "astring": "^1.8.6",
-    "estree-util-build-jsx": "2.2.2",
-    "estree-util-is-identifier-name": "2.1.0",
-    "estree-util-to-js": "^1.2.0",
+    "estree-util-build-jsx": "3.0.1",
+    "estree-util-is-identifier-name": "3.0.0",
+    "estree-util-to-js": "^2.0.0",
     "estree-walker": "3.0.3",
-    "hast-util-to-estree": "^2.3.3",
+    "hast-util-to-estree": "^3.1.1",
     "periscopic": "3.1.0",
+    "recma-build-jsx": "^1.0.0",
+    "recma-jsx": "^1.0.0",
+    "recma-stringify": "^1.0.0",
     "source-map": "^0.7.4",
-    "unified": "^10.1.2",
-    "unist-util-position-from-estree": "^1.1.2",
-    "unist-util-stringify-position": "^3.0.3",
-    "vfile": "^5.3.7",
-    "@orgajs/reorg-parse": "^4.1.2",
-    "@orgajs/reorg-rehype": "^4.1.2"
+    "unified": "^11.0.5",
+    "unist-util-position-from-estree": "^2.0.0",
+    "unist-util-stringify-position": "^4.0.0",
+    "vfile": "^6.0.3",
+    "@orgajs/reorg-parse": "^4.2.0",
+    "@orgajs/reorg-rehype": "^4.2.0"
   },
   "scripts": {
     "clean": "tsc --build --clean",

package/dist/lib/condition.browser.d.ts

@@ -1 +0,0 @@
-export const development: false;

package/dist/lib/condition.d.ts

@@ -1 +0,0 @@
-export const development: boolean;

package/dist/lib/plugin/recma-jsx-build.d.ts

@@ -1,14 +0,0 @@
-export function recmaJsxBuild(this: import("unified").Processor<void, import("estree").Program, void, void>, ...settings: [RecmaJsxBuildOptions | null | undefined] | []): void | import("unified").Transformer<import("estree").Program, import("estree").Program>;
-export type Program = import('estree-jsx').Program;
-export type BuildJsxOptions = import('estree-util-build-jsx').BuildJsxOptions;
-/**
- * Configuration for internal plugin `recma-jsx-build`.
- */
-export type ExtraOptions = {
-    /**
-     * Whether to keep the import of the automatic runtime or get it from
-     * `arguments[0]` instead.
-     */
-    outputFormat?: 'function-body' | 'program' | null | undefined;
-};
-export type RecmaJsxBuildOptions = BuildJsxOptions & ExtraOptions;

package/dist/lib/plugin/recma-stringify.d.ts

@@ -1,13 +0,0 @@
-export function recmaStringify(this: import("unified").Processor<void, import("estree").Program, import("estree").Program, string>, ...settings: [] | [RecmaStringifyOptions | null | undefined]): void;
-export type Program = import('estree-jsx').Program;
-export type SourceMapGenerator = typeof import('source-map').SourceMapGenerator;
-/**
- * Configuration for internal plugin `recma-stringify`.
- */
-export type RecmaStringifyOptions = {
-    /**
-     * Generate a source map by passing a `SourceMapGenerator` from `source-map`
-     * in.
-     */
-    SourceMapGenerator?: SourceMapGenerator | null | undefined;
-};

package/lib/condition.browser.js

@@ -1 +0,0 @@
-export const development = false

package/lib/condition.js

@@ -1,3 +0,0 @@
-import process from 'process'
-
-export const development = process.env.NODE_ENV === 'development'

package/lib/plugin/recma-jsx-build.js

@@ -1,53 +0,0 @@
-/**
- * @typedef {import('estree-jsx').Program} Program
- * @typedef {import('estree-util-build-jsx').BuildJsxOptions} BuildJsxOptions
- */
-
-/**
- * @typedef ExtraOptions
- *   Configuration for internal plugin `recma-jsx-build`.
- * @property {'function-body' | 'program' | null | undefined} [outputFormat='program']
- *   Whether to keep the import of the automatic runtime or get it from
- *   `arguments[0]` instead.
- *
- * @typedef {BuildJsxOptions & ExtraOptions} RecmaJsxBuildOptions
- */
-
-import { buildJsx } from 'estree-util-build-jsx'
-import { specifiersToDeclarations } from '../util/estree-util-specifiers-to-declarations.js'
-import { toIdOrMemberExpression } from '../util/estree-util-to-id-or-member-expression.js'
-
-/**
- * A plugin to build JSX into function calls.
- * `estree-util-build-jsx` does all the work for us!
- *
- * @type {import('unified').Plugin<[RecmaJsxBuildOptions | null | undefined] | [], Program>}
- */
-export function recmaJsxBuild(options) {
-  // Always given inside `@orgajs/orgx`
-  const { development, outputFormat } = options || {}
-
-  return (tree, file) => {
-    buildJsx(tree, { development, filePath: file.history[0] })
-
-    // When compiling to a function body, replace the import that was just
-    // generated, and get `jsx`, `jsxs`, and `Fragment` from `arguments[0]`
-    // instead.
-    if (
-      outputFormat === 'function-body' &&
-      tree.body[0] &&
-      tree.body[0].type === 'ImportDeclaration' &&
-      typeof tree.body[0].source.value === 'string' &&
-      /\/jsx-(dev-)?runtime$/.test(tree.body[0].source.value)
-    ) {
-      tree.body[0] = {
-        type: 'VariableDeclaration',
-        kind: 'const',
-        declarations: specifiersToDeclarations(
-          tree.body[0].specifiers,
-          toIdOrMemberExpression(['arguments', 0])
-        ),
-      }
-    }
-  }
-}

package/lib/plugin/recma-stringify.js

@@ -1,42 +0,0 @@
-/**
- * @typedef {import('estree-jsx').Program} Program
- * @typedef {typeof import('source-map').SourceMapGenerator} SourceMapGenerator
- *
- * @typedef RecmaStringifyOptions
- *   Configuration for internal plugin `recma-stringify`.
- * @property {SourceMapGenerator | null | undefined} [SourceMapGenerator]
- *   Generate a source map by passing a `SourceMapGenerator` from `source-map`
- *   in.
- */
-
-import { toJs, jsx } from 'estree-util-to-js'
-
-/**
- * A plugin that adds an esast compiler: a small wrapper around `astring` to add
- * support for serializing JSX.
- *
- * @this {import('unified').Processor}
- * @type {import('unified').Plugin<[RecmaStringifyOptions | null | undefined] | [], Program, string>}
- */
-export function recmaStringify(options) {
-  // Always given inside `@mdx-js/mdx`
-  /* c8 ignore next */
-  const { SourceMapGenerator } = options || {}
-
-  Object.assign(this, { Compiler: compiler })
-
-  /** @type {import('unified').CompilerFunction<Program, string>} */
-  function compiler(tree, file) {
-    const result = SourceMapGenerator
-      ? toJs(tree, {
-          filePath: file.path || 'unknown.mdx',
-          SourceMapGenerator,
-          handlers: jsx,
-        })
-      : toJs(tree, { handlers: jsx })
-
-    file.map = result.map
-
-    return result.value
-  }
-}