use relative path in artifact file

Author: freedomhero

src/compilerWrapper.ts

@@ -1,6 +1,6 @@
 import { ChildProcess, exec, execSync } from 'child_process';
 import { existsSync, mkdirSync, readFileSync, renameSync, unlinkSync, writeFileSync } from 'fs';
-import { basename, dirname, join } from 'path';
+import { basename, dirname, join, relative } from 'path';
 import {
   buildTypeResolver, Artifact, CURRENT_CONTRACT_ARTIFACT_VERSION, findCompiler, hash160, md5, path2uri, resolveConstValue, TypeResolver
 } from './internal';
@@ -457,6 +457,11 @@ export function handleCompilerOutput(
         const artifact = result.toArtifact();
 
         writeFileSync(artifactFile, JSON.stringify(artifact, (key, value) => {
+
+          if (key === 'file') {
+            return relative(artifactFile, value)
+          }
+
           //ignore deprecated fields
           if (key == 'sources' || key == 'sourceMap' || key === 'asm')
             return undefined;
@@ -542,7 +547,7 @@ export function getFullFilePath(relativePath: string, baseDir: string, curFileNa
   }
 
   if (relativePath === 'std') {
-    return 'std'; // 
+    return 'std'; //
   }
 
   return join(baseDir, relativePath);
@@ -612,7 +617,7 @@ function shortGenericType(genericType: string): string {
 }
 
 /**
- * 
+ *
  * @param astRoot AST root node after main contract compilation
  * @param typeResolver a Type Resolver
  * @returns All function ABIs defined by the main contract, including constructors
@@ -646,7 +651,7 @@ export function getABIDeclaration(astRoot: unknown, typeResolver: TypeResolver):
 }
 
 /**
- * 
+ *
  * @param astRoot AST root node after main contract compilation
  * @param dependencyAsts AST root node after all dependency contract compilation
  * @returns all defined structures of the main contract and dependent contracts
@@ -672,7 +677,7 @@ export function getStructDeclaration(astRoot: unknown, dependencyAsts: unknown):
 
 
 /**
- * 
+ *
  * @param astRoot AST root node after main contract compilation
  * @param dependencyAsts AST root node after all dependency contract compilation
  * @returns all defined Library of the main contract and dependent contracts
@@ -748,7 +753,7 @@ export function getContractDeclaration(astRoot: unknown, dependencyAsts: unknown
 
 
 /**
- * 
+ *
  * @param astRoot AST root node after main contract compilation
  * @param dependencyAsts AST root node after all dependency contract compilation
  * @returns all defined type aliaes of the main contract and dependent contracts
@@ -772,7 +777,7 @@ export function getAliasDeclaration(astRoot: unknown, dependencyAsts: unknown):
 
 
 /**
- * 
+ *
  * @param astRoot AST root node after main contract compilation
  * @param dependencyAsts AST root node after all dependency contract compilation
  * @returns all defined static const int literal of the main contract and dependent contracts
@@ -928,7 +933,7 @@ function parserAst(result: CompileResult, ast: any, srcDir: string, sourceFileNa
   const allAst = addSourceLocation(ast, srcDir, sourceFileName);
 
   const sourceUri = path2uri(sourcePath);
-  result.file = sourceUri;
+  result.file = sourcePath;
   result.ast = allAst[sourceUri];
   delete allAst[sourceUri];
   result.dependencyAsts = allAst;
@@ -977,11 +982,11 @@ function parserAst(result: CompileResult, ast: any, srcDir: string, sourceFileNa
 
 /**
  * @deprecated use `--hex` when compiling
- * @param result 
- * @param asmObj 
- * @param settings 
- * @param srcDir 
- * @param sourceFileName 
+ * @param result
+ * @param asmObj
+ * @param settings
+ * @param srcDir
+ * @param sourceFileName
  */
 function parserASM(result: CompileResult, asmObj: any, settings: CompilingSettings, srcDir: string, sourceFileName: string) {
 

src/contract.ts

@@ -1,4 +1,4 @@
-import { basename, dirname } from 'path';
+import { basename, dirname, join } from 'path';
 import { ABIEntityType, Argument, LibraryEntity, ParamEntity, parseGenericType } from '.';
 import { ContractEntity, getFullFilePath, loadSourceMapfromArtifact, OpCode, StaticEntity } from './compilerWrapper';
 import {
@@ -10,7 +10,7 @@ import { arrayTypeAndSize, checkSupportedParamType, flatternArg, hasGeneric, sub
 
 
 /**
- * TxContext provides some context information of the current transaction, 
+ * TxContext provides some context information of the current transaction,
  * needed only if signature is checked inside the contract.
  */
 export interface TxContext {
@@ -66,7 +66,7 @@ export interface Artifact {
   asm?: string;
   /** locking script of the contract in hex format, including placeholders for constructor parameters */
   hex: string;
-  /** file uri of the main contract source code file */
+  /** relative file uri of the main contract source code file */
   file: string;
   /** @deprecated **/
   sources?: Array<string>;
@@ -326,7 +326,7 @@ export class AbstractContract {
   }
 
   /**
-   * format the error 
+   * format the error
    * @param err the result output by  `tx.verifyInputScript(inputIndex)`
    * @returns string the formatted error message.
    */
@@ -346,7 +346,7 @@ export class AbstractContract {
       const sourceMapFilePath = uri2path(this.sourceMapFile);
       const sourceMap = JSONParserSync(sourceMapFilePath);
 
-      const sourcePath = uri2path(this.file);
+      const sourcePath = join(sourceMapFilePath, this.file);
 
       const srcDir = dirname(sourcePath);
       const sourceFileName = basename(sourcePath);
@@ -397,7 +397,7 @@ export class AbstractContract {
 
   /**
    * Generate a debugger launch configuration for the contract's last called public method
-   * @param txContext 
+   * @param txContext
    * @returns a uri of the debugger launch configuration
    */
   public genLaunchConfig(txContext?: TxContext): string {
@@ -435,10 +435,10 @@ export class AbstractContract {
   }
 
   /**
- * @deprecated use setDataPartInASM setDataPartInHex 
+ * @deprecated use setDataPartInASM setDataPartInHex
  * set the data part of the contract
- * @param state 
- * @param isStateHex 
+ * @param state
+ * @param isStateHex
  */
   setDataPart(state: string, isStateHex = false): void {
     if (isStateHex == false) {
@@ -452,8 +452,8 @@ export class AbstractContract {
 
   /**
  * set the data part of the contract in ASM format
- * @param asm 
- * @param  
+ * @param asm
+ * @param
  */
   setDataPartInASM(asm: string): void {
     if (AbstractContract.isStateful(this)) {
@@ -465,7 +465,7 @@ export class AbstractContract {
 
   /**
  * set the data part of the contract in hex format
- * @param hex 
+ * @param hex
  */
   setDataPartInHex(hex: string): void {
     this._dataPartInHex = hex.trim();
@@ -711,7 +711,7 @@ export class AbstractContract {
 
 
 
-  // struct / array: sha256 every single element of the flattened struct / array, and concat the result to a joint byte, and sha256 again 
+  // struct / array: sha256 every single element of the flattened struct / array, and concat the result to a joint byte, and sha256 again
   // basic type: sha256 every single element
   static flattenSha256(data: SupportedParamType, type: string): string {
     const error = checkSupportedParamType(data, {

tsconfig.json

@@ -18,7 +18,7 @@
         }
     },
     "compilerOptions": {
-        "target": "es5",
+        "target": "es2020",
         "lib": [
             "dom",
             "dom.iterable",