@cloudbase/lowcode-builder 1.8.25 → 1.8.27

package/lib/builder/config/index.d.ts

@@ -6,7 +6,7 @@ export declare const materialsDirName = "materials";
  * src/template的代码，在IDE编辑器插件中构建builder
  * 存放在大账号：100015939275。访问地址：https://console.cloud.tencent.com/cos/bucket?bucket=comp-public-1303824488&region=ap-shanghai&path=%252Flcap-builder%252F
  */
-export declare const builderTemplateURL = "https://comp-public-1303824488.cos.ap-shanghai.myqcloud.com/lcap-builder/template.1.8.25.zip";
+export declare const builderTemplateURL = "https://comp-public-1303824488.cos.ap-shanghai.myqcloud.com/lcap-builder/template.1.8.27.zip";
 /**
  * miniprogram的代码，IDE插件后续会提供端功能
  * 存放在大账号：100015939275。访问地址：https://console.cloud.tencent.com/cos/bucket?bucket=comp-public-1303824488&region=ap-shanghai&path=%252Flcap-builder%252F

package/lib/builder/config/index.js

@@ -45,7 +45,7 @@ exports.materialsDirName = 'materials'; // materials diretory of current project
  * src/template的代码，在IDE编辑器插件中构建builder
  * 存放在大账号：100015939275。访问地址：https://console.cloud.tencent.com/cos/bucket?bucket=comp-public-1303824488&region=ap-shanghai&path=%252Flcap-builder%252F
  */
-exports.builderTemplateURL = 'https://comp-public-1303824488.cos.ap-shanghai.myqcloud.com/lcap-builder/template.1.8.25.zip';
+exports.builderTemplateURL = 'https://comp-public-1303824488.cos.ap-shanghai.myqcloud.com/lcap-builder/template.1.8.27.zip';
 /**
  * miniprogram的代码，IDE插件后续会提供端功能
  * 存放在大账号：100015939275。访问地址：https://console.cloud.tencent.com/cos/bucket?bucket=comp-public-1303824488&region=ap-shanghai&path=%252Flcap-builder%252F

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

@@ -22,6 +22,7 @@ export declare function generateConfig(data: {
     isPrivateMode?: boolean;
     endpointType?: IBuildContext['endpointType'] | '';
 }, root: string): Promise<void>;
+export declare function normalizePageId(pageId: any): string;
 export declare function writeLowCodeFiles(ctx: IBuildContext, appData: IWeAppData, outDir: string): Promise<void>;
 /**
  * TODO: 与 cals 里的实现进行整合

package/lib/builder/mp/index.js

@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.handleUsedComponents = exports.writeLowCodeFiles = exports.generateConfig = exports.generateWxMp = void 0;
+exports.handleUsedComponents = exports.writeLowCodeFiles = exports.normalizePageId = exports.generateConfig = exports.generateWxMp = void 0;
 const chalk_1 = __importDefault(require("chalk"));
 const path_1 = __importDefault(require("path"));
 const util_1 = require("util");
@@ -288,6 +288,20 @@ async function generateConfig(data, root) {
     }, templateDir, root);
 }
 exports.generateConfig = generateConfig;
+/**
+ * pageId 名称管理器
+ * 因为 pageId 命名为非法
+ */
+const _MANAGER_PAGE_ID_LIST = [];
+const _MANAGER_PAGE_ID_MAP = {};
+function normalizePageId(pageId) {
+    if (!_MANAGER_PAGE_ID_MAP[pageId]) {
+        _MANAGER_PAGE_ID_MAP[pageId] = `$${_MANAGER_PAGE_ID_LIST.length}`;
+        _MANAGER_PAGE_ID_LIST.push(pageId);
+    }
+    return _MANAGER_PAGE_ID_MAP[pageId];
+}
+exports.normalizePageId = normalizePageId;
 async function generatePkg(ctx, weapp, appRoot, pageConfigs) {
     const wxmlDataPrefix = (0, mp_1.getWxmlDataPrefix)(!ctx.isProduction);
     console.log(`Generating ${em(weapp.rootPath ? 'subApp' : 'app')} to ${appRoot}`);
@@ -335,7 +349,7 @@ async function generatePkg(ctx, weapp, appRoot, pageConfigs) {
                     stringifyObj: util_1.inspect,
                 },
                 [`index.js|${pageFileName}.js`]: {
-                    pageIndex: index,
+                    pageNameVar: normalizePageId(page.id),
                     pageName: page.id,
                     pageSource: page.data.src || '',
                     eventHandlers: (0, util_2.createEventHandlers)(ctx, componentInstances, 'this', page),
@@ -405,6 +419,7 @@ async function generateFramework(ctx, appData, outDir, options) {
         (0, weapps_core_1.loopDealWithFn)(appData.pageInstanceList || [], (p) => {
             allCodeModules.push({
                 id: p.id,
+                pageNameVar: normalizePageId(p.id),
                 lowCodes: p.lowCodes || [],
             });
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/lowcode-builder",
-  "version": "1.8.25",
+  "version": "1.8.27",
   "description": "云开发 Tencent CloudBase Framework Low Code Plugin，将低码配置生成完整项目并一键部署云开发资源。",
   "author": "yhsunshining@gmail.com",
   "homepage": "https://github.com/TencentCloudBase/cloudbase-framework#readme",

package/template/mp/app/handlers.js

@@ -1,16 +1,16 @@
-<% pageModules.forEach(({id: pageId, lowCodes}, index) => { %>
+<% pageModules.forEach(({id: pageId, pageNameVar, lowCodes}) => { %>
 <% lowCodes.filter(mod => mod.type === 'handler-fn' && mod.name !== '____index____').forEach(mod => {%>
-  import $<%= index%>_<%= mod.name%> from '../lowcode/<%= pageId%>/handler/<%= mod.name%>'
+  import <%= pageNameVar%>_<%= mod.name%> from '../lowcode/<%= pageId%>/handler/<%= mod.name%>'
 <% }) %>
 <% }) %>
 
 
 
-  <% pageModules.forEach(({id: pageId, lowCodes}, index) => { %>
+<% pageModules.forEach(({id: pageId, lowCodes, pageNameVar}) => { %>
 // <%= pageId %>
-export const $<%=index %> = {
+export const <%=pageNameVar %> = {
   <% lowCodes.filter(mod => mod.type === 'handler-fn' && mod.name !== '____index____').forEach(mod => {%>
-    ['<%= mod.name%>']: $<%= index%>_<%= mod.name%>,
+    ['<%= mod.name%>']: <%= pageNameVar%>_<%= mod.name%>,
   <% }) %>
 }
 <% }) %>

package/template/mp/page/index.js

@@ -2,7 +2,7 @@ import { observable } from 'mobx';
 import { createPage } from '<%= subLevelPath %>../../common/weapp-page'
 import { concatClassList, px2rpx } from '<%= subLevelPath %>../../common/style'
 import { app, $app } from '<%= subLevelPath %>../../app/weapps-api'
-import { $<%= pageIndex %> as handlers } from '../../app/handlers'
+import { <%= pageNameVar %> as handlers } from '../../app/handlers'
 <%= importor.lifecycle? `import lifecycle from '../../lowcode/${pageName}/lifecycle'` : "const lifecycle = {}" %>
 <%= importor.state? `import state from '../../lowcode/${pageName}/state'` : "const state = {}" %>
 <%= importor.computed? `import computed from '../../lowcode/${pageName}/computed'` : "const computed = {}" %>