@cloudbase/lowcode-builder 1.0.17 → 1.0.20

package/lib/builder/mp/index.js

@@ -44,13 +44,13 @@ const mp_config_1 = require("./mp_config");
 const plugin_1 = require("./plugin");
 const plugin_2 = require("../core/plugin");
 const util_3 = require("../util");
-const style_1 = require("@cloudbase/lowcode-generator/lib/generator/util/style");
 const lowcode_generator_1 = require("@cloudbase/lowcode-generator");
 const types_1 = require("../../types");
 const common_1 = require("../types/common");
 const lodash_1 = require("lodash");
 const junk = __importStar(require("../util/junk"));
 const net_1 = require("../util/net");
+const cals_1 = require("@cloudbase/cals");
 const templateDir = `${config_1.appTemplateDir}/mp/`;
 const em = chalk_1.default.blue.bold;
 const error = chalk_1.default.redBright;
@@ -73,7 +73,7 @@ async function generateWxMp({ weapps, projDir, appId, domain, materials, plugins
         isBrowserMpBuilder,
     };
     const yyptConfig = await (0, util_3.getYyptConfigInfo)(extraData);
-    const { appUsedComps, allAppUsedComps } = handleUsedComponents({
+    const { allAppUsedComps } = handleUsedComponents({
         buildContext,
         weapps,
         materials,
@@ -150,16 +150,19 @@ async function generateWxMp({ weapps, projDir, appId, domain, materials, plugins
         await (0, generateFiles_1.writeFile)(appJsonPath, JSON.stringify(appJson, undefined, 2));
     }
     else {
+        const importor = (0, util_3.generateLowcodeImportor)(mainAppData.lowCodes || []);
         appFileData = {
             ...appFileData,
             'common/wx_yypt_report_v2.js': {},
-            'app.js': { yyptConfig, appConfig },
+            'app.js': { appConfig, importor },
             'app.json': { content: appConfig },
             'app.wxss': {
-                importStyles: materials.reduce((styles, lib) => {
+                importStyles: materials
+                    .reduce((styles, lib) => {
                     styles = styles.concat((lib.styles || []).map((stylePath) => stylePath && !stylePath.startsWith('/') ? `/${config_1.materialsDirName}/${lib.name}/${stylePath}` : stylePath) || []);
                     return styles;
-                }, []),
+                }, [])
+                    .concat(importor.styles.map((mod) => path_1.default.join('lowcode', (0, weapps_core_1.getCodeModuleFilePath)('global', mod, { style: '.wxss' })))),
             },
             'package.json': {
                 appId,
@@ -303,6 +306,7 @@ async function generatePkg(weapp, appRoot, ctx, pageConfigs) {
             const usingComponents = {};
             const componentGenerics = {};
             const wxml = (0, wxml_1.generateWxml)(page.componentInstances, `Page ${rootPath ? path_1.default.join(rootPath, 'pages') : ''}/${page.id}`, wxmlDataPrefix, { ...ctx, rootPath, isPage: true }, usingComponents, componentGenerics);
+            const importor = (0, util_3.generateLowcodeImportor)(page.lowCodes);
             const pageFileName = (0, lodash_1.get)(pageConfigs, `${page.id}.pageFileName`, 'index');
             const pageFileData = {
                 [`api.js|api.js`]: {},
@@ -319,6 +323,7 @@ async function generatePkg(weapp, appRoot, ctx, pageConfigs) {
                     debug: ctx.debugMode,
                     stringifyObj: util_1.inspect,
                     subLevelPath: rootPath ? `${path_1.default.relative(rootPath, '')}/` : '',
+                    importor,
                 },
                 [`index.json|${pageFileName}.json`]: {
                     usingComponents,
@@ -337,7 +342,7 @@ async function generatePkg(weapp, appRoot, ctx, pageConfigs) {
                         toRem: false,
                         toRpx: true,
                     }), 'page'),
-                    pageWxss: `@import "../../lowcode/${page.id}/style.wxss"`,
+                    pageWxss: importor.styles.length ? `@import "../../lowcode/${page.id}/style.wxss"` : '',
                 },
             };
             // Generating file by template and data
@@ -358,7 +363,7 @@ async function generateFramework(appData, outDir, ctx) {
                     appId: ctx.appId,
                     subLevelPath: '',
                     subPackageName: '',
-                    isBare: true,
+                    importor: (0, util_3.generateLowcodeImportor)([]),
                     domain: ctx.domain || '',
                     appConfig: JSON.stringify({}),
                 },
@@ -379,6 +384,7 @@ async function generateFramework(appData, outDir, ctx) {
         // 子包混合模式 只在子包中生成 handlers
         const isMixSubpackage = ctx.isMixMode && appData.rootPath;
         if (!isMixSubpackage) {
+            const importor = (0, util_3.generateLowcodeImportor)(appData.lowCodes);
             fileData = {
                 ...fileData,
                 'app/app-global.js': {},
@@ -387,7 +393,7 @@ async function generateFramework(appData, outDir, ctx) {
                     domain: ctx.domain || '',
                     subLevelPath: appData.rootPath ? `${path_1.default.relative(`${appData.rootPath}`, '')}/` : '',
                     subPackageName: appData.rootPath || '',
-                    isBare: false,
+                    importor,
                     appConfig: (0, util_3.JsonToStringWithVariableName)({
                         id: ctx.appId,
                         envId: appData.envId,
@@ -403,7 +409,7 @@ async function generateFramework(appData, outDir, ctx) {
                 },
                 'app/common.js': {
                     mods: appData.lowCodes
-                        .filter((m) => m.type === 'normal-module' && m.name !== '____index____')
+                        .filter((m) => m.type === cals_1.ECodeType.NORMAL_MODULE && m.name !== '____index____')
                         .map((m) => m.name)
                         .sort(),
                 },
@@ -416,31 +422,23 @@ async function generateFramework(appData, outDir, ctx) {
 async function writeLowCodeFiles(appData, outDir, ctx) {
     console.log(`Writing ${em('lowcode')} files:`);
     const lowcodeRootDir = path_1.default.join(outDir, 'lowcode');
-    const themeStyle = (0, style_1.generateDefaultTheme)(appData);
+    const lowCodes = (0, cals_1.processRuntimeCodeResources)({ id: 'global' }, appData.lowCodes || appData.codeModules, 'app');
+    const themeStyle = lowCodes.find((mod) => mod.type === cals_1.ECodeType.THEME);
     // 混合模式，子包不生成顶级（应用级）的 lowcodes
     if (!(ctx.isMixMode && appData.rootPath)) {
-        await Promise.all(appData.lowCodes
-            .filter((mod) => mod.name !== '____index____')
+        await Promise.all(lowCodes
             .filter((mod) => mod.type !== 'renderer')
             .map((m) => {
             (0, lowcode_1.writeCode2file)(m, lowcodeRootDir, { appDir: outDir }, themeStyle.code);
         }));
     }
     await Promise.all((0, weapps_core_1.loopDealWithFn)(appData.pageInstanceList, async (page) => {
-        var _a;
-        (0, style_1.generateDefaultStyle)(page);
-        const codes = [...((page === null || page === void 0 ? void 0 : page.lowCodes) || [])];
-        if (!codes.find((m) => m.name === 'index')) {
-            // @ts-ignore
-            codes.push({
-                code: 'export default {}',
-                name: 'index',
-                path: 'xx/index',
-            });
-        }
-        await ((_a = page === null || page === void 0 ? void 0 : page.lowCodes) === null || _a === void 0 ? void 0 : _a.filter((mod) => mod.name !== '____index____').filter((mod) => mod.type !== 'renderer').forEach((m) => {
+        const codes = (0, cals_1.processRuntimeCodeResources)({ id: page.id }, page.lowCodes || page.codeModules, 'page');
+        await codes
+            .filter((mod) => mod.type !== 'renderer')
+            .forEach((m) => {
             (0, lowcode_1.writeCode2file)(m, lowcodeRootDir, { pageId: page.id, appDir: outDir }, themeStyle.code, ctx);
-        }));
+        });
     }));
 }
 exports.writeLowCodeFiles = writeLowCodeFiles;

package/lib/builder/mp/lowcode.js

@@ -8,19 +8,20 @@ const path_1 = __importDefault(require("path"));
 const weapps_core_1 = require("@cloudbase/lowcode-generator/lib/weapps-core");
 const style_1 = require("@cloudbase/lowcode-generator/lib/generator/util/style");
 const generateFiles_1 = require("../util/generateFiles");
+const cals_1 = require("@cloudbase/cals");
 async function writeCode2file(mod, lowcodeRootDir, opts = {}, themeCode, ctx) {
     const { pageId = 'global', appDir, comp } = opts;
     const file = path_1.default.join(lowcodeRootDir, (0, weapps_core_1.getCodeModuleFilePath)(pageId || 'global', mod, { style: '.wxss' }));
-    let code = mod.code;
-    if (mod.type !== 'style' && mod.type !== 'theme') {
+    let { code } = mod;
+    if (mod.type !== cals_1.ECodeType.STYLE && mod.type !== cals_1.ECodeType.THEME) {
         if (appDir) {
             // Generate app lowcode
             const baseDir = path_1.default.relative(path_1.default.dirname(file), appDir).replace(/\\/g, '/');
             // 子包混合模式需要添加相对索引到根目录
-            const relativeRoot = (ctx === null || ctx === void 0 ? void 0 : ctx.isMixMode) && ctx.rootPath ? path_1.default.relative(ctx.rootPath, '') + '/' : '';
+            const relativeRoot = (ctx === null || ctx === void 0 ? void 0 : ctx.isMixMode) && ctx.rootPath ? `${path_1.default.relative(ctx.rootPath, '')}/` : '';
             let weappsApiPrefix = [
                 `import { app, process } from '${relativeRoot}${baseDir}/app/weapps-api';`,
-                'const $app = app;',
+                'const $app = new Proxy({}, { get: function(obj, prop){ return app[prop] }})',
             ]; // windows compatibility
             if (pageId !== 'global') {
                 weappsApiPrefix.push(`import { $page } from '${baseDir}/pages/${pageId}/api'`);
@@ -29,7 +30,7 @@ async function writeCode2file(mod, lowcodeRootDir, opts = {}, themeCode, ctx) {
         }
         else {
             // Generate component lowcode
-            code = `import process from '${mod.type === 'handler-fn' ? '../' : ''}../../../../common/process'\nimport app from '${mod.type === 'handler-fn' ? '../' : ''}../../../../common/weapp-sdk';\nconst $app = app;\n${code.replace(/\$comp/g, weapps_core_1.COMPONENT_API_PREFIX)}`;
+            code = `import process from '${mod.type === 'handler-fn' ? '../' : ''}../../../../common/process'\nimport app from '${mod.type === 'handler-fn' ? '../' : ''}../../../../common/weapp-sdk';\nconst $app = new Proxy({}, { get: function(obj, prop){ return app[prop] }});\n${code.replace(/\$comp/g, weapps_core_1.COMPONENT_API_PREFIX)}`;
         }
     }
     else {

package/lib/builder/mp/materials.js

@@ -36,14 +36,12 @@ const wxml_1 = require("./wxml");
 const generateFiles_1 = __importStar(require("../util/generateFiles"));
 const lowcode_1 = require("./lowcode");
 const net_1 = require("../util/net");
-const util_4 = require("../util");
 const junk = __importStar(require("../util/junk"));
-const templateDir = config_1.appTemplateDir + '/mp/';
+const cals_1 = require("@cloudbase/cals");
+const templateDir = `${config_1.appTemplateDir}/mp/`;
 async function installMaterials(projDir, usedComps, weapps, ctx) {
     let { materialLibs, isBrowserMpBuilder } = ctx;
-    const weappsList = ctx.isMixMode
-        ? weapps
-        : weapps.filter((item) => !item.rootPath);
+    const weappsList = ctx.isMixMode ? weapps : weapps.filter((item) => !item.rootPath);
     // #1 Download uploaded libs
     const localPkg = (0, util_2.getCurrentPackageJson)();
     await Promise.all(materialLibs
@@ -62,7 +60,7 @@ async function installMaterials(projDir, usedComps, weapps, ctx) {
             await downloadMaterial(mpPkgUrl, materialsSrcDir, ctx.isBrowserMpBuilder);
         }
         function libUpdated(libDir, version) {
-            const meta = (0, util_4.readComponentLibMata)(libDir);
+            const meta = (0, util_2.readComponentLibMata)(libDir);
             if (!meta) {
                 return true;
             }
@@ -98,7 +96,7 @@ async function installMaterials(projDir, usedComps, weapps, ctx) {
                     // #3 copy 组件库代码文件到项目目录
                     !isBrowserMpBuilder
                         ? await fs.copy(materialsSrcDirPath, targetDir, {
-                            filter: function (src, dest) {
+                            filter(src, dest) {
                                 const path = src.split('/');
                                 return !junk.is(path[path.length - 1]);
                             },
@@ -112,7 +110,7 @@ async function installMaterials(projDir, usedComps, weapps, ctx) {
                     // #2 link material to current project
                     !isBrowserMpBuilder
                         ? await fs.copy(materialsSrcDir, targetDir, {
-                            filter: function (src, dest) {
+                            filter(src, dest) {
                                 const path = src.split('/');
                                 return !junk.is(path[path.length - 1]);
                             },
@@ -122,7 +120,7 @@ async function installMaterials(projDir, usedComps, weapps, ctx) {
                         });
                 }
             }
-            const libMeta = (0, util_4.readComponentLibMata)(targetDir);
+            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;
@@ -163,7 +161,7 @@ async function installMaterials(projDir, usedComps, weapps, ctx) {
             }
             cmp.meta.platforms = {
                 mp: {
-                    path: cmp.name + '/index',
+                    path: `${cmp.name}/index`,
                 },
             };
             lib.dependencies = { ...lib.dependencies, ...cmp.npmDependencies };
@@ -171,8 +169,8 @@ async function installMaterials(projDir, usedComps, weapps, ctx) {
     });
     // #2 Generate composited libs
     await Promise.all(compositedLibs.map(async (lib) => {
-        console.log('Generate composited library ' + lib.name);
-        await (0, util_4.writeLibCommonRes2file)(lib, path.join(ctx.projDir, config_1.materialsDirName, lib.name, 'libCommonRes'));
+        console.log(`Generate composited library ${lib.name}`);
+        await (0, util_2.writeLibCommonRes2file)(lib, path.join(ctx.projDir, config_1.materialsDirName, lib.name, 'libCommonRes'));
         await Promise.all(lib.components.map(async (cmp) => {
             return generateCompositeComponent(cmp, {
                 ...ctx,
@@ -206,7 +204,7 @@ function extractUsedCompsRecursively(comps, checkedComps, compositedLibs, output
         cmpNames.forEach((cmpName) => {
             const cmp = lib.components.find((c) => c.name === cmpName);
             if (!cmp) {
-                console.warn('Component not found', libName + ':' + cmpName);
+                console.warn('Component not found', `${libName}:${cmpName}`);
                 return;
             }
             if (checkedComps.indexOf(cmp) > -1)
@@ -237,23 +235,20 @@ async function generateCompositeComponent(compositedComp, ctx, compLibCommonReso
     const { materialName } = compositedComp;
     const outDir = path.join(ctx.projDir, ctx.rootPath || '', // 混合模式下，可能会有 rootPath
     config_1.materialsDirName, materialName, compositedComp.name);
+    const LOWCODE_DIR_NAME = 'lowcode';
     console.log(`Generating composited component ${materialName}:${compositedComp.name} to ${outDir}`);
     const wxmlDataPrefix = (0, mp_1.getWxmlDataPrefix)(!ctx.isProduction);
     // # Generating page
     const usingComponents = {};
     const componentGenerics = {};
     const cmpContainer = Object.values(compositedComp.componentInstances)[0];
-    const wxml = (0, wxml_1.generateWxml)(compositedComp.componentInstances, 'Component ' + materialName + ':' + compositedComp.name, wxmlDataPrefix, { ...ctx, isPage: false }, usingComponents, componentGenerics, (cmp, node) => {
+    const wxml = (0, wxml_1.generateWxml)(compositedComp.componentInstances, `Component ${materialName}:${compositedComp.name}`, wxmlDataPrefix, { ...ctx, isPage: false }, usingComponents, componentGenerics, (cmp, node) => {
         if (cmp === cmpContainer) {
             // Set className & style passed from parent for root component
             const { attributes } = node;
             const classAttrName = (0, mp_1.getClassAttrName)(node.name);
             const oldClass = attributes[classAttrName];
-            attributes[classAttrName] =
-                (0, weapps_core_1.getCompositedComponentClass)(compositedComp) +
-                    ' ' +
-                    oldClass +
-                    ' {{className}}';
+            attributes[classAttrName] = `${(0, weapps_core_1.getCompositedComponentClass)(compositedComp)} ${oldClass} {{className}}`;
             attributes.style += ';{{style}}';
         }
     });
@@ -275,9 +270,11 @@ async function generateCompositeComponent(compositedComp, ctx, compLibCommonReso
             delete propDefs[p];
         }
     });
+    const codes = (0, cals_1.processRuntimeCodeResources)({ id: '$comp' }, compositedComp.lowCodes, 'component');
+    const importor = (0, util_2.generateLowcodeImportor)(codes);
     const pageFileData = {
         'index.js': {
-            materialName: materialName,
+            materialName,
             propDefs,
             handlers: compositedComp.lowCodes
                 .filter((m) => m.type === 'handler-fn' && m.name !== '____index____')
@@ -288,13 +285,14 @@ async function generateCompositeComponent(compositedComp, ctx, compLibCommonReso
             widgetProps: (0, util_3.createWidgetProps)(compositedComp.componentInstances, ctx),
             compApi: weapps_core_1.COMPONENT_API_PREFIX,
             jsonSchemaType2jsClass: mp_1.jsonSchemaType2jsClass,
-            key: compositedComp.materialName + ':' + compositedComp.name,
+            key: `${compositedComp.materialName}:${compositedComp.name}`,
             dataBinds: (0, util_3.createDataBinds)(compositedComp.componentInstances, ctx),
             debug: !ctx.isProduction,
             stringifyObj: util_1.inspect,
             // dataPropNames: wxmlDataPrefix,
             formEvents: Object.keys(formEvents).length > 0 ? formEvents : null,
             config: compositedComp.compConfig,
+            importor,
         },
         'index.json': { usingComponents, componentGenerics },
         'index.wxml': {
@@ -302,32 +300,34 @@ async function generateCompositeComponent(compositedComp, ctx, compLibCommonReso
             // wrapperClass: getCompositedComponentClass(compositedComp),
             content: wxml,
         },
-        'index.wxss': {},
+        'index.wxss': {
+            importStyles: importor.styles.map((mod) => path.join(LOWCODE_DIR_NAME, (0, weapps_core_1.getCodeModuleFilePath)('global', mod, { style: '.wxss' }))),
+        },
     };
     // Generating file by template and data
-    await (0, generateFiles_1.default)(pageFileData, templateDir + '/component', outDir, ctx);
+    await (0, generateFiles_1.default)(pageFileData, `${templateDir}/component`, outDir, ctx);
     // #3 writing lowcode files
-    const codes = [...compositedComp.lowCodes];
-    if (!codes.find((m) => m.name === 'index')) {
-        // @ts-ignore
-        codes.push({
-            code: 'export default {}',
-            name: 'index',
-            path: 'index',
-        });
-    }
-    codes
-        .filter((mod) => mod.name !== '____index____')
-        .map((mod) => {
+    /**
+     * 低码没有开放 index 类别，直接去掉
+     */
+    // if (!codes.find((m) => m.name === 'index')) {
+    //   // @ts-ignore
+    //   codes.push({
+    //     code: 'export default {}',
+    //     name: 'index',
+    //     path: 'index',
+    //   });
+    // }
+    codes.map((mod) => {
         let themeCode;
-        if (mod.type === 'style' && compLibCommonResource) {
+        if (mod.type === cals_1.ECodeType.STYLE && compLibCommonResource) {
             themeCode = `
          ${compLibCommonResource.theme.variable || ''}
          ${compLibCommonResource.class || ''}
          ${compLibCommonResource.theme.class || ''}
       `;
         }
-        return (0, lowcode_1.writeCode2file)(mod, path.join(outDir, 'lowcode'), { comp: compositedComp }, themeCode, ctx);
+        return (0, lowcode_1.writeCode2file)(mod, path.join(outDir, LOWCODE_DIR_NAME), { comp: compositedComp }, themeCode, ctx);
     });
     // await writeLowCodeFiles(weapp, appRoot)
     // await generateFramework(weapp, appRoot)
@@ -368,7 +368,7 @@ function getWxmlTag(cmp, ctx, nameMangler) {
                 compPath.startsWith('/') || compPath.indexOf('://') > 0
                     ? compPath
                     : path.posix.join(
-                    /*ctx.isMixMode ? '/' + rootPath : */ '', `/${config_1.materialsDirName}/${cmp.moduleName}`, compPath);
+                    /* ctx.isMixMode ? '/' + rootPath : */ '', `/${config_1.materialsDirName}/${cmp.moduleName}`, compPath);
             tagName = `${moduleName}-${name}`;
             if (nameMangler) {
                 tagName = nameMangler.mangle(tagName);

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

@@ -1,5 +1,5 @@
 import { IComponentInputProps, IComponentsInfoMap, IPackageJson } from '../types/common';
-import { ICompositedComponent, IMaterialItem, IPageInstance, IWeAppComponentInstance } from '@cloudbase/lowcode-generator/lib/weapps-core';
+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 declare type PromiseResult<T> = Promise<[null, T] | [Error, null]>;
 export declare function promiseWrapper<T>(p: Promise<T>): PromiseResult<T>;
@@ -37,7 +37,6 @@ export declare function readComponentLibMata(libDir: any): {
     };
 } | null;
 export declare function isOfficialComponentLib(name: any, version: any): boolean;
-export declare function gererateIndexAPI(data: IPageInstance | ICompositedComponent, isComponent?: boolean): void;
 /**
  * 能否使用 Vite
  * @param mode 当前 mode 模式
@@ -50,3 +49,10 @@ interface ICompileDirs {
     materialsDir: string;
 }
 export declare function getCompileDirs(appKey?: string): ICompileDirs;
+export declare function generateLowcodeImportor(lowcodes?: IWeAppCode[]): {
+    state: boolean;
+    computed: boolean;
+    lifecycle: boolean;
+    common: boolean;
+    styles: IWeAppCode[];
+};

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.getCompileDirs = exports.deepDealComponentSchemaJson = exports.canUseVite = exports.gererateIndexAPI = 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.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;
 // import * as R from 'ramda'
 const path_1 = __importDefault(require("path"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
@@ -11,6 +11,7 @@ const style_1 = require("@cloudbase/lowcode-generator/lib/generator/util/style")
 const generateFiles_1 = require("./generateFiles");
 const cals_1 = require("@cloudbase/cals");
 const compare_versions_1 = __importDefault(require("compare-versions"));
+const os_1 = __importDefault(require("os"));
 var common_1 = require("@cloudbase/lowcode-generator/lib/generator/util/common");
 Object.defineProperty(exports, "getMetaInfoBySourceKey", { enumerable: true, get: function () { return common_1.getMetaInfoBySourceKey; } });
 Object.defineProperty(exports, "isArray", { enumerable: true, get: function () { return common_1.isArray; } });
@@ -19,7 +20,6 @@ Object.defineProperty(exports, "deepDeal", { enumerable: true, get: function ()
 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 os_1 = __importDefault(require("os"));
 const homeDir = os_1.default.homedir();
 const commandConfigPath = path_1.default.join(homeDir, '.warc');
 function promiseWrapper(p) {
@@ -56,12 +56,8 @@ function getSelfPackageJson() {
 }
 exports.getSelfPackageJson = getSelfPackageJson;
 function JsonToStringWithVariableName(copyJson, options = {}) {
-    let variable = JSON.stringify(copyJson, null, 2).replace(/"%%%(.*?)%%%"/g, function (match, expression) {
-        return expression
-            .replace(/\\"/g, '"')
-            .replace(/\\'/g, "'")
-            .replace(/\\r/g, '\r')
-            .replace(/\\n/g, '\n');
+    let variable = JSON.stringify(copyJson, null, 2).replace(/"%%%(.*?)%%%"/g, (match, expression) => {
+        return expression.replace(/\\"/g, '"').replace(/\\'/g, "'").replace(/\\r/g, '\r').replace(/\\n/g, '\n');
     });
     return variable;
 }
@@ -88,8 +84,7 @@ function getInputProps(componentsMetaMap) {
             let compItem = component;
             Object.keys(compItem.dataForm || {}).forEach((key) => {
                 var _a, _b;
-                const inputProps = ((_a = compItem.dataForm[key]) === null || _a === void 0 ? void 0 : _a.inputProp) ||
-                    ((_b = compItem.dataForm[key]) === null || _b === void 0 ? void 0 : _b.syncProps);
+                const inputProps = ((_a = compItem.dataForm[key]) === null || _a === void 0 ? void 0 : _a.inputProp) || ((_b = compItem.dataForm[key]) === null || _b === void 0 ? void 0 : _b.syncProps);
                 if (inputProps) {
                     outputObj[sourceKey] = {
                         [key]: inputProps,
@@ -177,7 +172,7 @@ async function getYyptConfigInfo(extraData) {
 }
 exports.getYyptConfigInfo = getYyptConfigInfo;
 async function writeLibCommonRes2file(gItem, codeDir) {
-    const compLibCommonResource = gItem.compLibCommonResource;
+    const { compLibCommonResource } = gItem;
     const libCommonResFiles = [];
     libCommonResFiles.push({
         path: path_1.default.join(codeDir, `class.${codeDir.includes('/mp/') ? 'wxss' : 'less'}`),
@@ -227,35 +222,16 @@ const _OFFICIAL_COMPONENT_LIB = {
 };
 function isOfficialComponentLib(name, version) {
     var _a, _b;
-    return (!!((_a = _OFFICIAL_COMPONENT_LIB[name]) === null || _a === void 0 ? void 0 : _a.includes(version)) ||
-        ((_b = _OFFICIAL_COMPONENT_LIB[name]) === null || _b === void 0 ? void 0 : _b.includes('*')));
+    return !!((_a = _OFFICIAL_COMPONENT_LIB[name]) === null || _a === void 0 ? void 0 : _a.includes(version)) || ((_b = _OFFICIAL_COMPONENT_LIB[name]) === null || _b === void 0 ? void 0 : _b.includes('*'));
 }
 exports.isOfficialComponentLib = isOfficialComponentLib;
-function gererateIndexAPI(data, isComponent) {
-    const lowCodes = data.lowCodes ||
-        data.codeModules ||
-        [];
-    if (!lowCodes.find(({ name }) => name === 'index')) {
-        // 补充组件不存在的 index 类型代码
-        lowCodes.push({
-            type: 'index',
-            path: isComponent ? 'index' : `${data.id}/index`,
-            name: 'index',
-            code: 'export default {}',
-            system: true,
-        });
-    }
-}
-exports.gererateIndexAPI = gererateIndexAPI;
 /**
  * 能否使用 Vite
  * @param mode 当前 mode 模式
  */
 function canUseVite(mode, devTool) {
     return false;
-    return (devTool === 'vite' &&
-        mode !== 'production' &&
-        (0, compare_versions_1.default)(process.version, '12.0.0') >= 0);
+    return devTool === 'vite' && mode !== 'production' && (0, compare_versions_1.default)(process.version, '12.0.0') >= 0;
 }
 exports.canUseVite = canUseVite;
 function deepDealComponentSchemaJson(schema, dealFn) {
@@ -282,3 +258,38 @@ function getCompileDirs(appKey = 'test') {
     };
 }
 exports.getCompileDirs = getCompileDirs;
+function generateLowcodeImportor(lowcodes = []) {
+    const importor = {
+        state: false,
+        computed: false,
+        lifecycle: false,
+        common: false,
+        styles: [],
+    };
+    lowcodes.forEach((mod) => {
+        switch (mod.type) {
+            case cals_1.ECodeType.STYLE: {
+                importor.styles.push(mod);
+                break;
+            }
+            case cals_1.ECodeType.LIFECYCLE: {
+                importor.lifecycle = true;
+                break;
+            }
+            case cals_1.ECodeType.STATE: {
+                importor.state = true;
+                break;
+            }
+            case cals_1.ECodeType.COMPUTEDN: {
+                importor.computed = true;
+                break;
+            }
+            case cals_1.ECodeType.NORMAL_MODULE: {
+                importor.common = true;
+                break;
+            }
+        }
+    });
+    return importor;
+}
+exports.generateLowcodeImportor = generateLowcodeImportor;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/lowcode-builder",
-  "version": "1.0.17",
+  "version": "1.0.20",
   "description": "云开发 Tencent CloudBase Framework Low Code Plugin，将低码配置生成完整项目并一键部署云开发资源。",
   "author": "yhsunshining@gmail.com",
   "homepage": "https://github.com/TencentCloudBase/cloudbase-framework#readme",
@@ -38,8 +38,8 @@
     "url": "https://github.com/TencentCloudBase/cloudbase-framework/issues"
   },
   "dependencies": {
-    "@cloudbase/cals": "^0.3.37",
-    "@cloudbase/lowcode-generator": "^1.0.4",
+    "@cloudbase/cals": "^0.4.1",
+    "@cloudbase/lowcode-generator": "^1.0.6",
     "axios": "^0.21.0",
     "browserfs": "^1.4.3",
     "browserify-zlib": "^0.2.0",

package/template/html/index.html.ejs

@@ -461,7 +461,7 @@
     ></script>
     <script
       crossorigin
-      src="https://qbase.cdn-go.cn/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.3a66f83a42344bba1e13.bundle.js"
+      src="https://qbase.cdn-go.cn/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.aa184d8a35d646df4cc0.bundle.js"
     ></script>
   </body>
 </html>

package/template/mp/app/weapps-api.js

@@ -3,17 +3,11 @@ import { createMpApp } from '@cloudbase/weda-client';
 import { createComputed, formatEnum, enumOptions } from '<%= subLevelPath %>../common/util'
 import process from '<%= subLevelPath %>../common/process'
 import appGlobal from '<%= subLevelPath %>../app/app-global'
-import { createDataset, EXTRA_API } from '<%= subLevelPath %>../datasources/index'
+import { createDataset } from '<%= subLevelPath %>../datasources/index'
 
-<% if (!isBare) {%>
-import state from '../lowcode/state'
-import computed from '../lowcode/computed'
-import common from './common'
-<%} else {%>
-const state = {}
-const computed = {}
-const common = {}
-<%}%>
+<%= importor.state? `import state from '../lowcode/state'` : "const state = {}" %>
+<%= importor.computed? `import computed from '../lowcode/computed'` : "const computed = {}" %>
+<%= importor.common? `import common from './common'` : "const common = {}" %>
 
 const mainAppKey = '__weappsMainApp'
 

package/template/mp/app.js

@@ -1,4 +1,4 @@
-import lifeCycle from './lowcode/lifecycle'
+<%= importor.lifecycle? "import lifeCycle from './lowcode/lifecycle'" : "const lifeCycle = {}" %>
 import { app } from './app/weapps-api'
 // 引入数据源管理器并进行初始化
 import { setConfig, getAccessToken, EXTRA_API, createStateDataSourceVar, generateParamsParser } from './datasources/index'
@@ -15,7 +15,7 @@ console.warn = (...args) => {
     }
 }
 
-const $app = app;
+const $app = new Proxy({}, { get: function(obj, prop){ return app[prop] }});
 // 设置数据源请求的 loading 及 toast 处理
 setConfig({
   beforeDSRequest: (cfg) => {
@@ -95,23 +95,15 @@ App({
     createStateDataSourceVar('$global', generateParamsParser({ app }))
 
     onLaunch && onLaunch.call(this, options)
-      <% if (yyptConfig.yyptAppKey) { %>
-        // 挂运营平台上报对象到app里
-        app.yyptReport = wxReport
-          <% }%>
-
-            // 初始私有全局数据
-            this.$$global = {
+    // 初始私有全局数据
+    this.$$global = {
       homePageId: '<%= appConfig.homePageId %>'
     }
   },
   onShow(options) {
     const fn = lifeCycle.onShow || lifeCycle.onAppShow
     fn && fn.call(this, options)
-      <% if (yyptConfig.yyptAppKey) { %>
-        wxReport.startReport()
-        <% }%>
-},
+  },
   onHide() {
     const fn = lifeCycle.onHide || lifeCycle.onAppHide
     fn && fn.call(this)

package/template/mp/app.wxss

@@ -8,8 +8,5 @@ page view, page element, page text, page image {
   box-sizing: border-box;
 }
 
-/** import styles specified by material libs*/<% importStyles.map(style => {%>
+/** import styles specified by material libs & lowcode styles if exist*/<% importStyles.map(style => {%>
 @import  '<%= style %>';<%})%>
-
-/** import lowcode styles */
-@import  'lowcode/style.wxss';

package/template/mp/component/index.js

@@ -2,10 +2,9 @@ import { observable } from 'mobx';
 import { createComponent } from '../../../common/weapp-component'
 import { concatClassList, px2rpx } from '../../../common/style'
 import app from '../../../common/weapp-sdk'
-import index from './lowcode/index'
-import lifeCycle from './lowcode/lifecycle'
-import stateFn from './lowcode/state'
-import computedFuncs from './lowcode/computed'
+<%= importor.lifecycle? "import lifeCycle from './lowcode/lifecycle'" : "const lifeCycle = {}" %>
+<%= importor.state? "import stateFn from './lowcode/state'" : "const stateFn = {}" %>
+<%= importor.computed? "import computedFuncs from './lowcode/computed'" : "const computedFuncs = {}" %>
 <% handlers.forEach(h => {%>
 import _handler<%= h %> from './lowcode/handler/<%= h %>' <%}) %>
 import * as constObj from '../libCommonRes/const'
@@ -61,4 +60,4 @@ const dataBinds = {<% Object.entries(dataBinds).map(([id, widgetBinds])=>{%>
 const config = <%= JSON.stringify(config || {})%>
 
 createComponent('<%= key %>', behaviors, properties, events, handler, dataBinds, evtListeners, widgetProps,
- index, lifeCycle, stateFn, computedFuncs, config, { const: constObj, tools: toolsObj }, libCode, context)
+ {}, lifeCycle, stateFn, computedFuncs, config, { const: constObj, tools: toolsObj }, libCode, context)

package/template/mp/component/index.wxss

@@ -1 +1,2 @@
-@import './lowcode/style.wxss';
+<% importStyles.map(style => {%>
+  @import  '<%= style %>';<%})%>

package/template/mp/page/index.js

@@ -3,12 +3,12 @@ import { createPage } from '<%= subLevelPath %>../../common/weapp-page'
 import { concatClassList, px2rpx } from '<%= subLevelPath %>../../common/style'
 import { app } from '<%= subLevelPath %>../../app/weapps-api'
 import { <%= pageName %> as handlers } from '../../app/handlers'
-import lifecyle from '../../lowcode/<%= pageName %>/lifecycle'
-import state from '../../lowcode/<%= pageName %>/state'
-import computed from '../../lowcode/<%= pageName %>/computed'
+<%= importor.lifecycle? `import lifecyle from '../../lowcode/${pageName}/lifecycle'` : "const lifecyle = {}" %>
+<%= importor.state? `import state from '../../lowcode/${pageName}/state'` : "const state = {}" %>
+<%= importor.computed? `import computed from '../../lowcode/${pageName}/computed'` : "const computed = {}" %>
 import { $page } from './api'
 
-const $app = app;
+const $app = new Proxy({}, { get: function(obj, prop){ return app[prop] }});
 const context = observable({});
 
 const widgetProps = <%= stringifyObj(widgetProps, {depth: null}) %>