@cloudbase/framework-plugin-low-code 0.7.15 → 0.7.16

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/builder/mp/index.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,aAAa,EACb,UAAU,EAEV,OAAO,EAIR,MAAM,mBAAmB,CAAC;AAU3B,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAkB/C,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAEL,SAAS,EACT,YAAY,EACZ,UAAU,EACX,MAAM,iBAAiB,CAAC;AAQzB,wBAAsB,YAAY,CAAC,EACjC,MAAM,EACN,OAAO,EACP,KAAK,EACL,MAAM,EACN,SAAS,EACT,OAAO,EACP,YAAY,EACZ,UAAU,EACV,SAAS,EACT,SAAS,EACT,OAAO,EACP,aAAa,GACd,EAAE;IACD,MAAM,EAAE,UAAU,EAAE,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,aAAa,EAAE,CAAC;IAC3B,OAAO,EAAE,OAAO,EAAE,CAAC;IACnB,YAAY,EAAE,OAAO,CAAC;IACtB,UAAU,EAAE,WAAW,CAAC;IACxB,SAAS,EAAE,GAAG,CAAC;IACf,SAAS,EAAE,OAAO,CAAC;IACnB,OAAO,EAAE;QACP,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,cAAc,EAAE,OAAO,CAAC;KACzB,CAAC;IACF,aAAa,EAAE,SAAS,EAAE,CAAC;CAC5B,GAAG,OAAO,CAAC;IAAE,eAAe,EAAE,MAAM,CAAA;CAAE,CAAC,CAgSvC;AAuLD,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,UAAU,EACnB,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,aAAa,iBAkCnB;AAiBD,wBAAgB,oBAAoB,CAAC,EACnC,YAAY,EACZ,MAAM,EACN,SAAS,GACV,EAAE;IACD,YAAY,EAAE,aAAa,CAAC;IAC5B,MAAM,EAAE,UAAU,EAAE,CAAC;IACrB,SAAS,EAAE,aAAa,EAAE,CAAC;CAC5B;;;EA0CA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/builder/mp/index.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,aAAa,EACb,UAAU,EAEV,OAAO,EAIR,MAAM,mBAAmB,CAAC;AAM3B,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAW/C,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAiC,SAAS,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAQrG,wBAAsB,YAAY,CAAC,EACjC,MAAM,EACN,OAAO,EACP,KAAK,EACL,MAAM,EACN,SAAS,EACT,OAAO,EACP,YAAY,EACZ,UAAU,EACV,SAAS,EACT,SAAS,EACT,OAAO,EACP,aAAa,GACd,EAAE;IACD,MAAM,EAAE,UAAU,EAAE,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,aAAa,EAAE,CAAC;IAC3B,OAAO,EAAE,OAAO,EAAE,CAAC;IACnB,YAAY,EAAE,OAAO,CAAC;IACtB,UAAU,EAAE,WAAW,CAAC;IACxB,SAAS,EAAE,GAAG,CAAC;IACf,SAAS,EAAE,OAAO,CAAC;IACnB,OAAO,EAAE;QACP,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,cAAc,EAAE,OAAO,CAAC;KACzB,CAAC;IACF,aAAa,EAAE,SAAS,EAAE,CAAC;CAC5B,GAAG,OAAO,CAAC;IAAE,eAAe,EAAE,MAAM,CAAA;CAAE,CAAC,CA+OvC;AAsJD,wBAAsB,iBAAiB,CAAC,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,aAAa,iBAuB9F;AAiBD,wBAAgB,oBAAoB,CAAC,EACnC,YAAY,EACZ,MAAM,EACN,SAAS,GACV,EAAE;IACD,YAAY,EAAE,aAAa,CAAC;IAC5B,MAAM,EAAE,UAAU,EAAE,CAAC;IACrB,SAAS,EAAE,aAAa,EAAE,CAAC;CAC5B;;;EA6BA"}

package/lib/builder/mp/index.js

@@ -81,7 +81,7 @@ function generateWxMp({ weapps, projDir, appId, domain, materials, plugins, isPr
             weapps,
             materials,
         });
-        buildContext['miniprogramPlugins'] = (mainAppData.miniprogramPlugins || []).filter((plugin) => allAppUsedComps[plugin.name]);
+        buildContext.miniprogramPlugins = (mainAppData.miniprogramPlugins || []).filter((plugin) => allAppUsedComps[plugin.name]);
         yield (0, materials_1.installMaterials)(projDir, allAppUsedComps, weapps, buildContext);
         const wxmlDataPrefix = (0, mp_1.getWxmlDataPrefix)(!isProduction);
         const { projConfig, appConfig, pageConfigs } = (0, mp_config_1.generateMpConfig)(weapps, buildContext);
