@cloudbase/lowcode-builder 1.8.95 → 1.8.96

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

@@ -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.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"));
@@ -99,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));
         }