@cloudbase/lowcode-builder 1.0.2 → 1.0.5

package/lib/builder/mp/index.js

@@ -182,10 +182,11 @@ async function generateWxMp({ weapps, projDir, appId, domain, materials, plugins
                 clientID: (_a = mainAppData.extra) === null || _a === void 0 ? void 0 : _a.clientId,
             },
             'datasources/datasource-profiles.js.tpl': {
-                datasourceProfiles: (0, util_3.JsonToStringWithVariableName)((0, lowcode_generator_1.getDatasourceProfiles)(weapps.reduce((datasources, app) => {
-                    datasources.push(...(app.datasources || []));
-                    return datasources;
-                }, [])), { EOL: false }),
+                datasourceProfiles: (0, util_3.JsonToStringWithVariableName)((0, lowcode_generator_1.getDatasourceProfiles)(
+                /**
+                 * 精简文件生成，新 cloud-sdk 不依赖 profile 了
+                 */
+                []), { EOL: false }),
             },
             'datasources/dataset-profiles.js.tpl': {
                 datasetProfiles: (0, util_3.JsonToStringWithVariableName)((0, lowcode_generator_1.getDatasetProfiles)(mainAppData, weapps), { EOL: true }),

package/lib/builder/mp/util.js

@@ -6,6 +6,7 @@ const weapp_1 = require("@cloudbase/lowcode-generator/lib/generator/util/weapp")
 const wxml_1 = require("./wxml");
 const mp_1 = require("@cloudbase/lowcode-generator/lib/generator/config/mp");
 function extractWidgetProps(props, compInfo) {
+    var _a, _b;
     const { classList } = props;
     const staticProps = {
         style: (0, weapps_core_1.toCssStyle)(props.commonStyle, {
@@ -16,6 +17,9 @@ function extractWidgetProps(props, compInfo) {
     };
     const { data = {} } = props;
     Object.assign(staticProps, generatedDynamicData(data, compInfo).staticProps);
+    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;
 }
 exports.extractWidgetProps = extractWidgetProps;
@@ -120,7 +124,7 @@ function createWidgetProps(widgets, ctx) {
         widgetProps[id] = extractWidgetProps(xProps, widegetComp);
         widgetProps[id]._parentId = parentId;
         widgetProps[id]._order = widget.xIndex;
-        widgetProps[id].widgetType = xComponent.moduleName + ':' + xComponent.name;
+        widgetProps[id].widgetType = `${xComponent.moduleName}:${xComponent.name}`;
     });
     return widgetProps;
 }

package/lib/builder/mp/wxml.js

@@ -52,7 +52,7 @@ function generateWxml(widgets, docTag, wxmlDataPrefix, ctx, usingComponents, com
         ];
     }
     function createXml(widgets, parent = null, parentForNodes = []) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f;
         const elements = [];
         for (const id of Object.keys(widgets !== null && widgets !== void 0 ? widgets : {})) {
             const { xComponent, xProps, properties, xIndex, genericComp } = widgets[id];
@@ -151,7 +151,7 @@ function generateWxml(widgets, docTag, wxmlDataPrefix, ctx, usingComponents, com
                     .map((forNodeId) => `[${wxmlDataPrefix.forIndex}${forNodeId}]`)
                     .join('')}`);
                 node.attributes['wx:for-index'] = wxmlDataPrefix.forIndex + id;
-                node.attributes['wx:key'] = 'id';
+                node.attributes['wx:key'] = ((_f = directives.waForKey) === null || _f === void 0 ? void 0 : _f.value) ? '_key' : '$$i';
             }
             const compSchema = componentProto.dataForm;
             for (const prop of Object.keys(data || {})) {

package/lib/builder/service/webpack.js

@@ -290,11 +290,7 @@ function getWebpackWebBuildParams(appId, appBuildDir, publicPath = '/', mode = c
             '@zxing/library': 'window.ZXing',
             '@cloudbase/lowcode-render': 'window["weda-render"]',
         },
-        resolveModules: [
-            // path.resolve(appBuildDir, 'node_modules'),
-            path_1.default.resolve(appBuildDir),
-            'node_modules',
-        ],
+        resolveModules: [path_1.default.resolve(appBuildDir), 'node_modules'],
         definePlugin: {
             'process.env.buildType': `"${buildTypeList[0]}"`,
             'process.env.isApp': buildTypeList.includes(common_1.BuildType.APP),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/lowcode-builder",
-  "version": "1.0.2",
+  "version": "1.0.5",
   "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.3.31",
-    "@cloudbase/lowcode-generator": "^1.0.1",
+    "@cloudbase/cals": "^0.3.34",
+    "@cloudbase/lowcode-generator": "^1.0.2",
     "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.6096c46cbcf1ae46ae72.bundle.js"
+      src="https://qbase.cdn-go.cn/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.e2916ad4121fca1c0f08.bundle.js"
     ></script>
   </body>
 </html>

package/template/mp/app.js

@@ -52,7 +52,7 @@ setConfig({
           icon: 'error',
         });
       }
-      console.error('beforeCallFunction error', e);
+      // console.error('beforeCallFunction error', e);
     }
     return params;
   },

package/template/mp/common/widget.js

@@ -1,46 +1,104 @@
-import { observable, autorun, untracked } from 'mobx'
-import { styleToCss } from './style'
-import { getDeep } from './util'
-import { compLowcodes, create$comp } from './weapp-component'
-import EventEmitter from './event-emitter'
+import { observable, autorun, untracked } from 'mobx';
+import { styleToCss } from './style';
+import { getDeep } from './util';
+import { compLowcodes, create$comp } from './weapp-component';
+import EventEmitter from './event-emitter';
+import lodashSet from 'lodash.set';
+
+function basePullAt(array, indexes) {
+  let length = array ? indexes.length : 0;
+  let lastIndex = length - 1;
+
+  // eslint-disable-next-line no-plusplus
+  while (length--) {
+    let index = indexes[length];
+    let previous;
+    if (length == lastIndex || index !== previous) {
+      previous = index;
+      Array.prototype.splice.call(array, index, 1);
+    }
+  }
+  return array;
+}
+
+function remove(array, predicate) {
+  const result = [];
+  if (!(array != null && array.length)) {
+    return result;
+  }
+  let index = -1;
+  const indexes = [];
+  const { length } = array;
+
+  while (++index < length) {
+    const value = array[index];
+    if (predicate(value, index, array)) {
+      result.push(value);
+      indexes.push(index);
+    }
+  }
+  basePullAt(array, indexes);
+  return result;
+}
 
 /**
  * convert widget prop to data for wxml
  * @param {*} props
  */
 function resolveWidgetProp(props) {
-  let { classList = [] } = props
-  const data = {}
-  Object.keys(props).forEach(key => {
+  let { classList = [] } = props;
+  const data = {};
+  Object.keys(props).forEach((key) => {
     if (props[key] instanceof Function || props[key] === undefined) {
-      return
+      return;
     }
-    data[key] = props[key]
-  })
-  data.style = styleToCss(props.style)
-  data.className = classList.join ? classList.join(' ') : classList
-  const extraProps = ['classList', '_forItems', '_disposers', 'children', 'parent', '_parentId', 'id', '_order', 'widgetType', '$comp']
-  extraProps.map(prop => {
-    delete data[prop]
-  })
-  return data
+    data[key] = props[key];
+  });
+  data.style = styleToCss(props.style);
+  data.className = classList.join ? classList.join(' ') : classList;
+  const extraProps = [
+    'classList',
+    '_forItems',
+    '_disposers',
+    'children',
+    'parent',
+    '_parentId',
+    'id',
+    '_order',
+    'widgetType',
+    '$comp',
+  ];
+  extraProps.map((prop) => {
+    delete data[prop];
+  });
+  return data;
 }
 
 // widget prop -> wxml data
 export function resolveWidgetData(props) {
   if (!Array.isArray(props)) {
-    return resolveWidgetProp(props)
+    return resolveWidgetProp(props);
   }
-  return props.map(resolveWidgetData)
+  return props.map(resolveWidgetData);
 }
 
-
 export function createWidgets(widgetProps, dataBinds, widgetHolder, context, ownerMpInst) {
-  const rootNode = createWidgetDataTree(widgetProps, dataBinds)
-  const failedBinds = []
-  const result = createSubWidgetTree(rootNode, widgetProps, dataBinds, ownerMpInst, widgetHolder, 0, {}, null, failedBinds, undefined, context)
-  retryFailedBinds(failedBinds, true)
-  return result
+  const rootNode = createWidgetDataTree(widgetProps, dataBinds);
+  const failedBinds = [];
+  const result = createSubWidgetTree(
+    rootNode,
+    widgetProps,
+    dataBinds,
+    ownerMpInst,
+    widgetHolder,
+    {},
+    null,
+    failedBinds,
+    undefined,
+    context,
+  );
+  retryFailedBinds(failedBinds, true);
+  return result;
 }
 
 /**
@@ -49,66 +107,101 @@ export function createWidgets(widgetProps, dataBinds, widgetHolder, context, own
  * @param curForNode a component node or a virtual root tree node
  * @returns {widgets: {id1:[], id2}, rootWidget: {children: [], _disposers: [], ...otherProps}}
  */
-function createSubWidgetTree(curForNode, widgetProps, dataBinds, ownerMpInst, widgetHolder = {},
-  index = 0, forItems = {}, ownerForWidgetHolder = null,
-  failedBinds = [], defaultParent = { children: observable([]), _disposers: [] }, context) {
-  const indexPostfix = (forItems.lists || []).slice().reverse().map(list => idSeparator + list.currentIndex).join('')
+function createSubWidgetTree(
+  curForNode,
+  widgetProps,
+  dataBinds,
+  ownerMpInst,
+  widgetHolder = {},
+  forItems = {},
+  ownerForWidgetHolder = null,
+  failedBinds = [],
+  defaultParent = { children: observable([]), _disposers: [] },
+  context,
+) {
+  const indexPostfix = (forItems.lists || [])
+    .slice()
+    .reverse()
+    .map((list) => idSeparator + list.currentIndex)
+    .join('');
 
   // traverse down the tree to set up all widgets
-  dfsTree(curForNode, (node) => {
-    const parentForWidgetArr = ownerForWidgetHolder && ownerForWidgetHolder[node.id] || []
-    const existedWidget = index < parentForWidgetArr.length ? parentForWidgetArr[index] : null  // try to reuse previous node when rerun for
+  dfsTree(curForNode, (node, parentNode, cache) => {
+    const parentForWidgetArr = ownerForWidgetHolder?.[node.id] || [];
+    const { _waForKey } = node.value;
+    const key = forItems.itemsById?.[node.id]?.[_waForKey];
+    const index = cache[parentNode?.id]
+      ? cache[parentNode.id].index
+      : parentForWidgetArr.findIndex((widget) => key && widget._key === key);
+    const existedWidget = index !== -1 ? parentForWidgetArr[index] : null; // try to reuse previous node when rerun for
+
+    if (existedWidget) {
+      cache[node.id] = {
+        index,
+      };
+    }
 
-    if (node.forCount === curForNode.forCount) { // Leaf node
-      let w = existedWidget
+    if (node.forCount === curForNode.forCount) {
+      // Leaf node
+      let w = existedWidget;
       if (!existedWidget) {
-        const parentNode = node.parent
-        let parentWidget = null
+        const parentNode = node.parent;
+        let parentWidget = null;
         if (parentNode) {
-          parentWidget = widgetHolder[parentNode.id] || ownerForWidgetHolder[parentNode.id]
+          parentWidget = widgetHolder[parentNode.id] || ownerForWidgetHolder[parentNode.id];
         }
-        w = createAWidget(widgetProps[node.id], node.id + indexPostfix, parentWidget, ownerMpInst)
+        w = createAWidget(widgetProps[node.id], node.id + indexPostfix, parentWidget, ownerMpInst);
+        w._key = key;
         if (!parentWidget) {
-          defaultParent.children.push(w)
+          defaultParent.children.push(w);
         }
-        parentForWidgetArr.push(w)
+        parentForWidgetArr.push(w);
       } else {
-        disposeWidget(existedWidget, true)
+        disposeWidget(existedWidget, true);
       }
-      setUpWidgetDataBinds(w, dataBinds[node.id], forItems, failedBinds, ownerMpInst.getWeAppInst(), context)
-      widgetHolder[node.id] = w
+      setUpWidgetDataBinds(w, dataBinds[node.id], forItems, failedBinds, ownerMpInst.getWeAppInst(), context);
+      widgetHolder[node.id] = w;
     } else if (!existedWidget) {
-      const len = parentForWidgetArr.push(observable([]))
-      widgetHolder[node.id] = parentForWidgetArr[len - 1]
+      const len = parentForWidgetArr.push(observable([]));
+      widgetHolder[node.id] = parentForWidgetArr[len - 1];
     } else {
       // Reuse existed for widget array
-      widgetHolder[node.id] = existedWidget
+      widgetHolder[node.id] = existedWidget;
     }
-  })
+  });
 
   // run for of next level
   dfsTree(curForNode, (node) => {
     if (node.forCount === curForNode.forCount + 1 && dataBinds[node.id] && dataBinds[node.id]._waFor) {
       // find the node bound with next level for
-      const parent = node.parent ? widgetHolder[node.parent.id] : defaultParent
-      const dispose = runFor(node, widgetProps, dataBinds, ownerMpInst, forItems, widgetHolder, failedBinds, parent, context)
-      parent._disposers.push(dispose)  // Add the for bind dispose to the parent node of forNode
+      const parent = node.parent ? widgetHolder[node.parent.id] : defaultParent;
+      const dispose = runFor(
+        node,
+        widgetProps,
+        dataBinds,
+        ownerMpInst,
+        forItems,
+        widgetHolder,
+        failedBinds,
+        parent,
+        context,
+      );
+      parent._disposers.push(dispose); // Add the for bind dispose to the parent node of forNode
     }
-  })
+  });
 
-  retryFailedBinds(failedBinds)
+  retryFailedBinds(failedBinds);
 
-  return { widgets: widgetHolder, rootWidget: widgetHolder[curForNode.id] || defaultParent }
+  return { widgets: widgetHolder, rootWidget: widgetHolder[curForNode.id] || defaultParent };
 }
 
 // Retry failed databinds
 function retryFailedBinds(failedBinds, finalTry) {
-  const len = failedBinds.length
+  const len = failedBinds.length;
   for (let i = 0; i < len; i++) {
-    const setUpDataBind = failedBinds.shift()
-    setUpDataBind(finalTry)
+    const setUpDataBind = failedBinds.shift();
+    setUpDataBind(finalTry);
   }
-
 }
 
 /**
@@ -119,280 +212,360 @@ function retryFailedBinds(failedBinds, finalTry) {
  * @param {*} parentWidget
  * @returns top level widgets or for dispose
  */
-function runFor(curForNode, widgetProps, dataBinds, ownerMpInst, forItems, ownerForWidgetHolder, failedBinds, defaultParent, context) {
-  const nodeId = curForNode.id
+const _FOR_ERROR_CACHE_MAP = {};
+function runFor(
+  curForNode,
+  widgetProps,
+  dataBinds,
+  ownerMpInst,
+  forItems,
+  ownerForWidgetHolder,
+  failedBinds,
+  defaultParent,
+  context,
+) {
+  const nodeId = curForNode.id;
+  const { _waForKey } = curForNode.value;
+
   const dispose = autorun(() => {
-    let forList = []
+    let forList = [];
     try {
-      forList = dataBinds[nodeId]._waFor.call(ownerMpInst.getWeAppInst(), ownerMpInst.getWeAppInst(), forItems.lists, forItems.itemsById, undefined, context)
+      clearTimeout(_FOR_ERROR_CACHE_MAP[nodeId]);
+      forList = dataBinds[nodeId]._waFor.call(
+        ownerMpInst.getWeAppInst(),
+        ownerMpInst.getWeAppInst(),
+        forItems.lists,
+        forItems.itemsById,
+        undefined,
+        context,
+      );
       if (!Array.isArray(forList)) {
-        forList = []
+        forList = [];
       }
     } catch (e) {
-      forList = []
-      console.warn('For binding error', e)
+      forList = [];
+      _FOR_ERROR_CACHE_MAP[nodeId] = setTimeout(() => {
+        console.warn('For binding error', nodeId, e);
+      }, 1000);
     }
 
     // Track list change (e.g. push)
-    forList.forEach(e => { })
+    forList.forEach((e) => {});
 
     untracked(() => {
       // dispose widgets before reused instead
       // disposeWidgets(parentForWidgets[curForNode.id])
+      const exsitMap = forList.reduce((map, item) => {
+        if (item[_waForKey]) {
+          map[item[_waForKey]] = true;
+        }
+        return map;
+      }, {});
+      const forWidgets = ownerForWidgetHolder[nodeId];
+      const existedWidgetIndex = [];
+      const extraWidgetsIndex = [];
+      const extraWidgets = [];
+      forWidgets.forEach((widget, index) => {
+        if (exsitMap[widget._key]) {
+          existedWidgetIndex.push(index);
+          // need to use uqique key
+          exsitMap[widget._key] = undefined;
+        } else {
+          extraWidgetsIndex.push(index);
+        }
+      });
+      const extraWidgetsIndexMap = extraWidgetsIndex.reduce((map, item) => {
+        map[item] = true;
+        extraWidgets.push(forWidgets[item]);
+        return map;
+      }, {});
 
       // clean extra widgets of previous for run
       dfsTree(curForNode, (node) => {
-        const arr = ownerForWidgetHolder[node.id]
-        const extraWidgets = arr.splice(forList.length, arr.length)
-        //console.log('@@ delete widgets', node.id, extraWidgets)
-
-        if (node.id === curForNode.id) {  // clean the root widget.children only(recursive)
-          extraWidgets.map(w => {
-            disposeWidget(w)
-            const { children } = w.parent || defaultParent
-            children.remove(w)
-            // w.parent = null
-          })
-        }
-      })
+        const arr = ownerForWidgetHolder[node.id];
+        remove(arr, (_, index) => {
+          return extraWidgetsIndexMap[index];
+        });
+      });
+
+      // 清理根 for 的 autorun, 并递归清理子节点
+      extraWidgets.map((w) => {
+        disposeWidget(w);
+        const { children } = w.parent || defaultParent;
+        children.remove(w);
+        // w.parent = null
+      });
 
       forList.forEach((item, index) => {
-        let { lists = [], itemsById = {}, } = forItems
+        let { lists = [], itemsById = {} } = forItems;
         const _forItems = {
           lists: [{ currentItem: item, currentIndex: index }, ...lists],
-          itemsById: { ...itemsById, [nodeId]: item },
-        }
-        const { rootWidget } = createSubWidgetTree(curForNode, widgetProps, dataBinds, ownerMpInst, {}, index, _forItems, ownerForWidgetHolder, failedBinds, defaultParent, context)
-        rootWidget._forItems = _forItems
-      })
-    })
-  })
-
-  return dispose
+          itemsById: { ...itemsById, [nodeId]: item, index: { ...itemsById?.index, [nodeId]: index } },
+        };
+        const { rootWidget } = createSubWidgetTree(
+          curForNode,
+          widgetProps,
+          dataBinds,
+          ownerMpInst,
+          {},
+          _forItems,
+          ownerForWidgetHolder,
+          failedBinds,
+          defaultParent,
+          context,
+        );
+        rootWidget._forItems = _forItems;
+      });
+    });
+  });
+
+  return dispose;
 }
 
 function createAWidget(props, id, parent, ownerMpInst) {
-
-  const w = observable(props)
+  const w = observable(props);
 
   // Builtin props
-  Object.defineProperty(w, 'id', { value: id })
-  const { widgetType } = w
-  delete w.widgetType
-  Object.defineProperty(w, 'widgetType', { value: widgetType })
-
-  //w._disposers = []
-  //w.children = []
-  Object.defineProperty(w, 'children', { value: observable([]) })
-  Object.defineProperty(w, '_disposers', { value: observable([]) })
-  Object.defineProperty(w, '_eventListeners', {value: new EventEmitter()})
+  Object.defineProperty(w, 'id', { value: id });
+  const { widgetType } = w;
+  delete w.widgetType;
+  Object.defineProperty(w, 'widgetType', { value: widgetType });
+
+  // w._disposers = []
+  // w.children = []
+  Object.defineProperty(w, 'children', { value: observable([]) });
+  Object.defineProperty(w, '_disposers', { value: observable([]) });
+  Object.defineProperty(w, '_eventListeners', { value: new EventEmitter() });
   if (parent) {
-    //w.parent = parent
-    Object.defineProperty(w, 'parent', { value: parent })
-    parent.children.push(w)
+    // w.parent = parent
+    Object.defineProperty(w, 'parent', { value: parent });
+    parent.children.push(w);
   }
-  delete w._parentId
+  delete w._parentId;
 
-  Object.defineProperty(w, '$comp', { value: create$comp(w) })
-  mountBuiltinWigetsAPI(w, ownerMpInst)
-  return w
+  Object.defineProperty(w, '$comp', { value: create$comp(w) });
+  mountBuiltinWigetsAPI(w, ownerMpInst);
+  return w;
 }
 
 function setUpWidgetDataBinds(w, dataBinds, forItems, failedBinds, ctx, context) {
-  Object.keys(dataBinds || {}).map(prop => {
-    if (prop === '_waFor') { return }
-    const setUpDataBind = (isFinalTry) => {
-      let firstRunError = null
-      let ran = false
-      const dispose = autorun((reaction) => {
-        try {
-          // Computed data bind in the next tick since data bind may read widgets data
-          w[prop] = dataBinds[prop].call(ctx,ctx,forItems.lists, forItems.itemsById, undefined, context)
-        } catch (e) {
-          if (prop === '_waIf') {
-            w[prop] = false
-          }
-
-          if(isFinalTry || ran){
-            console.warn(`Error computing data bind ${w.id}.${prop}`, e)
-          } else {
-            reaction.dispose()
-            failedBinds.push(setUpDataBind)
+  Object.keys(dataBinds || {})
+    .sort((a, b) => {
+      return a.length - b.length > 0 ? 1 : -1;
+    })
+    .map((prop) => {
+      if (prop === '_waFor') {
+        return;
+      }
+      let timer = null;
+      const setUpDataBind = (isFinalTry) => {
+        let ran = false;
+        const dispose = autorun((reaction) => {
+          try {
+            clearTimeout(timer);
+            // Computed data bind in the next tick since data bind may read widgets data
+            const value = dataBinds[prop].call(ctx, ctx, forItems.lists, forItems.itemsById, undefined, context);
+            const paths = prop.split('.').filter((key) => !!key);
+            if (paths.length > 1) {
+              // 一定要 untracked 不然爆栈了
+              untracked(() => lodashSet(w, prop, value));
+            } else {
+              // 普通 key 直接赋值
+              w[prop] = value;
+            }
+          } catch (e) {
+            if (prop === '_waIf') {
+              w[prop] = false;
+            }
+
+            if (isFinalTry || ran) {
+              timer = setTimeout(() => {
+                console.warn(`Error computing data bind ${w.id}.${prop}`, e);
+              }, 1000);
+            } else {
+              reaction.dispose();
+              failedBinds.push(setUpDataBind);
+            }
+
+            ran = true;
           }
-
-          ran = true
-        }
-      })
-      w._disposers.push(dispose)
-    }
-    setUpDataBind()
-  })
+        });
+        w._disposers.push(dispose);
+      };
+      setUpDataBind();
+    });
 }
 
 export function findForItemsOfWidget(widget) {
-  const forItems = widget._forItems
-  if (forItems) return forItems
-  if (widget.parent) return findForItemsOfWidget(widget.parent)
+  const forItems = widget._forItems;
+  if (forItems) return forItems;
+  if (widget.parent) return findForItemsOfWidget(widget.parent);
 }
 
-const idSeparator = '-'
+const idSeparator = '-';
 
 export function getWidget(widgets, id) {
-  return getDeep(widgets, id, idSeparator)
+  return getDeep(widgets, id, idSeparator);
 }
 
 /**
  * Add parent, children to widget
  */
 function createWidgetDataTree(widgets, dataBinds) {
-  const virtualRoot = { children: [], forCount: 0 }
+  const virtualRoot = { children: [], forCount: 0 };
   const nodes = Object.keys(widgets).reduce((result, id) => {
-    const w = widgets[id]
-    result[id] = { id, value: w, _order: w._order, children: [], parent: null, forCount: 0 }
-    return result
-  }, {})
+    const w = widgets[id];
+    result[id] = { id, value: w, _order: w._order, children: [], parent: null, forCount: 0 };
+    return result;
+  }, {});
 
   // Create widgets tree API
-  Object.keys(nodes).map(id => {
-    const curNode = nodes[id]
-    const parent = nodes[widgets[id]._parentId]
-    //delete widgets[id]._parentId
+  Object.keys(nodes).map((id) => {
+    const curNode = nodes[id];
+    const parent = nodes[widgets[id]._parentId];
+    // delete widgets[id]._parentId
     if (!parent) {
-      virtualRoot.children.push(curNode)
-      return
+      virtualRoot.children.push(curNode);
+      return;
     }
-    curNode.parent = parent
-    parent.children.push(curNode)
-  })
+    curNode.parent = parent;
+    parent.children.push(curNode);
+  });
 
   // Sort children
-  Object.keys(nodes).map(id => {
-    nodes[id].children.sort((a, b) => a._order - b._order)
-  })
+  Object.keys(nodes).map((id) => {
+    nodes[id].children.sort((a, b) => a._order - b._order);
+  });
 
-  virtualRoot.children.map(addForCount)
+  virtualRoot.children.map(addForCount);
 
   // dfs, add forCount
   function addForCount(node) {
     if (node.parent) {
-      node.forCount = node.parent.forCount
+      node.forCount = node.parent.forCount;
     }
-    if (dataBinds[node.id] && dataBinds[node.id]._waFor) {
-      node.forCount++
+    if (dataBinds[node.id]?._waFor) {
+      node.forCount++;
     }
-    node.children.map(addForCount)
+    node.children.map(addForCount);
   }
 
-  return virtualRoot
+  return virtualRoot;
 }
 
-function dfsTree(node, fn, parent) {
-  node.value && fn(node, parent)
-  node.children.map(e => dfsTree(e, fn, node.value ? node : null))
+function dfsTree(node, fn, parent, cache = {}) {
+  node.value && fn(node, parent, cache);
+  node.children.map((e) => dfsTree(e, fn, node.value ? node : null, cache));
 }
 
 // dispose autorun, widget can be the virtual root widget
 export function disposeWidget(widget, noRecursive) {
-  const disposers = widget._disposers
-  disposers.map(dispose => dispose())
-  disposers.splice(0, disposers.length)
-  !noRecursive && widget.children.forEach(w => disposeWidget(w))
+  const disposers = widget._disposers;
+  disposers.map((dispose) => dispose());
+  disposers.splice(0, disposers.length);
+  !noRecursive && widget.children.forEach((w) => disposeWidget(w));
 }
 
 export function createInitData(widgets, dataBinds, keyPrefix = '') {
   return Object.keys(widgets).reduce((result, id) => {
     if (!isWidgetInFor(id, widgets, dataBinds)) {
-      result[keyPrefix + id] = resolveWidgetData(widgets[id])
+      result[keyPrefix + id] = resolveWidgetData(widgets[id]);
     } else {
-      result[keyPrefix + id] = []
+      result[keyPrefix + id] = [];
     }
-    return result
-  }, {})
+    return result;
+  }, {});
 }
 
 function isWidgetInFor(id, widgets, dataBinds) {
-  let curNode = widgets[id]
-  let nodeId = id
+  let curNode = widgets[id];
+  let nodeId = id;
   while (curNode) {
-    if (dataBinds[nodeId] && dataBinds[nodeId]._waFor) {
-      return true
+    if (dataBinds[nodeId]?._waFor) {
+      return true;
     }
-    nodeId = curNode._parentId
-    curNode = widgets[nodeId]
+    nodeId = curNode._parentId;
+    curNode = widgets[nodeId];
   }
 }
 
 function mountBuiltinWigetsAPI(widget, owner) {
   // #1 builtin APIs
   widget.findWidgets = function (filter, includeInvisibleDescendants) {
-    let { children = [] } = this
-    if (!includeInvisibleDescendants) { // include visible widgets only by default
-      children = children.filter(e => e._waIf !== false)
+    let { children = [] } = this;
+    if (!includeInvisibleDescendants) {
+      // include visible widgets only by default
+      children = children.filter((e) => e._waIf !== false);
     }
-    const matched = []
-    children.forEach(w => {
+    const matched = [];
+    children.forEach((w) => {
       if (filter(w)) {
-        matched.push(w)
+        matched.push(w);
       }
-      matched.push(...w.findWidgets(filter, includeInvisibleDescendants))
-    })
-    return matched
-  }
+      matched.push(...w.findWidgets(filter, includeInvisibleDescendants));
+    });
+    return matched;
+  };
 
   widget.getWidgetsByType = function (type, includeInvisibleDescendants) {
-    return this.findWidgets(w => w.widgetType === type, includeInvisibleDescendants)
-  }
+    return this.findWidgets((w) => w.widgetType === type, includeInvisibleDescendants);
+  };
 
   /**
    * Similar to selectOwnerComponent of WX MP: https://developers.weixin.qq.com/miniprogram/dev/reference/api/Component.html
    */
   widget.getOwnerWidget = function () {
-    return owner && owner.getWeAppInst().node
-  }
+    return owner?.getWeAppInst?.()?.node;
+  };
 
   // Will be overwritten by composited component
   widget.getDom = function (fields) {
     return new Promise((resolve, reject) => {
-      const query = (owner || wx).createSelectorQuery()
-      query.select('#' + this.id).fields(fields, res => {
-        resolve(res)
-      }).exec()
-    })
-  }
-
-  widget.on = function(type,listener){
-    this._eventListeners.on(type,listener)
-  }
-
-  widget.off = function(type,listener){
-    this._eventListeners.off(type,listener)
-  }
-
-  widget.getConfig = () => ({})
-
-  const lowcode = compLowcodes[widget.widgetType]
+      const query = (owner || wx).createSelectorQuery();
+      query
+        .select(`#${this.id}`)
+        .fields(fields, (res) => {
+          resolve(res);
+        })
+        .exec();
+    });
+  };
+
+  widget.on = function (type, listener) {
+    this._eventListeners.on(type, listener);
+  };
+
+  widget.off = function (type, listener) {
+    this._eventListeners.off(type, listener);
+  };
+
+  widget.getConfig = () => ({});
+
+  const lowcode = compLowcodes[widget.widgetType];
   if (lowcode) {
-    const { index = {}, config } = lowcode
-    const builtinProps = Object.keys(widget.$comp)
+    const { index = {}, config } = lowcode;
+    const builtinProps = Object.keys(widget.$comp);
 
-    widget.getConfig = () => config
+    widget.getConfig = () => config;
 
     // #2 User defined APIs
-    const { publicMethods = {} } = index
-    Object.keys(publicMethods).map(name => {
-      if (builtinProps.indexOf(name) > -1 ) {
-        console.error(`Invalid publicMethod name(${name}) of Component(${widget.widgetType}), builtin name can't be used, please rename this method.`)
-        return
+    const { publicMethods = {} } = index;
+    Object.keys(publicMethods).map((name) => {
+      if (builtinProps.indexOf(name) > -1) {
+        console.error(
+          `Invalid publicMethod name(${name}) of Component(${widget.widgetType}), builtin name can't be used, please rename this method.`,
+        );
+        return;
       }
-      const method = publicMethods[name]
+      const method = publicMethods[name];
       if (method instanceof Function) {
-        Object.defineProperty(widget, name, { value: method.bind(widget.$comp) })
-        Object.defineProperty(widget.$comp, name, { value: method })
+        Object.defineProperty(widget, name, { value: method.bind(widget.$comp) });
+        Object.defineProperty(widget.$comp, name, { value: method });
       } else {
-        console.error(`Component(${widget.widgetType}) method(${name}) is not a function.`)
+        console.error(`Component(${widget.widgetType}) method(${name}) is not a function.`);
       }
-    })
+    });
   }
 
-  widget._methods = {}
+  widget._methods = {};
 }

