move relative path correction logic up, add to other command

AztecProtocol · Oct 10, 2023 · b6838e7 · b6838e7
1 parent 0b63a54
commit b6838e7
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 44 deletions.
diff --git a/yarn-project/boxes/blank-react/src/artifacts/Blank.json b/yarn-project/boxes/blank-react/src/artifacts/Blank.json
diff --git a/yarn-project/boxes/blank/src/artifacts/Blank.json b/yarn-project/boxes/blank/src/artifacts/Blank.json
diff --git a/yarn-project/boxes/private-token/src/artifacts/PrivateToken.json b/yarn-project/boxes/private-token/src/artifacts/PrivateToken.json
diff --git a/yarn-project/noir-compiler/src/cli/contract.ts b/yarn-project/noir-compiler/src/cli/contract.ts
@@ -59,7 +59,14 @@ export function compileContract(program: Command, name = 'contract', log: LogFn
           if (typescript) {
             const tsPath = resolve(projectPath, typescript, `${contract.name}.ts`);
             log(`Writing ${contract.name} typescript interface to ${path.relative(currentDir, tsPath)}`);
-            const relativeArtifactPath = path.relative(path.dirname(tsPath), artifactPath);
+            let relativeArtifactPath = path.relative(path.dirname(tsPath), artifactPath);
+            log(`Relative path: ${relativeArtifactPath}`);
+            if (relativeArtifactPath === `${contract.name}.json`) {
+              // relative path edge case, prepending ./ for local import - the above logic just does
+              // `${contract.name}.json`, which is not a valid import for a file in the same directory
+              relativeArtifactPath = `./${contract.name}.json`;
+            }
+            log(`Relative path after correction: ${relativeArtifactPath}`);
             const tsWrapper = generateTypescriptContractInterface(contract, relativeArtifactPath);
             mkdirpSync(path.dirname(tsPath));
             writeFileSync(tsPath, tsWrapper);

diff --git a/yarn-project/noir-compiler/src/cli/typescript.ts b/yarn-project/noir-compiler/src/cli/typescript.ts
@@ -49,12 +49,12 @@ export function generateTypescriptInterface(program: Command, name = 'typescript
             const tsPath = resolve(projectPath, outdir, `${contract.name}.ts`);
             log(`Writing ${contract.name} typescript interface to ${path.relative(currentDir, tsPath)}`);
             let relativeArtifactPath = path.relative(path.dirname(tsPath), artifactPath);
+            if (relativeArtifactPath === `${contract.name}.json`) {
+              // relative path edge case, prepending ./ for local import - the above logic just does
+              // `${contract.name}.json`, which is not a valid import for a file in the same directory
+              relativeArtifactPath = `./${contract.name}.json`;
+            }
             try {
-              if (relativeArtifactPath === `${contract.name}.json`) {
-                // relative path edge case, prepending ./ for local import - the above logic just does
-                // `${contract.name}.json`, which is not a valid import for a file in the same directory
-                relativeArtifactPath = `./${contract.name}.json`;
-              }
               const tsWrapper = generateTypescriptContractInterface(contract, relativeArtifactPath);
               mkdirpSync(path.dirname(tsPath));
               writeFileSync(tsPath, tsWrapper);

diff --git a/yarn-project/yarn.lock b/yarn-project/yarn.lock
@@ -6981,7 +6981,6 @@ __metadata:
     "@aztec/aztec-ui": ^0.1.14
     "@aztec/aztec.js": "workspace:^"
     "@aztec/circuits.js": "workspace:^"
-    "@aztec/cli": "workspace:^"
     "@aztec/foundation": "workspace:^"
     "@aztec/types": "workspace:^"
     "@types/node": ^20.5.9
@@ -7031,7 +7030,6 @@ __metadata:
     "@aztec/aztec-ui": ^0.1.14
     "@aztec/aztec.js": "workspace:^"
     "@aztec/circuits.js": "workspace:^"
-    "@aztec/cli": "workspace:^"
     "@aztec/foundation": "workspace:^"
     "@typescript-eslint/eslint-plugin": ^6.0.0
     "@typescript-eslint/parser": ^6.0.0
@@ -15598,7 +15596,6 @@ __metadata:
     "@aztec/aztec-ui": ^0.1.14
     "@aztec/aztec.js": "workspace:^"
     "@aztec/circuits.js": "workspace:^"
-    "@aztec/cli": "workspace:^"
     "@aztec/foundation": "workspace:^"
     "@aztec/types": "workspace:^"
     "@types/node": ^20.5.9