@helios-lang/contract-utils 0.2.23 → 0.2.25

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@helios-lang/contract-utils",
-    "version": "0.2.23",
+    "version": "0.2.25",
     "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/UserFunc.js

@@ -14,6 +14,7 @@ import { ConstrData, UplcDataValue } from "@helios-lang/uplc"
  *   arguments: {
  *     name: string
  *     type: TypeSchema
+ *     isOptional: boolean
  *   }[]
  *   returns: TypeSchema
  *   validatorIndices?: Record<string, number>
@@ -56,12 +57,22 @@ export class UserFunc {
                 /**
                  * @type {UplcData[]}
                  */
-                const args = this.props.arguments.map(({ name, type }) => {
-                    const rawArg = expectSome(namedArgs[name])
+                const args = this.props.arguments.map(
+                    ({ name, type, isOptional }) => {
+                        if (isOptional) {
+                            if (name in namedArgs) {
+                                return new ConstrData(0, [namedArgs[name]])
+                            } else {
+                                return new ConstrData(1, [])
+                            }
+                        } else {
+                            const rawArg = expectSome(namedArgs[name])
 
-                    // TODO: apply type conversion
-                    return rawArg
-                })
+                            // TODO: apply type conversion
+                            return rawArg
+                        }
+                    }
+                )
 
                 if (this.props.requiresScriptContext) {
                     args.push(expectSome(namedArgs["$scriptContext"]))

package/src/codegen/LoadedScriptsWriter.js

@@ -312,7 +312,7 @@ export class LoadedScriptsWriter {
             `export const ${v.name} = {
     $name: /** @type {const} */ ("${v.name}"),
     $purpose: /** @type {const} */ ("${v.purpose}"),
-${isSome(currentScriptIndex) ? `    $currentScriptIndex: /** @type {const} */ (${currentScriptIndex}),\n` : ""}
+${isSome(currentScriptIndex) ? `    $currentScriptIndex: /** @type {const} */ (${currentScriptIndex}),` : ""}
     $sourceCode: ${JSON.stringify(v.sourceCode)},
     $dependencies: /** @type {const} */ ([${v.moduleDepedencies.join(", ")}]),
     $hashDependencies: [${v.hashDependencies.filter((d) => d != v.name).join(", ")}],
@@ -325,7 +325,7 @@ ${datumTypes ? `    $Datum: (config) => /** @type {Cast<${datumTypes[0]}, ${datu
             `export const ${v.name}: {
     $name: "${v.name}"
     $purpose: "${v.purpose}"
-${isSome(currentScriptIndex) ? `    $currentScriptIndex: ${currentScriptIndex},\n` : ""}
+${isSome(currentScriptIndex) ? `    $currentScriptIndex: ${currentScriptIndex}` : ""}
     $sourceCode: string
     $dependencies: [${v.moduleDepedencies.map((d) => `typeof ${d}`).join(", ")}]
     $hashDependencies: [${v.hashDependencies
@@ -341,7 +341,7 @@ ${datumTypes ? `    $Datum: ConfigurableCast<${datumTypes[0]}, ${datumTypes[1]}>
             `export const ${v.name} = {
     $name: "${v.name}" as const,
     $purpose: "${v.purpose}" as const,
-${isSome(currentScriptIndex) ? `    $currentScriptIndex: ${currentScriptIndex} as const,\n` : ""}
+${isSome(currentScriptIndex) ? `    $currentScriptIndex: ${currentScriptIndex} as const,` : ""}
     $sourceCode: ${JSON.stringify(v.sourceCode)} as string,
     $dependencies: [${v.moduleDepedencies.join(", ")}] as const,
     $hashDependencies: [${v.hashDependencies.filter((d) => d != v.name).join(", ")}],
@@ -403,10 +403,8 @@ function genFuncType(fn) {
         fields.push("$currentScript: string")
     }
 
-    fn.arguments.forEach(({ name, type: _type }, i) => {
-        if (!name.startsWith("_")) {
-            fields.push(`${name}: UplcData`)
-        }
+    fn.arguments.forEach(({ name, type: _type, isOptional }, i) => {
+        fields.push(`${name}${isOptional ? "?" : ""}: UplcData`)
     })
 
     return `(args: {${fields.join(", ")}}) => UplcData`

package/src/codegen/TypeCheckedModule.js

@@ -11,6 +11,7 @@ export {}
  *   arguments: {
  *     name: string
  *     type: TypeSchema
+ *     isOptional: boolean
  *   }[]
  *   returns: TypeSchema
  * }} TypeCheckedUserFunc

package/src/context/DagCompiler.js

@@ -1,6 +1,7 @@
 import { bytesToHex } from "@helios-lang/codec-utils"
 import {
     MintingPolicyHash,
+    ScriptHash,
     StakingValidatorHash,
     ValidatorHash
 } from "@helios-lang/ledger"
@@ -219,6 +220,13 @@ export class DagCompiler {
                     datum: configureCast(validator.$Datum, this.castConfig)
                 })
                 break
+            case "mixed":
+                this.cachedValidators[name] = new ScriptHash(hash, {
+                    program,
+                    redeemer,
+                    datum: configureCast(validator.$Datum, this.castConfig)
+                })
+                break
             case "minting":
                 this.cachedValidators[name] = new MintingPolicyHash(hash, {
                     program,
@@ -234,7 +242,9 @@ export class DagCompiler {
                 })
                 break
             default:
-                throw new Error("unhandled purpose")
+                throw new Error(
+                    `unhandled purpose '${/** @type {any} */ (validator).$purpose}'`
+                )
         }
     }
 

