@cloudbase/lowcode-builder 1.3.13 → 1.3.15-private.0

package/lib/builder/config/index.js

@@ -59,7 +59,7 @@ exports.CDN_ENDPONTS_CONFIG = {
     common: '',
     cloudbase: '//static.cloudbase.net',
     cdngo: 'https://qbase.cdn-go.cn',
-    aegis: 'https://cdn-go.cn',
+    aegis: 'https://tam.cdn-go.cn',
 };
 function generateCdnEndpoints(endpoints = exports.CDN_ENDPONTS_CONFIG) {
     for (const key in exports.CDN_ENDPONTS_CONFIG) {

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

@@ -40,6 +40,13 @@ export interface IBuildWedaApp extends IBaseAppProps {
     isPrivateMode?: boolean;
     endpointType?: 'tcb-api' | 'wechat-service';
 }
+export declare function buildWedaConfig({ output, domain, isPrivateMode, endpointType, buildTypeList, }: {
+    output: Required<IBuildWedaApp['output']>;
+    domain?: string;
+    isPrivateMode?: boolean;
+    endpointType?: IBuildWedaApp['endpointType'];
+    buildTypeList?: IBuildWedaApp['buildTypeList'];
+}): Promise<void>;
 export declare function buildWedaApp({ cals, subAppCalsList, dependencies, appKey, runtime, ignoreInstall, buildTypeList, mode, devTool, deployOptions, generateMpType, plugins, extraData, resourceAppId, domain, output, isBrowserMpBuilder, cdnEndpoints, isPrivateMode, endpointType, }: IBuildWedaApp, cb?: WebpackBuildCallBack): Promise<string | undefined>;
 export declare function cleanComponentDir(): Promise<void>;
 export declare const version: any;

package/lib/builder/core/index.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.normalizeInputs = exports.getCompileDirs = exports.downloadZip = exports.strToBuf = exports.fileToZip = exports.getFiles = exports.version = exports.cleanComponentDir = exports.buildWedaApp = void 0;
+exports.normalizeInputs = exports.getCompileDirs = exports.downloadZip = exports.strToBuf = exports.fileToZip = exports.getFiles = exports.version = exports.cleanComponentDir = exports.buildWedaApp = exports.buildWedaConfig = void 0;
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const chalk_1 = __importDefault(require("chalk"));
 const path_1 = __importDefault(require("path"));
@@ -18,6 +18,45 @@ const postProcess_1 = require("../../utils/postProcess");
 const cals_1 = require("@cloudbase/cals");
 const net_1 = require("../util/net");
 const pkg = require('../../../package.json');
+async function buildWedaConfig({ output, domain = undefined, isPrivateMode = undefined, endpointType = undefined, buildTypeList = [common_1.BuildType.WEB], }) {
+    if ((0, common_1.buildAsWebByBuildType)(buildTypeList)) {
+        throw new Error('构建类型仅支持 MP');
+    }
+    let outDir = output === null || output === void 0 ? void 0 : output.path;
+    if (!outDir) {
+        throw new Error('无效的项目输出路径');
+    }
+    let miniprogramRoot = outDir;
+    let projectJsonPath = path_1.default.resolve(outDir, 'project.config.json');
+    if (fs_extra_1.default.existsSync(projectJsonPath)) {
+        const projectConfigJson = await fs_extra_1.default.readJson(projectJsonPath);
+        miniprogramRoot = path_1.default.join(outDir, projectConfigJson.miniprogramRoot || '/');
+    }
+    const configPath = path_1.default.resolve(miniprogramRoot, 'common/config.js');
+    let data = { domain, isPrivateMode, endpointType };
+    if (fs_extra_1.default.existsSync(configPath)) {
+        try {
+            let config = require(configPath);
+            let current = {};
+            if (config.__esModule) {
+                current = config.default || {};
+            }
+            else {
+                current = config || {};
+            }
+            for (const key in data) {
+                if (data[key] === undefined) {
+                    data[key] = current[key];
+                }
+            }
+        }
+        catch (e) {
+            console.error('parse current file error, overwrite current config', e);
+        }
+    }
+    await (0, index_1.generateConfig)(data, outDir);
+}
+exports.buildWedaConfig = buildWedaConfig;
 async function buildWedaApp({ cals, subAppCalsList = [], dependencies = [], appKey = 'test', runtime = types_1.RUNTIME.NONE, ignoreInstall = false, buildTypeList = [common_1.BuildType.WEB], mode = common_1.WebpackModeType.PRODUCTION, devTool = 'webpack', deployOptions = { mode: types_1.DEPLOY_MODE.PREVIEW }, generateMpType = common_1.GenerateMpType.APP, plugins = [], extraData = {
     isComposite: false,
     compProps: {},

package/lib/builder/h5/generate.js

@@ -74,14 +74,15 @@ async function handleAssets({ appBuildDir, buildTypeList, assets, }) {
     if (assetsArr && assetsArr.length > 0) {
         if (buildTypeList.includes('app')) {
             const targetDir = path_1.default.resolve(appBuildDir, './assets');
-            assetsArr.forEach(async (assetUrl) => {
+            await Promise.all(assetsArr.map(async (assetUrl) => {
                 console.log('============>>>>>> getWebpackWebBuildParams assetUrl', assetUrl);
                 if (assetUrl) {
                     const fileName = (0, common_1.getFileNameByUrl)(assetUrl);
                     jsApis.push(`./${fileName}`);
                     await (0, webpack_1.downloadAssets)(targetDir, assetUrl);
+                    return `./${fileName}`;
                 }
-            });
+            }));
         }
         else {
             jsApis = jsApis.concat(assetsArr);

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

@@ -17,6 +17,11 @@ export declare function generateWxMp({ buildContext, weapps, plugins, deployMode
 }): Promise<{
     miniprogramRoot: string;
 }>;
+export declare function generateConfig(data: {
+    domain?: string;
+    isPrivateMode?: boolean;
+    endpointType?: IBuildContext['endpointType'] | '';
+}, root: string): Promise<void>;
 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.generateWxMp = void 0;
+exports.handleUsedComponents = exports.writeLowCodeFiles = exports.generateConfig = exports.generateWxMp = void 0;
 const chalk_1 = __importDefault(require("chalk"));
 const path_1 = __importDefault(require("path"));
 const util_1 = require("util");
@@ -76,7 +76,7 @@ async function generateWxMp({ buildContext, weapps, plugins, deployMode, options
             'project.config.json': { content: projConfig },
         };
         console.log(`Generating ${em('project')} files`);
-        await (0, generateFiles_1.default)(buildContext, projectFileData, templateDir, projDir);
+        await (0, generateFiles_1.default)(projectFileData, templateDir, projDir);
     }
     // #2 生成主包
     await generatePkg({ ...buildContext, rootPath: mainAppData.rootPath }, mainAppData, path_1.default.join(projDir, '/'), pageConfigs[0]);
@@ -94,12 +94,15 @@ async function generateWxMp({ buildContext, weapps, plugins, deployMode, options
             let appJsContent = await fs.readFile(appJsPath);
             await (0, generateFiles_1.writeFile)(appJsPath, `import { app as wedaApp } from './app/weapps-api'\n${appJsContent}`);
         }
+        await generateConfig({
+            domain,
+            isPrivateMode,
+            endpointType,
+        }, miniprogramRoot);
         appFileData = {
             ...appFileData,
             'common/style.js': {},
-            'common/utils.wxs': {
-                domain,
-            },
+            'common/utils.wxs': {},
             'common/util.js': {
                 isAdminPortal: (0, common_1.buildAsAdminPortalByBuildType)(buildTypeList),
             },
@@ -164,7 +167,7 @@ async function generateWxMp({ buildContext, weapps, plugins, deployMode, options
         };
     }
     console.log(`Generating ${em('miniprogramRoot')} files`);
-    await (0, generateFiles_1.default)(buildContext, appFileData, templateDir, miniprogramRoot);
+    await (0, generateFiles_1.default)(appFileData, templateDir, miniprogramRoot);
     // 若项目目录与小程序根目录不同，则拷贝素材到小程序根目录
     if (miniprogramRoot !== path_1.default.join(projDir, '/') && fs.existsSync(path_1.default.join(projDir, config_1.materialsDirName))) {
         console.log(`Move ${em(config_1.materialsDirName)} from` + `${projDir} to ${miniprogramRoot}`);
@@ -180,9 +183,6 @@ async function generateWxMp({ buildContext, weapps, plugins, deployMode, options
                 resourceAppid: !!options.isCrossAccount ? options.resourceAppId : '',
                 isProd: deployMode === types_1.DEPLOY_MODE.UPLOAD,
                 clientID: (_a = mainAppData.extra) === null || _a === void 0 ? void 0 : _a.clientId,
-                isPrivateMode,
-                endpointType,
-                tcbApiOrigin: endpointType === 'tcb-api' && isPrivateMode && domain ? `https://${domain}` : '',
             },
             'datasources/datasource-profiles.js.tpl': {
                 datasourceProfiles: (0, util_3.JsonToStringWithVariableName)((0, lowcode_generator_1.getDatasourceProfiles)(
@@ -196,7 +196,7 @@ async function generateWxMp({ buildContext, weapps, plugins, deployMode, options
             },
         };
         console.log(`Generating ${em('datasources')} files`);
-        await (0, generateFiles_1.default)(buildContext, datasourceFileData, templateDir, miniprogramRoot);
+        await (0, generateFiles_1.default)(datasourceFileData, templateDir, miniprogramRoot);
     }
     // 生成子包
     await Promise.all(weapps.map(async (app, index) => {
@@ -214,7 +214,7 @@ async function generateWxMp({ buildContext, weapps, plugins, deployMode, options
             // 生成package.json
             let packageJsonPath = path_1.default.join(subpackageRootPath, 'package.json');
             if (!fs.existsSync(packageJsonPath)) {
-                await (0, generateFiles_1.default)(buildContext, {
+                await (0, generateFiles_1.default)({
                     'package.json': {
                         appId,
                         importJSSDK: endpointType === 'tcb-api',
@@ -283,6 +283,20 @@ async function generateWxMp({ buildContext, weapps, plugins, deployMode, options
     }
 }
 exports.generateWxMp = generateWxMp;
+async function generateConfig(data, root) {
+    const { domain = '', isPrivateMode = false, endpointType = '' } = data;
+    await (0, generateFiles_1.default)({
+        'common/config.js': {
+            domain,
+            isPrivateMode,
+            endpointType,
+        },
+        'common/config.wxs': {
+            domain,
+        },
+    }, templateDir, root);
+}
+exports.generateConfig = generateConfig;
 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}`);
@@ -348,7 +362,7 @@ async function generatePkg(ctx, weapp, appRoot, pageConfigs) {
                 },
             };
             // Generating file by template and data
-            await (0, generateFiles_1.default)(ctx, pageFileData, `${templateDir}/page`, path_1.default.join(appRoot, 'pages', page.id));
+            await (0, generateFiles_1.default)(pageFileData, `${templateDir}/page`, path_1.default.join(appRoot, 'pages', page.id));
         }));
         // #3 writing lowcode files
         await writeLowCodeFiles(ctx, weapp, appRoot);
@@ -366,7 +380,6 @@ async function generateFramework(ctx, appData, outDir) {
                     subLevelPath: '',
                     subPackageName: '',
                     importor: (0, util_3.generateLowcodeImportor)([]),
-                    domain: ctx.domain || '',
                     appConfig: JSON.stringify({}),
                 },
             };
@@ -392,14 +405,12 @@ async function generateFramework(ctx, appData, outDir) {
                 'app/app-global.js': {},
                 'app/weapps-api.js': {
                     appId: ctx.appId,
-                    domain: ctx.domain || '',
                     subLevelPath: appData.rootPath ? `${path_1.default.posix.relative(`${appData.rootPath}`, '')}/` : '',
                     subPackageName: appData.rootPath || '',
                     importor,
                     appConfig: (0, util_3.JsonToStringWithVariableName)({
                         id: ctx.appId,
                         envId: appData.envId,
-                        staticResourceDomain: ctx.domain || '',
                         envVersion: (ctx === null || ctx === void 0 ? void 0 : ctx.isProduction) ? 'production' : 'preview',
                         pages: appData.pageInstanceList
                             .sort((item) => (item.isHome ? -1 : 1))
@@ -411,7 +422,7 @@ async function generateFramework(ctx, appData, outDir) {
                 },
                 'app/common.js': {
                     mods: appData.lowCodes
-                        .filter((m) => m.type === cals_1.ECodeType.NORMAL_MODULE && m.name !== '____index____')
+                        .filter((m) => m.type === cals_1.ECodeType.NORMAL_MODULE && m.name !== cals_1.ECodeName.PLACEHOLDER)
                         .map((m) => m.name)
                         .sort(),
                 },
@@ -419,7 +430,7 @@ async function generateFramework(ctx, appData, outDir) {
         }
     }
     console.log('Generate app framework');
-    await (0, generateFiles_1.default)(ctx, fileData, templateDir, outDir);
+    await (0, generateFiles_1.default)(fileData, templateDir, outDir);
 }
 async function writeLowCodeFiles(ctx, appData, outDir) {
     console.log(`Writing ${em('lowcode')} files:`);

package/lib/builder/mp/materials.js

@@ -311,7 +311,7 @@ async function generateCompositeComponent(ctx, compositedComp, compLibCommonReso
         },
     };
     // Generating file by template and data
-    await (0, generateFiles_1.default)(compositeCtx, pageFileData, `${templateDir}/component`, outDir);
+    await (0, generateFiles_1.default)(pageFileData, `${templateDir}/component`, outDir);
     // #3 writing lowcode files
     /**
      * 低码没有开放 index 类别，直接去掉

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

@@ -1,8 +1,7 @@
 /// <reference types="node" />
-import { IBuildContext } from '../mp/BuildContext';
 import { OutputType } from 'jszip';
 export declare const generatedFileContents: {};
-export default function generateFiles(ctx: IBuildContext, appFileData: any, srcDir: string, dstDir: string): Promise<string[]>;
+export default function generateFiles(appFileData: any, srcDir: string, dstDir: string): 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

@@ -35,7 +35,7 @@ const glob_1 = __importDefault(require("glob"));
 const jszip_1 = __importDefault(require("jszip"));
 const buffer_1 = require("buffer");
 exports.generatedFileContents = {}; // generated files for incrmental build
-async function generateFiles(ctx, appFileData, srcDir, dstDir) {
+async function generateFiles(appFileData, srcDir, dstDir) {
     const filesGenerated = [];
     // Generating file by template and data
     for (const file in appFileData) {
@@ -46,18 +46,6 @@ async function generateFiles(ctx, appFileData, srcDir, dstDir) {
             encoding: 'utf8',
         });
         let generatedCode = (0, lodash_1.template)(tplStr, { interpolate: /<%=([\s\S]+?)%>/ })(appFileData[file]);
-        // 混合模式下，引用公共路径要多增加一层，并加多一层命名
-        // 混合子包直接在对应目录上生成，而不采用替换的方式 @royhyang
-        // if (ctx?.isMixMode && ctx?.rootPath) {
-        //   generatedCode = generatedCode.replace(
-        //     /..\/..\/..\/common\//g,
-        //     '../../../../common/'
-        //   )
-        //   generatedCode = generatedCode.replace(
-        //     /..\/..\/..\/app\//g,
-        //     '../../../../app/'
-        //   )
-        // }
         const outFile = path_1.default.resolve(dstDir, outFileName.replace(/\.tpl$/, ''));
         if (await writeFile(outFile, generatedCode)) {
             filesGenerated.push(outFileName);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/lowcode-builder",
-  "version": "1.3.13",
+  "version": "1.3.15-private.0",
   "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": "workspace:^",
-    "@cloudbase/lowcode-generator": "workspace:^",
+    "@cloudbase/cals": "^0.5.11",
+    "@cloudbase/lowcode-generator": "1.3.7-private.0",
     "axios": "^0.21.0",
     "browserfs": "^1.4.3",
     "browserify-zlib": "^0.2.0",
@@ -81,4 +81,4 @@
     "webpack-dev-server": "^4.7.3",
     "worker-loader": "^3.0.8"
   }
-}
+}

package/template/html/index.html.ejs

@@ -19,7 +19,7 @@
     <% cssStyles.forEach(function(styleUrl){%>
     <link type="text/css" rel="stylesheet" href="<%=styleUrl %>" />
     <% })%> <% if(cdnEndpoints.aegis){ %>
-    <script crossorigin="anonymous" src="<%= cdnEndpoints.aegis %>/aegis/aegis-sdk/latest/aegis.min.js?v=1"></script>
+    <script crossorigin="anonymous" src="<%= cdnEndpoints.aegis %>/aegis-sdk/latest/aegis.min.js"></script>
     <script>
       <% if(!isAdminPortal){ %>
       const _aegis = new Aegis({
@@ -475,7 +475,7 @@
       crossorigin
       src="<%=
       cdnEndpoints.cdngo
-      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.e8d1597a7c671defbbac.bundle.js"
+      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.dd7f29a986538b6b1dce.bundle.js"
     ></script>
   </body>
 </html>

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

@@ -4,6 +4,7 @@ import { createComputed, formatEnum, enumOptions } from '<%= subLevelPath %>../c
 import appGlobal from '<%= subLevelPath %>../app/app-global'
 import { createDataset } from '<%= subLevelPath %>../datasources/index'
 import lodashGet from 'lodash.get';
+import config from '<%= subLevelPath %>../common/config';
 
 
 <%= importor.state? `import state from '../lowcode/state'` : "const state = {}" %>
@@ -25,11 +26,14 @@ export const $w = new Proxy(
 
 function createGlboalApi() {
   const mpApp = createMpApp({
-    appConfig: <%= appConfig %>
+    appConfig: {
+      staticResourceDomain: config.domain,
+      ...(<%= appConfig %>)
+    }
   });
-  const globalAPI = {
+  const globalAPI = Object.assign(mpApp, {
     id: '<%= appId %>',
-    domain: '<%= domain %>',
+    domain: config.domain,
     pages: {},
     session: {
       //configure: sdk.configure,
@@ -45,7 +49,7 @@ function createGlboalApi() {
       return $page.invokeComponentMethod(params)
     },
     // ... other sdk apis & apis from mp
-  } // The global api exposed to lowcode
+  }) // The global api exposed to lowcode
 
   globalAPI.__internal__.enumOptions = enumOptions
   globalAPI.utils.formatEnum = formatEnum

package/template/mp/common/config.js

@@ -0,0 +1,9 @@
+/**
+ * require to be commonjs
+ */
+module.exports = {
+  isPrivate: <%=isPrivateMode%>,
+  domain: '<%=domain%>',
+  endpointType: '<%=endpointType%>',
+  tcbApiOrigin: '<%= endpointType === `tcb-api` && isPrivateMode && domain ? `https://${domain}` : `` %>'
+}

package/template/mp/common/config.wxs

@@ -0,0 +1,3 @@
+module.exports = {
+  domain: '<%=domain%>',
+};

package/template/mp/common/utils.wxs

@@ -1,6 +1,8 @@
+var config = require('./config.wxs')
+
 function getStaticResourceAttribute(staticUrl) {
   if (staticUrl && staticUrl[0] == '/') {
-    var domain = '<%=domain%>'
+    var domain = config.domain
     return 'https://' + domain + staticUrl;
   }
   return staticUrl

package/template/mp/common/widget.js

@@ -651,13 +651,22 @@ function mountBuiltinWigetsAPI(widget, owner) {
 
   switch (widget.widgetType) {
     case `${REPEATER.MODULE_NAME}:${REPEATER.REPEATER_NAME}`: {
-      const currentRef = observable({ current: undefined });
+      const currentRef = observable({ current: {} });
       widget._getInstanceRef = () => {
         return currentRef;
       }; // 默认初始值
       widget._disposers.push(
         autorun((r) => {
-          currentRef.current = { data: widget.data };
+          currentRef.current = {
+            data: widget.data,
+            items: (widget.children || []).map((item) => {
+              const descendants = {};
+              Object.keys(item?._descendants || {}).forEach((key) => {
+                descendants[key] = item._descendants[key]._userWidget;
+              });
+              return descendants;
+            })
+          }
         }),
       );
       break;

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

@@ -1,5 +1,6 @@
 import datasetProfiles from './dataset-profiles'
 const dataSourceProfiles = require('./datasource-profiles.js')
+import config from '../common/config'
 
 /**
  * 数据源基本配置
@@ -25,14 +26,14 @@ export default {
   /**
    * 确定调用链路
    */
-  endpointType: '<%= endpointType %>',
+  endpointType: config.endpointType,
   /**
    * 调用链路为 tcb-api 时有效
    * 私有化需要设置
    */
-  tcbApiOrigin: '<%= tcbApiOrigin %>',
+  tcbApiOrigin: config.tcbApiOrigin,
   /**
    * 是否是处于私有化版本
    */
-  isPrivate: <%= isPrivateMode %>
+  isPrivate: config.isPrivate
 }