package/template/mp/component/index.js

@@ -35,7 +35,7 @@ const behaviors = [<% if(formEvents) { %>'wx://form-field'<% } %>]
 const properties = {<% Object.entries(propDefs).filter(([prop,def])=>{
   return !!jsonSchemaType2jsClass[def.type]
 }).map(([prop, def])=> {%>
-  <%= prop %>: {
+  "<%= prop %>": {
     type: <%= jsonSchemaType2jsClass[def.type] %>,<%if(def.extraTypes) { %>
     optionalTypes: [<%= def.extraTypes.split('|').map(t => jsonSchemaType2jsClass[t]).join(',') %>], <% }%>
     <%if(def.default != null) {%>value: <%= JSON.stringify(def.default) %><%}%>
@@ -52,7 +52,7 @@ const handler = {<% handlers.forEach(h => {%>
 
 const dataBinds = {<% Object.entries(dataBinds).map(([id, widgetBinds])=>{%>
   <%= id %>: { <% Object.entries(widgetBinds).map(([prop, expr]) => { %>
-    <%= prop %>: function ($comp, lists, forItems, event, $context) {const $for=forItems; return (
+    "<%= prop %>": function ($comp, lists, forItems, event, $context) {const $for=forItems; return (
       <%= expr === '' ? 'undefined': expr %>
     ); },<% }) %>
   },<%}) %>

package/template/mp/datasources/index.js

@@ -7,7 +7,6 @@ const {
   createStateDataSourceVar,
   generateParamsParser,
   EXTRA_API,
-  DS_API,
   DS_SDK,
 } = WEDA_CLOUD_SDK
 const getAccessToken = auth.getAccessToken
@@ -18,7 +17,6 @@ export {
   generateParamsParser,
   EXTRA_API,
   CLOUD_SDK,
-  DS_API,
   DS_SDK,
   setConfig,
   getAccessToken,

package/template/mp/package.json

@@ -3,7 +3,8 @@
 	"version": "1.0.8",
 	"scripts": {},
 	"dependencies": {
-		"@cloudbase/weda-client": "^0.2.15",
+		"@cloudbase/weda-client": "0.2.18-alpha.1",
+		"@cloudbase/weda-cloud-sdk": "1.0.13",
     "@cloudbase/oauth": "0.1.1-alpha.5",
 		"mobx": "^5.15.4",
 		"lodash.get": "^4.4.2",

package/template/mp/page/index.js

@@ -29,7 +29,7 @@ const evtListeners = {<% Object.entries(eventHanlders).map(([handlerName, listen
 }
 const dataBinds = {<% Object.entries(dataBinds).map(([id, widgetBinds])=>{%>
   <%= id %>: { <% Object.entries(widgetBinds).map(([prop, expr]) => { %>
-    <%= prop %>: function ($page, lists, forItems, event, $context) {const $for = forItems; return (
+    "<%= prop %>": function ($page, lists, forItems, event, $context) {const $for = forItems; return (
       <%= expr === '' ? 'undefined': expr %>
     ); },<% }) %>
   },<%}) %>

package/template/package.json

@@ -10,7 +10,6 @@
     "@tcwd/weapps-sdk": "1.2.10",
     "@zxing/library": "^0.18.6",
     "@cloudbase/weda-client": "^0.2.4",
-    "fastclick": "^1.0.6",
     "lodash": "^4.17.19",
     "mobx": "^5.15.4",
     "mobx-react-lite": "^2.0.7",
@@ -42,7 +41,7 @@
     "css-loader": "^5",
     "css-minimizer-webpack-plugin": "^1.2.0",
     "happypack": "^5.0.1",
-    "dart-sass": "^1.24.0",
+    "sass": "^1.24.0",
     "postcss": "^8.3.6",
     "postcss-pxtorem": "^6.0.0",
     "postcss-loader": "^4.0.3",

package/template/webpack/web.prod.js

@@ -225,7 +225,7 @@ module.exports = function (options) {
             {
               loader: 'sass-loader',
               options: {
-                implementation: require('dart-sass'),
+                implementation: require('sass'),
               },
             },
           ],