@cloudbase/lowcode-builder 1.6.5 → 1.7.0

package/lib/builder/h5/index.js

@@ -92,7 +92,7 @@ async function buildH5App({ buildContext, i18nConfig, extraData, cals, buildType
         const runHandleMaterialTag = '🚥  buildWebApp-runHandleMaterial';
         console.time(runHandleMaterialTag);
         // 精简只使用用到的组件库，并获取补齐json格式
-        const processedDependiencies = await (0, material_1.runHandleMaterial)(h5BuildDir, dependencies.filter((lib) => {
+        const processedDependencies = await (0, material_1.runHandleMaterial)(h5BuildDir, dependencies.filter((lib) => {
             // 注意需要包涵官方的(gsd)，部分平台方法需要由其补充
             return lib.name === config_1.OFFICIAL_LIB_KEY || !!allAppUsedComps[lib.name];
         }), materialsDir, runtime, ignoreInstall);
@@ -101,7 +101,7 @@ async function buildH5App({ buildContext, i18nConfig, extraData, cals, buildType
         const runGenerateTag = '🚥  buildWebApp-generateProjectFiles';
         console.time(runGenerateTag);
         await (0, generate_1.generateProjectFiles)({
-            dependencies: processedDependiencies,
+            dependencies: processedDependencies,
             cals,
             mainAppData,
             subAppDataList,
@@ -125,7 +125,7 @@ async function buildH5App({ buildContext, i18nConfig, extraData, cals, buildType
             mainAppData,
             subAppDataList,
             appBuildDir: h5BuildDir,
-            dependencies: processedDependiencies,
+            dependencies: processedDependencies,
             mode,
             devTool,
             ignoreInstall,

package/lib/builder/mp/mixMode.js

@@ -126,7 +126,7 @@ async function handleMixMode({ buildContext, apps = [], miniprogramRoot, plugins
             if (fs_extra_1.default.existsSync(packageJosnPath)) {
                 mergeDependencies = {
                     ...mergeDependencies,
-                    ...(await (0, mp_1.mergePackageDependiences)(mergeDependencies, await fs_extra_1.default.readJson(packageJosnPath))),
+                    ...(await (0, mp_1.mergePackageDependencies)(mergeDependencies, await fs_extra_1.default.readJson(packageJosnPath))),
                 };
                 modifiedPackageJosn = true;
             }
@@ -149,7 +149,7 @@ async function handleMixMode({ buildContext, apps = [], miniprogramRoot, plugins
         if (modifiedPackageJosn) {
             await (0, fs_extra_1.writeFile)(rootPackageJosnPath, JSON.stringify({
                 ...rootPackageJson,
-                ...(0, mp_1.mergePackageDependiences)(mergeDependencies, rootPackageJson), // 主包优先
+                ...(0, mp_1.mergePackageDependencies)(mergeDependencies, rootPackageJson), // 主包优先
             }, undefined, 2));
         }
     }

package/lib/builder/service/webpack.js

@@ -298,7 +298,7 @@ function getWebpackWebBuildParams(appId, appBuildDir, publicPath = '/', mode = c
             'process.env.buildType': `"${buildTypeList[0]}"`,
             ...extraDefine,
         },
-        devtool: ['app-nvzcvt10', 'app-msa2ihs9'].includes(appId)
+        devtool: ['app-nvzcvt10', 'app-msa2ihs9', 'app-PMoFiTuX'].includes(appId)
             ? 'source-map'
             : mode !== common_1.WebpackModeType.PRODUCTION
                 ? 'eval'

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

@@ -1,4 +1,4 @@
 export declare function mergeSubPackages(baseAppJsonPath: string, mergeAppJsonPath: string): Promise<void>;
 export declare function mergePackageJson(basePkgJsonPath: string, mergePkgJsonPath: string): Promise<void>;
-export declare function mergePackageDependiences(baseJson: any, mergeJson: any): any;
+export declare function mergePackageDependencies(baseJson: any, mergeJson: any): any;
 export declare function mergePages(baseAppJsonPath: string, mergeAppJsonPath: string): Promise<void>;

package/lib/builder/util/mp.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mergePages = exports.mergePackageDependiences = exports.mergePackageJson = exports.mergeSubPackages = void 0;
+exports.mergePages = exports.mergePackageDependencies = exports.mergePackageJson = exports.mergeSubPackages = void 0;
 /**
  * Tencent is pleased to support the open source community by making CloudBaseFramework - 云原生一体化部署工具 available.
  *
@@ -60,13 +60,13 @@ async function mergePackageJson(basePkgJsonPath, mergePkgJsonPath) {
         const mergeJson = fs.readJSONSync(mergePkgJsonPath);
         baseJson = {
             ...baseJson,
-            ...mergePackageDependiences(baseJson, mergeJson),
+            ...mergePackageDependencies(baseJson, mergeJson),
         };
         await fs.writeJSON(basePkgJsonPath, baseJson, { spaces: 2 });
     }
 }
 exports.mergePackageJson = mergePackageJson;
-function mergePackageDependiences(baseJson, mergeJson) {
+function mergePackageDependencies(baseJson, mergeJson) {
     baseJson.dependencies = {
         ...(baseJson.dependencies || {}),
         ...(mergeJson.dependencies || {}),
@@ -77,7 +77,7 @@ function mergePackageDependiences(baseJson, mergeJson) {
     };
     return baseJson;
 }
-exports.mergePackageDependiences = mergePackageDependiences;
+exports.mergePackageDependencies = mergePackageDependencies;
 async function mergePages(baseAppJsonPath, mergeAppJsonPath) {
     const baseJson = fs.readJSONSync(baseAppJsonPath);
     const mergeJson = fs.readJSONSync(mergeAppJsonPath);

package/lib/event-emitter.d.ts

@@ -0,0 +1,32 @@
+export default class EventEmitter {
+    constructor();
+    on(eventName: any, listener: any): void;
+    off(eventName: any, listener: any): void;
+    emit(eventName: any, ...args: any[]): void;
+    clear(): void;
+}
+export declare class Event {
+    type: string;
+    detail: any;
+    /**
+     * 类别应当为 typeof UserWidget
+     * 当前类别为 typeof $page.widgets.xxxx
+     * 添加上报确定用量
+     */
+    currentTarget: any;
+    target?: any;
+    /**
+     * 内部实现
+     * 外部不应该进行访问
+     */
+    _isCapturePhase: boolean;
+    origin: Event;
+    constructor({ type, detail, currentTarget, target, _isCapturePhase, origin, }: {
+        type: string;
+        currentTarget: any;
+        target?: any;
+        detail?: any;
+        _isCapturePhase?: boolean;
+        origin?: Event;
+    });
+}

package/lib/event-emitter.js

@@ -0,0 +1,88 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Event = void 0;
+function checkFunc(listener) {
+    if (!listener instanceof Function) {
+        throw new Error(' The listener argument must be of type Function. ');
+    }
+}
+class EventEmitter {
+    constructor() {
+        this.listeners = {};
+    }
+    on(eventName, listener) {
+        checkFunc(listener);
+        let listeners = this.listeners[eventName];
+        if (!listeners) {
+            this.listeners[eventName] = [listener];
+        }
+        else {
+            listeners.push(listener);
+        }
+    }
+    off(eventName, listener) {
+        let listeners = this.listeners[eventName];
+        if (listeners && listeners.length) {
+            const index = listeners.indexOf(listener);
+            index > -1 && listeners.splice(index, 1);
+        }
+    }
+    emit(eventName, ...args) {
+        let listeners = this.listeners[eventName] || [];
+        listeners.forEach((fn) => {
+            try {
+                fn.call(this, ...args);
+            }
+            catch (err) {
+                console.error(err);
+            }
+        });
+    }
+    clear() {
+        this.listeners = {};
+    }
+}
+exports.default = EventEmitter;
+class Event {
+    constructor({ type = '', detail = undefined, currentTarget = undefined, target = undefined, _isCapturePhase = false, origin, }) {
+        function proxyWrapper(target, key) {
+            try {
+                return new Proxy(target, {
+                    get(target, p) {
+                        if (p !== 'id') {
+                            // reportEvent(`event.${key}.${String(p)}`);
+                        }
+                        return target[p];
+                    },
+                });
+            }
+            catch (e) {
+                return target;
+            }
+        }
+        this.type = type;
+        this.detail = detail;
+        this.currentTarget = proxyWrapper(currentTarget, 'currentTarget');
+        this.target = proxyWrapper(target, 'target');
+        this.origin = proxyWrapper(origin, 'origin');
+        this._isCapturePhase = _isCapturePhase;
+        return new Proxy(this, {
+            get(target, prop) {
+                switch (prop) {
+                    case 'name': {
+                        console.warn('[deprecated] event.name 将在未来版本放弃支持，请使用 event.type 替代');
+                        return target.type;
+                    }
+                    case 'origin':
+                    case 'target':
+                    case 'currentTarget': {
+                        return target[prop];
+                        break;
+                    }
+                }
+                return target[prop];
+            },
+        });
+    }
+}
+exports.Event = Event;

package/lib/flow.d.ts

@@ -0,0 +1,30 @@
+declare type IGenerateContext = any;
+export interface IEventFlowContext extends IGenerateContext {
+    $w?: any;
+    target?: any;
+}
+interface IMPEventFlowGenerateOptions {
+    looseError?: boolean;
+    isComposite?: boolean;
+}
+export declare class EventFlow {
+    id: string;
+    description: string;
+    private _eventHandlerMap;
+    private _context;
+    constructor({ schema, context, options, }: {
+        schema: {
+            id?: string;
+            description?: string;
+            /**
+             * 预处理后 event handler listeners
+             */
+            listeners?: any[];
+        };
+        context: IEventFlowContext;
+        options?: IMPEventFlowGenerateOptions;
+    });
+    trigger(additionalScope: any, options?: Partial<IEventFlowContext>): any;
+}
+export declare function generateEventFlows(flows: never[] | undefined, context: IEventFlowContext, options?: IMPEventFlowGenerateOptions): {};
+export {};

package/lib/flow.js

@@ -0,0 +1,63 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateEventFlows = exports.EventFlow = void 0;
+const util_1 = require("./util");
+const event_emitter_1 = require("./event-emitter");
+class EventFlow {
+    constructor({ schema, context, options, }) {
+        this._eventHandlerMap = {};
+        this._context = context;
+        const { id, description, listeners = [] } = schema || {};
+        const startNode = listeners[0];
+        const [_, eventFlowId] = (startNode === null || startNode === void 0 ? void 0 : startNode.eventName.match(/(.*?)\.start/)) || [];
+        this.id = id || eventFlowId;
+        this.description = description || (startNode === null || startNode === void 0 ? void 0 : startNode.description) || '';
+        const handlers = (0, util_1.createEventHandlers)(listeners, {
+            looseError: (options === null || options === void 0 ? void 0 : options.looseError) || false,
+            isComposite: (options === null || options === void 0 ? void 0 : options.isComposite) || false,
+        });
+        this._eventHandlerMap = Object.entries(handlers).reduce((map, [key, fn]) => {
+            map[key] = fn.bind(this);
+            return map;
+        }, {
+            _getInstance: () => this._context.$page || this._context.$app,
+        });
+        return this;
+    }
+    trigger(additionalScope, options = {}) {
+        const mergedContext = {
+            ...this._context,
+            ...options,
+        };
+        const { $w, target } = mergedContext;
+        return this._eventHandlerMap[(0, util_1.getMpEventHandlerName)(this.id, 'start')](new event_emitter_1.Event({
+            type: `${this.id}.start`,
+            detail: additionalScope,
+            target,
+            currentTarget: target,
+        }));
+        // const emit = (trigger, eventData, originalEvent?) =>
+        //   generateEmit($w, target)(
+        //     trigger,
+        //     this._listenerInstances,
+        //     eventData,
+        //     forContext,
+        //     originalEvent,
+        //     scopeContext,
+        //     dataContext,
+        //     $w.page.id,
+        //     true,
+        //   );
+        // return emit(`${this.id}.start`, additionalScope);
+    }
+}
+exports.EventFlow = EventFlow;
+function generateEventFlows(flows = [], context, options) {
+    const result = {};
+    return result;
+    for (let flow of flows) {
+        result[flow.id] = new EventFlow({ schema: flow, context, options });
+    }
+    return result;
+}
+exports.generateEventFlows = generateEventFlows;

package/lib/query.d.ts

@@ -0,0 +1,47 @@
+interface IMPDataSourceQuery {
+    id: string;
+    label?: string;
+    description?: string;
+    trigger: 'auto' | 'manual';
+    type: 'model' | 'apis' | 'sql';
+    dataSourceName: string;
+    methodName: string;
+    data: object;
+    dataBinds: Record<string, Function>;
+    /**
+     * 预处理后 event handler listeners
+     */
+    listeners?: any[];
+}
+declare type IQueryContext = any;
+declare type IGenerateOptions = any;
+export declare class Query {
+    private _schema;
+    private _context;
+    private _disposes;
+    private _dataBinds;
+    private _triggered;
+    private _action;
+    private _paramsRef;
+    private _currentRequestKey;
+    private _observableValue;
+    private _eventHandlerMap;
+    constructor({ schema, context, options, }: {
+        schema: IMPDataSourceQuery;
+        context: IQueryContext;
+        options?: IGenerateOptions;
+    });
+    get id(): string;
+    get label(): string;
+    get description(): string;
+    get data(): any;
+    get error(): Error | null;
+    trigger(additionalScope?: any, options?: {}): Promise<any>;
+    _innerTrigger(data: any, additionalScope?: any, options?: {}): Promise<any>;
+    private _debounceTrigger;
+    destroy(): void;
+    private _resolveParams;
+    private _emit;
+}
+export declare function generateDatasetQuery(schema: any, context: IQueryContext, options: IGenerateOptions): {};
+export {};

package/lib/query.js

@@ -0,0 +1,175 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateDatasetQuery = exports.Query = void 0;
+const mobx_1 = require("mobx");
+const util_1 = require("./util");
+const event_emitter_1 = require("./event-emitter");
+class Query {
+    constructor({ schema, context, options, }) {
+        var _a, _b;
+        this._disposes = [];
+        this._dataBinds = {};
+        this._triggered = false;
+        this._paramsRef = (0, mobx_1.observable)({ current: null });
+        this._currentRequestKey = null;
+        this._observableValue = (0, mobx_1.observable)({ data: null, error: null });
+        this._eventHandlerMap = {};
+        this._debounceTrigger = (function () {
+            let timer = null;
+            return function (...args) {
+                if (timer) {
+                    clearTimeout(timer);
+                }
+                timer = setTimeout(() => {
+                    this._innerTrigger(...args);
+                }, 300);
+            };
+        })();
+        const { looseError = false, useScopeWidgetData = false } = options;
+        const { $w, $app, $page } = context;
+        this._schema = schema;
+        this._context = context;
+        if (((_a = this._schema) === null || _a === void 0 ? void 0 : _a.trigger) === 'auto') {
+            this._disposes.push((0, mobx_1.autorun)((r) => {
+                try {
+                    const data = this._resolveParams();
+                    if (this._triggered) {
+                        this._debounceTrigger(data);
+                    }
+                }
+                catch (e) {
+                    console.error(e);
+                }
+            }, { delay: 50 }));
+        }
+        const baseParam = {
+            dataSourceName: this._schema.dataSourceName,
+        };
+        if (((_b = this._schema) === null || _b === void 0 ? void 0 : _b.type) === 'sql') {
+            baseParam.sqlTemplateId = this._schema.methodName;
+        }
+        else {
+            baseParam.methodName = this._schema.methodName;
+        }
+        this._paramsRef.current = this._schema.data;
+        this._dataBinds = this._schema.dataBinds;
+        this._action = async (data) => {
+            return $w.cloud.callDataSource({
+                ...baseParam,
+                params: data,
+            });
+        };
+        this._eventHandlerMap = Object.entries((0, util_1.createEventHandlers)(this._schema.listeners || [], {
+            looseError: looseError,
+            isComposite: false,
+        })).reduce((map, [key, fn]) => {
+            map[key] = fn.bind(this);
+            return map;
+        }, {
+            _getInstance: () => this._context.$page || this._context.$app,
+        });
+        // this._emit = async (trigger, eventData, originalEvent?) =>
+        //   generateEmit($w)(
+        //     trigger,
+        //     generateListnerInstances(
+        //       {
+        //         $app,
+        //         $page,
+        //         actionsMap: (this._context as any).actionsMap,
+        //       },
+        //       this._schema.listeners || [],
+        //     ),
+        //     eventData,
+        //     {},
+        //     originalEvent,
+        //     {},
+        //     {},
+        //     $w.page.id,
+        //     true,
+        //   );
+        return this;
+    }
+    get id() {
+        var _a;
+        return ((_a = this._schema) === null || _a === void 0 ? void 0 : _a.id) || '';
+    }
+    get label() {
+        var _a;
+        return ((_a = this._schema) === null || _a === void 0 ? void 0 : _a.label) || '';
+    }
+    get description() {
+        var _a;
+        return ((_a = this._schema) === null || _a === void 0 ? void 0 : _a.description) || '';
+    }
+    get data() {
+        return this._observableValue.data;
+    }
+    get error() {
+        return this._observableValue.error;
+    }
+    async trigger(additionalScope, options = {}) {
+        this._triggered = true;
+        return this._innerTrigger(this._resolveParams(), additionalScope, options);
+    }
+    async _innerTrigger(data, additionalScope, options = {}) {
+        this._currentRequestKey = Date.now();
+        const key = this._currentRequestKey;
+        try {
+            const res = await this._action(data);
+            if (key === this._currentRequestKey) {
+                this._observableValue.data = res;
+                this._observableValue.error = null;
+                this._emit(`success`, res);
+            }
+            return res;
+        }
+        catch (e) {
+            if (key === this._currentRequestKey) {
+                this._observableValue.data = null;
+                this._observableValue.error = e;
+                this._emit(`fail`, e);
+            }
+            throw e;
+        }
+    }
+    destroy() {
+        this._disposes.forEach((dispose) => dispose());
+    }
+    _resolveParams() {
+        var _a;
+        /**
+         * 这里万一其中某个字段计算失败
+         * 好像会阻塞其他字段的计算
+         * 从而导致 autorun 没有添加依赖
+         */
+        return (_a = (0, util_1.mergeDynamic2StaticData)((0, mobx_1.toJS)(this._paramsRef.current), this._dataBinds, {
+            codeContext: {
+                /**
+                 * $page 或 $comp 实例
+                 */
+                instance: this._context.$page,
+            },
+            $w: this._context.$w,
+            // may be additional scope
+        })) === null || _a === void 0 ? void 0 : _a.params;
+    }
+    async _emit(eventName, data) {
+        var _a, _b;
+        return (_b = (_a = this._eventHandlerMap)[(0, util_1.getMpEventHandlerName)(this.id, eventName)]) === null || _b === void 0 ? void 0 : _b.call(_a, new event_emitter_1.Event({
+            type: eventName,
+            detail: data,
+            target: undefined,
+            currentTarget: undefined,
+        }));
+    }
+}
+exports.Query = Query;
+function generateDatasetQuery(schema, context, options) {
+    const result = {};
+    return result;
+    for (const key in schema) {
+        result[key] = new Query({ schema: schema[key], context, options });
+    }
+    return result;
+}
+exports.generateDatasetQuery = generateDatasetQuery;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/lowcode-builder",
-  "version": "1.6.5",
+  "version": "1.7.0",
   "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": "^1.0.3",
-    "@cloudbase/lowcode-generator": "^1.6.5",
+    "@cloudbase/cals": "^1.0.5",
+    "@cloudbase/lowcode-generator": "^1.7.1",
     "axios": "^0.21.0",
     "browserfs": "^1.4.3",
     "browserify-zlib": "^0.2.0",

package/template/html/index.html.ejs

@@ -9,7 +9,7 @@
       content="width=device-width,initial-scale=1.0,user-scalable=no<% if(!isBuildApp) {%>,viewport-fit=cover<%}%>"
     />
     <meta name="format-detection" content="telephone=no" />
-    <meta name="description" content="<%= desc %>" />
+    <!-- <meta name="description" content="<%= desc %>" /> -->
     <link
       rel="stylesheet"
       href="<%=
@@ -28,6 +28,7 @@
         reportAssetSpeed: true, // 静态资源测速
         spa: true,
         ext1: '<%=appId%>',
+        version: '0.0.1',
       });
       <% } else {%>
       const _aegis = new Aegis({
@@ -36,6 +37,7 @@
         reportAssetSpeed: false, // 静态资源测速
         spa: true,
         ext1: '<%=appId%>',
+        version: '0.0.1',
       });
       <% }%>
       window._aegis = _aegis;
@@ -547,7 +549,7 @@
       crossorigin
       src="<%=
       cdnEndpoints.cdngo
-      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.b13197aa3e72385a9cc9.bundle.js"
+      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.bd132ac7897700329255.bundle.js"
     ></script>
   </body>
 </html>

package/template/mp/common/util.js

@@ -85,7 +85,7 @@ export function createEventHandlers(
         const { id, __internal__ } = currentPageContext || {};
         if (pageId && id) {
           if (pageId !== id || (__internal__ && !__internal__.active)) {
-            console.error(`Action error: [${listener.trigger}:${listener.key}] 页面生命周期结束，链式调用中断`);
+            console.error(`Action error: [${name}] 页面生命周期结束，链式调用中断`);
             return false;
           }
         }
@@ -376,12 +376,13 @@ async function getAccessPermission(app, appId, pageId) {
   if (Array.isArray(res)) {
     const resourceInfo = res.find((i) => i.ResourceId === cacheKey);
     const isAccess = !!resourceInfo?.IsAccess;
-    _AUTH_CACHE_MAP[cacheKey] = isAccess;
 
-    return {
+    _AUTH_CACHE_MAP[cacheKey] = {
       isAccess,
       roleId: resourceInfo?.RoleId,
     };
+
+    return _AUTH_CACHE_MAP[cacheKey];
   } else {
     throw new Error(`鉴权接口返回参数不正确 - ${JSON.stringify(res)}`);
   }

package/template/webpack/web.prod.js

@@ -181,7 +181,7 @@ module.exports = function (options) {
         {
           test: /\.(js|jsx)$/,
           exclude:
-            /node_modules\/(?!(@cloudbase\/weda-ui)|(@tcwd\/vuera)|(@tcwd\/weapps-core)|(@react-spring))|gsd-kbone-react/,
+            /node_modules\/(?!(@cloudbase\/weda-ui)|(@tcwd\/vuera)|(@tcwd\/weapps-core)|(@react-spring)|(@react-hookz))|gsd-kbone-react/,
           use: ['happypack/loader?id=babel'],
         },
         {