@cloudbase/lowcode-builder 1.8.10 → 1.8.12

package/lib/builder/mp/index.js

@@ -118,13 +118,13 @@ async function generateWxMp({ buildContext, weapps, plugins, deployOptions, opti
                 debug: buildContext.debugMode,
             },
             'common/data-patch.js': {},
-            'common/event-emitter.ts': {},
+            'common/event-emitter.js': {},
             'common/watch.js': {},
             'common/constant.js': {
                 REPEATER: JSON.stringify(config_1.REPEATER, undefined, 2),
             },
-            'common/query.ts': {},
-            'common/flow.ts': {},
+            'common/query.js': {},
+            'common/flow.js': {},
             'common/loading': {},
             /**
              * 调试用

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/lowcode-builder",
-  "version": "1.8.10",
+  "version": "1.8.12",
   "description": "云开发 Tencent CloudBase Framework Low Code Plugin，将低码配置生成完整项目并一键部署云开发资源。",
   "author": "yhsunshining@gmail.com",
   "homepage": "https://github.com/TencentCloudBase/cloudbase-framework#readme",
@@ -39,7 +39,7 @@
   },
   "dependencies": {
     "@cloudbase/cals": "^1.0.9",
-    "@cloudbase/lowcode-generator": "^1.8.1",
+    "@cloudbase/lowcode-generator": "^1.8.5",
     "axios": "^0.21.0",
     "browserfs": "^1.4.3",
     "browserify-zlib": "^0.2.0",

package/template/html/index.html.ejs

@@ -30,7 +30,7 @@
         reportAssetSpeed: true, // 静态资源测速
         spa: true,
         ext1: '<%=appId%>',
-        version: '0.0.1',
+        version: '0.0.2',
       });
       <% } else {%>
       const _aegis = new Aegis({
@@ -39,7 +39,7 @@
         reportAssetSpeed: false, // 静态资源测速
         spa: true,
         ext1: '<%=appId%>',
-        version: '0.0.1',
+        version: '0.0.2',
       });
       <% }%>
       window._aegis = _aegis;
@@ -551,7 +551,7 @@
       crossorigin
       src="<%=
       cdnEndpoints.cdngo
-      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.3df3008899037155a92c.bundle.js"
+      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.4e08e64803c057479d66.bundle.js"
     ></script>
   </body>
 </html>

package/template/mp/common/{event-emitter.ts → event-emitter.js}

@@ -43,37 +43,41 @@ export default class EventEmitter {
   }
 }
 
+// interface IEventProps {
+//   type: string;
+//   currentTarget: any;
+//   target?: any;
+//   detail?: any;
+//   _isCapturePhase?: boolean;
+//   origin?: Event;
+// }
+
 export class Event {
-  type: string;
-  detail: any;
+  type /* : string*/;
+  detail /* : any*/;
   /**
    * 类别应当为 typeof UserWidget
    * 当前类别为 typeof $page.widgets.xxxx
    * 添加上报确定用量
    */
-  currentTarget: any /* typeof UserWidget */;
-  target?: any /* typeof UserWidget */;
+  currentTarget /* : any */ /* typeof UserWidget */;
+  target /* ?: any */ /* typeof UserWidget */;
   /**
    * 内部实现
    * 外部不应该进行访问
    */
-  _isCapturePhase: boolean;
-  origin: Event;
-  constructor({
-    type = '',
-    detail = undefined,
-    currentTarget = undefined,
-    target = undefined,
-    _isCapturePhase = false,
-    origin,
-  }: {
-    type: string;
-    currentTarget: any;
-    target?: any;
-    detail?: any;
-    _isCapturePhase?: boolean;
-    origin?: Event;
-  }) {
+  _isCapturePhase; /* : boolean; */
+  origin /* : Event */;
+  constructor(
+    {
+      type = '',
+      detail = undefined,
+      currentTarget = undefined,
+      target = undefined,
+      _isCapturePhase = false,
+      origin,
+    } /* : IEventProps*/,
+  ) {
     function proxyWrapper(target, key) {
       try {
         return new Proxy(target, {

package/template/mp/common/{flow.ts → flow.js}

@@ -1,50 +1,19 @@
 import { createEventHandlers, getMpEventHandlerName } from './util';
 import { Event } from './event-emitter';
-type IGenerateContext = any;
-
-export interface IEventFlowContext extends IGenerateContext {
-  $page?: any;
-  $app?: any;
-  target?: any; // widget
-}
-
-interface IMPEventFlowGenerateOptions {
-  looseError?: boolean;
-  isComposite?: boolean;
-}
-
 export class EventFlow {
-  id: string;
-  description: string;
-  private _eventHandlerMap: Record<string, Function> = {};
-  private _context: IEventFlowContext;
-
-  constructor({
-    schema,
-    context,
-    options,
-  }: {
-    schema: {
-      id?: string;
-      description?: string;
-      /**
-       * 预处理后 event handler listeners
-       */
-      eventHandlers?: Record<string, any>;
-    };
-    context: IEventFlowContext;
-    options?: IMPEventFlowGenerateOptions;
-  }) {
+  constructor({ schema, context, options }) {
+    this._eventHandlerMap = {};
     this._context = context;
     const { id, description, eventHandlers = {} } = schema || {};
     this.id = id || '';
     this.description = description || '';
-
-    this._eventHandlerMap = Object.entries(createEventHandlers(eventHandlers, {
-      looseError: true,
-      isComposite: options?.isComposite || false,
-      syncCall: true
-    })).reduce(
+    this._eventHandlerMap = Object.entries(
+      createEventHandlers(eventHandlers, {
+        looseError: true,
+        isComposite: options?.isComposite || false,
+        syncCall: true,
+      }),
+    ).reduce(
       (map, [key, fn]) => {
         map[key] = fn;
         return map;
@@ -53,11 +22,9 @@ export class EventFlow {
         _getInstance: () => this._context.$page || this._context.$app,
       },
     );
-
     return this;
   }
-
-  trigger(additionalScope, options: Partial<IEventFlowContext> = {}) {
+  trigger(additionalScope, options = {}) {
     const mergedContext = {
       ...this._context,
       ...options,
@@ -87,14 +54,8 @@ export class EventFlow {
     // return emit(`${this.id}.start`, additionalScope);
   }
 }
-
-export function generateEventFlows(
-  flows: { id: string }[] = [],
-  context: IEventFlowContext,
-  options?: IMPEventFlowGenerateOptions,
-) {
+export function generateEventFlows(flows = [], context, options) {
   const result = {};
-
   for (let flow of flows) {
     result[flow.id] = new EventFlow({ schema: flow, context, options });
   }

package/template/mp/common/{query.ts → query.js}

@@ -1,59 +1,20 @@
-import { observable, IReactionDisposer, autorun, toJS } from 'mobx';
+import { observable, autorun, toJS } from 'mobx';
 import { createEventHandlers, getMpEventHandlerName, mergeDynamic2StaticData } from './util';
 import { Event } from './event-emitter';
 
-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
-   */
-  eventHandlers?: Record<string, any>;
-}
-interface IQueryContext {
-  $w: any,
-  $app?: any,
-  $page?: any
-};
-type IDataBind = any;
-interface IGenerateOptions {
-  looseError: boolean
-};
-
 export class Query {
-  private _schema: IMPDataSourceQuery;
-  private _context: IQueryContext;
-  private _disposes: IReactionDisposer[] = [];
-  private _dataBinds: Record<string, IDataBind> = {};
-  private _triggered = false;
-  private _action: any;
-  private _paramsRef: { current: any } = observable({ current: null });
-  private _currentRequestKey: any = null;
-  private _observableValue: { data: any; error: Error | null } = observable({ data: null, error: null });
-  private _eventHandlerMap: Record<string, Function> = {};
-  private _timer: any;
-
-  constructor({
-    schema,
-    context,
-    options = {},
-  }: {
-    schema: IMPDataSourceQuery;
-    context: IQueryContext;
-    options?: IGenerateOptions;
-  }) {
+  constructor({ schema, context, options = {} }) {
+    this._disposes = [];
+    this._dataBinds = {};
+    this._triggered = false;
+    this._paramsRef = observable({ current: null });
+    this._currentRequestKey = null;
+    this._observableValue = observable({ data: null, error: null });
+    this._eventHandlerMap = {};
     const { looseError = false } = options;
     const { $w } = context;
     this._schema = schema;
     this._context = context;
-
     if (this._schema?.trigger === 'auto') {
       this._disposes.push(
         autorun(
@@ -71,38 +32,29 @@ export class Query {
         ),
       );
     }
-
-    const baseParam: {
-      dataSourceName: string;
-      sqlTemplateId?: string;
-      methodName?: string;
-    } = {
+    const baseParam = {
       dataSourceName: this._schema.dataSourceName,
     };
-
     if (this._schema?.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(
       createEventHandlers(this._schema.eventHandlers || {}, {
         looseError: looseError,
         isComposite: false,
       }),
     ).reduce(
-      (map, [key, fn]: [string, any]) => {
+      (map, [key, fn]) => {
         // map[key] = fn.bind(this);
         map[key] = fn;
         return map;
@@ -111,7 +63,6 @@ export class Query {
         _getInstance: () => this._context.$page || this._context.$app,
       },
     );
-
     // this._emit = async (trigger, eventData, originalEvent?) =>
     //   generateEmit($w)(
     //     trigger,
@@ -131,41 +82,32 @@ export class Query {
     //     $w.page.id,
     //     true,
     //   );
-
     return this;
   }
-
-  get id(): string {
+  get id() {
     return this._schema?.id || '';
   }
-
-  get label(): string {
+  get label() {
     return this._schema?.label || '';
   }
-
-  get description(): string {
+  get description() {
     return this._schema?.description || '';
   }
-
   get data() {
     return this._observableValue.data;
   }
-
   get error() {
     return this._observableValue.error;
   }
-
-  async trigger(additionalScope?, options = {}) {
+  async trigger(additionalScope, options = {}) {
     this._triggered = true;
     return this._innerTrigger(this._resolveParams(), additionalScope, options);
   }
-
   reset() {
     this._observableValue.data = null;
     this._observableValue.error = null;
   }
-
-  async _innerTrigger(data, additionalScope?, options = {}) {
+  async _innerTrigger(data, additionalScope, options = {}) {
     this._currentRequestKey = Date.now();
     const key = this._currentRequestKey;
     try {
@@ -179,14 +121,13 @@ export class Query {
     } catch (e) {
       if (key === this._currentRequestKey) {
         this._observableValue.data = null;
-        this._observableValue.error = e as any;
+        this._observableValue.error = e;
         this._emit(`fail`, e);
       }
       throw e;
     }
   }
-
-  private _debounceTrigger(...args) {
+  _debounceTrigger(...args) {
     if (this._timer) {
       clearTimeout(this._timer);
     }
@@ -194,12 +135,10 @@ export class Query {
       this._innerTrigger(...args);
     }, 300);
   }
-
   destroy() {
     this._disposes.forEach((dispose) => dispose());
   }
-
-  private _resolveParams() {
+  _resolveParams() {
     /**
      * 这里万一其中某个字段计算失败
      * 好像会阻塞其他字段的计算
@@ -216,8 +155,7 @@ export class Query {
       // may be additional scope
     })?.params;
   }
-
-  private async _emit(eventName: string, data?: any) {
+  async _emit(eventName, data) {
     return this._eventHandlerMap[getMpEventHandlerName(this.id, eventName)]?.(
       new Event({
         type: eventName,
@@ -228,10 +166,8 @@ export class Query {
     );
   }
 }
-
-export function generateDatasetQuery(schema, context: IQueryContext, options: IGenerateOptions) {
+export function generateDatasetQuery(schema, context, options) {
   const result = {};
-
   for (const key in schema) {
     result[key] = new Query({ schema: schema[key], context, options });
   }

package/template/mp/common/util.js

@@ -6,7 +6,6 @@ import { getAccessToken, loginScope } from '../datasources/index';
 import { app } from '../app/weapps-api';
 export { generateDatasetQuery } from './query';
 export { generateEventFlows } from './flow';
-import { Event } from './event-emitter';
 
 /**
  * Convert abcWordSnd -> abc-word-snd