@cloudbase/lowcode-builder 1.9.6 → 1.9.8

package/lib/builder/config/dependencies.js

@@ -13,8 +13,8 @@ const BASE_DEPS = {
  * 注意锁版本
  */
 const CLOUDBASE_DEPS = {
-    '@cloudbase/weda-client': '1.1.6',
-    '@cloudbase/weda-cloud-sdk': '1.0.86',
+    '@cloudbase/weda-client': '1.1.11',
+    '@cloudbase/weda-cloud-sdk': '1.0.87',
 };
 const COMPONENT_DEPS = {
     '@cloudbase/lowcode-render': '^1.1.4',

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

@@ -1,2 +1,5 @@
 import { RUNTIME } from '../../types';
-export declare function buildBlock(buildDir: any, dependencies: any, runtime?: RUNTIME): Promise<any>;
+export declare function buildBlock(buildDir: any, dependencies: any, runtime?: RUNTIME): Promise<{
+    buildDir: any;
+    componentsList: any;
+}>;

package/lib/builder/h5/block2component.js

@@ -43,8 +43,9 @@ async function buildBlock(buildDir, dependencies, runtime = types_1.RUNTIME.NONE
     const officialDependence = dependencies.find((lib) => lib.name === config_1.OFFICIAL_LIB_KEY);
     const componentDeps = (0, config_1.generateLibDependencies)('h5', officialDependence === null || officialDependence === void 0 ? void 0 : officialDependence.version);
     processedDependencies.push(officialDependence);
+    let componentsList;
     try {
-        await (0, generate_1.generateBlockFiles)({
+        componentsList = await (0, generate_1.generateBlockFiles)({
             dependencies: processedDependencies,
             appBuildDir: buildDir,
             componentDeps,
@@ -53,6 +54,6 @@ async function buildBlock(buildDir, dependencies, runtime = types_1.RUNTIME.NONE
     catch (error) {
         throw error;
     }
-    return buildDir;
+    return { buildDir, componentsList };
 }
 exports.buildBlock = buildBlock;

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

@@ -7,7 +7,7 @@ import { ICommonBuildContext } from '../mp/BuildContext';
  * 该函数从 @govcloud/generate 取到需要的模版文件
  */
 export declare function generateProjectFiles(buildData: BuildAppProps): Promise<void>;
-export declare function generateBlockFiles(buildData: any): Promise<void>;
+export declare function generateBlockFiles(buildData: any): Promise<string[]>;
 export declare function generateHTML({ buildContext, appId, envId, description, appBuildDir, externalResources, mode, devTool, isBuildApp, buildTypeList, cdnEndpoints, 
 /**
  * 由于存量兜底逻辑存在

package/lib/builder/h5/generate.js

@@ -29,7 +29,7 @@ exports.generateProjectFiles = generateProjectFiles;
 async function generateBlockFiles(buildData) {
     const { dependencies, appBuildDir, componentDeps } = buildData;
     const fileCodeMap = {};
-    await (0, lowcode_generator_1.generateCompositeComponent)(dependencies, './', fileCodeMap, componentDeps);
+    const componentsList = await (0, lowcode_generator_1.generateCompositeComponent)(dependencies, './', fileCodeMap, componentDeps);
     try {
         await Promise.all(Object.keys(fileCodeMap).map(async (filePath) => {
             await (0, generateFiles_1.writeFile)(path_1.default.join(appBuildDir || '', filePath), fileCodeMap[filePath].code);
@@ -38,6 +38,7 @@ async function generateBlockFiles(buildData) {
     catch (error) {
         throw error;
     }
+    return componentsList;
 }
 exports.generateBlockFiles = generateBlockFiles;
 async function generateHTML({ buildContext, appId, envId, description = '', appBuildDir, externalResources = [], mode, devTool, isBuildApp, buildTypeList, cdnEndpoints, 

package/lib/builder/mp/index.js

@@ -112,7 +112,7 @@ async function generateWedaRootCommonFile({ buildContext, buildTypeList, localWe
 }
 exports.generateWedaRootCommonFile = generateWedaRootCommonFile;
 async function generateWxMp({ buildContext: _buildContext, weapps, calses, deployOptions, options, buildTypeList, ignoreInstall = false, cdnEndpoints = {}, mpConfig = {}, }) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
     const operationLabel = em('Wexin MiniProgram Generated');
     console.time(operationLabel);
     console.log(`Generating ${em('Wexin MiniProgram')} to ${_buildContext.projDir}`);
@@ -243,6 +243,7 @@ async function generateWxMp({ buildContext: _buildContext, weapps, calses, deplo
                     ? JSON.stringify(buildContext.privatelinkConfig, undefined, 2)
                     : undefined,
                 defaultLoginType: buildContext.__defaultLoginType__,
+                pureAnonymousLogin: !!((_k = (_j = calses[0]) === null || _j === void 0 ? void 0 : _j.extra) === null || _k === void 0 ? void 0 : _k.pureAnonymousLogin),
             },
             'datasources/datasource-profiles.js.tpl': {
                 datasourceProfiles: (0, util_3.JsonToStringWithVariableName)([], { EOL: false }),
@@ -311,8 +312,8 @@ async function generateWxMp({ buildContext: _buildContext, weapps, calses, deplo
         projectConfigJson.setting = {
             ...projectConfigJson.setting,
             ...projConfig.setting,
-            packNpmRelationList: ((_j = projConfig.setting) === null || _j === void 0 ? void 0 : _j.packNpmRelationList) || ((_k = projectConfigJson.setting) === null || _k === void 0 ? void 0 : _k.packNpmRelationList)
-                ? (0, mp_config_1.mergePackNpmRelationList)(projConfig.setting.packNpmRelationList, (_l = projectConfigJson.setting) === null || _l === void 0 ? void 0 : _l.packNpmRelationList)
+            packNpmRelationList: ((_l = projConfig.setting) === null || _l === void 0 ? void 0 : _l.packNpmRelationList) || ((_m = projectConfigJson.setting) === null || _m === void 0 ? void 0 : _m.packNpmRelationList)
+                ? (0, mp_config_1.mergePackNpmRelationList)(projConfig.setting.packNpmRelationList, (_o = projectConfigJson.setting) === null || _o === void 0 ? void 0 : _o.packNpmRelationList)
                 : undefined,
         };
         const wedaRoot = path_1.default.posix.join('./', projectConfigJson.miniprogramRoot || '/', projectConfigJson.wedaRoot || '');
@@ -332,7 +333,7 @@ async function generateWxMp({ buildContext: _buildContext, weapps, calses, deplo
         }
         const appJsonPath = path_1.default.join(miniprogramRoot, 'app.json');
         const appJson = await fs.readJson(appJsonPath);
-        appJson.subpackages = (0, mp_config_1.mergeSubPackages)(((_o = (_m = appJson.subpackages) === null || _m === void 0 ? void 0 : _m.filter) === null || _o === void 0 ? void 0 : _o.call(_m, (item) => item.name !== 'wd-sys-module' && item.name !== 'wd-sys-materials')) || [], appConfig.subpackages);
+        appJson.subpackages = (0, mp_config_1.mergeSubPackages)(((_q = (_p = appJson.subpackages) === null || _p === void 0 ? void 0 : _p.filter) === null || _q === void 0 ? void 0 : _q.call(_p, (item) => item.name !== 'wd-sys-module' && item.name !== 'wd-sys-materials')) || [], appConfig.subpackages);
         await (0, generateFiles_1.writeFile)(appJsonPath, JSON.stringify(appJson, undefined, 2));
     }
     else {
@@ -631,7 +632,7 @@ async function generatePkg(ctx, { cals, weapp }, appRoot, pageConfigs, cssVarMap
     }
 }
 async function generateFramework(ctx, { cals, weapp: appData }, outDir, options) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d, _e;
     let fileData = {};
     if (appData.mpPkgUrl) {
         /**
@@ -684,6 +685,7 @@ async function generateFramework(ctx, { cals, weapp: appData }, outDir, options)
                         label: (appData === null || appData === void 0 ? void 0 : appData.label) || '',
                         version: (_a = options === null || options === void 0 ? void 0 : options.deployOptions) === null || _a === void 0 ? void 0 : _a.version,
                         loginConfigVersion: (_b = cals.extra) === null || _b === void 0 ? void 0 : _b.loginConfigVersion,
+                        pureAnonymousLogin: !!((_d = (_c = cals.extra) === null || _c === void 0 ? void 0 : _c.access) === null || _d === void 0 ? void 0 : _d.pureAnonymousLogin),
                         basename: ctx.wedaRoot,
                         pages: appData.pageInstanceList
                             .sort((item) => (item.isHome ? -1 : 1))
@@ -699,7 +701,7 @@ async function generateFramework(ctx, { cals, weapp: appData }, outDir, options)
                             });
                         }),
                     }),
-                    appQuery: (0, util_2.createTemplateQuery)(ctx, (_c = appData.dataset) === null || _c === void 0 ? void 0 : _c.query),
+                    appQuery: (0, util_2.createTemplateQuery)(ctx, (_e = appData.dataset) === null || _e === void 0 ? void 0 : _e.query),
                     /**
                      * @deprecated
                      */

package/lib/builder/mp/materials.js

@@ -262,7 +262,7 @@ async function generateCompositeComponent(compositeCtx, compositedComp, lowcalWe
             datasetProfile: (0, util_1.JsonToStringWithVariableName)((0, lowcode_generator_1.generateDynamicDataset)(compositedComp.dataset || {}), {
                 EOL: true,
             }),
-            query: (0, util_2.createTemplateQuery)(compositeCtx, (_a = compositedComp.dataset) === null || _a === void 0 ? void 0 : _a.query) || {},
+            query: (0, util_2.createTemplateQuery)(compositeCtx, (_a = compositedComp.dataset) === null || _a === void 0 ? void 0 : _a.query, true) || {},
             eventFlows: (0, util_2.createTemplateEventFlows)(compositeCtx, compositedComp.eventFlows) || [],
             nativeMode: mode === 'lib' ? 1 : 0,
         },

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

@@ -24,7 +24,7 @@ export declare function generateDataContainerListeners(): {
 }[];
 export declare function createTemplateQuery(ctx: IMpCommonBuildContext, query?: {
     [key: string]: IQueryData;
-}): {};
+}, isComposite?: boolean): {};
 export declare function createTemplateEventFlows(ctx: IMpCommonBuildContext, eventFlows?: any[]): any[];
 export declare function generateArgsDynamicValueFromData(args?: {
     [prop: string]: IDynamicValue;

package/lib/builder/mp/util.js

@@ -211,15 +211,17 @@ function generateDataContainerListeners() {
     ];
 }
 exports.generateDataContainerListeners = generateDataContainerListeners;
-function createTemplateQuery(ctx, query = {}) {
+function createTemplateQuery(ctx, query = {}, isComposite = false) {
     return Object.entries(query).reduce((map, [key, item]) => {
-        var _a, _b;
+        var _a, _b, _c, _d;
         const { listeners = [], handler, data, args, ...rest } = item;
         const { staticProps, boundProps } = generatedDynamicData(generateArgsDynamicValueFromData(args, data) || {}, undefined, false);
         map[key] = {
             ...rest,
             handler: item.type === cals_1.EQueryType.GeneralFunc
-                ? `(__data__,__params__) => (\n${(_b = (_a = handler['code']) === null || _a === void 0 ? void 0 : _a.replace) === null || _b === void 0 ? void 0 : _b.call(_a, /;\s*$/, '')}\n)({params:__params__,data:__data__})`
+                ? isComposite
+                    ? `(__data__,__params__,$comp,$w) => (\n${(_b = (_a = handler['code']) === null || _a === void 0 ? void 0 : _a.replace) === null || _b === void 0 ? void 0 : _b.call(_a, /;\s*$/, '')}\n)({params:__params__,data:__data__,$comp,$w})`
+                    : `(__data__,__params__) => (\n${(_d = (_c = handler['code']) === null || _c === void 0 ? void 0 : _c.replace) === null || _d === void 0 ? void 0 : _d.call(_c, /;\s*$/, '')}\n)({params:__params__,data:__data__})`
                 : `(...args) => $app.${handler === null || handler === void 0 ? void 0 : handler.name}(...args)`,
             data: staticProps,
             dataBinds: boundProps,