@lynx-js/web-core-server 0.14.0 → 0.14.2

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @lynx-js/web-core-server
 
+## 0.14.2
+
+### Patch Changes
+
+- chore: extract shared logic from web-core and web-core-server's loadTemplate into a unified generateTemplate function ([#1211](https://github.com/lynx-family/lynx-stack/pull/1211))
+
+## 0.14.1
+
 ## 0.14.0
 
 ### Patch Changes

package/dist/createLynxView.js

@@ -50,6 +50,8 @@ export async function createLynxView(config) {
         firstPaintReady();
     }, () => {
         // mark timing
+    }, () => {
+        // flush mark timing
     }, () => {
         // report error
     }, () => {

package/dist/utils/loadTemplate.js

@@ -1,4 +1,4 @@
-import { globalMuteableVars } from '@lynx-js/web-constants';
+import { generateTemplate } from '@lynx-js/web-constants';
 import os from 'node:os';
 import fs from 'node:fs/promises';
 import path from 'node:path';
@@ -12,112 +12,13 @@ async function createJsModuleUrl(content, filename) {
     await fs.writeFile(fileUrl, content, { flag: 'w+' });
     return fileUrl;
 }
-async function generateJavascriptUrl(obj, injectVars, injectWithBind, muteableVars, templateName) {
-    injectVars = injectVars.concat(muteableVars);
-    return Object.fromEntries(await Promise.all(Object.entries(obj).map(async ([name, content]) => {
-        return [
-            name,
-            await createJsModuleUrl([
-                '//# allFunctionsCalledOnLoad\n',
-                'globalThis.module.exports = function(lynx_runtime) {',
-                'const module= {exports:{}};let exports = module.exports;',
-                'var {',
-                injectVars.join(','),
-                '} = lynx_runtime;',
-                ...injectWithBind.map((nm) => `const ${nm} = lynx_runtime.${nm}?.bind(lynx_runtime);`),
-                ';var globDynamicComponentEntry = \'__Card__\';',
-                'var {__globalProps} = lynx;',
-                'lynx_runtime._updateVars=()=>{',
-                ...muteableVars.map((nm) => `${nm} = lynx_runtime.__lynxGlobalBindingValues.${nm};`),
-                '};\n',
-                content,
-                '\n return module.exports;}',
-            ].join(''), `${templateName}-${name.replaceAll('/', '')}.js`),
-        ];
-    })));
-}
-const mainThreadInjectVars = [
-    'lynx',
-    'globalThis',
-    '_ReportError',
-    '_SetSourceMapRelease',
-    '__AddConfig',
-    '__AddDataset',
-    '__GetAttributes',
-    '__GetComponentID',
-    '__GetDataByKey',
-    '__GetDataset',
-    '__GetElementConfig',
-    '__GetElementUniqueID',
-    '__GetID',
-    '__GetTag',
-    '__SetAttribute',
-    '__SetConfig',
-    '__SetDataset',
-    '__SetID',
-    '__UpdateComponentID',
-    '__GetConfig',
-    '__UpdateListCallbacks',
-    '__AppendElement',
-    '__ElementIsEqual',
-    '__FirstElement',
-    '__GetChildren',
-    '__GetParent',
-    '__InsertElementBefore',
-    '__LastElement',
-    '__NextElement',
-    '__RemoveElement',
-    '__ReplaceElement',
-    '__ReplaceElements',
-    '__SwapElement',
-    '__CreateComponent',
-    '__CreateElement',
-    '__CreatePage',
-    '__CreateView',
-    '__CreateText',
-    '__CreateRawText',
-    '__CreateImage',
-    '__CreateScrollView',
-    '__CreateWrapperElement',
-    '__CreateList',
-    '__AddEvent',
-    '__GetEvent',
-    '__GetEvents',
-    '__SetEvents',
-    '__AddClass',
-    '__SetClasses',
-    '__GetClasses',
-    '__AddInlineStyle',
-    '__SetInlineStyles',
-    '__SetCSSId',
-    '__OnLifecycleEvent',
-    '__FlushElementTree',
-    '__LoadLepusChunk',
-    'SystemInfo',
-    '_I18nResourceTranslation',
-    '_AddEventListener',
-];
-const backgroundInjectVars = [
-    'NativeModules',
-    'globalThis',
-    'lynx',
-    'lynxCoreInject',
-    'SystemInfo',
-];
-const backgroundInjectWithBind = [
-    'Card',
-    'Component',
-];
 export async function loadTemplate(rawTemplate, templateName = Math.random().toString(36).substring(2, 7)) {
     if (templateCache.has(rawTemplate)) {
         return templateCache.get(rawTemplate);
     }
     templateName += Math.random().toString(36).substring(2, 7);
-    const decodedTemplate = templateCache.get(rawTemplate) ?? {
-        ...rawTemplate,
-        lepusCode: await generateJavascriptUrl(rawTemplate.lepusCode, mainThreadInjectVars, [], globalMuteableVars, templateName + '-lepusCode'),
-        manifest: await generateJavascriptUrl(rawTemplate.manifest, backgroundInjectVars, backgroundInjectWithBind, [], templateName + '-manifest'),
-    };
+    const decodedTemplate = templateCache.get(rawTemplate)
+        ?? await generateTemplate(rawTemplate, createJsModuleUrl, templateName + '-lepusCode');
     templateCache.set(rawTemplate, decodedTemplate);
     /**
      * This will cause a memory leak, which is expected.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lynx-js/web-core-server",
-  "version": "0.14.0",
+  "version": "0.14.2",
   "private": false,
   "description": "",
   "keywords": [],
@@ -23,9 +23,9 @@
   ],
   "devDependencies": {
     "@lynx-js/offscreen-document": "0.1.2",
-    "@lynx-js/web-constants": "0.14.0",
-    "@lynx-js/web-elements-template": "0.7.6",
-    "@lynx-js/web-mainthread-apis": "0.14.0",
-    "@lynx-js/web-worker-rpc": "0.14.0"
+    "@lynx-js/web-constants": "0.14.2",
+    "@lynx-js/web-elements-template": "0.7.7",
+    "@lynx-js/web-mainthread-apis": "0.14.2",
+    "@lynx-js/web-worker-rpc": "0.14.2"
   }
 }