@orgajs/orgx 2.6.0 → 2.6.2

package/lib/util/estree-util-to-id-or-member-expression.js

@@ -7,27 +7,27 @@
  */
 
 import {
-  start as esStart,
-  cont as esCont,
-  name as isIdentifierName
+	cont as esCont,
+	start as esStart,
+	name as isIdentifierName
 } from 'estree-util-is-identifier-name'
 
 export const toIdOrMemberExpression = toIdOrMemberExpressionFactory(
-  'Identifier',
-  'MemberExpression',
-  isIdentifierName
+	'Identifier',
+	'MemberExpression',
+	isIdentifierName
 )
 
 export const toJsxIdOrMemberExpression =
-  // @ts-expect-error: fine
-  /** @type {(ids: Array<string | number>) => JSXIdentifier | JSXMemberExpression)} */
-  (
-    toIdOrMemberExpressionFactory(
-      'JSXIdentifier',
-      'JSXMemberExpression',
-      isJsxIdentifierName
-    )
-  )
+	// @ts-expect-error: fine
+	/** @type {(ids: Array<string | number>) => JSXIdentifier | JSXMemberExpression)} */
+	(
+		toIdOrMemberExpressionFactory(
+			'JSXIdentifier',
+			'JSXMemberExpression',
+			isJsxIdentifierName
+		)
+	)
 
 /**
  * @param {string} idType
@@ -35,50 +35,52 @@ export const toJsxIdOrMemberExpression =
  * @param {(value: string) => boolean} isIdentifier
  */
 function toIdOrMemberExpressionFactory(idType, memberType, isIdentifier) {
-  return toIdOrMemberExpression
-  /**
-   * @param {Array<string | number>} ids
-   * @returns {Identifier | MemberExpression}
-   */
-  function toIdOrMemberExpression(ids) {
-    let index = -1
-    /** @type {Identifier | Literal | MemberExpression | undefined} */
-    let object
+	return toIdOrMemberExpression
+	/**
+	 * @param {Array<string | number>} ids
+	 * @returns {Identifier | MemberExpression}
+	 */
+	function toIdOrMemberExpression(ids) {
+		let index = -1
+		/** @type {Identifier | Literal | MemberExpression | undefined} */
+		let object
 
-    while (++index < ids.length) {
-      const name = ids[index]
-      const valid = typeof name === 'string' && isIdentifier(name)
+		while (++index < ids.length) {
+			const name = ids[index]
+			const valid = typeof name === 'string' && isIdentifier(name)
 
-      // A value of `asd.123` could be turned into `asd['123']` in the JS form,
-      // but JSX does not have a form for it, so throw.
-      /* c8 ignore next 3 */
-      if (idType === 'JSXIdentifier' && !valid) {
-        throw new Error('Cannot turn `' + name + '` into a JSX identifier')
-      }
+			// A value of `asd.123` could be turned into `asd['123']` in the JS form,
+			// but JSX does not have a form for it, so throw.
+			/* c8 ignore next 3 */
+			if (idType === 'JSXIdentifier' && !valid) {
+				throw new Error(`Cannot turn \`${name}\` into a JSX identifier`)
+			}
 
-      /** @type {Identifier | Literal} */
-      // @ts-expect-error: JSX is fine.
-      const id = valid ? {type: idType, name} : {type: 'Literal', value: name}
-      // @ts-expect-error: JSX is fine.
-      object = object
-        ? {
-            type: memberType,
-            object,
-            property: id,
-            computed: id.type === 'Literal',
-            optional: false
-          }
-        : id
-    }
+			/** @type {Identifier | Literal} */
+			// @ts-expect-error: JSX is fine.
+			const id = valid
+				? { type: idType, name }
+				: { type: 'Literal', value: name }
+			// @ts-expect-error: JSX is fine.
+			object = object
+				? {
+						type: memberType,
+						object,
+						property: id,
+						computed: id.type === 'Literal',
+						optional: false
+					}
+				: id
+		}
 
-    // Just for types.
-    /* c8 ignore next 3 */
-    if (!object) throw new Error('Expected non-empty `ids` to be passed')
-    if (object.type === 'Literal')
-      throw new Error('Expected identifier as left-most value')
+		// Just for types.
+		/* c8 ignore next 3 */
+		if (!object) throw new Error('Expected non-empty `ids` to be passed')
+		if (object.type === 'Literal')
+			throw new Error('Expected identifier as left-most value')
 
-    return object
-  }
+		return object
+	}
 }
 
 /**
@@ -86,17 +88,17 @@ function toIdOrMemberExpressionFactory(idType, memberType, isIdentifier) {
  * @param {string} name
  */
 function isJsxIdentifierName(name) {
-  let index = -1
+	let index = -1
 
-  while (++index < name.length) {
-    // We currently receive valid input, but this catches bugs and is needed
-    // when externalized.
-    /* c8 ignore next */
-    if (!(index ? jsxCont : esStart)(name.charCodeAt(index))) return false
-  }
+	while (++index < name.length) {
+		// We currently receive valid input, but this catches bugs and is needed
+		// when externalized.
+		/* c8 ignore next */
+		if (!(index ? jsxCont : esStart)(name.charCodeAt(index))) return false
+	}
 
-  // `false` if `name` is empty.
-  return index > 0
+	// `false` if `name` is empty.
+	return index > 0
 }
 
 /**
@@ -104,5 +106,5 @@ function isJsxIdentifierName(name) {
  * @param {number} code
  */
 function jsxCont(code) {
-  return code === 45 /* `-` */ || esCont(code)
+	return code === 45 /* `-` */ || esCont(code)
 }

