@cloudbase/lowcode-builder 1.8.94 → 1.8.96

package/lib/builder/mp/util.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateScopedStyleText = exports.findComponentInfo = exports.processRepeaterSchema = exports.setDataBind = exports.createDataBinds = exports.generateArgsDynamicValueFromData = exports.createTemplateEventFlows = exports.createTemplateQuery = exports.generateDataContainerListeners = exports.generateSyncListeners = exports.createEventHandlers = exports.createWidgetProps = exports.generatedDynamicData = void 0;
+exports.isRepeaterWidget = exports.generateScopedStyleText = exports.findComponentInfo = exports.processRepeaterSchema = exports.setDataBind = exports.createDataBinds = exports.generateArgsDynamicValueFromData = exports.createTemplateEventFlows = exports.createTemplateQuery = exports.generateDataContainerListeners = exports.generateSyncListeners = exports.createEventHandlers = exports.createWidgetProps = exports.generatedDynamicData = void 0;
 const weapps_core_1 = require("@cloudbase/lowcode-generator/lib/weapps-core");
 const lowcode_generator_1 = require("@cloudbase/lowcode-generator");
 const weapp_1 = require("@cloudbase/lowcode-generator/lib/generator/util/weapp");
@@ -128,14 +128,8 @@ function createWidgetProps(ctx, widgets) {
             materialLibs: ctx.materialLibs,
             miniprogramPlugins: ctx.miniprogramPlugins,
         });
