chore: remove default exports in the projects (#2537)

* fix: remove default exports in the project * fix: build errors due to merge * fix: pretty-quick
aws-amplify · Oct 29, 2019 · 384e0b4 · 384e0b4
1 parent a818558
commit 384e0b4
Show file tree

Hide file tree

Showing 141 changed files with 426 additions and 465 deletions.
diff --git a/.gitignore b/.gitignore
@@ -21,4 +21,4 @@ packages/*/package-lock.json
 **/.env
 amplify-integ*/
 packages/amplify-storage-simulator/lib
-packages/*/reports/junit
+packages/**/reports/junit/*
diff --git a/packages/amplify-appsync-simulator/src/index.ts b/packages/amplify-appsync-simulator/src/index.ts
@@ -1,12 +1,11 @@
-import { parse, Source, validate, specifiedRules, execute, GraphQLSchema, Kind } from 'graphql';
+import { Source, GraphQLSchema } from 'graphql';
 import { generateResolvers } from './schema';
 import { VelocityTemplate } from './velocity';
 import { getDataLoader, AmplifyAppSyncSimulatorDataLoader } from './data-loader';
 import { AppSyncUnitResolver } from './resolvers';
 import { AppSyncSimulatorServer } from './server';
 export { addDataLoader, removeDataLoader } from './data-loader';
 import { PubSub } from 'graphql-subscriptions';
-import * as EventEmitter from 'events';
 import { AmplifySimulatorFunction } from './resolvers/function';
 import { AppSyncPipelineResolver } from './resolvers/pipeline-resolver';
 import {

diff --git a/packages/amplify-appsync-simulator/src/schema/directives/auth.ts b/packages/amplify-appsync-simulator/src/schema/directives/auth.ts
@@ -3,7 +3,7 @@ import { buildSchemaFromTypeDefinitions, forEachField } from 'graphql-tools';
 import { AmplifyAppSyncSimulator } from '../..';
 import { AmplifyAppSyncSimulatorAuthenticationType, AmplifyAppSyncSimulatorRequestContext } from '../../type-definition';
 import { Unauthorized } from '../../velocity/util';
-import AppSyncSimulatorDirectiveBase from './directive-base';
+import { AppSyncSimulatorDirectiveBase } from './directive-base';
 
 const AUTH_DIRECTIVES = {
   aws_api_key: 'directive @aws_api_key on FIELD_DEFINITION | OBJECT',

diff --git a/packages/amplify-appsync-simulator/src/schema/directives/aws-subscribe.ts b/packages/amplify-appsync-simulator/src/schema/directives/aws-subscribe.ts
@@ -1,4 +1,4 @@
-import AppSyncSimulatorDirectiveBase from './directive-base';
+import { AppSyncSimulatorDirectiveBase } from './directive-base';
 
 export class AwsSubscribe extends AppSyncSimulatorDirectiveBase {
   static typeDefinitions: string = 'directive @aws_subscribe(mutations: [String!]) on FIELD_DEFINITION';

diff --git a/packages/amplify-appsync-simulator/src/schema/directives/directive-base.ts b/packages/amplify-appsync-simulator/src/schema/directives/directive-base.ts
@@ -1,7 +1,7 @@
 import { SchemaDirectiveVisitor } from 'graphql-tools';
 import { AmplifyAppSyncSimulator } from '../..';
 
-export default abstract class AppSyncSimulatorDirectiveBase extends SchemaDirectiveVisitor {
+export abstract class AppSyncSimulatorDirectiveBase extends SchemaDirectiveVisitor {
   name: string;
   static typeDefinitions: string;
   static simulatorContext: AmplifyAppSyncSimulator;

diff --git a/packages/amplify-appsync-simulator/src/schema/index.ts b/packages/amplify-appsync-simulator/src/schema/index.ts
@@ -4,7 +4,7 @@ import { AmplifyAppSyncSimulator } from '..';
 import { AppSyncSimulatorBaseResolverConfig } from '../type-definition';
 import { scalars } from './appsync-scalars';
 import { AwsAuth, AwsSubscribe, protectResolversWithAuthRules } from './directives';
-import AppSyncSimulatorDirectiveBase from './directives/directive-base';
+import { AppSyncSimulatorDirectiveBase } from './directives/directive-base';
 const KNOWN_DIRECTIVES: {
   name: string;
   visitor: typeof AppSyncSimulatorDirectiveBase;

diff --git a/packages/amplify-cli/src/__test__/context-manager.test.ts b/packages/amplify-cli/src/__test__/context-manager.test.ts
@@ -1,5 +1,5 @@
-import Input from '../domain/input';
-import PluginPlatform from '../domain/plugin-platform';
+import { Input } from '../domain/input';
+import { PluginPlatform } from '../domain/plugin-platform';
 
 import { constructContext } from '../context-manager';
 

diff --git a/packages/amplify-cli/src/commands/plugin.ts b/packages/amplify-cli/src/commands/plugin.ts
@@ -1,5 +1,5 @@
 import path from 'path';
-import Context from '../domain/context';
+import { Context } from '../domain/context';
 
 export async function run(context: Context) {
   let subCommand = 'help';

diff --git a/packages/amplify-cli/src/commands/plugin/add.ts b/packages/amplify-cli/src/commands/plugin/add.ts
@@ -1,9 +1,9 @@
 import os from 'os';
 import fs from 'fs-extra';
 import path from 'path';
-import Context from '../../domain/context';
-import PluginInfo from '../../domain/plugin-info';
-import constants from '../../domain/constants';
+import { Context } from '../../domain/context';
+import { PluginInfo } from '../../domain/plugin-info';
+import { constants } from '../../domain/constants';
 import { addUserPluginPackage, addExcludedPluginPackage as addFromExcluded, confirmAndScan } from '../../plugin-manager';
 import inquirer, { InquirerOption, EXPAND } from '../../domain/inquirer-helper';
 import { AddPluginError } from '../../domain/add-plugin-result';

diff --git a/packages/amplify-cli/src/commands/plugin/configure.ts b/packages/amplify-cli/src/commands/plugin/configure.ts
@@ -1,9 +1,9 @@
 import fs from 'fs-extra';
 import os from 'os';
-import Context from '../../domain/context';
-import PluginPlatform from '../../domain/plugin-platform';
+import { Context } from '../../domain/context';
+import { PluginPlatform } from '../../domain/plugin-platform';
 import inquirer from '../../domain/inquirer-helper';
-import Constants from '../../domain/constants';
+import { constants } from '../../domain/constants';
 import { writePluginsJsonFileSync } from '../../plugin-helpers/access-plugins-file';
 import { normalizePluginDirectory } from '../../plugin-helpers/scan-plugin-platform';
 import { scan } from '../../plugin-manager';
@@ -98,24 +98,24 @@ plugins in a plugin scan.');
 scan behavior, and consequently its outcome.');
   context.print.green('There are three well-known directories that the CLI \
 usually scans for plugins.');
-  context.print.red(Constants.ParentDirectory);
-  context.print.green(`${Constants.ParentDirectory} \
+  context.print.red(constants.ParentDirectory);
+  context.print.green(`${constants.ParentDirectory} \
 is the directory that contains the Amplify CLI Core package.`);
-  context.print.blue(normalizePluginDirectory(Constants.ParentDirectory));
-  context.print.red(Constants.LocalNodeModules);
-  context.print.green(`${Constants.LocalNodeModules} \
+  context.print.blue(normalizePluginDirectory(constants.ParentDirectory));
+  context.print.red(constants.LocalNodeModules);
+  context.print.green(`${constants.LocalNodeModules} \
 is the Amplify CLI Core package's local node_modules directory. `);
-  context.print.blue(normalizePluginDirectory(Constants.LocalNodeModules));
-  context.print.red(Constants.GlobalNodeModules);
-  context.print.green(`${Constants.GlobalNodeModules} \
+  context.print.blue(normalizePluginDirectory(constants.LocalNodeModules));
+  context.print.red(constants.GlobalNodeModules);
+  context.print.green(`${constants.GlobalNodeModules} \
 is the global node_modules directory.`);
-  context.print.blue(normalizePluginDirectory(Constants.GlobalNodeModules));
+  context.print.blue(normalizePluginDirectory(constants.GlobalNodeModules));
   context.print.info('');
 }
 
 async function addPluginDirectory(pluginPlatform: PluginPlatform) {
   const ADDCUSTOMDIRECTORY = 'Add custom directory >';
-  let options = [Constants.ParentDirectory, Constants.LocalNodeModules, Constants.GlobalNodeModules];
+  let options = [constants.ParentDirectory, constants.LocalNodeModules, constants.GlobalNodeModules];
 
   options = options.filter(item => !pluginPlatform.pluginDirectories.includes(item.toString()));
 
@@ -210,13 +210,13 @@ are checked in plugin scans.');
   context.print.green('You can add or remove from this list to change the plugin \
 scan behavior, and consequently its outcome.');
   context.print.green('The offical prefix is:');
-  context.print.red(Constants.AmplifyPrefix);
+  context.print.red(constants.AmplifyPrefix);
   context.print.info('');
 }
 
 async function addPrefix(pluginPlatform: PluginPlatform) {
   const ADDCUSTOMPREFIX = 'Add custom prefix >';
-  let options = [Constants.AmplifyPrefix];
+  let options = [constants.AmplifyPrefix];
 
   options = options.filter(item => !pluginPlatform.pluginPrefixes.includes(item.toString()));
 

diff --git a/packages/amplify-cli/src/commands/plugin/help.ts b/packages/amplify-cli/src/commands/plugin/help.ts
@@ -1,4 +1,4 @@
-import Context from '../../domain/context';
+import { Context } from '../../domain/context';
 
 export function run(context: Context) {
   context.print.info('');

diff --git a/packages/amplify-cli/src/commands/plugin/list.ts b/packages/amplify-cli/src/commands/plugin/list.ts
@@ -1,6 +1,6 @@
-import Context from '../../domain/context';
+import { Context } from '../../domain/context';
 import inquirer from '../../domain/inquirer-helper';
-import PluginCollection from '../../domain/plugin-collection';
+import { PluginCollection } from '../../domain/plugin-collection';
 import { displayGeneralInfo, displayPluginCollection, displayPluginInfoArray } from '../../plugin-helpers/display-plugin-platform';
 
 export async function run(context: Context) {

diff --git a/packages/amplify-cli/src/commands/plugin/new.ts b/packages/amplify-cli/src/commands/plugin/new.ts
@@ -1,9 +1,9 @@
-import Context from '../../domain/context';
-import constants from '../../domain/constants';
+import path from 'path';
+import { Context } from '../../domain/context';
+import { constants } from '../../domain/constants';
 import { createNewPlugin } from '../../plugin-manager';
 import { addUserPluginPackage } from '../../plugin-manager';
 import { AddPluginError } from '../../domain/add-plugin-result';
-import path from 'path';
 
 export async function run(context: Context) {
   const pluginDirPath = await createNewPlugin(context, process.cwd());

diff --git a/packages/amplify-cli/src/commands/plugin/remove.ts b/packages/amplify-cli/src/commands/plugin/remove.ts
@@ -1,17 +1,17 @@
-import Context from '../../domain/context';
+import { Context } from '../../domain/context';
 import { removePluginPackage, confirmAndScan } from '../../plugin-manager';
-import PluginPlatform from '../../domain/plugin-platform';
-import Constant from '../../domain/constants';
+import { PluginPlatform } from '../../domain/plugin-platform';
+import { constants } from '../../domain/constants';
 import inquirer, { InquirerOption, EXPAND } from '../../domain/inquirer-helper';
-import PluginInfo from '../../domain/plugin-info';
+import { PluginInfo } from '../../domain/plugin-info';
 
 export async function run(context: Context) {
   const options = new Array<InquirerOption>();
   const { plugins } = context.pluginPlatform;
 
   if (plugins && Object.keys(plugins).length > 0) {
     Object.keys(plugins).forEach(key => {
-      if (key === Constant.CORE) {
+      if (key === constants.CORE) {
         return;
       }
 

diff --git a/packages/amplify-cli/src/commands/plugin/scan.ts b/packages/amplify-cli/src/commands/plugin/scan.ts
@@ -1,6 +1,6 @@
-import Context from '../../domain/context';
-import { scan as pluginManagerScan } from '../../plugin-manager';
+import { Context } from '../../domain/context';
+import { scan } from '../../plugin-manager';
 
 export async function run(context: Context) {
-  await pluginManagerScan();
+  await scan();
 }
diff --git a/packages/amplify-cli/src/commands/plugin/verify.ts b/packages/amplify-cli/src/commands/plugin/verify.ts
@@ -1,4 +1,4 @@
-import Context from '../../domain/context';
+import { Context } from '../../domain/context';
 import { verifyPlugin } from '../../plugin-manager';
 
 export async function run(context: Context) {

diff --git a/packages/amplify-cli/src/commands/version.ts b/packages/amplify-cli/src/commands/version.ts
@@ -1,4 +1,4 @@
-import Context from '../domain/context';
+import { Context } from '../domain/context';
 import { readJsonFileSync } from '../utils/readJsonFile';
 import path from 'path';
 

diff --git a/packages/amplify-cli/src/context-extensions.ts b/packages/amplify-cli/src/context-extensions.ts
@@ -1,4 +1,4 @@
-import Context from './domain/context';
+import { Context } from './domain/context';
 import fs from 'fs-extra';
 import path from 'path';
 import importedColors from 'colors/safe';

diff --git a/packages/amplify-cli/src/context-manager.ts b/packages/amplify-cli/src/context-manager.ts
@@ -1,6 +1,6 @@
-import Context from './domain/context';
-import Input from './domain/input';
-import PluginPlatform from './domain/plugin-platform';
+import { Context } from './domain/context';
+import { Input } from './domain/input';
+import { PluginPlatform } from './domain/plugin-platform';
 import { attachExtentions } from './context-extensions';
 
 export function constructContext(pluginPlatform: PluginPlatform, input: Input): Context {

diff --git a/packages/amplify-cli/src/domain/add-plugin-result.ts b/packages/amplify-cli/src/domain/add-plugin-result.ts
@@ -1,6 +1,6 @@
-import PluginVerificationResult from './plugin-verification-result';
+import { PluginVerificationResult } from './plugin-verification-result';
 
-export default class AddPluginResult {
+export class AddPluginResult {
   constructor(public isAdded: boolean = false, public pluginVerificationResult?: PluginVerificationResult, public error?: AddPluginError) {}
 }
 

diff --git a/packages/amplify-cli/src/domain/amplify-toolkit.ts b/packages/amplify-cli/src/domain/amplify-toolkit.ts
@@ -1,6 +1,6 @@
 import path from 'path';
 
-export default class AmplifyToolkit {
+export class AmplifyToolkit {
   private _buildResources: any;
   private _confirmPrompt: any;
   private _constants: any;

diff --git a/packages/amplify-cli/src/domain/constants.ts b/packages/amplify-cli/src/domain/constants.ts
@@ -1,4 +1,4 @@
-export default {
+export const constants = {
   HELP: 'help',
   HELP_SHORT: 'h',
   VERSION: 'version',

diff --git a/packages/amplify-cli/src/domain/context.ts b/packages/amplify-cli/src/domain/context.ts
@@ -1,8 +1,8 @@
-import Input from './input';
-import AmplifyToolkit from './amplify-toolkit';
-import PluginPlatform from './plugin-platform';
+import { Input } from './input';
+import { AmplifyToolkit } from './amplify-toolkit';
+import { PluginPlatform } from './plugin-platform';
 
-export default class Context {
+export class Context {
   amplify: AmplifyToolkit;
   constructor(public pluginPlatform: PluginPlatform, public input: Input) {
     this.amplify = new AmplifyToolkit();

diff --git a/packages/amplify-cli/src/domain/input-verification-result.ts b/packages/amplify-cli/src/domain/input-verification-result.ts
@@ -1,4 +1,4 @@
-export default class InputVerificationResult {
+export class InputVerificationResult {
   constructor(
     public verified: boolean = false,
     public helpCommandAvailable: boolean = false,

diff --git a/packages/amplify-cli/src/domain/input.ts b/packages/amplify-cli/src/domain/input.ts
@@ -1,4 +1,4 @@
-export default class Input {
+export class Input {
   argv: Array<string>;
   plugin?: string;
   command?: string;

diff --git a/packages/amplify-cli/src/domain/plugin-collection.ts b/packages/amplify-cli/src/domain/plugin-collection.ts
@@ -1,5 +1,5 @@
-import PluginInfo from './plugin-info';
+import { PluginInfo } from './plugin-info';
 
-export default class PluginCollection {
+export class PluginCollection {
   [key: string]: Array<PluginInfo>;
 }
diff --git a/packages/amplify-cli/src/domain/plugin-info.ts b/packages/amplify-cli/src/domain/plugin-info.ts
@@ -1,5 +1,5 @@
-import PluginManifest from './plugin-manifest';
+import { PluginManifest } from './plugin-manifest';
 
-export default class PluginInfo {
+export class PluginInfo {
   constructor(public packageName: string, public packageVersion: string, public packageLocation: string, public manifest: PluginManifest) {}
 }
diff --git a/packages/amplify-cli/src/domain/plugin-manifest.ts b/packages/amplify-cli/src/domain/plugin-manifest.ts
@@ -1,6 +1,6 @@
 import { AmplifyEvent } from './amplify-event';
 
-export default class PluginManifest {
+export class PluginManifest {
   constructor(
     public name: string,
     public type: string,

diff --git a/packages/amplify-cli/src/domain/plugin-platform.ts b/packages/amplify-cli/src/domain/plugin-platform.ts
@@ -1,9 +1,9 @@
-import PluginCollection from './plugin-collection';
-import constants from './constants';
+import { PluginCollection } from './plugin-collection';
+import { constants } from './constants';
 
 const SECONDSINADAY = 86400;
 
-export default class PluginPlatform {
+export class PluginPlatform {
   constructor() {
     this.pluginDirectories = [constants.LocalNodeModules, constants.ParentDirectory, constants.GlobalNodeModules];
     this.pluginPrefixes = [constants.AmplifyPrefix];

diff --git a/packages/amplify-cli/src/domain/plugin-verification-result.ts b/packages/amplify-cli/src/domain/plugin-verification-result.ts
@@ -1,6 +1,6 @@
-import PluginManifest from './plugin-manifest';
+import { PluginManifest } from './plugin-manifest';
 
-export default class PluginVerificationResult {
+export class PluginVerificationResult {
   constructor(
     public verified: boolean = false,
     public error?: PluginVerificationError,

diff --git a/packages/amplify-cli/src/execution-manager.ts b/packages/amplify-cli/src/execution-manager.ts
@@ -1,11 +1,10 @@
 import fs from 'fs-extra';
 import path from 'path';
-import Context from './domain/context';
-import Constant from './domain/constants';
+import { Context } from './domain/context';
+import { constants } from './domain/constants';
 import { scan, getPluginsWithNameAndCommand, getPluginsWithEventHandler } from './plugin-manager';
-import PluginInfo from './domain/plugin-info';
+import { PluginInfo } from './domain/plugin-info';
 import inquirer from './domain/inquirer-helper';
-import constants from './domain/constants';
 import {
   AmplifyEvent,
   AmplifyEventArgs,
@@ -99,7 +98,7 @@ async function executePluginModuleCommand(context: Context, plugin: PluginInfo)
 }
 
 async function raisePreEvent(context: Context) {
-  if (context.input.plugin === Constant.CORE) {
+  if (context.input.plugin === constants.CORE) {
     if (context.input.command === 'init') {
       await raisePreInitEvent(context);
     } else if (context.input.command === 'push') {
@@ -117,7 +116,7 @@ async function raisePrePushEvent(context: Context) {
 }
 
 async function raisePostEvent(context: Context) {
-  if (context.input.plugin === Constant.CORE) {
+  if (context.input.plugin === constants.CORE) {
     if (context.input.command === 'init') {
       await raisePostInitEvent(context);
     } else if (context.input.command === 'push') {

diff --git a/packages/amplify-cli/src/index.ts b/packages/amplify-cli/src/index.ts
@@ -1,12 +1,12 @@
-import Input from './domain/input';
+import * as path from 'path';
+import { Input } from './domain/input';
 import { getPluginPlatform, scan } from './plugin-manager';
 import { getCommandLineInput, verifyInput } from './input-manager';
 import { constructContext, persistContext } from './context-manager';
 import { print } from './context-extensions';
 import { executeCommand } from './execution-manager';
-import Context from './domain/context';
-import constants from './domain/constants';
-import * as path from 'path';
+import { Context } from './domain/context';
+import { constants } from './domain/constants';
 
 // entry from commandline
 export async function run(): Promise<number> {