package/lib/util/render-error.js

@@ -5,87 +5,87 @@
  * @returns {import('estree-jsx').Program}
  */
 export default (error, bg = '#F44336', color = 'white') => {
-  return {
-    type: 'Program',
-    body: [
-      {
-        type: 'ExpressionStatement',
-        expression: {
-          type: 'JSXElement',
-          openingElement: {
-            type: 'JSXOpeningElement',
-            attributes: [
-              {
-                type: 'JSXAttribute',
-                name: {
-                  type: 'JSXIdentifier',
-                  name: 'style',
-                },
-                value: {
-                  type: 'JSXExpressionContainer',
-                  expression: {
-                    type: 'ObjectExpression',
-                    properties: [
-                      {
-                        type: 'Property',
-                        method: false,
-                        shorthand: false,
-                        computed: false,
-                        key: {
-                          type: 'Identifier',
-                          name: 'backgroundColor',
-                        },
-                        value: {
-                          type: 'Literal',
-                          value: bg,
-                          raw: `'${bg}'`,
-                        },
-                        kind: 'init',
-                      },
-                      {
-                        type: 'Property',
-                        method: false,
-                        shorthand: false,
-                        computed: false,
-                        key: {
-                          type: 'Identifier',
-                          name: 'color',
-                        },
-                        value: {
-                          type: 'Literal',
-                          value: color,
-                          raw: `'${color}'`,
-                        },
-                        kind: 'init',
-                      },
-                    ],
-                  },
-                },
-              },
-            ],
-            name: {
-              type: 'JSXIdentifier',
-              name: 'pre',
-            },
-            selfClosing: false,
-          },
-          closingElement: {
-            type: 'JSXClosingElement',
-            name: {
-              type: 'JSXIdentifier',
-              name: 'pre',
-            },
-          },
-          children: [
-            {
-              type: 'JSXText',
-              value: error.message,
-              raw: error.message,
-            },
-          ],
-        },
-      },
-    ],
-    sourceType: 'module',
-  }
+	return {
+		type: 'Program',
+		body: [
+			{
+				type: 'ExpressionStatement',
+				expression: {
+					type: 'JSXElement',
+					openingElement: {
+						type: 'JSXOpeningElement',
+						attributes: [
+							{
+								type: 'JSXAttribute',
+								name: {
+									type: 'JSXIdentifier',
+									name: 'style'
+								},
+								value: {
+									type: 'JSXExpressionContainer',
+									expression: {
+										type: 'ObjectExpression',
+										properties: [
+											{
+												type: 'Property',
+												method: false,
+												shorthand: false,
+												computed: false,
+												key: {
+													type: 'Identifier',
+													name: 'backgroundColor'
+												},
+												value: {
+													type: 'Literal',
+													value: bg,
+													raw: `'${bg}'`
+												},
+												kind: 'init'
+											},
+											{
+												type: 'Property',
+												method: false,
+												shorthand: false,
+												computed: false,
+												key: {
+													type: 'Identifier',
+													name: 'color'
+												},
+												value: {
+													type: 'Literal',
+													value: color,
+													raw: `'${color}'`
+												},
+												kind: 'init'
+											}
+										]
+									}
+								}
+							}
+						],
+						name: {
+							type: 'JSXIdentifier',
+							name: 'pre'
+						},
+						selfClosing: false
+					},
+					closingElement: {
+						type: 'JSXClosingElement',
+						name: {
+							type: 'JSXIdentifier',
+							name: 'pre'
+						}
+					},
+					children: [
+						{
+							type: 'JSXText',
+							value: error.message,
+							raw: error.message
+						}
+					]
+				}
+			}
+		],
+		sourceType: 'module'
+	}
 }

