@markuplint/php-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: 'php-tag',
             start: /<\?php/,
@@ -21,8 +18,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/php-parser",
-	"version": "3.10.0",
+	"version": "4.0.0-alpha.2",
 	"description": "PHP 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,119 +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:php-echo: <?=␣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:php-echo: <?=␣efg␣?>',
-			'[1:19]>[1:22](18,21)#text: hij',
-			'[1:22]>[1:32](21,31)#ps:php-echo: <?=␣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:php-echo: <?=␣efg␣?>',
-			'[1:19]>[1:22](18,21)#text: hij',
-			'[1:22]>[1:32](21,31)#ps:php-echo: <?=␣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:php-echo: <?=␣efg␣?>',
-			'[1:14]>[1:17](13,16)#text: hij',
-			'[1:17]>[1:27](16,26)#ps:php-echo: <?=␣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:php-short-tag: <?␣if␣(foo)␣{␣?>',
-			'[1:17]>[1:23](16,22)#text: abcdef',
-			'[1:23]>[1:30](22,29)#ps:php-short-tag: <?␣}␣?>',
-		]);
-	});
-
-	it('nest block', () => {
-		const doc = parse('<? if (foo) { ?>abc<?= foo ?>def<? } ?>');
-		expect(nodeListToDebugMaps(doc.nodeList)).toStrictEqual([
-			'[1:1]>[1:17](0,16)#ps:php-short-tag: <?␣if␣(foo)␣{␣?>',
-			'[1:17]>[1:20](16,19)#text: abc',
-			'[1:20]>[1:30](19,29)#ps:php-echo: <?=␣foo␣?>',
-			'[1:30]>[1:33](29,32)#text: def',
-			'[1:33]>[1:40](32,39)#ps:php-short-tag: <?␣}␣?>',
-		]);
-	});
-
-	it('nest block', () => {
-		const doc = parse(`<? if (user) { ?>
-<div><?= user.name ?></div>
-<? } ?>
-`);
-		expect(nodeListToDebugMaps(doc.nodeList)).toStrictEqual([
-			'[1:1]>[1:18](0,17)#ps:php-short-tag: <?␣if␣(user)␣{␣?>',
-			'[1:18]>[2:1](17,18)#text: ⏎',
-			'[2:1]>[2:6](18,23)div: <div>',
-			'[2:6]>[2:22](23,39)#ps:php-echo: <?=␣user.name␣?>',
-			'[2:22]>[2:28](39,45)div: </div>',
-			'[2:28]>[3:1](45,46)#text: ⏎',
-			'[3:1]>[3:8](46,53)#ps:php-short-tag: <?␣}␣?>',
-			'[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('omitted close tag', () => {
-		const doc = parse('<div></div><?php include("path/to")');
-		expect(nodeListToDebugMaps(doc.nodeList)).toStrictEqual([
-			'[1:1]>[1:6](0,5)div: <div>',
-			'[1:6]>[1:12](5,11)div: </div>',
-			'[1:12]>[1:36](11,35)#ps:php-tag: <?php␣include("path/to")',
-		]);
-	});
-});
-
-describe('Tags', () => {
-	it('php-tag', () => {
-		expect(parse('<?php any; ?>').nodeList[0].nodeName).toBe('#ps:php-tag');
-		expect(parse('<?php any;').nodeList[0].nodeName).toBe('#ps:php-tag');
-	});
-
-	it('php-echo', () => {
-		expect(parse('<?= any ?>').nodeList[0].nodeName).toBe('#ps:php-echo');
-	});
-
-	it('php-short-tag', () => {
-		expect(parse('<? any; ?>').nodeList[0].nodeName).toBe('#ps:php-short-tag');
-		expect(parse('<? any;').nodeList[0].nodeName).toBe('#ps:php-short-tag');
-	});
-});