@markuplint/html-parser 3.3.0 → 3.4.0

package/lib/attr-tokenizer.js

@@ -5,17 +5,18 @@ 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;
     const attrMatchedMap = raw.match(reAttrsInStartTag);
     if (!attrMatchedMap) {
         throw new SyntaxError('Illegal attribute token');
     }
-    const spacesBeforeAttrString = attrMatchedMap[1];
-    const nameChars = attrMatchedMap[2];
-    const spacesBeforeEqualChars = attrMatchedMap[3] || '';
+    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 = attrMatchedMap[5] || '';
+    const spacesAfterEqualChars = (_d = attrMatchedMap[5]) !== null && _d !== void 0 ? _d : '';
     const quoteChars = attrMatchedMap[6] != null ? '"' : attrMatchedMap[7] != null ? "'" : null;
-    const valueChars = attrMatchedMap[6] || attrMatchedMap[7] || attrMatchedMap[8] || (quoteChars ? '' : 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);
     let offset = startOffset;
     const spacesBeforeName = (0, parser_utils_1.tokenizer)(spacesBeforeAttrString, line, col, offset);
     line = spacesBeforeName.endLine;

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

@@ -5,7 +5,10 @@ const tslib_1 = require("tslib");
 const parser_utils_1 = require("@markuplint/parser-utils");
 const parse5_1 = require("parse5");
 const parse_raw_tag_1 = tslib_1.__importDefault(require("./parse-raw-tag"));
