Fix cannot import module use import {a as b} from 'c';

Show error stack in hover message of result;
Rename some variable.

Author: plylrnsdy

src/code.ts

@@ -2,24 +2,19 @@ import * as Path from 'path';
 import * as Fs from 'fs';
 
 
-const importStatement = /import\s*(?:(\*\s+as\s)?([\w-_]+),?)?\s*(?:\{([^\}]+)\})?\s+from\s+["']([^"']+)["']/gi;
+const importStatement = /import\s+(?:(\*\s+as\s)?([\w-_]+),?)?\s*(?:\{([^\}]+)\})?\s+from\s+["']([^"']+)["']/gi;
 
 export function rewriteImportToRequire(code: string): string {
     return code.replace(importStatement, (str, wildcard: string, module: string, modules: string, from: string) => {
         let rewrite = '';
 
         if (module)
-            rewrite += `${rewrite === '' ? '' : ', '}default: ${module} `;
+            rewrite = `default: ${module}`;
 
         if (modules)
-            rewrite += `${rewrite === '' ? '' : ', '}${modules
-                .split(',')
-                .map(r => r.replace(/\s*([\w-_]+)(?:\s+as\s+([\w-_]))?\s*/gi, (str, moduleName: string, moduleNewName: string) => {
-                    return `${moduleNewName ? `${moduleNewName.trim()}: ` : ``}${moduleName.trim()}`;
-                }))
-                .join(', ')}`;
-
-        return `const ${wildcard ? module : `{ ${rewrite} }`} = require('${from}')`;
+            rewrite += (rewrite && ', ') + modules.replace(/\sas\s/g, ': ');
+
+        return `const ${wildcard ? module : `{ ${rewrite} }`} = require('${from}');`;
     });
 }
 
@@ -42,14 +37,14 @@ export function rewriteModulePathInRequire(code: string, basePath: string, fileP
 }
 
 
-const linBreak = /\r?\n/;
+const lineBreak = /\r?\n/;
 const consoleLogCall = /console\s*\.(log|debug|error)\(/g;
 
 export function rewriteConsoleToAppendLineNumber(code: string): string {
     let num = 0,
         out = [];
 
-    for (let line of code.split(linBreak)) {
+    for (let line of code.split(lineBreak)) {
         out.push(line.replace(consoleLogCall, `global['\`console\`'].$1(${num++}, `));
     }
 
@@ -60,5 +55,5 @@ export function rewriteConsoleToAppendLineNumber(code: string): string {
 const lineBreakInChainCall = /([\n\s]+)\./gi;
 
 export function rewriteChainCallInOneLine(code: string): string {
-    return code.replace(lineBreakInChainCall, (str, whitespace) => `/*\`${whitespace.split(linBreak).length - 1}\`*/.`);
+    return code.replace(lineBreakInChainCall, (str, whitespace) => `/*\`${whitespace.split(lineBreak).length - 1}\`*/.`);
 }

src/decorator.ts

@@ -23,11 +23,11 @@ const colorOfType = {
     'Console': '#457abb',
     'Error': 'red',
 }
-// TODO: if Node's Version of VSCode >=9.9, use option `compact`
-const inspectOptions = { maxArrayLength: null, depth: null };
+// TODO: if Node's Version of VSCode >=9.9, use default option
+const inspectOptions: NodeJS.InspectOptions = { depth: 20 };
 
 type Data = { line: number, type: 'Expression' | 'Terminal', value: any };
-type Result = { line: number, type: 'Value of Expression' | 'Console' | 'Error', text: string, value: any };
+type Result = { line: number, type: 'Value of Expression' | 'Console' | 'Error', text: string, value: string };
 
 export default class Decorator {
     private editor: TextEditor;
@@ -63,18 +63,15 @@ export default class Decorator {
                 renderOptions: { before: { margin: '0 0 0 1em' } },
                 range: new Range(pos, pos)
             };
-            this.lineToDecorator.set(result.line, decorator);
+            this.lineToDecorator.set(line, decorator);
             this.decorators.push(decorator);
         }
 
         decorator.renderOptions.before.color = colorOfType[result.type];
         decorator.renderOptions.before.contentText = ` ${result.text}`;
 
         decorator.hoverMessage = new MarkdownString(result.type);
-        decorator.hoverMessage.appendCodeblock(
-            result.type === 'Console' ? result.value.join('\n') : result.value || result.text,
-            'javascript'
-        );
+        decorator.hoverMessage.appendCodeblock(result.value, result.type === 'Error' ? 'text' : 'javascript');
 
         this.decorateAll();
     }
@@ -87,14 +84,14 @@ export default class Decorator {
             case 'object':
                 if (result.constructor && result.constructor.name === 'Promise' && result.then) {
                     try {
-                        let value = await Promise.resolve(result);
-                        return value ? this.formatExpressionValue(Object.assign(data, { value })) : null;
+                        data.value = await (<Promise<any>>result);
+                        return data.value ? this.formatExpressionValue(data) : null;
                     } catch (error) {
                         return {
                             line: data.line,
                             type: 'Error',
                             text: `${error.name}: ${error.message}`,
-                            value: error,
+                            value: error.stack,
                         }
                     }
                 }
@@ -103,7 +100,7 @@ export default class Decorator {
                 return {
                     line: data.line,
                     type: 'Value of Expression',
-                    text: string,
+                    text: string.replace(/\n/g, ' '),
                     value: string,
                 }
 
@@ -120,22 +117,22 @@ export default class Decorator {
         let out = data.value as string;
         let match: RegExpExecArray;
 
-        if ((match = /(\w*Error:\s.*)(?:\n\s*at\s)?/g.exec(out)) != null) {
-            this.outputChannel.appendLine(`  ${match[1]}\n\tat line ${data.line}`);
+        if ((match = /^(\w*Error(?: \[[^\]]+\])?:\s.*)(?:\n\s*at\s)?/.exec(out)) != null) {
+            this.outputChannel.appendLine(`  ${out}`);
 
-            return { line: data.line, type: 'Error', text: match[1], value: match[1] };
+            return { line: data.line, type: 'Error', text: match[1], value: out };
         }
-        else if ((match = /^`\{(\d+)\}`([\s\S]*)$/g.exec(out)) != null) {
+        else if ((match = /^`\{(\d+)\}`([\s\S]*)$/.exec(out)) != null) {
             let line = +match[1];
             let msg = match[2] || '';
 
             let output = this.lineToOutput.get(line);
             if (output == null) {
-                this.lineToOutput.set(+match[1], output = { line, type: 'Console', text: '', value: [] });
+                this.lineToOutput.set(line, output = { line, type: 'Console', text: '', value: '' });
             }
 
-            output.text += (output.text === '' ? '' : ', ') + msg.replace(/\r?\n/g, ' ');
-            output.value.push(msg);
+            output.text += (output.text && ', ') + msg.replace(/\r?\n/g, ' ');
+            output.value += (output.value && '\n') + msg;
 
             this.outputChannel.appendLine(`  ${msg}`);
             return output;

src/repl-server.ts

@@ -30,7 +30,7 @@ const server = Repl.start({
 
 
 const originEval = server.eval; // keep a backup of original eval
-const lineNumber = /\/\*`(\d+)`\*\//gi;
+const lineNumber = /\/\*`(\d+)`\*\//g;
 
 // nice place to read the result in sequence and inject it in the code
 server.eval = (cmd, context, filename, callback) => {