@cloudbase/lowcode-builder 1.0.20 → 1.0.21

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

@@ -1,3 +1,3 @@
 import { IWebRuntimeAppData, II18nConfig, IMaterialItem } from '@cloudbase/lowcode-generator/lib/weapps-core';
 export declare function runCopy(appBuildDir: string, webRuntimeAppData: IWebRuntimeAppData, i18nConfig?: II18nConfig): Promise<void>;
-export declare function copyMaterialLibraries(dependencies: IMaterialItem[] | undefined, materialsDir: string, appBuildDir: string): Promise<void>;
+export declare function copyMaterialLibraries(dependencies: IMaterialItem[] | undefined, materialsDir: string, appBuildDir: string): Promise<void[]>;

package/lib/builder/h5/copy.js

@@ -57,8 +57,7 @@ async function runCopy(appBuildDir, webRuntimeAppData, i18nConfig) {
 exports.runCopy = runCopy;
 async function copyMaterialLibraries(dependencies = [], materialsDir, appBuildDir) {
     const localPkg = (0, common_1.getCurrentPackageJson)();
-    await Promise.all(dependencies.map(async (componentLib) => {
-        var _a, _b, _c, _d, _e;
+    return Promise.all(dependencies.map(async (componentLib) => {
         const { name, version } = componentLib;
         const materialNameVersion = `${name}@${version}`;
         const materialDir = path.join(materialsDir, materialNameVersion);
@@ -85,36 +84,6 @@ async function copyMaterialLibraries(dependencies = [], materialsDir, appBuildDi
         if (fs_extra_1.default.existsSync(nodeModulesPath) && !fs_extra_1.default.existsSync(targetNodeModulesPath)) {
             await fs_extra_1.default.symlink(nodeModulesPath, targetNodeModulesPath, 'dir');
         }
-        // 副作用修改了dependence定义，trycatch 不阻塞主流程
-        try {
-            const meta = (0, common_1.readComponentLibMata)(librariesDir);
-            if (meta === null || meta === void 0 ? void 0 : meta.schemaVersion) {
-                componentLib['schemaVersion'] = meta === null || meta === void 0 ? void 0 : meta.schemaVersion;
-            }
-            let [major] = ((_a = meta === null || meta === void 0 ? void 0 : meta.schemaVersion) === null || _a === void 0 ? void 0 : _a.split('.')) || [];
-            if (Number(major) >= 3) {
-                componentLib['isPlainProps'] = true;
-            }
-        }
-        catch (e) { }
-        try {
-            const packageJson = fs_extra_1.default.readJsonSync(path.join(materialDir, 'package.json'));
-            if ((_c = (_b = packageJson.weda) === null || _b === void 0 ? void 0 : _b.platform) === null || _c === void 0 ? void 0 : _c.web) {
-                const entries = (_e = (_d = packageJson.weda) === null || _d === void 0 ? void 0 : _d.platform) === null || _e === void 0 ? void 0 : _e.web;
-                componentLib['entries'] = {
-                    entry: path.posix.relative(srcDir, entries.entry),
-                    components: path.posix.relative(srcDir, entries.components),
-                    actions: path.posix.relative(srcDir, entries.actions),
-                };
-            }
-            else if (packageJson.lowcode) {
-                const entry = path.posix.relative(srcDir, packageJson.lowcode);
-                componentLib['entries'] = {
-                    entry,
-                };
-            }
-        }
-        catch (e) { }
     }));
 }
 exports.copyMaterialLibraries = copyMaterialLibraries;

package/lib/builder/h5/index.js

@@ -13,7 +13,6 @@ const webpack_2 = require("../service/webpack");
 const npm_1 = require("./npm");
 const copy_1 = require("./copy");
 const common_1 = require("../types/common");
-const generate_2 = require("./generate");
 const compile_1 = require("./compile");
 const util_1 = require("../util");
 const types_1 = require("../../types");
@@ -52,7 +51,7 @@ async function buildH5App({ appKey, buildDir, dependencies, i18nConfig, extraDat
         // 前置操作
         const { publicPath, basename, assets = '' } = ((_b = mainAppData.appConfig) === null || _b === void 0 ? void 0 : _b.window) || {};
         // 获取 插入的cdn 资源
-        const jsAssets = await (0, generate_2.handleAssets)({
+        const jsAssets = await (0, generate_1.handleAssets)({
             appBuildDir: buildDir,
             buildTypeList,
             assets,
@@ -63,17 +62,16 @@ async function buildH5App({ appKey, buildDir, dependencies, i18nConfig, extraDat
         // // 素材库
         const runHandleMaterialTag = '🚥  buildWebApp-runHandleMaterial';
         console.time(runHandleMaterialTag);
-        // 精简只使用用到的组件库
-        const filteredDependiences = dependencies.filter((lib) => {
+        // 精简只使用用到的组件库，并获取补齐json格式
+        const processedDependiencies = await (0, material_1.runHandleMaterial)(h5BuildDir, dependencies.filter((lib) => {
             return !!allAppUsedComps[lib.name];
-        });
-        await (0, material_1.runHandleMaterial)(h5BuildDir, filteredDependiences, materialsDir, runtime, ignoreInstall);
+        }), materialsDir, runtime, ignoreInstall);
         console.timeEnd(runHandleMaterialTag);
         // // 获取 generate 需要的构建文件
         const runGenerateTag = '🚥  buildWebApp-generateProjectFiles';
         console.time(runGenerateTag);
         await (0, generate_1.generateProjectFiles)({
-            dependencies: filteredDependiences,
+            dependencies: processedDependiencies,
             cals,
             mainAppData,
             subAppDataList,
@@ -95,7 +93,7 @@ async function buildH5App({ appKey, buildDir, dependencies, i18nConfig, extraDat
             mainAppData,
             subAppDataList,
             appBuildDir: h5BuildDir,
-            dependencies: filteredDependiences,
+            dependencies: processedDependiencies,
             mode,
             devTool,
             ignoreInstall,

package/lib/builder/h5/material.js

@@ -24,71 +24,124 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runHandleMaterial = void 0;
-const fs = __importStar(require("fs"));
+const fs = __importStar(require("fs-extra"));
 const path = __importStar(require("path"));
-const lodash_1 = require("lodash");
 const webpack_1 = require("../service/webpack");
 const copy_1 = require("./copy");
 const types_1 = require("../../types");
 const common_1 = require("../util/common");
 async function runHandleMaterial(appBuildDir, dependencies = [], materialsDir, runtime = types_1.RUNTIME.NONE, ignoreInstall = false) {
-    const allMaterials = [
-        await handleNormalMaterial({
-            dependencies,
-            materialsDir,
-            appBuildDir,
-            runtime,
-            ignoreInstall,
-        }),
-    ];
-    return (0, lodash_1.flatten)(allMaterials);
+    const normalDependencies = [];
+    const compositeDependencies = [];
+    dependencies.forEach((item) => {
+        if (item.isComposite) {
+            compositeDependencies.push(item);
+        }
+        else {
+            normalDependencies.push(item);
+        }
+    });
+    const allMaterials = await handleNormalMaterial({
+        dependencies: normalDependencies,
+        materialsDir,
+        appBuildDir,
+        runtime,
+        ignoreInstall,
+    });
+    return allMaterials.concat(compositeDependencies);
     // TODO: 确认这里是否需要生成复合组件
     // await handleCompositeComponent({ dependencies, appBuildDir });
 }
 exports.runHandleMaterial = runHandleMaterial;
-async function handleNormalMaterial({ dependencies, materialsDir, appBuildDir, runtime, ignoreInstall = false }) {
+async function handleNormalMaterial({ dependencies: normalDependencies, materialsDir, appBuildDir, runtime, ignoreInstall = false, }) {
     const timeTag = '-------------------- handleNormalMaterial';
     console.time(timeTag);
-    const normalDependencies = dependencies.filter((item) => !item.isComposite);
     await (0, webpack_1.downloadAndInstallDependencies)(normalDependencies, materialsDir, {
         runtime,
         ignoreInstall,
     });
     await (0, copy_1.copyMaterialLibraries)(normalDependencies, materialsDir, appBuildDir);
     console.timeEnd(timeTag);
-    return normalDependencies.map((metaInfo) => {
-        var _a, _b;
-        const { name: materialName } = metaInfo;
+    return Promise.all(normalDependencies.map(async (metaInfo) => {
+        var _a, _b, _c, _d, _e, _f;
+        const materialNameVersion = `${metaInfo.name}@${metaInfo.version}`;
         const materialItemPath = path
-            .resolve(appBuildDir, 'src/libraries', `${metaInfo.name}@${metaInfo.version}`)
+            .resolve(appBuildDir, 'src/libraries', materialNameVersion)
             .replace(/packages\/\w+\//, ''); // HACK：去除子包的目录，找根目录的素材地址。后续提供一个方法获取这些关键路径。
         const materialComponentsPath = path.resolve(materialItemPath, `components`);
         const actionsDir = path.join(materialItemPath, 'actions');
         const meta = (0, common_1.readComponentLibMata)(materialItemPath);
         let actions = [];
         let components = [];
+        let { schemaVersion, isPlainProps, entries } = metaInfo;
+        try {
+            const packageJson = fs.readJsonSync(path.join(materialsDir, materialNameVersion, 'package.json'));
+            if ((_b = (_a = packageJson.weda) === null || _a === void 0 ? void 0 : _a.platform) === null || _b === void 0 ? void 0 : _b.web) {
+                const _entries = (_d = (_c = packageJson.weda) === null || _c === void 0 ? void 0 : _c.platform) === null || _d === void 0 ? void 0 : _d.web;
+                entries = {
+                    entry: path.posix.relative('src', _entries.entry),
+                    components: path.posix.relative('src', _entries.components),
+                    actions: path.posix.relative('src', _entries.actions),
+                };
+            }
+            else if (packageJson.lowcode) {
+                entries = {
+                    entry: path.posix.relative('src', packageJson.lowcode),
+                };
+            }
+        }
+        catch (e) { }
         if (meta) {
+            if (meta === null || meta === void 0 ? void 0 : meta.schemaVersion) {
+                schemaVersion = meta === null || meta === void 0 ? void 0 : meta.schemaVersion;
+            }
+            let [major] = ((_e = meta === null || meta === void 0 ? void 0 : meta.schemaVersion) === null || _e === void 0 ? void 0 : _e.split('.')) || [];
+            if (Number(major) >= 3) {
+                isPlainProps = true;
+            }
             const { components: componentsMap, actions: actionsMap = {} } = meta;
             for (let name in componentsMap) {
-                components.push({ name });
+                const { $schema, platforms, data, dataForm, events, emitEvents, ...rest } = componentsMap[name];
+                components.push({
+                    ...rest,
+                    dataForm: dataForm || data.properties,
+                    emitEvents: emitEvents ||
+                        (events === null || events === void 0 ? void 0 : events.map((event) => {
+                            return {
+                                eventName: event.name,
+                                name: event.title,
+                            };
+                        })),
+                    name,
+                    type: 'component',
+                });
             }
             for (let name in actionsMap) {
-                actions.push({ name: name });
+                actions.push({ name });
             }
         }
         else {
             // 老格式，需要从子目录下读取
-            actions = ((_a = fs.readdirSync(actionsDir)) === null || _a === void 0 ? void 0 : _a.map((dirName) => ({ name: dirName }))) || [];
-            components = (_b = fs.readdirSync(materialComponentsPath)) === null || _b === void 0 ? void 0 : _b.map((dirName) => ({ name: dirName }));
+            actions = ((_f = fs.readdirSync(actionsDir)) === null || _f === void 0 ? void 0 : _f.map((dirName) => ({ name: dirName }))) || [];
+            components = await Promise.all((fs.readdirSync(materialComponentsPath) || []).map(async (name) => {
+                const componentMetaPath = `${materialComponentsPath}/${name}/meta.json`;
+                let metaJson = {
+                    name,
+                    meta: await fs.readJson(componentMetaPath),
+                };
+                return metaJson;
+            }));
         }
-        // TODO: 根据mata判断而非readdir
         return {
             ...metaInfo,
-            actions,
-            components,
+            schemaVersion,
+            isPlainProps,
+            entries,
+            actions: actions.length ? actions : metaInfo.actions,
+            components: components.length ? components : metaInfo.components,
             plugins: [],
         };
-    });
+    }));
 }
 // async function handleCompositeComponent({ dependencies, appBuildDir }) {
 //   console.time('handleCompositeComponent');

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

@@ -23,6 +23,10 @@ export declare function generateWxMp({ weapps, projDir, appId, domain, materials
     miniprogramRoot: string;
 }>;
 export declare function writeLowCodeFiles(appData: IWeAppData, outDir: string, ctx: IBuildContext): Promise<void>;
+/**
+ * TODO: 与 cals 里的实现进行整合
+ * 关键点在于 appUsedComps 分组， 与 generic componen 的实现
+ */
 export declare function handleUsedComponents({ buildContext, weapps, materials, }: {
     buildContext: IBuildContext;
     weapps: IWeAppData[];

package/lib/builder/mp/index.js

@@ -459,6 +459,10 @@ function getAppendableJson(json) {
     return '';
 }
 // 处理使用到的组件
+/**
+ * TODO: 与 cals 里的实现进行整合
+ * 关键点在于 appUsedComps 分组， 与 generic componen 的实现
+ */
 function handleUsedComponents({ buildContext, weapps, materials, }) {
     const appUsedComps = weapps.map((app) => {
         var _a;

package/lib/builder/mp/materials.js

@@ -277,7 +277,7 @@ async function generateCompositeComponent(compositedComp, ctx, compLibCommonReso
             materialName,
             propDefs,
             handlers: compositedComp.lowCodes
-                .filter((m) => m.type === 'handler-fn' && m.name !== '____index____')
+                .filter((m) => m.type === cals_1.ECodeType.HANDLER_FN && m.name !== cals_1.ECodeName.PLACEHOLDER)
                 .map((m) => m.name),
             eventHandlers: (0, util_3.createEventHanlders)(compositedComp.componentInstances, weapps_core_1.COMPONENT_API_PREFIX, ctx),
             // protectEventKeys: builtinMpEvents,

package/lib/builder/util/common.js

@@ -108,7 +108,7 @@ async function getComponentsInfo(appBuildDir, dependencies) {
     await Promise.all(dependencies.map(async ({ name: materialName, version, components = [], isComposite }) => {
         if (isComposite) {
             components.forEach((component) => {
-                let compItem = component;
+                let { lowCodes, componentInstances, ...compItem } = component;
                 const sourceKey = `${materialName}:${compItem.name}`;
                 outputObj[sourceKey] = {
                     isComposite,
@@ -200,6 +200,7 @@ function readComponentLibMata(libDir) {
     if (!isExistsMeta) {
         return null;
     }
+    console.log('meta path', metaPath);
     let meta = fs_extra_1.default.readJSONSync(metaPath);
     let [major] = ((_a = meta === null || meta === void 0 ? void 0 : meta.schemaVersion) === null || _a === void 0 ? void 0 : _a.split('.')) || [];
     const originComponentMetaMap = meta.components;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/lowcode-builder",
-  "version": "1.0.20",
+  "version": "1.0.21",
   "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": "^0.4.1",
-    "@cloudbase/lowcode-generator": "^1.0.6",
+    "@cloudbase/cals": "^0.4.2",
+    "@cloudbase/lowcode-generator": "^1.0.7",
     "axios": "^0.21.0",
     "browserfs": "^1.4.3",
     "browserify-zlib": "^0.2.0",

package/template/html/index.html.ejs

@@ -461,7 +461,7 @@
     ></script>
     <script
       crossorigin
-      src="https://qbase.cdn-go.cn/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.aa184d8a35d646df4cc0.bundle.js"
+      src="https://qbase.cdn-go.cn/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.51d9d452d9a709afe6a4.bundle.js"
     ></script>
   </body>
 </html>

package/template/mp/common/util.js

@@ -2,6 +2,7 @@
 import { findForItemsOfWidget, getWidget } from './widget'
 import { observable } from 'mobx';
 import { getAccessToken } from '../datasources/index'
+import { app } from '../app/weapps-api'
 
 /**
  * Convert abcWordSnd -> abc-word-snd
@@ -44,10 +45,10 @@ export function createEventHandlers(evtListeners, context) {
       listeners.forEach(async l => {
         let { data = {}, boundData = {} } = l
         data = { ...data }
-        for (const k in boundData) {
-          set(data, k, boundData[k].call(owner, owner, lists, itemsById, event, context))
-        }
         try {
+          for (const k in boundData) {
+            set(data, k, boundData[k].call(owner, owner, lists, itemsById, event, context))
+          }
           let res = await l.handler.call(owner, { event, lists, forItems: itemsById, data })
           let eventName = prefix && l.key ? `${prefix}$${l.key}_success` : ''
           self[eventName] && self[eventName]({
@@ -57,11 +58,16 @@ export function createEventHandlers(evtListeners, context) {
         } catch (e) {
           let eventName = l.key ? `${prefix}$${l.key}_fail` : ''
           if (self[eventName]) {
+            console.error(`事件响应失败`, e)
             await self[eventName]({
               ...event,
               detail: e
             })
           } else {
+            app.showToast({
+              icon: 'error',
+              title: `事件响应失败`
+            })
             throw e
           }