@helios-lang/contract-utils 0.3.20 → 0.3.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@helios-lang/contract-utils",
-  "version": "0.3.20",
+  "version": "0.3.21",
   "description": "Convenience and type-safety utilities for using Helios validators from within Typescript",
   "main": "src/index.js",
   "types": "types/index.d.ts",
@@ -38,11 +38,11 @@
   "dependencies": {
     "@helios-lang/cli-utils": "^0.1.10",
     "@helios-lang/codec-utils": "^0.3.4",
-    "@helios-lang/compiler-utils": "^0.5.13",
+    "@helios-lang/compiler-utils": "^0.5.15",
     "@helios-lang/crypto": "0.2.3",
-    "@helios-lang/ledger": "^0.7.4",
-    "@helios-lang/type-utils": "^0.2.9",
-    "@helios-lang/uplc": "^0.7.14"
+    "@helios-lang/ledger": "^0.7.8",
+    "@helios-lang/type-utils": "^0.3.0",
+    "@helios-lang/uplc": "^0.7.15"
   },
   "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/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"}