-const P5_OPTIONS = { sourceCodeLocationInfo: true };
+const P5_OPTIONS = {
+    scriptingEnabled: false,
+    sourceCodeLocationInfo: true,
+};
 function createTree(rawCode, isFragment, offsetOffset, offsetLine, offsetColumn) {
     const doc = isFragment
         ? (0, parse5_1.parseFragment)(rawCode, P5_OPTIONS)
@@ -231,28 +234,8 @@ function nodeize(originNode, prevNode, parentNode, rawHtml, offsetOffset, offset
  * getChildNodes
  *
  * - If node has "content" property then parse as document fragment.
- * - If node is <noscript> then that childNodes is a TextNode. But parse as document fragment it for disabled script.
  */
 function getChildNodes(rootNode) {
-    if (rootNode.nodeName === 'noscript') {
-        const textNode = rootNode.childNodes[0];
-        if (!textNode || textNode.nodeName !== '#text') {
-            return [];
-        }
-        // @ts-ignore
-        const html = textNode.value;
-        // @ts-ignore
-        const { startOffset, startLine, startCol } = textNode.sourceCodeLocation;
-        const breakCount = startLine - 1;
-        const indentWidth = startCol - 1;
-        const offsetSpaces = ' '.repeat(startOffset - Math.max(breakCount, 0) - Math.max(indentWidth, 0)) +
-            '\n'.repeat(breakCount) +
-            ' '.repeat(indentWidth);
-        const fragment = (0, parse5_1.parseFragment)(`${offsetSpaces}${html}`, P5_OPTIONS);
-        const childNodes = fragment.childNodes.slice(offsetSpaces ? 1 : 0);
-        // const childNodes = ('childNodes' in _childNodes && _childNodes.childNodes) || [];
-        return childNodes;
-    }
     return rootNode.content ? rootNode.content.childNodes : rootNode.childNodes || [];
 }
 function hasLocation(node) {

package/lib/flatten-nodes.js

@@ -26,7 +26,7 @@ function flattenNodes(nodeTree, rawHtml, createLastText = true) {
                 const prevWreckagesText = prevToken;
                 if (prevWreckagesText) {
                     const wreckages = (0, tag_splitter_1.default)(prevWreckagesText.raw, prevWreckagesText.startLine, prevWreckagesText.startCol);
-                    if (wreckages.length) {
+                    if (wreckages.length && wreckages[0]) {
                         // console.log('wreckages\n', wreckages);
                         const lastText = wreckages[0];
                         const raw = lastText.raw;

package/lib/get-namespace.js

@@ -27,7 +27,7 @@ function getNamespace(tagName, parentNamespace = DEFAULT_NAMESPACE) {
         const doc = (0, parse5_1.parse)(tag);
         node = doc.childNodes[0];
     }
-    if ('namespaceURI' in node) {
+    if (node && 'namespaceURI' in node) {
         return node.namespaceURI;
     }
     return DEFAULT_NAMESPACE;

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/lib/parse-raw-tag.js

@@ -8,14 +8,15 @@ const const_1 = require("./const");
 const reAttrsInStartTag = /\s*[^\x00-\x1f\x7f-\x9f "'>/=]+(?:\s*=\s*(?:(?:"[^"]*")|(?:'[^']*')|[^\s]*))?/;
 const reEndTokens = /(\s*\/)?(\s*)>$/;
 function parseRawTag(raw, startLine, startCol, startOffset, offsetOffset = 0, offsetLine = 0, offsetColumn = 0) {
+    var _a, _b;
     let offset = startOffset + offsetOffset;
     let line = startLine + offsetLine;
     let col = startCol + (startLine === 1 ? offsetColumn : 0);
     const matches = raw.match(const_1.reTag);
-    if (!matches) {
+    const tagWithAttrs = matches === null || matches === void 0 ? void 0 : matches[1];
+    if (!tagWithAttrs) {
         throw new SyntaxError(`Invalid tag syntax: "${raw}"`);
     }
-    const tagWithAttrs = matches[1];
     // eslint-disable-next-line no-control-regex
     const tagNameSplitted = tagWithAttrs.split(/[\u0000\u0009\u000A\u000C\u0020/>]/);
     const tagName = tagNameSplitted[0] || tagNameSplitted[1];
@@ -41,11 +42,11 @@ function parseRawTag(raw, startLine, startCol, startOffset, offsetOffset = 0, of
         }
     }
     const endTokens = reEndTokens.exec(raw);
-    const selfClosingSolidus = (0, parser_utils_1.tokenizer)(endTokens && endTokens[1], line, col, offset);
+    const selfClosingSolidus = (0, parser_utils_1.tokenizer)((_a = endTokens === null || endTokens === void 0 ? void 0 : endTokens[1]) !== null && _a !== void 0 ? _a : '', line, col, offset);
     line = selfClosingSolidus.endLine;
     col = selfClosingSolidus.endCol;
     offset = selfClosingSolidus.endOffset;
-    const endSpace = (0, parser_utils_1.tokenizer)(endTokens && endTokens[2], line, col, offset);
+    const endSpace = (0, parser_utils_1.tokenizer)((_b = endTokens === null || endTokens === void 0 ? void 0 : endTokens[2]) !== null && _b !== void 0 ? _b : '', line, col, offset);
     return {
         tagName,
         attrs,

package/lib/tag-splitter.d.ts

@@ -1,7 +1,7 @@
 export interface N {
-    type: 'text' | 'starttag' | 'endtag' | 'comment' | 'boguscomment';
-    raw: string;
-    line: number;
-    col: number;
+	type: 'text' | 'starttag' | 'endtag' | 'comment' | 'boguscomment';
+	raw: string;
+	line: number;
+	col: number;
 }
 export default function tagSplitter(raw: string, line: number, col: number): N[];

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@markuplint/html-parser",
-	"version": "3.3.0",
+	"version": "3.4.0",
 	"description": "HTML parser for markuplint",
 	"repository": "git@github.com:markuplint/markuplint.git",
 	"author": "Yusuke Hirao <yusukehirao@me.com>",
@@ -21,9 +21,9 @@
 	},
 	"dependencies": {
 		"@markuplint/ml-ast": "3.0.0",
-		"@markuplint/parser-utils": "3.3.0",
+		"@markuplint/parser-utils": "3.4.0",
 		"parse5": "7.1.2",
 		"tslib": "^2.4.1"
 	},
-	"gitHead": "791fb22a4df7acb985ced3808923fba0cd95c28a"
+	"gitHead": "a83e0f5f214a9bbcc0286b9e269074ddca6189e7"
 }