@monimesl/dot-dml-parser 0.1.0-alpha.21 → 0.1.0-alpha.24

package/dist/index.d.ts

@@ -22,8 +22,7 @@ interface ParseDmlOptions {
   locations?: boolean;
   whitespace?: 'trim' | 'collapse' | 'inline' | 'preserve';
 }
-/** Parses .dml markup into an IR tree, leaving `{{ }}` bindings as raw strings. */
-declare function parseDmlToIR(dmlString: string, options?: ParseDmlOptions): DmlNode[];
+declare function parseDmlToIR(source: string, options?: ParseDmlOptions): DmlNode[];
 //#endregion
 //#region src/errors.d.ts
 export declare class DmlParseError extends SourceError {

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","names":[],"sources":["../src/ast.ts","../src/parse.ts","../src/errors.ts"],"mappings":";;UAEiB;WACN;WACA;WACA,QAAQ;WACR,YAAY;WACZ,UAAU;WACV,MAAM;;UAGA;WACN;WACA;WACA,MAAM;;KAGL,UAAU,iBAAiB;wBAEvB,cAAc,MAAM,UAAU,QAAQ;;;UCbrC;EACf;EACA;EACA;;;iBAYO,aAAa,mBAAmB,UAAS,kBAAuB;;;qBCnB5D,sBAAsB;WACf"}
+{"version":3,"file":"index.d.ts","names":[],"sources":["../src/ast.ts","../src/parse.ts","../src/errors.ts"],"mappings":";;UAEiB;WACN;WACA;WACA,QAAQ;WACR,YAAY;WACZ,UAAU;WACV,MAAM;;UAGA;WACN;WACA;WACA,MAAM;;KAGL,UAAU,iBAAiB;wBAEvB,cAAc,MAAM,UAAU,QAAQ;;;UCbrC;EACf;EACA;EACA;;iBAcO,aAAa,gBAAgB,UAAS,kBAAuB;;;qBCrBzD,sBAAsB;WACf"}

package/dist/index.js

@@ -8,38 +8,37 @@ var DmlParseError = class extends SourceError {
 //#region src/parse.ts
 const CLOSING_TAG = /<\/([^\s>]+)\s*>/g;
 const OPAQUE_REGION = /<!--[\s\S]*?-->|<!\[CDATA\[[\s\S]*?]]>/g;
-/** Parses .dml markup into an IR tree, leaving `{{ }}` bindings as raw strings. */
-function parseDmlToIR(dmlString, options = {}) {
+function parseDmlToIR(source, options = {}) {
 	const { file, locations = false, whitespace = "trim" } = options;
 	const roots = [];
-	const stack = [];
+	const openTags = [];
 	let textBuffer = "";
 	let textStart = -1;
 	const matchedClosingTagOffsets = /* @__PURE__ */ new Set();
-	const locate = createLocator(dmlString);
+	const locate = createLocator(source);
 	const errorAt = (message, offset) => {
 		return new DmlParseError(message, file, locate(offset));
 	};
+	const withLocation = (node, offset) => {
+		if (!locations) return node;
+		return {
+			...node,
+			loc: locate(offset)
+		};
+	};
 	const currentChildren = () => {
-		return stack.at(-1)?.node.children ?? roots;
+		return openTags.at(-1)?.node.children ?? roots;
 	};
 	const flushText = () => {
 		if (textStart < 0) return;
 		const content = normalizeText(textBuffer, whitespace);
 		if (content.length > 0) {
-			let node;
-			if (locations) {
-				const leadingWhitespace = whitespace === "preserve" ? 0 : textBuffer.length - textBuffer.trimStart().length;
-				node = {
-					type: "Text",
-					content,
-					loc: locate(textStart + leadingWhitespace)
-				};
-			} else node = {
+			let contentStart = textStart;
+			if (whitespace !== "preserve") contentStart += leadingWhitespaceLength(textBuffer);
+			currentChildren().push(withLocation({
 				type: "Text",
 				content
-			};
-			currentChildren().push(node);
+			}, contentStart));
 		}
 		textBuffer = "";
 		textStart = -1;
@@ -52,31 +51,19 @@ function parseDmlToIR(dmlString, options = {}) {
 				start: parser.startIndex
 			};
 		},
-		onopentag(name, attribs) {
+		onopentag(name, rawAttributes) {
 			unfinishedTag = void 0;
 			flushText();
-			const events = {};
-			const attributes = {};
-			for (const [attributeName, value] of Object.entries(attribs)) if (isEventProp(attributeName)) events[attributeName] = value;
-			else attributes[attributeName] = value;
-			let node;
-			if (locations) node = {
-				type: "Element",
-				tag: name,
-				attributes,
-				events,
-				children: [],
-				loc: locate(parser.startIndex)
-			};
-			else node = {
+			const { attributes, events } = splitEvents(rawAttributes);
+			const node = withLocation({
 				type: "Element",
 				tag: name,
 				attributes,
 				events,
 				children: []
-			};
+			}, parser.startIndex);
 			currentChildren().push(node);
-			stack.push({
+			openTags.push({
 				node,
 				start: parser.startIndex
 			});
@@ -84,11 +71,12 @@ function parseDmlToIR(dmlString, options = {}) {
 		onclosetag(name, isImplied) {
 			flushText();
 			if (unfinishedTag) throw errorAt(`<${unfinishedTag.name}> isn't finished: add \`>\` or \`/>\``, unfinishedTag.start);
-			const openTag = stack.pop();
+			const openTag = openTags.pop();
 			const openTagName = openTag.node.tag;
 			const selfClosing = parser.startIndex === openTag.start;
 			if (isImplied && !selfClosing) {
-				const found = parser.startIndex >= dmlString.length ? "end of input" : `\`${dmlString.slice(parser.startIndex, parser.endIndex + 1)}\``;
+				let found = "end of input";
+				if (parser.startIndex < source.length) found = `\`${source.slice(parser.startIndex, parser.endIndex + 1)}\``;
 				throw errorAt(`<${openTagName}> isn't closed: expected </${openTagName}>, found ${found}`, openTag.start);
 			}
 			if (name !== openTagName) throw errorAt(`</${name}> doesn't match <${openTagName}>: expected </${openTagName}>`, parser.startIndex);
@@ -112,25 +100,43 @@ function parseDmlToIR(dmlString, options = {}) {
 		decodeEntities: true,
 		recognizeCDATA: true
 	});
-	parser.write(dmlString);
+	parser.write(source);
 	parser.end();
 	flushText();
-	const markupOnly = dmlString.replace(OPAQUE_REGION, (region) => " ".repeat(region.length));
+	const markupOnly = source.replace(OPAQUE_REGION, (region) => " ".repeat(region.length));
 	for (const closingTag of markupOnly.matchAll(CLOSING_TAG)) if (!matchedClosingTagOffsets.has(closingTag.index)) throw errorAt(`</${closingTag[1]}> has no matching opening tag`, closingTag.index);
 	return roots;
 }
+function splitEvents(rawAttributes) {
+	const attributes = {};
+	const events = {};
+	for (const [name, value] of Object.entries(rawAttributes)) if (isEventProp(name)) events[name] = value;
+	else attributes[name] = value;
+	return {
+		attributes,
+		events
+	};
+}
 function normalizeText(raw, mode) {
 	switch (mode) {
-		case "preserve": return raw.trim().length === 0 ? "" : raw;
+		case "preserve":
+			if (raw.trim() === "") return "";
+			return raw;
 		case "collapse": return raw.replace(/\s+/g, " ").trim();
 		case "inline": return inlineText(raw);
 		case "trim": return raw.trim();
 	}
 }
 function inlineText(raw) {
-	if (raw.trim() === "") return raw.includes("\n") ? "" : " ";
+	if (raw.trim() === "") {
+		if (raw.includes("\n")) return "";
+		return " ";
+	}
 	return raw.replace(/^\s*\n\s*/, "").replace(/\s*\n\s*$/, "").replace(/\s+/g, " ");
 }
+function leadingWhitespaceLength(text) {
+	return text.length - text.trimStart().length;
+}
 //#endregion
 //#region src/ast.ts
 function isElementNode(node) {

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":[],"sources":["../src/errors.ts","../src/parse.ts","../src/ast.ts"],"sourcesContent":["import { SourceError } from '@monimesl/dot-core';\n\nexport class DmlParseError extends SourceError {\n  override readonly name = 'DmlParseError';\n}\n","import { Parser } from 'htmlparser2';\nimport { createLocator, isEventProp } from '@monimesl/dot-core';\n\nimport { DmlParseError } from './errors';\nimport type { DmlElementNode, DmlNode } from './ast';\n\nexport interface ParseDmlOptions {\n  file?: string;\n  locations?: boolean;\n  whitespace?: 'trim' | 'collapse' | 'inline' | 'preserve';\n}\n\nconst CLOSING_TAG = /<\\/([^\\s>]+)\\s*>/g;\nconst OPAQUE_REGION = /<!--[\\s\\S]*?-->|<!\\[CDATA\\[[\\s\\S]*?]]>/g;\n\ninterface OpenTag {\n  node: DmlElementNode;\n  start: number;\n}\n\n/** Parses .dml markup into an IR tree, leaving `{{ }}` bindings as raw strings. */\nfunction parseDmlToIR(dmlString: string, options: ParseDmlOptions = {}): DmlNode[] {\n  const { file, locations = false, whitespace = 'trim' } = options;\n  const roots: DmlNode[] = [];\n  const stack: OpenTag[] = [];\n  let textBuffer = '';\n  let textStart = -1;\n  const matchedClosingTagOffsets = new Set<number>();\n  const locate = createLocator(dmlString);\n  const errorAt = (message: string, offset: number) => {\n    return new DmlParseError(message, file, locate(offset));\n  };\n  const currentChildren = (): DmlNode[] => {\n    return stack.at(-1)?.node.children ?? roots;\n  };\n  const flushText = (): void => {\n    if (textStart < 0) {\n      return;\n    }\n    const content = normalizeText(textBuffer, whitespace);\n    if (content.length > 0) {\n      let node: DmlNode;\n      if (locations) {\n        const leadingWhitespace =\n          whitespace === 'preserve' ? 0 : textBuffer.length - textBuffer.trimStart().length;\n        node = { type: 'Text', content, loc: locate(textStart + leadingWhitespace) };\n      } else {\n        node = { type: 'Text', content };\n      }\n      currentChildren().push(node);\n    }\n    textBuffer = '';\n    textStart = -1;\n  };\n  // A tag whose name has been read but not its closing `>`.\n  let unfinishedTag: { name: string; start: number } | undefined;\n  const parser = new Parser(\n    {\n      onopentagname(name) {\n        unfinishedTag = { name, start: parser.startIndex };\n      },\n      onopentag(name, attribs) {\n        unfinishedTag = undefined;\n        flushText();\n        const events: Record<string, string> = {};\n        const attributes: Record<string, string> = {};\n        for (const [attributeName, value] of Object.entries(attribs)) {\n          if (isEventProp(attributeName)) {\n            events[attributeName] = value;\n          } else {\n            attributes[attributeName] = value;\n          }\n        }\n        let node: DmlElementNode;\n        if (locations) {\n          node = {\n            type: 'Element',\n            tag: name,\n            attributes,\n            events,\n            children: [],\n            loc: locate(parser.startIndex),\n          };\n        } else {\n          node = { type: 'Element', tag: name, attributes, events, children: [] };\n        }\n        currentChildren().push(node);\n        stack.push({ node, start: parser.startIndex });\n      },\n      onclosetag(name, isImplied) {\n        flushText();\n        if (unfinishedTag) {\n          throw errorAt(\n            `<${unfinishedTag.name}> isn't finished: add \\`>\\` or \\`/>\\``,\n            unfinishedTag.start,\n          );\n        }\n        // htmlparser2 only reports closing tags it has seen open.\n        const openTag = stack.pop()!;\n        const openTagName = openTag.node.tag;\n        const selfClosing = parser.startIndex === openTag.start;\n        if (isImplied && !selfClosing) {\n          const found =\n            parser.startIndex >= dmlString.length\n              ? 'end of input'\n              : `\\`${dmlString.slice(parser.startIndex, parser.endIndex + 1)}\\``;\n          throw errorAt(\n            `<${openTagName}> isn't closed: expected </${openTagName}>, found ${found}`,\n            openTag.start,\n          );\n        }\n        if (name !== openTagName) {\n          throw errorAt(\n            `</${name}> doesn't match <${openTagName}>: expected </${openTagName}>`,\n            parser.startIndex,\n          );\n        }\n        if (!selfClosing) {\n          matchedClosingTagOffsets.add(parser.startIndex);\n        }\n      },\n      ontext(data) {\n        // htmlparser2 splits text around entities; buffer until the next tag.\n        if (textStart < 0) {\n          textStart = parser.startIndex;\n        }\n        textBuffer += data;\n      },\n      oncomment() {\n        flushText();\n      },\n      onprocessinginstruction() {\n        flushText();\n      },\n      onerror(error) {\n        throw errorAt(error.message, parser.startIndex);\n      },\n    },\n    {\n      xmlMode: true,\n      decodeEntities: true,\n      recognizeCDATA: true,\n    },\n  );\n\n  parser.write(dmlString);\n  parser.end();\n  flushText();\n\n  // htmlparser2 ignores unmatched closing tags instead of throwing, so we catch them here.\n  // Comments and CDATA are blanked with spaces, not removed, so offsets still match the source.\n  const markupOnly = dmlString.replace(OPAQUE_REGION, (region) => ' '.repeat(region.length));\n  for (const closingTag of markupOnly.matchAll(CLOSING_TAG)) {\n    if (!matchedClosingTagOffsets.has(closingTag.index)) {\n      throw errorAt(`</${closingTag[1]!}> has no matching opening tag`, closingTag.index);\n    }\n  }\n  return roots;\n}\n\nexport default parseDmlToIR;\n\nfunction normalizeText(raw: string, mode: NonNullable<ParseDmlOptions['whitespace']>): string {\n  switch (mode) {\n    case 'preserve':\n      return raw.trim().length === 0 ? '' : raw;\n    case 'collapse':\n      return raw.replace(/\\s+/g, ' ').trim();\n    case 'inline':\n      return inlineText(raw);\n    case 'trim':\n      return raw.trim();\n  }\n}\n\n// As text flows around inline elements: whitespace with a line break in it only lays out the markup,\n// so it goes, but a space on the same line as an element stays, as in `paid <Text>SLE 50</Text> today`.\nfunction inlineText(raw: string): string {\n  if (raw.trim() === '') {\n    return raw.includes('\\n') ? '' : ' ';\n  }\n  return raw\n    .replace(/^\\s*\\n\\s*/, '')\n    .replace(/\\s*\\n\\s*$/, '')\n    .replace(/\\s+/g, ' ');\n}\n","import type { SourceLocation } from '@monimesl/dot-core';\n\nexport interface DmlElementNode {\n  readonly type: 'Element';\n  readonly tag: string;\n  readonly events: Record<string, string>;\n  readonly attributes: Record<string, string>;\n  readonly children: DmlNode[];\n  readonly loc?: SourceLocation;\n}\n\nexport interface DmlTextNode {\n  readonly type: 'Text';\n  readonly content: string;\n  readonly loc?: SourceLocation;\n}\n\nexport type DmlNode = DmlElementNode | DmlTextNode;\n\nexport function isElementNode(node: DmlNode): node is DmlElementNode {\n  return node.type === 'Element';\n}\n"],"mappings":"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"}
+{"version":3,"file":"index.js","names":[],"sources":["../src/errors.ts","../src/parse.ts","../src/ast.ts"],"sourcesContent":["import { SourceError } from '@monimesl/dot-core';\n\nexport class DmlParseError extends SourceError {\n  override readonly name = 'DmlParseError';\n}\n","import { Parser } from 'htmlparser2';\nimport { createLocator, isEventProp } from '@monimesl/dot-core';\n\nimport { DmlParseError } from './errors';\nimport type { DmlElementNode, DmlNode } from './ast';\n\nexport interface ParseDmlOptions {\n  file?: string;\n  locations?: boolean;\n  whitespace?: 'trim' | 'collapse' | 'inline' | 'preserve';\n}\n\ntype WhitespaceMode = NonNullable<ParseDmlOptions['whitespace']>;\n\nconst CLOSING_TAG = /<\\/([^\\s>]+)\\s*>/g;\nconst OPAQUE_REGION = /<!--[\\s\\S]*?-->|<!\\[CDATA\\[[\\s\\S]*?]]>/g;\n\ninterface OpenTag {\n  node: DmlElementNode;\n  start: number;\n}\n\n// Parses .dml markup into a tree, leaving `{{ }}` bindings as raw strings.\nfunction parseDmlToIR(source: string, options: ParseDmlOptions = {}): DmlNode[] {\n  const { file, locations = false, whitespace = 'trim' } = options;\n  const roots: DmlNode[] = [];\n  const openTags: OpenTag[] = [];\n  let textBuffer = '';\n  let textStart = -1;\n  const matchedClosingTagOffsets = new Set<number>();\n  const locate = createLocator(source);\n  const errorAt = (message: string, offset: number) => {\n    return new DmlParseError(message, file, locate(offset));\n  };\n  // Without `locations`, nodes have no `loc` key at all.\n  const withLocation = <Node extends DmlNode>(node: Node, offset: number): Node => {\n    if (!locations) {\n      return node;\n    }\n    return { ...node, loc: locate(offset) };\n  };\n  const currentChildren = (): DmlNode[] => {\n    return openTags.at(-1)?.node.children ?? roots;\n  };\n  const flushText = (): void => {\n    if (textStart < 0) {\n      return;\n    }\n    const content = normalizeText(textBuffer, whitespace);\n    if (content.length > 0) {\n      // Point at the first character kept, past any whitespace trimmed off the front.\n      let contentStart = textStart;\n      if (whitespace !== 'preserve') {\n        contentStart += leadingWhitespaceLength(textBuffer);\n      }\n      currentChildren().push(withLocation({ type: 'Text', content }, contentStart));\n    }\n    textBuffer = '';\n    textStart = -1;\n  };\n  // A tag whose name has been read but not its closing `>`.\n  let unfinishedTag: { name: string; start: number } | undefined;\n  const parser = new Parser(\n    {\n      onopentagname(name) {\n        unfinishedTag = { name, start: parser.startIndex };\n      },\n      onopentag(name, rawAttributes) {\n        unfinishedTag = undefined;\n        flushText();\n        const { attributes, events } = splitEvents(rawAttributes);\n        const node = withLocation<DmlElementNode>(\n          { type: 'Element', tag: name, attributes, events, children: [] },\n          parser.startIndex,\n        );\n        currentChildren().push(node);\n        openTags.push({ node, start: parser.startIndex });\n      },\n      onclosetag(name, isImplied) {\n        flushText();\n        if (unfinishedTag) {\n          throw errorAt(\n            `<${unfinishedTag.name}> isn't finished: add \\`>\\` or \\`/>\\``,\n            unfinishedTag.start,\n          );\n        }\n        // htmlparser2 only reports closing tags it has seen open.\n        const openTag = openTags.pop()!;\n        const openTagName = openTag.node.tag;\n        const selfClosing = parser.startIndex === openTag.start;\n        if (isImplied && !selfClosing) {\n          let found = 'end of input';\n          if (parser.startIndex < source.length) {\n            found = `\\`${source.slice(parser.startIndex, parser.endIndex + 1)}\\``;\n          }\n          throw errorAt(\n            `<${openTagName}> isn't closed: expected </${openTagName}>, found ${found}`,\n            openTag.start,\n          );\n        }\n        if (name !== openTagName) {\n          throw errorAt(\n            `</${name}> doesn't match <${openTagName}>: expected </${openTagName}>`,\n            parser.startIndex,\n          );\n        }\n        if (!selfClosing) {\n          matchedClosingTagOffsets.add(parser.startIndex);\n        }\n      },\n      ontext(data) {\n        // htmlparser2 splits text around entities; buffer until the next tag.\n        if (textStart < 0) {\n          textStart = parser.startIndex;\n        }\n        textBuffer += data;\n      },\n      oncomment() {\n        flushText();\n      },\n      onprocessinginstruction() {\n        flushText();\n      },\n      onerror(error) {\n        throw errorAt(error.message, parser.startIndex);\n      },\n    },\n    {\n      xmlMode: true,\n      decodeEntities: true,\n      recognizeCDATA: true,\n    },\n  );\n\n  parser.write(source);\n  parser.end();\n  flushText();\n\n  // htmlparser2 ignores unmatched closing tags instead of throwing, so we catch them here.\n  // Comments and CDATA are blanked with spaces, not removed, so offsets still match the source.\n  const markupOnly = source.replace(OPAQUE_REGION, (region) => ' '.repeat(region.length));\n  for (const closingTag of markupOnly.matchAll(CLOSING_TAG)) {\n    if (!matchedClosingTagOffsets.has(closingTag.index)) {\n      throw errorAt(`</${closingTag[1]!}> has no matching opening tag`, closingTag.index);\n    }\n  }\n  return roots;\n}\n\nexport default parseDmlToIR;\n\nfunction splitEvents(rawAttributes: Record<string, string>): {\n  attributes: Record<string, string>;\n  events: Record<string, string>;\n} {\n  const attributes: Record<string, string> = {};\n  const events: Record<string, string> = {};\n  for (const [name, value] of Object.entries(rawAttributes)) {\n    if (isEventProp(name)) {\n      events[name] = value;\n    } else {\n      attributes[name] = value;\n    }\n  }\n  return { attributes, events };\n}\n\nfunction normalizeText(raw: string, mode: WhitespaceMode): string {\n  switch (mode) {\n    case 'preserve':\n      if (raw.trim() === '') {\n        return '';\n      }\n      return raw;\n    case 'collapse':\n      return raw.replace(/\\s+/g, ' ').trim();\n    case 'inline':\n      return inlineText(raw);\n    case 'trim':\n      return raw.trim();\n  }\n}\n\n// As text flows around inline elements: whitespace with a line break in it only lays out the markup,\n// so it goes, but a space on the same line as an element stays, as in `paid <Text>SLE 50</Text> today`.\nfunction inlineText(raw: string): string {\n  if (raw.trim() === '') {\n    if (raw.includes('\\n')) {\n      return '';\n    }\n    return ' ';\n  }\n  return raw\n    .replace(/^\\s*\\n\\s*/, '')\n    .replace(/\\s*\\n\\s*$/, '')\n    .replace(/\\s+/g, ' ');\n}\n\nfunction leadingWhitespaceLength(text: string): number {\n  return text.length - text.trimStart().length;\n}\n","import type { SourceLocation } from '@monimesl/dot-core';\n\nexport interface DmlElementNode {\n  readonly type: 'Element';\n  readonly tag: string;\n  readonly events: Record<string, string>;\n  readonly attributes: Record<string, string>;\n  readonly children: DmlNode[];\n  readonly loc?: SourceLocation;\n}\n\nexport interface DmlTextNode {\n  readonly type: 'Text';\n  readonly content: string;\n  readonly loc?: SourceLocation;\n}\n\nexport type DmlNode = DmlElementNode | DmlTextNode;\n\nexport function isElementNode(node: DmlNode): node is DmlElementNode {\n  return node.type === 'Element';\n}\n"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@monimesl/dot-dml-parser",
-  "version": "0.1.0-alpha.21",
+  "version": "0.1.0-alpha.24",
   "description": "Dot .dml template parser: markup -> intermediary representation",
   "type": "module",
   "repository": {
@@ -32,7 +32,7 @@
   },
   "dependencies": {
     "htmlparser2": "^12.0.0",
-    "@monimesl/dot-core": "0.1.0-alpha.21"
+    "@monimesl/dot-core": "0.1.0-alpha.24"
   },
   "publishConfig": {
     "access": "public"