@cloudbase/lowcode-builder 1.8.95 → 1.8.96

package/lib/builder/mp/materials.js

@@ -26,15 +26,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getWxmlTag = exports.filterMaterial = exports.installMaterials = void 0;
+exports.getWxmlTag = exports.filterMaterial = exports.installMaterials = exports.normalizeCompositeDependienciesForBuild = void 0;
 const path = __importStar(require("path"));
-const util_1 = require("util");
 const fs = __importStar(require("fs-extra"));
 const weapps_core_1 = require("@cloudbase/lowcode-generator/lib/weapps-core");
 const config_1 = require("../config");
 const mp_1 = require("@cloudbase/lowcode-generator/lib/generator/config/mp");
-const util_2 = require("../util");
-const util_3 = require("./util");
+const util_1 = require("../util");
+const util_2 = require("./util");
 const wxml_1 = require("./wxml");
 const generateFiles_1 = __importStar(require("../util/generateFiles"));
 const lowcode_1 = require("./lowcode");
@@ -43,12 +42,63 @@ 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, outDir, usedMeta, weapps) {
+function normalizeCompositeDependienciesForBuild(lib) {
+    lib.dependencies = lib.dependencies || {};
+    lib.components.map((cmp) => {
+        // populate cmp.materialName
+        cmp.materialName = lib.name;
+        cmp.meta.syncProps = {};
+        const { dataForm = {} } = cmp;
+        for (const prop in dataForm) {
+            const { inputProp, syncProp } = dataForm[prop];
+            if (syncProp || inputProp) {
+                cmp.meta.syncProps[prop] = syncProp || inputProp;
+            }
+        }
+        if (lib.isComposite) {
+            cmp.meta.platforms = {
+                mp: {
+                    path: `${cmp.name}/index`,
+                },
+            };
+            lib.dependencies = { ...lib.dependencies, ...cmp.npmDependencies };
+        }
+    });
+    return lib;
+}
+exports.normalizeCompositeDependienciesForBuild = normalizeCompositeDependienciesForBuild;
+async function generateCompLibs(ctx, outDir, mode) {
+    const { materialLibs } = ctx;
+    // Collection infomation from components to lib meta
+    const compositedLibs = materialLibs.filter((lib) => lib.isComposite);
+    const reg = new RegExp(`${cals_1.SPINOFF_SUFFIX}$`);
+    // #2 Generate composited libs
+    await Promise.all(compositedLibs.map(async (lib) => {
+        console.log(`Generate composited library ${lib.name}`);
+        await Promise.all(lib.components.map(async (cmp) => {
+            return generateCompositeComponent({
+                ...ctx,
+                /**
+                 * 此处强行覆盖为 rpx 是为了兼容老的复合组件
+                 * $template, 和单独lib构建应受控，跟随应用的配置
+                 */
+                processCssUnit: lib.name === cals_1.OFFICIAL_COMPONENT_LIB_NAME || reg.test(lib.name) ? 'rpx' : ctx.processCssUnit,
+                // 只生成在主目录中，减少冗余
+                // rootPath: app.rootPath || '', // 主包是没有 rootPath 的
+            }, cmp, outDir, lib.rootPath !== undefined ? lib.rootPath : path.join(config_1.materialsDirName, lib.name), lib.compLibCommonResource, mode);
+        }));
+    }));
+}
+async function installMaterials(ctx, outDir, usedMeta, mode) {
     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]);
+    let materialLibs = _materialLibs.filter((lib) => {
+        if (!usedMeta) {
+            return true;
+        }
+        return usedMeta.component[lib.name] || usedMeta.action[lib.name];
+    });
     // #1 Download uploaded libs
