Merge pull request #77 from posthtml/milestone-0.9.1

Milestone 0.9.1

Author: Scrum

changelog.md

@@ -1,5 +1,22 @@
+## <small>0.9.1 (2021-07-26)</small>
+
+* test: dom nest parsing issues #76 ([fdfe82e](https://github.com/posthtml/posthtml-parser/commit/fdfe82e)), closes [#76](https://github.com/posthtml/posthtml-parser/issues/76)
+* test: remove only ([78b7fc7](https://github.com/posthtml/posthtml-parser/commit/78b7fc7))
+* style: after prettier ([ccbfd69](https://github.com/posthtml/posthtml-parser/commit/ccbfd69))
+* style: after prettier ([72f2092](https://github.com/posthtml/posthtml-parser/commit/72f2092))
+* build: set object-curly-spacing always ([47dceb6](https://github.com/posthtml/posthtml-parser/commit/47dceb6))
+* build(deps): bump handlebars from 4.7.6 to 4.7.7 ([e6bc6cd](https://github.com/posthtml/posthtml-parser/commit/e6bc6cd))
+* build(deps): bump hosted-git-info from 2.8.8 to 2.8.9 ([2137591](https://github.com/posthtml/posthtml-parser/commit/2137591))
+* build(deps): bump lodash from 4.17.20 to 4.17.21 ([e9b8d04](https://github.com/posthtml/posthtml-parser/commit/e9b8d04))
+* build(deps): bump normalize-url from 4.5.0 to 4.5.1 ([9e0d1f9](https://github.com/posthtml/posthtml-parser/commit/9e0d1f9))
+* perf: type for replace ([94ebb8d](https://github.com/posthtml/posthtml-parser/commit/94ebb8d))
+* Update readme.md ([7081062](https://github.com/posthtml/posthtml-parser/commit/7081062))
+
+
+
 ## 0.9.0 (2021-05-11)
 
+* 0.9.0 ([d725e83](https://github.com/posthtml/posthtml-parser/commit/d725e83))
 * Add description to docs ([d61007b](https://github.com/posthtml/posthtml-parser/commit/d61007b))
 * Move location tracker to a separate file and refactor into class ([7d6f76b](https://github.com/posthtml/posthtml-parser/commit/7d6f76b))
 * feat: add optional support for source locations ([6faf50d](https://github.com/posthtml/posthtml-parser/commit/6faf50d))

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "posthtml-parser",
-  "version": "0.9.0",
+  "version": "0.9.1",
   "description": "Parse HTML/XML to PostHTMLTree",
   "license": "MIT",
   "repository": "posthtml/posthtml-parser",

package.json

@@ -1,6 +1,6 @@
-import {Parser, ParserOptions} from 'htmlparser2';
-import {Directive, Node, NodeTag, Options, Attributes} from '../types/index.d';
-import {LocationTracker} from './location-tracker';
+import { Parser, ParserOptions } from 'htmlparser2';
+import { Directive, Node, NodeTag, Options, Attributes } from '../types/index.d';
+import { LocationTracker } from './location-tracker';
 
 const defaultOptions: ParserOptions = {
   lowerCaseTags: false,
@@ -44,7 +44,7 @@ const parser = (html: string, options: Options = {}): Node[] => {
     Object.keys(attrs).forEach((key: string) => {
       const object: Attributes = {};
 
-      object[key] = attrs[key].replace(/"/g, '"');
+      object[key] = String(attrs[key]).replace(/"/g, '"');
       Object.assign(result, object);
     });
 
@@ -95,7 +95,7 @@ const parser = (html: string, options: Options = {}): Node[] => {
 
   function onopentag(tag: string, attrs: Attributes) {
     const start = locationTracker.getPosition(parser.startIndex);
-    const buf: NodeTag = {tag};
+    const buf: NodeTag = { tag };
 
     if (options.sourceLocations) {
       buf.location = {
@@ -167,7 +167,7 @@ const parser = (html: string, options: Options = {}): Node[] => {
     onopentag,
     onclosetag,
     ontext
-  }, {...defaultOptions, ...options});
+  }, { ...defaultOptions, ...options });
 
   parser.write(html);
   parser.end();

src/index.ts

@@ -1,4 +1,4 @@
-import {Position} from '../types/index.d';
+import { Position } from '../types/index.d';
 
 export class LocationTracker {
   private readonly source: string;

src/location-tracker.ts

@@ -14,8 +14,8 @@ test('should be parse comment', t => {
 });
 
 test('should be parse CDATA', t => {
-  const tree = parser('<script><![CDATA[console.log(1);]]></script>', {xmlMode: true});
-  const expected = [{tag: 'script', content: ['console.log(1);']}];
+  const tree = parser('<script><![CDATA[console.log(1);]]></script>', { xmlMode: true });
+  const expected = [{ tag: 'script', content: ['console.log(1);'] }];
   t.deepEqual(tree, expected);
 });
 
@@ -52,7 +52,7 @@ test.skip('should be parse tag with object in attribute data witchout escape', t
 });
 
 test.skip('should be parse tag with object in attribute data escape', t => {
-  const json = JSON.stringify({button: {checkedView: 'extra'}});
+  const json = JSON.stringify({ button: { checkedView: 'extra' } });
   const html = '<button data-bem="' + json + '"' +
     ' type="submit"></button>';
   const tree = parser(html);
@@ -70,25 +70,25 @@ test.skip('should be parse tag with object in attribute data escape', t => {
 
 test('should be parse isolated comment', t => {
   const tree = parser('<div><!--comment--></div>');
-  const expected = [{tag: 'div', content: ['<!--comment-->']}];
+  const expected = [{ tag: 'div', content: ['<!--comment-->'] }];
   t.deepEqual(tree, expected);
 });
 
 test('should be parse comment before text content', t => {
   const tree = parser('<div><!--comment-->Text after comment</div>');
-  const expected = [{tag: 'div', content: ['<!--comment-->', 'Text after comment']}];
+  const expected = [{ tag: 'div', content: ['<!--comment-->', 'Text after comment'] }];
   t.deepEqual(tree, expected);
 });
 
 test('should be parse comment after text content', t => {
   const tree = parser('<div>Text before comment.<!--comment--></div>');
-  const expected = [{tag: 'div', content: ['Text before comment.', '<!--comment-->']}];
+  const expected = [{ tag: 'div', content: ['Text before comment.', '<!--comment-->'] }];
   t.deepEqual(tree, expected);
 });
 
 test('should be parse comment in the middle of text content', t => {
   const tree = parser('<div>Text surrounding <!--comment--> a comment.</div>');
-  const expected = [{tag: 'div', content: ['Text surrounding ', '<!--comment-->', ' a comment.']}];
+  const expected = [{ tag: 'div', content: ['Text surrounding ', '<!--comment-->', ' a comment.'] }];
   t.deepEqual(tree, expected);
 });
 
@@ -101,7 +101,7 @@ test('should be parse doctype', t => {
 test('should be parse directive', t => {
   const options = {
     directives: [
-      {name: '?php', start: '<', end: '>'}
+      { name: '?php', start: '<', end: '>' }
     ]
   };
   const tree = parser('<?php echo "Hello word"; ?>', options);
@@ -112,7 +112,7 @@ test('should be parse directive', t => {
 test('should be parse regular expression directive', t => {
   const options = {
     directives: [
-      {name: /\?(php|=).*/, start: '<', end: '>'}
+      { name: /\?(php|=).*/, start: '<', end: '>' }
     ]
   };
   const tree1 = parser('<?php echo "Hello word"; ?>', options);
@@ -127,8 +127,8 @@ test('should be parse regular expression directive', t => {
 test('should be parse directives and tag', t => {
   const options = {
     directives: [
-      {name: '!doctype', start: '<', end: '>'},
-      {name: '?php', start: '<', end: '>'}
+      { name: '!doctype', start: '<', end: '>' },
+      { name: '?php', start: '<', end: '>' }
     ]
   };
   const html = '<!doctype html><header><?php echo "Hello word"; ?></header><body>{{%njk test %}}</body>';
@@ -149,20 +149,20 @@ test('should be parse directives and tag', t => {
 
 test('should be parse tag', t => {
   const tree = parser('<html></html>');
-  const expected = [{tag: 'html'}];
+  const expected = [{ tag: 'html' }];
   t.deepEqual(tree, expected);
 });
 
 test('should be parse doctype and tag', t => {
   const tree = parser('<!doctype html><html></html>');
-  const expected = ['<!doctype html>', {tag: 'html'}];
+  const expected = ['<!doctype html>', { tag: 'html' }];
   t.deepEqual(tree, expected);
 });
 
 test('should be parse tag attrs', t => {
   const tree = parser('<div id="id" class="class"></div>');
   const expected = [{
-    tag: 'div', attrs: {id: 'id', class: 'class'}
+    tag: 'div', attrs: { id: 'id', class: 'class' }
   }];
   t.deepEqual(tree, expected);
 });
@@ -175,30 +175,30 @@ test('should be parse text', t => {
 
 test('should be parse text in content', t => {
   const tree = parser('<div>Text</div>');
-  const expected = [{tag: 'div', content: ['Text']}];
+  const expected = [{ tag: 'div', content: ['Text'] }];
   t.deepEqual(tree, expected);
 });
 
 test('should be parse not a single node in tree', t => {
   const tree = parser('<span>Text1</span><span>Text2</span>Text3');
   const expected = [
-    {tag: 'span', content: ['Text1']}, {tag: 'span', content: ['Text2']}, 'Text3'
+    { tag: 'span', content: ['Text1'] }, { tag: 'span', content: ['Text2'] }, 'Text3'
   ];
   t.deepEqual(tree, expected);
 });
 
 test('should be parse not a single node in parent content', t => {
   const tree = parser('<div><span>Text1</span><span>Text2</span>Text3</div>');
   const expected = [
-    {tag: 'div', content: [{tag: 'span', content: ['Text1']}, {tag: 'span', content: ['Text2']}, 'Text3']}
+    { tag: 'div', content: [{ tag: 'span', content: ['Text1'] }, { tag: 'span', content: ['Text2'] }, 'Text3'] }
   ];
   t.deepEqual(tree, expected);
 });
 
 test('should be parse camelCase tag name', t => {
   const tree = parser('<mySuperTag></mySuperTag>');
   const expected = [
-    {tag: 'mySuperTag'}
+    { tag: 'mySuperTag' }
   ];
   t.deepEqual(tree, expected);
 });
@@ -207,7 +207,7 @@ test('should be parse simple contents are split with "<" in comment', t => {
   const html = '<a> /* width < 800px */ <hr /> test</a>';
   const tree = parser(html);
   const expected = [
-    {tag: 'a', content: [' /* width < 800px */ ', {tag: 'hr'}, ' test']}
+    { tag: 'a', content: [' /* width < 800px */ ', { tag: 'hr' }, ' test'] }
   ];
   t.deepEqual(tree, expected);
 });
@@ -216,7 +216,7 @@ test('should be parse style contents are split with "<" in comment', t => {
   const html = '<style> /* width < 800px */ @media (max-width: 800px) { /* selectors */} </style>';
   const tree = parser(html);
   const expected = [
-    {tag: 'style', content: [' /* width < 800px */ @media (max-width: 800px) { /* selectors */} ']}
+    { tag: 'style', content: [' /* width < 800px */ @media (max-width: 800px) { /* selectors */} '] }
   ];
   t.deepEqual(tree, expected);
 });
@@ -229,7 +229,8 @@ test('should be parse script contents are split with "<" in comment', t => {
       tag: 'script',
       content: [
         ' var str = \'hey <form\'; if (!str.match(new RegExp(\'<(form|iframe)\', \'g\'))) { /* ... */ }'
-      ]}
+      ]
+    }
   ];
   t.deepEqual(tree, expected);
 });
@@ -243,7 +244,7 @@ test('should be not converting html entity name', t => {
 
 test('should parse with source locations', t => {
   const html = '<h1>Test</h1>\n<p><b>Foo</b></p>';
-  const tree = parser(html, {sourceLocations: true});
+  const tree = parser(html, { sourceLocations: true });
   const expected = [
     {
       tag: 'h1',
@@ -292,3 +293,25 @@ test('should parse with source locations', t => {
   ];
   t.deepEqual(tree, expected);
 });
+
+test('should parse with input in button', t => {
+  const html = '<button >Hello <input type="file" ng-hide="true" />PostHtml</button>';
+  const tree = parser(html, { xmlMode: true });
+  const expected = [
+    {
+      tag: 'button',
+      content: [
+        'Hello ',
+        {
+          tag: 'input',
+          attrs: {
+            type: 'file',
+            'ng-hide': 'true'
+          }
+        },
+        'PostHtml'
+      ]
+    }
+  ];
+  t.deepEqual(tree, expected);
+});

test/test-core.spec.ts

@@ -1,4 +1,4 @@
-import {ParserOptions} from 'htmlparser2';
+import { ParserOptions } from 'htmlparser2';
 
 declare const parser: (html: string, options?: Options) => Node[];
 

types/index.d.ts

@@ -3,6 +3,7 @@ module.exports = {
   rules: {
     '@typescript-eslint/prefer-readonly-parameter-types': 'off',
     'ava/no-skip-test': 'off',
-    'ava/no-only-test': 'off'
+    'ava/no-only-test': 'off',
+    'object-curly-spacing': ['error', 'always']
   }
 };