@lynx-js/web-mainthread-apis 0.15.5 → 0.15.7

package/CHANGELOG.md

@@ -1,5 +1,37 @@
 # @lynx-js/web-mainthread-apis
 
+## 0.15.7
+
+### Patch Changes
+
+- fix: globalThis is never accessible in MTS ([#1531](https://github.com/lynx-family/lynx-stack/pull/1531))
+
+- Updated dependencies [[`70863fb`](https://github.com/lynx-family/lynx-stack/commit/70863fbc311d8885ebda40855668097b0631f521)]:
+  - @lynx-js/web-constants@0.15.7
+  - @lynx-js/web-style-transformer@0.15.7
+
+## 0.15.6
+
+### Patch Changes
+
+- fix: systeminfo in mts function ([#1537](https://github.com/lynx-family/lynx-stack/pull/1537))
+
+- refactor: use utf-8 string ([#1473](https://github.com/lynx-family/lynx-stack/pull/1473))
+
+- feat: add MTS API: \_\_UpdateComponentInfo ([#1485](https://github.com/lynx-family/lynx-stack/pull/1485))
+
+- fix: \_\_ElementFromBinary should mark all elements actively ([#1484](https://github.com/lynx-family/lynx-stack/pull/1484))
+
+- fix: `__ElementFromBinary` needs to correctly apply the dataset in elementTemplate to the Element ([#1487](https://github.com/lynx-family/lynx-stack/pull/1487))
+
+- fix: all attributes except `id` and `type` under ElementTemplateData are optional. ([#1483](https://github.com/lynx-family/lynx-stack/pull/1483))
+
+- feat: add MTS API \_\_GetAttributeByName ([#1486](https://github.com/lynx-family/lynx-stack/pull/1486))
+
+- Updated dependencies [[`405a917`](https://github.com/lynx-family/lynx-stack/commit/405a9170442ae32603b7687549b49ab4b34aff92), [`b8f89e2`](https://github.com/lynx-family/lynx-stack/commit/b8f89e25f106a15ba9d70f2df06dfb684cbb6633), [`f76aae9`](https://github.com/lynx-family/lynx-stack/commit/f76aae9ea06abdc7022ba508d22f9f4eb00864e8), [`d8381a5`](https://github.com/lynx-family/lynx-stack/commit/d8381a58d12af6424cab4955617251e798bdc9f1), [`214898b`](https://github.com/lynx-family/lynx-stack/commit/214898bb9c74fc9b44e68cb220a4c02485102ce2), [`ab8cee4`](https://github.com/lynx-family/lynx-stack/commit/ab8cee4bab384fa905c045c4b4b93e5d4a95d57f)]:
+  - @lynx-js/web-constants@0.15.6
+  - @lynx-js/web-style-transformer@0.15.6
+
 ## 0.15.5
 
 ### Patch Changes

package/dist/createMainThreadGlobalThis.js

@@ -1,11 +1,11 @@
 // Copyright 2023 The Lynx Authors. All rights reserved.
 // Licensed under the Apache License Version 2.0 that can be found in the
 // LICENSE file in the root directory of this source tree.
-import { lynxUniqueIdAttribute, systemInfo, parentComponentUniqueIdAttribute, componentIdAttribute, LynxEventNameToW3cByTagName, LynxEventNameToW3cCommon, lynxTagAttribute, W3cEventNameToLynx, cssIdAttribute, lynxDefaultDisplayLinearAttribute, __lynx_timing_flag, lynxDisposedAttribute, } from '@lynx-js/web-constants';
+import { lynxUniqueIdAttribute, systemInfo, parentComponentUniqueIdAttribute, componentIdAttribute, LynxEventNameToW3cByTagName, LynxEventNameToW3cCommon, lynxTagAttribute, W3cEventNameToLynx, cssIdAttribute, lynxDefaultDisplayLinearAttribute, __lynx_timing_flag, lynxDisposedAttribute, globalDisallowedVars, } from '@lynx-js/web-constants';
 import { globalMuteableVars } from '@lynx-js/web-constants';
 import { createMainThreadLynx } from './createMainThreadLynx.js';
 import { flattenStyleInfo, genCssContent, genCssOGInfo, transformToWebCss, } from './utils/processStyleInfo.js';
-import { __AddClass, __AddConfig, __AddDataset, __AddInlineStyle, __AppendElement, __ElementIsEqual, __FirstElement, __GetAttributes, __GetChildren, __GetClasses, __GetComponentID, __GetDataByKey, __GetDataset, __GetElementConfig, __GetElementUniqueID, __GetID, __GetParent, __GetTag, __GetTemplateParts, __InsertElementBefore, __LastElement, __MarkPartElement, __MarkTemplateElement, __NextElement, __RemoveElement, __ReplaceElement, __ReplaceElements, __SetClasses, __SetConfig, __SetCSSId, __SetDataset, __SetID, __SetInlineStyles, __UpdateComponentID, } from './pureElementPAPIs.js';
+import { __AddClass, __AddConfig, __AddDataset, __AddInlineStyle, __AppendElement, __ElementIsEqual, __FirstElement, __GetAttributes, __GetChildren, __GetClasses, __GetComponentID, __GetDataByKey, __GetDataset, __GetElementConfig, __GetElementUniqueID, __GetID, __GetParent, __GetTag, __GetTemplateParts, __InsertElementBefore, __LastElement, __MarkPartElement, __MarkTemplateElement, __NextElement, __RemoveElement, __ReplaceElement, __ReplaceElements, __SetClasses, __SetConfig, __SetCSSId, __SetDataset, __SetID, __SetInlineStyles, __UpdateComponentID, __UpdateComponentInfo, __GetAttributeByName, } from './pureElementPAPIs.js';
 import { createCrossThreadEvent } from './utils/createCrossThreadEvent.js';
 import { decodeCssOG } from './utils/decodeCssOG.js';
 const exposureRelatedAttributes = new Set([
@@ -380,27 +380,31 @@ export function createMainThreadGlobalThis(config) {
     const createElementForElementTemplateData = (data, parentComponentUniId) => {
         const element = __CreateElement(data.type, parentComponentUniId);
         __SetID(element, data.id);
-        __SetClasses(element, data.class.join(' '));
-        for (const [key, value] of Object.entries(data.attributes)) {
+        data.class && __SetClasses(element, data.class.join(' '));
+        for (const [key, value] of Object.entries(data.attributes || {})) {
             __SetAttribute(element, key, value);
         }
-        for (const [key, value] of Object.entries(data.builtinAttributes)) {
+        for (const [key, value] of Object.entries(data.builtinAttributes || {})) {
+            if (key === 'dirtyID' && value === data.id) {
+                __MarkPartElement(element, value);
+            }
             __SetAttribute(element, key, value);
         }
-        for (const childData of data.children) {
+        for (const childData of data.children || []) {
             __AppendElement(element, createElementForElementTemplateData(childData, parentComponentUniId));
         }
+        data.dataset !== undefined && __SetDataset(element, data.dataset);
         return element;
     };
     const applyEventsForElementTemplate = (data, element) => {
         const uniqueId = uniqueIdInc++;
         element.setAttribute(lynxUniqueIdAttribute, uniqueId + '');
-        for (const event of data.events) {
+        for (const event of data.events || []) {
             const { type, name, value } = event;
             __AddEvent(element, type, name, value);
         }
-        for (let ii = 0; ii < data.children.length; ii++) {
-            const childData = data.children[ii];
+        for (let ii = 0; ii < (data.children || []).length; ii++) {
+            const childData = (data.children || [])[ii];
             const childElement = element.children[ii];
             if (childData && childElement) {
                 applyEventsForElementTemplate(childData, childElement);
@@ -431,12 +435,17 @@ export function createMainThreadGlobalThis(config) {
                     applyEventsForElementTemplate(data, element);
                 }
             }
+            clonedElements.forEach(__MarkTemplateElement);
             return clonedElements;
         }
         return [];
     };
     let release = '';
     const isCSSOG = !pageConfig.enableCSSSelector;
+    const SystemInfo = {
+        ...systemInfo,
+        ...config.browserConfig,
+    };
     const mtsGlobalThis = {
         __ElementFromBinary,
         __GetTemplateParts: rootDom.querySelectorAll
@@ -473,6 +482,7 @@ export function createMainThreadGlobalThis(config) {
         __SetDataset,
         __SetID,
         __UpdateComponentID,
+        __UpdateComponentInfo,
         __CreateElement,
         __CreateView,
         __CreateText,
@@ -487,6 +497,7 @@ export function createMainThreadGlobalThis(config) {
         __SwapElement,
         __UpdateListCallbacks,
         __GetConfig: __GetElementConfig,
+        __GetAttributeByName,
         __GetClasses,
         __AddClass: isCSSOG ? __AddClassForCSSOG : __AddClass,
         __SetClasses: isCSSOG ? __SetClassesForCSSOG : __SetClasses,
@@ -496,11 +507,8 @@ export function createMainThreadGlobalThis(config) {
         __LoadLepusChunk,
         __GetPageElement,
         __globalProps: globalProps,
-        SystemInfo: {
-            ...systemInfo,
-            ...config.browserConfig,
-        },
-        lynx: createMainThreadLynx(config),
+        SystemInfo,
+        lynx: createMainThreadLynx(config, SystemInfo),
         _ReportError: (err, _) => callbacks._ReportError(err, _, release),
         _SetSourceMapRelease: (errInfo) => release = errInfo?.release,
         __OnLifecycleEvent: callbacks.__OnLifecycleEvent,
@@ -521,6 +529,9 @@ export function createMainThreadGlobalThis(config) {
     };
     mtsGlobalThis.globalThis = new Proxy(mtsGlobalThis, {
         get: (target, prop) => {
+            if (typeof prop === 'string' && globalDisallowedVars.includes(prop)) {
+                return undefined;
+            }
             if (prop === 'globalThis') {
                 return target;
             }

package/dist/createMainThreadLynx.d.ts

@@ -1,3 +1,3 @@
 import type { MainThreadLynx } from '@lynx-js/web-constants';
 import { type MainThreadRuntimeConfig } from './createMainThreadGlobalThis.js';
-export declare function createMainThreadLynx(config: MainThreadRuntimeConfig): MainThreadLynx;
+export declare function createMainThreadLynx(config: MainThreadRuntimeConfig, SystemInfo: Record<string, any>): MainThreadLynx;

package/dist/createMainThreadLynx.js

@@ -1,5 +1,5 @@
 import {} from './createMainThreadGlobalThis.js';
-export function createMainThreadLynx(config) {
+export function createMainThreadLynx(config, SystemInfo) {
     return {
         getJSContext() {
             return config.jsContext;
@@ -15,6 +15,7 @@ export function createMainThreadLynx(config) {
             return config.customSections[key]?.content;
         },
         markPipelineTiming: config.callbacks.markTiming,
+        SystemInfo,
     };
 }
 //# sourceMappingURL=createMainThreadLynx.js.map

package/dist/pureElementPAPIs.d.ts

@@ -1,4 +1,4 @@
-import { type AddClassPAPI, type AddConfigPAPI, type AddDatasetPAPI, type AddInlineStylePAPI, type AppendElementPAPI, type ElementIsEqualPAPI, type FirstElementPAPI, type GetAttributesPAPI, type GetChildrenPAPI, type GetClassesPAPI, type GetComponentIdPAPI, type GetDataByKeyPAPI, type GetDatasetPAPI, type GetElementConfigPAPI, type GetElementUniqueIDPAPI, type GetIDPAPI, type GetParentPAPI, type GetTagPAPI, type GetTemplatePartsPAPI, type InsertElementBeforePAPI, type LastElementPAPI, type MarkPartElementPAPI, type MarkTemplateElementPAPI, type NextElementPAPI, type RemoveElementPAPI, type ReplaceElementPAPI, type ReplaceElementsPAPI, type SetClassesPAPI, type SetConfigPAPI, type SetCSSIdPAPI, type SetDatasetPAPI, type SetIDPAPI, type SetInlineStylesPAPI, type UpdateComponentIDPAPI } from '@lynx-js/web-constants';
+import { type AddClassPAPI, type AddConfigPAPI, type AddDatasetPAPI, type AddInlineStylePAPI, type AppendElementPAPI, type ElementIsEqualPAPI, type FirstElementPAPI, type GetAttributeByNamePAPI, type GetAttributesPAPI, type GetChildrenPAPI, type GetClassesPAPI, type GetComponentIdPAPI, type GetDataByKeyPAPI, type GetDatasetPAPI, type GetElementConfigPAPI, type GetElementUniqueIDPAPI, type GetIDPAPI, type GetParentPAPI, type GetTagPAPI, type GetTemplatePartsPAPI, type InsertElementBeforePAPI, type LastElementPAPI, type MarkPartElementPAPI, type MarkTemplateElementPAPI, type NextElementPAPI, type RemoveElementPAPI, type ReplaceElementPAPI, type ReplaceElementsPAPI, type SetClassesPAPI, type SetConfigPAPI, type SetCSSIdPAPI, type SetDatasetPAPI, type SetIDPAPI, type SetInlineStylesPAPI, type UpdateComponentIDPAPI, type UpdateComponentInfoPAPI } from '@lynx-js/web-constants';
 export declare const __AppendElement: AppendElementPAPI;
 export declare const __ElementIsEqual: ElementIsEqualPAPI;
 export declare const __FirstElement: FirstElementPAPI;
@@ -17,6 +17,7 @@ export declare const __GetDataByKey: GetDataByKeyPAPI;
 export declare const __GetAttributes: GetAttributesPAPI;
 export declare const __GetComponentID: GetComponentIdPAPI;
 export declare const __GetElementConfig: GetElementConfigPAPI;
+export declare const __GetAttributeByName: GetAttributeByNamePAPI;
 export declare const __GetElementUniqueID: GetElementUniqueIDPAPI;
 export declare const __GetID: GetIDPAPI;
 export declare const __SetID: SetIDPAPI;
@@ -25,6 +26,7 @@ export declare const __SetConfig: SetConfigPAPI;
 export declare const __SetDataset: SetDatasetPAPI;
 export declare const __UpdateComponentID: UpdateComponentIDPAPI;
 export declare const __GetClasses: GetClassesPAPI;
+export declare const __UpdateComponentInfo: UpdateComponentInfoPAPI;
 export declare const __SetCSSId: SetCSSIdPAPI;
 export declare const __SetClasses: SetClassesPAPI;
 export declare const __AddInlineStyle: AddInlineStylePAPI;

package/dist/pureElementPAPIs.js

@@ -67,6 +67,7 @@ export const __GetElementConfig = /*#__PURE__*/ (element) => {
         ? JSON.parse(decodeURIComponent(currentComponentConfigString))
         : {};
 };
+export const __GetAttributeByName = /*#__PURE__*/ (element, name) => element.getAttribute(name);
 export const __GetElementUniqueID = /*#__PURE__*/ (element) => (element && element.getAttribute
     ? Number(element.getAttribute(lynxUniqueIdAttribute))
     : -1);
@@ -84,6 +85,13 @@ export const __SetDataset = /*#__PURE__*/ (element, dataset) => {
 };
 export const __UpdateComponentID = /*#__PURE__*/ (element, componentID) => element.setAttribute(componentIdAttribute, componentID);
 export const __GetClasses = /*#__PURE__*/ (element) => ((element.getAttribute('class') ?? '').split(' ').filter(e => e));
+export const __UpdateComponentInfo = /*#__PURE__*/ (element, params) => {
+    params.componentID !== undefined
+        && __UpdateComponentID(element, params.componentID);
+    params.cssID !== undefined
+        && element.setAttribute(cssIdAttribute, params.cssID + '');
+    params.name !== undefined && element.setAttribute('name', params.name);
+};
 export const __SetCSSId = /*#__PURE__*/ (elements, cssId) => {
     for (const element of elements) {
         element.setAttribute(cssIdAttribute, cssId + '');

package/dist/utils/tokenizer.js

@@ -1,56 +1,23 @@
 import { wasm } from '@lynx-js/web-style-transformer';
-let HEAPU16;
-const stringToUTF16 = (str) => {
-    const len = str.length;
-    const ptr = wasm.malloc(len << 1);
-    if (!HEAPU16 || HEAPU16.byteLength == 0) {
-        HEAPU16 = new Uint16Array(wasm.memory.buffer);
-    }
-    for (let i = 0; i < len; i++) {
-        HEAPU16[(ptr >> 1) + i] = str.charCodeAt(i);
-    }
-    return { ptr, len };
-};
 export function transformInlineStyleString(str) {
-    const { ptr, len } = stringToUTF16(str);
-    try {
-        const transformedStyle = wasm.transform_raw_u16_inline_style_ptr(ptr, len)
-            ?? str;
-        wasm.free(ptr, len << 1);
-        return transformedStyle;
-    }
-    catch (e) {
-        wasm.free(ptr, len << 1);
-        throw e;
-    }
+    return wasm.transform_raw_u16_inline_style_ptr(str) ?? str;
 }
 export function transformParsedStyles(styles) {
     let childStyle = [];
     let transformedStyle = [];
     for (const [property, value] of styles) {
-        const { ptr: propertyPtr, len: propertyLen } = stringToUTF16(property);
-        const { ptr: valuePtr, len: valueLen } = stringToUTF16(value);
-        try {
-            const transformedResult = wasm
-                .transform_raw_u16_inline_style_ptr_parsed(propertyPtr, propertyLen, valuePtr, valueLen);
-            wasm.free(propertyPtr, propertyLen << 1);
-            wasm.free(valuePtr, valueLen << 1);
-            if (transformedResult) {
-                const [transformedStyleForCurrent, childStyleForCurrent] = transformedResult;
-                transformedStyle = transformedStyle.concat(transformedStyleForCurrent);
-                if (childStyleForCurrent) {
-                    childStyle = childStyle.concat(childStyleForCurrent);
-                }
-            }
-            else {
-                // If the transformation fails, we keep the original style
-                transformedStyle.push([property, value]);
+        const transformedResult = wasm
+            .transform_raw_u16_inline_style_ptr_parsed(property, value);
+        if (transformedResult) {
+            const [transformedStyleForCurrent, childStyleForCurrent] = transformedResult;
+            transformedStyle = transformedStyle.concat(transformedStyleForCurrent);
+            if (childStyleForCurrent) {
+                childStyle = childStyle.concat(childStyleForCurrent);
             }
         }
-        catch (e) {
-            wasm.free(propertyPtr, propertyLen << 1);
-            wasm.free(valuePtr, valueLen << 1);
-            throw e;
+        else {
+            // If the transformation fails, we keep the original style
+            transformedStyle.push([property, value]);
         }
     }
     return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lynx-js/web-mainthread-apis",
-  "version": "0.15.5",
+  "version": "0.15.7",
   "private": false,
   "description": "",
   "keywords": [],
@@ -25,7 +25,7 @@
   ],
   "dependencies": {
     "hyphenate-style-name": "^1.1.0",
-    "@lynx-js/web-constants": "0.15.5",
-    "@lynx-js/web-style-transformer": "0.15.5"
+    "@lynx-js/web-constants": "0.15.7",
+    "@lynx-js/web-style-transformer": "0.15.7"
   }
 }