@helios-lang/contract-utils 0.2.18 → 0.2.20

package/package.json

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

package/src/context/ContractContext.js

@@ -114,7 +114,7 @@ import { Cast, UserFunc } from "../cast/index.js"
 /**
  * @template {{[funcName: string]: (uplc: UplcProgram) => UserFunc<any>}} T
  * @typedef {{
- *   [K in keyof T]: UserFunc<T[K]>
+ *   [K in keyof T]: ReturnType<T[K]>
  * }} ContractUserFuncsContext
  */
 

package/src/context/DagCompiler.js

@@ -261,16 +261,26 @@ export class DagCompiler {
     }
 
     /**
+     * Also returns the hash types of any hash-dependencies
      * @private
      * @param {LoadedValidator[]} validators
-     * @returns {{[name: string]: any}}
+     * @returns {Record<string, any>}
      */
     getHashTypes(validators) {
-        return Object.fromEntries(
-            validators.map((v) => {
-                return [v.$name, this.lib.getScriptHashType(v.$purpose)]
+        /**
+         * @type {Record<string, any>}
+         */
+        const res = {}
+
+        validators.forEach((v) => {
+            res[v.$name] = this.lib.getScriptHashType(v.$purpose)
+
+            v.$hashDependencies.forEach((d) => {
+                res[d.$name] = this.lib.getScriptHashType(d.$purpose)
             })
-        )
+        })
+
+        return res
     }
 }
 

package/types/context/ContractContext.d.ts

@@ -37,7 +37,7 @@ export type ContractTypesContext<T extends {
 }> = { [K in keyof T]: Cast<import("../cast/StrictType.js").StrictType<T[K]>, import("../cast/PermissiveType.js").PermissiveType<T[K]>>; };
 export type ContractUserFuncsContext<T extends {
     [funcName: string]: (uplc: UplcProgram) => UserFunc<any>;
-}> = { [K in keyof T]: UserFunc<T[K]>; };
+}> = { [K in keyof T]: ReturnType<T[K]>; };
 export type ContractContext<Vs extends {
     [name: string]: import("../codegen/LoadedValidator.js").LoadedValidator;
 }, Ms extends {

package/types/context/DagCompiler.d.ts

@@ -74,9 +74,10 @@ export class DagCompiler {
      */
     private getHashDependencies;
     /**
+     * Also returns the hash types of any hash-dependencies
      * @private
      * @param {LoadedValidator[]} validators
-     * @returns {{[name: string]: any}}
+     * @returns {Record<string, any>}
      */
     private getHashTypes;
 }

package/types/context/DagCompiler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DagCompiler.d.ts","sourceRoot":"","sources":["../../src/context/DagCompiler.js"],"names":[],"mappings":"AAoRA;;;GAGG;AACH,iDAHW,eAAe,GACb,MAAM,EAAE,CAsBpB;AAlSD;;;;;;GAMG;AAEH;;;;;GAKG;AAEH;;GAEG;AACH;IA6BI;;;OAGG;IACH,iBAHW,WAAW,cACX,UAAU,EAOpB;IArCD;;;;OAIG;IACH,qBAAG;IAEH;;;;OAIG;IACH,wBAAM;IAEN;;;;OAIG;IACH,kCAAgB;IAEhB;;;;OAIG;IACH,iCAAe;IAQX,iDAA4B;IAKhC;;;;;;OAMG;IACH,kBANW,eAAe,EAAE,cACjB,OAAO,MAAM,EAAE,GAAG,CAAC,aACnB,OAAO;;SAEL,iBAAiB,CA2H7B;IAED;;;;;OAKG;IACH,4BA6BC;IAED;;;;OAIG;IACH,4BAoBC;IAED;;;;OAIG;IACH,qBAMC;CACJ;0BAvQY,OAAO,mBAAmB,EAAE,WAAW;yBACvC,OAAO,kBAAkB,EAAE,UAAU;8BACrC,OAAO,+BAA+B,EAAE,eAAe;0BACvD,OAAO,sBAAsB,EAAE,WAAW;0CAC1C,OAAO,sBAAsB,EAAE,2BAA2B"}
+{"version":3,"file":"DagCompiler.d.ts","sourceRoot":"","sources":["../../src/context/DagCompiler.js"],"names":[],"mappings":"AA8RA;;;GAGG;AACH,iDAHW,eAAe,GACb,MAAM,EAAE,CAsBpB;AA5SD;;;;;;GAMG;AAEH;;;;;GAKG;AAEH;;GAEG;AACH;IA6BI;;;OAGG;IACH,iBAHW,WAAW,cACX,UAAU,EAOpB;IArCD;;;;OAIG;IACH,qBAAG;IAEH;;;;OAIG;IACH,wBAAM;IAEN;;;;OAIG;IACH,kCAAgB;IAEhB;;;;OAIG;IACH,iCAAe;IAQX,iDAA4B;IAKhC;;;;;;OAMG;IACH,kBANW,eAAe,EAAE,cACjB,OAAO,MAAM,EAAE,GAAG,CAAC,aACnB,OAAO;;SAEL,iBAAiB,CA2H7B;IAED;;;;;OAKG;IACH,4BA6BC;IAED;;;;OAIG;IACH,4BAoBC;IAED;;;;;OAKG;IACH,qBAeC;CACJ;0BAjRY,OAAO,mBAAmB,EAAE,WAAW;yBACvC,OAAO,kBAAkB,EAAE,UAAU;8BACrC,OAAO,+BAA+B,EAAE,eAAe;0BACvD,OAAO,sBAAsB,EAAE,WAAW;0CAC1C,OAAO,sBAAsB,EAAE,2BAA2B"}