@helios-lang/contract-utils 0.2.68 → 0.2.70

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@helios-lang/contract-utils",
-  "version": "0.2.68",
+  "version": "0.2.70",
   "description": "Convenience and type-safety utilities for using Helios validators from within Typescript",
   "main": "src/index.js",
   "types": "types/index.d.ts",
@@ -27,10 +27,10 @@
   "dependencies": {
     "@helios-lang/cli-utils": "^0.1.6",
     "@helios-lang/codec-utils": "^0.1.35",
-    "@helios-lang/compiler-utils": "^0.1.25",
-    "@helios-lang/ledger": "^0.5.3",
-    "@helios-lang/type-utils": "^0.1.21",
-    "@helios-lang/uplc": "^0.3.11"
+    "@helios-lang/compiler-utils": "^0.1.57",
+    "@helios-lang/ledger": "^0.5.5",
+    "@helios-lang/type-utils": "^0.1.22",
+    "@helios-lang/uplc": "^0.3.13"
   },
   "scripts": {
     "build": "pnpm run prettify && pnpm run build:types && pnpm run test:suite",

package/src/cast/UserFunc.js

@@ -2,6 +2,7 @@ import { bytesToHex } from "@helios-lang/codec-utils"
 import { expectSome, isLeft, isString } from "@helios-lang/type-utils"
 import { ConstrData, IntData, UplcDataValue } from "@helios-lang/uplc"
 import { Cast } from "./Cast.js"
+import { None } from "@helios-lang/type-utils"
 import { BasicUplcLogger } from "@helios-lang/uplc"
 
 /**
@@ -15,6 +16,7 @@ import { BasicUplcLogger } from "@helios-lang/uplc"
  */
 
 /**
+ * TODO: add logOptions here as well (which can be overridden by logOptions passed directly to eval(), evalUnsafe() and profile())?
  * `returns` is optional to accomodate main functions that return void
  * @typedef {{
  *   name: string
@@ -72,10 +74,10 @@ export class UserFunc {
 
     /**
      * @param {ArgsT} namedArgs
-     * @param {UplcLoggingI} [logOptions]
+     * @param {Option<UplcLoggingI>} logOptions
      * @returns {RetT}
      */
-    eval(namedArgs, logOptions) {
+    eval(namedArgs, logOptions = None) {
         /**
          * @type {{[argName: string]: any}}
          */
@@ -119,10 +121,10 @@ export class UserFunc {
 
     /**
      * @param {UnsafeArgsT<ArgsT>} namedArgs
-     * @param {UplcLoggingI} [logOptions]
+     * @param {Option<UplcLoggingI>} logOptions
      * @returns {RetT extends void ? void : UplcData}
      */
-    evalUnsafe(namedArgs, logOptions) {
+    evalUnsafe(namedArgs, logOptions = None) {
         const result = this.profile(namedArgs, logOptions).result
 
         if (isLeft(result)) {
@@ -130,7 +132,9 @@ export class UserFunc {
 
             let msg = result.left.error
 
-            if (stackTrace.length > 0) {
+            // only add the stackTrace if the logOptions aren't given
+            // TODO: make sure logOptions actually logs the stack trace
+            if (!logOptions && stackTrace.length > 0) {
                 msg = `Stack trace:\n    ${stackTrace.join("\n    ")}\n${msg}`
             }
 
@@ -146,10 +150,10 @@ export class UserFunc {
 
     /**
      * @param {UnsafeArgsT<ArgsT>} namedArgs
-     * @param {UplcLoggingI} [logOptions] - optional, passed to UplcProgram.eval if provided
+     * @param {Option<UplcLoggingI>} logOptions - optional, passed to UplcProgram.eval if provided
      * @returns {CekResult}
      */
-    profile(namedArgs, logOptions) {
+    profile(namedArgs, logOptions = None) {
         const isMain = this.name == "main"
 
         /**
@@ -198,11 +202,13 @@ export class UserFunc {
 
         const argValues = args.map((a) => new UplcDataValue(a))
 
-        const cekResult = this.uplc.eval(argValues, { logOptions })
+        const cekResult = this.uplc.eval(argValues, {
+            logOptions: logOptions ?? undefined
+        })
 
         if (this.uplc.alt?.plutusVersion == "PlutusScriptV2") {
             const cekResultUnoptim = this.uplc.alt.eval(argValues, {
-                logOptions
+                logOptions: logOptions ?? undefined
             })
             const resultUnoptim = cekResultUnoptim.result
             const resultUnoptimStr = evalResultToString(resultUnoptim)
@@ -243,6 +249,9 @@ export class UserFunc {
                     `Warning: optimizer didn't improve cost of ${this.props.name}`
                 )
             }
+
+            // overwrite the optimized cekResult.result with the unoptimized result because it contains more information
+            cekResult.result = resultUnoptim
         }
 
         return cekResult

package/src/compiler/CompilerLib_v0_17.js

@@ -159,7 +159,7 @@ export class CompilerLib_v0_17 {
             cborHex: bytesToHex(uplc.toCbor()),
             plutusVersion: uplc.plutusVersion,
             sourceMap: sourceMap.toJsonSafe(),
-            ir: uplc.ir ?? undefined
+            ir: options.debug ? (uplc.ir ?? undefined) : undefined
         }
     }
 

package/types/cast/UserFunc.d.ts

@@ -8,6 +8,7 @@
  * @typedef {import("./Cast.js").CastConfig} CastConfig
  */
 /**
+ * TODO: add logOptions here as well (which can be overridden by logOptions passed directly to eval(), evalUnsafe() and profile())?
  * `returns` is optional to accomodate main functions that return void
  * @typedef {{
  *   name: string
@@ -56,22 +57,22 @@ export class UserFunc<ArgsT extends {
     get name(): string;
     /**
      * @param {ArgsT} namedArgs
-     * @param {UplcLoggingI} [logOptions]
+     * @param {Option<UplcLoggingI>} logOptions
      * @returns {RetT}
      */
-    eval(namedArgs: ArgsT, logOptions?: import("@helios-lang/uplc/types/logging/UplcLoggingI.js").UplcLoggingI | undefined): RetT;
+    eval(namedArgs: ArgsT, logOptions?: Option<UplcLoggingI>): RetT;
     /**
      * @param {UnsafeArgsT<ArgsT>} namedArgs
-     * @param {UplcLoggingI} [logOptions]
+     * @param {Option<UplcLoggingI>} logOptions
      * @returns {RetT extends void ? void : UplcData}
      */
-    evalUnsafe(namedArgs: UnsafeArgsT<ArgsT>, logOptions?: import("@helios-lang/uplc/types/logging/UplcLoggingI.js").UplcLoggingI | undefined): RetT extends void ? void : UplcData;
+    evalUnsafe(namedArgs: UnsafeArgsT<ArgsT>, logOptions?: Option<UplcLoggingI>): RetT extends void ? void : UplcData;
     /**
      * @param {UnsafeArgsT<ArgsT>} namedArgs
-     * @param {UplcLoggingI} [logOptions] - optional, passed to UplcProgram.eval if provided
+     * @param {Option<UplcLoggingI>} logOptions - optional, passed to UplcProgram.eval if provided
      * @returns {CekResult}
      */
-    profile(namedArgs: UnsafeArgsT<ArgsT>, logOptions?: import("@helios-lang/uplc/types/logging/UplcLoggingI.js").UplcLoggingI | undefined): CekResult;
+    profile(namedArgs: UnsafeArgsT<ArgsT>, logOptions?: Option<UplcLoggingI>): CekResult;
 }
 export type TypeSchema = import("@helios-lang/type-utils").TypeSchema;
 export type CekResult = import("@helios-lang/uplc").CekResult;
@@ -81,6 +82,7 @@ export type UplcProgram = import("@helios-lang/uplc").UplcProgram;
 export type UplcValue = import("@helios-lang/uplc").UplcValue;
 export type CastConfig = import("./Cast.js").CastConfig;
 /**
+ * TODO: add logOptions here as well (which can be overridden by logOptions passed directly to eval(), evalUnsafe() and profile())?
  * `returns` is optional to accomodate main functions that return void
  */
 export type UserFuncProps = {

package/types/cast/UserFunc.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"UserFunc.d.ts","sourceRoot":"","sources":["../../src/cast/UserFunc.js"],"names":[],"mappings":"AAMA;;;;;;;;GAQG;AAEH;;;;;;;;;;;;;;;GAeG;AAEH;;;GAGG;AAEH;;;GAGG;AACH,sBAHwC,KAAK,SAAhC;IAAE,CAAC,OAAO,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,EAC1B,IAAI;IAgBb;;;OAGG;IACH,kBAHW,WAAW,SACX,aAAa,EAKvB;IApBD;;;OAGG;IACH,eAFU,WAAW,CAEjB;IAEJ;;;;OAIG;IACH,uBAAK;IAWL;;OAEG;IACH,mBAEC;IAED;;;;OAIG;IACH,gBAJW,KAAK,oGAEH,IAAI,CA0ChB;IAED;;;;OAIG;IACH,sBAJW,WAAW,CAAC,KAAK,CAAC,oGAEhB,IAAI,SAAS,IAAI,GAAG,IAAI,GAAG,QAAQ,CAsB/C;IAED;;;;OAIG;IACH,mBAJW,WAAW,CAAC,KAAK,CAAC,oGAEhB,SAAS,CAmGrB;CACJ;yBAlPY,OAAO,yBAAyB,EAAE,UAAU;wBAC5C,OAAO,mBAAmB,EAAE,SAAS;uBACrC,OAAO,mBAAmB,EAAE,QAAQ;2BACpC,OAAO,mBAAmB,EAAE,YAAY;0BACxC,OAAO,mBAAmB,EAAE,WAAW;wBACvC,OAAO,mBAAmB,EAAE,SAAS;yBACrC,OAAO,WAAW,EAAE,UAAU;;;;4BAK9B;IACZ,IAAQ,EAAE,MAAM,CAAA;IAChB,qBAAyB,EAAE,OAAO,CAAA;IAClC,qBAAyB,EAAE,OAAO,CAAA;IAClC,SAAa,EAAE;QACf,IAAU,EAAE,MAAM,CAAA;QAClB,IAAU,EAAE,UAAU,CAAA;QACtB,UAAgB,EAAE,OAAO,CAAA;KACpB,EAAE,CAAA;IACP,OAAW,CAAC,EAAE,UAAU,CAAA;IACxB,gBAAoB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC7C,UAAc,EAAE,UAAU,CAAA;CACvB;wBAIS,KAAK,IACL,GAAE,CAAgB,IAAX,MAAM,KAAK,GAAG,CAAC,SAAS,gBAAgB,GAAG,MAAM,GAAG,QAAQ,GAAC"}
+{"version":3,"file":"UserFunc.d.ts","sourceRoot":"","sources":["../../src/cast/UserFunc.js"],"names":[],"mappings":"AAOA;;;;;;;;GAQG;AAEH;;;;;;;;;;;;;;;;GAgBG;AAEH;;;GAGG;AAEH;;;GAGG;AACH,sBAHwC,KAAK,SAAhC;IAAE,CAAC,OAAO,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,EAC1B,IAAI;IAgBb;;;OAGG;IACH,kBAHW,WAAW,SACX,aAAa,EAKvB;IApBD;;;OAGG;IACH,eAFU,WAAW,CAEjB;IAEJ;;;;OAIG;IACH,uBAAK;IAWL;;OAEG;IACH,mBAEC;IAED;;;;OAIG;IACH,gBAJW,KAAK,eACL,MAAM,CAAC,YAAY,CAAC,GAClB,IAAI,CA0ChB;IAED;;;;OAIG;IACH,sBAJW,WAAW,CAAC,KAAK,CAAC,eAClB,MAAM,CAAC,YAAY,CAAC,GAClB,IAAI,SAAS,IAAI,GAAG,IAAI,GAAG,QAAQ,CAwB/C;IAED;;;;OAIG;IACH,mBAJW,WAAW,CAAC,KAAK,CAAC,eAClB,MAAM,CAAC,YAAY,CAAC,GAClB,SAAS,CAwGrB;CACJ;yBA1PY,OAAO,yBAAyB,EAAE,UAAU;wBAC5C,OAAO,mBAAmB,EAAE,SAAS;uBACrC,OAAO,mBAAmB,EAAE,QAAQ;2BACpC,OAAO,mBAAmB,EAAE,YAAY;0BACxC,OAAO,mBAAmB,EAAE,WAAW;wBACvC,OAAO,mBAAmB,EAAE,SAAS;yBACrC,OAAO,WAAW,EAAE,UAAU;;;;;4BAM9B;IACZ,IAAQ,EAAE,MAAM,CAAA;IAChB,qBAAyB,EAAE,OAAO,CAAA;IAClC,qBAAyB,EAAE,OAAO,CAAA;IAClC,SAAa,EAAE;QACf,IAAU,EAAE,MAAM,CAAA;QAClB,IAAU,EAAE,UAAU,CAAA;QACtB,UAAgB,EAAE,OAAO,CAAA;KACpB,EAAE,CAAA;IACP,OAAW,CAAC,EAAE,UAAU,CAAA;IACxB,gBAAoB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC7C,UAAc,EAAE,UAAU,CAAA;CACvB;wBAIS,KAAK,IACL,GAAE,CAAgB,IAAX,MAAM,KAAK,GAAG,CAAC,SAAS,gBAAgB,GAAG,MAAM,GAAG,QAAQ,GAAC"}