@orgajs/orgx 2.6.0 → 2.6.2

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

@@ -1 +1 @@
-{"version":3,"file":"rehype-recma.d.ts","sourceRoot":"","sources":["rehype-recma.js"],"names":[],"mappings":"AAWA;;;;;;;GAOG;AACH,8CALW,OAAO,GAAG,IAAI,GAAG,SAAS,IAYlB,MALN,IAKU,KAHR,OAAO,CAmCrB;AA2BD,mDAAmD;AACnD,wBADW,OAAO,qBAAqB,EAAE,MAAM,CA+B9C;sBAjHY,OAAO,qBAAqB,EAAE,OAAO;6BADO,QAAQ;0BAD1C,MAAM"}
+{"version":3,"file":"rehype-recma.d.ts","sourceRoot":"","sources":["rehype-recma.js"],"names":[],"mappings":"AAWA;;;;;;;GAOG;AACH,8CALW,OAAO,GAAG,IAAI,GAAG,SAAS,IAYnB,MALN,IAKU,KAHR,OAAO,CA+BpB;AA2BD,mDAAmD;AACnD,wBADW,OAAO,qBAAqB,EAAE,MAAM,CA8B9C;sBA5GY,OAAO,qBAAqB,EAAE,OAAO;6BADO,QAAQ;0BAD1C,MAAM"}

package/lib/plugin/rehype-recma.js

@@ -4,9 +4,9 @@
  * @typedef {import('hast-util-to-estree').Options} Options
  */
 
-import { toEstree } from 'hast-util-to-estree'
 import { Parser } from 'acorn'
 import jsx from 'acorn-jsx'
+import { toEstree } from 'hast-util-to-estree'
 import renderError from '../util/render-error.js'
 
 /**
@@ -18,44 +18,40 @@ import renderError from '../util/render-error.js'
  *   Transform.
  */
 export default function rehypeRecma(options) {
-  /**
-   * @param {Root} tree
-   *   Tree (hast).
-   * @returns {Program}
-   *   Program (esast).
-   */
-  return function (tree) {
-    const data = tree.data || {}
-    /** @type {ModuleDeclaration[]} */
-    const prepand = []
-    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}'`,
-          },
-        })
-      } else {
-        prepand.push(createExport(k, v))
-      }
-    })
+	/**
+	 * @param {Root} tree
+	 *   Tree (hast).
+	 * @returns {Program}
+	 *   Program (esast).
+	 */
+	return function (tree) {
+		const data = tree.data || {}
+		/** @type {ModuleDeclaration[]} */
+		const prepend = []
+		Object.entries(data).forEach(([k, v]) => {
+			if (k === 'layout') {
+				prepend.push({
+					type: 'ImportDeclaration',
+					specifiers: [
+						{
+							type: 'ImportDefaultSpecifier',
+							local: {
+								type: 'Identifier',
+								name: 'OrgLayout'
+							}
+						}
+					],
+					source: { type: 'Literal', value: `${v}` }
+				})
+			} else if (isValidName(k)) {
+				prepend.push(createExport(k, v))
+			}
+		})
 
-    const estree = toEstree(tree, { ...options, handlers: { jsx: handleJsx } })
-    estree.body.unshift(...prepand)
-    return estree
-  }
+		const estree = toEstree(tree, { ...options, handlers: { jsx: handleJsx } })
+		estree.body.unshift(...prepend)
+		return estree
+	}
 }
 
 const jsxParser = Parser.extend(jsx())
