@teaflask/assistant 0.7.0 → 0.8.0

package/dist/reader/render.js

@@ -55,10 +55,7 @@ function _renderNode(node, depth, lines) {
 function _renderSelectOptions(select, depth, lines) {
     const indent = _indentOf(depth);
     for (const option of Array.from(select.options)) {
-        const text = option.text
-            .replace(/\s+/g, " ")
-            .trim()
-            .substring(0, MAX_OPTION_TEXT_LENGTH);
+        const text = renderedOptionTextOf(option);
         let line = `${indent}- option "${_escapedText(text)}"`;
         if (option.selected) {
             line += " (selected)";
@@ -115,3 +112,9 @@ function _escapedText(text) {
 function _indentOf(depth) {
     return "  ".repeat(depth);
 }
+export function renderedOptionTextOf(option) {
+    return option.text
+        .replace(/\s+/g, " ")
+        .trim()
+        .substring(0, MAX_OPTION_TEXT_LENGTH);
+}

package/dist/reader/roles.js

@@ -1,3 +1,4 @@
+import { parentAcrossShadowBoundaryOf } from "./visibility.js";
 const IMPLICIT_ROLE_BY_TAG = {
     a: "link",
     button: "button",
@@ -131,7 +132,7 @@ export const ARIA_CHECKED_ROLES = new Set([
     "menuitemradio",
     "switch",
 ]);
-export const ARIA_DISABLED_ROLES = new Set([
+const ARIA_DISABLED_ROLES = new Set([
     "application",
     "button",
     "composite",
@@ -213,6 +214,32 @@ export function ariaBooleanOf(attribute) {
     }
     return attribute.toLowerCase() === "true";
 }
+export function theControlIsDisabled(element, role) {
+    if (!ARIA_DISABLED_ROLES.has(role)) {
+        return false;
+    }
+    if (_isNativelyDisabled(element)) {
+        return true;
+    }
+    for (let current = element; current !== null; current = parentAcrossShadowBoundaryOf(current)) {
+        if (ariaBooleanOf(current.getAttribute("aria-disabled")) === true) {
+            return true;
+        }
+    }
+    return false;
+}
+function _isNativelyDisabled(element) {
+    const tag = element.tagName.toLowerCase();
+    if (!["button", "input", "select", "textarea", "option", "optgroup"].includes(tag)) {
+        return false;
+    }
+    try {
+        return element.matches(":disabled");
+    }
+    catch {
+        return false;
+    }
+}
 function _implicitRoleOf(element) {
     const tag = element.tagName.toLowerCase();
     if (isContentEditableElement(element)) {

package/dist/reader/snapshot-node.js

@@ -1,8 +1,7 @@
 import { accessibleNameOf } from "./accessible-name.js";
 import { CONTENT_REF_ROLES, INTERACTIVE_REF_ROLES, interactivitySignalsOf, isScrollable, } from "./interactivity.js";
 import { textboxValueOf } from "./redaction.js";
-import { ariaBooleanOf, ariaLevelOf, ARIA_CHECKED_ROLES, ARIA_DISABLED_ROLES, ARIA_SELECTED_ROLES, roleOf, } from "./roles.js";
-import { parentAcrossShadowBoundaryOf } from "./visibility.js";
+import { ariaBooleanOf, ariaLevelOf, ARIA_CHECKED_ROLES, ARIA_SELECTED_ROLES, roleOf, theControlIsDisabled, } from "./roles.js";
 const MAX_NODE_NAME_LENGTH = 100;
 export function _snapshotNodeOf(element, context, refFor) {
     const { options, oracle, nameCache } = context;
@@ -35,7 +34,7 @@ export function _snapshotNodeOf(element, context, refFor) {
         checked: _checkedStateOf(element, roleLower),
         selected: _selectedStateOf(element, roleLower),
         focused: element.ownerDocument.activeElement === element,
-        disabled: _disabledStateOf(element, roleLower),
+        disabled: theControlIsDisabled(element, roleLower),
         offscreen: !hidden && oracle.isOffscreen(element),
         refId,
         hints,
@@ -63,32 +62,6 @@ function _selectedStateOf(element, role) {
     }
     return ariaBooleanOf(element.getAttribute("aria-selected")) === true;
 }
-function _disabledStateOf(element, role) {
-    if (!ARIA_DISABLED_ROLES.has(role)) {
-        return false;
-    }
-    if (_isNativelyDisabled(element)) {
-        return true;
-    }
-    for (let current = element; current !== null; current = parentAcrossShadowBoundaryOf(current)) {
-        if (ariaBooleanOf(current.getAttribute("aria-disabled")) === true) {
-            return true;
-        }
-    }
-    return false;
-}
-function _isNativelyDisabled(element) {
-    const tag = element.tagName.toLowerCase();
-    if (!["button", "input", "select", "textarea", "option", "optgroup"].includes(tag)) {
-        return false;
-    }
-    try {
-        return element.matches(":disabled");
-    }
-    catch {
-        return false;
-    }
-}
 export function _normalizedNodeName(name) {
     return name.replace(/\s+/g, " ").trim().substring(0, MAX_NODE_NAME_LENGTH);
 }

package/dist/reader/snapshot-root.js

@@ -34,17 +34,23 @@ export function _resolvedRootOf(options, elementByRef) {
     return { root: body, error: null };
 }
 function _rootUnlessCurated(root, options) {
-    for (let current = root; current !== null; current = parentAcrossShadowBoundaryOf(current)) {
-        if (_theSubtreeIsCurated(current, options.ignoreSelectors)) {
-            return {
-                root: null,
-                error: "That part of the page has opted out of page reads — " +
-                    "take a full read to see what is available.",
-            };
-        }
+    if (theElementSitsInACuratedSubtree(root, options.ignoreSelectors)) {
+        return {
+            root: null,
+            error: "That part of the page has opted out of page reads — " +
+                "take a full read to see what is available.",
+        };
     }
     return { root, error: null };
 }
+export function theElementSitsInACuratedSubtree(element, ignoreSelectors) {
+    for (let current = element; current !== null; current = parentAcrossShadowBoundaryOf(current)) {
+        if (_theSubtreeIsCurated(current, ignoreSelectors)) {
+            return true;
+        }
+    }
+    return false;
+}
 function _safeQuerySelector(selector) {
     try {
         const direct = document.querySelector(selector);

package/dist/reader/snapshot.js

@@ -18,6 +18,10 @@ const SKIP_TAGS = new Set([
 let _refCounter = 0;
 const _refBadgeByElement = new WeakMap();
 const _elementByRef = new Map();
+let _lastReadIgnoreSelectors = [];
+export function lastReadIgnoreSelectors() {
+    return _lastReadIgnoreSelectors;
+}
 export function snapshotTreeOf(options) {
     const context = {
         options,
@@ -30,6 +34,7 @@ export function snapshotTreeOf(options) {
     }
     const root = rooting.root;
     _elementByRef.clear();
+    _lastReadIgnoreSelectors = options.ignoreSelectors;
     const fragment = _fragmentNode();
     _traverse(root, 0, fragment, context);
     _mergeStringChildren(fragment);
@@ -52,7 +57,7 @@ export function resolvedElementOfRef(refId) {
         rootElement: null,
         refId,
         selector: null,
-        ignoreSelectors: [],
+        ignoreSelectors: _lastReadIgnoreSelectors,
     };
     const rooting = _resolvedRootOf(address, _elementByRef);
     if (rooting.error !== null) {

package/dist/transport/actions-adapter.js

@@ -27,19 +27,96 @@ export function actionIntentOf(wire) {
     if (wire.body !== null && wire.body !== undefined) {
         intent.body = wire.body;
     }
+    const graphql = _graphqlOf(wire);
+    if (graphql !== null) {
+        intent.graphql = graphql;
+    }
     return intent;
 }
+function _graphqlOf(wire) {
+    const descriptor = _recordOf(wire.graphql);
+    const body = _recordOf(wire.body);
+    if (descriptor === null || body === null) {
+        return null;
+    }
+    const halves = {
+        operationName: _nonEmptyStringOf(descriptor.operation_name),
+        operationType: descriptor.operation_type,
+        document: _nonEmptyStringOf(body.query),
+        variables: body.variables === undefined || body.variables === null
+            ? {}
+            : _recordOf(body.variables),
+    };
+    if (!_descriptorAgreesWithBody(halves, body.operationName)) {
+        return null;
+    }
+    const { operationName, operationType, document, variables } = halves;
+    return { operationName, operationType, document, variables };
+}
+function _descriptorAgreesWithBody(halves, bodyOperationName) {
+    return (halves.operationName !== null &&
+        halves.operationName === bodyOperationName &&
+        (halves.operationType === "query" || halves.operationType === "mutation") &&
+        halves.document !== null &&
+        halves.variables !== null);
+}
 export async function performActionIntent(adapter, intent) {
+    const land = intent.graphql === undefined ? _landableBodyOf : _landableGraphQLBodyOf;
     if (adapter.kind === "request") {
-        return _intentResultOf(200, await adapter.execute(intent));
+        return _intentResultOf(200, land(await adapter.execute(intent)));
     }
     const response = await fetch(_urlOf(adapter.baseUrl, intent), await _requestInitOf(adapter, intent));
-    return _resultOf(response);
+    return _resultOf(response, land);
 }
-function _intentResultOf(status, rawBody) {
-    const landed = _landableBodyOf(rawBody);
+function _intentResultOf(status, landed) {
     return { status, body: landed.body, truncated: landed.truncated };
 }
+function _landableGraphQLBodyOf(body) {
+    const whole = _landableBodyOf(body);
+    const errored = whole.truncated ? _erroredResponseOf(body) : null;
+    if (errored === null) {
+        return whole;
+    }
+    return (_errorsAndDataWhole(errored) ??
+        _errorsWithDataCut(errored) ??
+        _wholeCutErrorsFirst(errored));
+}
+function _erroredResponseOf(body) {
+    const response = _recordOf(body);
+    if (response === null) {
+        return null;
+    }
+    const errors = JSON.parse(JSON.stringify(response.errors ?? null));
+    if (!Array.isArray(errors) || errors.length === 0) {
+        return null;
+    }
+    return { errors, data: response.data ?? null, response };
+}
+function _errorsAndDataWhole({ errors, data, }) {
+    const kept = { errors, data };
+    return doorLengthCeilingOf(JSON.stringify(kept)) <= RESPONSE_BODY_MAX_CHARS
+        ? { body: kept, truncated: true }
+        : null;
+}
+function _errorsWithDataCut({ errors, data, }) {
+    const dataBudget = RESPONSE_BODY_MAX_CHARS -
+        doorLengthCeilingOf(JSON.stringify({ errors, data: "" })) -
+        doorCostOfText(TRUNCATION_NOTICE);
+    if (dataBudget < 0) {
+        return null;
+    }
+    const dataText = JSON.stringify(data);
+    const bounded = boundedTextOf(dataText, Math.min(dataBudget, doorCostOfText(dataText) - 1));
+    return {
+        body: { errors, data: bounded + TRUNCATION_NOTICE },
+        truncated: true,
+    };
+}
+function _wholeCutErrorsFirst({ errors, response, }) {
+    const rest = { ...response };
+    delete rest.errors;
+    return _landableBodyOf(JSON.stringify({ errors, ...rest }));
+}
 function _landableBodyOf(body) {
     if (body === undefined) {
         return { body: null, truncated: false };
@@ -105,8 +182,8 @@ function _queryStringOf(query) {
     const encoded = parameters.toString();
     return encoded === "" ? "" : `?${encoded}`;
 }
-async function _resultOf(response) {
-    return _intentResultOf(response.status, _jsonOrTextOf(await response.text()));
+async function _resultOf(response, land) {
+    return _intentResultOf(response.status, land(_jsonOrTextOf(await response.text())));
 }
 function _jsonOrTextOf(text) {
     try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teaflask/assistant",
-  "version": "0.7.0",
+  "version": "0.8.0",
   "description": "The AI assistant for your product: drop it into your React app or any page with a script tag.",
   "license": "FSL-1.1-ALv2",
   "author": "Teaflask",