refactor: reorganize common parameters and scripts into utility_scrip…

…ts module
EnsembleUI · Dec 31, 2024 · 0d94acb · 0d94acb
1 parent 6805eef
commit 0d94acb
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 48 deletions.
diff --git a/starter/src/dart_runner.ts b/starter/src/dart_runner.ts
@@ -1,12 +1,12 @@
 import { exec } from 'child_process';
-import { commonParameters } from './modules';
 import { ArgumentParseResult, Script } from './interfaces';
 import {
   checkAndAskForMissingArgs,
   findScript,
   logError,
   selectModules,
 } from './utils';
+import { commonParameters } from './utility_scripts';
 
 const parseArguments = (args: string[]): ArgumentParseResult => {
   const scripts: string[] = [];

diff --git a/starter/src/modules.ts → starter/src/modules_scripts.ts b/starter/src/modules.ts → starter/src/modules_scripts.ts
@@ -3,24 +3,7 @@ import {
   firebaseIOSParameters,
   firebaseWebParameters,
 } from './common-params';
-import { Parameter, Script } from './interfaces';
-
-// Common parameters available across scripts and modules
-export const commonParameters: Parameter[] = [
-  {
-    key: 'platform',
-    question: 'Which platform(s) are you targeting?',
-    type: 'select',
-    choices: ['ios', 'android', 'web'],
-    platform: ['android', 'ios', 'web'],
-  },
-  {
-    key: 'ensemble_version',
-    question: 'Which version of ensemble are you using?',
-    type: 'text',
-    platform: ['android', 'ios', 'web'],
-  },
-];
+import { Script } from './interfaces';
 
 // Modules (called with `enable` command)
 export const modules: Script[] = [
@@ -299,31 +282,3 @@ export const modules: Script[] = [
     ],
   },
 ];
-
-// Custom Scripts (standalone Dart scripts)
-export const scripts: Script[] = [
-  {
-    name: 'generateKeystore',
-    path: 'scripts/generate_keystore.dart',
-    parameters: [
-      {
-        key: 'storePassword',
-        question: 'Please provide the store password: ',
-        platform: ['android'],
-        type: 'text',
-      },
-      {
-        key: 'keyPassword',
-        question: 'Please provide the key password: ',
-        platform: ['android'],
-        type: 'text',
-      },
-      {
-        key: 'keyAlias',
-        question: 'Please provide the key alias: ',
-        platform: ['android'],
-        type: 'text',
-      },
-    ],
-  },
-];
diff --git a/starter/src/utility_scripts.ts b/starter/src/utility_scripts.ts
@@ -0,0 +1,46 @@
+import { Parameter, Script } from './interfaces';
+
+// Common parameters available across scripts and modules
+export const commonParameters: Parameter[] = [
+  {
+    key: 'platform',
+    question: 'Which platform(s) are you targeting?',
+    type: 'select',
+    choices: ['ios', 'android', 'web'],
+    platform: ['android', 'ios', 'web'],
+  },
+  {
+    key: 'ensemble_version',
+    question: 'Which version of ensemble are you using?',
+    type: 'text',
+    platform: ['android', 'ios', 'web'],
+  },
+];
+
+// Custom Scripts (standalone Dart scripts)
+export const scripts: Script[] = [
+  {
+    name: 'generateKeystore',
+    path: 'scripts/generate_keystore.dart',
+    parameters: [
+      {
+        key: 'storePassword',
+        question: 'Please provide the store password: ',
+        platform: ['android'],
+        type: 'text',
+      },
+      {
+        key: 'keyPassword',
+        question: 'Please provide the key password: ',
+        platform: ['android'],
+        type: 'text',
+      },
+      {
+        key: 'keyAlias',
+        question: 'Please provide the key alias: ',
+        platform: ['android'],
+        type: 'text',
+      },
+    ],
+  },
+];
diff --git a/starter/src/utils.ts b/starter/src/utils.ts
@@ -1,6 +1,7 @@
 import prompts from 'prompts';
 import { Parameter, Platform, Script } from './interfaces';
-import { commonParameters, modules, scripts } from './modules';
+import { commonParameters, scripts } from './utility_scripts';
+import { modules } from './modules_scripts';
 
 export const findScript = (name: string): Script => {
   const script =