@@ -65,55 +61,54 @@ const jsxParser = Parser.extend(jsx())
  * @returns {node is Program}
  */
 function isProgram(node) {
-  return node.type === 'Program'
+	return node.type === 'Program'
 }
 
 /**
  * @param {string} code
  */
 function parse(code) {
-  try {
-    return jsxParser.parse(code, {
-      sourceType: 'module',
-      ecmaVersion: 2020,
-    })
-  } catch (err) {
-    // @ts-ignore
-    return renderError(err)
-  }
+	try {
+		return jsxParser.parse(code, {
+			sourceType: 'module',
+			ecmaVersion: 2020
+		})
+	} catch (err) {
+		// @ts-expect-error
+		return renderError(err)
+	}
 }
 
 /** @type {import("hast-util-to-estree").Handle} */
 export const handleJsx = (node, state) => {
-  let skipImport = false
-  const estree = parse(node.value)
+	const skipImport = false
+	const estree = parse(node.value)
 
-  /** @type {Expression[]} */
-  const expressions = []
+	/** @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'
-      ) {
-        state.esm.push(child)
-      } else {
-        throw new Error(`unexpected node: ${child.type}`)
-      }
-    })
-  }
+	if (isProgram(estree)) {
+		estree.body.forEach((child) => {
+			if (child.type === 'ImportDeclaration') {
+				if (!skipImport) {
+					state.esm.push(child)
+				}
+			} 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}`)
+			}
+		})
+	}
 
-  // @ts-expect-error: array works
-  // https://github.com/syntax-tree/hast-util-to-estree/blob/c0c4bd33583abade25c4f4e248a06cb1ec8c3aff/lib/state.js#L215
-  return expressions
+	// @ts-expect-error: array works
+	// https://github.com/syntax-tree/hast-util-to-estree/blob/c0c4bd33583abade25c4f4e248a06cb1ec8c3aff/lib/state.js#L215
+	return expressions
 }
 
 /**
@@ -121,7 +116,25 @@ export const handleJsx = (node, state) => {
  * @returns {string}
  */
 function removeQuotes(text) {
-  return text.trim().replace(/^["'](.+(?=["']$))["']$/, '$1')
+	return text.trim().replace(/^["'](.+(?=["']$))["']$/, '$1')
+}
+
+/**
+ * Whether `name` can be declared with `export const`. Org keywords are `\w+`,
+ * so this only rejects names starting with a digit and reserved words.
+ *
+ * @param {string} name
+ */
+function isValidName(name) {
+	try {
+		Parser.parse(`const ${name} = 0`, {
+			sourceType: 'module',
+			ecmaVersion: 'latest'
+		})
+		return true
+	} catch {
+		return false
+	}
 }
 
 /**
@@ -130,32 +143,31 @@ function removeQuotes(text) {
  * @returns {ModuleDeclaration}
  */
 function createExport(k, v) {
-  /** @type {(text: string) => Expression} */
-  const createLiteral = (text) => {
-    const value = removeQuotes(`${text}`)
-    return { type: 'Literal', value, raw: `'${value}'` }
-  }
-  /** @type {Expression} */
-  const init = Array.isArray(v)
-    ? {
-        type: 'ArrayExpression',
-        elements: v.map(createLiteral),
-      }
-    : createLiteral(v)
-  return {
-    type: 'ExportNamedDeclaration',
-    declaration: {
-      type: 'VariableDeclaration',
-      declarations: [
-        {
-          type: 'VariableDeclarator',
-          id: { type: 'Identifier', name: k },
-          init,
-        },
-      ],
-      kind: 'const',
-    },
-    specifiers: [],
-    source: null,
-  }
+	/** @type {(text: string) => Expression} */
+	const createLiteral = (text) => {
+		return { type: 'Literal', value: removeQuotes(`${text}`) }
+	}
+	/** @type {Expression} */
+	const init = Array.isArray(v)
+		? {
+				type: 'ArrayExpression',
+				elements: v.map(createLiteral)
+			}
+		: createLiteral(v)
+	return {
+		type: 'ExportNamedDeclaration',
+		declaration: {
+			type: 'VariableDeclaration',
+			declarations: [
+				{
+					type: 'VariableDeclarator',
+					id: { type: 'Identifier', name: k },
+					init
+				}
+			],
+			kind: 'const'
+		},
+		specifiers: [],
+		source: null
+	}
 }

package/lib/run.js

@@ -12,7 +12,7 @@ const AsyncFunction = Object.getPrototypeOf(run).constructor
  *   Anything.
  */
 export async function run(file, options) {
-  return new AsyncFunction(String(file))(options)
+	return new AsyncFunction(String(file))(options)
 }
 
 /**
@@ -26,6 +26,6 @@ export async function run(file, options) {
  *   Anything.
  */
 export function runSync(file, options) {
-  // eslint-disable-next-line no-new-func
-  return new Function(String(file))(options)
+	// eslint-disable-next-line no-new-func
+	return new Function(String(file))(options)
 }

package/lib/util/estree-util-create.js

@@ -11,17 +11,17 @@
  *   Nothing.
  */
 export function create(from, to) {
-  /** @type {Array<keyof Node>} */
-  // @ts-expect-error: `start`, `end`, `comments` are custom Acorn fields.
-  const fields = ['start', 'end', 'loc', 'range', 'comments']
-  let index = -1
+	/** @type {Array<keyof Node>} */
+	// @ts-expect-error: `start`, `end`, `comments` are custom Acorn fields.
+	const fields = ['start', 'end', 'loc', 'range', 'comments']
+	let index = -1
 
-  while (++index < fields.length) {
-    const field = fields[index]
+	while (++index < fields.length) {
+		const field = fields[index]
 
-    if (field in from) {
-      // @ts-expect-error: assume they’re settable.
-      to[field] = from[field]
-    }
-  }
+		if (field in from) {
+			// @ts-expect-error: assume they’re settable.
+			to[field] = from[field]
+		}
+	}
 }

package/lib/util/estree-util-declaration-to-expression.js

@@ -16,17 +16,17 @@
  *   Expression.
  */
 export function declarationToExpression(declaration) {
-  if (declaration.type === 'FunctionDeclaration') {
-    return {...declaration, type: 'FunctionExpression'}
-  }
+	if (declaration.type === 'FunctionDeclaration') {
+		return { ...declaration, type: 'FunctionExpression' }
+	}
 
-  if (declaration.type === 'ClassDeclaration') {
-    return {...declaration, type: 'ClassExpression'}
-    /* Internal utility so the next shouldn’t happen or a maintainer is making a
-     * mistake. */
-    /* c8 ignore next 4 */
-  }
+	if (declaration.type === 'ClassDeclaration') {
+		return { ...declaration, type: 'ClassExpression' }
+		/* Internal utility so the next shouldn’t happen or a maintainer is making a
+		 * mistake. */
+		/* c8 ignore next 4 */
+	}
 
-  // Probably `VariableDeclaration`.
-  throw new Error('Cannot turn `' + declaration.type + '` into an expression')
+	// Probably `VariableDeclaration`.
+	throw new Error(`Cannot turn \`${declaration.type}\` into an expression`)
 }

package/lib/util/estree-util-is-declaration.js

@@ -12,9 +12,9 @@
  *   Whether `node` is a declaration.
  */
 export function isDeclaration(node) {
-  return Boolean(
-    node.type === 'FunctionDeclaration' ||
-      node.type === 'ClassDeclaration' ||
-      node.type === 'VariableDeclaration'
-  )
+	return Boolean(
+		node.type === 'FunctionDeclaration' ||
+			node.type === 'ClassDeclaration' ||
+			node.type === 'VariableDeclaration'
+	)
 }

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

@@ -9,7 +9,7 @@
  * @typedef {import('estree-jsx').VariableDeclarator} VariableDeclarator
  */
 
-import {create} from './estree-util-create.js'
+import { create } from './estree-util-create.js'
 
 /**
  * @param {Array<ImportSpecifier | ImportDefaultSpecifier | ImportNamespaceSpecifier | ExportSpecifier>} specifiers
@@ -17,78 +17,78 @@ import {create} from './estree-util-create.js'
  * @returns {Array<VariableDeclarator>}
  */
 export function specifiersToDeclarations(specifiers, init) {
-  let index = -1
-  /** @type {Array<VariableDeclarator>} */
-  const declarations = []
-  /** @type {Array<ImportSpecifier | ImportDefaultSpecifier | ExportSpecifier>} */
-  const otherSpecifiers = []
-  // Can only be one according to JS syntax.
-  /** @type {ImportNamespaceSpecifier | undefined} */
-  let importNamespaceSpecifier
+	let index = -1
+	/** @type {Array<VariableDeclarator>} */
+	const declarations = []
+	/** @type {Array<ImportSpecifier | ImportDefaultSpecifier | ExportSpecifier>} */
+	const otherSpecifiers = []
+	// Can only be one according to JS syntax.
+	/** @type {ImportNamespaceSpecifier | undefined} */
+	let importNamespaceSpecifier
 
-  while (++index < specifiers.length) {
-    const specifier = specifiers[index]
+	while (++index < specifiers.length) {
+		const specifier = specifiers[index]
 
-    if (specifier.type === 'ImportNamespaceSpecifier') {
-      importNamespaceSpecifier = specifier
-    } else {
-      otherSpecifiers.push(specifier)
-    }
-  }
+		if (specifier.type === 'ImportNamespaceSpecifier') {
+			importNamespaceSpecifier = specifier
+		} else {
+			otherSpecifiers.push(specifier)
+		}
+	}
 
-  if (importNamespaceSpecifier) {
-    /** @type {VariableDeclarator} */
-    const declarator = {
-      type: 'VariableDeclarator',
-      id: importNamespaceSpecifier.local,
-      init
-    }
-    create(importNamespaceSpecifier, declarator)
-    declarations.push(declarator)
-  }
+	if (importNamespaceSpecifier) {
+		/** @type {VariableDeclarator} */
+		const declarator = {
+			type: 'VariableDeclarator',
+			id: importNamespaceSpecifier.local,
+			init
+		}
+		create(importNamespaceSpecifier, declarator)
+		declarations.push(declarator)
+	}
 
-  declarations.push({
-    type: 'VariableDeclarator',
-    id: {
-      type: 'ObjectPattern',
-      properties: otherSpecifiers.map((specifier) => {
-        /** @type {Identifier} */
-        // @ts-expect-error: fine.
-        let key =
-          specifier.type === 'ImportSpecifier'
-            ? specifier.imported
-            : specifier.type === 'ExportSpecifier'
-            ? specifier.exported
-            : {type: 'Identifier', name: 'default'}
-        let value = specifier.local
+	declarations.push({
+		type: 'VariableDeclarator',
+		id: {
+			type: 'ObjectPattern',
+			properties: otherSpecifiers.map((specifier) => {
+				/** @type {Identifier} */
+				// @ts-expect-error: fine.
+				let key =
+					specifier.type === 'ImportSpecifier'
+						? specifier.imported
+						: specifier.type === 'ExportSpecifier'
+							? specifier.exported
+							: { type: 'Identifier', name: 'default' }
+				let value = specifier.local
 
-        // Switch them around if we’re exporting.
-        if (specifier.type === 'ExportSpecifier') {
-          value = key
-          // @ts-expect-error: fine.
-          key = specifier.local
-        }
+				// Switch them around if we’re exporting.
+				if (specifier.type === 'ExportSpecifier') {
+					value = key
+					// @ts-expect-error: fine.
+					key = specifier.local
+				}
 
-        /** @type {AssignmentProperty} */
-        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)
-        return property
-      })
-    },
-    init: importNamespaceSpecifier
-      ? {type: 'Identifier', name: importNamespaceSpecifier.local.name}
-      : init
-  })
+				/** @type {AssignmentProperty} */
+				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)
+				return property
+			})
+		},
+		init: importNamespaceSpecifier
+			? { type: 'Identifier', name: importNamespaceSpecifier.local.name }
+			: init
+	})
 