-        if (!widegetComp) {
-            if (xComponent.moduleName === config_1.REPEATER.MODULE_NAME &&
-                (xComponent.name === config_1.REPEATER.REPEATER_NAME || xComponent.name === config_1.REPEATER.REPEATER_ITEM_NAME)) {
-                // skip
-            }
-            else {
-                return;
-            }
+        if (!widegetComp && !checkRepeaterComponent(xComponent)) {
+            return;
         }
         widgetProps[id] = extractWidgetProps(xProps, widegetComp, ctx.processCssUnit);
         widgetProps[id]._parentId = parentId;
@@ -157,8 +151,7 @@ function createEventHandlers(ctx, widgets, componentApi, page) {
             return;
         }
         let compProto;
-        if (xComponent.moduleName === config_1.REPEATER.MODULE_NAME &&
-            (xComponent.name === config_1.REPEATER.REPEATER_ITEM_NAME || xComponent.name === config_1.REPEATER.REPEATER_NAME)) {
+        if (checkRepeaterComponent(xComponent)) {
             // 内部虚组件，不校验compProto
         }
         else {
@@ -357,8 +350,7 @@ function createDataBinds(ctx, widgets) {
             // skip slot component
             return;
         }
-        if (xComponent.moduleName === config_1.REPEATER.MODULE_NAME &&
-            (xComponent.name === config_1.REPEATER.REPEATER_NAME || xComponent.name === config_1.REPEATER.REPEATER_ITEM_NAME)) {
+        if (checkRepeaterComponent(xComponent)) {
             // skip exist
         }
         else if (!findComponentInfo(xComponent, { materialLibs: ctx.materialLibs, miniprogramPlugins: ctx.miniprogramPlugins })) {
@@ -439,16 +431,36 @@ function processRepeaterSchema(ctx, componentInstanceMap) {
             // skip slot component
             return;
         }
-        if (`${xComponent.moduleName}:${xComponent.name}` === `${config_1.REPEATER.MODULE_NAME}:${config_1.REPEATER.REPEATER_NAME}`) {
+        const componentInfo = findComponentInfo(xComponent, {
+            materialLibs: ctx.materialLibs,
+            miniprogramPlugins: ctx.miniprogramPlugins,
+        });
+        const simpleWidget = {
+            widgetType: `${xComponent.moduleName}:${xComponent.name}`,
+            getConfig: () => {
+                return (componentInfo === null || componentInfo === void 0 ? void 0 : componentInfo.compConfig) || {};
+            },
+        };
+        if (isRepeaterWidget(simpleWidget, config_1.REPEATER.REPEATER_NAME)) {
             const children = Object.values(properties);
             // 子项已经为 item 的不在处理
             if (children.length === 1) {
                 const child = children[0];
                 const { xComponent: childXComponent } = child;
-                if (childXComponent &&
-                    `${childXComponent.moduleName}:${childXComponent.name}` ===
-                        `${config_1.REPEATER.MODULE_NAME}:${config_1.REPEATER.REPEATER_ITEM_NAME}`) {
-                    return;
+                if (childXComponent) {
+                    const componentInfo = findComponentInfo(childXComponent, {
+                        materialLibs: ctx.materialLibs,
+                        miniprogramPlugins: ctx.miniprogramPlugins,
+                    });
+                    const simpleWidget = {
+                        widgetType: `${xComponent.moduleName}:${xComponent.name}`,
+                        getConfig: () => {
+                            return (componentInfo === null || componentInfo === void 0 ? void 0 : componentInfo.compConfig) || {};
+                        },
+                    };
+                    if (isRepeaterWidget(simpleWidget, config_1.REPEATER.REPEATER_ITEM_NAME)) {
+                        return;
+                    }
                 }
             }
             // 给 Repeater 组件加一层虚拟项组件，在虚拟项组件上挂 for 循环
@@ -483,10 +495,10 @@ function processRepeaterSchema(ctx, componentInstanceMap) {
                 },
             };
         }
-        else if (`${xComponent.moduleName}:${xComponent.name}` === `${config_1.REPEATER.MODULE_NAME}:${config_1.REPEATER.REPEATER_ITEM_NAME}`) {
+        else if (isRepeaterWidget(simpleWidget, config_1.REPEATER.REPEATER_ITEM_NAME)) {
             return;
         }
-        else if (xComponent && !findComponentInfo(xComponent, ctx)) {
+        else if (xComponent && !componentInfo) {
             component.properties = {};
         }
         return;
@@ -522,7 +534,7 @@ function findComponentInfo(xComponent, { materialLibs, miniprogramPlugins }) {
     return compProto;
 }
 exports.findComponentInfo = findComponentInfo;
-function generateScopedStyleText(widgets) {
+function generateScopedStyleText(widgets, weightPrefix = '#wd-page-root') {
     const cssTextList = [];
     function traverse(target) {
         var _a;
@@ -535,7 +547,7 @@ function generateScopedStyleText(widgets) {
                     // 移除换行及其前后的空白符
                     .replace(/\s*\n\s*/g, '')
                     // 添加 `#wd-page-root` 前缀以增加样式权重
-                    .replace(/(:scope.*?{)/g, '\n#wd-page-root $1')
+                    .replace(/(:scope.*?{)/g, `\n${weightPrefix} $1`)
                     // 替换 `:scope`
                     .replace(/:scope/g, `.wd-comp-id-${id}`)
                     // `: ` => `:`
@@ -555,3 +567,19 @@ function generateScopedStyleText(widgets) {
     return cssTextList.join('\n');
 }
 exports.generateScopedStyleText = generateScopedStyleText;
+function isRepeaterWidget(w, repeaterComponentName /* 'Repeater' | 'RepeaterItem' */) {
+    var _a;
+    const { componentType } = ((_a = w === null || w === void 0 ? void 0 : w.getConfig) === null || _a === void 0 ? void 0 : _a.call(w)) || {};
+    if (componentType === repeaterComponentName || (w === null || w === void 0 ? void 0 : w.widgetType) === `${config_1.REPEATER.MODULE_NAME}:${repeaterComponentName}`) {
+        return true;
+    }
+}
+exports.isRepeaterWidget = isRepeaterWidget;
+function checkRepeaterComponent(xComponent) {
+    if (xComponent.moduleName === config_1.REPEATER.MODULE_NAME &&
+        (xComponent.name === config_1.REPEATER.REPEATER_NAME || xComponent.name === config_1.REPEATER.REPEATER_ITEM_NAME)) {
+        return true;
+        // skip
+    }
+    return false;
+}

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

@@ -1,10 +1,12 @@
 import { IWeAppComponentInstance, IEventModifiers } from '@cloudbase/lowcode-generator/lib/weapps-core';
-import { IBuildContext } from './BuildContext';
+import { IBuildContext, IMpCommonBuildContext } from './BuildContext';
 export declare const WD_EMPTY_PLACEHOLDER = "wd-ph";
 export declare const WD_RUNTIME_TAG: string[];
-export declare function generateWxml(ctx: IBuildContext & {
+export declare function generateWxml(ctx: (IBuildContext & {
     pageUUID?: string;
-}, widgets: {
+}) | (IMpCommonBuildContext & {
+    pageUUID?: undefined;
+}), widgets: {
     [key: string]: IWeAppComponentInstance;
 }, docTag: string, wxmlDataPrefix: any, usingComponents: any, componentGenerics: any, nodeTransform?: (cmp: IWeAppComponentInstance, node: any) => void): string;
 export declare function getMpEventHandlerName(widgetId: string, evtName: string, modifier?: IEventModifiers): string;

package/lib/builder/mp/wxml.js

@@ -194,35 +194,37 @@ function generateWxml(ctx, widgets, docTag, wxmlDataPrefix, usingComponents, com
             }
             const componentKey = `${xComponent.moduleName}:${xComponent.name}`;
             const helpMsg = `Please check component(${id}) in component tree of ${docTag}.`;
-            let tagName, path, componentProto;
-            switch (componentKey) {
-                case `${config_1.REPEATER.MODULE_NAME}:${config_1.REPEATER.REPEATER_NAME}`: {
-                    const children = createXml(properties, parent, parentForNodes);
-                    for (let item of children) {
-                        item._order = xIndex || 0;
-                    }
-                    elements.push(...children);
-                    continue;
-                    break;
-                }
-                case `${config_1.REPEATER.MODULE_NAME}:${config_1.REPEATER.REPEATER_ITEM_NAME}`: {
-                    tagName = 'block';
-                    path = '';
-                    break;
+            let tagName, path;
+            const componentProto = (0, util_1.findComponentInfo)(xComponent, {
+                materialLibs: ctx.materialLibs,
+                miniprogramPlugins: ctx.miniprogramPlugins,
+            });
+            const simpleWidget = {
+                widgetType: componentKey,
+                getConfig: () => {
+                    return (componentProto === null || componentProto === void 0 ? void 0 : componentProto.compConfig) || {};
+                },
+            };
+            if ((0, util_1.isRepeaterWidget)(simpleWidget, config_1.REPEATER.REPEATER_NAME)) {
+                const children = createXml(properties, parent, parentForNodes);
+                for (let item of children) {
+                    item._order = xIndex || 0;
                 }
-                default: {
-                    componentProto = (0, util_1.findComponentInfo)(xComponent, {
-                        materialLibs: ctx.materialLibs,
-                        miniprogramPlugins: ctx.miniprogramPlugins,
-                    });
-                    if (!componentProto) {
-                        console.error(error(`Component(${xComponent.name}) not found in lib(${xComponent.moduleName}). ${helpMsg}`));
-                        continue;
-                    }
-                    const meta = (0, materials_1.getWxmlTag)(ctx, xComponent, nameMangler);
-                    tagName = meta.tagName;
-                    path = meta.path;
+                elements.push(...children);
+                continue;
+            }
+            else if ((0, util_1.isRepeaterWidget)(simpleWidget, config_1.REPEATER.REPEATER_ITEM_NAME)) {
+                tagName = 'block';
+                path = '';
+            }
+            else {
+                if (!componentProto) {
+                    console.error(error(`Component(${xComponent.name}) not found in lib(${xComponent.moduleName}). ${helpMsg}`));
+                    continue;
                 }
+                const meta = (0, materials_1.getWxmlTag)(ctx, xComponent, nameMangler);
+                tagName = meta.tagName;
+                path = meta.path;
             }
             if (genericComp === null || genericComp === void 0 ? void 0 : genericComp.propName) {
                 tagName = getGenericCompTagName(genericComp.propName);

package/lib/builder/service/webpack.js

@@ -259,7 +259,6 @@ async function downloadDependencies(targetDir, srcZipUrl) {
     }
 }
 exports.downloadDependencies = downloadDependencies;
-// TODO use yarn if installed
 async function installDependencies(targetDir, options = {}) {
     var _a;
     let yarnExists = false;

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

@@ -1,6 +1,6 @@
 import { IComponentInputProps, IComponentsInfoMap, IPackageJson } from '../types/common';
 import { IMaterialItem, IWeAppComponentInstance, IWeAppCode } from '@cloudbase/lowcode-generator/lib/weapps-core';
-export { getMetaInfoBySourceKey, isArray, isPlainObject, deepDeal, simpleDeepClone, deepDealSchema, getFileNameByUrl, } from '@cloudbase/lowcode-generator/lib/generator/util/common';
+export { getMetaInfoBySourceKey, isArray, isPlainObject, deepDeal, simpleDeepClone, getFileNameByUrl, } from '@cloudbase/lowcode-generator/lib/generator/util/common';
 declare type PromiseResult<T> = Promise<[null, T] | [Error, null]>;
 export declare function promiseWrapper<T>(p: Promise<T>): PromiseResult<T>;
 export declare function getCurrentPackageJson(): {
@@ -14,7 +14,6 @@ export declare function JsonToStringWithVariableName(copyJson: any, options?: {
 export declare function requireUncached(module: any): any;
 export declare function removeRequireUncached(path?: string): void;
 export declare function getInputProps(componentsMetaMap: IComponentsInfoMap): IComponentInputProps;
-export declare function getComponentsInfo(appBuildDir: string, dependencies: IMaterialItem[]): Promise<IComponentsInfoMap>;
 export declare function getYyptConfigInfo(extraData: any): Promise<{
     yyptAppKey: any;
     reportUrl: any;

package/lib/builder/util/common.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.normalizeWedaRoot = exports.normalizePackageName = exports.generateLowcodeImportor = exports.getCompileDirs = exports.deepDealComponentSchemaJson = exports.canUseVite = exports.isOfficialComponentLib = exports.readComponentLibMata = exports.writeLibCommonRes2file = exports.getYyptConfigInfo = exports.getComponentsInfo = exports.getInputProps = exports.removeRequireUncached = exports.requireUncached = exports.JsonToStringWithVariableName = exports.getSelfPackageJson = exports.getCurrentPackageJson = exports.promiseWrapper = exports.getFileNameByUrl = exports.deepDealSchema = exports.simpleDeepClone = exports.deepDeal = exports.isPlainObject = exports.isArray = exports.getMetaInfoBySourceKey = void 0;
+exports.normalizeWedaRoot = exports.normalizePackageName = exports.generateLowcodeImportor = exports.getCompileDirs = exports.deepDealComponentSchemaJson = exports.canUseVite = exports.isOfficialComponentLib = exports.readComponentLibMata = exports.writeLibCommonRes2file = exports.getYyptConfigInfo = exports.getInputProps = exports.removeRequireUncached = exports.requireUncached = exports.JsonToStringWithVariableName = exports.getSelfPackageJson = exports.getCurrentPackageJson = exports.promiseWrapper = exports.getFileNameByUrl = exports.simpleDeepClone = exports.deepDeal = exports.isPlainObject = exports.isArray = exports.getMetaInfoBySourceKey = void 0;
 // import * as R from 'ramda'
 const path_1 = __importDefault(require("path"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
@@ -19,7 +19,6 @@ Object.defineProperty(exports, "isArray", { enumerable: true, get: function () {
 Object.defineProperty(exports, "isPlainObject", { enumerable: true, get: function () { return common_1.isPlainObject; } });
 Object.defineProperty(exports, "deepDeal", { enumerable: true, get: function () { return common_1.deepDeal; } });
 Object.defineProperty(exports, "simpleDeepClone", { enumerable: true, get: function () { return common_1.simpleDeepClone; } });
-Object.defineProperty(exports, "deepDealSchema", { enumerable: true, get: function () { return common_1.deepDealSchema; } });
 Object.defineProperty(exports, "getFileNameByUrl", { enumerable: true, get: function () { return common_1.getFileNameByUrl; } });
 const homeDir = os_1.default.homedir();
 const commandConfigPath = path_1.default.join(homeDir, '.warc');
@@ -100,49 +99,6 @@ function getInputProps(componentsMetaMap) {
     return outputObj;
 }
 exports.getInputProps = getInputProps;
-async function getComponentsInfo(appBuildDir, dependencies) {
-    const outputObj = {};
-    await Promise.all(dependencies.map(async ({ name: materialName, version, components = [], isComposite }) => {
-        if (isComposite) {
-            components.forEach((component) => {
-                let { lowCodes, componentInstances, ...compItem } = component;
-                const sourceKey = `${materialName}:${compItem.name}`;
-                outputObj[sourceKey] = {
-                    isComposite,
-                    ...compItem,
-                };
-            });
-        }
-        else {
-            const materialComponentsPath = path_1.default.resolve(appBuildDir, `src/libraries/${materialName}@${version}/components`);
-            const componentLibPath = path_1.default.resolve(appBuildDir, `src/libraries/${materialName}@${version}`);
-            const meta = readComponentLibMata(componentLibPath);
-            if (meta) {
-                const { components: componentsMap } = meta;
-                for (let name in componentsMap) {
-                    const sourceKey = `${materialName}:${name}`;
-                    let metaJson = componentsMap[name];
-                    outputObj[sourceKey] = { isComposite, ...metaJson };
-                }
-            }
-            else {
-                // 老格式，需要从子目录下读取
-                const components = await fs_extra_1.default.readdir(materialComponentsPath);
-                await Promise.all(components.map(async (name) => {
-                    const sourceKey = `${materialName}:${name}`;
-                    const componentMetaPath = `${materialComponentsPath}/${name}/meta.json`;
-                    let metaJson = {
-                        name,
-                        meta: await fs_extra_1.default.readJson(componentMetaPath),
-                    };
-                    outputObj[sourceKey] = { isComposite, ...metaJson };
-                }));
-            }
-        }
-    }));
-    return outputObj;
-}
-exports.getComponentsInfo = getComponentsInfo;
 async function getYyptConfigInfo(extraData) {
     let configJson;
     try {

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

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 import { OutputType } from 'jszip';
 export declare const generatedFileContents: {};
-export default function generateFiles(appFileData: any, srcDir: string, dstDir: string): Promise<void>;
+export default function generateFiles(appFileData: any, srcDir: string, dstDir: string, filter?: (src: any) => boolean): Promise<void>;
 export declare function writeFile(outFile: string, content: string): Promise<boolean>;
 export declare function removeFile(file: string): void;
 /**

package/lib/builder/util/generateFiles.js

@@ -35,7 +35,7 @@ const glob_1 = __importDefault(require("glob"));
 const jszip_1 = __importDefault(require("jszip"));
 const buffer_1 = require("buffer");
 exports.generatedFileContents = {}; // generated files for incrmental build
-async function generateFiles(appFileData, srcDir, dstDir) {
+async function generateFiles(appFileData, srcDir, dstDir, filter = (src) => true) {
     const filesGenerated = [];
     // Generating file by template and data
     for (const file in appFileData) {
@@ -43,6 +43,10 @@ async function generateFiles(appFileData, srcDir, dstDir) {
         const srcFileName = fileNameList[0];
         const outFileName = fileNameList[1] || fileNameList[0];
         const srcePath = path_1.default.join(srcDir, srcFileName);
+        const use = filter ? filter(srcePath) : true;
+        if (!use) {
+            continue;
+        }
         if (fs_extra_1.default.lstatSync(srcePath).isDirectory()) {
             (0, exports.copyRecursiveSync)(srcePath, path_1.default.join(dstDir, outFileName));
         }