@@ -105,7 +105,7 @@ function generateWxMp({ weapps, projDir, appId, domain, materials, plugins, isPr
                 yield (0, generateFiles_1.writeFile)(appJsPath, `import { app as wedaApp } from './app/weapps-api'\n${appJsContent}`);
             }
             appFileData = Object.assign(Object.assign({}, appFileData), { 'common/style.js': {}, 'common/utils.wxs': {
-                    domain: domain,
+                    domain,
                 }, 'common/util.js': {
                     isAdminPortal: (0, common_1.buildAsAdminPortalByBuildType)(buildTypeList),
                 }, 'common/widget.js': {}, 'common/url.js': {}, 'common/weapp-sdk.js': {}, 'common/weapp-page.js': {
@@ -128,11 +128,9 @@ function generateWxMp({ weapps, projDir, appId, domain, materials, plugins, isPr
             yield (0, generateFiles_1.writeFile)(appJsonPath, JSON.stringify(appJson, undefined, 2));
         }
         else {
-            appFileData = Object.assign(Object.assign({}, appFileData), { 'common/wx_yypt_report_v2.js': {}, 'app.js': { yyptConfig: yyptConfig }, 'app.json': { content: appConfig }, 'app.wxss': {
+            appFileData = Object.assign(Object.assign({}, appFileData), { 'common/wx_yypt_report_v2.js': {}, 'app.js': { yyptConfig }, 'app.json': { content: appConfig }, 'app.wxss': {
                     importStyles: materials.reduce((styles, lib) => {
-                        styles = styles.concat((lib.styles || []).map((stylePath) => stylePath && !stylePath.startsWith('/')
-                            ? `/${config_1.materialsDirName}/${lib.name}/${stylePath}`
-                            : stylePath) || []);
+                        styles = styles.concat((lib.styles || []).map((stylePath) => stylePath && !stylePath.startsWith('/') ? `/${config_1.materialsDirName}/${lib.name}/${stylePath}` : stylePath) || []);
                         return styles;
                     }, []),
                 }, 'package.json': {
@@ -140,14 +138,10 @@ function generateWxMp({ weapps, projDir, appId, domain, materials, plugins, isPr
                     extraDeps: resolveNpmDeps(),
                 } });
         }
-        console.log('Generating ' + em('miniprogramRoot') + ' files');
+        console.log(`Generating ${em('miniprogramRoot')} files`);
         yield (0, generateFiles_1.default)(appFileData, templateDir, miniprogramRoot, buildContext);
-        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}`);
+        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}`);
             yield fs.move(path_1.default.join(projDir, config_1.materialsDirName), path_1.default.join(miniprogramRoot, config_1.materialsDirName));
         }
         if (weapps.find((item) => !item.mpPkgUrl)) {
@@ -170,7 +164,7 @@ function generateWxMp({ weapps, projDir, appId, domain, materials, plugins, isPr
                     datasetProfiles: (0, util_3.JsonToStringWithVariableName)((0, dataSource_1.getDatasetProfiles)(mainAppData, weapps)),
                 },
             };
-            console.log('Generating ' + em('datasources') + ' files');
+            console.log(`Generating ${em('datasources')} files`);
             yield (0, generateFiles_1.default)(datasourceFileData, templateDir, miniprogramRoot, buildContext);
         }
         yield Promise.all(weapps.map((app, index) => __awaiter(this, void 0, void 0, function* () {
@@ -225,7 +219,7 @@ exports.generateWxMp = generateWxMp;
 function generatePkg(weapp, appRoot, ctx, pageConfigs) {
     return __awaiter(this, void 0, void 0, function* () {
         const wxmlDataPrefix = (0, mp_1.getWxmlDataPrefix)(!ctx.isProduction);
-        console.log('Generating ' + em(weapp.rootPath ? 'subApp' : 'app') + ' to ' + appRoot);
+        console.log(`Generating ${em(weapp.rootPath ? 'subApp' : 'app')} to ${appRoot}`);
         if (weapp.mpPkgUrl) {
             console.log(`Removing ${appRoot}`);
             yield (0, generateFiles_1.cleanDir)(appRoot, ['materials']);
@@ -235,7 +229,7 @@ function generatePkg(weapp, appRoot, ctx, pageConfigs) {
             }
         }
         else {
-            console.log('Generating ' + em('page') + ' files');
+            console.log(`Generating ${em('page')} files`);
             (0, generateFiles_1.cleanDir)(path_1.default.join(appRoot, 'pages'), []);
             yield Promise.all(weapp.pageInstanceList.map((page) => __awaiter(this, void 0, void 0, function* () {
                 var _a, _b;
@@ -251,12 +245,10 @@ function generatePkg(weapp, appRoot, ctx, pageConfigs) {
                         pageSource: page.data.src || '',
                         eventHanlders: (0, util_2.createEventHanlders)(page.componentInstances, '$page', ctx),
                         dataBinds: (0, util_2.createDataBinds)(page.componentInstances, ctx),
-                        pageAttributes: Object.assign({}, (((_a = page.data) === null || _a === void 0 ? void 0 : _a.appShareMessage)
-                            ? { appShareMessage: page.data.appShareMessage.value }
-                            : {})),
+                        pageAttributes: Object.assign({}, (((_a = page.data) === null || _a === void 0 ? void 0 : _a.appShareMessage) ? { appShareMessage: page.data.appShareMessage.value } : {})),
                         debug: !ctx.isProduction,
                         stringifyObj: util_1.inspect,
-                        subLevelPath: rootPath ? path_1.default.relative(rootPath, '') + '/' : '',
+                        subLevelPath: rootPath ? `${path_1.default.relative(rootPath, '')}/` : '',
                     },
                     [`index.json|${pageFileName}.json`]: {
                         usingComponents,
@@ -314,9 +306,7 @@ function generateFramework(appData, outDir, ctx) {
                 fileData = Object.assign(Object.assign({}, fileData), { 'app/app-global.js': {}, 'app/weapps-api.js': {
                         appId: ctx.appId,
                         domain: ctx.domain || '',
-                        subLevelPath: appData.rootPath
-                            ? path_1.default.relative(`${appData.rootPath}`, '') + '/'
-                            : '',
+                        subLevelPath: appData.rootPath ? `${path_1.default.relative(`${appData.rootPath}`, '')}/` : '',
                         subPackageName: appData.rootPath || '',
                         isBare: false,
                         appConfig: (0, util_3.JsonToStringWithVariableName)({
@@ -367,12 +357,12 @@ exports.writeLowCodeFiles = writeLowCodeFiles;
 function getAppendableJson(json) {
     const obj = Object.assign({}, json);
     if (obj.reachBottomDistance) {
-        obj.onReachBottomDistance = obj.reachBottomDistance;
+        obj.onReachBottomDistance = parseInt(obj.reachBottomDistance) || 0;
         delete obj.reachBottomDistance;
     }
     if (obj && Object.keys(obj).length > 0) {
         const str = JSON.stringify(obj);
-        return ',\n' + str.substr(1, str.length - 2);
+        return `,\n${str.substr(1, str.length - 2)}`;
     }
     return '';
 }
@@ -388,10 +378,7 @@ function handleUsedComponents({ buildContext, weapps, materials, }) {
     });
     let allAppUsedComps = appUsedComps.reduce((comps, item) => {
         Object.keys(item.usedComps).forEach((libName) => {
-            comps[libName] = new Set([
-                ...Array.from(item.usedComps[libName]),
-                ...Array.from(comps[libName] || []),
-            ]);
+            comps[libName] = new Set([...Array.from(item.usedComps[libName]), ...Array.from(comps[libName] || [])]);
         });
         return comps;
     }, {});
@@ -419,9 +406,7 @@ function cleanPkg(pkg, miniprogramRoot) {
         if (pkg.mpPkgUrl) {
             return;
         }
-        const pkgDir = [miniprogramRoot, pkg.rootPath]
-            .filter((p) => !!p)
-            .join(path_1.default.sep);
+        const pkgDir = [miniprogramRoot, pkg.rootPath].filter((p) => !!p).join(path_1.default.sep);
         const pagesDir = path_1.default.join(pkgDir, 'pages');
         const lowcodesDir = path_1.default.join(pkgDir, 'lowcode');
         const existedPages = yield fs.readdir(pagesDir);
@@ -436,13 +421,11 @@ function cleanPkg(pkg, miniprogramRoot) {
             }
             else {
                 const handlersDir = path_1.default.join(lowcodeDir, 'handler');
-                const handlers = ((_d = (_c = (_b = (_a = pkg === null || pkg === void 0 ? void 0 : pkg.pageInstanceList) === null || _a === void 0 ? void 0 : _a.find((p) => p.id === pageName)) === null || _b === void 0 ? void 0 : _b.lowCodes) === null || _c === void 0 ? void 0 : _c.filter((m) => m.type === 'handler-fn')) === null || _d === void 0 ? void 0 : _d.map((m) => m.name + '.js')) || [];
+                const handlers = ((_d = (_c = (_b = (_a = pkg === null || pkg === void 0 ? void 0 : pkg.pageInstanceList) === null || _a === void 0 ? void 0 : _a.find((p) => p.id === pageName)) === null || _b === void 0 ? void 0 : _b.lowCodes) === null || _c === void 0 ? void 0 : _c.filter((m) => m.type === 'handler-fn')) === null || _d === void 0 ? void 0 : _d.map((m) => `${m.name}.js`)) || [];
                 (0, generateFiles_1.cleanDir)(handlersDir, handlers);
             }
         });
-        const commonModules = pkg.lowCodes
-            .filter((m) => m.type === 'normal-module')
-            .map((m) => m.name + '.js');
+        const commonModules = pkg.lowCodes.filter((m) => m.type === 'normal-module').map((m) => `${m.name}.js`);
         const commonDir = path_1.default.join(lowcodesDir, 'common');
         (0, generateFiles_1.cleanDir)(commonDir, commonModules);
     });

package/package.json

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