Merge pull request #123 from magiclabs/staging

Making flag inputs case insensitive
magiclabs · Jan 22, 2024 · 4073bb8 · 4073bb8
2 parents 84bd04d + af1f9e2
commit 4073bb8
Show file tree

Hide file tree

Showing 8 changed files with 80 additions and 10 deletions.
diff --git a/core/cli.ts b/core/cli.ts
@@ -5,7 +5,7 @@ import { createApp } from './create-app';
 import { printHelp } from './help-text';
 import { resolveToRoot } from './utils/path-helpers';
 import { CreateMagicAppError, CreateMagicAppErrorCode } from './utils/errors-warnings';
-import { parseFlags } from './flags';
+import { makeInputsLowercase, parseFlags } from './flags';
 import { globalOptions } from './global-options';
 import { shutdown, useGracefulShutdown } from './utils/shutdown';
 import { SharedAnalytics } from './analytics';
@@ -47,6 +47,11 @@ export const ConsoleMessages = {
 
     return msg.join('\n');
   },
+
+  gitHubIssuesLink: () => {
+    const msg = chalk`For feedback/questions/issues, please use {rgb(0,255,255) https://github.com/magiclabs/create-magic-app/issues/new/choose}`;
+    return msg;
+  },
 };
 
 async function sayHello() {
@@ -71,6 +76,9 @@ async function sayHello() {
   } else {
     console.log(chalk`\n {dim v${getMakeMagicVersion()}}\n\n`);
   }
+
+  console.log(ConsoleMessages.gitHubIssuesLink());
+  console.log();
 }
 
 (async () => {
@@ -79,7 +87,14 @@ async function sayHello() {
 
   useGracefulShutdown();
 
-  const { version, help, projectName, template, branch, network, shareUsageData } = await parseFlags(globalOptions);
+  const parsedFlags = await parseFlags(globalOptions);
+  const { version, help, projectName, shareUsageData } = parsedFlags;
+  let { template, network, branch } = parsedFlags;
+
+  template = makeInputsLowercase(template);
+  network = makeInputsLowercase(network);
+  branch = makeInputsLowercase(branch);
+
   const collectUsageData = await initializeUsageConfigIfneeded();
   const config = loadConfig();
 

diff --git a/core/create-app.tsx b/core/create-app.tsx
@@ -71,7 +71,9 @@ export async function createApp(config: CreateMagicAppConfig) {
       };
     });
 
-  const isChosenTemplateValid = availableScaffolds.map((i) => i.name).includes(config?.template!);
+  const isChosenTemplateValid = availableScaffolds
+    .map((i) => i.name)
+    .includes((config?.template ? config.template : '').toLowerCase());
 
   if (config?.template && !isChosenTemplateValid) {
     printWarning(chalk`'{bold ${config.template}}' does not match any templates.`);

diff --git a/core/flags.ts b/core/flags.ts
@@ -91,7 +91,7 @@ export async function parseFlags<T extends Flags>(flags: T, data?: {}): Promise<
 
   Object.entries(flags).forEach(([flag, options]) => {
     if (options.alias) {
-      aliases[flag] = [options.alias];
+      aliases[flag] = [options.alias.toLowerCase()];
     }
 
     if (options.type === Boolean) {
@@ -183,3 +183,10 @@ async function validateFlagInputs<T extends Flags>(flags: T, inputs: {} = {}) {
     ),
   );
 }
+
+export function makeInputsLowercase(arg: string | undefined): string | undefined {
+  if (arg === undefined) {
+    return undefined;
+  }
+  return arg.toLowerCase();
+}
diff --git a/core/utils/templateMappings.ts b/core/utils/templateMappings.ts
@@ -8,6 +8,7 @@ import {
   PublishableApiKeyPrompt,
 } from 'scaffolds/prompts';
 import { CreateMagicAppConfig, pauseTimerAndSpinner } from 'core/create-app';
+import { makeInputsLowercase } from 'core/flags';
 import BaseScaffold from '../types/BaseScaffold';
 import DedicatedScaffold, { flags as dedicatedFlags } from '../../scaffolds/nextjs-dedicated-wallet/scaffold';
 import FlowDedicatedScaffold, {
@@ -75,6 +76,7 @@ export async function mapTemplateToScaffold(
   timer: Timer,
 ): Promise<BaseScaffold> {
   const data = appData;
+  data.network = makeInputsLowercase(data.network);
   pauseTimerAndSpinner(timer, spinner);
   if (!data.publishableApiKey) {
     data.publishableApiKey = await PublishableApiKeyPrompt.publishableApiKeyPrompt();

diff --git a/scaffolds/nextjs-dedicated-wallet/scaffold.ts b/scaffolds/nextjs-dedicated-wallet/scaffold.ts
@@ -57,8 +57,11 @@ export default class DedicatedScaffold extends BaseScaffold {
     this.data = data;
 
     if (typeof this.source !== 'string') {
-      data.loginMethods.forEach((authType) => {
-        (this.source as string[]).push(`./src/components/magic/auth/${authType.replaceAll(' ', '')}.tsx`);
+      this.data.loginMethods = this.data.loginMethods.map((authType) =>
+        AuthTypePrompt.mapInputToLoginMethods(authType),
+      );
+      this.data.loginMethods.forEach((authType) => {
+        (this.source as string[]).push(`./src/components/magic/auth/${authType}.tsx`);
         if (
           authType === 'Discord' ||
           authType === 'Facebook' ||
@@ -67,11 +70,14 @@ export default class DedicatedScaffold extends BaseScaffold {
           authType === 'Twitch' ||
           authType === 'Twitter'
         ) {
-          (this.source as string[]).push(`./public/social/${authType.replaceAll(' ', '')}.svg`);
+          (this.source as string[]).push(`./public/social/${authType}.svg`);
         }
-        if (authType.replaceAll(' ', '') === 'EmailOTP') {
+        if (authType === 'EmailOTP') {
           (this.source as string[]).push('./src/components/magic/wallet-methods/UpdateEmail.tsx');
         }
+        if (authType === 'SMSOTP') {
+          (this.source as string[]).push('./src/components/magic/wallet-methods/UpdatePhone.tsx');
+        }
       });
     }
   }

diff --git a/scaffolds/nextjs-flow-dedicated-wallet/scaffold.ts b/scaffolds/nextjs-flow-dedicated-wallet/scaffold.ts
@@ -57,7 +57,10 @@ export default class FlowDedicatedScaffold extends BaseScaffold {
     this.data = data;
 
     if (typeof this.source !== 'string') {
-      data.loginMethods.forEach((authType) => {
+      this.data.loginMethods = this.data.loginMethods.map((authType) =>
+        AuthTypePrompt.mapInputToLoginMethods(authType),
+      );
+      this.data.loginMethods.forEach((authType) => {
         (this.source as string[]).push(`./src/components/magic/auth/${authType.replaceAll(' ', '')}.tsx`);
         if (
           authType === 'Discord' ||

diff --git a/scaffolds/nextjs-solana-dedicated-wallet/scaffold.ts b/scaffolds/nextjs-solana-dedicated-wallet/scaffold.ts
@@ -57,7 +57,10 @@ export default class SolanaDedicatedScaffold extends BaseScaffold {
     this.data = data;
 
     if (typeof this.source !== 'string') {
-      data.loginMethods.forEach((authType) => {
+      this.data.loginMethods = this.data.loginMethods.map((authType) =>
+        AuthTypePrompt.mapInputToLoginMethods(authType),
+      );
+      this.data.loginMethods.forEach((authType) => {
         (this.source as string[]).push(`./src/components/magic/auth/${authType.replaceAll(' ', '')}.tsx`);
         if (
           authType === 'Discord' ||

diff --git a/scaffolds/prompts.ts b/scaffolds/prompts.ts
@@ -235,4 +235,36 @@ export namespace AuthTypePrompt {
       },
     },
   };
+
+  export const mapInputToLoginMethods = (input: string) => {
+    if (input.replaceAll(' ', '').toLocaleLowerCase().includes('emailotp')) {
+      return 'EmailOTP';
+    }
+
+    if (input.replaceAll(' ', '').toLocaleLowerCase().includes('smsotp')) {
+      return 'SMSOTP';
+    }
+
+    if (input.replaceAll(' ', '').toLocaleLowerCase().includes('google')) {
+      return 'Google';
+    }
+
+    if (input.replaceAll(' ', '').toLocaleLowerCase().includes('github')) {
+      return 'Github';
+    }
+
+    if (input.replaceAll(' ', '').toLocaleLowerCase().includes('discord')) {
+      return 'Discord';
+    }
+
+    if (input.replaceAll(' ', '').toLocaleLowerCase().includes('twitter')) {
+      return 'Twitter';
+    }
+
+    if (input.replaceAll(' ', '').toLocaleLowerCase().includes('twitch')) {
+      return 'Twitch';
+    }
+
+    return input;
+  };
 }