Merge pull request #805 from onflow/staging

fix for #804

.github/workflows/ci.yml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [16.x]
+        node-version: [18.x]
 
     steps:
       - uses: actions/checkout@v2

package.json

@@ -8,7 +8,7 @@
     "start": "webpack-dev-server -d source-map --config webpack.config.js",
     "build": "webpack --mode=production",
     "graphql:codegen": "npx graphql-codegen --config codegen.yml",
-    "test": "echo Tests command not implemented.",
+    "test": "jest",
     "format:app": "prettier --write 'src'",
     "format:check:app": "prettier --check 'src/**/*.{js,jsx,ts,tsx,css}' ",
     "lint": "eslint --ext .js,.jsx,.ts,.tsx src",
@@ -85,6 +85,7 @@
     "@sentry/types": "^7.44.0",
     "@types/file-saver": "^2.0.5",
     "@types/isomorphic-fetch": "0.0.36",
+    "@types/jest": "^29.5.13",
     "@types/mixpanel-browser": "^2.38.0",
     "@types/reach__router": "^1.3.10",
     "@types/react": "^17.0.39",

src/providers/Project/projectDefault.ts

@@ -111,7 +111,7 @@ export function createLocalProject(
   const accountEntities: Account[] = accounts.map((_account) => {
     return {
       __typename: 'Account',
-      address: _account.padStart(16, "0"),
+      address: _account.padStart(16, '0'),
       deployedContracts: [],
       state: DEFAULT_ACCOUNT_STATE,
     };

src/util/parser.test.ts

@@ -0,0 +1,24 @@
+import { extractSigners } from './parser';
+
+const oneSigner = `
+transaction {
+  prepare(acct: auth(LoadValue, SaveValue) &Account) {}
+}`;
+
+const twoSigners = `
+transaction {
+  prepare(authorizer1: auth(Capabilities,SomethingElse) &Account, authorizer2: auth(Storage,Vaults) &Account) { }
+}`;
+
+describe('parser tests', () => {
+  it('should extract one code signer', () => {
+    const signers = extractSigners(oneSigner);
+
+    expect(signers).toHaveLength(1);
+  });
+  it('should extract two code signer', () => {
+    const signers = extractSigners(twoSigners);
+
+    expect(signers).toHaveLength(2);
+  });
+});

src/util/parser.ts

@@ -2,10 +2,18 @@ export const collapseSpaces = (input: string) => input.replace(/\s+/g, ' ');
 export const stripNewLines = (input: string) =>
   input.replace(/\r\n|\n|\r/g, ' ');
 
+const COMMA_PLACEHOLDER = '<COMMA>';
+
 export const generateSchema = (argsDefinition: string) =>
   argsDefinition
+    .replace(/\(([^()]+)\)/g, (match) => {
+      // Replace commas with placeholder inside the parentheses content
+      return match.replace(/,/g, COMMA_PLACEHOLDER);
+    })
     .split(',')
-    .map((item) => item.replace(/\s*/g, ''))
+    .map((item) =>
+      item.replace(/\s*/g, '').replace(new RegExp(COMMA_PLACEHOLDER, 'g'), ','),
+    )
     .filter((item) => item !== '');
 
 export const stripComments = (code: string) => {
@@ -32,5 +40,5 @@ export const extract = (code: string, keyWord: string) => {
 };
 
 export const extractSigners = (code: string) => {
-  return extract(code, `(?:prepare\\s*\\(\\s*)([^\\)]*)(?:\\))`);
+  return extract(code, `(?:prepare\\s*\\(\\s*)([^{}]*)(?:\\))`);
 };

tsconfig.json

@@ -1,7 +1,7 @@
 {
   "compileOnSave": false,
   "compilerOptions": {
-    "types": ["node"],
+    "types": ["node", "jest"],
     "target": "es6",
     "module": "esnext",
     "jsx": "react",