@cloudbase/lowcode-builder 1.8.58 → 1.8.60

package/lib/builder/core/index.js

@@ -154,7 +154,8 @@ async function buildWedaApp({ cals, subAppCalsList = [], dependencies = [], appK
                     : 'rpx'),
                 enablePageRoot,
                 enableLoading: (_e = cals === null || cals === void 0 ? void 0 : cals.extra) === null || _e === void 0 ? void 0 : _e.enableLoading,
-                enableAsyncMaterials: (_f = cals === null || cals === void 0 ? void 0 : cals.extra) === null || _f === void 0 ? void 0 : _f.enableAsyncMaterials,
+                enableAsyncMaterials: (_f = cals.extra) === null || _f === void 0 ? void 0 : _f.enableAsyncMaterials,
+                // enableAsyncMaterials: true,
             };
             const result = await (0, index_1.generateWxMp)({
                 weapps: apps,

package/lib/builder/h5/index.js

@@ -39,7 +39,7 @@ const common_1 = require("../types/common");
 const compile_1 = require("./compile");
 const util_1 = require("../util");
 const types_1 = require("../../types");
-const mp_1 = require("../mp");
+const cals_1 = require("@cloudbase/cals");
 const common_2 = require("../../utils/common");
 const config_1 = require("../config");
 const fs_extra_1 = __importDefault(require("fs-extra"));
@@ -51,7 +51,7 @@ if (!process.env.IS_WEB_WORKER) {
     BabelTransform = transform.BabelTransform;
 }
 async function buildH5App({ buildContext, i18nConfig, extraData, cals: _cals, buildTypeList = [common_1.BuildType.WEB], subAppCalsList, mode, devTool, runtime = types_1.RUNTIME.NONE, deployOptions = { mode: types_1.DEPLOY_MODE.PREVIEW }, ignoreInstall = false, cdnEndpoints, }) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     const { projDir: buildDir, domain, materialLibs: dependencies, appId: appKey, isPrivateMode, enableExpiredTag, } = buildContext;
     if (!deployOptions.mode) {
         deployOptions.mode = types_1.DEPLOY_MODE.PREVIEW;
@@ -68,23 +68,21 @@ async function buildH5App({ buildContext, i18nConfig, extraData, cals: _cals, bu
             _cals.extra.historyType = types_1.HISTORY_TYPE.HASH;
         }
         const cals = processCals(_cals);
-        const mainAppSerializeData = (0, common_2.processCals2WeappsData)(cals, dependencies);
-        const subAppSerializeDataList = (subAppCalsList === null || subAppCalsList === void 0 ? void 0 : subAppCalsList.map((item) => (0, common_2.processCals2WeappsData)(item, dependencies))) || [];
-        const { allAppUsedComps } = (0, mp_1.handleUsedComponents)({
-            buildContext: { ...buildContext, mainAppData: mainAppSerializeData },
-            weapps: [mainAppSerializeData, ...subAppSerializeDataList],
+        const used = (0, cals_1.getUsedComps)([cals], dependencies, {
+            withAction: true,
+            streamline: false,
         });
         // 处理应用数据
-        const mainAppData = (0, weapps_core_1.deserialize)(mainAppSerializeData);
+        const mainAppData = (0, weapps_core_1.deserialize)((0, common_2.processCals2WeappsData)(cals, dependencies));
         if (!mainAppData.extra) {
             mainAppData.extra = { domain };
         }
         if (!((_a = mainAppData.extra) === null || _a === void 0 ? void 0 : _a.domain)) {
             mainAppData.extra.domain = domain;
         }
-        const subAppDataList = subAppSerializeDataList.map((sub) => (0, weapps_core_1.deserialize)(sub));
+        const subAppDataList = ((_b = subAppCalsList === null || subAppCalsList === void 0 ? void 0 : subAppCalsList.map) === null || _b === void 0 ? void 0 : _b.call(subAppCalsList, (sub) => (0, weapps_core_1.deserialize)((0, common_2.processCals2WeappsData)(sub, dependencies)))) || [];
         // 前置操作
-        const { publicPath, basename, assets = '', _indexPage } = ((_b = mainAppData.appConfig) === null || _b === void 0 ? void 0 : _b.window) || {};
+        const { publicPath, basename, assets = '', _indexPage } = ((_c = mainAppData.appConfig) === null || _c === void 0 ? void 0 : _c.window) || {};
         // 获取 插入的cdn 资源
         const jsAssets = await (0, generate_1.handleAssets)({
             appBuildDir: buildDir,
@@ -97,8 +95,9 @@ async function buildH5App({ buildContext, i18nConfig, extraData, cals: _cals, bu
         console.time(runHandleMaterialTag);
         // 精简只使用用到的组件库，并获取补齐json格式
         const processedDependencies = await (0, material_1.runHandleMaterial)(h5BuildDir, dependencies.filter((lib) => {
+            var _a, _b;
             // 注意需要包涵官方的(gsd)，部分平台方法需要由其补充
-            return lib.name === config_1.OFFICIAL_LIB_KEY || !!allAppUsedComps[lib.name];
+            return lib.name === config_1.OFFICIAL_LIB_KEY || !!(((_a = used.component) === null || _a === void 0 ? void 0 : _a[lib.name]) || ((_b = used.action) === null || _b === void 0 ? void 0 : _b[lib.name]));
         }), materialsDir, runtime, ignoreInstall);
         console.timeEnd(runHandleMaterialTag);
         // // 获取 generate 需要的构建文件
@@ -187,7 +186,7 @@ async function buildH5App({ buildContext, i18nConfig, extraData, cals: _cals, bu
         })
             .filter((item) => !!item);
         // 普通 web 模式，且非hash模式，根据页面生成多份入口
-        if (!((_c = cals.extra) === null || _c === void 0 ? void 0 : _c.historyType) || cals.extra.historyType === types_1.HISTORY_TYPE.BROWSER) {
+        if (!((_d = cals.extra) === null || _d === void 0 ? void 0 : _d.historyType) || cals.extra.historyType === types_1.HISTORY_TYPE.BROWSER) {
             preHeatUrls.push(path_1.default.posix.join(basename || ''));
             await Promise.all((cals.items || []).map((page) => {
                 preHeatUrls.push(path_1.default.posix.join(basename || '', page.id));

package/lib/builder/mp/index.d.ts

@@ -1,7 +1,7 @@
 import { IWeAppData, IPlugin } from '@cloudbase/lowcode-generator/lib/weapps-core';
 import { ICDN_ENDPOINTS_COFIG } from '../config';
 import { IBuildContext } from './BuildContext';
-import { BuildType, IAppUsedComp, IUsedComps } from '../types/common';
+import { BuildType } from '../types/common';
 import { IPlatformApp } from '@cloudbase/cals';
 import { IBuildWedaApp } from '../core';
 export declare function generateWxMp({ buildContext, weapps, calses, plugins, deployOptions, options, buildTypeList, ignoreInstall, cdnEndpoints, }: {
@@ -27,14 +27,3 @@ export declare function generateConfig(data: {
     endpointType?: IBuildContext['endpointType'] | '';
 }, root: string): Promise<void>;
 export declare function writeLowCodeFiles(ctx: IBuildContext, appData: IWeAppData, outDir: string): Promise<void>;
-/**
- * TODO: 与 cals 里的实现进行整合
- * 关键点在于 appUsedComps 分组， 与 generic componen 的实现
- */
-export declare function handleUsedComponents({ buildContext, weapps }: {
-    buildContext: IBuildContext;
-    weapps: IWeAppData[];
-}): {
-    appUsedComps: IAppUsedComp[];
-    allAppUsedComps: IUsedComps;
-};

package/lib/builder/mp/index.js

@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.handleUsedComponents = exports.writeLowCodeFiles = exports.generateConfig = exports.generateWxMp = void 0;
+exports.writeLowCodeFiles = exports.generateConfig = exports.generateWxMp = void 0;
 const chalk_1 = __importDefault(require("chalk"));
 const path_1 = __importDefault(require("path"));
 const util_1 = require("util");
@@ -52,24 +52,25 @@ const junk = __importStar(require("../util/junk"));
 const net_1 = require("../util/net");
 const cals_1 = require("@cloudbase/cals");
 const core_1 = require("../core");
+const theme_1 = require("../../utils/theme");
 const templateDir = `${config_1.appTemplateDir}/mp/`;
 const em = chalk_1.default.blue.bold;
 const error = chalk_1.default.redBright;
-function patchBuildContext(ctx, calses, weapps) {
+function patchBuildContext(ctx, calses) {
     var _a, _b, _c;
     const { mainAppData } = ctx;
     if ((_b = (_a = calses === null || calses === void 0 ? void 0 : calses[0]) === null || _a === void 0 ? void 0 : _a.templates) === null || _b === void 0 ? void 0 : _b.length) {
         ctx.materialLibs = [...ctx.materialLibs, (0, cals_1.processTemplatesToDependiencies)((_c = calses === null || calses === void 0 ? void 0 : calses[0]) === null || _c === void 0 ? void 0 : _c.templates)];
     }
-    const { allAppUsedComps } = handleUsedComponents({ buildContext: ctx, weapps });
+    const used = (0, cals_1.getUsedComps)(calses, ctx.materialLibs, { streamline: false, withAction: true });
     /**
      * 修改 buildContext 进行 miniprogramPlugins 精简
      */
-    ctx.miniprogramPlugins = (mainAppData.miniprogramPlugins || []).filter((plugin) => allAppUsedComps[plugin.name]);
-    return { allAppUsedComps };
+    ctx.miniprogramPlugins = (mainAppData.miniprogramPlugins || []).filter((plugin) => used.component[plugin.name] || used.action[plugin.name]);
+    return { used: used };
 }
 async function generateWxMp({ buildContext, weapps, calses, plugins, deployOptions, options, buildTypeList, ignoreInstall = false, cdnEndpoints = {}, }) {
-    var _a, _b;
+    var _a, _b, _c, _d;
     const operationLabel = em('Wexin MiniProgram Generated');
     console.time(operationLabel);
     console.log(`Generating ${em('Wexin MiniProgram')} to ${buildContext.projDir}`);
@@ -77,10 +78,10 @@ async function generateWxMp({ buildContext, weapps, calses, plugins, deployOptio
      * 此函数具有副作用，用于补充修正小程序特殊的buildContext
      * 注意一定在入口进行处理，应当尽可能提前，后续逻辑不应该更新buildContext
      */
-    const { allAppUsedComps } = patchBuildContext(buildContext, calses, weapps);
+    const { used } = patchBuildContext(buildContext, calses);
     const { uin = '', appId, projDir, materialLibs: materials, isProduction, mainAppData, domain, isPrivateMode = false, endpointType = '', isBrowserMpBuilder = false, } = buildContext;
     // 安装依赖库，生成 materials 目录
-    await (0, materials_1.installMaterials)(buildContext, projDir, allAppUsedComps, weapps);
+    await (0, materials_1.installMaterials)(buildContext, projDir, used, weapps);
     const wxmlDataPrefix = (0, mp_1.getWxmlDataPrefix)(!isProduction);
     const { projConfig, appConfig, pageConfigs } = (0, mp_config_1.generateMpConfig)(buildContext, weapps, { mpAppId: options.mpAppId });
     const hasLowcodePkg = weapps.find((item) => !item.mpPkgUrl);
@@ -93,7 +94,7 @@ async function generateWxMp({ buildContext, weapps, calses, plugins, deployOptio
         await (0, generateFiles_1.default)(projectFileData, templateDir, projDir);
     }
     // #2 生成主包
-    await generatePkg({ ...buildContext, rootPath: mainAppData.rootPath }, mainAppData, path_1.default.join(projDir, '/'), pageConfigs[0]);
+    await generatePkg({ ...buildContext, rootPath: mainAppData.rootPath }, { cals: calses[0], weapp: mainAppData }, path_1.default.join(projDir, '/'), pageConfigs[0]);
     const projectConfigJsonPath = path_1.default.join(projDir, mainAppData.rootPath || '', 'project.config.json');
     let projectConfigJson = await fs.readJSON(projectConfigJsonPath);
     const miniprogramRoot = path_1.default.join(projDir, projectConfigJson.miniprogramRoot || '/');
@@ -114,6 +115,12 @@ async function generateWxMp({ buildContext, weapps, calses, plugins, deployOptio
             endpointType,
         }, miniprogramRoot);
         const expirationStartTimesnap = buildContext.enableExpiredTag ? Date.now() : 0;
+        const cssVarList = Object.entries((0, theme_1.mergeCssVarConfig)((_b = (_a = calses[0]) === null || _a === void 0 ? void 0 : _a.theme) === null || _b === void 0 ? void 0 : _b.cssVarConfig, 'MP'))
+            .map(([key, _value]) => {
+            const value = _value || '';
+            return `${key}: ${value}${/;$/.test(value) ? '' : ';'}`;
+        })
+            .filter((str) => !!str) || [];
         appFileData = {
             ...appFileData,
             'common/style.js': {},
@@ -124,6 +131,7 @@ async function generateWxMp({ buildContext, weapps, calses, plugins, deployOptio
             'common/widget.js': {},
             'common/weapp-page.js': {
                 expirationStartTimesnap,
+                pageStyle: cssVarList.join(''),
             },
             'common/weapp-component.js': {},
             'common/merge-renderer.js': {
@@ -226,9 +234,9 @@ async function generateWxMp({ buildContext, weapps, calses, plugins, deployOptio
                 appID: appId,
                 resourceAppid: !!options.isCrossAccount ? options.resourceAppId : '',
                 isProd: (deployOptions === null || deployOptions === void 0 ? void 0 : deployOptions.mode) === types_1.DEPLOY_MODE.UPLOAD,
-                clientID: ((_a = mainAppData.extra) === null || _a === void 0 ? void 0 : _a.enableLoginStatusShare)
+                clientID: ((_c = mainAppData.extra) === null || _c === void 0 ? void 0 : _c.enableLoginStatusShare)
                     ? mainAppData.envId
-                    : (_b = mainAppData.extra) === null || _b === void 0 ? void 0 : _b.clientId,
+                    : (_d = mainAppData.extra) === null || _d === void 0 ? void 0 : _d.clientId,
                 cdnEndpoints,
                 builderVersion: core_1.version || '',
                 officialLibVersion: (officialLib === null || officialLib === void 0 ? void 0 : officialLib.version) || '',
@@ -265,7 +273,7 @@ async function generateWxMp({ buildContext, weapps, calses, plugins, deployOptio
                 ...buildContext,
                 rootPath: app.rootPath,
             };
-            await generatePkg(subpackageBuildCtx, app, subpackageRootPath, pageConfigs[index]);
+            await generatePkg(subpackageBuildCtx, { cals: calses[index], weapp: app }, subpackageRootPath, pageConfigs[index]);
             await generateFramework(subpackageBuildCtx, app, subpackageRootPath, { deployOptions });
             // 生成package.json
             let packageJsonPath = path_1.default.join(subpackageRootPath, 'package.json');
@@ -298,8 +306,10 @@ async function generateWxMp({ buildContext, weapps, calses, plugins, deployOptio
     await handleMpPlugins();
     console.timeEnd(operationLabel);
     // web端的builder不需要清除
-    !isBrowserMpBuilder && cleanProj(weapps, miniprogramRoot);
-    !isBrowserMpBuilder && cleanMaterils(path_1.default.join(miniprogramRoot, config_1.materialsDirName), allAppUsedComps);
+    if (!isBrowserMpBuilder) {
+        cleanProj(weapps, miniprogramRoot);
+        cleanMaterils(path_1.default.join(miniprogramRoot, config_1.materialsDirName), used);
+    }
     return { miniprogramRoot };
     // SDK 插件
     async function handleMpPlugins() {
@@ -359,7 +369,8 @@ async function generateConfig(data, root) {
     }, templateDir, root);
 }
 exports.generateConfig = generateConfig;
-async function generatePkg(ctx, weapp, appRoot, pageConfigs) {
+async function generatePkg(ctx, { cals, weapp }, appRoot, pageConfigs) {
+    var _a;
     const wxmlDataPrefix = (0, mp_1.getWxmlDataPrefix)(!ctx.isProduction);
     console.log(`Generating ${em(weapp.rootPath ? 'subApp' : 'app')} to ${appRoot}`);
     const { processCssUnit = 'rpx' } = ctx;
@@ -376,6 +387,10 @@ async function generatePkg(ctx, weapp, appRoot, pageConfigs) {
         // #2 generate page files
         console.log(`Generating ${em('page')} files`);
         (0, generateFiles_1.cleanDir)(path_1.default.join(appRoot, 'pages'), []);
+        const CALS_PAGE_MAP = (_a = cals.items) === null || _a === void 0 ? void 0 : _a.reduce((map, page) => {
+            map[page.id] = page;
+            return map;
+        }, {});
         await Promise.all(weapp.pageInstanceList.map(async (page, index) => {
             var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
             // # Generating page
@@ -383,15 +398,12 @@ async function generatePkg(ctx, weapp, appRoot, pageConfigs) {
             const usingComponents = {};
             const componentGenerics = {};
             const componentInstances = (0, util_2.processRepeaterSchema)(ctx, page.componentInstances);
-            const { allAppUsedComps = [] } = handleUsedComponents({
-                buildContext: ctx,
-                weapps: [
-                    {
-                        ...weapp,
-                        pageInstanceList: [page],
-                    },
-                ],
-            });
+            const allAppUsedComps = (0, cals_1.getUsedComps)([
+                {
+                    ...cals,
+                    items: CALS_PAGE_MAP[page.id] ? [CALS_PAGE_MAP[page.id]] : [],
+                },
+            ], ctx.materialLibs);
             const wxml = (0, wxml_1.generateWxml)({ ...ctx, rootPath, pageUUID: rootPath ? `${rootPath}/${page.id}` : page.id }, componentInstances, `Page ${rootPath ? path_1.default.join('packages', rootPath, 'pages') : ''}/${page.id}`, wxmlDataPrefix, usingComponents, componentGenerics);
             const importor = (0, util_3.generateLowcodeImportor)(page.lowCodes);
             const pageFileName = (0, lodash_1.get)(pageConfigs, `${page.id}.pageFileName`, 'index');
@@ -595,42 +607,6 @@ function getAppendableJson(json = {}) {
     return '';
 }
 // 处理使用到的组件
-/**
- * TODO: 与 cals 里的实现进行整合
- * 关键点在于 appUsedComps 分组， 与 generic componen 的实现
- */
-function handleUsedComponents({ buildContext, weapps }) {
-    const { materialLibs: materials } = buildContext;
-    const appUsedComps = weapps.map((app) => {
-        var _a;
-        const usedComps = {};
-        (_a = app.pageInstanceList) === null || _a === void 0 ? void 0 : _a.forEach((p) => (0, wxml_1.getUsedComponents)(p.componentInstances, usedComps));
-        return {
-            rootPath: app.rootPath || '',
-            usedComps,
-        };
-    });
-    // merge all app/subapp used
-    let allAppUsedComps = appUsedComps.reduce((comps, item) => {
-        Object.keys(item.usedComps).forEach((libName) => {
-            comps[libName] = new Set([...Array.from(item.usedComps[libName]), ...Array.from(comps[libName] || [])]);
-        });
-        return comps;
-    }, {});
-    const compositedLibs = materials.filter((lib) => lib.isComposite);
-    allAppUsedComps = (0, materials_1.extractUsedCompsRecursively)(allAppUsedComps, [], compositedLibs);
-    if (buildContext.isMixMode) {
-        appUsedComps.forEach((item) => {
-            const appCompositedLibs = materials.filter((lib) => lib.isComposite);
-            item.usedComps = (0, materials_1.extractUsedCompsRecursively)(item.usedComps, [], appCompositedLibs);
-        });
-    }
-    return {
-        appUsedComps,
-        allAppUsedComps,
-    };
-}
-exports.handleUsedComponents = handleUsedComponents;
 async function cleanProj(weapps, miniprogramRoot) {
     weapps.map((pkg) => cleanPkg(pkg, miniprogramRoot));
 }
@@ -670,11 +646,12 @@ async function cleanPkg(pkg, miniprogramRoot) {
 /**
  * Delete unsed materials
  */
-function cleanMaterils(materialsDir, usedComps) {
+function cleanMaterils(materialsDir, used) {
     if (fs.existsSync(materialsDir)) {
         fs.readdirSync(materialsDir)
             .filter(junk.not)
             .map((libName) => {
+            var _a;
             const libDir = path_1.default.join(materialsDir, libName);
             if (fs.existsSync(path_1.default.join(libDir, 'meta.json'))) {
                 try {
@@ -684,11 +661,11 @@ function cleanMaterils(materialsDir, usedComps) {
                 // Skip none-composited materials
                 return;
             }
-            if (!usedComps[libName]) {
+            if (!used.component[libName] && !used.action[libName]) {
                 (0, generateFiles_1.removeFile)(libDir);
                 return;
             }
-            (0, generateFiles_1.cleanDir)(libDir, [...Array.from(usedComps[libName]), 'libCommonRes']);
+            (0, generateFiles_1.cleanDir)(libDir, [...Array.from((_a = used.component) === null || _a === void 0 ? void 0 : _a[libName]), 'libCommonRes']);
         });
     }
 }

package/lib/builder/mp/materials.d.ts

@@ -1,8 +1,11 @@
-import { IMaterialItem, ICompositedComponent, IWeAppComponentInstance, IWeAppData } from '@cloudbase/lowcode-generator/lib/weapps-core';
+import { IWeAppComponentInstance, IWeAppData } from '@cloudbase/lowcode-generator/lib/weapps-core';
 import { IBuildContext } from './BuildContext';
 import NameMangler from '@cloudbase/lowcode-generator/lib/generator/util/name-mangler';
 import { IUsedComps } from '../types/common';
-export declare function installMaterials(ctx: IBuildContext, projDir: string, usedComps: IUsedComps, weapps: IWeAppData[]): Promise<void>;
+export declare function installMaterials(ctx: IBuildContext, projDir: string, usedMeta: {
+    component: IUsedComps;
+    action: IUsedComps;
+}, weapps: IWeAppData[]): Promise<void>;
 /**
  * 过滤组件库文件
  * @param src 源文件
@@ -10,7 +13,6 @@ export declare function installMaterials(ctx: IBuildContext, projDir: string, us
  * @returns boolean
  */
 export declare function filterMaterial(src: any, dest: any): boolean;
-export declare function extractUsedCompsRecursively(comps: IUsedComps, checkedComps: ICompositedComponent[], compositedLibs: IMaterialItem[], outputComps?: IUsedComps): IUsedComps;
 export declare function getWxmlTag(ctx: IBuildContext, cmp: Required<IWeAppComponentInstance>['xComponent'], nameMangler?: NameMangler): {
     tagName: string;
     path?: undefined;

package/lib/builder/mp/materials.js

@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getWxmlTag = exports.extractUsedCompsRecursively = exports.filterMaterial = exports.installMaterials = void 0;
+exports.getWxmlTag = exports.filterMaterial = exports.installMaterials = void 0;
 const path = __importStar(require("path"));
 const util_1 = require("util");
 const fs = __importStar(require("fs-extra"));
@@ -43,13 +43,14 @@ const name_mangler_1 = __importDefault(require("@cloudbase/lowcode-generator/lib
 const junk = __importStar(require("../util/junk"));
 const cals_1 = require("@cloudbase/cals");
 const templateDir = `${config_1.appTemplateDir}/mp/`;
-async function installMaterials(ctx, projDir, usedComps, weapps) {
-    let { materialLibs, isBrowserMpBuilder } = ctx;
+async function installMaterials(ctx, projDir, usedMeta, weapps) {
+    let { materialLibs: _materialLibs, isBrowserMpBuilder } = ctx;
     const weappsList = ctx.isMixMode ? weapps : weapps.filter((item) => !item.rootPath);
+    let materialLibs = _materialLibs.filter((lib) => usedMeta.component[lib.name] || usedMeta.action[lib.name]);
     // #1 Download uploaded libs
     const localPkg = (0, util_2.getCurrentPackageJson)();
     await Promise.all(materialLibs
-        .filter((lib) => !lib.isComposite && usedComps[lib.name])
+        .filter((lib) => !lib.isComposite)
         .map(async (lib) => {
         const { name, version, mpPkgUrl } = lib;
         let materialsSrcDir = '';
@@ -140,10 +141,9 @@ async function installMaterials(ctx, projDir, usedComps, weapps) {
         }));
     }));
     // clean unused comps
-    materialLibs = ctx.materialLibs.filter((lib) => usedComps[lib.name]);
     ctx.materialLibs = materialLibs;
-    materialLibs.map((lib) => {
-        lib.components = lib.components.filter((comp) => usedComps[lib.name].has(comp.name));
+    materialLibs.forEach((lib) => {
+        lib.components = lib.components.filter((comp) => { var _a, _b; return (_b = (_a = usedMeta.component[lib.name]) === null || _a === void 0 ? void 0 : _a.has) === null || _b === void 0 ? void 0 : _b.call(_a, comp.name); });
     });
     // populate cmp.materialName
     materialLibs.map((lib) => {
@@ -173,7 +173,7 @@ async function installMaterials(ctx, projDir, usedComps, weapps) {
         });
     });
     // Collection infomation from components to lib meta
-    const compositedLibs = materialLibs.filter((lib) => lib.isComposite && usedComps[lib.name]);
+    const compositedLibs = materialLibs.filter((lib) => lib.isComposite);
     // #2 Generate composited libs
     await Promise.all(compositedLibs.map(async (lib) => {
         console.log(`Generate composited library ${lib.name}`);
@@ -204,40 +204,6 @@ function filterMaterial(src, dest) {
     return !junk.is(srcPath[srcPath.length - 1]);
 }
 exports.filterMaterial = filterMaterial;
-// 递归查询复合组件所使用的组件
-function extractUsedCompsRecursively(comps, checkedComps, compositedLibs, outputComps) {
-    let usedComps = (outputComps || comps);
-    const libsUsedByApp = Object.keys(comps);
-    libsUsedByApp.forEach((libName) => {
-        const cmpNames = comps[libName];
-        const lib = compositedLibs.find((lib) => lib.name == libName);
-        if (!lib || !lib.isComposite)
-            return;
-        cmpNames.forEach((cmpName) => {
-            const cmp = lib.components.find((c) => c.name === cmpName);
-            if (!cmp) {
-                console.warn('Component not found', `${libName}:${cmpName}`);
-                return;
-            }
-            if (checkedComps.indexOf(cmp) > -1)
-                return;
-            checkedComps.push(cmp);
-            const cmpsUsedByThisComp = (0, wxml_1.getUsedComponents)(cmp.componentInstances);
-            const libs = Object.keys(cmpsUsedByThisComp);
-            libs.forEach((libName) => {
-                if (!usedComps[libName]) {
-                    usedComps[libName] = cmpsUsedByThisComp[libName];
-                }
-                else {
-                    cmpsUsedByThisComp[libName].forEach((n) => usedComps[libName].add(n));
-                }
-            });
-            extractUsedCompsRecursively(cmpsUsedByThisComp, checkedComps, compositedLibs, usedComps);
-        });
-    });
-    return usedComps;
-}
-exports.extractUsedCompsRecursively = extractUsedCompsRecursively;
 async function downloadMaterial(zipUrl, dstFolder, isBrowser = false, noCache = false) {
     if (!noCache && fs.existsSync(path.join(dstFolder, 'meta.json')))
         return;

package/lib/builder/mp/mixMode.d.ts

@@ -1,5 +1,4 @@
-import { IWeAppData, IPlugin, IMaterialItem } from '@cloudbase/lowcode-generator/lib/weapps-core';
-import { IAppUsedComp } from '../types/common';
+import { IWeAppData, IPlugin } from '@cloudbase/lowcode-generator/lib/weapps-core';
 import { IBuildContext } from '../mp/BuildContext';
 export declare function handleMixMode({ buildContext, apps, miniprogramRoot, plugins, ignoreInstall, }: {
     buildContext: IBuildContext;
@@ -8,4 +7,3 @@ export declare function handleMixMode({ buildContext, apps, miniprogramRoot, plu
     plugins: IPlugin[];
     ignoreInstall: boolean;
 }): Promise<void>;
-export declare function handleMixMaterials(projDir: string, apps: IWeAppData[], appUsedComps: IAppUsedComp[], compositedLibs: IMaterialItem[]): Promise<void[]>;

package/lib/builder/mp/mixMode.js

@@ -26,12 +26,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.handleMixMaterials = exports.handleMixMode = void 0;
+exports.handleMixMode = void 0;
 const path_1 = __importDefault(require("path"));
 const fs_extra_1 = __importStar(require("fs-extra"));
 const mp_1 = require("../util/mp");
 const plugin_1 = require("./plugin");
-const lodash_1 = require("lodash");
 const chalk_1 = __importDefault(require("chalk"));
 const generateFiles_1 = require("../util/generateFiles");
 const webpack_1 = require("../service/webpack");
@@ -179,39 +178,3 @@ async function handleMixMode({ buildContext, apps = [], miniprogramRoot, plugins
     }
 }
 exports.handleMixMode = handleMixMode;
-// 子模式则清理未使用的组件库
-async function handleMixMaterials(projDir, apps, appUsedComps, compositedLibs) {
-    return Promise.all(apps.map(async (app) => {
-        var _a;
-        const rootPath = app.rootPath || '';
-        const materialsDirPath = path_1.default.join(projDir, rootPath, 'materials');
-        const usedComps = ((_a = appUsedComps.find((item) => item.rootPath === rootPath)) === null || _a === void 0 ? void 0 : _a.usedComps) || {};
-        const materialsLib = await readDirs(materialsDirPath);
-        // 清理未使用的组件库
-        const cleanLibs = (0, lodash_1.difference)(materialsLib, Object.keys(usedComps));
-        await removeDirs(cleanLibs.map((libName) => path_1.default.join(materialsDirPath, libName)));
-        // 清理未使用的组件
-        await Promise.all(Object.keys(usedComps).map(async (libName) => {
-            // 只去处理复合组件
-            if (!compositedLibs.find((item) => item.name === libName)) {
-                return;
-            }
-            const libComponents = usedComps[libName];
-            const materialsLibComps = await readDirs(path_1.default.join(materialsDirPath, libName));
-            const cleanComps = (0, lodash_1.difference)(materialsLibComps, Array.from(libComponents));
-            await removeDirs(cleanComps.map((compName) => path_1.default.join(materialsDirPath, libName, compName)));
-        }));
-    }));
-}
-exports.handleMixMaterials = handleMixMaterials;
-async function removeDirs(dirs) {
-    return Promise.all(dirs.map((dir) => {
-        console.log('【MIX MODE 清理】', dir);
-        return fs_extra_1.default.remove(dir);
-    }));
-}
-// 只返回文件夹
-async function readDirs(dirPath) {
-    const isDirectory = (source) => (0, fs_extra_1.lstatSync)(source).isDirectory();
-    return ((await fs_extra_1.default.readdir(dirPath)) || []).filter((name) => isDirectory(path_1.default.join(dirPath, name)));
-}

package/lib/builder/mp/util.d.ts

@@ -23,6 +23,13 @@ export declare function createTemplateQuery(ctx: IBuildContext, query?: {
     [key: string]: IQueryData;
 }): {};
 export declare function createTemplateEventFlows(ctx: IBuildContext, eventFlows?: any[]): any[];
+export declare function generateArgsDynamicValueFromData(args?: {
+    [prop: string]: IDynamicValue;
+}, data?: {
+    [prop: string]: IDynamicValue;
+}): {
+    [prop: string]: IDynamicValue;
+} | undefined;
 export declare function createDataBinds(ctx: IBuildContext, widgets: {
     [key: string]: IWeAppComponentInstance;
 }): {};