@cloudbase/lowcode-builder 0.1.14 → 0.1.17

package/lib/builder/mp/index.js

@@ -46,9 +46,8 @@ const types_1 = require("../../types");
 const common_1 = require("../types/common");
 const lodash_1 = require("lodash");
 const junk = __importStar(require("../util/junk"));
-const path_2 = __importDefault(require("path"));
 const net_1 = require("../util/net");
-const templateDir = config_1.appTemplateDir + '/mp/';
+const templateDir = `${config_1.appTemplateDir}/mp/`;
 const em = chalk_1.default.blue.bold;
 const error = chalk_1.default.redBright;
 async function generateWxMp({ weapps, projDir, appId, domain, materials, plugins, isProduction, deployMode, extraData, isMixMode, options, buildTypeList, isBrowserMpBuilder = false, }) {
@@ -85,7 +84,7 @@ async function generateWxMp({ weapps, projDir, appId, domain, materials, plugins
         const projectFileData = {
             'project.config.json': { content: projConfig },
         };
-        console.log('Generating ' + em('project') + ' files');
+        console.log(`Generating ${em('project')} files`);
         await (0, generateFiles_1.default)(projectFileData, templateDir, projDir, buildContext);
     }
     // #2 生成主包
@@ -143,17 +142,7 @@ async function generateWxMp({ weapps, projDir, appId, domain, materials, plugins
         await (0, generateFiles_1.writeFile)(projectConfigJsonPath, JSON.stringify(projectConfigJson, undefined, 2));
         let appJsonPath = path_1.default.join(miniprogramRoot, 'app.json');
         let appJson = await fs.readJson(appJsonPath);
-        let subpackages = appJson.subpackages || [];
-        for (let item of appConfig.subpackages || []) {
-            let find = subpackages.find((config) => config.root === item.root);
-            if (find) {
-                find.pages = Array.from(new Set([].concat(find.pages || []).concat(item.pages || [])));
-            }
-            else {
-                subpackages.push(item);
-            }
-        }
-        appJson.subpackages = subpackages;
+        appJson.subpackages = (0, mp_config_1.mergeSubPackages)(appJson.subpackages, appConfig.subpackages);
         await (0, generateFiles_1.writeFile)(appJsonPath, JSON.stringify(appJson, undefined, 2));
     }
     else {
@@ -328,7 +317,7 @@ async function generatePkg(weapp, appRoot, ctx, pageConfigs) {
                     dataBinds: (0, util_2.createDataBinds)(page.componentInstances, ctx),
                     debug: ctx.debugMode,
                     stringifyObj: util_1.inspect,
-                    subLevelPath: rootPath ? path_2.default.relative(rootPath, '') + '/' : '',
+                    subLevelPath: rootPath ? path_1.default.relative(rootPath, '') + '/' : '',
                 },
                 [`index.json|${pageFileName}.json`]: {
                     usingComponents,
@@ -341,7 +330,7 @@ async function generatePkg(weapp, appRoot, ctx, pageConfigs) {
                 },
                 [`index.wxss|${pageFileName}.wxss`]: {
                     subWxss: rootPath && !((_a = ctx.mainAppData) === null || _a === void 0 ? void 0 : _a.mpPkgUrl)
-                        ? `@import "${path_2.default.relative(`/${rootPath}/pages/${page.id}`, '/lowcode')}/style.wxss";`
+                        ? `@import "${path_1.default.relative(`/${rootPath}/pages/${page.id}`, '/lowcode')}/style.wxss";`
                         : '',
                     content: (0, weapps_core_1.toCssText)((0, weapps_core_1.toCssStyle)(page.commonStyle, {
                         toRem: false,
@@ -426,14 +415,17 @@ async function generateFramework(appData, outDir, ctx) {
     await (0, generateFiles_1.default)(fileData, templateDir, outDir, ctx);
 }
 async function writeLowCodeFiles(appData, outDir, ctx) {
-    console.log('Writing ' + em('lowcode') + ' files:');
+    console.log(`Writing ${em('lowcode')} files:`);
     const lowcodeRootDir = path_1.default.join(outDir, 'lowcode');
     const themeStyle = (0, style_1.generateDefaultTheme)(appData);
     // 混合模式，子包不生成顶级（应用级）的 lowcodes
     if (!(ctx.isMixMode && appData.rootPath)) {
         await Promise.all(appData.lowCodes
             .filter((mod) => mod.name !== '____index____')
-            .map((m) => (0, lowcode_1.writeCode2file)(m, lowcodeRootDir, { appDir: outDir }, themeStyle.code)));
+            .filter((mod) => mod.type !== 'renderer')
+            .map((m) => {
+            (0, lowcode_1.writeCode2file)(m, lowcodeRootDir, { appDir: outDir }, themeStyle.code);
+        }));
     }
     await Promise.all((0, weapps_core_1.loopDealWithFn)(appData.pageInstanceList, async (page) => {
         var _a;
@@ -447,7 +439,9 @@ async function writeLowCodeFiles(appData, outDir, ctx) {
                 path: 'xx/index',
             });
         }
-        await ((_a = page === null || page === void 0 ? void 0 : page.lowCodes) === null || _a === void 0 ? void 0 : _a.filter((mod) => mod.name !== '____index____').forEach((m) => (0, lowcode_1.writeCode2file)(m, lowcodeRootDir, { pageId: page.id, appDir: outDir }, themeStyle.code, ctx)));
+        await ((_a = page === null || page === void 0 ? void 0 : page.lowCodes) === null || _a === void 0 ? void 0 : _a.filter((mod) => mod.name !== '____index____').filter((mod) => mod.type !== 'renderer').forEach((m) => {
+            (0, lowcode_1.writeCode2file)(m, lowcodeRootDir, { pageId: page.id, appDir: outDir }, themeStyle.code, ctx);
+        }));
     }));
 }
 exports.writeLowCodeFiles = writeLowCodeFiles;

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

@@ -7,11 +7,17 @@ import { IBuildContext } from './BuildContext';
  * @param appConfigs app config from prop edit panel
  */
 export declare function generateMpConfig(weapps: IWeAppData[], ctx: IBuildContext): {
-    appConfig: {
-        useExtendedLib: {
-            weui: boolean;
-        };
-    };
+    appConfig: any;
     projConfig: any;
     pageConfigs: {}[];
 };
+interface ISubpackage {
+    root: string;
+    pages?: string[];
+    plugins?: Record<string, {
+        version?: string;
+        provider?: string;
+    }>;
+}
+export declare function mergeSubPackages(base?: ISubpackage[], extra?: ISubpackage[]): ISubpackage[];
+export {};

package/lib/builder/mp/mp_config.js

@@ -22,7 +22,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateMpConfig = void 0;
+exports.mergeSubPackages = exports.generateMpConfig = void 0;
 const path = __importStar(require("path"));
 const lodash_1 = require("lodash");
 const mp_1 = require("@cloudbase/lowcode-generator/lib/generator/config/mp");
@@ -43,7 +43,8 @@ function generateMpConfig(weapps, ctx) {
     };
     const { miniprogramPlugins = [] } = ctx;
     const projConfig = (0, lodash_1.merge)({}, mp_1.defaultProjConfig, {
-        projectname: (ctx.mainAppData && ctx.mainAppData.label) || ('WeDa-' + ctx.appId),
+        projectname: (ctx.mainAppData && ctx.mainAppData.label) ||
+            `WeDa-${ctx.appId}`,
     });
     const pageConfigs = weapps.map((app) => {
         var _a;
@@ -80,7 +81,9 @@ function generateMpConfig(weapps, ctx) {
     projConfig.packOptions.ignore.push(...matertialMetaIgnores);
     const { tradingCapability, ...mainAppConfig } = weapps[0].appConfig || {};
     // keep main app config only, ignore subapp config
-    (0, lodash_1.merge)(appConfig, mainAppConfig, extractPages(weapps, pageConfigs));
+    const { subpackages, ...extra } = extractPages(weapps, pageConfigs);
+    (0, lodash_1.merge)(appConfig, mainAppConfig, extra);
+    appConfig.subpackages = mergeSubPackages(appConfig.subpackages, subpackages);
     if (tradingCapability) {
         const tradePluginKey = `weda-mini-shop-plugin`;
         const pluginMeta = {
@@ -179,10 +182,29 @@ function parseTabConfig(tabBar, projDir) {
             console.error(chalk_1.default.red('App.json invalid tabbar icon path'), iconUrl);
             return;
         }
-        const iconPath = 'assets/tab' + index + '/' + filename + path.extname(iconUrl);
-        (0, net_1.downloadFile)(iconUrl, projDir + '/' + iconPath).catch((e) => {
+        const iconPath = `assets/tab${index}/${filename}${path.extname(iconUrl)}`;
+        (0, net_1.downloadFile)(iconUrl, `${projDir}/${iconPath}`).catch((e) => {
             console.error(chalk_1.default.red(`Fail to download tabBar icon from ${iconUrl}`), e);
         });
         return iconPath;
     }
 }
+function mergeSubPackages(base = [], extra = []) {
+    const baseMap = base.reduce((map, item) => {
+        map[item.root] = item;
+        return map;
+    }, {});
+    for (const subpackage of extra) {
+        if (!baseMap[subpackage.root]) {
+            base.push(subpackage);
+            continue;
+        }
+        const current = baseMap[subpackage.root];
+        current.pages = Array.from(new Set([...(current.pages || []), ...(subpackage.pages || [])]));
+        if (current.plugins || subpackage.plugins) {
+            current.plugins = (0, lodash_1.merge)(current.pplugins, subpackage.plugins);
+        }
+    }
+    return base;
+}
+exports.mergeSubPackages = mergeSubPackages;

package/lib/builder/mp/wxml.js

@@ -161,7 +161,7 @@ function generateWxml(widgets, docTag, wxmlDataPrefix, ctx, usingComponents, com
                 node.attributes['wx:key'] = 'id';
             }
             const compSchema = componentProto.dataForm;
-            for (const prop of Object.keys(data)) {
+            for (const prop of Object.keys(data || {})) {
                 if (compSchema) {
                     const fieldDef = compSchema[prop];
                     if (!fieldDef && !isGlobalAttr(prop)) {
@@ -245,7 +245,7 @@ function generateWxml(widgets, docTag, wxmlDataPrefix, ctx, usingComponents, com
                 componentKey === 'gsd-h5-react:Swiper') {
                 node.elements = node.elements.map((item, index) => {
                     var _a, _b;
-                    let { ['wx:for']: wxFor, ['wx:for-index']: wxForIndex, ['wx:key']: wxKey, ...itemRestKey } = item.attributes || {};
+                    let { ['wx:for']: wxFor, ['wx:for-index']: wxForIndex, ['wx:key']: wxKey, ['wx:if']: wxIf, ...itemRestKey } = item.attributes || {};
                     if (item.name !== 'swiper-item') {
                         let SwiperItem = {
                             type: 'element',
@@ -255,6 +255,7 @@ function generateWxml(widgets, docTag, wxmlDataPrefix, ctx, usingComponents, com
                                 'wx:for': wxFor,
                                 'wx:for-index': wxForIndex,
                                 'wx:key': wxKey,
+                                'wx:if': wxIf,
                             },
                             elements: [],
                             _order: index || 0,

package/lib/builder/util/mp.js

@@ -32,6 +32,7 @@ exports.mergePages = exports.mergePackageDependiences = exports.mergePackageJson
  */
 const fs = __importStar(require("fs-extra"));
 const lodash_1 = __importDefault(require("lodash"));
+const mp_config_1 = require("../mp/mp_config");
 // 将后面的子包配置合并到前面
 // 暂时不考虑 root 会重名的情况
 async function mergeSubPackages(baseAppJsonPath, mergeAppJsonPath) {
@@ -40,24 +41,7 @@ async function mergeSubPackages(baseAppJsonPath, mergeAppJsonPath) {
     if (!getSubPackages(mergeJson))
         return;
     const newJson = { ...baseJson };
-    if (!baseJson.subpackages) {
-        newJson.subpackages = getSubPackages(mergeJson);
-    }
-    else {
-        getSubPackages(mergeJson).forEach((mergeItem) => {
-            // 找到重复的进行合并再去重
-            const targetItemIdx = newJson.subpackages.findIndex((item) => {
-                return item.root === mergeItem.root;
-            });
-            if (newJson.subpackages[targetItemIdx]) {
-                const pages = lodash_1.default.uniq([].concat(newJson.subpackages[targetItemIdx].pages, mergeItem.pages));
-                newJson.subpackages[targetItemIdx].pages = pages;
-            }
-            else {
-                newJson.subpackages.push(mergeItem);
-            }
-        });
-    }
+    newJson.subpackages = (0, mp_config_1.mergeSubPackages)(baseJson.subpackages, mergeJson.subpackages);
     fs.writeJSONSync(baseAppJsonPath, newJson, { spaces: 2 });
     // 处理兼容
     function getSubPackages(json) {