@helios-lang/contract-utils 0.1.17 → 0.1.18

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@helios-lang/contract-utils",
-    "version": "0.1.17",
+    "version": "0.1.18",
     "description": "Convenience and type-safety utilities for using Helios validators from within Typescript",
     "main": "src/index.js",
     "types": "types/index.d.ts",

package/src/runtime/ContractContextBuilder.js

@@ -79,12 +79,21 @@ export class ContractContextBuilder {
      */
     validators
 
+    /**
+     * @private
+     * @readonly
+     * @type {Option<Module[]>}
+     */
+    forcedModules
+
     /**
      * @private
      * @param {T} validators
+     * @param {Option<Module[]>} forcedModules
      */
-    constructor(validators) {
+    constructor(validators, forcedModules = None) {
         this.validators = validators
+        this.forcedModules = forcedModules
     }
 
     /**
@@ -108,6 +117,14 @@ export class ContractContextBuilder {
         })
     }
 
+    /**
+     * @param {Module[]} modules
+     * @returns {ContractContextBuilder<T>}
+     */
+    setModules(modules) {
+        return new ContractContextBuilder(this.validators, modules)
+    }
+
     /**
      * @private
      * @param {Lib} lib
@@ -121,6 +138,38 @@ export class ContractContextBuilder {
         )
     }
 
+    /**
+     * @private
+     * @param {Validator} validator
+     * @returns {Map<string, string>}
+     */
+    getModules(validator) {
+        if (this.forcedModules) {
+            return new Map(
+                this.forcedModules.map((m) => [m.$name, m.$sourceCode])
+            )
+        }
+
+        /**
+         * @type {Map<string, string>}
+         */
+        const result = new Map()
+        let stack = validator.$dependencies.slice()
+        let m = stack.pop()
+
+        while (m) {
+            if (!result.has(m.$name)) {
+                result.set(m.$name, m.$sourceCode)
+
+                stack = stack.concat(m.$dependencies)
+            }
+
+            m = stack.pop()
+        }
+
+        return result
+    }
+
     /**
      * @param {Option<{[name: string]: string}>} expectedHashes
      * @param {LibOptions} options
@@ -162,33 +211,6 @@ export class ContractContextBuilder {
          */
         const validators = {}
 
-        /**
-         * @param {Validator} validator
-         * @returns {Map<string, string>}
-         */
-        function collectModules(validator) {
-            /**
-             * @type {Map<string, string>}
-             */
-            const result = new Map()
-
-            let stack = validator.$dependencies.slice()
-
-            let m = stack.pop()
-
-            while (m) {
-                if (!result.has(m.$name)) {
-                    result.set(m.$name, m.$sourceCode)
-
-                    stack = stack.concat(m.$dependencies)
-                }
-
-                m = stack.pop()
-            }
-
-            return result
-        }
-
         /**
          * @returns {{[name: string]: {purpose: string, hash: string}}}
          */
@@ -227,7 +249,7 @@ export class ContractContextBuilder {
         /**
          * @param {Validator} validator
          */
-        function buildValidator(validator) {
+        const buildValidator = (validator) => {
             const name = validator.$name
 
             if (name in validators) {
@@ -238,7 +260,7 @@ export class ContractContextBuilder {
                 buildValidator(v)
             }
 
-            const modules = collectModules(validator)
+            const modules = this.getModules(validator)
 
             const { cborHex: optimizedCborHex, prettyIR } = lib.compile(
                 validator.$sourceCode,
@@ -265,29 +287,8 @@ export class ContractContextBuilder {
                 }
             }
 
-            /**
-             * @type {ScriptHash}
-             */
-            let ownTypedHash
-
             const purpose = validator.$purpose
 
-            switch (purpose) {
-                case "spending":
-                    ownTypedHash = new ValidatorHash(ownHash)
-                    break
-                case "minting":
-                    ownTypedHash = new MintingPolicyHash(ownHash)
-                    break
-                case "staking":
-                case "certifying":
-                case "rewarding":
-                    ownTypedHash = new StakingValidatorHash(ownHash)
-                    break
-                default:
-                    throw new Error("unhandled purpose")
-            }
-
             const { cborHex: unoptimizedCborHex } = lib.compile(
                 validator.$sourceCode,
                 Array.from(modules.values()),

package/types/runtime/ContractContextBuilder.d.ts

@@ -60,6 +60,7 @@ export class ContractContextBuilder<T extends {
     /**
      * @private
      * @param {T} validators
+     * @param {Option<Module[]>} forcedModules
      */
     private constructor();
     /**
@@ -68,6 +69,12 @@ export class ContractContextBuilder<T extends {
      * @type {T}
      */
     private readonly validators;
+    /**
+     * @private
+     * @readonly
+     * @type {Option<Module[]>}
+     */
+    private readonly forcedModules;
     /**
      * @template {Validator} V
      * @param {V} validator
@@ -76,12 +83,23 @@ export class ContractContextBuilder<T extends {
      * }>}
      */
     with<V extends Validator>(validator: V): ContractContextBuilder<T & { [K in V["$name"]]: V; }>;
+    /**
+     * @param {Module[]} modules
+     * @returns {ContractContextBuilder<T>}
+     */
+    setModules(modules: Module[]): ContractContextBuilder<T>;
     /**
      * @private
      * @param {Lib} lib
      * @returns {{[name: string]: any}}
      */
     private getValidatorTypes;
+    /**
+     * @private
+     * @param {Validator} validator
+     * @returns {Map<string, string>}
+     */
+    private getModules;
     /**
      * @param {Option<{[name: string]: string}>} expectedHashes
      * @param {LibOptions} options

package/types/runtime/ContractContextBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ContractContextBuilder.d.ts","sourceRoot":"","sources":["../../src/runtime/ContractContextBuilder.js"],"names":[],"mappings":"AAaA;;;;GAIG;AAEH;;;;GAIG;AAEH;;;;;;GAMG;AAEH;;;;GAIG;AAEH;;;GAGG;AAEH;;;GAGG;AAEH;;;;;;GAMG;AAEH;;;;;;;;;;;GAWG;AAEH;;GAEG;AACH;;;IAgBI;;OAEG;IACH,gBAFa,uBAAuB,EAAE,CAAC,CAItC;IAbD;;;OAGG;IACH,sBAEC;IAbD;;;;OAIG;IACH,4BAAU;IAiBV;;;;;;OAMG;IACH,+FAKC;IAED;;;;OAIG;IACH,0BAMC;IAED;;;;;;;;;;;;;;;;;;;;;;;;;;OA0BG;IACH;;kBAzBW,UAAU,qwBAiNpB;CACJ;kBAjUY,OAAO,iBAAiB,EAAE,GAAG;yBAC7B,OAAO,iBAAiB,EAAE,UAAU;gCACpC,OAAO,sBAAsB,EAAE,SAAS;mEAMxC,OAAO,qBAAqB,EAAE,cAAc,CAAC,eAAe,EAAE,mBAAmB,CAAC;oGAQlF,OAAO,qBAAqB,EAAE,eAAe,CAAC,YAAY,EAAE,gBAAgB,EAAE,eAAe,EAAE,mBAAmB,CAAC;mEAMnH,OAAO,qBAAqB,EAAE,cAAc,CAAC,eAAe,EAAE,mBAAmB,CAAC;6HAKlF,OAAO,qBAAqB,EAAE,cAAc,CAAC,CAAC,CAAC;yHAK/C,OAAO,iBAAiB,EAAE,UAAU,CAAC,CAAC,CAAC;qBAIvC;IACZ,KAAS,EAAE,MAAM,CAAA;IACjB,WAAe,EAAE,MAAM,CAAA;IACvB,aAAiB,EAAE,MAAM,EAAE,CAAA;CACxB;wBAIS;IACZ,KAAS,EAAE,MAAM,CAAA;IACjB,QAAY,EAAE,MAAM,CAAA;IACpB,WAAe,EAAE,MAAM,CAAA;IACvB,aAAiB,EAAE,MAAM,EAAE,CAAA;IAC3B,iBAAqB,EAAE,SAAS,EAAE,CAAA;IAClC,iBAAqB,EAAE,OAAO,CAAA;IAC9B,SAAa,EAAE,KAAK,GAAG,EAAE,GAAG,CAAC,CAAA;IAC7B,MAAU,CAAC,EAAE,KAAK,GAAG,EAAE,GAAG,CAAC,CAAA;CACxB;8BA7DG,qBAAqB;kCAArB,qBAAqB;qCAArB,qBAAqB;qBAIP,WAAW"}
+{"version":3,"file":"ContractContextBuilder.d.ts","sourceRoot":"","sources":["../../src/runtime/ContractContextBuilder.js"],"names":[],"mappings":"AAaA;;;;GAIG;AAEH;;;;GAIG;AAEH;;;;;;GAMG;AAEH;;;;GAIG;AAEH;;;GAGG;AAEH;;;GAGG;AAEH;;;;;;GAMG;AAEH;;;;;;;;;;;GAWG;AAEH;;GAEG;AACH;;;IAyBI;;OAEG;IACH,gBAFa,uBAAuB,EAAE,CAAC,CAItC;IAfD;;;;OAIG;IACH,sBAGC;IAtBD;;;;OAIG;IACH,4BAAU;IAEV;;;;OAIG;IACH,+BAAa;IAmBb;;;;;;OAMG;IACH,+FAKC;IAED;;;OAGG;IACH,oBAHW,MAAM,EAAE,GACN,uBAAuB,CAAC,CAAC,CAIrC;IAED;;;;OAIG;IACH,0BAMC;IAED;;;;OAIG;IACH,mBAyBC;IAED;;;;;;;;;;;;;;;;;;;;;;;;;;OA0BG;IACH;;kBAzBW,UAAU,qwBAiKpB;CACJ;kBAlUY,OAAO,iBAAiB,EAAE,GAAG;yBAC7B,OAAO,iBAAiB,EAAE,UAAU;gCACpC,OAAO,sBAAsB,EAAE,SAAS;mEAMxC,OAAO,qBAAqB,EAAE,cAAc,CAAC,eAAe,EAAE,mBAAmB,CAAC;oGAQlF,OAAO,qBAAqB,EAAE,eAAe,CAAC,YAAY,EAAE,gBAAgB,EAAE,eAAe,EAAE,mBAAmB,CAAC;mEAMnH,OAAO,qBAAqB,EAAE,cAAc,CAAC,eAAe,EAAE,mBAAmB,CAAC;6HAKlF,OAAO,qBAAqB,EAAE,cAAc,CAAC,CAAC,CAAC;yHAK/C,OAAO,iBAAiB,EAAE,UAAU,CAAC,CAAC,CAAC;qBAIvC;IACZ,KAAS,EAAE,MAAM,CAAA;IACjB,WAAe,EAAE,MAAM,CAAA;IACvB,aAAiB,EAAE,MAAM,EAAE,CAAA;CACxB;wBAIS;IACZ,KAAS,EAAE,MAAM,CAAA;IACjB,QAAY,EAAE,MAAM,CAAA;IACpB,WAAe,EAAE,MAAM,CAAA;IACvB,aAAiB,EAAE,MAAM,EAAE,CAAA;IAC3B,iBAAqB,EAAE,SAAS,EAAE,CAAA;IAClC,iBAAqB,EAAE,OAAO,CAAA;IAC9B,SAAa,EAAE,KAAK,GAAG,EAAE,GAAG,CAAC,CAAA;IAC7B,MAAU,CAAC,EAAE,KAAK,GAAG,EAAE,GAAG,CAAC,CAAA;CACxB;8BA7DG,qBAAqB;kCAArB,qBAAqB;qCAArB,qBAAqB;qBAIP,WAAW"}