-    const localPkg = (0, util_2.getCurrentPackageJson)();
+    const localPkg = (0, util_1.getCurrentPackageJson)();
     await Promise.all(materialLibs
         .filter((lib) => !lib.isComposite)
         .map(async (lib) => {
@@ -66,7 +116,7 @@ async function installMaterials(ctx, outDir, usedMeta, weapps) {
             await downloadMaterial(mpPkgUrl, materialsSrcDir, ctx.isBrowserMpBuilder, noCache);
         }
         function libUpdated(libDir, version) {
-            const meta = (0, util_2.readComponentLibMata)(libDir);
+            const meta = (0, util_1.readComponentLibMata)(libDir);
             if (!meta) {
                 return true;
             }
@@ -74,120 +124,68 @@ async function installMaterials(ctx, outDir, usedMeta, weapps) {
                 return true;
             }
         }
-        const usingMaterialMap = {};
-        // 混合模式下，各个子包获取自己使用过的组件和复合组件（会出现冗余）
-        // 统一都放在根目录下，可以减少冗余
-        await Promise.all(weappsList.map(async (app) => {
-            const targetDir = path.join(outDir, config_1.materialsDirName, name);
-            if (usingMaterialMap[targetDir]) {
-                return;
-            }
-            else {
-                usingMaterialMap[targetDir] = true;
-            }
-            if (libUpdated(targetDir, version)) {
-                const materialsSrcDirPath = path.join(materialsSrcDir, 'src');
-                if (fs.existsSync(materialsSrcDirPath)) {
-                    console.log(`Copying material ${materialId} from ${isBrowserMpBuilder ? materialsSrcDirPath : materialsSrcDir}/src to ${targetDir}`);
-                    // #2 从根目录 copy meta 文件
-                    const metaJosnPath = path.join(materialsSrcDir, 'meta.json');
-                    if (fs.existsSync(metaJosnPath)) {
-                        !isBrowserMpBuilder
-                            ? await fs.copy(metaJosnPath, path.join(targetDir, 'meta.json'))
-                            : (0, generateFiles_1.copyRecursiveSync)(metaJosnPath, path.join(targetDir, 'meta.json'));
-                    }
-                    // #3 copy 组件库代码文件到项目目录
-                    !isBrowserMpBuilder
-                        ? await fs.copy(materialsSrcDirPath, targetDir, {
-                            filter(src, dest) {
-                                const path = src.split('/');
-                                return !junk.is(path[path.length - 1]);
-                            },
-                        })
-                        : (0, generateFiles_1.copyRecursiveSync)(materialsSrcDirPath, targetDir, {
-                            filter: filterMaterial,
-                        });
-                }
-                else {
-                    console.log(`Copying material ${materialId} from ${materialsSrcDir} to ${targetDir}`);
-                    // #2 link material to current project
+        const targetDir = path.join(outDir, config_1.materialsDirName, name);
+        if (libUpdated(targetDir, version)) {
+            const materialsSrcDirPath = path.join(materialsSrcDir, 'src');
+            if (fs.existsSync(materialsSrcDirPath)) {
+                console.log(`Copying material ${materialId} from ${isBrowserMpBuilder ? materialsSrcDirPath : materialsSrcDir}/src to ${targetDir}`);
+                // #2 从根目录 copy meta 文件
+                const metaJosnPath = path.join(materialsSrcDir, 'meta.json');
+                if (fs.existsSync(metaJosnPath)) {
                     !isBrowserMpBuilder
-                        ? await fs.copy(materialsSrcDir, targetDir, {
-                            filter(src, dest) {
-                                const path = src.split('/');
-                                return !junk.is(path[path.length - 1]);
-                            },
-                        })
-                        : (0, generateFiles_1.copyRecursiveSync)(materialsSrcDir, targetDir, {
-                            filter: filterMaterial,
-                        });
+                        ? await fs.copy(metaJosnPath, path.join(targetDir, 'meta.json'))
+                        : (0, generateFiles_1.copyRecursiveSync)(metaJosnPath, path.join(targetDir, 'meta.json'));
                 }
+                // #3 copy 组件库代码文件到项目目录
+                !isBrowserMpBuilder
+                    ? await fs.copy(materialsSrcDirPath, targetDir, {
+                        filter: filterMaterial,
+                    })
+                    : (0, generateFiles_1.copyRecursiveSync)(materialsSrcDirPath, targetDir, {
+                        filter: filterMaterial,
+                    });
             }
-            const libMeta = (0, util_2.readComponentLibMata)(targetDir);
-            if (!lib.components) {
-                lib.components = Object.keys((libMeta === null || libMeta === void 0 ? void 0 : libMeta.components) || {}).map((name) => {
-                    var _a;
-                    return ({
-                        name,
-                        meta: (_a = libMeta === null || libMeta === void 0 ? void 0 : libMeta.components[name]) === null || _a === void 0 ? void 0 : _a.meta,
+            else {
+                console.log(`Copying material ${materialId} from ${materialsSrcDir} to ${targetDir}`);
+                // #2 link material to current project
+                !isBrowserMpBuilder
+                    ? await fs.copy(materialsSrcDir, targetDir, {
+                        filter(src, dest) {
+                            const path = src.split('/');
+                            return !junk.is(path[path.length - 1]);
+                        },
+                    })
+                    : (0, generateFiles_1.copyRecursiveSync)(materialsSrcDir, targetDir, {
+                        filter: filterMaterial,
                     });
-                });
             }
-            lib.styles = libMeta === null || libMeta === void 0 ? void 0 : libMeta.styles;
-            lib.dependencies = libMeta === null || libMeta === void 0 ? void 0 : libMeta.dependencies;
-        }));
+        }
+        const libMeta = (0, util_1.readComponentLibMata)(targetDir);
+        if (!lib.components) {
+            lib.components = Object.keys((libMeta === null || libMeta === void 0 ? void 0 : libMeta.components) || {}).map((name) => {
+                var _a;
+                return ({
+                    name,
+                    meta: (_a = libMeta === null || libMeta === void 0 ? void 0 : libMeta.components[name]) === null || _a === void 0 ? void 0 : _a.meta,
+                });
+            });
+        }
+        lib.styles = libMeta === null || libMeta === void 0 ? void 0 : libMeta.styles;
+        lib.dependencies = libMeta === null || libMeta === void 0 ? void 0 : libMeta.dependencies;
     }));
     // clean unused comps
-    ctx.materialLibs = materialLibs;
     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) => {
-        lib.components.map((comp) => {
-            comp.materialName = lib.name;
-        });
-    });
-    materialLibs.map((lib) => {
-        lib.dependencies = lib.dependencies || {};
-        lib.components.map((cmp) => {
-            cmp.meta.syncProps = {};
-            const { dataForm = {} } = cmp;
-            for (const prop in dataForm) {
-                const { inputProp, syncProp } = dataForm[prop];
-                if (syncProp || inputProp) {
-                    cmp.meta.syncProps[prop] = syncProp || inputProp;
-                }
-            }
-            if (lib.isComposite) {
-                cmp.meta.platforms = {
-                    mp: {
-                        path: `${cmp.name}/index`,
-                    },
-                };
-                lib.dependencies = { ...lib.dependencies, ...cmp.npmDependencies };
+        lib.components = lib.components.filter((comp) => {
+            var _a, _b;
+            if (!usedMeta) {
+                return true;
             }
+            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);
         });
+        normalizeCompositeDependienciesForBuild(lib);
     });
-    // Collection infomation from components to lib meta
-    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}`);
-        await (0, util_2.writeLibCommonRes2file)(lib, path.join(outDir, config_1.materialsDirName, lib.name, 'libCommonRes'));
-        await Promise.all(lib.components.map(async (cmp) => {
-            return generateCompositeComponent({
-                ...ctx,
-                /**
-                 * 此处强行覆盖为 rpx 是为了兼容老的复合组件
-                 * $template 应该跟随应用的配置
-                 */
-                processCssUnit: lib.name !== '$template' ? 'rpx' : ctx.processCssUnit,
-                // 只生成在主目录中，减少冗余
-                // rootPath: app.rootPath || '', // 主包是没有 rootPath 的
-            }, cmp, path.join(outDir, config_1.materialsDirName), lib.compLibCommonResource);
-        }));
-    }));
+    ctx.materialLibs = materialLibs;
+    await generateCompLibs(ctx, outDir, mode);
 }
 exports.installMaterials = installMaterials;
 /**
@@ -206,21 +204,17 @@ async function downloadMaterial(zipUrl, dstFolder, isBrowser = false, noCache =
         return;
     await (0, net_1.downloadZip)(zipUrl, dstFolder, isBrowser, noCache);
 }
-async function generateCompositeComponent(ctx, compositedComp, outDir, compLibCommonResource) {
-    const compositeCtx = {
-        ...ctx,
-        isPage: false,
-        enableLoading: false,
-    };
+async function generateCompositeComponent(compositeCtx, compositedComp, lowcalWedaRoot, componentLibRoot, compLibCommonResource, mode = 'inline') {
     const { materialName } = compositedComp;
-    const componentDir = path.join(outDir, materialName, compositedComp.name);
+    const componentRelativeDir = path.posix.join(componentLibRoot, compositedComp.name);
+    const componentDir = path.join(lowcalWedaRoot, componentLibRoot, compositedComp.name);
     const LOWCODE_DIR_NAME = 'lowcode';
     console.log(`Generating composited component ${materialName}:${compositedComp.name} to ${componentDir}`);
     const wxmlDataPrefix = (0, mp_1.getWxmlDataPrefix)(!compositeCtx.isProduction);
     // # Generating page
     const usingComponents = {};
     const componentGenerics = {};
-    const componentInstances = (0, util_3.processRepeaterSchema)(compositeCtx, compositedComp.componentInstances);
+    const componentInstances = (0, util_2.processRepeaterSchema)(compositeCtx, compositedComp.componentInstances);
     const cmpContainer = Object.values(componentInstances)[0];
     const wxml = (0, wxml_1.generateWxml)(compositeCtx, componentInstances, `Component ${materialName}:${compositedComp.name}`, wxmlDataPrefix, usingComponents, componentGenerics, (cmp, node) => {
         if (cmp === cmpContainer) {
@@ -233,7 +227,7 @@ async function generateCompositeComponent(ctx, compositedComp, outDir, compLibCo
         }
     });
     // prepare form field change events
-    const { syncProps } = compositedComp.meta;
+    const { syncProps = {} } = compositedComp.meta;
     const formEvents = {};
     Object.keys(syncProps).map((prop) => {
         const config = syncProps[prop];
@@ -251,39 +245,46 @@ async function generateCompositeComponent(ctx, compositedComp, outDir, compLibCo
         }
     });
     const codes = (0, cals_1.processRuntimeCodeResources)({ id: '$comp' }, compositedComp.lowCodes, 'component');
-    const importor = (0, util_2.generateLowcodeImportor)(codes);
+    const importor = (0, util_1.generateLowcodeImportor)(codes);
     const pageFileData = {
         'index.js': {
+            relativeWedaRoot: path.posix.relative(path.posix.join('/', componentRelativeDir), '/') || '.',
             materialName,
             propDefs,
             handlers: compositedComp.lowCodes
                 .filter((m) => m.type === cals_1.ECodeType.HANDLER_FN && m.name !== cals_1.ECodeName.PLACEHOLDER)
                 .map((m) => m.name),
-            eventHandlers: (0, util_3.createEventHandlers)(compositeCtx, componentInstances, weapps_core_1.COMPONENT_API_PREFIX),
-            // protectEventKeys: builtinMpEvents,
+            eventHandlers: (0, util_2.createEventHandlers)(compositeCtx, componentInstances, weapps_core_1.COMPONENT_API_PREFIX),
             emitEvents: (compositedComp.emitEvents || []).map((evt) => evt.eventName),
-            widgetProps: (0, util_3.createWidgetProps)(compositeCtx, componentInstances),
+            widgetProps: (0, util_2.createWidgetProps)(compositeCtx, componentInstances),
             compApi: weapps_core_1.COMPONENT_API_PREFIX,
             jsonSchemaType2jsClass: mp_1.jsonSchemaType2jsClass,
-            key: `${compositedComp.materialName}:${compositedComp.name}`,
-            dataBinds: (0, util_3.createDataBinds)(compositeCtx, componentInstances),
+            key: `${materialName}:${compositedComp.name}`,
+            dataBinds: (0, util_2.createDataBinds)(compositeCtx, componentInstances),
             debug: !compositeCtx.isProduction,
-            /**
-             * @deprecated
-             */
-            stringifyObj: util_1.inspect,
             // dataPropNames: wxmlDataPrefix,
             formEvents: Object.keys(formEvents).length > 0 ? formEvents : null,
             config: compositedComp.compConfig,
             importor,
         },
-        'index.json': { usingComponents, componentGenerics },
+        'index.json': {
+            usingComponents: Object.entries(usingComponents).reduce((map, [key, value]) => {
+                if (new RegExp(`^${path.posix.join('/', compositeCtx.wedaRoot || '', '\\w')}`).test(value)) {
+                    map[key] = path.posix.relative(path.posix.join('/', compositeCtx.wedaRoot || '', componentRelativeDir), value);
+                }
+                else {
+                    map[key] = value;
+                }
+                return map;
+            }, {}),
+            componentGenerics,
+        },
         'index.wxml': {
             content: wxml,
         },
         'index.wxss': {
             importStyles: importor.styles.map((mod) => path.posix.join(LOWCODE_DIR_NAME, (0, weapps_core_1.getCodeModuleFilePath)('global', mod, { style: '.wxss' }))),
-            content: (0, util_3.generateScopedStyleText)(componentInstances),
+            content: (0, util_2.generateScopedStyleText)(componentInstances),
         },
     };
     // Generating file by template and data
@@ -315,7 +316,7 @@ async function generateCompositeComponent(ctx, compositedComp, outDir, compLibCo
         if (mod.name === 'index') {
             return;
         }
-        return (0, lowcode_1.writeCode2file)(compositeCtx, mod, path.join(componentDir, LOWCODE_DIR_NAME), { comp: compositedComp }, themeCode);
+        return (0, lowcode_1.writeCode2file)(compositeCtx, mod, path.join(componentDir, LOWCODE_DIR_NAME), { comp: compositedComp }, themeCode, mode === 'lib' ? true : false);
     });
     // await writeLowCodeFiles(weapp, appRoot)
     // await generateFramework(weapp, appRoot)
@@ -341,6 +342,9 @@ function getWxmlTag(ctx, cmp, nameMangler) {
         return { tagName };
     }
     if (materialLib) {
+        const libRootInMiniprogram = path.posix.join('/', ctx.wedaRoot || '', (materialLib === null || materialLib === void 0 ? void 0 : materialLib.rootPath)
+            ? materialLib === null || materialLib === void 0 ? void 0 : materialLib.rootPath
+            : path.posix.join(`${config_1.materialsDirName}/${cmp.moduleName}`));
         let cmpMeta = (findComponent === null || findComponent === void 0 ? void 0 : findComponent.meta) || { platforms: undefined };
         if (!cmpMeta.platforms) {
             return { tagName };
@@ -353,7 +357,7 @@ function getWxmlTag(ctx, cmp, nameMangler) {
             compPath =
                 compPath.startsWith('/') || compPath.indexOf('://') > 0
                     ? compPath
-                    : path.posix.join('/', ctx.wedaRoot || '', `${config_1.materialsDirName}/${cmp.moduleName}`, compPath);
+                    : path.posix.join(libRootInMiniprogram, compPath);
             tagName = `${/^\$/.test(moduleName) ? NAME_MANAGER.mangle(moduleName) : moduleName}-${name}`;
             if (nameMangler) {
                 tagName = nameMangler.mangle(tagName);

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

@@ -1,15 +1,15 @@
 import { IDynamicValue, IWeAppComponentInstance, ActionType, ICompositedComponent, IWeAppPage, IEventListener, IQueryData } from '@cloudbase/lowcode-generator/lib/weapps-core';
-import { IBuildContext } from './BuildContext';
+import { IMpCommonBuildContext } from './BuildContext';
 export declare function generatedDynamicData(data: {
     [key: string]: IDynamicValue;
 }, compInfo?: ICompositedComponent, filterBuiltInProps?: boolean): {
     staticProps: {};
     boundProps: {};
 };
-export declare function createWidgetProps(ctx: IBuildContext, widgets: {
+export declare function createWidgetProps(ctx: IMpCommonBuildContext, widgets: {
     [key: string]: IWeAppComponentInstance;
 }): {};
-export declare function createEventHandlers(ctx: IBuildContext, widgets: {
+export declare function createEventHandlers(ctx: IMpCommonBuildContext, widgets: {
     [key: string]: IWeAppComponentInstance;
 }, componentApi: string, page?: IWeAppPage): {};
 export declare function generateSyncListeners(syncConfigs: any): IEventListener[];
@@ -19,10 +19,10 @@ export declare function generateDataContainerListeners(): {
     type: ActionType;
     data: {};
 }[];
-export declare function createTemplateQuery(ctx: IBuildContext, query?: {
+export declare function createTemplateQuery(ctx: IMpCommonBuildContext, query?: {
     [key: string]: IQueryData;
 }): {};
-export declare function createTemplateEventFlows(ctx: IBuildContext, eventFlows?: any[]): any[];
+export declare function createTemplateEventFlows(ctx: IMpCommonBuildContext, eventFlows?: any[]): any[];
 export declare function generateArgsDynamicValueFromData(args?: {
     [prop: string]: IDynamicValue;
 }, data?: {
@@ -30,11 +30,11 @@ export declare function generateArgsDynamicValueFromData(args?: {
 }): {
     [prop: string]: IDynamicValue;
 } | undefined;
-export declare function createDataBinds(ctx: IBuildContext, widgets: {
+export declare function createDataBinds(ctx: IMpCommonBuildContext, widgets: {
     [key: string]: IWeAppComponentInstance;
 }): {};
 export declare function setDataBind(target: any, prop: string, val: IDynamicValue): void;
-export declare function processRepeaterSchema(ctx: any, componentInstanceMap: {
+export declare function processRepeaterSchema(ctx: Pick<IMpCommonBuildContext, 'materialLibs' | 'miniprogramPlugins'>, componentInstanceMap: {
     [key: string]: IWeAppComponentInstance;
 }): {
     [key: string]: IWeAppComponentInstance;
@@ -45,8 +45,11 @@ export declare function processRepeaterSchema(ctx: any, componentInstanceMap: {
 export declare function findComponentInfo(xComponent: {
     moduleName: string;
     name: string;
-}, { materialLibs, miniprogramPlugins }: {
-    materialLibs: any;
-    miniprogramPlugins: any;
-}): any;
-export declare function generateScopedStyleText(widgets: Record<string, IWeAppComponentInstance>): string;
+}, { materialLibs, miniprogramPlugins }: Pick<IMpCommonBuildContext, 'materialLibs' | 'miniprogramPlugins'>): ICompositedComponent | undefined;
+export declare function generateScopedStyleText(widgets: Record<string, IWeAppComponentInstance>, weightPrefix?: string): string;
+export declare function isRepeaterWidget(w: {
+    widgetType: string;
+    getConfig: () => {
+        componentType?: string;
+    };
+}, repeaterComponentName: string): true | undefined;

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;