@cloudbase/lowcode-builder 1.1.5-alpha.2 → 1.1.5-alpha.4

package/lib/builder/core/index.js

@@ -69,6 +69,8 @@ async function buildWedaApp({ cals, subAppCalsList = [], dependencies = [], appK
                     resourceAppId,
                 },
                 buildTypeList,
+                isBrowserMpBuilder,
+                ignoreInstall,
             });
             // 如果是混合模式，则将特定的目录复制到工程下
             // 针对 app.json / package.json 则采用 merge 的操作
@@ -89,7 +91,7 @@ async function buildWedaApp({ cals, subAppCalsList = [], dependencies = [], appK
             });
             // 如果是代开发的模式，则写入ext.json
             await (0, postProcess_1.postprocessDeployExtraJson)(outDir, deployOptions);
-            if (!isBrowserMpBuilder && generateMpType === common_1.GenerateMpType.APP) {
+            if (!isBrowserMpBuilder && generateMpType === common_1.GenerateMpType.APP && !ignoreInstall) {
                 // 模板拷入的 miniprogram_npm 有问题，直接删除使用重新构建的版本
                 // 模板需要占位保证 mp 文件夹存在
                 fs_extra_1.default.removeSync(path_1.default.resolve(outDir, 'miniprogram_npm'));

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

@@ -2,7 +2,7 @@ import { IWeAppData, IPlugin } from '@cloudbase/lowcode-generator/lib/weapps-cor
 import { IBuildContext } from './BuildContext';
 import { DEPLOY_MODE } from '../../types';
 import { BuildType, IAppUsedComp, IUsedComps } from '../types/common';
-export declare function generateWxMp({ buildContext, weapps, plugins, deployMode, options, buildTypeList, }: {
+export declare function generateWxMp({ buildContext, weapps, plugins, deployMode, options, buildTypeList, isBrowserMpBuilder, ignoreInstall, }: {
     buildContext: IBuildContext;
     weapps: IWeAppData[];
     plugins: IPlugin[];
@@ -13,6 +13,8 @@ export declare function generateWxMp({ buildContext, weapps, plugins, deployMode
         isCrossAccount: boolean;
     };
     buildTypeList: BuildType[];
+    isBrowserMpBuilder: boolean;
+    ignoreInstall: boolean;
 }): Promise<{
     miniprogramRoot: string;
 }>;

package/lib/builder/mp/index.js

@@ -54,9 +54,9 @@ 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;
-async function generateWxMp({ buildContext, weapps, plugins, deployMode, options, buildTypeList, }) {
+async function generateWxMp({ buildContext, weapps, plugins, deployMode, options, buildTypeList, isBrowserMpBuilder = false, ignoreInstall = false, }) {
     var _a;
-    const { appId, projDir, materialLibs: materials, isProduction, mainAppData, domain, isBrowserMpBuilder, isPrivateMode = false, } = buildContext;
+    const { appId, projDir, materialLibs: materials, isProduction, mainAppData, domain, isPrivateMode = false, } = buildContext;
     const operationLabel = em('Wexin MiniProgram Generated');
     console.time(operationLabel);
     console.log(`Generating ${em('Wexin MiniProgram')} to ${projDir}`);
@@ -215,6 +215,7 @@ async function generateWxMp({ buildContext, weapps, plugins, deployMode, options
     }));
     if (!isBrowserMpBuilder && fs.existsSync(path_1.default.join(miniprogramRoot, 'package.json'))) {
         await (0, webpack_1.installDependencies)(miniprogramRoot, {
+            ignoreInstall,
             fixNodeModulesMap: { '@cloudbase/js-sdk': !isPrivateMode, mobx: true },
         });
     }

package/lib/builder/mp/mp_config.js

@@ -48,6 +48,7 @@ function generateMpConfig(weapps, ctx, options) {
     const { miniprogramPlugins = [] } = ctx;
     const projConfig = (0, lodash_1.merge)({}, mp_1.defaultProjConfig, {
         projectname: (ctx.mainAppData && ctx.mainAppData.label) || `WeDa-${ctx.appId}`,
+        appid: (options === null || options === void 0 ? void 0 : options.mpAppId) || mp_1.defaultProjConfig.appid,
     });
     const pageConfigs = weapps.map((app) => {
         var _a;

package/lib/builder/mp/util.js

@@ -67,7 +67,7 @@ function generateDataBindMeta(bind) {
             imports += (0, lowcode_generator_1.generateExpressionAlias)(value);
         }
         catch (e) {
-            console.error('parse expression error', value);
+            console.error('parse expression error', value, e === null || e === void 0 ? void 0 : e.message);
         }
         expr = value;
     }

package/lib/builder/service/webpack.js

@@ -455,6 +455,10 @@ async function installDependencies(targetDir, options = {}) {
         }
     }
     catch (e) { }
+    // 如果generatedFileContents[path.resolve(targetDir, 'package.json')]不存在，说明是不存在缓存文件，isPkgModify必须是true，才不会忽略install
+    const isPkgModify = !generateFiles_1.generatedFileContents[path_1.default.resolve(targetDir, 'package.json')]
+        ? true
+        : generateFiles_1.generatedFileContents[path_1.default.resolve(targetDir, 'package.json')].modify;
     if ((options === null || options === void 0 ? void 0 : options.ignoreInstall) && fs_extra_1.default.existsSync(path_1.default.join(targetDir, 'node_modules'))) {
         console.log(`ignore install dependencies in ${targetDir}`);
         return;

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

@@ -1,6 +1,7 @@
 /// <reference types="node" />
 import { IBuildContext } from '../mp/BuildContext';
 import { OutputType } from 'jszip';
+export declare const generatedFileContents: {};
 export default function generateFiles(appFileData: any, srcDir: string, dstDir: string, ctx: IBuildContext): Promise<string[]>;
 export declare function writeFile(outFile: string, content: string): Promise<boolean>;
 export declare function removeFile(file: string): void;

package/lib/builder/util/generateFiles.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.strToBuf = exports.fileToZip = exports.getFiles = exports.copyRecursiveSync = exports.copyFileSync = exports.copy = exports.copyFiles = exports.cleanDir = exports.removeFile = exports.writeFile = void 0;
+exports.strToBuf = exports.fileToZip = exports.getFiles = exports.copyRecursiveSync = exports.copyFileSync = exports.copy = exports.copyFiles = exports.cleanDir = exports.removeFile = exports.writeFile = exports.generatedFileContents = void 0;
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const path_1 = __importDefault(require("path"));
 const lodash_1 = require("lodash");
@@ -34,7 +34,7 @@ const junk = __importStar(require("../util/junk"));
 const glob_1 = __importDefault(require("glob"));
 const jszip_1 = __importDefault(require("jszip"));
 const buffer_1 = require("buffer");
-const generatedFileContents = {}; // generated files for incrmental build
+exports.generatedFileContents = {}; // generated files for incrmental build
 async function generateFiles(appFileData, srcDir, dstDir, ctx) {
     const filesGenerated = [];
     // Generating file by template and data
@@ -67,22 +67,24 @@ async function generateFiles(appFileData, srcDir, dstDir, ctx) {
 }
 exports.default = generateFiles;
 async function writeFile(outFile, content) {
-    const generated = generatedFileContents[outFile];
+    var _a;
+    const generated = (_a = exports.generatedFileContents[outFile]) === null || _a === void 0 ? void 0 : _a.content;
     if (generated === content && fs_extra_1.default.existsSync(outFile)) {
+        exports.generatedFileContents[outFile].modify = false;
         return false;
     }
     // console.log(outFile);
     await fs_extra_1.default.ensureFile(outFile);
     await fs_extra_1.default.writeFile(outFile, content);
-    generatedFileContents[outFile] = content;
+    exports.generatedFileContents[outFile] = { content, modify: true };
     return true;
 }
 exports.writeFile = writeFile;
 function removeFile(file) {
     console.log(`Removing ${file}`);
-    Object.keys(generatedFileContents).map((cachedFile) => {
+    Object.keys(exports.generatedFileContents).map((cachedFile) => {
         if (cachedFile.indexOf(file) === 0) {
-            delete generatedFileContents[cachedFile];
+            delete exports.generatedFileContents[cachedFile];
         }
     });
     return fs_extra_1.default.removeSync(file);

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

@@ -1,2 +1,3 @@
 export declare const is: (filename: any) => boolean;
 export declare const not: (filename: any) => boolean;
+export declare const isFilePath: (filename: any) => boolean;

package/lib/builder/util/junk.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.not = exports.is = void 0;
+exports.isFilePath = exports.not = exports.is = void 0;
 const ignoreList = [
     // # All
     '^npm-debug\\.log$',
@@ -25,8 +25,14 @@ const ignoreList = [
     '^readme.md$',
     '^README.md$',
 ];
+const filePathIgnoreList = [
+    '__MACOSX', // 路径有__MACOSX就过滤
+];
 const regex = new RegExp(ignoreList.join('|'));
+const filePathRegex = new RegExp(filePathIgnoreList.join('|'));
 const is = (filename) => regex.test(filename);
 exports.is = is;
 const not = (filename) => !(0, exports.is)(filename);
 exports.not = not;
+const isFilePath = (filename) => filePathRegex.test(filename);
+exports.isFilePath = isFilePath;

package/lib/builder/util/net.js

@@ -34,6 +34,7 @@ const compressing_1 = __importDefault(require("compressing"));
 const jszip_1 = __importDefault(require("jszip"));
 const config_1 = require("../config");
 const generateFiles_1 = require("../util/generateFiles");
+const junk_1 = require("../util/junk");
 async function downloadFile(url, filePath) {
     await fs_extra_1.default.ensureDir(path.dirname(filePath));
     const res = await axios_1.default.get(url, { responseType: 'stream' });
@@ -91,6 +92,9 @@ async function saveFiles(files, dstDir) {
     try {
         for (const fileName of Object.keys(files)) {
             const dest = path.join(dstDir, fileName);
+            if ((0, junk_1.isFilePath)(dest)) {
+                continue;
+            }
             if (files[fileName].dir) { // 如果该文件为目录需先创建文件夹
                 fs_extra_1.default.mkdirSync(dest, {
                     recursive: true

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/lowcode-builder",
-  "version": "1.1.5-alpha.2",
+  "version": "1.1.5-alpha.4",
   "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.4.10",
-    "@cloudbase/lowcode-generator": "^1.1.2-alpha.1",
+    "@cloudbase/cals": "^0.5.0",
+    "@cloudbase/lowcode-generator": "1.1.2-alpha.1",
     "axios": "^0.21.0",
     "browserfs": "^1.4.3",
     "browserify-zlib": "^0.2.0",

package/template/mp/app.js

@@ -2,7 +2,7 @@
 import { app } from './app/weapps-api'
 // 引入数据源管理器并进行初始化
 import { setConfig, getAccessToken, EXTRA_API, createStateDataSourceVar, generateParamsParser } from './datasources/index'
-import { redirectToLogin, findLoginPage, getAuthConfig } from './common/util'
+import { redirectToLogin, findLoginPage, getAuthConfig, checkAnonymous } from './common/util'
 
 // 防止报类型不匹配warning
 const originWarn = console.warn;
@@ -37,7 +37,8 @@ setConfig({
       }
 
       // 后续做过滤处理
-      if (!loginPage || (params?.data?.mode === 'c' && skip)) {
+      const endpointType = app?.__internal__?.getCloudSdkConfig('endpointType');
+      if ((params?.data?.mode === 'c' && skip) || (endpointType !== 'tcb-api' && !loginPage)) {
         return params;
       }
       // await initTcb();
@@ -68,11 +69,7 @@ setConfig({
       const loginPage = findLoginPage();
       if (loginPage) {
         const authConfig = await getAuthConfig();
-        let isAnonymous = true;
-        try {
-          const { accessToken } = await getAccessToken();
-          isAnonymous = !accessToken;
-        } catch (e) { }
+        const isAnonymous = await checkAnonymous();
         if (isAnonymous && authConfig.RejectStrategy == 'to_login') {
           redirectToLogin();
         } else if (authConfig.RejectStrategy == 'show_warning') {

package/template/mp/common/util.js

@@ -1,7 +1,7 @@
 'use strict';
 import { findForItemsOfWidget, getWidget } from './widget'
-import { observable } from 'mobx';
-import { getAccessToken } from '../datasources/index'
+import { observable, untracked } from 'mobx';
+import { getAccessToken, loginScope } from '../datasources/index'
 import { app } from '../app/weapps-api'
 
 /**
@@ -31,9 +31,13 @@ export function createComputed(funcs, bindContext = null) {
 export function generateDataContext(widget) {
   const dataContext = {};
   while (widget?._scope) {
-    if (widget._scope.dataContext && !isEmptyObj(widget._scope.dataContext)) {
-      dataContext[widget._scope.id] = widget._scope.dataContext;
-    }
+    const current = widget
+    // 此处采用代理的方式，是为了可以获取到最新的 _scope.dataContext 防止 dataContext 引用被重新赋值
+    Object.defineProperty(dataContext, current._scope.id, {
+      get() {
+        return current._scope.dataContext;
+      },
+    });
     widget = widget.parent;
   }
   return dataContext;
@@ -57,7 +61,7 @@ export function createEventHandlers(evtListeners) {
       const [prefix = ''] = name.split('$');
       // The page event handler
       const { lists = [], itemsById = {} } = !!currentTarget && findForItemsOfWidget(currentTarget) || {}
-      const dataContext = generateDataContext(currentTarget)
+      const dataContext = untracked(() => generateDataContext(currentTarget))
 
       listeners.forEach(async l => {
         let { data = {}, boundData = {} } = l;
@@ -306,6 +310,21 @@ async function getAccessPermission(app, appId, pageId) {
   return isAccess
 }
 
+export async function checkAnonymous() {
+  let isAnonymous = true;
+  try {
+    const { accessToken } = await getAccessToken();
+    isAnonymous = !accessToken;
+    const { app } = getApp();
+    // 私密链路有token则不是匿名; tcb链路会匿名登录需要多验证scope === 'anonymous'
+    if (accessToken && app.__internal__.getCloudSdkConfig('endpointType') === 'tcb-api') {
+      const scope = await loginScope();
+      isAnonymous = scope === 'anonymous';
+    }
+  } catch (e) { }
+  return isAnonymous;
+}
+
 /**
  * 检查页面权限
  **/
@@ -323,11 +342,7 @@ export async function checkAuth(app, appId, $page) {
   const [isAccess, authConfig] = await Promise.all(requestList);
   app.hideNavigationBarLoading();
 
-  let isAnonymousUser = true;
-  try {
-    const { accessToken } = await getAccessToken();
-    isAnonymousUser = !accessToken;
-  } catch (e) { }
+  const isAnonymousUser = await checkAnonymous();
 
   if (!isAccess) {
     if (isAnonymousUser && loginPage && (authConfig.NeedLogin || authConfig.RejectStrategy == 'to_login')) {

package/template/mp/common/widget.js

@@ -221,7 +221,7 @@ function runFor(
       clearTimeout(_FOR_ERROR_CACHE_MAP[nodeId]);
 
       const $instance = ownerMpInst.getWeAppInst();
-      const dataContext = generateDataContext(defaultParent);
+      const dataContext = untracked(()=>generateDataContext(defaultParent));
 
       forList = dataBinds[nodeId]._waFor.call(
         $instance,
@@ -364,7 +364,7 @@ function setUpWidgetDataBinds(w, dataBinds, forItems, failedBinds, ctx) {
           try {
             clearTimeout(timer);
 
-            const dataContext = generateDataContext(w);
+            const dataContext = untracked(()=>generateDataContext(w));
 
             // Computed data bind in the next tick since data bind may read widgets data
             const value = dataBinds[prop].call(ctx, ctx, forItems.lists, forItems.itemsById, undefined, dataContext);

package/template/mp/datasources/config.js.tpl

@@ -22,5 +22,9 @@ export default {
    *  key 为页面ID(全局为$global), val 为变量配置数组
    */
   datasetProfiles: datasetProfiles,
+  /**
+   * 确定调用链路
+   */
+  endpointType: <%= isPrivateMode %> ? 'tcb-api' : 'wechat-service',
   isPrivate: <%= isPrivateMode %>
 }

package/template/mp/datasources/index.js

@@ -1,4 +1,4 @@
-import { _WEDA_CLOUD_SDK as WEDA_CLOUD_SDK, auth} from '@cloudbase/weda-client'
+import { _WEDA_CLOUD_SDK as WEDA_CLOUD_SDK, auth } from '@cloudbase/weda-client'
 const {
   setConfig,
   initTcb,
@@ -10,6 +10,7 @@ const {
   DS_SDK,
 } = WEDA_CLOUD_SDK
 const getAccessToken = auth.getAccessToken
+const loginScope = auth.loginScope
 
 export {
   createDataset,
@@ -20,6 +21,7 @@ export {
   DS_SDK,
   setConfig,
   getAccessToken,
+  loginScope,
   initTcb,
 }
 

package/template/mp/package.json

@@ -3,10 +3,10 @@
 	"version": "1.0.8",
 	"scripts": {},
 	"dependencies": {<% if(isPrivateMode) {%>
-		"@cloudbase/js-sdk": "2.5.2-beta.0",<% } %>
+		"@cloudbase/js-sdk": "2.5.6-beta.1",<% } %>
 		"@cloudbase/oauth": "0.1.1-alpha.5",
-		"@cloudbase/weda-client": "0.2.25",
-		"@cloudbase/weda-cloud-sdk": "1.0.24-alpha.0",
+		"@cloudbase/weda-client": "0.2.36",
+		"@cloudbase/weda-cloud-sdk": "1.0.24-alpha.3",
 		"mobx": "^5.15.4",
 		"lodash.get": "^4.4.2",
 		"lodash.set": "^4.3.2",