Merge branch 'main' into tweaks/parse-module

Author: yifancong

packages/ai/package.json

@@ -7,8 +7,8 @@
     "directory": "packages/ai"
   },
   "license": "MIT",
-  "main": "./dist/server/index.js",
-  "types": "./dist/server/index.d.ts",
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
   "files": [
     "dist",
     "bin"

packages/ai/src/server/tools.ts

@@ -138,9 +138,9 @@ export const getModuleById = async (
   moduleId: string,
 ): Promise<{
   module: {
-    id: string;
-    renderId: string;
-    webpackId: string | number;
+    id: number;
+    renderId?: string;
+    webpackId: string;
     path: string;
     isPreferSource: boolean;
     imported: number[];
@@ -216,11 +216,11 @@ export const getPackageDependency = async () => {
 };
 
 export const getRuleInfo = async () => {
-  return await sendRequest(SDK.ServerAPI.API.GetOverlayAlerts, {});
+  return await sendRequest(SDK.ServerAPI.API.GetBundleAlerts, {});
 };
 
 export const getDuplicatePackages = async () => {
-  const ruleInfo = await sendRequest(SDK.ServerAPI.API.GetOverlayAlerts, {});
+  const ruleInfo = await sendRequest(SDK.ServerAPI.API.GetBundleAlerts, {});
 
   if (!ruleInfo) {
     return {
@@ -233,9 +233,7 @@ export const getDuplicatePackages = async () => {
 
   // Assuming ruleInfo contains a 'rules' array
   // @ts-ignore
-  const e1001Rule = ruleInfo?.find((rule) =>
-    rule.description?.includes('E1001'),
-  );
+  const e1001Rule = ruleInfo?.find((rule) => rule.code?.includes('E1001'));
 
   if (e1001Rule) {
     return {

packages/types/src/sdk/server/apis/alerts.ts

@@ -18,6 +18,11 @@ export interface AlertsAPIResponse {
    * get the alerts list which use to display in overlay at the client page
    */
   [API.GetOverlayAlerts]: OverlayRuleStoreData[];
+
+  /**
+   * get the alerts list which use to display in category bundle at the client page
+   */
+  [API.GetBundleAlerts]: OverlayRuleStoreData[];
 }
 
 export interface AlertsAPIRequestBody {

packages/types/src/sdk/server/apis/index.ts

@@ -79,6 +79,7 @@ export enum API {
   /** Alerts API */
   GetPackageRelationAlertDetails = '/api/alerts/details/package/relation',
   GetOverlayAlerts = '/api/alerts/overlay',
+  GetBundleAlerts = '/api/alerts/bundle',
 
   /** BundleDiff API */
   BundleDiffManifest = '/api/bundle_diff/manifest.json',

packages/utils/src/common/data/index.ts

@@ -405,9 +405,18 @@ export class APIDataLoader {
 
       case SDK.ServerAPI.API.GetOverlayAlerts:
         return this.loader.loadData('errors').then((res) => {
-          return (res || []).filter(
+          const results = (res || []).filter(
             (e) => e.code === Rule.RuleMessageCodeEnumerated.Overlay,
-          ) as R;
+          ) as Rule.OverlayRuleStoreData[];
+          return results as R;
+        });
+
+      case SDK.ServerAPI.API.GetBundleAlerts:
+        return this.loader.loadData('errors').then((res) => {
+          const results = (res || []).filter(
+            (e) => e.category === Rule.RuleMessageCategory.Bundle,
+          ) as Rule.OverlayRuleStoreData[];
+          return results as R;
         });
 
       /** Bundle Diff API */
@@ -523,8 +532,8 @@ export class APIDataLoader {
 
       case SDK.ServerAPI.API.GetChunkGraphAI:
         return this.loader.loadData('chunkGraph').then((res) => {
-          const { chunks = [] } = res || {};
-          const filteredChunks = chunks.map(({ modules, ...rest }) => rest);
+          const { assets = [] } = res || {};
+          const filteredChunks = assets.map(({ content, ...rest }) => rest);
           return filteredChunks as R;
         });