oast-to-hast 4.3.2 → 4.4.0

package/lib/handlers/list.d.ts

@@ -7,9 +7,10 @@ export function list(state: import("../state.js").State, node: import("orga").Li
 /**
  * @param {import('../state.js').State} state
  * @param {import('orga').ListItem} node
- * @returns {import('hast').Element}
+ * @param {import('orga').Parent | undefined} parent
+ * @returns {import('hast').ElementContent | import('hast').ElementContent[]}
  */
-export function item(state: import("../state.js").State, node: import("orga").ListItem): import("hast").Element;
+export function item(state: import("../state.js").State, node: import("orga").ListItem, parent: import("orga").Parent | undefined): import("hast").ElementContent | import("hast").ElementContent[];
 /**
  * @param {import('../state.js').State} state
  * @param {import('orga').ListItemCheckbox} node

package/lib/handlers/list.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"list.d.ts","sourceRoot":"","sources":["list.js"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,4BAJW,OAAO,aAAa,EAAE,KAAK,QAC3B,OAAO,MAAM,EAAE,IAAI,GACjB,OAAO,MAAM,EAAE,OAAO,CAgBlC;AAED;;;;GAIG;AACH,4BAJW,OAAO,aAAa,EAAE,KAAK,QAC3B,OAAO,MAAM,EAAE,QAAQ,GACrB,OAAO,MAAM,EAAE,OAAO,CAmClC;AAED;;;;GAIG;AACH,gCAJW,OAAO,aAAa,EAAE,KAAK,QAC3B,OAAO,MAAM,EAAE,gBAAgB,GAC7B,OAAO,MAAM,EAAE,OAAO,CAalC"}
+{"version":3,"file":"list.d.ts","sourceRoot":"","sources":["list.js"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,4BAJW,OAAO,aAAa,EAAE,KAAK,QAC3B,OAAO,MAAM,EAAE,IAAI,GACjB,OAAO,MAAM,EAAE,OAAO,CAgBlC;AAED;;;;;GAKG;AACH,4BALW,OAAO,aAAa,EAAE,KAAK,QAC3B,OAAO,MAAM,EAAE,QAAQ,UACvB,OAAO,MAAM,EAAE,MAAM,GAAG,SAAS,GAC/B,OAAO,MAAM,EAAE,cAAc,GAAG,OAAO,MAAM,EAAE,cAAc,EAAE,CAkD3E;AAED;;;;GAIG;AACH,gCAJW,OAAO,aAAa,EAAE,KAAK,QAC3B,OAAO,MAAM,EAAE,gBAAgB,GAC7B,OAAO,MAAM,EAAE,OAAO,CAalC"}

package/lib/handlers/list.js

@@ -5,7 +5,7 @@
  */
 export function list(state, node) {
 	let tagName = node.ordered ? 'ol' : 'ul'
-	if (node.children.every((i) => i.type === 'list.item' && i.tag)) {
+	if (node.children.every((i) => i.type !== 'list.item' || i.tag)) {
 		tagName = 'dl'
 	}
 
@@ -22,35 +22,51 @@ export function list(state, node) {
 /**
  * @param {import('../state.js').State} state
  * @param {import('orga').ListItem} node
- * @returns {import('hast').Element}
+ * @param {import('orga').Parent | undefined} parent
+ * @returns {import('hast').ElementContent | import('hast').ElementContent[]}
  */
-export function item(state, node) {
+export function item(state, node, parent) {
 	if (node.tag) {
+		/** @type {import('hast').Element[]} */
+		const dtdd = [
+			{
+				type: 'element',
+				tagName: 'dt',
+				properties: {},
+				children: [{ type: 'text', value: node.tag }]
+			},
+			{
+				type: 'element',
+				tagName: 'dd',
+				properties: {},
+				children: state.all(node)
+			}
+		]
+
+		const allTagged =
+			parent?.children?.every((i) => i.type !== 'list.item' || i.tag)
+
+		if (allTagged) {
+			// Pure definition list: return [<dt>, <dd>] to be flattened into <dl>
+			return dtdd
+		}
+
+		// Definition item inside a mixed list: wrap in <li><dl>…</dl></li>
 		return state.patch(node, {
 			type: 'element',
-			tagName: 'div',
+			tagName: 'li',
 			properties: {},
 			children: [
 				{
 					type: 'element',
-					tagName: 'dt',
+					tagName: 'dl',
 					properties: {},
-					children: [
-						{
-							type: 'text',
-							value: node.tag
-						}
-					]
-				},
-				{
-					type: 'element',
-					tagName: 'dd',
-					properties: {},
-					children: state.all(node)
+					children: dtdd
 				}
 			]
 		})
 	}
+
 	return state.patch(node, {
 		type: 'element',
 		tagName: 'li',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oast-to-hast",
-  "version": "4.3.2",
+  "version": "4.4.0",
   "description": "Transform OAST to HAST",
   "files": [
     "lib",
@@ -18,7 +18,7 @@
     "mime": "^3.0.0",
     "parse5": "^7.1.2",
     "unist-util-position": "^5.0.0",
-    "orga": "^4.5.1"
+    "orga": "^4.6.0"
   },
   "devDependencies": {
     "@types/hast": "^3.0.4",