From 6288bb2052626bc7b24e6f99af8284e4921c56c0 Mon Sep 17 00:00:00 2001
From: fxy060608 <fxy060608@gmail.com>
Date: Thu, 12 Dec 2019 12:29:20 +0800
Subject: [PATCH] feat(v3): uni-migration :host

---
 packages/uni-migration/__tests__/demo.js             |  2 +-
 packages/uni-migration/__tests__/wxml.spec.js        |  4 ++++
 .../lib/mp-weixin/transform/file-transformer.js      | 12 +++++++++++-
 .../lib/mp-weixin/transform/script-transformer.js    | 12 +-----------
 .../lib/mp-weixin/transform/style-transformer.js     |  1 +
 .../template-transformer/transform/generate.js       |  5 ++++-
 .../template-transformer/transform/traverse.js       |  2 +-
 7 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/packages/uni-migration/__tests__/demo.js b/packages/uni-migration/__tests__/demo.js
index 0a35608c5..a315ae33a 100644
--- a/packages/uni-migration/__tests__/demo.js
+++ b/packages/uni-migration/__tests__/demo.js
@@ -13,7 +13,7 @@ migrate('/Users/fxy/Downloads/wa-vantui_1.1')
 //   transformTemplate
 // } = require('../lib/mp-weixin/transform/template-transformer')
 // console.log(transformTemplate(
-//   `<uni-transition bind:click="click" bindtouchstart="startDrag" catchtouchmove="{{ catchMove ? 'noop' : '' }}"/>`, {
+//   `<view wx:for="{{ columns }}" wx:for-item="item" wx:key="{{item.value}}"/>`, {
 //     filename: 'index'
 //   }
 // ))
