@mavogel/cdk-vscode-server 0.0.64 → 0.0.66

package/node_modules/node-html-parser/dist/nodes/html.d.ts

@@ -43,8 +43,8 @@ export default class HTMLElement extends Node {
     private _attrs;
     private _rawAttrs;
     private _parseOptions;
+    private _id;
     rawTagName: string;
-    id: string;
     classList: DOMTokenList;
     /**
      * Node Type declaration.
@@ -79,6 +79,8 @@ export default class HTMLElement extends Node {
     set tagName(newname: string);
     get localName(): string;
     get isVoidElement(): boolean;
+    get id(): string;
+    set id(newid: string);
     /**
      * Get escpaed (as-it) text value of current node and its children.
      * @return {string} text content
@@ -130,6 +132,12 @@ export default class HTMLElement extends Node {
      * @return {(HTMLElement|null)}    matching node
      */
     querySelector(selector: string): HTMLElement | null;
+    /**
+     * Tests whether the node matches a given CSS selector.
+     * @param  {string}   selector Simplified CSS selector
+     * @return {boolean}
+     */
+    matches(selector: string): boolean;
     /**
      * find elements by their tagName
      * @param {string} tagName the tagName of the elements to select
@@ -231,6 +239,10 @@ export interface Options {
      */
     fixNestedATags?: boolean;
     parseNoneClosedTags?: boolean;
+    /**
+     * When true, preserves invalid HTML nesting (e.g., <p><p>bar</p></p>) instead of auto-closing tags
+     */
+    preserveTagNesting?: boolean;
     blockTextElements: {
         [tag: string]: boolean;
     };
@@ -244,6 +256,7 @@ export interface Options {
          */
         closingSlash?: boolean;
     };
+    closeAllByClosing?: boolean;
 }
 /**
  * Parses HTML and returns a root element

package/node_modules/node-html-parser/dist/nodes/html.js

@@ -126,7 +126,7 @@ class HTMLElement extends node_1.default {
         this.nodeType = type_1.default.ELEMENT_NODE;
         this.rawTagName = tagName;
         this.rawAttrs = rawAttrs || '';
-        this.id = keyAttrs.id || '';
+        this._id = keyAttrs.id || '';
         this.childNodes = [];
         this._parseOptions = _parseOptions;
         this.classList = new DOMTokenList(keyAttrs.class ? keyAttrs.class.split(/\s+/) : [], (classList) => this.setAttribute('class', classList.toString()) // eslint-disable-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call
@@ -185,6 +185,12 @@ class HTMLElement extends node_1.default {
     get isVoidElement() {
         return this.voidTag.isVoidElement(this.localName);
     }
+    get id() {
+        return this._id;
+    }
+    set id(newid) {
+        this.setAttribute('id', newid);
+    }
     /**
      * Get escpaed (as-it) text value of current node and its children.
      * @return {string} text content
@@ -350,7 +356,7 @@ class HTMLElement extends node_1.default {
             res.push('  '.repeat(indention) + str);
         }
         function dfs(node) {
-            const idStr = node.id ? `#${node.id}` : '';
+            const idStr = node._id ? `#${node._id}` : '';
             const classStr = node.classList.length ? `.${node.classList.value.join('.')}` : ''; // eslint-disable-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-member-access, @typescript-eslint/restrict-template-expressions, @typescript-eslint/no-unsafe-call
             write(`${node.rawTagName}${idStr}${classStr}`);
             indention++;
@@ -421,6 +427,17 @@ class HTMLElement extends node_1.default {
             adapter: matcher_1.default,
         });
     }
+    /**
+     * Tests whether the node matches a given CSS selector.
+     * @param  {string}   selector Simplified CSS selector
+     * @return {boolean}
+     */
+    matches(selector) {
+        return (0, css_select_1.is)(this, selector, {
+            xmlMode: true,
+            adapter: matcher_1.default,
+        });
+    }
     /**
      * find elements by their tagName
      * @param {string} tagName the tagName of the elements to select
@@ -483,7 +500,7 @@ class HTMLElement extends node_1.default {
                 continue;
             }
             if (child.nodeType === type_1.default.ELEMENT_NODE) {
-                if (child.id === id) {
+                if (child._id === id) {
                     return child;
                 }
                 // if children are existing push the current status to the stack and keep searching for elements in the level below
@@ -623,9 +640,9 @@ class HTMLElement extends node_1.default {
             return `${name}=${val}`;
         })
             .join(' ');
-        // Update this.id
+        // Update this._id
         if (key === 'id') {
-            this.id = '';
+            this._id = '';
         }
         return this;
     }
@@ -670,9 +687,9 @@ class HTMLElement extends node_1.default {
             return `${name}=${val}`;
         })
             .join(' ');
-        // Update this.id
+        // Update this._id
         if (key === 'id') {
-            this.id = value;
+            this._id = value;
         }
         return this;
     }
@@ -698,6 +715,10 @@ class HTMLElement extends node_1.default {
             return `${name}=${this.quoteAttribute(String(val))}`;
         })
             .join(' ');
+        // Update this._id
+        if ('id' in attributes) {
+            this._id = attributes['id'];
+        }
         return this;
     }
     insertAdjacentHTML(where, html) {
@@ -905,6 +926,9 @@ const kElementsClosedByClosing = {
     th: { tr: true, table: true, TR: true, TABLE: true },
     TH: { tr: true, table: true, TR: true, TABLE: true },
 };
+const kElementsClosedByClosingExcept = {
+    p: { a: true, audio: true, del: true, ins: true, map: true, noscript: true, video: true },
+};
 const frameflag = 'documentfragmentcontainer';
 /**
  * Parses HTML and returns a root element
@@ -984,7 +1008,7 @@ function base_parse(data, options = {}) {
                 attrs[key.toLowerCase()] = isQuoted ? val.slice(1, val.length - 1) : val;
             }
             const parentTagName = currentParent.rawTagName;
-            if (!closingSlash && kElementsClosedByOpening[parentTagName]) {
+            if (!closingSlash && !options.preserveTagNesting && kElementsClosedByOpening[parentTagName]) {
                 if (kElementsClosedByOpening[parentTagName][tagName]) {
                     stack.pop();
                     currentParent = (0, back_1.default)(stack);
@@ -1049,6 +1073,42 @@ function base_parse(data, options = {}) {
                             continue;
                         }
                     }
+                    const openTag = currentParent.rawTagName ?
+                        currentParent.rawTagName.toLowerCase() :
+                        '';
+                    if (kElementsClosedByClosingExcept[openTag]) {
+                        const closingTag = tagName.toLowerCase();
+                        if (stack.length > 1) {
+                            const possibleContainer = stack[stack.length - 2];
+                            if (possibleContainer &&
+                                possibleContainer.rawTagName &&
+                                possibleContainer.rawTagName.toLowerCase() === closingTag &&
+                                !kElementsClosedByClosingExcept[openTag][closingTag]) {
+                                // Update range end for closed tag
+                                currentParent.range[1] = createRange(-1, Math.max(lastTextPos, tagEndPos))[1];
+                                stack.pop();
+                                currentParent = (0, back_1.default)(stack);
+                                continue;
+                            }
+                        }
+                    }
+                    if (options.closeAllByClosing === true) {
+                        // If tag was opened, close all nested tags
+                        let i;
+                        for (i = stack.length - 2; i >= 0; i--) {
+                            if (stack[i].rawTagName === tagName)
+                                break;
+                        }
+                        if (i >= 0) {
+                            while (stack.length > i) {
+                                // Update range end for closed tag
+                                currentParent.range[1] = createRange(-1, Math.max(lastTextPos, tagEndPos))[1];
+                                stack.pop();
+                                currentParent = (0, back_1.default)(stack);
+                            }
+                            continue;
+                        }
+                    }
                     // Use aggressive strategy to handle unmatching markups.
                     break;
                 }

package/node_modules/node-html-parser/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "node-html-parser",
-	"version": "7.0.1",
+	"version": "7.1.0",
 	"description": "A very fast HTML parser, generating a simplified DOM, with basic element query support.",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",
@@ -87,7 +87,8 @@
 		"standard-version": "^9.5.0",
 		"travis-cov": "latest",
 		"ts-node": "^10.9.1",
-		"typescript": "latest"
+		"typescript": "latest",
+		"yarn": "^1.22.22"
 	},
 	"config": {
 		"blanket": {

package/package.json

@@ -112,7 +112,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.0.64",
+  "version": "0.0.66",
   "jest": {
     "coverageProvider": "v8",
     "testMatch": [
@@ -165,7 +165,7 @@
     "targets": {
       "python": {
         "distName": "cdk-vscode-server",
-        "module": "cdk-vscode-server"
+        "module": "cdk_vscode_server"
       }
     },
     "tsc": {