add option to custom href in oast-to-hast

Author: xiaoxinghu

.gitignore

@@ -105,3 +105,6 @@ dist
 *.d.ts.map
 !packages/reorg-parse/index.d.ts
 !packages/loader/index.d.ts
+
+.meta.json
+.orga-build

packages/oast-to-hast/index.js

@@ -1,5 +1,5 @@
 /**
- * @typedef {import('./lib/state.js').Options} Options
+ * @typedef {import('./lib/index.js').Options} Options
  */
 
 export { handlers as defaultHandlers } from './lib/handlers/index.js'

packages/oast-to-hast/lib/handlers/link.js

@@ -61,7 +61,7 @@ export function link(state, node) {
 		type: 'element',
 		tagName: 'a',
 		properties: {
-			href: node.path.value,
+			href: state.options.linkHref(node),
 			target: state.options.linkTarget
 		},
 		children: state.all(node)

packages/oast-to-hast/lib/handlers/section.js

@@ -33,7 +33,7 @@ export function section(state, node) {
 }
 
 /**
- * @param {import('../state.js').Options} options
+ * @param {import('../state.js').Config} config
  * @param {string[]} tags
  * @returns {boolean}
  */

packages/oast-to-hast/lib/index.js

@@ -1,14 +1,15 @@
 /**
  * @typedef {import('hast').Nodes} HastNodes
  * @typedef {import('orga').Nodes} OastNodes
+ * @typedef {Partial<import('./state.js').Config> | null | undefined} Options
  */
 
 import { createState } from './state.js'
 
 /**
  * @param {OastNodes} tree
  *   oast tree.
- * @param {import('./state.js').Options | null | undefined} [options]
+ * @param {Options} [options]
  *   Configuration (optional).
  * @returns {HastNodes}
  *   hast tree.

packages/oast-to-hast/lib/state.js

@@ -6,11 +6,12 @@
  */
 
 /**
- * @typedef {Object} Options
- * @property {Handlers} [handlers]
- * @property {string} [linkTarget='_self']
- * @property {string[]} [selectTags=[]]
- * @property {string[]} [excludeTags=['noexport']]
+ * @typedef {Object} Config
+ * @property {Handlers} handlers
+ * @property {string} linkTarget
+ * @property {(link: import('orga').Link) => string} linkHref
+ * @property {string[]} selectTags=[]
+ * @property {string[]} excludeTags=['noexport']
  */
 
 /**
@@ -32,22 +33,28 @@ import { handlers as defaultHandlers } from './handlers/index.js'
 
 /**
  * @param {OastNodes} tree
- * @param {Options | null | undefined} [options = {}]
+ * @param {Partial<Config> | null | undefined} [options = {}]
  */
 export function createState(tree, options = {}) {
 	/** @type {Handlers} */
-	const handlers = { ...defaultHandlers, ...options?.handlers }
+	let handlers = { ...defaultHandlers }
+	if (options?.handlers) {
+		handlers = { ...handlers, ...options.handlers }
+	}
 
 	const state = {
 		one,
 		all,
 		handlers,
 		getAttrHtml,
 		patch,
+		/** @type {Config} */
 		options: {
+			handlers,
 			linkTarget: '_self',
 			selectTags: [],
 			excludeTags: ['noexport'],
+			linkHref: (link) => link.path.value,
 			...options
 		}
 	}

packages/orga-build/cli.js

@@ -3,7 +3,6 @@
 import { argv } from 'node:process'
 import { parseArgs } from 'node:util'
 import { watch } from './lib/watch.js'
-// import { loadConfig, clean } from './lib/build.js'
 import { build } from './lib/esbuild/build.js'
 import { loadConfig } from './lib/config.js'
 import { serve } from './lib/serve.js'
@@ -24,8 +23,6 @@ const config = await loadConfig(
 	'orga.config.ts'
 )
 
-console.log('config', config)
-
 await build(config)
 
 if (positionals.includes('dev')) {

packages/orga-build/lib/esbuild/build.js

@@ -63,7 +63,21 @@ export async function build({ outDir = 'dir', preBuild = [], postBuild = [] }) {
 		outdir: '.orga-build/js',
 		// splitting: true,
 		metafile: true,
-		plugins: [esbuildOrga(), rawLoader, resolveReact],
+		plugins: [
+			esbuildOrga({
+				reorgRehypeOptions: {
+					linkHref: (link) => {
+						if (link.path.protocol === 'file') {
+							return link.path.value.replace(/\.org$/, '.html')
+						}
+						return link.path.value
+					}
+				}
+				// reorgPlugins: [reorgLinks]
+			}),
+			rawLoader,
+			resolveReact
+		],
 		// external: ['react/jsx-runtime'],
 		loader: {
 			'.jsx': 'jsx',

packages/orga-build/package.json

@@ -13,7 +13,7 @@
 	"author": "Xiaoxing Hu <[email protected]>",
 	"license": "MIT",
 	"dependencies": {
-		"@orgajs/esbuild": "^1.1.1",
+		"@orgajs/esbuild": "workspace:^",
 		"@orgajs/node-loader": "workspace:^",
 		"esbuild": "^0.24.2",
 		"globby": "^14.0.2",
@@ -27,6 +27,7 @@
 		"@types/node": "^22.13.1",
 		"@types/react": "^19.0.8",
 		"@types/react-dom": "^19.0.3",
-		"@types/serve-handler": "^6.1.4"
+		"@types/serve-handler": "^6.1.4",
+		"orga": "workspace:^"
 	}
 }