diff --git a/packages/uni-migration/__tests__/wxml.spec.js b/packages/uni-migration/__tests__/wxml.spec.js
index 8c0ca8a47..ed0928d2a 100644
--- a/packages/uni-migration/__tests__/wxml.spec.js
+++ b/packages/uni-migration/__tests__/wxml.spec.js
@@ -40,6 +40,10 @@ describe('wxml:compiler', () => {
     assertCodegen(
       '<view wx:for="{{ columns }}" wx:for-item="index" wx:key="*this"/>',
       `<uni-shadow-root><view v-for="(index,___i___) in (columns)" :key="index"></view></uni-shadow-root>`
+    )
+    assertCodegen(
+      '<view wx:for="{{ columns }}" wx:for-item="item" wx:key="{{item.value}}"/>',
+      `<uni-shadow-root><view v-for="(item,index) in (columns)" :key="item.value"></view></uni-shadow-root>`
     )
   })
   it('generate root element', () => {
diff --git a/packages/uni-migration/lib/mp-weixin/transform/file-transformer.js b/packages/uni-migration/lib/mp-weixin/transform/file-transformer.js
index ff99542c1..a9501ea82 100644
--- a/packages/uni-migration/lib/mp-weixin/transform/file-transformer.js
+++ b/packages/uni-migration/lib/mp-weixin/transform/file-transformer.js
@@ -13,6 +13,10 @@ const {
   transformScriptFile
 } = require('./script-transformer')
 
+const {
+  normalizePath
+} = require('../../util')
+
 const pkg = require('../../../package.json')
 
 module.exports = function transformFile(input, options) {
@@ -32,6 +36,12 @@ module.exports = function transformFile(input, options) {
   options.isComponent = isComponent
   options.filepath = filepath
   options.filename = path.basename(filepath)
+  if (options.base) {
+    options.route = normalizePath(path.relative(options.base, filepath))
+  } else {
+    options.route = options.filename
+  }
+  options.shadowRootHost = options.route.replace(/\//g, '-')
 
   const [templateCode, wxsCode = '', wxsFiles = []] = transformTemplateFile(filepath + templateExtname, options)
 
@@ -39,7 +49,7 @@ module.exports = function transformFile(input, options) {
   const scriptCode = transformScriptFile(filepath + '.js', jsCode, options, deps)
 
   return [
-    `<!-- @dcloudio/uni-migration@${pkg.version} -->
+    `<!-- @dcloudio/uni-migration@${pkg.version} -->
 <!-- ${new Date().toLocaleString()} -->
 <template>
 ${templateCode}
diff --git a/packages/uni-migration/lib/mp-weixin/transform/script-transformer.js b/packages/uni-migration/lib/mp-weixin/transform/script-transformer.js
index f135cde91..27be87673 100644
--- a/packages/uni-migration/lib/mp-weixin/transform/script-transformer.js
+++ b/packages/uni-migration/lib/mp-weixin/transform/script-transformer.js
@@ -1,9 +1,4 @@
 const fs = require('fs')
-const path = require('path')
-
-const {
-  normalizePath
-} = require('../../util')
 
 function transformScript(content, route, code) {
   return `${code}
@@ -24,11 +19,6 @@ Component({})
       content = fs.readFileSync(filepath, 'utf8').toString().trim()
       deps.push(filepath)
     }
-    let route = normalizePath(filepath)
-    if (options.base) {
-      route = normalizePath(path.relative(options.base, filepath))
-    }
-    route = route.replace('.js', '')
-    return transformScript(content, route, code, options)
+    return transformScript(content, options.route, code, options)
   }
 }
diff --git a/packages/uni-migration/lib/mp-weixin/transform/style-transformer.js b/packages/uni-migration/lib/mp-weixin/transform/style-transformer.js
index 89ac355f7..11593ec62 100644
--- a/packages/uni-migration/lib/mp-weixin/transform/style-transformer.js
+++ b/packages/uni-migration/lib/mp-weixin/transform/style-transformer.js
@@ -2,6 +2,7 @@ const fs = require('fs')
 
 function transformStyle(content, options) {
   return content.replace(new RegExp(`\\${options.extname.style}`, 'g'), '.css')
+    .replace(':host', '.' + options.shadowRootHost)
 }
 
 module.exports = {
diff --git a/packages/uni-migration/lib/mp-weixin/transform/template-transformer/transform/generate.js b/packages/uni-migration/lib/mp-weixin/transform/template-transformer/transform/generate.js
index f7198b6b8..9a15454de 100644
--- a/packages/uni-migration/lib/mp-weixin/transform/template-transformer/transform/generate.js
+++ b/packages/uni-migration/lib/mp-weixin/transform/template-transformer/transform/generate.js
@@ -58,5 +58,8 @@ function genWxs(wxs, state) {
 }
 
 module.exports = function generate(node, state) {
-  return [`<uni-shadow-root>${genChildren(node).trim()}</uni-shadow-root>`, ...genWxs(state.wxs, state)]
+  return [
+    `<uni-shadow-root class="${state.shadowRootHost}">${genChildren(node).trim()}</uni-shadow-root>`,
+    ...genWxs(state.wxs, state)
+  ]
 }
diff --git a/packages/uni-migration/lib/mp-weixin/transform/template-transformer/transform/traverse.js b/packages/uni-migration/lib/mp-weixin/transform/template-transformer/transform/traverse.js
index 4e8b2dabe..5be4b130e 100644
--- a/packages/uni-migration/lib/mp-weixin/transform/template-transformer/transform/traverse.js
+++ b/packages/uni-migration/lib/mp-weixin/transform/template-transformer/transform/traverse.js
@@ -127,7 +127,7 @@ function transformFor(attribs) {
   if (vKey) {
     if (vKey === '*this') {
       vKey = vItem
-    } else if (vKey !== vItem) {
+    } else if (vKey !== vItem && vKey.indexOf('.')===-1) {// wx:for-key="{{item.value}}"
       vKey = vItem + '.' + vKey
     }
     attribs[':key'] = vKey
-- 
GitLab