-  return declarations
+	return declarations
 }

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

@@ -1 +1 @@
-{"version":3,"file":"estree-util-to-binary-addition.d.ts","sourceRoot":"","sources":["estree-util-to-binary-addition.js"],"names":[],"mappings":"AAAA;;GAEG;AAEH;;GAEG;AACH,8CAFW,KAAK,CAAC,UAAU,CAAC,+BAiB3B;yBArBY,OAAO,YAAY,EAAE,UAAU"}
+{"version":3,"file":"estree-util-to-binary-addition.d.ts","sourceRoot":"","sources":["estree-util-to-binary-addition.js"],"names":[],"mappings":"AAAA;;GAEG;AAEH;;GAEG;AACH,8CAFW,KAAK,CAAC,UAAU,CAAC,+BAmB3B;yBAvBY,OAAO,YAAY,EAAE,UAAU"}

package/lib/util/estree-util-to-binary-addition.js

@@ -6,18 +6,20 @@
  * @param {Array<Expression>} expressions
  */
 export function toBinaryAddition(expressions) {
-  let index = -1
-  /** @type {Expression | undefined} */
-  let left
+	let index = -1
+	/** @type {Expression | undefined} */
+	let left
 
-  while (++index < expressions.length) {
-    const right = expressions[index]
-    left = left ? {type: 'BinaryExpression', left, operator: '+', right} : right
-  }
+	while (++index < expressions.length) {
+		const right = expressions[index]
+		left = left
+			? { type: 'BinaryExpression', left, operator: '+', right }
+			: right
+	}
 
-  // Just for types.
-  /* c8 ignore next */
-  if (!left) throw new Error('Expected non-empty `expressions` to be passed')
+	// Just for types.
+	/* c8 ignore next */
+	if (!left) throw new Error('Expected non-empty `expressions` to be passed')
 
-  return left
+	return left
 }

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

