@cloudbase/lowcode-builder 1.0.16 → 1.0.19

package/lib/builder/mp/index.js

@@ -51,7 +51,6 @@ const lodash_1 = require("lodash");
 const junk = __importStar(require("../util/junk"));
 const net_1 = require("../util/net");
 const cals_1 = require("@cloudbase/cals");
-const common_2 = require("@cloudbase/lowcode-generator/lib/generator/util/common");
 const templateDir = `${config_1.appTemplateDir}/mp/`;
 const em = chalk_1.default.blue.bold;
 const error = chalk_1.default.redBright;
@@ -410,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(),
                 },
@@ -423,7 +422,7 @@ 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 lowCodes = (0, common_2.generateDefaultLowcodeIndex)(appData, 'global');
+    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)) {
@@ -434,7 +433,7 @@ async function writeLowCodeFiles(appData, outDir, ctx) {
         }));
     }
     await Promise.all((0, weapps_core_1.loopDealWithFn)(appData.pageInstanceList, async (page) => {
-        const codes = (0, common_2.generateDefaultLowcodeIndex)(page, page.id);
+        const codes = (0, cals_1.processRuntimeCodeResources)({ id: page.id }, page.lowCodes || page.codeModules, 'page');
         await codes
             .filter((mod) => mod.type !== 'renderer')
             .forEach((m) => {

package/lib/builder/mp/lowcode.js

@@ -21,7 +21,7 @@ async function writeCode2file(mod, lowcodeRootDir, opts = {}, themeCode, ctx) {
             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'`);
@@ -30,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

@@ -37,6 +37,7 @@ const generateFiles_1 = __importStar(require("../util/generateFiles"));
 const lowcode_1 = require("./lowcode");
 const net_1 = require("../util/net");
 const junk = __importStar(require("../util/junk"));
+const cals_1 = require("@cloudbase/cals");
 const templateDir = `${config_1.appTemplateDir}/mp/`;
 async function installMaterials(projDir, usedComps, weapps, ctx) {
     let { materialLibs, isBrowserMpBuilder } = ctx;
@@ -269,7 +270,8 @@ async function generateCompositeComponent(compositedComp, ctx, compLibCommonReso
             delete propDefs[p];
         }
     });
-    const importor = (0, util_2.generateLowcodeImportor)(compositedComp.lowCodes);
+    const codes = (0, cals_1.processRuntimeCodeResources)({ id: '$comp' }, compositedComp.lowCodes, 'component');
+    const importor = (0, util_2.generateLowcodeImportor)(codes);
     const pageFileData = {
         'index.js': {
             materialName,
@@ -305,20 +307,20 @@ async function generateCompositeComponent(compositedComp, ctx, compLibCommonReso
     // Generating file by template and data
     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 || ''}

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

@@ -1,5 +1,5 @@
 import { IComponentInputProps, IComponentsInfoMap, IPackageJson } from '../types/common';
-import { ICompositedComponent, IMaterialItem, IPageInstance, IWeAppComponentInstance, IWeAppCode } 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 模式

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.generateLowcodeImportor = 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"));
@@ -225,20 +225,6 @@ function isOfficialComponentLib(name, version) {
     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 模式

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/lowcode-builder",
-  "version": "1.0.16",
+  "version": "1.0.19",
   "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}) %>