@cloudbase/lowcode-builder 0.1.4 → 0.1.5-mp-beta

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

@@ -2,3 +2,17 @@ export { REPLACE_SIGN, MP_CONFIG_MODULE_NAME, KBONE_PAGE_KEYS, npmRegistry, remC
 export declare const sharedMaterialsDir: string;
 export declare const appTemplateDir: string;
 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.zip";
+/**
+ * miniprogram的代码，IDE插件后续会提供端功能
+ * 存放在大账号：100015939275。访问地址：https://console.cloud.tencent.com/cos/bucket?bucket=comp-public-1303824488&region=ap-shanghai&path=%252Flcap-builder%252F
+ */
+export declare const miniprogramURL = "https://comp-public-1303824488.cos.ap-shanghai.myqcloud.com/lcap-builder/miniprogram_npm.zip";
+/**
+ * miniprogram_npm存放目录。IDE插件builder用到
+ */
+export declare const miniprogramDir: string;

package/lib/builder/config/index.js

@@ -22,7 +22,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.materialsDirName = exports.appTemplateDir = exports.sharedMaterialsDir = exports.rpxConfig = exports.remConfig = exports.npmRegistry = exports.KBONE_PAGE_KEYS = exports.MP_CONFIG_MODULE_NAME = exports.REPLACE_SIGN = void 0;
+exports.miniprogramDir = exports.miniprogramURL = exports.builderTemplateURL = exports.materialsDirName = exports.appTemplateDir = exports.sharedMaterialsDir = exports.rpxConfig = exports.remConfig = exports.npmRegistry = exports.KBONE_PAGE_KEYS = exports.MP_CONFIG_MODULE_NAME = exports.REPLACE_SIGN = void 0;
 const path = __importStar(require("path"));
 const os_1 = __importDefault(require("os"));
 var index_1 = require("@cloudbase/lowcode-generator/lib/generator/config/index");
@@ -35,3 +35,18 @@ Object.defineProperty(exports, "rpxConfig", { enumerable: true, get: function ()
 exports.sharedMaterialsDir = path.join(os_1.default.homedir(), '.weapps-materials');
 exports.appTemplateDir = path.resolve(__dirname, '../../../template');
 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.zip';
+/**
+ * miniprogram的代码，IDE插件后续会提供端功能
+ * 存放在大账号：100015939275。访问地址：https://console.cloud.tencent.com/cos/bucket?bucket=comp-public-1303824488&region=ap-shanghai&path=%252Flcap-builder%252F
+ */
+// export const miniprogramURL = 'https://cos-1252394733.cos.ap-nanjing.myqcloud.com/miniprogram_npm.zip';
+exports.miniprogramURL = 'https://comp-public-1303824488.cos.ap-shanghai.myqcloud.com/lcap-builder/miniprogram_npm.zip';
+/**
+ * miniprogram_npm存放目录。IDE插件builder用到
+ */
+exports.miniprogramDir = path.join(os_1.default.homedir(), exports.sharedMaterialsDir, 'miniprogram_npm');

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

@@ -36,9 +36,12 @@ export interface IBuildWedaApp extends IBaseAppProps {
     output?: {
         path?: string;
     };
+    isBrowserMpBuilder?: boolean;
 }
-export declare function buildWedaApp({ cals, subAppCalsList, dependencies, appKey, runtime, ignoreInstall, buildTypeList, mode, devTool, deployOptions, generateMpType, plugins, extraData, resourceAppId, domain, output, }: IBuildWedaApp, cb?: WebpackBuildCallBack): Promise<string | undefined>;
+export declare function buildWedaApp({ cals, subAppCalsList, dependencies, appKey, runtime, ignoreInstall, buildTypeList, mode, devTool, deployOptions, generateMpType, plugins, extraData, resourceAppId, domain, output, isBrowserMpBuilder, }: IBuildWedaApp, cb?: WebpackBuildCallBack): Promise<string | undefined>;
 export declare function cleanComponentDir(): Promise<void>;
 export declare function installDep(dir: any, opts?: IInstallOpts): Promise<void>;
 export declare const version: any;
+export { getFiles, fileToZip, strToBuf } from '../util/generateFiles';
+export { downloadZip } from '../util/net';
 export default buildWedaApp;

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.version = exports.installDep = exports.cleanComponentDir = exports.buildWedaApp = exports.getCompileDirs = void 0;
+exports.downloadZip = exports.strToBuf = exports.fileToZip = exports.getFiles = exports.version = exports.installDep = exports.cleanComponentDir = exports.buildWedaApp = exports.getCompileDirs = void 0;
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const webpack_1 = require("../service/webpack");
 const util_1 = require("../util");
@@ -18,11 +18,12 @@ const index_2 = require("../h5/index");
 const chalk_1 = __importDefault(require("chalk"));
 const common_2 = require("../../utils/common");
 const postProcess_1 = require("../../utils/postProcess");
+const net_1 = require("../util/net");
 const pkg = require('../../../package.json');
 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: {},
-}, resourceAppId = undefined, domain = '', output, }, cb) {
+}, resourceAppId = undefined, domain = '', output, isBrowserMpBuilder = false, }, cb) {
     var _a, _b;
     if (!cals) {
         console.error('无效的应用配置');
@@ -44,6 +45,10 @@ async function buildWedaApp({ cals, subAppCalsList = [], dependencies = [], appK
         appBuildDir = (output === null || output === void 0 ? void 0 : output.path) || path_1.default.join(appBuildDir, 'mp');
         const isMixMode = generateMpType === common_1.GenerateMpType.SUBPACKAGE;
         const apps = [mainAppSerializeData, ...subAppSerializeDataList];
+        if (isBrowserMpBuilder) {
+            // 尽早下载物料
+            await (0, net_1.downloadBrowserMaterial)(output && output.path);
+        }
         try {
             const result = await (0, index_1.generateWxMp)({
                 weapps: apps,
@@ -61,6 +66,7 @@ async function buildWedaApp({ cals, subAppCalsList = [], dependencies = [], appK
                     resourceAppId,
                 },
                 buildTypeList,
+                isBrowserMpBuilder,
             });
             // 如果是混合模式，则将特定的目录复制到工程下
             // 针对 app.json / package.json 则采用 merge 的操作
@@ -81,7 +87,7 @@ async function buildWedaApp({ cals, subAppCalsList = [], dependencies = [], appK
             });
             // 如果是代开发的模式，则写入ext.json
             await (0, postProcess_1.postprocessDeployExtraJson)(outDir, deployOptions);
-            if (generateMpType === common_1.GenerateMpType.APP) {
+            if (!isBrowserMpBuilder && generateMpType === common_1.GenerateMpType.APP) {
                 // 模板拷入的 miniprogram_npm 有问题，直接删除使用重新构建的版本
                 // 模板需要占位保证 mp 文件夹存在
                 fs_extra_1.default.removeSync(path_1.default.resolve(outDir, 'miniprogram_npm'));
@@ -133,4 +139,10 @@ function installDep(dir, opts = {}) {
 }
 exports.installDep = installDep;
 exports.version = pkg.version;
+var generateFiles_1 = require("../util/generateFiles");
+Object.defineProperty(exports, "getFiles", { enumerable: true, get: function () { return generateFiles_1.getFiles; } });
+Object.defineProperty(exports, "fileToZip", { enumerable: true, get: function () { return generateFiles_1.fileToZip; } });
+Object.defineProperty(exports, "strToBuf", { enumerable: true, get: function () { return generateFiles_1.strToBuf; } });
+var net_2 = require("../util/net");
+Object.defineProperty(exports, "downloadZip", { enumerable: true, get: function () { return net_2.downloadZip; } });
 exports.default = buildWedaApp;

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

@@ -13,4 +13,5 @@ export interface IBuildContext {
     rootPath?: string;
     miniprogramPlugins?: IMiniprogramPlugin[];
     debugMode?: boolean;
+    isBrowserMpBuilder?: boolean;
 }

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

@@ -2,7 +2,7 @@ import { IMaterialItem, IWeAppData, IPlugin } from '@cloudbase/lowcode-generator
 import { IBuildContext } from './BuildContext';
 import { DEPLOY_MODE } from '../../types';
 import { BuildType, IAppUsedComp, IUsedComps } from '../types/common';
-export declare function generateWxMp({ weapps, projDir, appId, domain, materials, plugins, isProduction, deployMode, extraData, isMixMode, options, buildTypeList, }: {
+export declare function generateWxMp({ weapps, projDir, appId, domain, materials, plugins, isProduction, deployMode, extraData, isMixMode, options, buildTypeList, isBrowserMpBuilder, }: {
     weapps: IWeAppData[];
     projDir: string;
     appId: string;
@@ -18,6 +18,7 @@ export declare function generateWxMp({ weapps, projDir, appId, domain, materials
         isCrossAccount: boolean;
     };
     buildTypeList: BuildType[];
+    isBrowserMpBuilder: boolean;
 }): Promise<{
     miniprogramRoot: string;
 }>;

package/lib/builder/mp/index.js

@@ -51,7 +51,7 @@ const net_1 = require("../util/net");
 const templateDir = config_1.appTemplateDir + '/mp/';
 const em = chalk_1.default.blue.bold;
 const error = chalk_1.default.redBright;
-async function generateWxMp({ weapps, projDir, appId, domain, materials, plugins, isProduction, deployMode, extraData, isMixMode, options, buildTypeList, }) {
+async function generateWxMp({ weapps, projDir, appId, domain, materials, plugins, isProduction, deployMode, extraData, isMixMode, options, buildTypeList, isBrowserMpBuilder = false, }) {
     const operationLabel = em('Wexin MiniProgram Generated');
     console.time(operationLabel);
     console.log('Generating ' + em('Wexin MiniProgram') + ' to ' + projDir);
@@ -66,6 +66,7 @@ async function generateWxMp({ weapps, projDir, appId, domain, materials, plugins
         isMixMode,
         mainAppData,
         domain,
+        isBrowserMpBuilder,
     };
     const yyptConfig = await (0, util_3.getYyptConfigInfo)(extraData);
     const { appUsedComps, allAppUsedComps } = handleUsedComponents({
@@ -233,13 +234,14 @@ async function generateWxMp({ weapps, projDir, appId, domain, materials, plugins
             }
         }
     }));
-    if (fs.existsSync(path_1.default.join(miniprogramRoot, 'package.json'))) {
+    if (!isBrowserMpBuilder && fs.existsSync(path_1.default.join(miniprogramRoot, 'package.json'))) {
         await (0, webpack_1.installDependencies)(miniprogramRoot);
     }
     await handleMpPlugins();
     console.timeEnd(operationLabel);
-    cleanProj(weapps, miniprogramRoot);
-    cleanMaterils(path_1.default.join(miniprogramRoot, config_1.materialsDirName), allAppUsedComps);
+    // web端的builder不需要清除
+    !isBrowserMpBuilder && cleanProj(weapps, miniprogramRoot);
+    !isBrowserMpBuilder && cleanMaterils(path_1.default.join(miniprogramRoot, config_1.materialsDirName), allAppUsedComps);
     return { miniprogramRoot };
     function resolveNpmDeps() {
         var _a;
@@ -295,7 +297,7 @@ async function generatePkg(weapp, appRoot, ctx, pageConfigs) {
         // 清空历史文件，使用zip覆盖
         console.log(`Removing ${appRoot}`);
         await (0, generateFiles_1.cleanDir)(appRoot, ['materials']);
-        await (0, net_1.downloadZip)(weapp.mpPkgUrl, appRoot);
+        await (0, net_1.downloadZip)(weapp.mpPkgUrl, appRoot, ctx.isBrowserMpBuilder);
         if (fs.existsSync(path_1.default.join(appRoot, '__MACOSX'))) {
             await fs.remove(path_1.default.join(appRoot, '__MACOSX'));
         }

package/lib/builder/mp/materials.js

@@ -18,9 +18,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getWxmlTag = exports.extractUsedCompsRecursively = exports.installMaterials = void 0;
 const path = __importStar(require("path"));
@@ -32,14 +29,14 @@ const mp_1 = require("@cloudbase/lowcode-generator/lib/generator/config/mp");
 const util_2 = require("../util");
 const util_3 = require("./util");
 const wxml_1 = require("./wxml");
-const generateFiles_1 = __importDefault(require("../util/generateFiles"));
+const generateFiles_1 = __importStar(require("../util/generateFiles"));
 const lowcode_1 = require("./lowcode");
 const net_1 = require("../util/net");
 const util_4 = require("../util");
 const junk = __importStar(require("../util/junk"));
 const templateDir = config_1.appTemplateDir + '/mp/';
 async function installMaterials(projDir, usedComps, weapps, ctx) {
-    let { materialLibs } = ctx;
+    let { materialLibs, isBrowserMpBuilder } = ctx;
     const weappsList = ctx.isMixMode
         ? weapps
         : weapps.filter((item) => !item.rootPath);
@@ -58,7 +55,7 @@ async function installMaterials(projDir, usedComps, weapps, ctx) {
         }
         else {
             materialsSrcDir = path.join(config_1.sharedMaterialsDir, `${name}-mp@${version}`);
-            await downloadMaterial(mpPkgUrl, materialsSrcDir);
+            await downloadMaterial(mpPkgUrl, materialsSrcDir, ctx.isBrowserMpBuilder);
         }
         function libUpdated(libDir, version) {
             const meta = (0, util_4.readComponentLibMata)(libDir);
@@ -86,29 +83,30 @@ async function installMaterials(projDir, usedComps, weapps, ctx) {
             if (libUpdated(targetDir, version)) {
                 const materialsSrcDirPath = path.join(materialsSrcDir, 'src');
                 if (fs.existsSync(materialsSrcDirPath)) {
-                    console.log(`Copying material ${materialId} from ${materialsSrcDir}/src to ${targetDir}`);
+                    console.log(`Copying material ${materialId} from ${isBrowserMpBuilder ? materialsSrcDirPath : materialsSrcDir}/src to ${targetDir}`);
                     // #2 从根目录 copy meta 文件
                     const metaJosnPath = path.join(materialsSrcDir, 'meta.json');
                     if (fs.existsSync(metaJosnPath)) {
-                        await fs.copy(metaJosnPath, path.join(targetDir, 'meta.json'));
+                        !isBrowserMpBuilder ? await fs.copy(metaJosnPath, path.join(targetDir, 'meta.json')) : (0, generateFiles_1.copyRecursiveSync)(metaJosnPath, path.join(targetDir, 'meta.json'));
+                        ;
                     }
                     // #3 copy 组件库代码文件到项目目录
-                    await fs.copy(materialsSrcDirPath, targetDir, {
+                    !isBrowserMpBuilder ? await fs.copy(materialsSrcDirPath, targetDir, {
                         filter: function (src, dest) {
                             const path = src.split('/');
                             return !junk.is(path[path.length - 1]);
                         },
-                    });
+                    }) : (0, generateFiles_1.copyRecursiveSync)(materialsSrcDirPath, targetDir);
                 }
                 else {
                     console.log(`Copying material ${materialId} from ${materialsSrcDir} to ${targetDir}`);
                     // #2 link material to current project
-                    await fs.copy(materialsSrcDir, targetDir, {
+                    !isBrowserMpBuilder ? await fs.copy(materialsSrcDir, targetDir, {
                         filter: function (src, dest) {
                             const path = src.split('/');
                             return !junk.is(path[path.length - 1]);
                         },
-                    });
+                    }) : (0, generateFiles_1.copyRecursiveSync)(materialsSrcDir, targetDir);
                 }
             }
             const libMeta = (0, util_4.readComponentLibMata)(targetDir);
@@ -206,10 +204,10 @@ function extractUsedCompsRecursively(comps, checkedComps, compositedLibs, output
     return usedComps;
 }
 exports.extractUsedCompsRecursively = extractUsedCompsRecursively;
-async function downloadMaterial(zipUrl, dstFolder) {
+async function downloadMaterial(zipUrl, dstFolder, isBrowser = false) {
     if (fs.existsSync(path.join(dstFolder, 'meta.json')))
         return;
-    await (0, net_1.downloadZip)(zipUrl, dstFolder);
+    await (0, net_1.downloadZip)(zipUrl, dstFolder, isBrowser);
 }
 async function generateCompositeComponent(compositedComp, ctx, compLibCommonResource) {
     const { materialName } = compositedComp;

package/lib/builder/mp/mp_config.js

@@ -43,7 +43,7 @@ function generateMpConfig(weapps, ctx) {
     };
     const { miniprogramPlugins = [] } = ctx;
     const projConfig = (0, lodash_1.merge)({}, mp_1.defaultProjConfig, {
-        projectname: 'WeDa-' + ctx.appId,
+        projectname: (ctx.mainAppData && ctx.mainAppData.label) || ('WeDa-' + ctx.appId),
     });
     const pageConfigs = weapps.map((app) => {
         var _a;

package/lib/builder/service/webpack.js

@@ -2,7 +2,6 @@
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.downloadAssets = exports.generateWebpackWebDevServerFile = exports.getMaterialNodeModulesPathList = exports.installDependencies = exports.downloadDependencies = exports.downloadAndInstallDependencies = exports.getAllPageMpEntryPath = exports.getWebpackMpBuildParams = exports.getWebpackWebBuildParams = exports.getMpAllRouterConfig = exports.getPageName = exports.getHomePageInstance = exports.getMainAppDataByList = exports.generateMpJsonConfigFile = exports.generateKboneAppConfig = exports.generateKbonePageConfig = exports.downloadAndWriteTabBarIcon = exports.generateKboneTabBarConfig = exports.generateAppConfig = exports.generateWebpackWebBuildParamsFile = exports.fixAppJson = void 0;
 const path_1 = __importDefault(require("path"));
@@ -20,15 +19,6 @@ const config_2 = require("../config");
 const common_2 = require("../util/common");
 const types_1 = require("../../types");
 const generateFiles_1 = require("../util/generateFiles");
-let yarnExists = false;
-try {
-    let { stdout } = cross_spawn_1.default.sync('yarn', ['-v']);
-    let str = stdout.toString();
-    if (Number((_a = str.split('.')) === null || _a === void 0 ? void 0 : _a[0]) <= 1) {
-        yarnExists = true;
-    }
-}
-catch (e) { }
 async function fixAppJson(appBuildDir) {
     const appJsonPath = path_1.default.resolve(appBuildDir, 'dist/mp/app.json');
     if (!fs_extra_1.default.existsSync(appJsonPath)) {
@@ -407,6 +397,16 @@ async function downloadDependencies(targetDir, srcZipUrl) {
 exports.downloadDependencies = downloadDependencies;
 // TODO use yarn if installed
 async function installDependencies(targetDir, options = {}) {
+    var _a;
+    let yarnExists = false;
+    try {
+        let { stdout } = cross_spawn_1.default.sync('yarn', ['-v']);
+        let str = stdout.toString();
+        if (Number((_a = str.split('.')) === null || _a === void 0 ? void 0 : _a[0]) <= 1) {
+            yarnExists = true;
+        }
+    }
+    catch (e) { }
     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);

package/lib/builder/util/common.js

@@ -57,11 +57,12 @@ function getSelfPackageJson() {
 exports.getSelfPackageJson = getSelfPackageJson;
 function JsonToStringWithVariableName(copyJson, options = {}) {
     let variable = JSON.stringify(copyJson, null, 2).replace(/"%%%(.*?)%%%"/g, function (match, expression) {
-        return expression.replace(/\\'/g, "'").replace(/\\"/g, '"');
+        return expression
+            .replace(/\\"/g, '"')
+            .replace(/\\'/g, "'")
+            .replace(/\\r/g, '\r')
+            .replace(/\\n/g, '\n');
     });
-    if (options.EOL) {
-        variable = variable.replace(/\\n/g, '\n').replace(/\\r/g, '\r');
-    }
     return variable;
 }
 exports.JsonToStringWithVariableName = JsonToStringWithVariableName;

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

@@ -1,4 +1,6 @@
+/// <reference types="node" />
 import { IBuildContext } from '../mp/BuildContext';
+import { OutputType } from 'jszip';
 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;
@@ -14,3 +16,34 @@ export declare function cleanDir(dir: string, allowedFiles: string[]): void;
  */
 export declare function copyFiles(copyFiles: string[], srcDir: string, dstDir: string): Promise<void[]>;
 export declare function copy(src: string, dest: string): Promise<void>;
+/**
+ * 复制文件
+ * @param source 源文件
+ * @param target 目标文件
+ */
+export declare function copyFileSync(source: any, target: any): void;
+/**
+ * 根据源文件目录，输出目录，递归复制文件
+ * @param {string} src  源文件目录
+ * @param {string} dest 输出目录
+ */
+export declare const copyRecursiveSync: (src: any, dest: any) => void;
+/**
+ * 返回指定目录的文件列表内容，返回map格式
+ * @param dir 指定目录
+ * @param files_ 文件列表
+ * @param replacePath 去掉前面路径
+ * @returns
+ */
+export declare function getFiles(dir: string, files_: any, replacePath?: string): any;
+/**
+ * 将文件压缩为zip包
+ * 参考JSZip例子：https://stuk.github.io/jszip/documentation/examples/download-zip-file.html
+ * @param files
+ * @param type
+ * @returns
+ */
+export declare function fileToZip(files: {
+    [key: string]: Uint8Array;
+}, type: OutputType): Promise<string | Buffer | Uint8Array | number[] | ArrayBuffer | Blob>;
+export declare function strToBuf(str: any): Buffer;

package/lib/builder/util/generateFiles.js

@@ -22,12 +22,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-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 = void 0;
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const path_1 = __importDefault(require("path"));
 const lodash_template_1 = __importDefault(require("lodash.template"));
 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
 async function generateFiles(appFileData, srcDir, dstDir, ctx) {
     const filesGenerated = [];
@@ -120,3 +122,120 @@ async function copy(src, dest) {
     await copyFiles(needCopyFiles, src, dest);
 }
 exports.copy = copy;
+/**
+ * 复制文件
+ * @param source 源文件
+ * @param target 目标文件
+ */
+function copyFileSync(source, target) {
+    let targetFile = target;
+    // If target is a directory, a new file with the same name will be created
+    if (fs_extra_1.default.existsSync(target)) {
+        if (fs_extra_1.default.lstatSync(target).isDirectory()) {
+            targetFile = path_1.default.join(target, path_1.default.basename(source));
+        }
+    }
+    fs_extra_1.default.writeFileSync(targetFile, fs_extra_1.default.readFileSync(source));
+}
+exports.copyFileSync = copyFileSync;
+/**
+ * 根据源文件目录，输出目录，递归复制文件
+ * @param {string} src  源文件目录
+ * @param {string} dest 输出目录
+ */
+const copyRecursiveSync = function (src, dest) {
+    var exists = fs_extra_1.default.existsSync(src);
+    var stats = exists && fs_extra_1.default.statSync(src);
+    var isDirectory = exists && stats.isDirectory();
+    if (!fs_extra_1.default.existsSync(dest)) {
+        mkDirByPathSync(path_1.default.parse(dest).dir);
+    }
+    if (isDirectory) {
+        const files = fs_extra_1.default.readdirSync(src);
+        files.forEach(function (childItemName) {
+            (0, exports.copyRecursiveSync)(path_1.default.join(src, childItemName), path_1.default.join(dest, childItemName));
+        });
+    }
+    else {
+        copyFileSync(src, dest);
+    }
+};
+exports.copyRecursiveSync = copyRecursiveSync;
+/**
+ * 参考：https://stackoverflow.com/questions/31645738/how-to-create-full-path-with-nodes-fs-mkdirsync
+ * @param targetDir
+ * @param param1
+ * @returns
+ */
+function mkDirByPathSync(targetDir, { isRelativeToScript = false } = {}) {
+    const sep = path_1.default.sep;
+    const initDir = path_1.default.isAbsolute(targetDir) ? sep : '';
+    const baseDir = isRelativeToScript ? __dirname : '.';
+    return targetDir.split(sep).reduce((parentDir, childDir) => {
+        const curDir = path_1.default.resolve(baseDir, parentDir, childDir);
+        try {
+            fs_extra_1.default.mkdirSync(curDir);
+        }
+        catch (err) {
+            if (err.code === 'EEXIST') { // curDir already exists!
+                return curDir;
+            }
+            // To avoid `EISDIR` error on Mac and `EACCES`-->`ENOENT` and `EPERM` on Windows.
+            if (err.code === 'ENOENT') { // Throw the original parentDir error on curDir `ENOENT` failure.
+                throw new Error(`EACCES: permission denied, mkdir '${parentDir}'`);
+            }
+            const caughtErr = ['EACCES', 'EPERM', 'EISDIR'].indexOf(err.code) > -1;
+            if (!caughtErr || caughtErr && curDir === path_1.default.resolve(targetDir)) {
+                throw err; // Throw if it's just the last created dir.
+            }
+        }
+        return curDir;
+    }, initDir);
+}
+/**
+ * 返回指定目录的文件列表内容，返回map格式
+ * @param dir 指定目录
+ * @param files_ 文件列表
+ * @param replacePath 去掉前面路径
+ * @returns
+ */
+function getFiles(dir, files_, replacePath = '') {
+    files_ = files_ || {};
+    const files = fs_extra_1.default.readdirSync(dir);
+    let mapName;
+    for (let i in files) {
+        const name = path_1.default.join(dir, files[i]);
+        if (fs_extra_1.default.statSync(name).isDirectory()) {
+            getFiles(name, files_, replacePath);
+        }
+        else {
+            mapName = name;
+            // 替换根路径
+            if (name.indexOf(replacePath) === 0) {
+                mapName = name.replace(replacePath, '');
+            }
+            files_[mapName] = fs_extra_1.default.readFileSync(name);
+        }
+    }
+    return files_;
+}
+exports.getFiles = getFiles;
+/**
+ * 将文件压缩为zip包
+ * 参考JSZip例子：https://stuk.github.io/jszip/documentation/examples/download-zip-file.html
+ * @param files
+ * @param type
+ * @returns
+ */
+async function fileToZip(files, type) {
+    var zip = new jszip_1.default();
+    for (let prop in files) {
+        zip.file(prop, files[prop]);
+    }
+    return zip.generateAsync({ type });
+}
+exports.fileToZip = fileToZip;
+function strToBuf(str) {
+    return buffer_1.Buffer.from(str);
+}
+exports.strToBuf = strToBuf;

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

@@ -4,4 +4,23 @@ export declare function downloadFile(url: string, filePath: string): Promise<voi
  * @param url
  * @param dstDir folder to hold the extract zip content
  */
-export declare function downloadZip(url: string, dstDir: string): Promise<void>;
+export declare function downloadZip(url: string, dstDir: string, isBrowser?: boolean): Promise<void>;
+/**
+ * node中下载和保存zip文件
+ * @param url 下载的url
+ * @param dstDir 存放文件夹
+ */
+export declare function downloadZipInNode(url: string, dstDir: string): Promise<void>;
+/**
+ * 浏览器中下载和保存zip文件
+ * @param url 下载的url
+ * @param dstDir 存放文件夹
+ * @returns
+ */
+export declare function downloadZipInBrowser(url: string, dstDir: string): Promise<void>;
+/**
+ * 微信IDE builder需要下载template文件和miniprogram_npm
+ * miniprogram_npm待微信提供端能力
+ * @param output
+ */
+export declare function downloadBrowserMaterial(output?: string): Promise<void>;

package/lib/builder/util/net.js

@@ -22,11 +22,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.downloadZip = exports.downloadFile = void 0;
+exports.downloadBrowserMaterial = exports.downloadZipInBrowser = exports.downloadZipInNode = exports.downloadZip = exports.downloadFile = void 0;
 const axios_1 = __importDefault(require("axios"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const path = __importStar(require("path"));
 const compressing_1 = __importDefault(require("compressing"));
+const jszip_1 = __importDefault(require("jszip"));
+const config_1 = require("../config");
+const generateFiles_1 = require("../util/generateFiles");
 async function downloadFile(url, filePath) {
     await fs_extra_1.default.ensureDir(path.dirname(filePath));
     const res = await axios_1.default.get(url, { responseType: 'stream' });
@@ -38,9 +41,75 @@ exports.downloadFile = downloadFile;
  * @param url
  * @param dstDir folder to hold the extract zip content
  */
-async function downloadZip(url, dstDir) {
+async function downloadZip(url, dstDir, isBrowser = false) {
+    // TODO 待加上平台判断
+    if (isBrowser) {
+        await downloadZipInBrowser(url, dstDir);
+        return;
+    }
+    await downloadZipInNode(url, dstDir);
+}
+exports.downloadZip = downloadZip;
+/**
+ * node中下载和保存zip文件
+ * @param url 下载的url
+ * @param dstDir 存放文件夹
+ */
+async function downloadZipInNode(url, dstDir) {
     await fs_extra_1.default.ensureDir(dstDir);
     const res = await axios_1.default.get(url, { responseType: 'stream' });
     await compressing_1.default.zip.uncompress(res.data, dstDir);
 }
-exports.downloadZip = downloadZip;
+exports.downloadZipInNode = downloadZipInNode;
+/**
+ * 浏览器中下载和保存zip文件
+ * @param url 下载的url
+ * @param dstDir 存放文件夹
+ * @returns
+ */
+async function downloadZipInBrowser(url, dstDir) {
+    // IMPORTANT 防止保存的时候保存
+    if (fs_extra_1.default.existsSync(dstDir)) {
+        return;
+    }
+    fs_extra_1.default.ensureDirSync(dstDir);
+    const res = await axios_1.default.get(url, { responseType: 'arraybuffer' });
+    const data = await jszip_1.default.loadAsync(res.data);
+    await saveFiles(data.files, dstDir);
+}
+exports.downloadZipInBrowser = downloadZipInBrowser;
+/**
+ * 保存JSZip解压的文件内容
+ * @param files 文件
+ * @param dstDir 指定目录
+ */
+async function saveFiles(files, dstDir) {
+    try {
+        for (const fileName of Object.keys(files)) {
+            const dest = path.join(dstDir, fileName);
+            if (files[fileName].dir) { // 如果该文件为目录需先创建文件夹
+                fs_extra_1.default.mkdirSync(dest, {
+                    recursive: true
+                });
+            }
+            else {
+                const ret = await files[fileName].async('nodebuffer'); // 由于这里有await，不能用forEach
+                fs_extra_1.default.writeFileSync(dest, ret);
+            }
+        }
+    }
+    catch (err) {
+        console.error('saveFiles catch error：', err);
+    }
+}
+/**
+ * 微信IDE builder需要下载template文件和miniprogram_npm
+ * miniprogram_npm待微信提供端能力
+ * @param output
+ */
+async function downloadBrowserMaterial(output = '.weapps-build') {
+    await Promise.all([downloadZip(config_1.builderTemplateURL, config_1.appTemplateDir, true), downloadZip(config_1.miniprogramURL, config_1.miniprogramDir, true)]);
+    // 必须先下载到.weapps-materials目录，因为.weapps-materials是默认下载目录，共享组件逻辑sharedMaterialsDir时会读取文件
+    (0, generateFiles_1.copyRecursiveSync)(config_1.miniprogramDir, path.join(output, 'miniprogram_npm'));
+}
+exports.downloadBrowserMaterial = downloadBrowserMaterial;

package/lib/types.d.ts

@@ -11,3 +11,4 @@ export declare enum HISTORY_TYPE {
     BROWSER = "BROWSER",
     HASH = "HASH"
 }
+export { PropBindType } from '@cloudbase/cals';

package/lib/types.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.HISTORY_TYPE = exports.RUNTIME = exports.DEPLOY_MODE = void 0;
+exports.PropBindType = exports.HISTORY_TYPE = exports.RUNTIME = exports.DEPLOY_MODE = void 0;
 var DEPLOY_MODE;
 (function (DEPLOY_MODE) {
     DEPLOY_MODE["PREVIEW"] = "preview";
@@ -17,3 +17,5 @@ var HISTORY_TYPE;
     HISTORY_TYPE["BROWSER"] = "BROWSER";
     HISTORY_TYPE["HASH"] = "HASH";
 })(HISTORY_TYPE = exports.HISTORY_TYPE || (exports.HISTORY_TYPE = {}));
+var cals_1 = require("@cloudbase/cals");
+Object.defineProperty(exports, "PropBindType", { enumerable: true, get: function () { return cals_1.PropBindType; } });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/lowcode-builder",
-  "version": "0.1.4",
+  "version": "0.1.5-mp-beta",
   "description": "云开发 Tencent CloudBase Framework Low Code Plugin，将低码配置生成完整项目并一键部署云开发资源。",
   "author": "yhsunshining@gmail.com",
   "homepage": "https://github.com/TencentCloudBase/cloudbase-framework#readme",
@@ -25,32 +25,43 @@
   "scripts": {
     "dev": "tsc -w",
     "develop": "tsc -w",
-    "build": "tsc",
+    "build": "rm -rf lib && tsc",
     "test": "jest",
-    "test:build": "ts-node ./__test__/build.ts"
+    "test:build": "ts-node ./__test__/build.ts",
+    "dev:mpweb": "rm -rf dist && cross-env NODE_ENV=development webpack-dev-server --config ./webpack/mpweb.config.js",
+    "build:mpweb": "rm -rf dist && cross-env NODE_ENV=production webpack --config ./webpack/mpweb.config.js"
   },
   "bugs": {
     "url": "https://github.com/TencentCloudBase/cloudbase-framework/issues"
   },
   "dependencies": {
     "@cloudbase/cals": "^0.3.3",
-    "@cloudbase/lowcode-generator": "^0.6.13",
+    "@cloudbase/lowcode-generator": "0.4.22-mp-beta",
     "axios": "^0.21.0",
+    "browserfs": "^1.4.3",
+    "browserify-zlib": "^0.2.0",
     "chalk": "^2.4.2",
     "compare-versions": "^3.6.0",
     "compressing": "^1.4.0",
     "cross-spawn": "^6.0.5",
     "fs-extra": "^7.0.1",
+    "constants-browserify": "^1.0.0",
+    "crypto-browserify": "^3.12.0",
+    "jszip": "^3.7.1",
     "lodash": "^4.17.11",
     "lodash.clone": "^4.5.0",
     "lodash.get": "^4.4.2",
     "lodash.set": "^4.3.2",
     "lodash.template": "^4.5.0",
     "lodash.uniqby": "^4.7.0",
+    "os-browserify": "^0.3.0",
+    "stream-browserify": "^3.0.0",
     "webpack": "^4.41.4",
     "xml-js": "^1.6.11"
   },
   "devDependencies": {
+    "worker-loader": "^3.0.8",
+    "@rollup/plugin-alias": "^3.1.9",
     "@types/archiver": "^3.1.0",
     "@types/command-exists": "^1.2.0",
     "@types/cross-spawn": "^6.0.2",
@@ -64,8 +75,10 @@
     "@types/weixin-app": "^2.9.0",
     "csstype": "^2.6.10",
     "jest": "^26.0.1",
-    "ts-jest": "^27.0.5",
+    "ts-loader": "^8.3.0",
     "ts-node": "^10.4.0",
-    "typescript": "^4.4.2"
+    "typescript": "^4.4.2",
+    "webpack-cli": "^4.9.1",
+    "webpack-dev-server": "^4.7.3"
   }
-}
+}

package/template/mp/component/index.js

@@ -20,7 +20,9 @@ const evtListeners = {<% Object.entries(eventHandlers).map(([handlerName, listen
       key: '<%= l.key %>',
       handler: <% if (l.type == 'rematch') {%> _handler<%= l.handler %> <%} else if (l.type === 'inline') {%> function({event, lists, forItems}, $comp){ <%= l.handler %> } <%} else {%> <%= l.handler %> <%} %>,
       data: <%= stringifyObj(l.data, {depth: null}) %>,
-      boundData: {<% Object.entries(l.boundData).map(([prop, expr])=>{%>'<%= prop %>':($comp, lists, forItems, event) => {const $for=forItems;return <%= expr %>},
+      boundData: {<% Object.entries(l.boundData).map(([prop, expr])=>{%>'<%= prop %>':($comp, lists, forItems, event) => {const $for=forItems;return (
+        <%= expr %>
+      )},
         <%}) %>}
     },<%})%>
   ],<%})%>
@@ -48,7 +50,9 @@ const handler = {<% handlers.forEach(h => {%>
 
 const dataBinds = {<% Object.entries(dataBinds).map(([id, widgetBinds])=>{%>
   <%= id %>: { <% Object.entries(widgetBinds).map(([prop, expr]) => { %>
-    <%= prop %>: function ($comp, lists, forItems, event) {const $for=forItems; return <%= expr %>; },<% }) %>
+    <%= prop %>: function ($comp, lists, forItems, event) {const $for=forItems; return (
+      <%= expr %>
+    ); },<% }) %>
   },<%}) %>
 }
 

package/template/mp/page/index.js

@@ -17,14 +17,18 @@ const evtListeners = {<% Object.entries(eventHanlders).map(([handlerName, listen
       key: '<%= l.key %>',
       handler: <% if (l.type === 'rematch') {%> handlers.<%= l.handler %> <%} else if (l.type == 'material') {%> function(...args) { return require('../../materials/<%= l.handlerModule %>/actions/<%= l.handler %>/index').default(...args) } <%} else if (l.type == 'inline') {%> function({event, lists, forItems}, $page){const $for = forItems; return <%= l.handler %> } <%} else {%> <%= l.handler %> <%} %>,
       data: <%= stringifyObj(l.data, {depth: null}) %>,
-      boundData: {<% Object.entries(l.boundData).map(([prop, expr])=>{%>'<%= prop %>':($page, lists, forItems, event) => {const $for = forItems; return <%= expr %>},
+      boundData: {<% Object.entries(l.boundData).map(([prop, expr])=>{%>'<%= prop %>':($page, lists, forItems, event) => {const $for = forItems; return (
+        <%= expr %>
+      )},
         <%}) %>}
     },<%})%>
   ],<%})%>
 }
 const dataBinds = {<% Object.entries(dataBinds).map(([id, widgetBinds])=>{%>
   <%= id %>: { <% Object.entries(widgetBinds).map(([prop, expr]) => { %>
-    <%= prop %>: function ($page, lists, forItems, event) {const $for = forItems; return <%= expr %>; },<% }) %>
+    <%= prop %>: function ($page, lists, forItems, event) {const $for = forItems; return (
+      <%= expr %>
+    ); },<% }) %>
   },<%}) %>
 }