@cloudbase/lowcode-builder 1.8.23 → 1.8.24-alpha.0

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

@@ -6,12 +6,12 @@ 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.19.zip";
+export declare const builderTemplateURL = "https://comp-public-1303824488.cos.ap-shanghai.myqcloud.com/lcap-builder/template.1.8.13.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.1.8.19.zip";
+export declare const miniprogramURL = "https://comp-public-1303824488.cos.ap-shanghai.myqcloud.com/lcap-builder/miniprogram_npm_20230606.zip";
 /**
  * miniprogram_npm存放目录。IDE插件builder用到
  */

package/lib/builder/config/index.js

@@ -45,12 +45,12 @@ 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.19.zip';
+exports.builderTemplateURL = 'https://comp-public-1303824488.cos.ap-shanghai.myqcloud.com/lcap-builder/template.1.8.13.zip';
 /**
  * miniprogram的代码，IDE插件后续会提供端功能
  * 存放在大账号：100015939275。访问地址：https://console.cloud.tencent.com/cos/bucket?bucket=comp-public-1303824488&region=ap-shanghai&path=%252Flcap-builder%252F
  */
-exports.miniprogramURL = 'https://comp-public-1303824488.cos.ap-shanghai.myqcloud.com/lcap-builder/miniprogram_npm.1.8.19.zip';
+exports.miniprogramURL = 'https://comp-public-1303824488.cos.ap-shanghai.myqcloud.com/lcap-builder/miniprogram_npm_20230606.zip';
 /**
  * miniprogram_npm存放目录。IDE插件builder用到
  */

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

@@ -5,7 +5,7 @@ import { IPlatformApp } from '@cloudbase/cals';
 import { ICDN_ENDPOINTS_COFIG } from '../config';
 import { IBuildContext } from '../mp/BuildContext';
 import { IBuildWedaApp } from '../core';
