@markuplint/ejs-parser 3.10.0 → 4.0.0-alpha.2

package/lib/index.d.ts

@@ -1 +1 @@
-export { parse } from './parse';
+export { parse } from './parse.js';

package/lib/index.js

@@ -1,5 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.parse = void 0;
-var parse_1 = require("./parse");
-Object.defineProperty(exports, "parse", { enumerable: true, get: function () { return parse_1.parse; } });
+export { parse } from './parse.js';

package/lib/parse.js

@@ -1,10 +1,7 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.parse = void 0;
-const html_parser_1 = require("@markuplint/html-parser");
-const parser_utils_1 = require("@markuplint/parser-utils");
-const parse = (rawCode, options) => {
-    const blocks = (0, parser_utils_1.ignoreBlock)(rawCode, [
+import { parse as htmlParse } from '@markuplint/html-parser';
+import { ignoreBlock, restoreNode } from '@markuplint/parser-utils';
+export const parse = (rawCode, options) => {
+    const blocks = ignoreBlock(rawCode, [
         {
             type: 'ejs-whitespace-slurping',
             start: /<%_/,
@@ -31,8 +28,7 @@ const parse = (rawCode, options) => {
             end: /%>/,
         },
     ]);
-    const doc = (0, html_parser_1.parse)(blocks.replaced, options);
-    doc.nodeList = (0, parser_utils_1.restoreNode)(doc.nodeList, blocks);
+    const doc = htmlParse(blocks.replaced, options);
+    doc.nodeList = restoreNode(doc.nodeList, blocks);
     return doc;
 };
-exports.parse = parse;

package/package.json

@@ -1,12 +1,17 @@
 {
 	"name": "@markuplint/ejs-parser",
-	"version": "3.10.0",
+	"version": "4.0.0-alpha.2",
 	"description": "EJS parser for markuplint",
 	"repository": "git@github.com:markuplint/markuplint.git",
 	"author": "Yusuke Hirao <yusukehirao@me.com>",
 	"license": "MIT",
 	"private": false,
-	"main": "lib/index.js",
+	"type": "module",
+	"exports": {
+		".": {
+			"import": "./lib/index.js"
+		}
+	},
 	"types": "lib/index.d.ts",
 	"publishConfig": {
 		"access": "public"
@@ -16,9 +21,9 @@
 		"clean": "tsc --build --clean"
 	},
 	"dependencies": {
-		"@markuplint/html-parser": "3.11.0",
-		"@markuplint/ml-ast": "3.2.0",
-		"@markuplint/parser-utils": "3.11.0"
+		"@markuplint/html-parser": "4.0.0-alpha.2",
+		"@markuplint/ml-ast": "4.0.0-alpha.2",
+		"@markuplint/parser-utils": "4.0.0-alpha.2"
 	},
-	"gitHead": "ef31aef8f2fff319d0f692feead332ec5fc5c7cf"
+	"gitHead": "51ad52c760435641f9bff8685707d8178b0787eb"
 }

package/test/index.spec.js

@@ -1,168 +0,0 @@
-const { nodeListToDebugMaps } = require('@markuplint/parser-utils');
-
-const { parse } = require('../lib/');
-
-describe('Node list', () => {
-	it('a code', () => {
-		const doc = parse('<div>abc<%= efg %>hij</div>');
-		expect(nodeListToDebugMaps(doc.nodeList)).toStrictEqual([
-			'[1:1]>[1:6](0,5)div: <div>',
-			'[1:6]>[1:9](5,8)#text: abc',
-			'[1:9]>[1:19](8,18)#ps:ejs-output-value: <%=␣efg␣%>',
-			'[1:19]>[1:22](18,21)#text: hij',
-			'[1:22]>[1:28](21,27)div: </div>',
-		]);
-	});
-
-	it('two codes', () => {
-		const doc = parse('<div>abc<%= efg %>hij<%= klm %></div>');
-		expect(nodeListToDebugMaps(doc.nodeList)).toStrictEqual([
-			'[1:1]>[1:6](0,5)div: <div>',
-			'[1:6]>[1:9](5,8)#text: abc',
-			'[1:9]>[1:19](8,18)#ps:ejs-output-value: <%=␣efg␣%>',
-			'[1:19]>[1:22](18,21)#text: hij',
-			'[1:22]>[1:32](21,31)#ps:ejs-output-value: <%=␣klm␣%>',
-			'[1:32]>[1:38](31,37)div: </div>',
-		]);
-	});
-
-	it('two codes2', () => {
-		const doc = parse('<div>abc<%= efg %>hij<%= klm %>nop</div>');
-		expect(nodeListToDebugMaps(doc.nodeList)).toStrictEqual([
-			'[1:1]>[1:6](0,5)div: <div>',
-			'[1:6]>[1:9](5,8)#text: abc',
-			'[1:9]>[1:19](8,18)#ps:ejs-output-value: <%=␣efg␣%>',
-			'[1:19]>[1:22](18,21)#text: hij',
-			'[1:22]>[1:32](21,31)#ps:ejs-output-value: <%=␣klm␣%>',
-			'[1:32]>[1:35](31,34)#text: nop',
-			'[1:35]>[1:41](34,40)div: </div>',
-		]);
-	});
-
-	it('two codes2 on bare', () => {
-		const doc = parse('abc<%= efg %>hij<%= klm %>nop');
-		expect(nodeListToDebugMaps(doc.nodeList)).toStrictEqual([
-			'[1:1]>[1:4](0,3)#text: abc',
-			'[1:4]>[1:14](3,13)#ps:ejs-output-value: <%=␣efg␣%>',
-			'[1:14]>[1:17](13,16)#text: hij',
-			'[1:17]>[1:27](16,26)#ps:ejs-output-value: <%=␣klm␣%>',
-			'[1:27]>[1:30](26,29)#text: nop',
-		]);
-	});
-
-	it('nest block', () => {
-		const doc = parse('<% if (foo) { %>abcdef<% } %>');
-		expect(nodeListToDebugMaps(doc.nodeList)).toStrictEqual([
-			'[1:1]>[1:17](0,16)#ps:ejs-scriptlet: <%␣if␣(foo)␣{␣%>',
-			'[1:17]>[1:23](16,22)#text: abcdef',
-			'[1:23]>[1:30](22,29)#ps:ejs-scriptlet: <%␣}␣%>',
-		]);
-	});
-
-	it('nest block', () => {
-		const doc = parse('<% if (foo) { %>abc<%= foo %>def<% } %>');
-		expect(nodeListToDebugMaps(doc.nodeList)).toStrictEqual([
-			'[1:1]>[1:17](0,16)#ps:ejs-scriptlet: <%␣if␣(foo)␣{␣%>',
-			'[1:17]>[1:20](16,19)#text: abc',
-			'[1:20]>[1:30](19,29)#ps:ejs-output-value: <%=␣foo␣%>',
-			'[1:30]>[1:33](29,32)#text: def',
-			'[1:33]>[1:40](32,39)#ps:ejs-scriptlet: <%␣}␣%>',
-		]);
-	});
-
-	it('nest block', () => {
-		const doc = parse(`<% if (user) { %>
-<div><%= user.name %></div>
-<% } %>
-`);
-		expect(nodeListToDebugMaps(doc.nodeList)).toStrictEqual([
-			'[1:1]>[1:18](0,17)#ps:ejs-scriptlet: <%␣if␣(user)␣{␣%>',
-			'[1:18]>[2:1](17,18)#text: ⏎',
-			'[2:1]>[2:6](18,23)div: <div>',
-			'[2:6]>[2:22](23,39)#ps:ejs-output-value: <%=␣user.name␣%>',
-			'[2:22]>[2:28](39,45)div: </div>',
-			'[2:28]>[3:1](45,46)#text: ⏎',
-			'[3:1]>[3:8](46,53)#ps:ejs-scriptlet: <%␣}␣%>',
-			'[3:8]>[4:1](53,54)#text: ⏎',
-		]);
-
-		const el = doc.nodeList[3];
-		const el2 = doc.nodeList[3].parentNode.childNodes[0];
-		expect(el.nodeName).toBe(el2.nodeName);
-		expect(el.uuid).toBe(el2.uuid);
-	});
-
-	it('Full HTML', () => {
-		const doc = parse(`<!DOCTYPE html>
-<html lang="en">
-	<head>
-		<%- include('path/to') _%>
-		<meta />
-	</head>
-	<body></body>
-</html>
-`);
-		expect(nodeListToDebugMaps(doc.nodeList)).toStrictEqual([
-			'[1:1]>[1:16](0,15)#doctype: <!DOCTYPE␣html>',
-			'[1:16]>[2:1](15,16)#text: ⏎',
-			'[2:1]>[2:17](16,32)html: <html␣lang="en">',
-			'[2:17]>[3:2](32,34)#text: ⏎→',
-			'[3:2]>[3:8](34,40)head: <head>',
-			'[3:8]>[4:3](40,43)#text: ⏎→→',
-			"[4:3]>[4:29](43,69)#ps:ejs-output-unescaped: <%-␣include('path/to')␣_%>",
-			'[4:29]>[5:3](69,72)#text: ⏎→→',
-			'[5:3]>[5:11](72,80)meta: <meta␣/>',
-			'[5:11]>[6:2](80,82)#text: ⏎→',
-			'[6:2]>[6:9](82,89)head: </head>',
-			'[6:9]>[7:2](89,91)#text: ⏎→',
-			'[7:2]>[7:8](91,97)body: <body>',
-			'[7:8]>[7:15](97,104)body: </body>',
-			'[7:15]>[8:1](104,105)#text: ⏎',
-			'[8:1]>[8:8](105,112)html: </html>',
-			'[8:8]>[9:1](112,113)#text: ⏎',
-		]);
-	});
-
-	it('mutable text node', () => {
-		const doc = parse('<title><%= title %></title>');
-		expect(nodeListToDebugMaps(doc.nodeList)).toStrictEqual([
-			'[1:1]>[1:8](0,7)title: <title>',
-			'[1:8]>[1:20](7,19)#ps:ejs-output-value: <%=␣title␣%>',
-			'[1:20]>[1:28](19,27)title: </title>',
-		]);
-	});
-});
-
-describe('Tags', () => {
-	it('ejs-whitespace-slurping', () => {
-		expect(parse('<%_ any _%>').nodeList[0].nodeName).toBe('#ps:ejs-whitespace-slurping');
-	});
-
-	it('ejs-output-value', () => {
-		expect(parse('<%= any %>').nodeList[0].nodeName).toBe('#ps:ejs-output-value');
-	});
-
-	it('ejs-output-unescaped', () => {
-		expect(parse('<%- any -%>').nodeList[0].nodeName).toBe('#ps:ejs-output-unescaped');
-	});
-
-	it('ejs-comment', () => {
-		expect(parse('<%# any %>').nodeList[0].nodeName).toBe('#ps:ejs-comment');
-	});
-
-	it('ejs-scriptlet', () => {
-		expect(parse('<% any %>').nodeList[0].nodeName).toBe('#ps:ejs-scriptlet');
-	});
-
-	it('text node', () => {
-		expect(parse('<%% any %>').nodeList[0].nodeName).toBe('#text');
-	});
-});
-
-describe('Issues', () => {
-	test('#607', () => {
-		const ast = parse('<% %><div></div>');
-		expect(ast.nodeList.length).toBe(3);
-		expect(ast.nodeList[1].prevNode?.uuid).toBe(ast.nodeList[0].uuid);
-	});
-});