feat(taroize): 支持 wxs

NervJS · Nov 19, 2018 · 061311c · 061311c
1 parent 1369688
commit 061311c
Show file tree

Hide file tree

Showing 5 changed files with 192 additions and 83 deletions.
diff --git a/packages/taro-transformer-wx/__tests__/loop.spec.ts b/packages/taro-transformer-wx/__tests__/loop.spec.ts
@@ -2747,7 +2747,7 @@ describe('loop', () => {
       ])
       expect(
         instance.state.loopArray0.map(i =>
-          i.$anonymousCallee__7.map(a => a.$original)
+          i.$anonymousCallee__1.map(a => a.$original)
         )
       ).toEqual(Object.keys(keys).map(key => Object.keys(keys[key]).map(i => i)))
       expect(template).toMatch(

diff --git a/packages/taroize/.eslintignore b/packages/taroize/.eslintignore
@@ -0,0 +1,2 @@
+/lib
+/index.js
diff --git a/packages/taroize/src/index.ts b/packages/taroize/src/index.ts
@@ -10,7 +10,7 @@ interface Option {
 }
 
 export function parse (option: Option): t.File {
-  const wxml = parseWXML(option.wxml)
+  const { wxml, wxses } = parseWXML(option.wxml)
   const json = parseJSON(option.json)
-  return parseScript(option.script, wxml as t.Expression, json)
+  return parseScript(option.script, wxml as t.Expression, json, wxses)
 }
diff --git a/packages/taroize/src/script.ts b/packages/taroize/src/script.ts
@@ -2,15 +2,20 @@ import * as t from 'babel-types'
 import traverse, { NodePath } from 'babel-traverse'
 import { transform } from 'babel-core'
 import { buildImportStatement, codeFrameError } from './utils'
-import { usedComponents } from './wxml'
+import { usedComponents, WXS } from './wxml'
 import { PageLifecycle } from './lifecycle'
 
 const buildDecorator = (type: string) => t.decorator(t.callExpression(
   t.identifier('withWeapp'),
   [t.stringLiteral(type)]
 ))
 
-export function parseScript (script?: string, returned?: t.Expression, json?: t.ObjectExpression) {
+export function parseScript (
+  script?: string,
+  returned?: t.Expression,
+  json?: t.ObjectExpression,
+  wxses: WXS[] = []
+) {
   script = script || 'Page({})'
   const { ast } = transform(script, {
     parserOpts: {
@@ -82,7 +87,12 @@ export function parseScript (script?: string, returned?: t.Expression, json?: t.
     [],
     'withWeapp'
   )
-  ast.program.body.unshift(taroComponentsImport, taroImport, withWeappImport)
+  ast.program.body.unshift(
+    taroComponentsImport,
+    taroImport,
+    withWeappImport,
+    ...wxses.map(wxs => buildImportStatement(wxs.src, [], wxs.module))
+  )
 
   return ast
 }