-export declare function buildH5App({ buildContext, i18nConfig, extraData, cals: _cals, buildTypeList, subAppCalsList, mode, devTool, runtime, deployOptions, ignoreInstall, cdnEndpoints, }: {
+export declare function buildH5App({ buildContext, i18nConfig, extraData, cals, buildTypeList, subAppCalsList, mode, devTool, runtime, deployOptions, ignoreInstall, cdnEndpoints, }: {
     buildContext: Omit<IBuildContext, 'mainAppData'>;
     cals: IPlatformApp;
     subAppCalsList: IPlatformApp[];
@@ -19,7 +19,3 @@ export declare function buildH5App({ buildContext, i18nConfig, extraData, cals:
     ignoreInstall?: boolean;
     cdnEndpoints?: ICDN_ENDPOINTS_COFIG;
 }): Promise<string>;
-/**
- * 导出进行单测
- */
-export declare function _BabelTransformCalsExpression(key: any, value: any): any;

package/lib/builder/h5/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._BabelTransformCalsExpression = exports.buildH5App = void 0;
+exports.buildH5App = void 0;
 const path_1 = __importDefault(require("path"));
 const weapps_core_1 = require("@cloudbase/lowcode-generator/lib/weapps-core");
 const material_1 = require("./material");
@@ -45,8 +45,7 @@ const config_1 = require("../config");
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const junk = __importStar(require("../util/junk"));
 const url_1 = require("url");
-const transform_1 = require("../../utils/transform");
-async function buildH5App({ buildContext, i18nConfig, extraData, cals: _cals, buildTypeList = [common_1.BuildType.WEB], subAppCalsList, mode, devTool, runtime = types_1.RUNTIME.NONE, deployOptions = { mode: types_1.DEPLOY_MODE.PREVIEW }, ignoreInstall = false, cdnEndpoints, }) {
+async function buildH5App({ buildContext, i18nConfig, extraData, cals, buildTypeList = [common_1.BuildType.WEB], subAppCalsList, mode, devTool, runtime = types_1.RUNTIME.NONE, deployOptions = { mode: types_1.DEPLOY_MODE.PREVIEW }, ignoreInstall = false, cdnEndpoints, }) {
     var _a, _b, _c;
     const { projDir: buildDir, domain, materialLibs: dependencies, appId: appKey, isPrivateMode } = buildContext;
     if (!deployOptions.mode) {
@@ -58,12 +57,11 @@ async function buildH5App({ buildContext, i18nConfig, extraData, cals: _cals, bu
         if (buildTypeList.includes(common_1.BuildType.APP) ||
             buildTypeList.includes(common_1.BuildType.XPAGE_PC) ||
             buildTypeList.includes(common_1.BuildType.ADMIN_PORTAL)) {
-            if (!_cals.extra) {
-                _cals.extra = {};
+            if (!cals.extra) {
+                cals.extra = {};
             }
-            _cals.extra.historyType = types_1.HISTORY_TYPE.HASH;
+            cals.extra.historyType = types_1.HISTORY_TYPE.HASH;
         }
-        const cals = processCals(_cals);
         const mainAppSerializeData = (0, common_2.processCals2WeappsData)(cals, dependencies);
         const subAppSerializeDataList = (subAppCalsList === null || subAppCalsList === void 0 ? void 0 : subAppCalsList.map((item) => (0, common_2.processCals2WeappsData)(item, dependencies))) || [];
         const { allAppUsedComps } = (0, mp_1.handleUsedComponents)({
@@ -201,60 +199,3 @@ async function buildH5App({ buildContext, i18nConfig, extraData, cals: _cals, bu
     }
 }
 exports.buildH5App = buildH5App;
-function processCals(cals) {
-    return walkThroughJson(cals, (key, value, prefix) => {
-        return _BabelTransformCalsExpression(key, value);
-    });
-}
-function _isPlainObj(obj) {
-    return typeof obj === 'object' && obj !== null;
-}
-function walkThroughJson(obj, callback, path = '') {
-    /**
-     * 跳过数据源 state 的处理
-     */
-    if (/dataset\.state$/.test(path)) {
-        return obj;
-    }
-    if (typeof obj === 'object' && Array.isArray(obj)) {
-        return obj.map((item, index) => {
-            const prefix = path ? `${path}.${index}` : String(index);
-            return _isPlainObj(item) ? walkThroughJson(item, callback, prefix) : callback(index, item, prefix);
-        });
-    }
-    for (const key in obj) {
-        const value = obj[key];
-        const prefix = path ? `${path}.${key}` : key;
-        obj[key] = _isPlainObj(value) ? walkThroughJson(value, callback, prefix) : callback(key, value, prefix);
-    }
-    return obj;
-}
-/**
- * 导出进行单测
- */
-function _BabelTransformCalsExpression(key, value) {
-    const DYNAMIC_REG = /^:(.*)$/;
-    const FOR_IN_REG = /^(.*?in\s)/;
-    if (DYNAMIC_REG.test(key)) {
-        try {
-            let forPrefix = '';
-            if (key === ':for') {
-                const matched = value.match(FOR_IN_REG) || [];
-                forPrefix = matched[0];
-                if (forPrefix) {
-                    value = value.replace(FOR_IN_REG, '');
-                }
-            }
-            value = (0, transform_1.BabelTransform)(value, { IIFE: true });
-            if (forPrefix) {
-                value = `${forPrefix}${value}`;
-            }
-            return value;
-        }
-        catch (e) {
-            return value;
-        }
-    }
-    return value;
-}
-exports._BabelTransformCalsExpression = _BabelTransformCalsExpression;

package/lib/builder/h5/webpack.js

@@ -30,7 +30,7 @@ async function runWebpackCore({ cals, mainAppData, subAppDataList, appBuildDir,
     await (0, generate_1.generateHTML)({
         appId: mainAppData.id || appKey,
         envId: mainAppData.envId || '',
-        description: cals.description || cals.label || '',
+        description: cals.description /* || cals.label */ || '',
         enableLoading: (_a = cals.extra) === null || _a === void 0 ? void 0 : _a.enableLoading,
         appBuildDir,
         externalResources: (cals.externalResources || []).concat(assets.map((url) => ({

package/lib/builder/mp/index.js

@@ -106,7 +106,11 @@ async function generateWxMp({ buildContext, weapps, plugins, deployOptions, opti
                 isAdminPortal: (0, common_1.buildAsAdminPortalByBuildType)(buildTypeList),
             },
             'common/widget.js': {},
-            'common/weapp-page.js': {},
+            'common/url.js': {},
+            'common/weapp-page.js': {
+                dataPropNames: wxmlDataPrefix,
+                debug: buildContext.debugMode,
+            },
             'common/weapp-component.js': {},
             'common/merge-renderer.js': {
                 dataPropNames: wxmlDataPrefix,
@@ -306,21 +310,12 @@ async function generatePkg(ctx, weapp, appRoot, pageConfigs) {
         console.log(`Generating ${em('page')} files`);
         (0, generateFiles_1.cleanDir)(path_1.default.join(appRoot, 'pages'), []);
         await Promise.all(weapp.pageInstanceList.map(async (page) => {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+            var _a, _b, _c, _d, _e, _f, _g;
             // # Generating page
             const rootPath = weapp.rootPath || '';
             const usingComponents = {};
             const componentGenerics = {};
             const componentInstances = (0, util_2.processRepeaterSchema)(ctx, page.componentInstances);
-            const { allAppUsedComps = [] } = handleUsedComponents({
-                buildContext: ctx,
-                weapps: [
-                    {
-                        ...weapp,
-                        pageInstanceList: [page],
-                    },
-                ],
-            });
             const wxml = (0, wxml_1.generateWxml)({ ...ctx, rootPath, isPage: true }, componentInstances, `Page ${rootPath ? path_1.default.join(rootPath, 'pages') : ''}/${page.id}`, wxmlDataPrefix, usingComponents, componentGenerics);
             const importor = (0, util_3.generateLowcodeImportor)(page.lowCodes);
             const pageFileName = (0, lodash_1.get)(pageConfigs, `${page.id}.pageFileName`, 'index');
@@ -348,11 +343,6 @@ async function generatePkg(ctx, weapp, appRoot, pageConfigs) {
                     importor,
                     query: (0, util_2.createTemplateQuery)(ctx, (_f = page.dataset) === null || _f === void 0 ? void 0 : _f.query),
                     eventFlows: (0, util_2.createTemplateEventFlows)(ctx, page.eventFlows),
-                    resetShare: ((_j = (_h = (_g = page === null || page === void 0 ? void 0 : page.data) === null || _g === void 0 ? void 0 : _g.appShareMessage) === null || _h === void 0 ? void 0 : _h.value) === null || _j === void 0 ? void 0 : _j.enable) ||
-                        ((_k = allAppUsedComps === null || allAppUsedComps === void 0 ? void 0 : allAppUsedComps[cals_1.OFFICIAL_LIB_KEY]) === null || _k === void 0 ? void 0 : _k.has('Share')) ||
-                        /* 从 enablePageRoot 的版本开始支持按需reset share
-                         * 否则默认都开启
-                         */ !ctx.enablePageRoot,
                 },
                 [`index.json|${pageFileName}.json`]: {
                     usingComponents,
@@ -363,7 +353,7 @@ async function generatePkg(ctx, weapp, appRoot, pageConfigs) {
                     content: wxml,
                 },
                 [`index.wxss|${pageFileName}.wxss`]: {
-                    subWxss: rootPath && !((_l = ctx.mainAppData) === null || _l === void 0 ? void 0 : _l.mpPkgUrl)
+                    subWxss: rootPath && !((_g = ctx.mainAppData) === null || _g === void 0 ? void 0 : _g.mpPkgUrl)
                         ? `@import "${path_1.default.posix.relative(`/${rootPath}/pages/${page.id}`, '/lowcode')}/style.wxss";`
                         : '',
                     content: (0, weapps_core_1.toCssText)((0, cals_1.processCommonStyle2CSSProperties)(page.commonStyle, {

package/lib/builder/mp/util.js

@@ -9,24 +9,21 @@ const mp_1 = require("@cloudbase/lowcode-generator/lib/generator/config/mp");
 const cals_1 = require("@cloudbase/cals");
 const config_1 = require("../config");
 function extractWidgetProps(props, compInfo, processCssUnit = 'rpx') {
-    var _a, _b, _c;
-    const { classList, staticResourceAttribute = [], data = {}, style } = props;
+    var _a, _b;
+    const { classList, staticResourceAttribute = [] } = props;
     const staticProps = {
-        style: style && ((_a = Object.keys(style || {})) === null || _a === void 0 ? void 0 : _a.length)
-            ? (0, cals_1.processCSSPropertiesUnit)(style || {}, processCssUnit)
-            : {
-                ...(0, cals_1.processCommonStyle2CSSProperties)(props.commonStyle || {}, {
-                    defaultUnit: processCssUnit,
-                }),
-            },
+        style: (0, cals_1.processCommonStyle2CSSProperties)(props.commonStyle, {
+            defaultUnit: processCssUnit,
+        }),
         classList: classList || [],
     };
     if (staticResourceAttribute === null || staticResourceAttribute === void 0 ? void 0 : staticResourceAttribute.length) {
         staticProps._staticResourceAttribute = staticResourceAttribute;
     }
+    const { data = {} } = props;
     Object.assign(staticProps, generatedDynamicData(data, compInfo).staticProps);
-    if ((_b = props.directives) === null || _b === void 0 ? void 0 : _b.waForKey) {
-        staticProps._waForKey = (_c = props.directives) === null || _c === void 0 ? void 0 : _c.waForKey.value;
+    if ((_a = props.directives) === null || _a === void 0 ? void 0 : _a.waForKey) {
+        staticProps._waForKey = (_b = props.directives) === null || _b === void 0 ? void 0 : _b.waForKey.value;
     }
     return staticProps;
 }

package/lib/builder/types/common.d.ts

@@ -1,6 +1,6 @@
 export { BuildType, GenerateMpType, WebpackModeType, WebpackBuildCallBack, IPackageJson, buildAsWebByBuildType, buildAsAdminPortalByBuildType, buildAsXPageByBuildType, IAppUsedComp, IUsedComps, ISyncProp, IComponentInputProps, IFileCodeMap, } from '@cloudbase/lowcode-generator/lib/generator/types/common';
 import { IComponentMeta, ICompositedComponent } from '@cloudbase/lowcode-generator/lib/weapps-core';
-export type IComponentsInfoMap = {
+export declare type IComponentsInfoMap = {
     [componentSourceKey: string]: ({
         meta: IComponentMeta;
     } & {

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

@@ -1,7 +1,7 @@
 import { IComponentInputProps, IComponentsInfoMap, IPackageJson } from '../types/common';
 import { IMaterialItem, IWeAppComponentInstance, IWeAppCode } from '@cloudbase/lowcode-generator/lib/weapps-core';
 export { getMetaInfoBySourceKey, isArray, isPlainObject, deepDeal, simpleDeepClone, deepDealSchema, getFileNameByUrl, } from '@cloudbase/lowcode-generator/lib/generator/util/common';
-type PromiseResult<T> = Promise<[null, T] | [Error, null]>;
+declare type PromiseResult<T> = Promise<[null, T] | [Error, null]>;
 export declare function promiseWrapper<T>(p: Promise<T>): PromiseResult<T>;
 export declare function getCurrentPackageJson(): {
     name: any;

package/lib/builder/util/process.js

@@ -3,22 +3,25 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.promisifyProcess = void 0;
 function promisifyProcess(p, opts = {}) {
     return new Promise((resolve, reject) => {
-        var _a, _b, _c, _d;
         let stdout = '';
         let stderr = '';
-        (_b = (_a = p.stdout) === null || _a === void 0 ? void 0 : _a.on) === null || _b === void 0 ? void 0 : _b.call(_a, 'data', opts.onStdout ||
-            ((data) => {
-                console.log(`${data}`);
-                stdout += data;
-            }));
-        (_d = (_c = p.stderr) === null || _c === void 0 ? void 0 : _c.on) === null || _d === void 0 ? void 0 : _d.call(_c, 'data', opts.onStderr ||
-            ((data) => {
-                console.error(`${data}`);
-                stderr += data;
-            }));
+        p.stdout &&
+            p.stdout.on('data', opts.onStdout ||
+                ((data) => {
+                    console.log(data + '');
+                    stdout += data;
+                }));
+        p.stderr &&
+            p.stderr.on('data', opts.onStderr ||
+                ((data) => {
+                    console.error(data + '');
+                    stderr += data;
+                }));
         p.on('error', reject);
         p.on('exit', (exitCode) => {
-            exitCode === 0 ? resolve(exitCode) : reject(new Error(stderr || String(exitCode)));
+            exitCode === 0
+                ? resolve(exitCode)
+                : reject(new Error(stderr || String(exitCode)));
         });
     });
 }