Update flags and workflow

axiom-crypto · Jun 21, 2024 · caac23b · caac23b
1 parent 2c6282a
commit caac23b
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 23 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -67,7 +67,7 @@ jobs:
 
       - name: Initialize app
         working-directory: ./axiom-init
-        run: node dist/index.js init -p app-nextjs -s nextjs -m npm -sq -c 11155111
+        run: node dist/index.js init -p app-nextjs -s nextjs -m npm -c 11155111
 
       - name: Compile circuit
         working-directory: ./axiom-init/app-nextjs
@@ -134,7 +134,7 @@ jobs:
 
       - name: Initialize app
         working-directory: ./axiom-init
-        run: node dist/index.js init -p app-nextjs -s nextjs -m yarn -sq -c 11155111
+        run: node dist/index.js init -p app-nextjs -s nextjs -m yarn -c 11155111
 
       - name: Compile circuit
         working-directory: ./axiom-init/app-nextjs
@@ -201,7 +201,7 @@ jobs:
 
       - name: Initialize app
         working-directory: ./axiom-init
-        run: node dist/index.js init -p app-nextjs -s nextjs -m pnpm -sq -c 84532
+        run: node dist/index.js init -p app-nextjs -s nextjs -m pnpm -c 84532
 
       - name: Compile circuit
         working-directory: ./axiom-init/app-nextjs
@@ -261,7 +261,7 @@ jobs:
 
       - name: Initialize app
         working-directory: ./axiom-init
-        run: node dist/index.js init -p app-script -s script -m npm -sq -c 84532
+        run: node dist/index.js init -p app-script -s script -m npm -c 84532
 
       - name: Compile circuit
         working-directory: ./axiom-init/app-script
@@ -323,7 +323,7 @@ jobs:
 
       - name: Initialize app
         working-directory: ./axiom-init
-        run: node dist/index.js init -p app-script -s script -m yarn -sq -c 11155111
+        run: node dist/index.js init -p app-script -s script -m yarn -c 11155111
 
       - name: Compile circuit
         working-directory: ./axiom-init/app-script
@@ -385,7 +385,7 @@ jobs:
 
       - name: Initialize app
         working-directory: ./axiom-init
-        run: node dist/index.js init -p app-script -s script -m pnpm -sq -c 1
+        run: node dist/index.js init -p app-script -s script -m pnpm -c 1
 
       - name: Compile circuit
         working-directory: ./axiom-init/app-script
@@ -444,7 +444,7 @@ jobs:
 
       - name: Initialize app
         working-directory: ./axiom-init
-        run: node dist/index.js init -p app-forge -s forge -m npm -sq -c 1
+        run: node dist/index.js init -p app-forge -s forge -m npm -c 1
 
       - name: Compile circuit
         working-directory: ./axiom-init/app-forge
@@ -500,7 +500,7 @@ jobs:
 
       - name: Initialize app
         working-directory: ./axiom-init
-        run: node dist/index.js init -p app-forge -s forge -m yarn -sq -c 84532
+        run: node dist/index.js init -p app-forge -s forge -m yarn -c 84532
 
       - name: Compile circuit
         working-directory: ./axiom-init/app-forge
@@ -554,7 +554,7 @@ jobs:
 
       - name: Initialize app
         working-directory: ./axiom-init
-        run: node dist/index.js init -p app-forge -s forge -m pnpm -sq -c 11155111
+        run: node dist/index.js init -p app-forge -s forge -m pnpm -c 11155111
 
       - name: Compile circuit
         working-directory: ./axiom-init/app-forge
@@ -608,7 +608,7 @@ jobs:
 
       - name: Initialize app
         working-directory: ./axiom-init
-        run: node dist/index.js init -p app-forge -s nextjs -m npm -cq -sc 11155111 -tc 84532
+        run: node dist/index.js init -p app-forge -s nextjs -m npm --query-type crosschain -sc 11155111 -tc 84532
 
       - name: Compile circuit
         working-directory: ./axiom-init/app-forge

diff --git a/axiom-init/src/index.ts b/axiom-init/src/index.ts
@@ -23,11 +23,10 @@ async function main() {
     .option("-p, --path <path>", "file path")
     .option("-s, --scaffold <type>", "type of scaffold (nextjs, script, forge, none)")
     .option("-m, --manager <name>", "package manager to use (npm, yarn, pnpm)")
-    .option("-sq, --single-chain", "single chain query (default)")
-    .option("-cq, --cross-chain", "cross chain query")
+    .option("-q, --query-type", "type of query (`samechain`, `crosschain`) [default: samechain]")
     .option("-c, --chain-id <number>", "(samechain) chainId (default: 11155111)")
-    .option("-tc, --target-chain-id <number>", "(crosschain) target chainId (default: 84532)")
-    .option("-sc, --source-chain-id <number>", "(crosschain) source chainId (default: 11155111)")
+    .option("-tc, --target-chain-id <number>", "(crosschain) target chainId [default: 84532]")
+    .option("-sc, --source-chain-id <number>", "(crosschain) source chainId [default: 11155111]")
     .action(init);
 
   const scaffold = program.command("scaffold")

diff --git a/axiom-init/src/projectScaffold/init.ts b/axiom-init/src/projectScaffold/init.ts
@@ -1,9 +1,4 @@
-import prompt, { PromptObject } from 'prompts';
-import { validateForge, validatePackageManager } from './dependency';
 import { scaffoldProject } from './project';
-import { ProjectScaffoldManager } from './projectScaffoldManager';
-import { filterQuestions, parseAnswer } from './utils';
-import { Options, Prompts } from '../constants';
 import { setup } from '../setup';
 import { ProjectScaffoldOptions } from '../types';
 

diff --git a/axiom-init/src/setup.ts b/axiom-init/src/setup.ts
@@ -60,12 +60,12 @@ export const setup = async (
   // Get queryType response and use it to determine which questions to ask next
   let isCrosschain = false;
   const queryType = answers0.queryType;
-  if (queryType === "samechain") {
-    isCrosschain = false;
-  } else if (queryType === "crosschain") {
+  if (queryType === "crosschain") {
     isCrosschain = true;
+  } else if (!queryType || queryType === "samechain") {
+    isCrosschain = false;
   } else {
-    throw new Error(`Invalid query type: ${queryType}`);
+    throw new Error(`Invalid query type: ${queryType}. Valid query types are ('samechain', 'crosschain')`);
   }
 
   if (!isCrosschain) {