@cloudbase/lowcode-builder 1.8.26 → 1.8.28

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.26",
+  "version": "1.8.28",
   "description": "云开发 Tencent CloudBase Framework Low Code Plugin，将低码配置生成完整项目并一键部署云开发资源。",
   "author": "yhsunshining@gmail.com",
   "homepage": "https://github.com/TencentCloudBase/cloudbase-framework#readme",
@@ -41,7 +41,7 @@
   "dependencies": {
     "@babel/core": "7.12.3",
     "@babel/preset-env": "7.12.1",
-    "@cloudbase/cals": "^1.0.17",
+    "@cloudbase/cals": "^1.0.18",
     "@cloudbase/lowcode-generator": "^1.8.10",
     "axios": "^0.21.0",
     "browserfs": "^1.4.3",

package/template/html/index.html.ejs

@@ -551,7 +551,7 @@
       crossorigin
       src="<%=
       cdnEndpoints.cdngo
-      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.badd82789c12ea6c7007.bundle.js"
+      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.5ec891fedc6dc37d6d57.bundle.js"
     ></script>
   </body>
 </html>

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/app/weapps-api.js

@@ -111,8 +111,9 @@ function createGlboalApi() {
 
   let dataset = createDataset('$global')
   dataset.query = generateDatasetQuery({<% Object.entries(appQuery).map(([id, item])=>{%>
-    <%= id %>: { <% const { dataBinds, eventHandlers, ...rest } = item %>
+    <%= id %>: { <% const { dataBinds, eventHandlers, handler, ...rest } = item %>
       ...(<%= stringifyObj(rest, {depth: null}) %>),
+      handler: <%= handler %>,
       dataBinds: {<%= printBoundData(dataBinds) %>},
       eventHandlers: {<% printEventHandler(eventHandlers) %>}
     },<%}) %>

package/template/mp/app.js

@@ -1,25 +1,31 @@
 <%= importor.lifecycle? "import lifeCycle from './lowcode/lifecycle'" : "const lifeCycle = {}" %>
-import { app, $app } from './app/weapps-api'
+import { app, $app } from './app/weapps-api';
 // 引入数据源管理器并进行初始化
-import { setConfig, getAccessToken, EXTRA_API, createStateDataSourceVar, generateParamsParser } from './datasources/index'
-import { redirectToLogin, findLoginPage, getAuthConfig, checkAnonymous } from './common/util'
+import {
+  setConfig,
+  getAccessToken,
+  EXTRA_API,
+  createStateDataSourceVar,
+  generateParamsParser,
+} from './datasources/index';
+import { redirectToLogin, findLoginPage, getAuthConfig, checkAnonymous } from './common/util';
 
 // 防止报类型不匹配warning
 const originWarn = console.warn;
 const warningSkipRegexp = /(type-uncompatible)|(slot "[\w-]*?" is not found)/;
 console.warn = (...args) => {
-    // 只看第一条
-    const shouldSkip = args.length > 0 && args[0][0] === '[' && args[0][1] === 'C' && warningSkipRegexp.test(args[0]);
-    if(!shouldSkip) {
-      originWarn(...args);
-    }
-}
+  // 只看第一条
+  const shouldSkip = args.length > 0 && args[0][0] === '[' && args[0][1] === 'C' && warningSkipRegexp.test(args[0]);
+  if (!shouldSkip) {
+    originWarn(...args);
+  }
+};
 
 // 设置数据源请求的 loading 及 toast 处理
 setConfig({
   beforeDSRequest: (cfg) => {
-    if (!cfg.options || !cfg.options.showLoading) return
-    app.showLoading()
+    if (!cfg.options || !cfg.options.showLoading) return;
+    app.showLoading();
   },
   beforeCallFunction: async (params) => {
     try {
@@ -46,7 +52,7 @@ setConfig({
         params.data.accessToken = accessToken;
       }
     } catch (e) {
-      if (app?.cloud?.currentUser?.userType === "externalUser" && e?.error === 'unauthenticated') {
+      if (app?.cloud?.currentUser?.userType === 'externalUser' && e?.error === 'unauthenticated') {
         app.showToast({
           title: '登录态失效',
           icon: 'error',
@@ -57,25 +63,45 @@ setConfig({
     return params;
   },
   afterDSRequest: (cfg, error, result) => {
-    if (!cfg.options) return
-    if (cfg.options.showLoading) app.hideLoading()
-    if (!cfg.options.showToast) return
-    const isSuccess = !error && result && !result.code
-    app.showToast({ icon: isSuccess ? 'success' : 'error' })
+    if (!cfg.options) return;
+    if (cfg.options.showLoading) app.hideLoading();
+    if (!cfg.options.showToast) return;
+    const isSuccess = !error && result && !result.code;
+    app.showToast({ icon: isSuccess ? 'success' : 'error' });
   },
   async afterCallFunction(params, error, res) {
-    if (params?.data?.params?.action != 'DescribeRuntimeResourceStrategy' && ['InnerError.AuthFailure', 'InvalidAccessToken'].includes(res?.result?.code)) {
+    const oauthError =
+      error?.message?.includes?.('PERMISSION_DENIED') ||
+      error?.code === 'unauthenticated' ||
+      error?.error === 'unauthenticated' ||
+      error?.code === 'invalid_grant' ||
+      error?.error === 'invalid_grant' ||
+      error?.code === 'INVALID_ACCESS_TOKEN' ||
+      (error?.code === 'OPERATION_FAIL' && /^\[INVALID_ACCESS_TOKEN\]/.test(error?.message || ''));
+
+    if (
+      params?.data?.params?.action != 'DescribeRuntimeResourceStrategy' &&
+        (['InnerError.AuthFailure', 'InvalidAccessToken'].includes(res?.result?.code) ||
+      oauthError)
+    ) {
       const loginPage = findLoginPage();
       if (loginPage) {
         const authConfig = await getAuthConfig();
-        if (authConfig.RejectStrategy == 'to_login') {
+        if (authConfig.RejectStrategy === 'to_login') {
           if (['InnerError.AuthFailure'].includes(res?.result?.code)) {
             const isAnonymous = await checkAnonymous();
             if (!isAnonymous) return;
             // 匿名用户越权去登录
           }
           redirectToLogin();
-        } else if (authConfig.RejectStrategy == 'show_warning') {
+        } else if (authConfig.RejectStrategy === 'show_warning') {
+          if (oauthError) {
+            const isAnonymous = await checkAnonymous();
+            if (!isAnonymous) {
+              redirectToLogin(generateLoginUrl);
+              return;
+            }
+          }
           app.showToast({
             title: '接口无访问权限',
             icon: 'error',
@@ -83,27 +109,27 @@ setConfig({
         }
       }
     }
-  }
-})
+  },
+});
 
 App({
   _query: {},
   globaldata: {
-    _beforeCustomLaunchPromise: null
+    _beforeCustomLaunchPromise: null,
   },
   async beforeCustomLaunch(query) {
-    if(!this.globaldata?._beforeCustomLaunchPromise){
-      if(!this.globaldata) {
-        this.globaldata = {}
+    if (!this.globaldata?._beforeCustomLaunchPromise) {
+      if (!this.globaldata) {
+        this.globaldata = {};
       }
-      this.globaldata._beforeCustomLaunchPromise = new Promise(async (resolve)=>{
+      this.globaldata._beforeCustomLaunchPromise = new Promise(async (resolve) => {
         try {
-          EXTRA_API.setParams('$global', query || {})
+          EXTRA_API.setParams('$global', query || {});
           await createStateDataSourceVar('$global', generateParamsParser({ app, $page: {}, $w: app.__internal__?.$w }));
         } catch (e) {
           throw e;
         } finally {
-          for (const queryId in app.dataset?.query||{}) {
+          for (const queryId in app.dataset?.query || {}) {
             if (app.dataset.query[queryId]?._schema?.trigger === 'auto') {
               try {
                 app.dataset?.query?.[queryId]?.trigger?.();
@@ -112,44 +138,44 @@ App({
               }
             }
           }
-          resolve()
+          resolve();
         }
-      })
+      });
     }
-    return this.globaldata._beforeCustomLaunchPromise
+    return this.globaldata._beforeCustomLaunchPromise;
   },
   async onLaunch(options) {
-    this.app = app
-    const onLaunch = lifeCycle.onLaunch || lifeCycle.onAppLaunch
-    let { query = {} } = options
-    this._query = query
+    this.app = app;
+    const onLaunch = lifeCycle.onLaunch || lifeCycle.onAppLaunch;
+    let { query = {} } = options;
+    this._query = query;
 
-    await this.beforeCustomLaunch(query)
-    onLaunch && onLaunch.call(this, options)
+    await this.beforeCustomLaunch(query);
+    onLaunch && onLaunch.call(this, options);
     // 初始私有全局数据
     this.$$global = {
-      homePageId: '<%= appConfig.homePageId %>'
-    }
+      homePageId: '<%= appConfig.homePageId %>',
+    };
   },
   async onShow(options) {
-    await this.beforeCustomLaunch(this._query)
-    const fn = lifeCycle.onShow || lifeCycle.onAppShow
-    fn && fn.call(this, options)
+    await this.beforeCustomLaunch(this._query);
+    const fn = lifeCycle.onShow || lifeCycle.onAppShow;
+    fn && fn.call(this, options);
   },
   onHide() {
-    const fn = lifeCycle.onHide || lifeCycle.onAppHide
-    fn && fn.call(this)
+    const fn = lifeCycle.onHide || lifeCycle.onAppHide;
+    fn && fn.call(this);
   },
   onError(msg) {
-    const fn = lifeCycle.onError || lifeCycle.onAppError
-    fn && fn.call(this, msg)
+    const fn = lifeCycle.onError || lifeCycle.onAppError;
+    fn && fn.call(this, msg);
   },
   onPageNotFound() {
-    const fn = lifeCycle.onPageNotFound || lifeCycle.onAppPageNotFound
-    fn && fn.call(this)
+    const fn = lifeCycle.onPageNotFound || lifeCycle.onAppPageNotFound;
+    fn && fn.call(this);
   },
   onUnhandledRejection() {
-    const fn = lifeCycle.onUnhandledRejection || lifeCycle.onAppUnhandledRejection
-    fn && fn.call(this)
+    const fn = lifeCycle.onUnhandledRejection || lifeCycle.onAppUnhandledRejection;
+    fn && fn.call(this);
   },
-})
+});

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 = {}" %>