@digipair/skill-html 0.60.4 → 0.60.7

package/index.cjs.js

@@ -23923,14 +23923,14 @@ function indent(str, spaces) {
         var match = parseIdentifier(input, i1, namePart) || namePart && parseAdditionalSymbol(input, i1) || maybeSpace && parseSpaces(input, i1);
         // match is required
         if (!match) {
-            return i = i1, nextMatch = nextMatch1, tokens = tokens1, {
+            return tokens = tokens1, nextMatch = nextMatch1, i = i1, {
                 v: nextMatch1
             };
         }
         var token = match.token, offset = match.offset;
         i1 += offset;
         if (token === " ") {
-            return i = i1, nextMatch = nextMatch1, tokens = tokens1, "continue";
+            return tokens = tokens1, nextMatch = nextMatch1, i = i1, "continue";
         }
         tokens1 = _to_consumable_array$1(tokens1).concat([
             token
@@ -23949,7 +23949,7 @@ function indent(str, spaces) {
         if (contextKeys.some(function(el) {
             return el.startsWith(name);
         })) {
-            return i = i1, nextMatch = nextMatch1, tokens = tokens1, "continue";
+            return tokens = tokens1, nextMatch = nextMatch1, i = i1, "continue";
         }
         if (dateTimeIdentifiers.some(function(el) {
             return el === name;
@@ -23968,9 +23968,9 @@ function indent(str, spaces) {
         if (dateTimeIdentifiers.some(function(el) {
             return el.startsWith(name);
         })) {
-            return i = i1, nextMatch = nextMatch1, tokens = tokens1, "continue";
+            return tokens = tokens1, nextMatch = nextMatch1, i = i1, "continue";
         }
-        return i = i1, nextMatch = nextMatch1, tokens = tokens1, {
+        return tokens = tokens1, nextMatch = nextMatch1, i = i1, {
             v: nextMatch1
         };
     };
@@ -28038,42 +28038,42 @@ let HtmlService = class HtmlService {
     }
     async parseHtml(params, _pinsSettingsList, context) {
         const { html, execute = [] } = params;
+        const dom = new jsdom.JSDOM(html);
         const result = await executePinsList(execute, {
             context,
-            document: html
+            document: {
+                querySelector: (selector)=>this.querySelector(selector, dom.window.document),
+                querySelectorAll: (selector)=>this.querySelectorAll(selector, dom.window.document)
+            }
         });
         return result;
     }
-    async selector(params, _pinsSettingsList, context) {
-        const { selector, html = context.document } = params;
-        const dom = new jsdom.JSDOM(html);
-        const element = dom.window.document.querySelector(selector);
-        return element;
-    }
-    async selectorAll(params, _pinsSettingsList, context) {
-        const { selector, html = context.document } = params;
-        const dom = new jsdom.JSDOM(html);
-        const element = dom.window.document.querySelectorAll(selector);
-        return element;
+    querySelector(selector, parent) {
+        const element = parent == null ? void 0 : parent.querySelector(selector);
+        return element ? {
+            textContent: element.textContent,
+            querySelector: (selector)=>this.querySelector(selector, element),
+            querySelectorAll: (selector)=>this.querySelectorAll(selector, element),
+            getAttribute: (name)=>this.getAttribute(name, element)
+        } : undefined;
+    }
+    querySelectorAll(selector, parent) {
+        const elements = Array.from((parent == null ? void 0 : parent.querySelectorAll(selector)) || []);
+        return elements.map((element)=>({
+                textContent: element.textContent,
+                querySelector: (selector)=>this.querySelector(selector, element),
+                querySelectorAll: (selector)=>this.querySelectorAll(selector, element),
+                getAttribute: (name)=>this.getAttribute(name, element)
+            }));
     }
-    getAttribute(params, _pinsSettingsList, context) {
-        const { selector, attribute, html = context.document } = params;
-        const dom = new jsdom.JSDOM(html);
-        const element = dom.window.document.querySelectorAll(selector);
-        const result = element.getAttribute(attribute);
-        return result;
+    getAttribute(name, element) {
+        return element == null ? void 0 : element.getAttribute(name);
     }
 };
 const html2pins = (params, pinsSettingsList, context)=>new HtmlService().html2pins(params, pinsSettingsList, context);
 const pins2html = (params, pinsSettingsList, context)=>new HtmlService().pins2html(params, pinsSettingsList, context);
 const parseHtml = (params, pinsSettingsList, context)=>new HtmlService().parseHtml(params, pinsSettingsList, context);
-const selector = (params, pinsSettingsList, context)=>new HtmlService().selector(params, pinsSettingsList, context);
-const selectorAll = (params, pinsSettingsList, context)=>new HtmlService().selectorAll(params, pinsSettingsList, context);
-const getAttribute = (params, pinsSettingsList, context)=>new HtmlService().getAttribute(params, pinsSettingsList, context);
 
-exports.getAttribute = getAttribute;
 exports.html2pins = html2pins;
 exports.parseHtml = parseHtml;
 exports.pins2html = pins2html;
-exports.selector = selector;
-exports.selectorAll = selectorAll;

package/index.esm.js

@@ -23901,14 +23901,14 @@ function indent(str, spaces) {
         var match = parseIdentifier(input, i1, namePart) || namePart && parseAdditionalSymbol(input, i1) || maybeSpace && parseSpaces(input, i1);
         // match is required
         if (!match) {
-            return nextMatch = nextMatch1, tokens = tokens1, i = i1, {
+            return i = i1, nextMatch = nextMatch1, tokens = tokens1, {
                 v: nextMatch1
             };
         }
         var token = match.token, offset = match.offset;
         i1 += offset;
         if (token === " ") {
-            return nextMatch = nextMatch1, tokens = tokens1, i = i1, "continue";
+            return i = i1, nextMatch = nextMatch1, tokens = tokens1, "continue";
         }
         tokens1 = _to_consumable_array$1(tokens1).concat([
             token
@@ -23927,7 +23927,7 @@ function indent(str, spaces) {
         if (contextKeys.some(function(el) {
             return el.startsWith(name);
         })) {
-            return nextMatch = nextMatch1, tokens = tokens1, i = i1, "continue";
+            return i = i1, nextMatch = nextMatch1, tokens = tokens1, "continue";
         }
         if (dateTimeIdentifiers.some(function(el) {
             return el === name;
@@ -23946,9 +23946,9 @@ function indent(str, spaces) {
         if (dateTimeIdentifiers.some(function(el) {
             return el.startsWith(name);
         })) {
-            return nextMatch = nextMatch1, tokens = tokens1, i = i1, "continue";
+            return i = i1, nextMatch = nextMatch1, tokens = tokens1, "continue";
         }
-        return nextMatch = nextMatch1, tokens = tokens1, i = i1, {
+        return i = i1, nextMatch = nextMatch1, tokens = tokens1, {
             v: nextMatch1
         };
     };
@@ -28016,37 +28016,40 @@ let HtmlService = class HtmlService {
     }
     async parseHtml(params, _pinsSettingsList, context) {
         const { html, execute = [] } = params;
+        const dom = new JSDOM(html);
         const result = await executePinsList(execute, {
             context,
-            document: html
+            document: {
+                querySelector: (selector)=>this.querySelector(selector, dom.window.document),
+                querySelectorAll: (selector)=>this.querySelectorAll(selector, dom.window.document)
+            }
         });
         return result;
     }
-    async selector(params, _pinsSettingsList, context) {
-        const { selector, html = context.document } = params;
-        const dom = new JSDOM(html);
-        const element = dom.window.document.querySelector(selector);
-        return element;
-    }
-    async selectorAll(params, _pinsSettingsList, context) {
-        const { selector, html = context.document } = params;
-        const dom = new JSDOM(html);
-        const element = dom.window.document.querySelectorAll(selector);
-        return element;
+    querySelector(selector, parent) {
+        const element = parent == null ? void 0 : parent.querySelector(selector);
+        return element ? {
+            textContent: element.textContent,
+            querySelector: (selector)=>this.querySelector(selector, element),
+            querySelectorAll: (selector)=>this.querySelectorAll(selector, element),
+            getAttribute: (name)=>this.getAttribute(name, element)
+        } : undefined;
+    }
+    querySelectorAll(selector, parent) {
+        const elements = Array.from((parent == null ? void 0 : parent.querySelectorAll(selector)) || []);
+        return elements.map((element)=>({
+                textContent: element.textContent,
+                querySelector: (selector)=>this.querySelector(selector, element),
+                querySelectorAll: (selector)=>this.querySelectorAll(selector, element),
+                getAttribute: (name)=>this.getAttribute(name, element)
+            }));
     }
-    getAttribute(params, _pinsSettingsList, context) {
-        const { selector, attribute, html = context.document } = params;
-        const dom = new JSDOM(html);
-        const element = dom.window.document.querySelectorAll(selector);
-        const result = element.getAttribute(attribute);
-        return result;
+    getAttribute(name, element) {
+        return element == null ? void 0 : element.getAttribute(name);
     }
 };
 const html2pins = (params, pinsSettingsList, context)=>new HtmlService().html2pins(params, pinsSettingsList, context);
 const pins2html = (params, pinsSettingsList, context)=>new HtmlService().pins2html(params, pinsSettingsList, context);
 const parseHtml = (params, pinsSettingsList, context)=>new HtmlService().parseHtml(params, pinsSettingsList, context);
-const selector = (params, pinsSettingsList, context)=>new HtmlService().selector(params, pinsSettingsList, context);
-const selectorAll = (params, pinsSettingsList, context)=>new HtmlService().selectorAll(params, pinsSettingsList, context);
-const getAttribute = (params, pinsSettingsList, context)=>new HtmlService().getAttribute(params, pinsSettingsList, context);
 
-export { getAttribute, html2pins, parseHtml, pins2html, selector, selectorAll };
+export { html2pins, parseHtml, pins2html };

package/libs/skill-html/src/lib/skill-html.d.ts

@@ -2,6 +2,3 @@ import { PinsSettings } from '../../../engine/src';
 export declare const html2pins: (params: any, pinsSettingsList: PinsSettings[], context: any) => Promise<any>;
 export declare const pins2html: (params: any, pinsSettingsList: PinsSettings[], context: any) => Promise<any>;
 export declare const parseHtml: (params: any, pinsSettingsList: PinsSettings[], context: any) => Promise<any>;
-export declare const selector: (params: any, pinsSettingsList: PinsSettings[], context: any) => Promise<any>;
-export declare const selectorAll: (params: any, pinsSettingsList: PinsSettings[], context: any) => Promise<any>;
-export declare const getAttribute: (params: any, pinsSettingsList: PinsSettings[], context: any) => any;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@digipair/skill-html",
-  "version": "0.60.4",
+  "version": "0.60.7",
   "dependencies": {
     "jsdom": "^25.0.1"
   },

package/schema.fr.json

@@ -82,96 +82,6 @@
         ],
         "x-events": []
       }
-    },
-    "/selector": {
-      "post": {
-        "tags": ["service"],
-        "summary": "Sélectionner un élément",
-        "parameters": [
-          {
-            "name": "selector",
-            "summary": "Sélecteur",
-            "required": true,
-            "description": "Sélecteur CSS",
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "name": "html",
-            "summary": "HTML",
-            "required": false,
-            "description": "Code HTML",
-            "schema": {
-              "type": "string"
-            }
-          }
-        ],
-        "x-events": []
-      }
-    },
-    "/selectorAll": {
-      "post": {
-        "tags": ["service"],
-        "summary": "Sélectionner des éléments",
-        "parameters": [
-          {
-            "name": "selector",
-            "summary": "Sélecteur",
-            "required": true,
-            "description": "Sélecteur CSS",
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "name": "html",
-            "summary": "HTML",
-            "required": false,
-            "description": "Code HTML",
-            "schema": {
-              "type": "string"
-            }
-          }
-        ],
-        "x-events": []
-      }
-    },
-    "/getAttribute": {
-      "post": {
-        "tags": ["service"],
-        "summary": "Récupérer un attribut",
-        "parameters": [
-          {
-            "name": "selector",
-            "summary": "Sélecteur",
-            "required": true,
-            "description": "Sélecteur CSS",
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "name": "attribute",
-            "summary": "Attribut",
-            "required": true,
-            "description": "Nom de l'attribut",
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "name": "html",
-            "summary": "HTML",
-            "required": false,
-            "description": "Code HTML",
-            "schema": {
-              "type": "string"
-            }
-          }
-        ],
-        "x-events": []
-      }
     }
   },
   "components": {

package/schema.json

@@ -82,87 +82,6 @@
         ],
         "x-events": []
       }
-    },
-    "/selector": {
-      "post": {
-        "tags": ["service"],
-        "summary": "Select an Element",
-        "parameters": [
-          {
-            "name": "selector",
-            "summary": "Selector",
-            "required": true,
-            "description": "CSS Selector",
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "name": "element",
-            "summary": "Element",
-            "required": false,
-            "description": "Parent Element",
-            "schema": {
-              "type": "object"
-            }
-          }
-        ],
-        "x-events": []
-      }
-    },
-    "/selectorAll": {
-      "post": {
-        "tags": ["service"],
-        "summary": "Select Elements",
-        "parameters": [
-          {
-            "name": "selector",
-            "summary": "Selector",
-            "required": true,
-            "description": "CSS Selector",
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "name": "element",
-            "summary": "Element",
-            "required": false,
-            "description": "Parent Element",
-            "schema": {
-              "type": "object"
-            }
-          }
-        ],
-        "x-events": []
-      }
-    },
-    "/getAttribute": {
-      "post": {
-        "tags": ["service"],
-        "summary": "Retrieve an Attribute",
-        "parameters": [
-          {
-            "name": "element",
-            "summary": "Element",
-            "required": true,
-            "description": "Element",
-            "schema": {
-              "type": "object"
-            }
-          },
-          {
-            "name": "attribute",
-            "summary": "Attribute",
-            "required": true,
-            "description": "Attribute Name",
-            "schema": {
-              "type": "string"
-            }
-          }
-        ],
-        "x-events": []
-      }
     }
   },
   "components": {