chore: rename package name

NervJS · Nov 19, 2018 · d450d68 · d450d68
1 parent de8f5ae
commit d450d68
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 10 deletions.
diff --git a/packages/wx-to-taro/package.json → packages/taroize/package.json b/packages/wx-to-taro/package.json → packages/taroize/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@tarojs/wx-to-taro",
+  "name": "@tarojs/taroize",
   "version": "0.0.1",
   "description": "转换原生微信小程序代码为 Taro 代码",
   "main": "index.js",

diff --git a/packages/wx-to-taro/src/index.ts → packages/taroize/src/index.ts b/packages/wx-to-taro/src/index.ts → packages/taroize/src/index.ts
@@ -8,7 +8,7 @@ interface Option {
   wxml: string
 }
 
-export default function parse (option: Option): t.File {
+export function parse (option: Option): t.File {
   const wxml = parseWXML(option.wxml)
   return parseScript(option.script, wxml as t.Expression)
 }
diff --git a/packages/wx-to-taro/src/json.ts → packages/taroize/src/json.ts b/packages/wx-to-taro/src/json.ts → packages/taroize/src/json.ts
diff --git a/packages/wx-to-taro/src/lifecycle.ts → packages/taroize/src/lifecycle.ts b/packages/wx-to-taro/src/lifecycle.ts → packages/taroize/src/lifecycle.ts
diff --git a/packages/wx-to-taro/src/script.ts → packages/taroize/src/script.ts b/packages/wx-to-taro/src/script.ts → packages/taroize/src/script.ts
diff --git a/packages/wx-to-taro/src/utils.ts → packages/taroize/src/utils.ts b/packages/wx-to-taro/src/utils.ts → packages/taroize/src/utils.ts
diff --git a/packages/wx-to-taro/src/wxml.ts → packages/taroize/src/wxml.ts b/packages/wx-to-taro/src/wxml.ts → packages/taroize/src/wxml.ts
@@ -67,7 +67,7 @@ function buildElement (
 export const usedComponents = new Set<string>()
 
 export function parseWXML (wxml: string) {
-  const nodes = (parse(wxml.trim()) as AllKindNode[]).filter(removEmptyText).filter(node => node.type !== NodeType.Comment) as Node[]
+  const nodes = removEmptyTextAndComment(parse(wxml.trim()))
   const ast = t.file(t.program([t.expressionStatement(parseNode(buildElement('block', nodes)) as t.Expression)], []))
 
   traverse(ast, {
@@ -250,16 +250,26 @@ function parseElement (element: Element): t.JSXElement {
   return t.jSXElement(
     t.jSXOpeningElement(tagName, element.attributes.map(parseAttribute)),
     t.jSXClosingElement(tagName),
-    element.children.filter(removEmptyText).map(parseNode),
+    element.children.map(parseNode),
     false
   )
 }
 
-function removEmptyText (node: Node) {
-  if (node.type === NodeType.Text && node.content.trim().length === 0) {
-    return false
+function removEmptyTextAndComment (nodes: AllKindNode[]) {
+  for (let index = 0; index < nodes.length; index++) {
+    const node = nodes[index]
+    if (
+      (node.type === NodeType.Text && node.content.trim().length === 0)
+      ||
+      (node.type === NodeType.Comment)
+    ) {
+      nodes.splice(index, 1)
+    }
+    if (node.type === NodeType.Element) {
+      removEmptyTextAndComment(node.children)
+    }
   }
-  return true
+  return nodes as Node[]
 }
 
 function parseText (node: Text) {

diff --git a/packages/wx-to-taro/tsconfig.json → packages/taroize/tsconfig.json b/packages/wx-to-taro/tsconfig.json → packages/taroize/tsconfig.json
diff --git a/packages/wx-to-taro/tslint.json → packages/taroize/tslint.json b/packages/wx-to-taro/tslint.json → packages/taroize/tslint.json
diff --git a/packages/wx-to-taro/yarn.lock → packages/taroize/yarn.lock b/packages/wx-to-taro/yarn.lock → packages/taroize/yarn.lock
diff --git a/packages/wx-to-taro/.gitignore b/packages/wx-to-taro/.gitignore