Updated version. Fixed typo. Handled errors gracefully. Handled null …

…values
dl-solarity · Nov 1, 2024 · 9d454fe · 9d454fe
1 parent 2825eab
commit 9d454fe
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 12 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@solarity/hardhat-zkit",
-  "version": "0.4.11",
+  "version": "0.4.12",
   "description": "The ultimate TypeScript environment for Circom development",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",

diff --git a/src/core/dependencies/parser/CircomFilesParser.ts b/src/core/dependencies/parser/CircomFilesParser.ts
@@ -6,7 +6,7 @@ import { CircuitsCompileCache } from "../../../cache";
 import { Reporter } from "../../../reporter";
 
 import { VisitorError } from "../parser/VisitorError";
-import { CircomResolvedFile, InputData, ResolvedFileData } from "../../../types/core";
+import { CircomResolvedFile, ErrorType, InputData, ResolvedFileData } from "../../../types/core";
 
 /**
  * A parser class for handling Circom files and extracting relevant data.
@@ -61,8 +61,12 @@ export class CircomFilesParser {
 
     circomFilesVisitor.visit(context);
 
-    if (circomFilesVisitor.errors.length > 0) {
-      throw new VisitorError(circomFilesVisitor.errors);
+    const visitorErrors = circomFilesVisitor.errors.filter(
+      (error) => error.type !== ErrorType.ComplexAccessNotSupported,
+    );
+
+    if (visitorErrors.length > 0) {
+      throw new VisitorError(visitorErrors);
     }
 
     this._cache.set(contentHash, { parsedFileData: circomFilesVisitor.fileData });
@@ -97,8 +101,12 @@ export class CircomFilesParser {
 
     circomTemplateInputsVisitor.startParse();
 
-    if (circomTemplateInputsVisitor.errors.length > 0) {
-      throw new VisitorError(circomTemplateInputsVisitor.errors);
+    const visitorErrors = circomTemplateInputsVisitor.errors.filter(
+      (error) => error.type !== ErrorType.ComplexAccessNotSupported,
+    );
+
+    if (visitorErrors.length > 0) {
+      throw new VisitorError(visitorErrors);
     }
 
     return circomTemplateInputsVisitor.templateInputs;

diff --git a/src/core/dependencies/parser/CircomFilesVisitor.ts b/src/core/dependencies/parser/CircomFilesVisitor.ts
@@ -74,7 +74,7 @@ export class CircomFilesVisitor extends CircomVisitor<void> {
     }
 
     this.fileData.templates[ctx.ID().getText()] = {
-      parameters: parseSimpleIdentifierList(ctx._argNames),
+      parameters: ctx._argNames ? parseSimpleIdentifierList(ctx._argNames) : [],
       isCustom: !!ctx.CUSTOM(),
       parallel: !!ctx.PARALLEL(),
       context: ctx,

diff --git a/src/core/dependencies/parser/CircomTemplateInputsVisitor.ts b/src/core/dependencies/parser/CircomTemplateInputsVisitor.ts
@@ -477,7 +477,7 @@ export class CircomTemplateInputsVisitor extends CircomVisitor<void> {
         break;
       default:
         this.errors.push({
-          type: ErrorType.ReachedUnkownOperation,
+          type: ErrorType.ReachedUnknownOperation,
           context: ctx,
           fileIdentifier: this.fileIdentifier,
           message: `Invalid operation type ${ctx.ASSIGNMENT_WITH_OP().getText()} (${ctx.start.line}:${ctx.start.column})`,
@@ -538,7 +538,7 @@ export class CircomTemplateInputsVisitor extends CircomVisitor<void> {
         break;
       default:
         this.errors.push({
-          type: ErrorType.ReachedUnkownOperation,
+          type: ErrorType.ReachedUnknownOperation,
           context: ctx,
           fileIdentifier: this.fileIdentifier,
           message: `Invalid operation type ${ctx.SELF_OP().getText()} (${ctx.start.line}:${ctx.start.column})`,

diff --git a/src/types/core/dependencies/parser/circom-files-visitor.ts b/src/types/core/dependencies/parser/circom-files-visitor.ts
@@ -23,7 +23,7 @@ export enum ErrorType {
   ComplexAccessNotSupported,
   AssigneeNotDeclared,
   QUOOperationNotSupported,
-  ReachedUnkownOperation,
+  ReachedUnknownOperation,
   InvalidIncDecOperation,
 }