package/lib/util/resolve-evaluate-options.js

@@ -28,37 +28,37 @@
  * @returns {{compiletime: ProcessorOptions, runtime: RunnerOptions}}
  */
 export function resolveEvaluateOptions(options) {
-  const {
-    development,
-    Fragment,
-    jsx,
-    jsxs,
-    jsxDEV,
-    useOrgComponents,
-    ...rest
-  } = options || {}
+	const {
+		development,
+		Fragment,
+		jsx,
+		jsxs,
+		jsxDEV,
+		useOrgComponents,
+		...rest
+	} = options || {}
 
-  if (!Fragment) throw new Error('Expected `Fragment` given to `evaluate`')
-  if (development) {
-    if (!jsxDEV) throw new Error('Expected `jsxDEV` given to `evaluate`')
-  } else {
-    if (!jsx) throw new Error('Expected `jsx` given to `evaluate`')
-    if (!jsxs) throw new Error('Expected `jsxs` given to `evaluate`')
-  }
+	if (!Fragment) throw new Error('Expected `Fragment` given to `evaluate`')
+	if (development) {
+		if (!jsxDEV) throw new Error('Expected `jsxDEV` given to `evaluate`')
+	} else {
+		if (!jsx) throw new Error('Expected `jsx` given to `evaluate`')
+		if (!jsxs) throw new Error('Expected `jsxs` given to `evaluate`')
+	}
 
-  return {
-    compiletime: {
-      ...rest,
-      development,
-      outputFormat: 'function-body',
-      providerImportSource: useOrgComponents ? '#' : undefined,
-    },
-    runtime: {
-      Fragment,
-      jsx,
-      jsxs,
-      jsxDEV,
-      useOrgComponents,
-    },
-  }
+	return {
+		compiletime: {
+			...rest,
+			development,
+			outputFormat: 'function-body',
+			providerImportSource: useOrgComponents ? '#' : undefined
+		},
+		runtime: {
+			Fragment,
+			jsx,
+			jsxs,
+			jsxDEV,
+			useOrgComponents
+		}
+	}
 }

package/lib/util/resolve-file-and-options.js

@@ -15,15 +15,15 @@ import { VFile } from 'vfile'
  * @returns {{file: VFile, options: ProcessorOptions}}
  */
 export function resolveFileAndOptions(vfileCompatible, options) {
-  const file = looksLikeAVFile(vfileCompatible)
-    ? vfileCompatible
-    : new VFile(vfileCompatible)
-  return {
-    file,
-    options: {
-      ...options,
-    },
-  }
+	const file = looksLikeAVFile(vfileCompatible)
+		? vfileCompatible
+		: new VFile(vfileCompatible)
+	return {
+		file,
+		options: {
+			...options
+		}
+	}
 }
 
 /**
@@ -31,10 +31,10 @@ export function resolveFileAndOptions(vfileCompatible, options) {
  * @returns {value is VFile}
  */
 function looksLikeAVFile(value) {
-  return Boolean(
-    value &&
-      typeof value === 'object' &&
-      'message' in value &&
-      'messages' in value
-  )
+	return Boolean(
+		value &&
+			typeof value === 'object' &&
+			'message' in value &&
+			'messages' in value
+	)
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orgajs/orgx",
-  "version": "2.6.0",
+  "version": "2.6.2",
   "description": "orga compiler with jsx support",
   "author": "Xiaoxing Hu <hi@xiaoxing.dev>",
   "license": "MIT",
@@ -25,7 +25,7 @@
     "@types/estree": "^1.0.6",
     "@types/estree-jsx": "^1.0.5",
     "@types/hast": "^3.0.4",
-    "@types/node": "^20.5.7",
+    "@types/node": "^25.3.2",
     "@types/react": "^19.0.8",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
@@ -49,8 +49,8 @@
     "unist-util-position-from-estree": "^2.0.0",
     "unist-util-stringify-position": "^4.0.0",
     "vfile": "^6.0.3",
-    "@orgajs/reorg-parse": "^4.4.0",
-    "@orgajs/reorg-rehype": "^4.3.3"
+    "@orgajs/reorg-rehype": "^4.3.12",
+    "@orgajs/reorg-parse": "^4.4.1"
   },
   "scripts": {
     "test": "node --test tests/*.test.js"