fix: 修复支付宝自定义组件使用 component2 模式报错的问题

remaxjs · Dec 29, 2019 · 109f904 · 109f904
1 parent af61726
commit 109f904
Show file tree

Hide file tree

Showing 57 changed files with 1,636 additions and 784 deletions.
diff --git a/...sts__/fixtures/alipay/expected/helper.sjs → ...alipay/expected/packageA/pages/helper.sjs b/...sts__/fixtures/alipay/expected/helper.sjs → ...alipay/expected/packageA/pages/helper.sjs
@@ -13,7 +13,17 @@ function reduce(action) {
   tree.lastActionId = action.id;
 
   switch (action.type) {
-    case 'clear': 
+    case 'init':
+      tree = {
+        root: {
+          children: [
+            action.payload[0].item,
+          ]
+        },
+        lastActionId: -1,
+      };
+      return tree;
+    case 'clear':
       tree.root = {
         children: []
       };

diff --git a/packages/remax-cli/src/__tests__/fixtures/alipay/expected/packageA/pages/index.axml b/packages/remax-cli/src/__tests__/fixtures/alipay/expected/packageA/pages/index.axml
@@ -1,4 +1,4 @@
-<import-sjs name="helper" from="../../helper.sjs" />
+<import-sjs name="helper" from="./helper.sjs" />
 <template is="REMAX_TPL" data="{{tree: helper.reduce(action)}}" />
 
 <template name="REMAX_TPL">

diff --git a/...sts__/fixtures/assets/expected/helper.sjs → ...fixtures/alipay/expected/pages/helper.sjs b/...sts__/fixtures/assets/expected/helper.sjs → ...fixtures/alipay/expected/pages/helper.sjs
@@ -13,7 +13,17 @@ function reduce(action) {
   tree.lastActionId = action.id;
 
   switch (action.type) {
-    case 'clear': 
+    case 'init':
+      tree = {
+        root: {
+          children: [
+            action.payload[0].item,
+          ]
+        },
+        lastActionId: -1,
+      };
+      return tree;
+    case 'clear':
       tree.root = {
         children: []
       };

diff --git a/packages/remax-cli/src/__tests__/fixtures/alipay/expected/pages/index.axml b/packages/remax-cli/src/__tests__/fixtures/alipay/expected/pages/index.axml
@@ -1,4 +1,4 @@
-<import-sjs name="helper" from="../helper.sjs" />
+<import-sjs name="helper" from="./helper.sjs" />
 <template is="REMAX_TPL" data="{{tree: helper.reduce(action)}}" />
 
 <template name="REMAX_TPL">

diff --git a/...ts__/fixtures/babelrc/expected/helper.sjs → ...fixtures/assets/expected/pages/helper.sjs b/...ts__/fixtures/babelrc/expected/helper.sjs → ...fixtures/assets/expected/pages/helper.sjs
@@ -13,7 +13,17 @@ function reduce(action) {
   tree.lastActionId = action.id;
 
   switch (action.type) {
-    case 'clear': 
+    case 'init':
+      tree = {
+        root: {
+          children: [
+            action.payload[0].item,
+          ]
+        },
+        lastActionId: -1,
+      };
+      return tree;
+    case 'clear':
       tree.root = {
         children: []
       };

diff --git a/packages/remax-cli/src/__tests__/fixtures/assets/expected/pages/index.axml b/packages/remax-cli/src/__tests__/fixtures/assets/expected/pages/index.axml
@@ -1,4 +1,4 @@
-<import-sjs name="helper" from="../helper.sjs" />
+<import-sjs name="helper" from="./helper.sjs" />
 <template is="REMAX_TPL" data="{{tree: helper.reduce(action)}}" />
 
 <template name="REMAX_TPL">

diff --git a/...eHostComponent/expected/alipay/helper.sjs → ...ixtures/babelrc/expected/pages/helper.sjs b/...eHostComponent/expected/alipay/helper.sjs → ...ixtures/babelrc/expected/pages/helper.sjs
@@ -13,7 +13,17 @@ function reduce(action) {
   tree.lastActionId = action.id;
 
   switch (action.type) {
-    case 'clear': 
+    case 'init':
+      tree = {
+        root: {
+          children: [
+            action.payload[0].item,
+          ]
+        },
+        lastActionId: -1,
+      };
+      return tree;
+    case 'clear':
       tree.root = {
         children: []
       };

diff --git a/packages/remax-cli/src/__tests__/fixtures/babelrc/expected/pages/index.axml b/packages/remax-cli/src/__tests__/fixtures/babelrc/expected/pages/index.axml
@@ -1,4 +1,4 @@
-<import-sjs name="helper" from="../helper.sjs" />
+<import-sjs name="helper" from="./helper.sjs" />
 <template is="REMAX_TPL" data="{{tree: helper.reduce(action)}}" />
 
 <template name="REMAX_TPL">

diff --git a/...eHostComponent/expected/wechat/helper.wxs → ...ompressTemplate/expected/pages/helper.wxs b/...eHostComponent/expected/wechat/helper.wxs → ...ompressTemplate/expected/pages/helper.wxs
@@ -13,7 +13,17 @@ function reduce(action) {
   tree.lastActionId = action.id;
 
   switch (action.type) {
-    case 'clear': 
+    case 'init':
+      tree = {
+        root: {
+          children: [
+            action.payload[0].item,
+          ]
+        },
+        lastActionId: -1,
+      };
+      return tree;
+    case 'clear':
       tree.root = {
         children: []
       };

diff --git a/packages/remax-cli/src/__tests__/fixtures/compressTemplate/expected/pages/index.wxml b/packages/remax-cli/src/__tests__/fixtures/compressTemplate/expected/pages/index.wxml
@@ -1 +1 @@
-<wxs src="../helper.wxs" module="helper" /> <import src="../base.wxml"/> <template is="REMAX_TPL" data="{{tree: helper.reduce(action)}}" />
+<wxs src="./helper.wxs" module="helper" /> <import src="../base.wxml"/> <template is="REMAX_TPL" data="{{tree: helper.reduce(action)}}" />
diff --git a/...ges/remax-cli/src/__tests__/fixtures/createHostComponent/expected/alipay/pages/helper.sjs b/...ges/remax-cli/src/__tests__/fixtures/createHostComponent/expected/alipay/pages/helper.sjs
@@ -0,0 +1,115 @@
+var tree = {
+  root: {
+    children: [],
+  },
+  lastActionId: -1
+};
+
+function reduce(action) {
+  if (action.id === tree.lastActionId) {
+    return tree;
+  }
+
+  tree.lastActionId = action.id;
+
+  switch (action.type) {
+    case 'init':
+      tree = {
+        root: {
+          children: [
+            action.payload[0].item,
+          ]
+        },
+        lastActionId: -1,
+      };
+      return tree;
+    case 'clear':
+      tree.root = {
+        children: []
+      };
+      return tree;
+    case 'splice':
+      for (var i = 0; i < action.payload.length; i += 1) {
+        var value = get(tree, action.payload[i].path);
+        if (action.payload[i].item) {
+          value.splice(
+            action.payload[i].start,
+            action.payload[i].deleteCount,
+            action.payload[i].item
+          );
+        } else {
+          value.splice(action.payload[i].start, action.payload[i].deleteCount);
+        }
+        set(tree, action.payload[i].path, value);
+      }
+      return tree;
+    default:
+      return tree;
+  }
+}
+
+function getKey(key) {
+  var intKey = parseInt(key);
+  if (intKey.toString() === key) {
+    return intKey;
+  }
+  return key;
+}
+
+function set(obj, path, value) {
+  if (typeof path === 'string') {
+    path = path.split('.').map(getKey);
+  }
+
+  if (path.length === 1) {
+    obj[path[0]] = value;
+  }
+
+  var nextObj = obj;
+  for (var i = 0; i < path.length; i += 1) {
+    var currentPath = path[i];
+    var currentValue = nextObj[currentPath];
+
+    if (currentValue === void 0) {
+      //check if we assume an array
+      if (typeof path[i + 1] === 'number') {
+        nextObj[currentPath] = [];
+      } else {
+        nextObj[currentPath] = {};
+      }
+    }
+
+    if (i === path.length - 1) {
+      nextObj[currentPath] = value;
+    }
+
+    nextObj = nextObj[currentPath];
+  }
+}
+
+function get(obj, path) {
+  if (typeof path === 'string') {
+    path = path.split('.').map(getKey);
+  }
+
+  var nextObj = obj;
+  for (var i = 0; i < path.length; i += 1) {
+    var currentPath = path[i];
+    nextObj = nextObj[currentPath];
+    if (nextObj === void 0) {
+      if (currentPath === 'children') {
+        nextObj = [];
+      } else {
+        nextObj = {};
+      }
+    }
+  }
+
+  return nextObj;
+}
+
+
+export default  {
+  reduce
+}
+
diff --git a/...ges/remax-cli/src/__tests__/fixtures/createHostComponent/expected/alipay/pages/index.axml b/...ges/remax-cli/src/__tests__/fixtures/createHostComponent/expected/alipay/pages/index.axml
@@ -1,4 +1,4 @@
-<import-sjs name="helper" from="../helper.sjs" />
+<import-sjs name="helper" from="./helper.sjs" />
 <template is="REMAX_TPL" data="{{tree: helper.reduce(action)}}" />
 
 <template name="REMAX_TPL">

diff --git a/...res/typescript/expected/wechat/helper.wxs → ...omponent/expected/wechat/pages/helper.wxs b/...res/typescript/expected/wechat/helper.wxs → ...omponent/expected/wechat/pages/helper.wxs
@@ -13,7 +13,17 @@ function reduce(action) {
   tree.lastActionId = action.id;
 
   switch (action.type) {
-    case 'clear': 
+    case 'init':
+      tree = {
+        root: {
+          children: [
+            action.payload[0].item,
+          ]
+        },
+        lastActionId: -1,
+      };
+      return tree;
+    case 'clear':
       tree.root = {
         children: []
       };

diff --git a/...ges/remax-cli/src/__tests__/fixtures/createHostComponent/expected/wechat/pages/index.wxml b/...ges/remax-cli/src/__tests__/fixtures/createHostComponent/expected/wechat/pages/index.wxml
@@ -1,3 +1,3 @@
-<wxs src="../helper.wxs" module="helper" />
+<wxs src="./helper.wxs" module="helper" />
 <import src="../base.wxml"/>
 <template is="REMAX_TPL" data="{{tree: helper.reduce(action)}}" />
diff --git a/packages/remax-cli/src/__tests__/fixtures/customRootDir/expected/helper.sjs b/packages/remax-cli/src/__tests__/fixtures/customRootDir/expected/helper.sjs
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<wxs src="../helper.wxs" module="helper" /> <import src="../base.wxml"/> <template is="REMAX_TPL" data="{{tree: helper.reduce(action)}}" />
		<wxs src="./helper.wxs" module="helper" /> <import src="../base.wxml"/> <template is="REMAX_TPL" data="{{tree: helper.reduce(action)}}" />