package/types/cast/UserFunc.d.ts

@@ -5,6 +5,7 @@
  *   arguments: {
  *     name: string
  *     type: TypeSchema
+ *     isOptional: boolean
  *   }[]
  *   returns: TypeSchema
  *   validatorIndices?: Record<string, number>
@@ -45,6 +46,7 @@ export type UserFuncProps = {
     arguments: {
         name: string;
         type: TypeSchema;
+        isOptional: boolean;
     }[];
     returns: TypeSchema;
     validatorIndices?: Record<string, number>;

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

@@ -1 +1 @@
-{"version":3,"file":"UserFunc.d.ts","sourceRoot":"","sources":["../../src/cast/UserFunc.js"],"names":[],"mappings":"AASA;;;;;;;;;;;GAWG;AAEH;;GAEG;AACH;IAeI;;;OAGG;IACH,kBAHW,WAAW,SACX,aAAa,EAKvB;IArBD;;;;OAIG;IACH,sBAAI;IAEJ;;;;OAIG;IACH,uBAAK;IAWL;;OAEG;IACH,oBA6CC;CACJ;yBAjGY,OAAO,yBAAyB,EAAE,UAAU;uBAC5C,OAAO,mBAAmB,EAAE,QAAQ;0BACpC,OAAO,mBAAmB,EAAE,WAAW;4BAOvC;IACZ,qBAAyB,EAAE,OAAO,CAAA;IAClC,qBAAyB,EAAE,OAAO,CAAA;IAClC,SAAa,EAAE;QACf,MAAY,MAAM,CAAA;QAClB,IAAU,EAAE,UAAU,CAAA;KACjB,EAAE,CAAA;IACP,OAAW,EAAE,UAAU,CAAA;IACvB,gBAAoB,CAAC,EAAE,OAAO,MAAM,EAAE,MAAM,CAAC,CAAA;CAC1C"}
+{"version":3,"file":"UserFunc.d.ts","sourceRoot":"","sources":["../../src/cast/UserFunc.js"],"names":[],"mappings":"AASA;;;;;;;;;;;;GAYG;AAEH;;GAEG;AACH;IAeI;;;OAGG;IACH,kBAHW,WAAW,SACX,aAAa,EAKvB;IArBD;;;;OAIG;IACH,sBAAI;IAEJ;;;;OAIG;IACH,uBAAK;IAWL;;OAEG;IACH,oBAuDC;CACJ;yBA5GY,OAAO,yBAAyB,EAAE,UAAU;uBAC5C,OAAO,mBAAmB,EAAE,QAAQ;0BACpC,OAAO,mBAAmB,EAAE,WAAW;4BAOvC;IACZ,qBAAyB,EAAE,OAAO,CAAA;IAClC,qBAAyB,EAAE,OAAO,CAAA;IAClC,SAAa,EAAE;QACf,MAAY,MAAM,CAAA;QAClB,IAAU,EAAE,UAAU,CAAA;QACtB,UAAgB,EAAE,OAAO,CAAA;KACpB,EAAE,CAAA;IACP,OAAW,EAAE,UAAU,CAAA;IACvB,gBAAoB,CAAC,EAAE,OAAO,MAAM,EAAE,MAAM,CAAC,CAAA;CAC1C"}

package/types/codegen/TypeCheckedModule.d.ts

@@ -5,6 +5,7 @@ export type TypeCheckedUserFunc = {
     arguments: {
         name: string;
         type: TypeSchema;
+        isOptional: boolean;
     }[];
     returns: TypeSchema;
 };

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

@@ -1 +1 @@
-{"version":3,"file":"TypeCheckedModule.d.ts","sourceRoot":"","sources":["../../src/codegen/TypeCheckedModule.js"],"names":[],"mappings":"yBAGa,OAAO,iBAAiB,EAAE,UAAU;kCAIpC;IACZ,qBAAyB,EAAE,OAAO,CAAA;IAClC,qBAAyB,EAAE,OAAO,CAAA;IAClC,SAAa,EAAE;QACf,MAAY,MAAM,CAAA;QAClB,IAAU,EAAE,UAAU,CAAA;KACjB,EAAE,CAAA;IACP,OAAW,EAAE,UAAU,CAAA;CACpB;gCAIS;IACZ,MAAU,MAAM,CAAA;IAChB,OAAW,EAAE,MAAM,CAAA;IACnB,UAAc,EAAE,MAAM,CAAA;IACtB,iBAAqB,EAAE,MAAM,EAAE,CAAA;IAC/B,KAAS,EAAE,OAAO,MAAM,EAAE,UAAU,CAAC,CAAA;IACrC,SAAa,CAAC,EAAE,OAAO,MAAM,EAAE,mBAAmB,CAAC,CAAA;CAChD"}
+{"version":3,"file":"TypeCheckedModule.d.ts","sourceRoot":"","sources":["../../src/codegen/TypeCheckedModule.js"],"names":[],"mappings":"yBAGa,OAAO,iBAAiB,EAAE,UAAU;kCAIpC;IACZ,qBAAyB,EAAE,OAAO,CAAA;IAClC,qBAAyB,EAAE,OAAO,CAAA;IAClC,SAAa,EAAE;QACf,MAAY,MAAM,CAAA;QAClB,IAAU,EAAE,UAAU,CAAA;QACtB,UAAgB,EAAE,OAAO,CAAA;KACpB,EAAE,CAAA;IACP,OAAW,EAAE,UAAU,CAAA;CACpB;gCAIS;IACZ,MAAU,MAAM,CAAA;IAChB,OAAW,EAAE,MAAM,CAAA;IACnB,UAAc,EAAE,MAAM,CAAA;IACtB,iBAAqB,EAAE,MAAM,EAAE,CAAA;IAC/B,KAAS,EAAE,OAAO,MAAM,EAAE,UAAU,CAAC,CAAA;IACrC,SAAa,CAAC,EAAE,OAAO,MAAM,EAAE,mBAAmB,CAAC,CAAA;CAChD"}

package/types/context/DagCompiler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DagCompiler.d.ts","sourceRoot":"","sources":["../../src/context/DagCompiler.js"],"names":[],"mappings":"AAsUA;;;GAGG;AACH,iDAHW,eAAe,GACb,MAAM,EAAE,CAsBpB;AApVD;;;;;;GAMG;AAEH;;;;;GAKG;AAEH;;GAEG;AACH;IA6BI;;;OAGG;IACH,iBAHW,WAAW,cACX,UAAU,EAOpB;IArCD;;;;OAIG;IACH,qBAAG;IAEH;;;;OAIG;IACH,wBAAM;IAEN;;;;OAIG;IACH,kCAAgB;IAEhB;;;;OAIG;IACH,iCAAe;IAQX,iDAA4B;IAKhC;;;;;;OAMG;IACH,kBANW,eAAe,EAAE,cACjB,OAAO,MAAM,EAAE,GAAG,CAAC,aACnB,OAAO;;SAEL,iBAAiB,CAgI7B;IAED;;;;;OAKG;IACH,4BA6BC;IAED;;;;;OAKG;IACH,yBA0BC;IAED;;;;;OAKG;IACH,qBAoBC;IAED;;;;;OAKG;IACH,4BAeC;CACJ;0BAzTY,OAAO,mBAAmB,EAAE,WAAW;yBACvC,OAAO,kBAAkB,EAAE,UAAU;8BACrC,OAAO,+BAA+B,EAAE,eAAe;0BACvD,OAAO,sBAAsB,EAAE,WAAW;0CAC1C,OAAO,sBAAsB,EAAE,2BAA2B"}
+{"version":3,"file":"DagCompiler.d.ts","sourceRoot":"","sources":["../../src/context/DagCompiler.js"],"names":[],"mappings":"AAgVA;;;GAGG;AACH,iDAHW,eAAe,GACb,MAAM,EAAE,CAsBpB;AA7VD;;;;;;GAMG;AAEH;;;;;GAKG;AAEH;;GAEG;AACH;IA6BI;;;OAGG;IACH,iBAHW,WAAW,cACX,UAAU,EAOpB;IArCD;;;;OAIG;IACH,qBAAG;IAEH;;;;OAIG;IACH,wBAAM;IAEN;;;;OAIG;IACH,kCAAgB;IAEhB;;;;OAIG;IACH,iCAAe;IAQX,iDAA4B;IAKhC;;;;;;OAMG;IACH,kBANW,eAAe,EAAE,cACjB,OAAO,MAAM,EAAE,GAAG,CAAC,aACnB,OAAO;;SAEL,iBAAiB,CAgI7B;IAED;;;;;OAKG;IACH,4BAsCC;IAED;;;;;OAKG;IACH,yBA0BC;IAED;;;;;OAKG;IACH,qBAoBC;IAED;;;;;OAKG;IACH,4BAeC;CACJ;0BAlUY,OAAO,mBAAmB,EAAE,WAAW;yBACvC,OAAO,kBAAkB,EAAE,UAAU;8BACrC,OAAO,+BAA+B,EAAE,eAAe;0BACvD,OAAO,sBAAsB,EAAE,WAAW;0CAC1C,OAAO,sBAAsB,EAAE,2BAA2B"}