build(4.9.7): 优化isEmitVerMatchInputVer

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+[released] - 2024-06-11
+
+发布 `hel-micro`，版本`4.9.7`，特性包含：
+
+- `isEmitVerMatchInputVer` 支持透传 `branchId` 做更准确的判断，避免 `waitAppReady` 函数一直处于等待状态
+
 [released] - 2024-06-06
 
 发布 `hel-micro`，版本`4.9.6`，特性包含：

packages/hel-micro/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hel-micro",
-  "version": "4.9.6",
+  "version": "4.9.7",
   "description": "A module federation SDK which is unrelated to tool chain for module consumer.",
   "keywords": [
     "hel",

packages/hel-micro/src/consts/ver.ts

@@ -1 +1 @@
-export const VER = '4.9.6';
+export const VER = '4.9.7';

packages/hel-micro/src/services/app.ts

@@ -140,13 +140,11 @@ export async function getAppFromRemoteOrLocal(appName: string, options: IInnerPr
   const memApp = core.getAppMeta(appName, platform);
   const memAppVersion = core.getVersion(appName, { platform, versionId });
 
-  // 优先从内存获取（非语义化api获取的 memAppVersion 才是有意义的，可进入此逻辑做判断）
+  // 优先从内存获取（非语义化api、未传递分支时获取的 memAppVersion 才是有意义的，可进入此逻辑做判断）
   // TODO : semverApi 下沉到 isEmitVerMatchInputVer 里面
+  const compareMem = !semverApi && !branchId && memApp && memAppVersion;
   if (
-    !semverApi
-    && !branchId
-    && memApp
-    && memAppVersion
+    compareMem
     && isEmitVerMatchInputVer(appName, { platform, projectId, emitVer: memAppVersion.sub_app_version, inputVer: versionId, strictMatchVer })
   ) {
     return { appInfo: memApp, appVersion: memAppVersion };

packages/hel-micro/src/services/appStyle.ts

@@ -102,11 +102,11 @@ const inner = {
     await new Promise((resolve) => {
       handleStyleFetched = (styleInfo: IEmitStyleInfo) => {
         const { appName: emitAppName, platform: emitPlatform, versionId: emitVer } = styleInfo;
-        const { versionId: inputVer, platform, strictMatchVer } = options;
+        const { branchId, versionId: inputVer, platform, strictMatchVer } = options;
         if (
           emitAppName !== appName
           || emitPlatform !== platform
-          || !isEmitVerMatchInputVer(appName, { platform, emitVer, inputVer, strictMatchVer })
+          || !isEmitVerMatchInputVer(appName, { branchId, platform, emitVer, inputVer, strictMatchVer })
         ) {
           return;
         }
@@ -142,7 +142,7 @@ const inner = {
 
   async fetchStyleData(appName: string, options: IFetchStyleOptions) {
     const platAndVer = getPlatAndVer(appName, options);
-    const { extraStyleStr = '', cssListToStr, extraCssList = [] } = options;
+    const { extraStyleStr = '', cssListToStr, extraCssList = [], strictMatchVer, branchId } = options;
     const { validCssList, onlyUseAppCssList, buildCssList, initExtraCssList, appCssList } = inner.computeStyleData(appName, options);
 
     // renderStyleStr 为渲染用到的样式字符串
@@ -165,7 +165,7 @@ const inner = {
 
       // 有其他上层调用已经触发样式获取逻辑，这里调用 waitStyleReady 等待样式获取动作完成即可
       if (status === LOADING) {
-        await inner.waitStyleReady(appName, { ...platAndVer, strictMatchVer: options.strictMatchVer });
+        await inner.waitStyleReady(appName, { ...platAndVer, strictMatchVer, branchId });
         appStyleStr = core.getAppStyleStr(appName, platAndVer) || '';
       } else if (status === NOT_LOAD) {
         core.setVerStyleStrStatus(appName, LOADING, platAndVer);

packages/hel-micro/src/services/logic.ts

@@ -142,7 +142,7 @@ export function judgeAppReady(appInfo: IEmitAppInfo, options: IJudgeOptions, pre
   const appPathDesc = `${platform}/${appName}/${inputVer}`;
   const appMeta = getAppMeta(appName, platform);
 
-  const { custom, trust } = preFetchOptions;
+  const { branchId, custom, trust } = preFetchOptions;
   const fixData = (fixOptions: IFixOptions) => {
     try {
       const shouldNext = isLib
@@ -181,7 +181,7 @@ export function judgeAppReady(appInfo: IEmitAppInfo, options: IJudgeOptions, pre
 
   const logStillWait = () => log(`${fnMark} still wait ${appPathDesc} emitted (appInfo,toMatch):`, appInfo, toMatch);
   // 啥也不做，等待平台值匹配、应用名匹配的那个事件发射上来
-  const toMatch = { platform, emitVer, inputVer, projectId, strictMatchVer };
+  const toMatch = { branchId, platform, emitVer, inputVer, projectId, strictMatchVer };
   if (appName !== emitAppName || !isEmitVerMatchInputVer(appName, toMatch)) {
     return logStillWait();
   }

packages/hel-micro/src/shared/util.ts

@@ -8,14 +8,15 @@ interface IVerMatchOptions {
   strictMatchVer?: boolean;
   platform?: Platform;
   projectId?: string;
+  branchId?: string;
 }
+const fnMark = '[[ isEmitVerMatchInputVer ]]';
 
 /**
  * @returns true，匹配成功，false，匹配失败
  */
 export function isEmitVerMatchInputVer(appName: string, options: IVerMatchOptions) {
-  const fnMark = '[[ isEmitVerMatchInputVer ]]';
-  const { platform, emitVer, inputVer, projectId } = options;
+  const { branchId, platform, emitVer, inputVer, projectId } = options;
   const strictMatchVer = alt.getVal(platform, 'strictMatchVer', [options.strictMatchVer]);
 
   const appMeta = getAppMeta(appName, platform);
@@ -32,6 +33,12 @@ export function isEmitVerMatchInputVer(appName: string, options: IVerMatchOption
 
   // 用在线版本或灰度版本比较
   if (!inputVer && appMeta) {
+    // 存在分支id的话，采取总是相信子模块的策略
+    if (branchId) {
+      log(`${fnMark} found branchId ${branchId}`);
+      return true;
+    }
+
     const { online_version, build_version } = appMeta;
     // 判断 projectId 是否传入，传入的话看 proj_ver.map[projectId].o 的值是否存在且是否和 emitVer 相等
     if (projectId) {

packages/hel-micro/src/types.d.ts

@@ -4,6 +4,7 @@ import type { ILinkAttrs, IScriptAttrs, ISubApp, ISubAppVersion } from 'hel-type
 export interface IGetOptionsLoose {
   platform?: string;
   versionId?: string;
+  branchId?: string;
 }
 
 export type AssetUrlType = 'build' | 'static' | 'relative';
@@ -42,6 +43,7 @@ export interface IPlatAndVer {
 export interface IWaitStyleReadyOptions extends IPlatAndVer {
   platform: string;
   versionId: string;
+  branchId?: string;
   strictMatchVer?: boolean;
 }