@cloudbase/framework-plugin-low-code 0.6.55 → 0.6.58-alpha.0

package/lib/builder/service/builder/generate.js

@@ -67,7 +67,7 @@ function generateAllPageJsxFile(pageInstanceList, appBuildDir, rootPath, depende
     compProps: {},
 }, buildTypeList) {
     return __awaiter(this, void 0, void 0, function* () {
-        yield Promise.all((0, weapps_core_1.loopDealWithFn)(pageInstanceList, (pageInstance) => generateSinglePageJsxFile(pageInstance, appBuildDir, rootPath, dependencies, extraData, buildTypeList)));
+        yield Promise.all(weapps_core_1.loopDealWithFn(pageInstanceList, (pageInstance) => generateSinglePageJsxFile(pageInstance, appBuildDir, rootPath, dependencies, extraData, buildTypeList)));
     });
 }
 exports.generateAllPageJsxFile = generateAllPageJsxFile;
@@ -79,7 +79,7 @@ function generateSinglePageJsxFile(pageInstance, appBuildDir, rootPath, dependen
         const fixedDependencies = dependencies;
         const { componentSchemaJson, pluginInstances, listenerInstances: pageListenerInstances, style: PageStyle, data, } = pageInstance;
         const { originComponentList, originActionList, } = getOriginComponentAndActionList(componentSchemaJson, fixedDependencies);
-        const componentsMeta = yield (0, util_1.getComponentsInfo)(appBuildDir, dependencies);
+        const componentsMeta = yield util_1.getComponentsInfo(appBuildDir, dependencies);
         const originPluginList = getOriginPluginList(pluginInstances, dependencies);
         pullActionToListByInstances(pageListenerInstances, originActionList, fixedDependencies);
         const originEntryMap = {};
@@ -108,10 +108,11 @@ function generateSinglePageJsxFile(pageInstance, appBuildDir, rootPath, dependen
         const actionImportStringArr = getActionImportStringArr(originActionList);
         const pluginImportStringArr = getPluginImportStringArr(originPluginList);
         const { widgets, dataBinds, componentSchema } = getComponentSchemaString(componentSchemaJson, false, componentsMeta);
-        const pageStyleString = (0, weapps_core_1.toCssText)((0, weapps_core_1.toCssStyle)(PageStyle), (0, common_1.buildAsWebByBuildType)(buildTypeList) ? 'body' : 'page');
+        const pageStyleString = weapps_core_1.toCssText(weapps_core_1.toCssStyle(PageStyle), common_1.buildAsWebByBuildType(buildTypeList) ? 'body' : 'page');
         const templateData = {
             pageUUID: rootPath ? `${rootPath}/${pageInstance.id}` : pageInstance.id,
             pageName: pageInstance.id,
+            pageSource: pageInstance.data.src || '',
             pageStyleText: pageStyleString,
             entryImports: entryImportStringArr.join(';\n'),
             componentImports: componentImportStringArr.join(';\n'),
@@ -131,7 +132,7 @@ function generateSinglePageJsxFile(pageInstance, appBuildDir, rootPath, dependen
         const template = yield fs_extra_1.default.readFile(path_1.default.resolve(config_1.appTemplateDir, './src/pages/app.tpl'), {
             encoding: 'utf8',
         });
-        const jsx = (0, lodash_template_1.default)(template)(templateData);
+        const jsx = lodash_template_1.default(template)(templateData);
         yield fs_extra_1.default.ensureFile(dest);
         yield fs_extra_1.default.writeFile(dest, jsx);
         const pageStyleDest = path_1.default.resolve(appBuildDir, `./pages/${pageInstance.id}/index.less`);
@@ -168,7 +169,7 @@ function getOriginPluginList(pluginInstances = [], dependencies = [], originPlug
     pluginInstances.map((instance) => {
         var _a;
         const { sourceKey } = instance;
-        const { materialName, name, variableName } = (0, util_1.getMetaInfoBySourceKey)(sourceKey);
+        const { materialName, name, variableName } = util_1.getMetaInfoBySourceKey(sourceKey);
         const pluginKey = `${materialName}_${name}`;
         const isExist = originPluginList.find((item) => item.key === pluginKey);
         if (isExist) {
@@ -192,7 +193,7 @@ function pullActionToListByInstances(listenerInstances, originActionList, fixedD
     }
     listenerInstances.map((pageListenerInstance) => {
         const { sourceKey, type } = pageListenerInstance;
-        const { materialName, name, variableName } = (0, util_1.getMetaInfoBySourceKey)(sourceKey);
+        const { materialName, name, variableName } = util_1.getMetaInfoBySourceKey(sourceKey);
         const material = fixedDependencies.find((m) => m.name === materialName);
         const actionKey = `${materialName}_${name}`;
         const isExistAction = originActionList.find((item) => item.key === actionKey);
@@ -211,7 +212,7 @@ function pullActionToListByInstances(listenerInstances, originActionList, fixedD
 }
 exports.pullActionToListByInstances = pullActionToListByInstances;
 function pullComponentToListByInstance(sourceKey, originComponentList, fixedDependencies) {
-    const { materialName, name, variableName } = (0, util_1.getMetaInfoBySourceKey)(sourceKey);
+    const { materialName, name, variableName } = util_1.getMetaInfoBySourceKey(sourceKey);
     const componentKey = `${materialName}_${name}`;
     const isExistComponent = originComponentList.find((item) => item.key === componentKey);
     if (!isExistComponent) {
@@ -249,11 +250,11 @@ function isSlot(comp) {
 }
 exports.isSlot = isSlot;
 function getComponentSchemaString(componentSchema, isComposite = false, componentsInfoMap = {}, wrapperClass) {
-    const componentInputProps = (0, util_1.getInputProps)(componentsInfoMap) || {};
-    const copyJson = (0, util_1.simpleDeepClone)(componentSchema);
+    const componentInputProps = util_1.getInputProps(componentsInfoMap) || {};
+    const copyJson = util_1.simpleDeepClone(componentSchema);
     const compWidgets = {};
     const compDataBinds = {};
-    const componentSchemaJson = (0, util_1.deepDealSchema)(copyJson, (schema) => {
+    const componentSchemaJson = util_1.deepDealSchema(copyJson, (schema) => {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         const { 'x-props': xProps = {}, properties } = schema;
         const { dataBinds = [], commonStyle = {}, data = {}, classNameList = [], sourceKey, styleBind, classNameListBind, staticResourceAttribute = [], } = xProps;
@@ -271,9 +272,8 @@ function getComponentSchemaString(componentSchema, isComposite = false, componen
             schema['emitEvents'] = componentInfo.emitEvents.map((item) => item.eventName);
         }
         if (!isSlot(schema) && schema.key) {
-            compWidgets[schema.key] = Object.assign(Object.assign({}, data), { style: (0, weapps_core_1.toCssStyle)(commonStyle), classList: classNameList, widgetType: sourceKey, _parentId: isSlot(schema.parent)
-                    ? (_g = (_f = schema === null || schema === void 0 ? void 0 : schema.parent) === null || _f === void 0 ? void 0 : _f.parent) === null || _g === void 0 ? void 0 : _g.key
-                    : (_h = schema === null || schema === void 0 ? void 0 : schema.parent) === null || _h === void 0 ? void 0 : _h.key });
+            compWidgets[schema.key] = Object.assign(Object.assign({}, data), { style: weapps_core_1.toCssStyle(commonStyle), classList: classNameList, widgetType: sourceKey, _parentId: isSlot(schema.parent)
+                    ? (_g = (_f = schema === null || schema === void 0 ? void 0 : schema.parent) === null || _f === void 0 ? void 0 : _f.parent) === null || _g === void 0 ? void 0 : _g.key : (_h = schema === null || schema === void 0 ? void 0 : schema.parent) === null || _h === void 0 ? void 0 : _h.key });
             if (dataBinds.length > 0) {
                 compDataBinds[schema.key] = generateDataBinds(dataBinds, isComposite);
             }
@@ -291,7 +291,7 @@ function getComponentSchemaString(componentSchema, isComposite = false, componen
                 compDataBinds[schema.key] = Object.assign(Object.assign({}, (compDataBinds[schema.key] || {})), generateDataBinds([classNameListBind], isComposite));
             }
         }
-        if (properties && (0, weapps_core_1.isEmptyObj)(properties)) {
+        if (properties && weapps_core_1.isEmptyObj(properties)) {
             delete schema.properties;
         }
         delete schema.type;
@@ -302,8 +302,7 @@ function getComponentSchemaString(componentSchema, isComposite = false, componen
                 if (propsVaule && Array.isArray(propsVaule)) {
                     propsVaule.map((block) => {
                         var _a, _b;
-                        const blockInstance = (block === null || block === void 0 ? void 0 : block.selectableBlock) &&
-                            ((_b = (_a = block === null || block === void 0 ? void 0 : block.selectableBlock) === null || _a === void 0 ? void 0 : _a['x-props']) === null || _b === void 0 ? void 0 : _b.listenerInstances);
+                        const blockInstance = (block === null || block === void 0 ? void 0 : block.selectableBlock) && ((_b = (_a = block === null || block === void 0 ? void 0 : block.selectableBlock) === null || _a === void 0 ? void 0 : _a['x-props']) === null || _b === void 0 ? void 0 : _b.listenerInstances);
                         if (blockInstance) {
                             block.selectableBlock['x-props'].listenerInstances = generateListnerInstances(blockInstance, isComposite);
                         }
@@ -320,12 +319,12 @@ function getComponentSchemaString(componentSchema, isComposite = false, componen
                     xProps['classNameList'].push(wrapperClass);
                 }
             }
-            xProps['commonStyle'] = (0, weapps_core_1.toCssStyle)(xProps['commonStyle']);
+            xProps['commonStyle'] = weapps_core_1.toCssStyle(xProps['commonStyle']);
             xProps['staticResourceAttribute'] = staticResourceAttribute;
-            if ((0, weapps_core_1.isEmptyObj)(xProps['commonStyle'])) {
+            if (weapps_core_1.isEmptyObj(xProps['commonStyle'])) {
                 delete xProps['commonStyle'];
             }
-            if ((0, weapps_core_1.isEmptyObj)(xProps['style'])) {
+            if (weapps_core_1.isEmptyObj(xProps['style'])) {
                 delete xProps['style'];
             }
             if (xProps['dataBinds'] && xProps['dataBinds'].length === 0) {
@@ -347,7 +346,7 @@ function getComponentSchemaString(componentSchema, isComposite = false, componen
                     xPropsData.staticResourceAttribute.length === 0) {
                     delete xPropsData.staticResourceAttribute;
                 }
-                if ((0, weapps_core_1.isEmptyObj)(xPropsData)) {
+                if (weapps_core_1.isEmptyObj(xPropsData)) {
                     delete xProps['data'];
                 }
             }
@@ -389,9 +388,9 @@ function getComponentSchemaString(componentSchema, isComposite = false, componen
         }
     });
     return {
-        widgets: (0, util_1.JsonToStringWithVariableName)(compWidgets),
-        dataBinds: (0, util_1.JsonToStringWithVariableName)(compDataBinds),
-        componentSchema: (0, util_1.JsonToStringWithVariableName)(componentSchemaJson),
+        widgets: util_1.JsonToStringWithVariableName(compWidgets),
+        dataBinds: util_1.JsonToStringWithVariableName(compDataBinds),
+        componentSchema: util_1.JsonToStringWithVariableName(componentSchemaJson),
     };
 }
 exports.getComponentSchemaString = getComponentSchemaString;
@@ -479,7 +478,7 @@ function generateListnerInstances(listenerInstances, isComposite = false) {
         };
         if (listener.type === weapps_core_1.ActionType.Material) {
             const { sourceKey } = listener;
-            const { variableName } = (0, util_1.getMetaInfoBySourceKey)(sourceKey);
+            const { variableName } = util_1.getMetaInfoBySourceKey(sourceKey);
             generatedListener.instanceFunction = `${config_1.REPLACE_SIGN}${variableName}${config_1.REPLACE_SIGN}`;
         }
         else if (listener.type === weapps_core_1.ActionType.Platform) {
@@ -504,7 +503,7 @@ function generateListnerInstances(listenerInstances, isComposite = false) {
                 generatedListener.instanceFunction = `${config_1.REPLACE_SIGN}handler.${((_e = listener.handler) === null || _e === void 0 ? void 0 : _e.name) || listener.jsCode}${config_1.REPLACE_SIGN}`;
             }
         }
-        if (!(0, weapps_core_1.isEmptyObj)(listener.data)) {
+        if (!weapps_core_1.isEmptyObj(listener.data)) {
             generatedListener.data = listener.data;
         }
         if (listener.dataBinds && listener.dataBinds.length > 0) {
@@ -514,20 +513,20 @@ function generateListnerInstances(listenerInstances, isComposite = false) {
     });
 }
 function getListenersString(listeners = [], isComposite = false) {
-    return (0, util_1.JsonToStringWithVariableName)(generateListnerInstances(listeners, isComposite));
+    return util_1.JsonToStringWithVariableName(generateListnerInstances(listeners, isComposite));
 }
 exports.getListenersString = getListenersString;
 function getPluginInstancesString(instances) {
     if (!instances || !instances.length) {
         return '[]';
     }
-    const copyInstances = (0, util_1.simpleDeepClone)(instances);
+    const copyInstances = util_1.simpleDeepClone(instances);
     copyInstances.map((itemInstance) => {
         const { sourceKey } = itemInstance;
-        const { variableName } = (0, util_1.getMetaInfoBySourceKey)(sourceKey);
+        const { variableName } = util_1.getMetaInfoBySourceKey(sourceKey);
         itemInstance.instanceFunction = `${config_1.REPLACE_SIGN}${variableName}${config_1.REPLACE_SIGN}`;
     });
-    return (0, util_1.JsonToStringWithVariableName)(copyInstances);
+    return util_1.JsonToStringWithVariableName(copyInstances);
 }
 exports.getPluginInstancesString = getPluginInstancesString;
 function getPluginImportStringArr(plugins, pluginImportStringArr = []) {
@@ -550,7 +549,7 @@ function getComponentImportStringArr(components, componentImportStringArr = [])
             importString = `import { ${name} as ${lodash_1.default.upperFirst(variableName)} } from '${path_1.default.posix.join(`libraries/${materialName}@${materialVersion}`, entries === null || entries === void 0 ? void 0 : entries.components)}'`;
         }
         else if (entries === null || entries === void 0 ? void 0 : entries.entry) {
-            const componentsLibVariableName = (0, util_3.camelcase)(`${materialName}`);
+            const componentsLibVariableName = util_3.camelcase(`${materialName}`);
             importString = `const { ${name}: ${lodash_1.default.upperFirst(variableName)} } = ${componentsLibVariableName}.components`;
         }
         else {
@@ -566,7 +565,7 @@ exports.getComponentImportStringArr = getComponentImportStringArr;
 function getEntryImportStringArr(materialInfoList = [], entryImportStringArr = []) {
     materialInfoList.forEach(({ materialName, version, entries }) => {
         if (!((entries === null || entries === void 0 ? void 0 : entries.actions) && (entries === null || entries === void 0 ? void 0 : entries.components)) && (entries === null || entries === void 0 ? void 0 : entries.entry)) {
-            const componentsLibVariableName = (0, util_3.camelcase)(`${materialName}`);
+            const componentsLibVariableName = util_3.camelcase(`${materialName}`);
             const importComponentLibString = `import ${componentsLibVariableName} from '${path_1.default.posix.join(`libraries/${materialName}@${version}`, entries === null || entries === void 0 ? void 0 : entries.entry)}'`;
             if (!entryImportStringArr.includes(importComponentLibString)) {
                 entryImportStringArr.push(importComponentLibString);
@@ -587,11 +586,9 @@ function getActionImportStringArr(originActionList, actionImportStringArr = [])
 exports.getActionImportStringArr = getActionImportStringArr;
 function pushActionToImportStringArr(listenerInstance, actionImportStringArr) {
     const { name, materialName, materialVersion, variableName, entries, } = listenerInstance;
-    const componentsLibVariableName = (0, util_3.camelcase)(`${materialName}`);
-    const importString = (entries === null || entries === void 0 ? void 0 : entries.actions)
-        ? `import { ${name} as ${variableName} } from '${path_1.default.posix.join(`libraries/${materialName}@${materialVersion}`, entries === null || entries === void 0 ? void 0 : entries.actions)}'`
-        : (entries === null || entries === void 0 ? void 0 : entries.entry)
-            ? `const { ${name}: ${variableName} } = ${componentsLibVariableName}.actions`
+    const componentsLibVariableName = util_3.camelcase(`${materialName}`);
+    const importString = (entries === null || entries === void 0 ? void 0 : entries.actions) ? `import { ${name} as ${variableName} } from '${path_1.default.posix.join(`libraries/${materialName}@${materialVersion}`, entries === null || entries === void 0 ? void 0 : entries.actions)}'`
+        : (entries === null || entries === void 0 ? void 0 : entries.entry) ? `const { ${name}: ${variableName} } = ${componentsLibVariableName}.actions`
             : `import ${variableName} from 'libraries/${materialName}@${materialVersion}/actions/${name}'`;
     if (actionImportStringArr.includes(importString)) {
         return;
@@ -608,7 +605,7 @@ function generateRouterFile(allAppDataList, appBuildDir, basename = '', buildTyp
             const { pageInstanceList, rootPath = '' } = data;
             const pageFilePath = rootPath ? `packages/${rootPath}/` : '';
             mountApis.push(`import '${pageFilePath}app/mountAppApis';`);
-            (0, weapps_core_1.loopDealWithFn)(pageInstanceList, (pageInstance) => {
+            weapps_core_1.loopDealWithFn(pageInstanceList, (pageInstance) => {
                 const pageId = [rootPath, pageInstance.id].filter((i) => i).join('_');
                 if (pageInstance.isHome && !rootPath) {
                     routerRenders.push(`<Route from="/" exact children={() => <Redirect to="/${pageId}" />} />`);
@@ -620,7 +617,7 @@ function generateRouterFile(allAppDataList, appBuildDir, basename = '', buildTyp
         const routerTemplate = yield fs_extra_1.default.readFile(path_1.default.resolve(config_1.appTemplateDir, './src/router/index.tpl'), {
             encoding: 'utf8',
         });
-        const routerIndexStr = (0, lodash_template_1.default)(routerTemplate)({
+        const routerIndexStr = lodash_template_1.default(routerTemplate)({
             routerImports: routerImports.join('\n'),
             routerRenders: routerRenders.join('\n'),
             mountApis: mountApis.join('\n'),
@@ -636,19 +633,19 @@ function writeLowCodeFiles(appData, appBuildDir) {
     return __awaiter(this, void 0, void 0, function* () {
         const lowcodeRootDir = path_1.default.join(appBuildDir, 'lowcode');
         console.log(chalk_1.default.blue.bold('Writing lowcode files:'));
-        (0, generateFiles_1.cleanDir)(lowcodeRootDir, []);
-        (0, style_1.generateDefaultTheme)(appData);
+        generateFiles_1.cleanDir(lowcodeRootDir, []);
+        style_1.generateDefaultTheme(appData);
         const themeCode = appData.codeModules.find((mod) => mod.type === 'theme');
         yield Promise.all(appData.codeModules.map((m) => writeCode2file(m, 'global')));
-        yield Promise.all((0, weapps_core_1.loopDealWithFn)(appData.pageInstanceList, (page) => __awaiter(this, void 0, void 0, function* () {
-            (0, style_1.generateDefaultStyle)(page);
+        yield Promise.all(weapps_core_1.loopDealWithFn(appData.pageInstanceList, (page) => __awaiter(this, void 0, void 0, function* () {
+            style_1.generateDefaultStyle(page);
             yield page.codeModules
                 .filter((m) => m.name !== '____index____')
                 .forEach((m) => writeCode2file(m, page.id));
         })));
         function writeCode2file(mod, pageId) {
             return __awaiter(this, void 0, void 0, function* () {
-                const file = path_1.default.join(lowcodeRootDir, (0, weapps_core_1.getCodeModuleFilePath)(pageId, mod));
+                const file = path_1.default.join(lowcodeRootDir, weapps_core_1.getCodeModuleFilePath(pageId, mod));
                 let weappsApiPrefix = '';
                 if (mod.type !== 'theme') {
                     weappsApiPrefix =
@@ -661,7 +658,7 @@ function writeLowCodeFiles(appData, appBuildDir) {
                 console.log(chalk_1.default.green(file));
                 let code = mod.code;
                 if (mod.type === 'style') {
-                    code = yield (0, style_1.processLess)(((themeCode === null || themeCode === void 0 ? void 0 : themeCode.code) || style_1.defaultThemeCode) + code);
+                    code = yield style_1.processLess(((themeCode === null || themeCode === void 0 ? void 0 : themeCode.code) || style_1.defaultThemeCode) + code);
                 }
                 yield fs_extra_1.default.ensureFile(file);
                 yield fs_extra_1.default.writeFile(file, weappsApiPrefix + os_1.default.EOL + code);
@@ -675,7 +672,7 @@ function writeLowCodeFilesForCompositeComp(compositeGroups, appBuildDir) {
         const lowcodeRootDir = path_1.default.join(appBuildDir, 'src', 'lowcode', 'composite');
         console.log(chalk_1.default.blue.bold('Writing composite component lowcode files:'));
         yield Promise.all(compositeGroups.map((gItem) => __awaiter(this, void 0, void 0, function* () {
-            yield (0, util_2.writeLibCommonRes2file)(gItem, path_1.default.join(appBuildDir, 'src', 'libraries', `${gItem.name}@${gItem.version}`, 'libCommonRes'));
+            yield util_2.writeLibCommonRes2file(gItem, path_1.default.join(appBuildDir, 'src', 'libraries', `${gItem.name}@${gItem.version}`, 'libCommonRes'));
             const compLibCommonResource = gItem.compLibCommonResource;
             let themeCode = '';
             if (compLibCommonResource) {
@@ -693,13 +690,13 @@ function writeLowCodeFilesForCompositeComp(compositeGroups, appBuildDir) {
         function writeCode2file(mod, lowcodeDir, comp, themeCode) {
             return __awaiter(this, void 0, void 0, function* () {
                 const pageId = comp.name + '_' + comp.id;
-                const file = path_1.default.join(lowcodeDir, (0, weapps_core_1.getCodeModuleFilePath)(pageId, mod));
+                const file = path_1.default.join(lowcodeDir, weapps_core_1.getCodeModuleFilePath(pageId, mod));
                 yield fs_extra_1.default.ensureFile(file);
                 let codeContent = '';
                 if (mod.type === 'style') {
-                    codeContent = `.${(0, weapps_core_1.getCompositedComponentClass)(comp)} { \n${themeCode ? themeCode : ''}\n${mod.code}\n }`;
+                    codeContent = `.${weapps_core_1.getCompositedComponentClass(comp)} { \n${themeCode ? themeCode : ''}\n${mod.code}\n }`;
                     try {
-                        codeContent = yield (0, style_1.processLess)(`${codeContent}`);
+                        codeContent = yield style_1.processLess(`${codeContent}`);
                     }
                     catch (e) {
                         console.error(`样式转换失败 [${pageId}] :`, e, codeContent);
@@ -717,21 +714,22 @@ function writeLowCodeFilesForCompositeComp(compositeGroups, appBuildDir) {
 exports.writeLowCodeFilesForCompositeComp = writeLowCodeFilesForCompositeComp;
 function generateCodeFromTpl(appData, appBuildDir, dependencies, appKey, rootPath, deployMode, buildTypeList, extraData) {
     return __awaiter(this, void 0, void 0, function* () {
-        const pageIds = [];
+        const computedPageIds = [];
         const pageModules = {};
-        (0, weapps_core_1.loopDealWithFn)(appData.pageInstanceList, (p) => {
-            pageIds.push(p.id);
+        weapps_core_1.loopDealWithFn(appData.pageInstanceList, (p) => {
             pageModules[p.id] = p.codeModules;
+            if (p.codeModules.find((item) => item.type === 'computed')) {
+                computedPageIds.push(p.id);
+            }
         });
-        const yyptConfig = yield (0, util_2.getYyptConfigInfo)(extraData);
+        const yyptConfig = yield util_2.getYyptConfigInfo(extraData);
         const templatesData = {
             'store/index.js': {
-                pageIds,
                 appId: appKey,
                 rootPath: rootPath,
             },
             'store/computed.js': {
-                pageIds,
+                pageIds: computedPageIds,
             },
             'app/handlers.js': {
                 pageModules,
@@ -746,7 +744,7 @@ function generateCodeFromTpl(appData, appBuildDir, dependencies, appKey, rootPat
                     .map((m) => m.name),
             },
             'datasources/index.js.tpl': {
-                isXPage: (0, common_1.buildAsXPageByBuildType)(buildTypeList),
+                isXPage: common_1.buildAsXPageByBuildType(buildTypeList),
             },
             'datasources/config.js.tpl': {
                 appID: appKey,
@@ -754,14 +752,14 @@ function generateCodeFromTpl(appData, appBuildDir, dependencies, appKey, rootPat
                 isProd: deployMode === types_1.DEPLOY_MODE.UPLOAD,
             },
             'datasources/datasource-profiles.js.tpl': {
-                datasourceProfiles: (0, util_1.JsonToStringWithVariableName)((0, dataSource_1.getDatasourceProfiles)(appData.datasources || [])),
+                datasourceProfiles: util_1.JsonToStringWithVariableName(dataSource_1.getDatasourceProfiles(appData.datasources || [])),
             },
             'datasources/dataset-profiles.js.tpl': {
-                datasetProfiles: (0, util_1.JsonToStringWithVariableName)((0, dataSource_1.getDatasetProfiles)(appData, [appData])),
+                datasetProfiles: util_1.JsonToStringWithVariableName(dataSource_1.getDatasetProfiles(appData, [appData])),
             },
             'handlers/utils/common.js': {
-                isAdminPortal: (0, common_1.buildAsAdminPortalByBuildType)(buildTypeList),
-                isXPage: (0, common_1.buildAsXPageByBuildType)(buildTypeList),
+                isAdminPortal: common_1.buildAsAdminPortalByBuildType(buildTypeList),
+                isXPage: common_1.buildAsXPageByBuildType(buildTypeList),
             },
         };
         if (!rootPath) {
@@ -772,7 +770,7 @@ function generateCodeFromTpl(appData, appBuildDir, dependencies, appKey, rootPat
             const tplStr = yield fs_extra_1.default.readFile(path_1.default.join(config_1.appTemplateDir, 'src', file), {
                 encoding: 'utf8',
             });
-            const generatedCode = (0, lodash_template_1.default)(tplStr, {
+            const generatedCode = lodash_template_1.default(tplStr, {
                 interpolate: /<%=([\s\S]+?)%>/g,
             })(templatesData[file]);
             const outFile = path_1.default.resolve(appBuildDir, file.replace(/.tpl$/, ''));

package/lib/builder/service/builder/index.js

@@ -34,7 +34,7 @@ function createNodeModulesSoftLink(appBuildDir, nodeModulesPath) {
     return __awaiter(this, void 0, void 0, function* () {
         const destPath = path_1.default.join(appBuildDir, 'node_modules');
         if (!fs_extra_1.default.existsSync(destPath)) {
-            (0, util_1.promiseWrapper)((0, symlink_dir_1.default)(nodeModulesPath, destPath));
+            util_1.promiseWrapper(symlink_dir_1.default(nodeModulesPath, destPath));
         }
     });
 }
@@ -42,7 +42,7 @@ exports.createNodeModulesSoftLink = createNodeModulesSoftLink;
 function getStoreModuleList(appData) {
     const storeModuleList = [];
     extractRematchModules(appData.codeModules);
-    (0, weapps_core_1.loopDealWithFn)(appData.pageInstanceList, (pageInstance) => {
+    weapps_core_1.loopDealWithFn(appData.pageInstanceList, (pageInstance) => {
         extractRematchModules(pageInstance.codeModules);
     });
     return storeModuleList;

package/lib/builder/service/builder/plugin.js

@@ -14,7 +14,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 var __importStar = (this && this.__importStar) || function (mod) {
     if (mod && mod.__esModule) return mod;
     var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
     __setModuleDefault(result, mod);
     return result;
 };
@@ -49,7 +49,7 @@ function installMpPlugin(appBuildDir, plugins) {
             yield fs.copy(pluginNodeModuleSrcDir, mpBuildPluginDir, {
                 overwrite: true,
             });
-            yield (0, mp_1.mergeSubPackages)(mpBuildAppJsonPath, pluginAppJsonPath);
+            yield mp_1.mergeSubPackages(mpBuildAppJsonPath, pluginAppJsonPath);
         }))).catch(err => console.error(err));
     });
 }

package/lib/builder/service/builder/webpack.js

@@ -33,7 +33,7 @@ const console_1 = require("../../util/console");
 const types_1 = require("../../../types");
 const index_1 = require("../../../index");
 const index_2 = require("./index");
-const yarnExists = (0, command_exists_1.sync)('yarn');
+const yarnExists = command_exists_1.sync('yarn');
 const runningCompilations = {};
 function startCompile(options, cb) {
     const key = options.configPath;
@@ -43,8 +43,8 @@ function startCompile(options, cb) {
         return;
     }
     console.log('Running webpack by ' + options.configPath);
-    (0, util_1.removeRequireUncached)(path_1.default.resolve(options.configPath, '../miniprogram.config.js'));
-    const watching = (0, webpack_1.default)((0, util_1.requireUncached)(options.configPath), (err, stats) => __awaiter(this, void 0, void 0, function* () {
+    util_1.removeRequireUncached(path_1.default.resolve(options.configPath, '../miniprogram.config.js'));
+    const watching = webpack_1.default(util_1.requireUncached(options.configPath), (err, stats) => __awaiter(this, void 0, void 0, function* () {
         if (err) {
             console.error('webpack config error', err.stack || err);
             if (err.details) {
@@ -158,7 +158,7 @@ function downloadAndWriteTabBarIcon(iconPath, pagePath, appBuildDir, fileName) {
         const fileFullPath = path_1.default.resolve(appBuildDir, `dist/mp/${relativePath}`);
         yield fs_extra_1.default.ensureFile(fileFullPath);
         const writer = fs_extra_1.default.createWriteStream(fileFullPath);
-        const response = yield (0, axios_1.default)({
+        const response = yield axios_1.default({
             method: 'get',
             url: iconPath,
             responseType: 'stream',
@@ -246,7 +246,7 @@ function generateMpJsonConfigFile(allAppDataList, userConfig, appBuildDir, plugi
             kbConfig.generate = Object.assign(Object.assign({}, kbConfig.generate), { app: 'noemit' });
         }
         if (plugins.length > 0) {
-            kbConfig.generate.subpackages = Object.assign(Object.assign({}, kbConfig.generate.subpackages), (yield (0, plugin_1.getPluginKboneSubpackage)(appBuildDir, plugins)));
+            kbConfig.generate.subpackages = Object.assign(Object.assign({}, kbConfig.generate.subpackages), (yield plugin_1.getPluginKboneSubpackage(appBuildDir, plugins)));
         }
         const templateStr = JSON.stringify(kbConfig, null, 2);
         yield fs_extra_1.default.writeFile(path_1.default.resolve(appBuildDir, 'webpack/miniprogram.config.js'), `module.exports = ${templateStr}`);
@@ -259,7 +259,7 @@ function getMainAppDataByList(allAppDataList) {
 exports.getMainAppDataByList = getMainAppDataByList;
 function getHomePageInstance(pageInstanceList) {
     let target = pageInstanceList[0];
-    (0, weapps_core_1.loopDealWithFn)(pageInstanceList, (pageInstance) => {
+    weapps_core_1.loopDealWithFn(pageInstanceList, (pageInstance) => {
         if (pageInstance.isHome) {
             target = pageInstance;
             return pageInstance;
@@ -277,7 +277,7 @@ function getMpAllRouterConfig(allAppDataList, getHome = false) {
     let homePath = '';
     allAppDataList.map((appData) => {
         const { pageInstanceList, rootPath = '' } = appData;
-        (0, weapps_core_1.loopDealWithFn)(pageInstanceList, (pageInstance) => {
+        weapps_core_1.loopDealWithFn(pageInstanceList, (pageInstance) => {
             const name = [rootPath, pageInstance.id].filter((i) => i).join('_');
             const path = `/${name}`;
             if (!homePath) {
@@ -310,7 +310,7 @@ function getWebpackWebBuildParams(appId, appBuildDir, materialsDir, dependencies
             assets
                 .filter((assetUrl) => !!assetUrl)
                 .forEach((assetUrl) => __awaiter(this, void 0, void 0, function* () {
-                const fileName = (0, common_1.getFileNameByUrl)(assetUrl);
+                const fileName = common_1.getFileNameByUrl(assetUrl);
                 jsApis.push(`./${fileName}`);
                 yield downloadAssets(targetDir, assetUrl);
             }));
@@ -354,7 +354,7 @@ function getWebpackWebBuildParams(appId, appBuildDir, materialsDir, dependencies
             path_1.default.resolve(appBuildDir, 'src'),
             ...getMaterialNodeModulesPathList(dependencies, materialsDir),
         ],
-        definePlugin: Object.assign({ 'process.env.buildType': `"${buildTypeList[0]}"`, 'process.env.isApp': buildTypeList.includes("app"), 'process.env.isAdminPortal': (0, common_2.buildAsAdminPortalByBuildType)(buildTypeList) }, extraDefine),
+        definePlugin: Object.assign({ 'process.env.buildType': `"${buildTypeList[0]}"`, 'process.env.isApp': buildTypeList.includes("app"), 'process.env.isAdminPortal': common_2.buildAsAdminPortalByBuildType(buildTypeList) }, extraDefine),
         devtool: ['app-nvzcvt10', 'app-msa2ihs9'].includes(appId)
             ? 'source-map'
             : mode !== "production"
@@ -398,7 +398,7 @@ function getAllPageMpEntryPath(allAppDataList, appBuildDir, options = { generate
     allAppDataList.map((app) => {
         const { pageInstanceList, rootPath } = app;
         const packagePathStr = rootPath ? `packages/${rootPath}` : '';
-        (0, weapps_core_1.loopDealWithFn)(pageInstanceList, (pageInstance) => {
+        weapps_core_1.loopDealWithFn(pageInstanceList, (pageInstance) => {
             const pageName = rootPath
                 ? `${rootPath}_${pageInstance.id}`
                 : pageInstance.id;
@@ -411,7 +411,7 @@ exports.getAllPageMpEntryPath = getAllPageMpEntryPath;
 const dependenciesMap = new Map();
 function downloadAndInstallDependencies(dependencies = [], materialsDir, installOptions = {}) {
     return __awaiter(this, void 0, void 0, function* () {
-        const localPkg = (0, util_1.getCurrentPackageJson)();
+        const localPkg = util_1.getCurrentPackageJson();
         yield Promise.all(dependencies.map(({ name, version, srcZipUrl }) => __awaiter(this, void 0, void 0, function* () {
             const materialNameVersion = `${name}@${version}`;
             const targetDir = path_1.default.join(materialsDir, materialNameVersion);
@@ -420,11 +420,11 @@ function downloadAndInstallDependencies(dependencies = [], materialsDir, install
                 return;
             }
             if (dependenciesMap.get(targetDir)) {
-                (0, console_1.notice)(`${materialNameVersion} 存在 ${targetDir}，无需安装, 如果依赖库报错，请重启wa watch`);
+                console_1.notice(`${materialNameVersion} 存在 ${targetDir}，无需安装, 如果依赖库报错，请重启wa watch`);
                 return;
             }
             const matched = srcZipUrl.match(/\/(cg-.*?)\//);
-            const { appBuildDir } = (0, index_2.getCompileDirs)('app');
+            const { appBuildDir } = index_2.getCompileDirs('app');
             if (matched &&
                 matched[1] &&
                 fs_extra_1.default.existsSync(path_1.default.resolve(appBuildDir, `.component_cache/web/${matched[1]}@${version}`))) {
@@ -436,8 +436,7 @@ function downloadAndInstallDependencies(dependencies = [], materialsDir, install
                 yield downloadDependencies(targetDir, srcZipUrl);
             }
             console.log(`处理${name}@${version}依赖 ...`);
-            yield installDependencies(targetDir, Object.assign(Object.assign({}, installOptions), { ignoreInstall: (0, common_1.isOfficialComponentLib)(name, version) ||
-                    (installOptions === null || installOptions === void 0 ? void 0 : installOptions.ignoreInstall), dependenceMeta: {
+            yield installDependencies(targetDir, Object.assign(Object.assign({}, installOptions), { ignoreInstall: common_1.isOfficialComponentLib(name, version) || (installOptions === null || installOptions === void 0 ? void 0 : installOptions.ignoreInstall), dependenceMeta: {
                     name,
                     version,
                     downloadUrl: srcZipUrl,
@@ -454,7 +453,7 @@ function downloadDependencies(targetDir, srcZipUrl) {
             return;
         }
         try {
-            let response = yield (0, axios_1.default)({
+            let response = yield axios_1.default({
                 url: srcZipUrl,
                 responseType: 'stream',
             });
@@ -502,21 +501,21 @@ function installDependencies(targetDir, options = {}) {
         let installProcess;
         if (yarnExists && (options === null || options === void 0 ? void 0 : options.runtime) !== types_1.RUNTIME.CI) {
             const addPackage = packageName ? ['add', packageName] : [];
-            installProcess = (0, cross_spawn_1.default)('yarn', [...addPackage, registry], {
+            installProcess = cross_spawn_1.default('yarn', [...addPackage, registry], {
                 cwd: targetDir,
                 env: process.env,
                 stdio: ['inherit', 'pipe', 'pipe'],
             });
         }
         else {
-            installProcess = (0, cross_spawn_1.default)('npm', ['install', packageName, ...npmOptions], {
+            installProcess = cross_spawn_1.default('npm', ['install', packageName, ...npmOptions], {
                 cwd: targetDir,
                 env: process.env,
                 stdio: ['inherit', 'pipe', 'pipe'],
             });
         }
         installProcess.on('exit', () => console.timeEnd(operationTag));
-        yield (0, process_1.promisifyProcess)(installProcess);
+        yield process_1.promisifyProcess(installProcess);
         try {
             yield fs_extra_1.default.remove(path_1.default.join(path_1.default.join(targetDir, 'package-lock.json')));
             yield fs_extra_1.default.remove(path_1.default.join(path_1.default.join(targetDir, 'yarn.lock')));
@@ -526,7 +525,7 @@ function installDependencies(targetDir, options = {}) {
 }
 exports.installDependencies = installDependencies;
 function getMaterialNodeModulesPathList(dependencies = [], materialsDir) {
-    const localPkg = (0, util_1.getCurrentPackageJson)();
+    const localPkg = util_1.getCurrentPackageJson();
     return dependencies.map(({ name, version }) => {
         const nameVersion = `${name}@${version}`;
         if (localPkg && localPkg.name === name && localPkg.version === version) {
@@ -543,11 +542,11 @@ function generateWebpackWebDevServerFile({ appBuildDir, buildTypeList, }) {
         const template = yield fs_extra_1.default.readFile(path_1.default.resolve(config_2.appTemplateDir, './webpack/devServer.js'), {
             encoding: 'utf8',
         });
-        const jsContent = (0, lodash_template_1.default)(template, {
+        const jsContent = lodash_template_1.default(template, {
             interpolate: /<%=([\s\S]+?)%>/g,
         })({
             isApp: buildTypeList.includes("app"),
-            isAdminPortal: (0, common_2.buildAsAdminPortalByBuildType)(buildTypeList),
+            isAdminPortal: common_2.buildAsAdminPortalByBuildType(buildTypeList),
         });
         yield fs_extra_1.default.ensureFile(dest);
         yield fs_extra_1.default.writeFile(dest, jsContent);
@@ -560,7 +559,7 @@ function downloadAssets(targetDir, assetUrl) {
         if (isExist) {
             return;
         }
-        const [err, response] = yield (0, util_1.promiseWrapper)((0, axios_1.default)({
+        const [err, response] = yield util_1.promiseWrapper(axios_1.default({
             url: assetUrl,
             responseType: 'stream',
         }));
@@ -569,7 +568,7 @@ function downloadAssets(targetDir, assetUrl) {
             throw err;
         }
         yield fs_extra_1.default.ensureDir(targetDir);
-        const filename = (0, common_1.getFileNameByUrl)(assetUrl);
+        const filename = common_1.getFileNameByUrl(assetUrl);
         const targetPath = path_1.default.resolve(targetDir, `./${filename}`);
         const writer = fs_extra_1.default.createWriteStream(targetPath);
         response.data.pipe(writer);

package/lib/builder/types/common.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildAsXPageByBuildType = exports.buildAsAdminPortalByBuildType = exports.buildAsWebByBuildType = void 0;
 var common_1 = require("../../generator/types/common");
 Object.defineProperty(exports, "buildAsWebByBuildType", { enumerable: true, get: function () { return common_1.buildAsWebByBuildType; } });
 Object.defineProperty(exports, "buildAsAdminPortalByBuildType", { enumerable: true, get: function () { return common_1.buildAsAdminPortalByBuildType; } });