Merge pull request #346 from near/fix-contract-method-conflicting

Error and stop build a contract that has method name confliction
near · Feb 24, 2023 · 4b7fc3c · 4b7fc3c
2 parents 09ebf81 + e6ff90a
commit 4b7fc3c
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 0 deletions.
diff --git a/packages/near-sdk-js/lib/cli/cli.js b/packages/near-sdk-js/lib/cli/cli.js
diff --git a/packages/near-sdk-js/lib/cli/utils.js b/packages/near-sdk-js/lib/cli/utils.js
diff --git a/packages/near-sdk-js/src/cli/cli.ts b/packages/near-sdk-js/src/cli/cli.ts
@@ -342,6 +342,12 @@ async function createMethodsHeaderFile(rollupTarget: string, verbose = false) {
 
   const mod = await import(`${PROJECT_DIR}/${rollupTarget}`);
   const exportNames = Object.keys(mod);
+  if (exportNames.includes('panic')) {
+    signal.error(
+      "'panic' is a reserved word, please use another name for contract method"
+    );
+    process.exit(1);
+  }
   const methods = exportNames.reduce(
     (result, key) => `${result}DEFINE_NEAR_METHOD(${key})\n`,
     ""

diff --git a/packages/near-sdk-js/src/cli/utils.ts b/packages/near-sdk-js/src/cli/utils.ts
@@ -28,6 +28,11 @@ export async function executeCommand(
   }
   if (code != 0) {
     signale.error(`Command failed: ${command}`);
+
+    const failDueToNameConflict = stderr.match(/conflicting types for '([a-zA-Z0-9_]+)'/);
+    if (failDueToNameConflict.length > 1) {
+      signale.error(`'${failDueToNameConflict[1]}' is a reserved word, please use another name for contract method"`);
+    }
   }
   if (stderr && verbose) {
     signale.error(`Command stderr: ${stderr}`);