@helios-lang/contract-utils 0.3.20 → 0.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@helios-lang/contract-utils",
-  "version": "0.3.20",
+  "version": "0.4.0",
   "description": "Convenience and type-safety utilities for using Helios validators from within Typescript",
   "main": "src/index.js",
   "types": "types/index.d.ts",
@@ -40,9 +40,9 @@
     "@helios-lang/codec-utils": "^0.3.4",
     "@helios-lang/compiler-utils": "^0.5.13",
     "@helios-lang/crypto": "0.2.3",
-    "@helios-lang/ledger": "^0.7.4",
+    "@helios-lang/ledger": "^0.8.0",
     "@helios-lang/type-utils": "^0.2.9",
-    "@helios-lang/uplc": "^0.7.14"
+    "@helios-lang/uplc": "^0.8.0"
   },
   "scripts": {
     "build": "pnpm run prettify && pnpm run build:types && pnpm run test:suite",

package/src/cast/Cast.js

@@ -475,15 +475,17 @@ function convertSchemaDataToUplcData(schema, x, context) {
             defs[schema.id] = schema
             const variantName = Object.keys(x)[0]
             const variantFields = Object.values(x)[0]
-            const tag = schema.variantTypes.findIndex(
+            const foundVariant = schema.variantTypes.find(
                 (v) => v.name == variantName
             )
-
-            if (tag == -1) {
+            if (!foundVariant) {
                 throw new Error(
-                    `invalid variant ${variantName} (expected: ${schema.variantTypes.map((v) => v.name).join(", ")})`
+                    `invalid enum variant '${variantName}' (expected one of: ${schema.variantTypes
+                        .map((v) => v.name)
+                        .join(", ")})`
                 )
             }
+            const tag = foundVariant.tag
 
             return convertEnumVariantDataToConstrData(
                 schema,
@@ -523,7 +525,14 @@ function convertSchemaDataToUplcData(schema, x, context) {
  * @returns {ConstrData}
  */
 function convertEnumVariantDataToConstrData(schema, tag, data, context) {
-    const variantSchema = schema.variantTypes[tag]
+    const variantSchema = schema.variantTypes.find((v) => v.tag == tag)
+    if (!variantSchema) {
+        throw new Error(
+            `invalid enum variant tag ${tag} (expected one of: ${schema.variantTypes
+                .map((v) => v.tag)
+                .join(", ")})`
+        )
+    }
     const variantName = variantSchema.name
 
     if (
@@ -867,10 +876,14 @@ function uplcToSchema(schema, data, context) {
 function convertConstrDataFieldsToEnumVariantFields(schema, data, context) {
     const { tag, fields } = data
 
-    const variantSchema = schema.variantTypes[tag]
+    const variantSchema = schema.variantTypes.find((v) => v.tag == tag)
 
     if (!variantSchema) {
-        throw new Error(`tag ${tag} out of range`)
+        throw new Error(
+            `invalid enum variant tag ${tag} (expected one of: ${schema.variantTypes
+                .map((v) => v.tag)
+                .join(", ")})`
+        )
     }
 
     const nExpected = variantSchema.fieldTypes.length

package/src/cast/UserFunc.js

@@ -3,7 +3,7 @@ import { expectDefined, isLeft, isString } from "@helios-lang/type-utils"
 import {
     makeConstrData,
     makeUplcDataValue,
-    UplcRuntimeError
+    makeUplcRuntimeError
 } from "@helios-lang/uplc"
 import { makeCast } from "./Cast.js"
 
@@ -159,7 +159,7 @@ export function evalUserFuncUnsafe(
     const result = profileUserFunc(program, props, namedArgs, logOptions).result
 
     if (isLeft(result)) {
-        throw new UplcRuntimeError(result.left.error, result.left.callSites)
+        throw makeUplcRuntimeError(result.left.error, result.left.callSites)
     } else if (!isString(result.right) && result.right.kind == "data") {
         return /** @type {any} */ (result.right.value)
     } else if (props.returns) {

package/src/compiler/CompilerLib_v0_17.js

@@ -1,8 +1,14 @@
 import { bytesToHex } from "@helios-lang/codec-utils"
-import { makeUplcSourceMap } from "@helios-lang/uplc"
+import {
+    makeUplcApply,
+    makeUplcDelay,
+    makeUplcForce,
+    makeUplcLambda,
+    makeUplcSourceMap
+} from "@helios-lang/uplc"
 
 /**
- * @import { UplcData, UplcProgramV2 } from "@helios-lang/uplc"
+ * @import { UplcData, UplcProgramV2, UplcTerm } from "@helios-lang/uplc"
  * @import { CompilerLib, CompileOptions, CompileOutput, ScriptHashType, TypeCheckOutput } from "../index.js"
  */
 
@@ -114,11 +120,13 @@ class CompilerLib_v0_17 {
                           const ir = options.debug ? uplc.ir : undefined
                           const altIr = options.debug ? alt?.ir : undefined
                           const sourceMap = makeUplcSourceMap({
-                              term: uplc.root
+                              term: changeUplcCallTermsToUplcApply(uplc.root)
                           }).toJsonSafe()
                           const altSourceMap = alt
                               ? makeUplcSourceMap({
-                                    term: alt.root
+                                    term: changeUplcCallTermsToUplcApply(
+                                        alt.root
+                                    )
                                 }).toJsonSafe()
                               : undefined
 
@@ -155,7 +163,9 @@ class CompilerLib_v0_17 {
                 : {})
         })
 
-        const sourceMap = makeUplcSourceMap({ term: uplc.root })
+        const sourceMap = makeUplcSourceMap({
+            term: changeUplcCallTermsToUplcApply(uplc.root)
+        })
 
         return {
             cborHex: bytesToHex(uplc.toCbor()),
@@ -176,3 +186,43 @@ class CompilerLib_v0_17 {
         return analyzeMulti(validatorSources, moduleSources)
     }
 }
+
+/**
+ * @param {UplcTerm} root
+ * @returns {UplcTerm}
+ */
+function changeUplcCallTermsToUplcApply(root) {
+    if (
+        root.kind == "apply" ||
+        root.kind == "builtin" ||
+        root.kind == "case" ||
+        root.kind == "const" ||
+        root.kind == "constr" ||
+        root.kind == "error" ||
+        root.kind == "var"
+    ) {
+        return root
+    } else if (root.kind == "delay") {
+        return makeUplcDelay({
+            arg: changeUplcCallTermsToUplcApply(root.arg),
+            site: root.site
+        })
+    } else if (root.kind == "force") {
+        return makeUplcForce({
+            arg: changeUplcCallTermsToUplcApply(root.arg),
+            site: root.site
+        })
+    } else if (root.kind == "lambda") {
+        return makeUplcLambda({
+            body: changeUplcCallTermsToUplcApply(root.children[0]),
+            site: root.site
+        })
+    } else {
+        const term = /** @type {any} */ (root)
+        return makeUplcApply({
+            fn: changeUplcCallTermsToUplcApply(term.fn),
+            arg: changeUplcCallTermsToUplcApply(term.arg),
+            site: term.site
+        })
+    }
+}

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

@@ -1 +1 @@
-{"version":3,"file":"Cast.d.ts","sourceRoot":"","sources":["../../src/cast/Cast.js"],"names":[],"mappings":"AAsDA;;;;;GAKG;AAEH;;;;;GAKG;AAEH;;;;;;GAMG;AAEH;;;;;;GAMG;AACH,yBANa,OAAO,EACP,WAAW,UACb,UAAU,UACV,UAAU,GACR,KAAK,OAAO,EAAE,WAAW,CAAC,CAItC;AAsED;;;;;;;;;;GAUG;AACH,oCAVa,CAAC,UACH,UAAU,QACV,QAAQ,WACR;IACN,SAAS,EAAE,OAAO,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,6BAA6B,CAAC,EAAE,OAAO,CAAA;CACxC,GACS,CAAC,CASb;AAED;;;;;;;;;GASG;AACH,kCATa,CAAC,UACH,UAAU,KACV,CAAC,YACD;IACN,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,6BAA6B,CAAC,EAAE,OAAO,CAAA;CACxC,GACS,QAAQ,CAUpB;AA6sBD;;;;;;GAMG;AACH,8BANa,OAAO,EACP,WAAW,QACb,SAAS,OAAO,EAAE,WAAW,CAAC,UAC9B,UAAU,GACR,KAAK,OAAO,EAAE,WAAW,CAAC,CAQtC;;;;;UA51BS,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC;;;;cAC1B,MAAM;;;;mCACN,OAAO;;;;;;UAKP,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC;;;;cAC1B,MAAM;;;;mCACN,OAAO;eACP,OAAO;;gCAjB8B,yBAAyB;gCAEzB,aAAa;0BAAb,aAAa;8BADnB,mBAAmB;8BACb,aAAa;gDAFb,yBAAyB"}
+{"version":3,"file":"Cast.d.ts","sourceRoot":"","sources":["../../src/cast/Cast.js"],"names":[],"mappings":"AAsDA;;;;;GAKG;AAEH;;;;;GAKG;AAEH;;;;;;GAMG;AAEH;;;;;;GAMG;AACH,yBANa,OAAO,EACP,WAAW,UACb,UAAU,UACV,UAAU,GACR,KAAK,OAAO,EAAE,WAAW,CAAC,CAItC;AAsED;;;;;;;;;;GAUG;AACH,oCAVa,CAAC,UACH,UAAU,QACV,QAAQ,WACR;IACN,SAAS,EAAE,OAAO,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,6BAA6B,CAAC,EAAE,OAAO,CAAA;CACxC,GACS,CAAC,CASb;AAED;;;;;;;;;GASG;AACH,kCATa,CAAC,UACH,UAAU,KACV,CAAC,YACD;IACN,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,6BAA6B,CAAC,EAAE,OAAO,CAAA;CACxC,GACS,QAAQ,CAUpB;AA0tBD;;;;;;GAMG;AACH,8BANa,OAAO,EACP,WAAW,QACb,SAAS,OAAO,EAAE,WAAW,CAAC,UAC9B,UAAU,GACR,KAAK,OAAO,EAAE,WAAW,CAAC,CAQtC;;;;;UAz2BS,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC;;;;cAC1B,MAAM;;;;mCACN,OAAO;;;;;;UAKP,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC;;;;cAC1B,MAAM;;;;mCACN,OAAO;eACP,OAAO;;gCAjB8B,yBAAyB;gCAEzB,aAAa;0BAAb,aAAa;8BADnB,mBAAmB;8BACb,aAAa;gDAFb,yBAAyB"}

package/types/compiler/CompilerLib_v0_17.d.ts

@@ -1,5 +1,5 @@
 /**
- * @import { UplcData, UplcProgramV2 } from "@helios-lang/uplc"
+ * @import { UplcData, UplcProgramV2, UplcTerm } from "@helios-lang/uplc"
  * @import { CompilerLib, CompileOptions, CompileOutput, ScriptHashType, TypeCheckOutput } from "../index.js"
  */
 /**

package/types/compiler/CompilerLib_v0_17.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CompilerLib_v0_17.d.ts","sourceRoot":"","sources":["../../src/compiler/CompilerLib_v0_17.js"],"names":[],"mappings":"AAGA;;;GAGG;AAEH;;;;;;;;;;;;;;GAcG;AAEH;;;GAGG;AACH,2CAHW,GAAG,GACD,WAAW,CAIvB;sBArBY;IACR,IAAI,EAAE,MAAM,CAAA;IACZ,kBAAkB,EAAE,MAAM,GAAG,SAAS,CAAA;IACtC,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,GAAG,IAAI,CAAA;IAC/C,OAAO,CAAC,OAAO,EAAE;QACf,QAAQ,CAAC,EAAE,OAAO,CAAC;QACnB,gBAAgB,CAAC,EAAE,OAAO,CAAC;QAC3B,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;QACzC,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;QACzC,gBAAgB,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;QAC9B,iBAAiB,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,KAAK,IAAI,CAAA;KAChE,GAAG,aAAa,CAAA;CAClB;iCAhB4F,aAAa;8BADjE,mBAAmB;mCAAnB,mBAAmB"}
+{"version":3,"file":"CompilerLib_v0_17.d.ts","sourceRoot":"","sources":["../../src/compiler/CompilerLib_v0_17.js"],"names":[],"mappings":"AASA;;;GAGG;AAEH;;;;;;;;;;;;;;GAcG;AAEH;;;GAGG;AACH,2CAHW,GAAG,GACD,WAAW,CAIvB;sBArBY;IACR,IAAI,EAAE,MAAM,CAAA;IACZ,kBAAkB,EAAE,MAAM,GAAG,SAAS,CAAA;IACtC,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,GAAG,IAAI,CAAA;IAC/C,OAAO,CAAC,OAAO,EAAE;QACf,QAAQ,CAAC,EAAE,OAAO,CAAC;QACnB,gBAAgB,CAAC,EAAE,OAAO,CAAC;QAC3B,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;QACzC,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;QACzC,gBAAgB,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;QAC9B,iBAAiB,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,KAAK,IAAI,CAAA;KAChE,GAAG,aAAa,CAAA;CAClB;iCAhB4F,aAAa;8BADvD,mBAAmB;mCAAnB,mBAAmB"}