Skip to content

Commit

Permalink
refactor(transformer): 任何情况返回都返回相同的 result
Browse files Browse the repository at this point in the history
  • Loading branch information
yuche authored and luckyadam committed Jan 7, 2020
1 parent bc78f1d commit b07142f
Showing 1 changed file with 25 additions and 3 deletions.
28 changes: 25 additions & 3 deletions packages/taro-transformer-wx/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,13 @@ export default function transform (options: Options): TransformResult {
setIsTaroReady('priTaroCompReady')
setCompId('priCompid')
}
const defaultResult: TransformResult = {
ast: {} as any,
code: '',
imageSrcs: '',
compressedTemplate: '',
components: []
}
THIRD_PARTY_COMPONENTS.clear()
const code = options.isTyped
? ts.transpile(options.code, {
Expand Down Expand Up @@ -247,7 +254,12 @@ export default function transform (options: Options): TransformResult {
resetTSClassProperty(mainClassNode.body.body)
}
}
return { ast } as any
const code = generate(ast).code
return {
...defaultResult,
ast,
code
}
}
// transformFromAst(ast, code)
let result
Expand Down Expand Up @@ -780,7 +792,12 @@ export default function transform (options: Options): TransformResult {
}

if (!mainClass) {
throw new Error('未找到 Taro.Component 的类定义')
const code = generate(ast).code
return {
...defaultResult,
ast,
code
}
}

if (Adapter.type === Adapters.alipay) {
Expand Down Expand Up @@ -837,7 +854,12 @@ export default function transform (options: Options): TransformResult {
renderMethod.replaceWith(
t.classMethod('method', t.identifier('_createData'), [], t.blockStatement([]))
)
return { ast } as TransformResult
const code = generate(ast).code
return {
...defaultResult,
ast,
code
}
}
result = new Transformer(mainClass, options.sourcePath, componentProperies, options.sourceDir!, classMethods).result
result.code = generate(ast).code
Expand Down

0 comments on commit b07142f

Please sign in to comment.