@helios-lang/contract-utils 0.2.46 → 0.2.48

package/package.json

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

package/src/cast/Cast.js

@@ -19,7 +19,7 @@ import {
     ValidatorHash,
     Value
 } from "@helios-lang/ledger"
-import { None, expectSome } from "@helios-lang/type-utils"
+import { None, expectSome, isSome } from "@helios-lang/type-utils"
 import {
     ByteArrayData,
     ConstrData,
@@ -220,13 +220,36 @@ function schemaToUplc(schema, x, defs = {}) {
                             schemaToUplc(type, x[name])
                         )
                     )
-                case "map":
-                    return new MapData(
-                        schema.fieldTypes.map(({ name, type }) => [
-                            new ByteArrayData(encodeUtf8(name)),
-                            schemaToUplc(type, x[name], defs)
-                        ])
-                    )
+                case "map": {
+                    // first make sure all fields are present
+                    schema.fieldTypes.forEach((ft) => {
+                        if (!(ft.name in x)) {
+                            throw new Error(`missing field ${ft.name}`)
+                        }
+                    })
+
+                    // respect order of entries
+                    /**
+                     * @type {[UplcData, UplcData][]}
+                     */
+                    const pairs = []
+
+                    Object.entries(x).forEach(([key, value]) => {
+                        const ft = schema.fieldTypes.find(
+                            (ft) => ft.name == key
+                        )
+
+                        if (ft) {
+                            const keyData = new ByteArrayData(encodeUtf8(key))
+                            const valueData = schemaToUplc(ft.type, value, defs)
+
+                            pairs.push([keyData, valueData])
+                        }
+                    })
+
+                    // wrapped in ConstrData
+                    return new ConstrData(0, [new MapData(pairs)])
+                }
                 default:
                     throw new Error(
                         `unhandled struct format '${schema.format}'`
@@ -404,7 +427,10 @@ function uplcToSchema(schema, data, config, defs = {}) {
                     )
                 }
                 case "map": {
-                    const entries = MapData.expect(data).items
+                    // wrapped in ConstrData
+                    const entries = MapData.expect(
+                        ConstrData.expect(data).fields[0]
+                    ).items
 
                     if (entries.length != schema.fieldTypes.length) {
                         throw new Error(
@@ -412,22 +438,34 @@ function uplcToSchema(schema, data, config, defs = {}) {
                         )
                     }
 
-                    return new Map(
-                        schema.fieldTypes.map(({ name, type }) => {
-                            const pair = expectSome(
-                                entries.find(
-                                    ([key, _]) =>
-                                        decodeUtf8(
-                                            ByteArrayData.expect(key).bytes
-                                        ) == name
+                    return Object.fromEntries(
+                        schema.fieldTypes
+                            .map(({ name, type }) => {
+                                const i = expectSome(
+                                    entries.findIndex(
+                                        ([key, _]) =>
+                                            decodeUtf8(
+                                                ByteArrayData.expect(key).bytes
+                                            ) == name
+                                    )
                                 )
-                            )
 
-                            return [
-                                name,
-                                uplcToSchema(type, pair[1], config, defs)
-                            ]
-                        })
+                                if (i == -1) {
+                                    throw new Error(
+                                        `field ${name} not found in MapData`
+                                    )
+                                }
+
+                                const pair = entries[i]
+
+                                return /** @type {const} */ ([
+                                    i,
+                                    name,
+                                    uplcToSchema(type, pair[1], config, defs)
+                                ])
+                            })
+                            .sort((a, b) => a[0] - b[0])
+                            .map(([_, name, x]) => [name, x])
                     )
                 }
                 default:

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

@@ -1 +1 @@
-{"version":3,"file":"Cast.d.ts","sourceRoot":"","sources":["../../src/cast/Cast.js"],"names":[],"mappings":"AAseA;;;;;;GAMG;AACH,kGAHW,UAAU,8BASpB;AA/cD;;;GAGG;AAEH;;;;GAIG;AAEH;;;;GAIG;AAEH;;;;;GAKG;AAEH;;;GAGG;AACH;IAaI;;;OAGG;IACH,oBAHW,UAAU,UACV,UAAU,EAKpB;IAnBD;;;OAGG;IACH,iBAFU,UAAU,CAEd;IAEN;;;OAGG;IACH,iBAFU,UAAU,CAEd;IAWN;;;OAGG;IACH,mBAHW,QAAQ,GACN,OAAO,CAInB;IAED;;;OAGG;IACH,cAHW,WAAW,GACT,QAAQ,CAIpB;CACJ;uBAhEY,OAAO,mBAAmB,EAAE,QAAQ;yBACpC,OAAO,qBAAqB,EAAE,UAAU;yBAIxC;IACZ,SAAa,EAAE,OAAO,CAAA;CACnB;8DAMkB,UAAU,KAAK,KAAK,OAAO,EAAE,WAAW,CAAC;;;;6CAOlD,KAAK,OAAO,EAAE,WAAW,CAAC,GAAG,iBAAiB,OAAO,EAAE,WAAW,CAAC"}
+{"version":3,"file":"Cast.d.ts","sourceRoot":"","sources":["../../src/cast/Cast.js"],"names":[],"mappings":"AA4gBA;;;;;;GAMG;AACH,kGAHW,UAAU,8BASpB;AArfD;;;GAGG;AAEH;;;;GAIG;AAEH;;;;GAIG;AAEH;;;;;GAKG;AAEH;;;GAGG;AACH;IAaI;;;OAGG;IACH,oBAHW,UAAU,UACV,UAAU,EAKpB;IAnBD;;;OAGG;IACH,iBAFU,UAAU,CAEd;IAEN;;;OAGG;IACH,iBAFU,UAAU,CAEd;IAWN;;;OAGG;IACH,mBAHW,QAAQ,GACN,OAAO,CAInB;IAED;;;OAGG;IACH,cAHW,WAAW,GACT,QAAQ,CAIpB;CACJ;uBAhEY,OAAO,mBAAmB,EAAE,QAAQ;yBACpC,OAAO,qBAAqB,EAAE,UAAU;yBAIxC;IACZ,SAAa,EAAE,OAAO,CAAA;CACnB;8DAMkB,UAAU,KAAK,KAAK,OAAO,EAAE,WAAW,CAAC;;;;6CAOlD,KAAK,OAAO,EAAE,WAAW,CAAC,GAAG,iBAAiB,OAAO,EAAE,WAAW,CAAC"}