fix: rest propertyName

searchfe · Feb 25, 2019 · 6410f1a · 6410f1a
1 parent bc7e2db
commit 6410f1a
Show file tree

Hide file tree

Showing 15 changed files with 91 additions and 792 deletions.
diff --git a/src/emitter.ts b/src/emitter.ts
@@ -4,12 +4,15 @@
  */
 
 import * as ts from 'typescript';
+
 import {
     SyntaxKind,
     ListFormat,
     SourceFile,
     Symbol,
-    Node
+    Node,
+    isImportSpecifier,
+    isBlock,
 } from 'typescript';
 
 import {
@@ -26,21 +29,23 @@ import {
     isPrologueDirective,
     rangeStartPositionsAreOnSameLine,
 } from './utilities';
+
 import * as utilities from './utilities';
+
 import {
     shouldAddDollar,
-    isImportSpecifier,
     shouldUseArray,
     shouldAddDoubleQuote,
-    isBlock,
     isStringLike
 } from './utilities/nodeTest';
+
 import {
     some,
     cast,
     lastOrUndefined,
     singleOrUndefined
 } from './core';
+
 import {tokenToString} from './scanner';
 import {getStartsOnNewLine} from './factory';
 import {CompilerState} from './types';
@@ -516,8 +521,8 @@ export function emitFile(sourceFile: SourceFile, state: CompilerState) {
                 //     return emitClassExpression(<ClassExpression>node);
                 // case SyntaxKind.OmittedExpression:
                 //     return;
-                // case SyntaxKind.AsExpression:
-                //     return emitAsExpression(<AsExpression>node);
+                case SyntaxKind.AsExpression:
+                    return emitAsExpression(<ts.AsExpression>node);
                 // case SyntaxKind.NonNullExpression:
                 //     return emitNonNullExpression(<NonNullExpression>node);
                 // case SyntaxKind.MetaProperty:
@@ -1300,15 +1305,15 @@ export function emitFile(sourceFile: SourceFile, state: CompilerState) {
     //     emitTypeArguments(node, node.typeArguments);
     // }
 
-    // function emitAsExpression(node: AsExpression) {
-    //     emitExpression(node.expression);
-    //     if (node.type) {
-    //         writeSpace();
-    //         writeKeyword("as");
-    //         writeSpace();
-    //         emit(node.type);
-    //     }
-    // }
+    function emitAsExpression(node: ts.AsExpression) {
+        emitExpression(node.expression);
+        // if (node.type) {
+        //     writeSpace();
+        //     writeKeyword("as");
+        //     writeSpace();
+        //     emit(node.type);
+        // }
+    }
 
     // function emitNonNullExpression(node: NonNullExpression) {
     //     emitExpression(node.expression);
@@ -1555,9 +1560,14 @@ export function emitFile(sourceFile: SourceFile, state: CompilerState) {
             const count = node.name.elements.length;
             let initializer = node.initializer;
             node.name.elements.forEach((element, index) => {
-                if (ts.isIdentifier(element.name) && ts.isIdentifier(initializer)) {
+
+                if (ts.isIdentifier(element.name)) {
+
                     const nameNode = element.name;
-                    const access = ts.createPropertyAccess(initializer, nameNode);
+                    const access = ts.createPropertyAccess(
+                        initializer,
+                        element.propertyName ? getTextOfNode(element.propertyName) : nameNode
+                    );
 
                     writeBase("$");
                     emit(nameNode);
@@ -1880,7 +1890,7 @@ export function emitFile(sourceFile: SourceFile, state: CompilerState) {
         const moduleIt = allowedModules[importModuleName];
 
         // 需要将引入的变量跟 module 对应起来
-        if (node.importClause.namedBindings) {
+        if (node.importClause && node.importClause.namedBindings) {
             node.importClause.namedBindings.forEachChild(child => {
                 const name = getTextOfNode(child);
                 state.moduleNamedImports[name] = {
@@ -1899,7 +1909,7 @@ export function emitFile(sourceFile: SourceFile, state: CompilerState) {
             writeLine();
         }
 
-        if (node.importClause.name) {
+        if (node.importClause && node.importClause.name) {
             let text = getTextOfNode(node.importClause.name);
             state.moduleDefaultImports[text] = {
                 className: moduleIt.className,

diff --git a/src/features/array.ts b/src/features/array.ts
@@ -4,15 +4,12 @@
  */
 
 import {
-    EmitHint
-} from 'typescript';
-
-import {
+    EmitHint,
     isArrayLiteralExpression,
     isPropertyAccessExpression,
     isCallExpression,
     isIdentifier
-} from '../utilities/nodeTest';
+} from 'typescript';
 
 import method from '../utilities/method';
 

diff --git a/src/features/console.ts b/src/features/console.ts
@@ -4,14 +4,11 @@
  */
 
 import {
-    EmitHint
-} from 'typescript';
-
-import {
+    EmitHint,
     isPropertyAccessExpression,
     isIdentifier,
     isCallExpression
-} from '../utilities/nodeTest';
+} from 'typescript';
 
 import method from '../utilities/method';
 

diff --git a/src/features/date.ts b/src/features/date.ts
@@ -4,14 +4,11 @@
  */
 
 import {
-    EmitHint
-} from 'typescript';
-
-import {
+    EmitHint,
     isPropertyAccessExpression,
     isIdentifier,
     isCallExpression
-} from '../utilities/nodeTest';
+} from 'typescript';
 
 import method from '../utilities/method';
 

diff --git a/src/features/global.ts b/src/features/global.ts
@@ -4,12 +4,9 @@
  */
 
 import {
-    EmitHint
-} from 'typescript';
-
-import {
+    EmitHint,
     isCallExpression
-} from '../utilities/nodeTest';
+} from 'typescript';
 
 import method from '../utilities/method';
 

diff --git a/src/features/import.ts b/src/features/import.ts
@@ -3,8 +3,6 @@
  * @author cxtom(cxtom2008@gmail.com)
  */
 
-import * as ts from 'typescript';
-
 import {
     EmitHint,
     isCallExpression,

diff --git a/src/features/json.ts b/src/features/json.ts
@@ -8,14 +8,11 @@ import {
     CallExpression,
     createLiteral,
     createNodeArray,
-    ListFormat
-} from 'typescript';
-
-import {
+    ListFormat,
     isPropertyAccessExpression,
     isIdentifier,
     isCallExpression
-} from '../utilities/nodeTest';
+} from 'typescript';
 
 
 const methods = {

diff --git a/src/features/math.ts b/src/features/math.ts
@@ -4,14 +4,11 @@
  */
 
 import {
-    EmitHint
-} from 'typescript';
-
-import {
+    EmitHint,
     isPropertyAccessExpression,
     isIdentifier,
     isCallExpression
-} from '../utilities/nodeTest';
+} from 'typescript';
 
 import method from '../utilities/method';
 

diff --git a/src/features/number.ts b/src/features/number.ts
@@ -4,13 +4,13 @@
  */
 
 import {
-    EmitHint, Expression, PropertyAccessExpression
-} from 'typescript';
-
-import {
+    EmitHint,
     isPropertyAccessExpression,
     isIdentifier,
     isCallExpression,
+} from 'typescript';
+
+import {
     isNumberLike
 } from '../utilities/nodeTest';
 

diff --git a/src/features/object.ts b/src/features/object.ts
@@ -4,14 +4,11 @@
  */
 
 import {
-    EmitHint
-} from 'typescript';
-
-import {
+    EmitHint,
     isPropertyAccessExpression,
     isIdentifier,
     isCallExpression
-} from '../utilities/nodeTest';
+} from 'typescript';
 
 import method from '../utilities/method';
 

diff --git a/src/features/string.ts b/src/features/string.ts
@@ -10,14 +10,14 @@ import {
     RegularExpressionLiteral,
     createNodeArray,
     PropertyAccessExpression,
-    EmitHint
+    EmitHint,
+    isPropertyAccessExpression,
+    isCallExpression,
+    isRegularExpressionLiteral
 } from 'typescript';
 
 import {
-    isRegularExpressionLiteral,
     isStringLike,
-    isPropertyAccessExpression,
-    isCallExpression
 } from '../utilities/nodeTest';
 
 import method from '../utilities/method';