@helios-lang/contract-utils 0.1.36 → 0.1.38

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@helios-lang/contract-utils",
-    "version": "0.1.36",
+    "version": "0.1.38",
     "description": "Convenience and type-safety utilities for using Helios validators from within Typescript",
     "main": "src/index.js",
     "types": "types/index.d.ts",
@@ -36,10 +36,10 @@
     },
     "dependencies": {
         "@helios-lang/cli-utils": "^0.1.2",
-        "@helios-lang/codec-utils": "^0.1.27",
+        "@helios-lang/codec-utils": "^0.1.29",
         "@helios-lang/compiler-utils": "^0.1.21",
-        "@helios-lang/ledger": "^0.1.33",
+        "@helios-lang/ledger": "^0.1.44",
         "@helios-lang/type-utils": "^0.1.8",
-        "@helios-lang/uplc": "^0.1.24"
+        "@helios-lang/uplc": "^0.1.26"
     }
 }

package/src/cast/Cast.js

@@ -81,60 +81,58 @@ function schemaToUplc(schema, x) {
     if ("primitiveType" in schema) {
         switch (schema.primitiveType) {
             case "Address":
-                return Address.fromAlike(x).toUplcData()
+                return Address.new(x).toUplcData()
             case "Any":
                 return new IntData(0n)
             case "AssetClass":
-                return AssetClass.fromAlike(x).toUplcData()
+                return AssetClass.new(x).toUplcData()
             case "Bool":
                 return encodeBoolData(x)
             case "ByteArray":
                 return new ByteArrayData(x)
             case "Credential":
             case "PaymentCredential":
-                return SpendingCredential.fromAlike(x).toUplcData()
+                return SpendingCredential.new(x).toUplcData()
             case "Data":
                 return x
             case "DatumHash":
-                return DatumHash.fromAlike(x).toUplcData()
+                return DatumHash.new(x).toUplcData()
             case "DCert":
                 return x.toUplcData()
             case "Duration":
             case "Int":
                 return new IntData(x)
             case "MintingPolicyHash":
-                return MintingPolicyHash.fromAlike(x).toUplcData()
+                return MintingPolicyHash.new(x).toUplcData()
             case "PubKeyHash":
-                return PubKeyHash.fromAlike(x).toUplcData()
+                return PubKeyHash.new(x).toUplcData()
             case "Real":
                 return encodeRealData(x)
             case "ScriptHash":
-                return ScriptHash.fromAlike(x).toUplcData()
+                return ScriptHash.new(x).toUplcData()
             case "StakingCredential":
-                return StakingCredential.fromAlike(x).toUplcData()
+                return StakingCredential.new(x).toUplcData()
             case "StakingHash":
-                return StakingHash.fromAlike(x).toUplcData()
+                return StakingHash.new(x).toUplcData()
             case "String":
                 return new ByteArrayData(encodeUtf8(x))
             case "Time":
-                // milliseconds since 1 jan 1970
-                const ms = x instanceof Date ? x.getTime() : x
-                return new IntData(ms)
+                return new IntData(x)
             case "TimeRange":
-                return TimeRange.fromAlike(x).toUplcData()
+                return TimeRange.new(x).toUplcData()
             case "TxId":
-                return TxId.fromAlike(x).toUplcData()
+                return TxId.new(x).toUplcData()
             case "TxOutputDatum":
                 return x
-                    ? TxOutputDatum.fromAlike(x)?.toUplcData() ??
+                    ? TxOutputDatum.new(x)?.toUplcData() ??
                           new ConstrData(0, [])
                     : new ConstrData(0, [])
             case "TxOutputId":
-                return TxOutputId.fromAlike(x).toUplcData()
+                return TxOutputId.new(x).toUplcData()
             case "ValidatorHash":
-                return ValidatorHash.fromAlike(x).toUplcData()
+                return ValidatorHash.new(x).toUplcData()
             case "Value":
-                return Value.fromAlike(x).toUplcData()
+                return Value.new(x).toUplcData()
             default:
                 throw new Error(
                     `not yet implemented for ${schema.primitiveType}`
@@ -241,7 +239,7 @@ function uplcToSchema(schema, data) {
             case "String":
                 return decodeUtf8(ByteArrayData.expect(data).bytes)
             case "Time":
-                return new Date(Number(IntData.expect(data).value))
+                return Number(IntData.expect(data).value) // a number has enough precision to represent ms since 1970 for another 142000 years
             case "TimeRange":
                 return TimeRange.fromUplcData(data)
             case "TxId":

package/src/codegen/LoadedScriptsWriter.js

@@ -135,11 +135,16 @@ export class LoadedScriptsWriter {
             'import { Cast } from "@helios-lang/contract-utils";'
         )
         ;[this.declaration, this.combined].forEach((w) => {
-            w.writeLine('import type {UplcData} from "@helios-lang/ledger";')
             w.writeLine(
-                'import { Address, AssetClass, DatumHash, MintingPolicyHash, PubKey, PubKeyHash, SpendingCredential, StakingCredential, StakingHash, StakingValidatorHash, TimeRange, TxId, TxOutputDatum, ValidatorHash, Value } from "@helios-lang/ledger";'
+                'import type { IntLike } from "@helios-lang/codec-utils";'
             )
             w.writeLine('import { Cast } from "@helios-lang/contract-utils";')
+            w.writeLine(
+                'import type { TimeLike, UplcData } from "@helios-lang/ledger";'
+            )
+            w.writeLine(
+                'import { Address, AssetClass, DatumHash, MintingPolicyHash, PubKey, PubKeyHash, SpendingCredential, StakingCredential, StakingHash, StakingValidatorHash, TimeRange, TxId, TxOutputDatum, ValidatorHash, Value } from "@helios-lang/ledger";'
+            )
         })
     }
 

package/src/codegen/TypeSchema.js

@@ -56,9 +56,9 @@ export function genTypes(schema) {
             case "Data":
                 return ["UplcData", "UplcData"]
             case "Duration":
-                return ["bigint", "bigint | number"]
+                return ["bigint", "IntLike"]
             case "Int":
-                return ["bigint", "bigint | number | string"]
+                return ["bigint", "IntLike"]
             case "MintingPolicyHash":
                 return [
                     "MintingPolicyHash",
@@ -88,11 +88,11 @@ export function genTypes(schema) {
             case "String":
                 return ["string", "string"]
             case "Time":
-                return ["Date", "Date | bigint | number"]
+                return ["number", "TimeLike"]
             case "TimeRange":
                 return [
                     "TimeRange",
-                    "TimeRange | [Date | number | bigint, Date | number | bigint] | {start?: Date | number | bigint, excludeStart?: boolean, end?: Date | number | bigint, excludeEnd?: boolean}"
+                    "TimeRange | [TimeLike, TimeLike] | {start?: TimeLike, excludeStart?: boolean, end?: TimeLike, excludeEnd?: boolean}"
                 ]
             case "TxId":
                 return ["TxId", "TxId | string | number[]"]
@@ -108,7 +108,7 @@ export function genTypes(schema) {
             case "Value":
                 return [
                     "Value",
-                    "Value | [MintingPolicyHash | string | number[], [number[] | string, bigint | number | string][]][] | {mph: MintingPolicyHash | string | number[], tokens: {name: number[] | string, qty: bigint | number | string}[]}[]"
+                    "Value | [MintingPolicyHash | string | number[], [number[] | string, IntLike][]][] | {mph: MintingPolicyHash | string | number[], tokens: {name: number[] | string, qty: IntLike}[]}[]"
                 ]
             default:
                 throw new Error(

package/types/codegen/LoadedScriptsWriter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"LoadedScriptsWriter.d.ts","sourceRoot":"","sources":["../../src/codegen/LoadedScriptsWriter.js"],"names":[],"mappings":"AAGA;;;;GAIG;AAEH;IAUI;;;OAGG;IACH,gBAFa,mBAAmB,CAQ/B;IAfG,yBAAoC;IACpC,0BAAqC;IACrC,uBAAkC;IAetC;;;OAGG;IACH;;QAFa,mBAAmB,CAgC/B;IAED;;;OAGG;IACH;;QAFa,mBAAmB,CAkC/B;IAED;;OAEG;IACH,YAFa,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAQpC;IAED;;;;;OAKG;IACH,cAKC;IAED;;OAEG;IACH,qBAWC;IAED;;;OAGG;IACH,kBAFW,OAAO,MAAM,EAAE,UAAU,CAAC,QAiBpC;IAED;;;OAGG;IACH,oBA4BC;IAED;;;OAGG;IACH,uBAgDC;CACJ;gCAzPY,OAAO,wBAAwB,EAAE,iBAAiB;mCAClD,OAAO,2BAA2B,EAAE,oBAAoB;yBACxD,OAAO,iBAAiB,EAAE,UAAU;6BANpB,0BAA0B"}
+{"version":3,"file":"LoadedScriptsWriter.d.ts","sourceRoot":"","sources":["../../src/codegen/LoadedScriptsWriter.js"],"names":[],"mappings":"AAGA;;;;GAIG;AAEH;IAUI;;;OAGG;IACH,gBAFa,mBAAmB,CAQ/B;IAfG,yBAAoC;IACpC,0BAAqC;IACrC,uBAAkC;IAetC;;;OAGG;IACH;;QAFa,mBAAmB,CAgC/B;IAED;;;OAGG;IACH;;QAFa,mBAAmB,CAkC/B;IAED;;OAEG;IACH,YAFa,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAQpC;IAED;;;;;OAKG;IACH,cAKC;IAED;;OAEG;IACH,qBAgBC;IAED;;;OAGG;IACH,kBAFW,OAAO,MAAM,EAAE,UAAU,CAAC,QAiBpC;IAED;;;OAGG;IACH,oBA4BC;IAED;;;OAGG;IACH,uBAgDC;CACJ;gCA9PY,OAAO,wBAAwB,EAAE,iBAAiB;mCAClD,OAAO,2BAA2B,EAAE,oBAAoB;yBACxD,OAAO,iBAAiB,EAAE,UAAU;6BANpB,0BAA0B"}