@markuplint/html-parser 3.5.0 → 3.6.0

package/lib/attr-tokenizer.js

@@ -5,7 +5,7 @@ const reAttrsInStartTag =
 // eslint-disable-next-line no-control-regex
 /(\s*)([^\x00-\x1f\x7f-\x9f "'>/=]+)(?:(\s*)(=)(\s*)(?:(?:"([^"]*)")|(?:'([^']*)')|([^\s]*)))?/;
 function attrTokenizer(raw, line, col, startOffset) {
-    var _a, _b, _c, _d, _e, _f, _g;
+    var _a, _b, _c, _d, _e, _f, _g, _h;
     const attrMatchedMap = raw.match(reAttrsInStartTag);
     if (!attrMatchedMap) {
         throw new SyntaxError('Illegal attribute token');
@@ -13,10 +13,10 @@ function attrTokenizer(raw, line, col, startOffset) {
     const spacesBeforeAttrString = (_a = attrMatchedMap[1]) !== null && _a !== void 0 ? _a : '';
     const nameChars = (_b = attrMatchedMap[2]) !== null && _b !== void 0 ? _b : '';
     const spacesBeforeEqualChars = (_c = attrMatchedMap[3]) !== null && _c !== void 0 ? _c : '';
-    const equalChars = attrMatchedMap[4] || null;
-    const spacesAfterEqualChars = (_d = attrMatchedMap[5]) !== null && _d !== void 0 ? _d : '';
+    const equalChars = (_d = attrMatchedMap[4]) !== null && _d !== void 0 ? _d : null;
+    const spacesAfterEqualChars = (_e = attrMatchedMap[5]) !== null && _e !== void 0 ? _e : '';
     const quoteChars = attrMatchedMap[6] != null ? '"' : attrMatchedMap[7] != null ? "'" : null;
-    const valueChars = (_g = (_f = (_e = attrMatchedMap[6]) !== null && _e !== void 0 ? _e : attrMatchedMap[7]) !== null && _f !== void 0 ? _f : attrMatchedMap[8]) !== null && _g !== void 0 ? _g : (quoteChars ? '' : null);
+    const valueChars = (_h = (_g = (_f = attrMatchedMap[6]) !== null && _f !== void 0 ? _f : attrMatchedMap[7]) !== null && _g !== void 0 ? _g : attrMatchedMap[8]) !== null && _h !== void 0 ? _h : (quoteChars ? '' : null);
     let offset = startOffset;
     const spacesBeforeName = (0, parser_utils_1.tokenizer)(spacesBeforeAttrString, line, col, offset);
     line = spacesBeforeName.endLine;
@@ -49,11 +49,11 @@ function attrTokenizer(raw, line, col, startOffset) {
     const endQuote = (0, parser_utils_1.tokenizer)(quoteChars, line, col, offset);
     const attrToken = (0, parser_utils_1.tokenizer)(nameChars +
         spacesBeforeEqualChars +
-        (equalChars || '') +
+        (equalChars !== null && equalChars !== void 0 ? equalChars : '') +
         spacesAfterEqualChars +
-        (quoteChars || '') +
-        (valueChars || '') +
-        (quoteChars || ''), name.startLine, name.startCol, name.startOffset);
+        (quoteChars !== null && quoteChars !== void 0 ? quoteChars : '') +
+        (valueChars !== null && valueChars !== void 0 ? valueChars : '') +
+        (quoteChars !== null && quoteChars !== void 0 ? quoteChars : ''), name.startLine, name.startCol, name.startOffset);
     return {
         type: 'html-attr',
         uuid: (0, parser_utils_1.uuid)(),

package/lib/create-tree.d.ts

@@ -1,2 +1,8 @@
 import type { MLASTNode } from '@markuplint/ml-ast';
-export declare function createTree(rawCode: string, isFragment: boolean, offsetOffset: number, offsetLine: number, offsetColumn: number): MLASTNode[];
+export declare function createTree(
+	rawCode: string,
+	isFragment: boolean,
+	offsetOffset: number,
+	offsetLine: number,
+	offsetColumn: number,
+): MLASTNode[];

package/lib/create-tree.js

@@ -41,10 +41,11 @@ function nodeize(originNode,
 prevNode, 
 // eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types
 parentNode, rawHtml, offsetOffset, offsetLine, offsetColumn) {
+    var _a, _b, _c;
     const nextNode = null;
     const location = getLocation(originNode);
     if (!location) {
-        const prevToken = prevNode || parentNode;
+        const prevToken = prevNode !== null && prevNode !== void 0 ? prevNode : parentNode;
         const startOffset = prevToken ? prevToken.endOffset : 0;
         const endOffset = prevToken ? prevToken.endOffset : 0;
         const startLine = prevToken ? prevToken.endLine : 0;
@@ -79,18 +80,18 @@ parentNode, rawHtml, offsetOffset, offsetLine, offsetColumn) {
         return node;
     }
     const { startOffset, endOffset, startLine, endLine, startCol, endCol } = location;
-    const raw = rawHtml.slice(startOffset, endOffset || startOffset);
+    const raw = rawHtml.slice(startOffset, endOffset !== null && endOffset !== void 0 ? endOffset : startOffset);
     switch (originNode.nodeName) {
         case '#documentType': {
             return {
                 uuid: (0, parser_utils_1.uuid)(),
                 raw,
                 // @ts-ignore
-                name: originNode.name || '',
+                name: (_a = originNode.name) !== null && _a !== void 0 ? _a : '',
                 // @ts-ignore
-                publicId: originNode.publicId || '',
+                publicId: (_b = originNode.publicId) !== null && _b !== void 0 ? _b : '',
                 // @ts-ignore
-                systemId: originNode.systemId || '',
+                systemId: (_c = originNode.systemId) !== null && _c !== void 0 ? _c : '',
                 startOffset: startOffset + offsetOffset,
                 endOffset: endOffset + offsetOffset,
                 startLine: startLine + offsetLine,
@@ -150,7 +151,7 @@ parentNode, rawHtml, offsetOffset, offsetLine, offsetColumn) {
             const tagLoc = 'startTag' in location ? location.startTag : null;
             const startTagRaw = tagLoc
                 ? rawHtml.slice(tagLoc.startOffset, tagLoc.endOffset)
-                : rawHtml.slice(startOffset, endOffset || startOffset);
+                : rawHtml.slice(startOffset, endOffset !== null && endOffset !== void 0 ? endOffset : startOffset);
             const tagTokens = (0, parse_raw_tag_1.default)(startTagRaw, startLine, startCol, startOffset, offsetOffset, offsetLine, offsetColumn);
             const tagName = tagTokens.tagName;
             let endTag = null;
@@ -240,7 +241,8 @@ parentNode, rawHtml, offsetOffset, offsetLine, offsetColumn) {
  * - If node has "content" property then parse as document fragment.
  */
 function getChildNodes(rootNode) {
-    return rootNode.content ? rootNode.content.childNodes : rootNode.childNodes || [];
+    var _a;
+    return rootNode.content ? rootNode.content.childNodes : (_a = rootNode.childNodes) !== null && _a !== void 0 ? _a : [];
 }
 function hasLocation(node) {
     return 'sourceCodeLocation' in node;

package/lib/optimize-starts-head-or-body.d.ts

@@ -1,8 +1,11 @@
 import type { MLASTNode } from '@markuplint/ml-ast';
 export declare function isStartsHeadTagOrBodyTag(rawCode: string): boolean;
 export declare function optimizeStartsHeadTagOrBodyTagSetup(rawCode: string): {
-    code: string;
-    heads: string[];
-    bodies: string[];
+	code: string;
+	heads: string[];
+	bodies: string[];
 };
-export declare function optimizeStartsHeadTagOrBodyTagResume(nodeList: MLASTNode[], replacements: ReturnType<typeof optimizeStartsHeadTagOrBodyTagSetup>): void;
+export declare function optimizeStartsHeadTagOrBodyTagResume(
+	nodeList: MLASTNode[],
+	replacements: ReturnType<typeof optimizeStartsHeadTagOrBodyTagSetup>,
+): void;

package/lib/parse-raw-tag.d.ts

@@ -1,9 +1,17 @@
 import type { MLASTAttr, MLToken } from '@markuplint/ml-ast';
 type TagTokens = {
-    tagName: string;
-    attrs: MLASTAttr[];
-    selfClosingSolidus: MLToken;
-    endSpace: MLToken;
+	tagName: string;
+	attrs: MLASTAttr[];
+	selfClosingSolidus: MLToken;
+	endSpace: MLToken;
 };
-export default function parseRawTag(raw: string, startLine: number, startCol: number, startOffset: number, offsetOffset?: number, offsetLine?: number, offsetColumn?: number): TagTokens;
+export default function parseRawTag(
+	raw: string,
+	startLine: number,
+	startCol: number,
+	startOffset: number,
+	offsetOffset?: number,
+	offsetLine?: number,
+	offsetColumn?: number,
+): TagTokens;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@markuplint/html-parser",
-	"version": "3.5.0",
+	"version": "3.6.0",
 	"description": "HTML parser for markuplint",
 	"repository": "git@github.com:markuplint/markuplint.git",
 	"author": "Yusuke Hirao <yusukehirao@me.com>",
@@ -21,12 +21,12 @@
 	},
 	"dependencies": {
 		"@markuplint/ml-ast": "3.1.0",
-		"@markuplint/parser-utils": "3.5.0",
+		"@markuplint/parser-utils": "3.6.0",
 		"parse5": "7.1.2",
 		"tslib": "^2.4.1"
 	},
 	"devDependencies": {
 		"type-fest": "^3.7.0"
 	},
-	"gitHead": "0c47b2c2722f6823a17f36edbab98486275f8ab4"
+	"gitHead": "715dd53d3b1064a9bcf616c1533921cad9e3b187"
 }