First functional CLI same as the zk-regex script

Shigoto-dev19 · Shigoto-dev19 · commit 6e32c2b32c89 · 2024-07-17T11:10:48.000+03:00
diff --git a/src/cli.ts b/src/cli.ts
@@ -1,20 +1,33 @@
 import { RegexCompiler } from './compiler.js';
 import { Command } from 'commander';
 
+//TODO edit to add more flexibility removing JSON.parse()
+//TODO take options into considersations --> split reveal transitions/subpattern
+
 // Initialize the commander program
 const program = new Command();
 
 program
-  .version('1.0.0')
-  .description('CLI for Regex Compiler')
+  .version('0.1.0')
+  .description('CLI for ZK Regex Compiler in o1js')
   .argument('<rawRegex>', 'Raw regex pattern to compile')
   .option('-c, --count', 'Enable count')
+  .option('-r, --reveal <inputs>', 'Reveal regex pattern substring')
   .action((rawRegex, options) => {
+    // Extract and set the options
     const countEnabled = options.count || false;
+    const revealEnabled = options.reveal ? true : false;
+    const transitionInput = revealEnabled ? options.reveal : undefined;
 
+    // Initialize the RegexCompiler
     const compiler = RegexCompiler.initialize(rawRegex, true);
-    compiler.printRegexCircuit(countEnabled, false);
+
+    // Print the regex circuit based on the options
+    compiler.printRegexCircuit(countEnabled, revealEnabled, transitionInput);
   });
 
 // Parse the command-line arguments
 program.parse(process.argv);
+
+// node build/src/cli.js '[a-z]' -r '[[[0, 1]]]'
+// node build/src/cli.js '[a-z]' -r '["[a-z]"]'
diff --git a/src/compiler.ts b/src/compiler.ts
@@ -465,11 +465,11 @@ export class RegexCompiler {
     return revealLines;
   }
 
-  private writeRevealLines(revealEnabled: boolean) {
+  private writeRevealLines(revealEnabled: boolean, transitionInput?: string) {
     let revealLines: string;
     if (revealEnabled) {
       const parsedInput: string[] | [number, number][][] = JSON.parse(
-        process.argv[3]
+        transitionInput ?? process.argv[3]
       );
 
       let revealedTransitions: [number, number][][];
@@ -492,7 +492,11 @@ export class RegexCompiler {
     return revealLines;
   }
 
-  printRegexCircuit(countEnabled: boolean, revealEnabled: boolean) {
+  printRegexCircuit(
+    countEnabled: boolean,
+    revealEnabled: boolean,
+    transitionInput?: string
+  ) {
     let circuitLines: string[] = [];
     circuitLines = this.writeDeclarationLines()
       .concat(this.writeInitLines())
@@ -502,7 +506,7 @@ export class RegexCompiler {
     const stringRegexCircuit =
       '\n(input: UInt8[]) {\n' +
       circuitLines.join('\n\t') +
-      this.writeRevealLines(revealEnabled) +
+      this.writeRevealLines(revealEnabled, transitionInput) +
       '\n}';
 
     const BOLD_GREEN = '\x1b[32;1m';