@@ -1 +1 @@
-{"version":3,"file":"estree-util-to-id-or-member-expression.d.ts","sourceRoot":"","sources":["estree-util-to-id-or-member-expression.js"],"names":[],"mappings":"AAsCE;;;GAGG;AACH,4CAHW,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,GACpB,UAAU,GAAG,gBAAgB,CAwCzC;AA5DH,wCAEa,CAAC,GAAG,EAAE,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,KAAK,aAAa,GAAG,mBAAmB,CAO9E;yBA5BU,OAAO,YAAY,EAAE,UAAU;4BAC/B,OAAO,YAAY,EAAE,aAAa;kCAClC,OAAO,YAAY,EAAE,mBAAmB;sBACxC,OAAO,YAAY,EAAE,OAAO;+BAC5B,OAAO,YAAY,EAAE,gBAAgB"}
+{"version":3,"file":"estree-util-to-id-or-member-expression.d.ts","sourceRoot":"","sources":["estree-util-to-id-or-member-expression.js"],"names":[],"mappings":"AAsCC;;;GAGG;AACH,4CAHW,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,GACpB,UAAU,GAAG,gBAAgB,CA0CzC;AA9DF,wCAEY,CAAC,GAAG,EAAE,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,KAAK,aAAa,GAAG,mBAAmB,CAO9E;yBA5BW,OAAO,YAAY,EAAE,UAAU;4BAC/B,OAAO,YAAY,EAAE,aAAa;kCAClC,OAAO,YAAY,EAAE,mBAAmB;sBACxC,OAAO,YAAY,EAAE,OAAO;+BAC5B,OAAO,YAAY,EAAE,gBAAgB"}