Merge pull request #13 from Paker30/10-default-imports

10 default imports

Author: Paker30

src/actions/initTest.ts

@@ -8,7 +8,7 @@ export const typeRegex = /\s*?type\s*(\w*)/gm;
 
 const identity = <T>(arg: T): T => arg;
 
-export const createTest = ({
+export const writeTest = ({
     editor,
     pathTo,
     mockedImports
@@ -31,6 +31,20 @@ export const createTest = ({
 
 };
 
+export const generateCode = (pathTo: string) => (content: string) => {
+    return content.match(importedRegex)
+        ?.map((line) => new RegExp(splitImportRegex).exec(line))
+        .map((importedContent) => {
+            const path = importedContent?.pop();
+            const [_, defaultImport, imports = ''] = importedContent!;
+            const mockedFunctions = [defaultImport ? 'default' : defaultImport, ...imports.split(',')]
+                .filter(identity)
+                .map((imp) => new RegExp(typeRegex).test(imp) ? new RegExp(typeRegex).exec(imp)![1] : imp)
+                .map((fn) => `${fn}: mock.fn()`);
+            return `'${relative(pathTo, path!)}': { ${mockedFunctions?.join(',')}}`;
+        });
+};
+
 export const initTest = async () => {
     const editor = vscode.window.activeTextEditor;
     if (!editor) {
@@ -48,18 +62,6 @@ export const initTest = async () => {
     const pathTo = relative(dirname(vscode.window.activeTextEditor!.document.uri.fsPath), targetFile[0].fsPath);
     const mockedImports = await vscode.workspace.fs.readFile(targetFile[0])
         .then((readData) => Buffer.from(readData).toString('utf8'))
-        .then((content) => {
-            return content.match(importedRegex)
-                ?.map((line) => new RegExp(splitImportRegex).exec(line))
-                .map((importedContent) => {
-                    const path = importedContent?.pop();
-                    const [defaultImport, imports] = importedContent?.slice(1)!;
-                    const mockedFunctions = [defaultImport ? 'default' : defaultImport, ...imports.split(',')]
-                        .filter(identity)
-                        .map((imp) => new RegExp(typeRegex).test(imp) ? new RegExp(typeRegex).exec(imp)![1] : imp)
-                        .map((fn) => `${fn}: mock.fn()`);
-                    return `'${relative(pathTo, path!)}': { ${mockedFunctions?.join(',')}}`;
-                });
-        });
-    editor.edit(createTest({ editor, pathTo: formatPath(pathTo), mockedImports}));
+        .then(generateCode(pathTo));
+    editor.edit(writeTest({ editor, pathTo: formatPath(pathTo), mockedImports }));
 };

src/test/extension.test.ts

@@ -4,7 +4,7 @@ import sinon from 'sinon';
 // You can import and use all API from the 'vscode' module
 // as well as import your extension to test it
 import * as vscode from 'vscode';
-import { importedRegex, splitImportRegex, createTest } from '../actions/initTest';
+import { importedRegex, splitImportRegex, generateCode, writeTest } from '../actions/initTest';
 
 suite('Extension Test Suite', () => {
 	vscode.window.showInformationMessage('Start all tests.');
@@ -37,7 +37,23 @@ suite('Extension Test Suite', () => {
 		});
 	});
 
-	suite('createTest', () => {
+	suite('generateCode', () => {
+		const fakePath = 'utils';
+		test('import default', () => {
+			const [createdCode] = generateCode(fakePath)('import cheers from \'./utils.ts\';')!;
+			assert.equal(createdCode.replace('\\', '/'), "'../utils.ts': { default: mock.fn()}");
+		});
+		test('import with destructuring', () => {
+			const [createdCode] = generateCode(fakePath)("import { goodbye, greeter, Person } from './utils.ts';")!;
+			assert.equal(createdCode.replace('\\', '/'), "'../utils.ts': {  goodbye: mock.fn(), greeter: mock.fn(), Person : mock.fn()}");
+		});
+		test('import with default and destructuring', () => {
+			const [createdCode] = generateCode(fakePath)("import cheers, { hello, goodbye, greeter, Person } from './utils.ts';")!;
+			assert.equal(createdCode.replace('\\', '/'), "'../utils.ts': { default: mock.fn(), hello: mock.fn(), goodbye: mock.fn(), greeter: mock.fn(), Person : mock.fn()}");
+		});
+	});
+
+	suite('writeTest', () => {
 		const fakeInsert = sinon.stub();
 		const fakeEditBuilder = {
 			insert: fakeInsert
@@ -53,7 +69,7 @@ suite('Extension Test Suite', () => {
 		} as unknown as vscode.TextEditor;
 
 		test('check inserted code', () => {
-			createTest({ editor: fakeEditor as any, pathTo: '', mockedImports: [] })(fakeEditBuilder);
+			writeTest({ editor: fakeEditor as any, pathTo: '', mockedImports: [] })(fakeEditBuilder);
 			sinon.assert.callCount(fakeInsert, 4);
 		});