@helios-lang/contract-utils 0.1.25 → 0.1.27

package/examples/multi-validator/index.d.ts

@@ -5,7 +5,8 @@ export const utils: {
     $name: string
     $purpose: string
     $sourceCode: string
-    $dependencies: []
+    $dependencies: [],
+    MyUtilType: Cast<{hello: bigint}, {hello: bigint | number | string}>,
 }
 export const match_string_policy: {
     $name: "match_string_policy"
@@ -15,7 +16,6 @@ export const match_string_policy: {
     $hashDependencies: []
     $dependsOnOwnHash: boolean
     $Redeemer: Cast<boolean, boolean>
-    
 }
 export const match_string: {
     $name: "match_string"
@@ -25,5 +25,6 @@ export const match_string: {
     $hashDependencies: [typeof match_string_policy]
     $dependsOnOwnHash: boolean
     $Redeemer: Cast<string, string>
-    $Datum: Cast<{One: {message: string}} | {Two: {code: bigint}}, {One: {message: string}} | {Two: {code: bigint | number | string}}>
+    $Datum: Cast<{One: {message: string}} | {Two: {code: bigint}}, {One: {message: string}} | {Two: {code: bigint | number | string}}>,
+    Datum: Cast<{One: {message: string}} | {Two: {code: bigint}}, {One: {message: string}} | {Two: {code: bigint | number | string}}>,
 }

package/examples/multi-validator/index.js

@@ -2,8 +2,9 @@ import { Cast } from "@helios-lang/contract-utils";
 export const utils = {
     $name: "utils",
     $purpose: "module",
-    $sourceCode: "module utils\n\nconst my_assetclass: AssetClass = AssetClass::new(Scripts::match_string_policy, #)\n\nconst my_hash: ValidatorHash = Scripts::match_string\n\nfunc compare(a: String, b: String) -> Bool {\n    a == b\n}",
+    $sourceCode: "module utils\n\nstruct MyUtilType {\n    hello: Int\n}\n\nconst my_assetclass: AssetClass = AssetClass::new(Scripts::match_string_policy, #)\n\nconst my_hash: ValidatorHash = Scripts::match_string\n\nfunc compare(a: String, b: String) -> Bool {\n    a == b\n}",
     $dependencies: [],
+    MyUtilType: new Cast({"structFieldTypes":[{"name":"hello","type":{"primitiveType":"Int"}}]}),
 }
 export const match_string_policy = {
     $name: "match_string_policy",
@@ -13,7 +14,6 @@ export const match_string_policy = {
     $hashDependencies: [],
     $dependsOnOwnHash: false,
     $Redeemer: new Cast({"primitiveType":"Bool"}),
-    
 }
 export const match_string = {
     $name: "match_string",
@@ -23,5 +23,6 @@ export const match_string = {
     $hashDependencies: [match_string_policy],
     $dependsOnOwnHash: true,
     $Redeemer: new Cast({"primitiveType":"String"}),
-    $Datum: new Cast({"enumVariantTypes":[{"name":"One","fieldTypes":[{"name":"message","type":{"primitiveType":"String"}}]},{"name":"Two","fieldTypes":[{"name":"code","type":{"primitiveType":"Int"}}]}]})
+    $Datum: new Cast({"enumVariantTypes":[{"name":"One","fieldTypes":[{"name":"message","type":{"primitiveType":"String"}}]},{"name":"Two","fieldTypes":[{"name":"code","type":{"primitiveType":"Int"}}]}]}),
+    Datum: new Cast({"enumVariantTypes":[{"name":"One","fieldTypes":[{"name":"message","type":{"primitiveType":"String"}}]},{"name":"Two","fieldTypes":[{"name":"code","type":{"primitiveType":"Int"}}]}]}),
 }

package/examples/multi-validator/utils.hl

@@ -1,5 +1,9 @@
 module utils
 
+struct MyUtilType {
+    hello: Int
+}
+
 const my_assetclass: AssetClass = AssetClass::new(Scripts::match_string_policy, #)
 
 const my_hash: ValidatorHash = Scripts::match_string

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@helios-lang/contract-utils",
-    "version": "0.1.25",
+    "version": "0.1.27",
     "description": "Convenience and type-safety utilities for using Helios validators from within Typescript",
     "main": "src/index.js",
     "types": "types/index.d.ts",
@@ -40,6 +40,6 @@
         "@helios-lang/compiler-utils": "^0.1.21",
         "@helios-lang/ledger": "^0.1.21",
         "@helios-lang/type-utils": "^0.1.8",
-        "@helios-lang/uplc": "^0.1.22"
+        "@helios-lang/uplc": "^0.1.23"
     }
 }

package/src/cast/Cast.js

@@ -1,6 +1,4 @@
 import { decodeUtf8, encodeUtf8 } from "@helios-lang/codec-utils"
-import { REAL_PRECISION } from "@helios-lang/compiler-utils"
-import { None } from "@helios-lang/type-utils"
 import {
     Address,
     AssetClass,
@@ -19,6 +17,7 @@ import {
     ValidatorHash,
     Value
 } from "@helios-lang/ledger"
+import { None } from "@helios-lang/type-utils"
 import {
     ByteArrayData,
     ConstrData,
@@ -27,8 +26,10 @@ import {
     MapData,
     decodeBoolData,
     decodeOptionData,
+    decodeRealData,
     encodeBoolData,
-    encodeOptionData
+    encodeOptionData,
+    encodeRealData
 } from "@helios-lang/uplc"
 
 /**
@@ -103,7 +104,7 @@ function schemaToUplc(schema, x) {
             case "PubKeyHash":
                 return PubKeyHash.fromAlike(x).toUplcData()
             case "Real":
-                return new IntData(Math.round(x * Math.pow(10, REAL_PRECISION)))
+                return encodeRealData(x)
             case "ScriptHash":
                 return ScriptHash.fromAlike(x).toUplcData()
             case "StakingCredential":
@@ -217,10 +218,7 @@ function uplcToSchema(schema, data) {
             case "PubKeyHash":
                 return PubKeyHash.fromUplcData(data)
             case "Real":
-                return (
-                    Number(IntData.expect(data).value) /
-                    Math.pow(10, REAL_PRECISION)
-                )
+                return decodeRealData(data)
             case "ScriptHash":
                 return ScriptHash.fromUplcData(data)
             case "StakingCredential":

package/src/codegen/LoadedScriptsWriter.js

@@ -4,6 +4,7 @@ import { genTypes } from "./TypeSchema.js"
 /**
  * @typedef {import("./TypeCheckedModule.js").TypeCheckedModule} TypeCheckedModule
  * @typedef {import("./TypeCheckedValidator.js").TypeCheckedValidator} TypeCheckedValidator
+ * @typedef {import("./TypeSchema.js").TypeSchema} TypeSchema
  */
 
 export class LoadedScriptsWriter {
@@ -142,29 +143,44 @@ export class LoadedScriptsWriter {
         })
     }
 
+    /**
+     *
+     * @param {Record<string, TypeSchema>} types
+     */
+    writeTypes(types) {
+        for (let key in types) {
+            const t = types[key]
+            const tsTypes = genTypes(t)
+
+            this.definition.write(
+                `    ${key}: new Cast(${JSON.stringify(t)}),\n`
+            )
+            this.declaration.write(
+                `    ${key}: Cast<${tsTypes[0]}, ${tsTypes[1]}>,\n`
+            )
+            this.combined.write(
+                `    ${key}: new Cast<${tsTypes[0]}, ${tsTypes[1]}>(${JSON.stringify(t)}),\n`
+            )
+        }
+    }
+
     /**
      * @private
      * @param {TypeCheckedModule} m
      */
     writeModule(m) {
-        this.definition.write(
-            `export const ${m.name} = {
+        this.definition.write(`export const ${m.name} = {
     $name: "${m.name}",
     $purpose: "${m.purpose}",
     $sourceCode: ${JSON.stringify(m.sourceCode)},
-    $dependencies: [${m.moduleDepedencies.join(", ")}],
-}
-`
-        )
+    $dependencies: [${m.moduleDepedencies.join(", ")}],\n`)
 
         this.declaration.write(
             `export const ${m.name}: {
     $name: string
     $purpose: string
     $sourceCode: string
-    $dependencies: [${m.moduleDepedencies.map((d) => `typeof ${d}`).join(", ")}]
-}
-`
+    $dependencies: [${m.moduleDepedencies.map((d) => `typeof ${d}`).join(", ")}],\n`
         )
 
         this.combined.write(
@@ -172,10 +188,14 @@ export class LoadedScriptsWriter {
     $name: "${m.name}" as "${m.name}",
     $purpose: "${m.purpose}" as "${m.purpose}",
     $sourceCode: ${JSON.stringify(m.sourceCode)} as string,
-    $dependencies: [${m.moduleDepedencies.join(", ")}],
-}
-`
+    $dependencies: [${m.moduleDepedencies.join(", ")}],\n`
         )
+
+        this.writeTypes(m.types)
+
+        this.definition.write(`}\n`)
+        this.declaration.write(`}\n`)
+        this.combined.write(`}\n`)
     }
 
     /**
@@ -195,10 +215,9 @@ export class LoadedScriptsWriter {
     $hashDependencies: [${v.hashDependencies.filter((d) => d != v.name).join(", ")}],
     $dependsOnOwnHash: ${v.hashDependencies.some((d) => d == v.name)},
     $Redeemer: new Cast(${JSON.stringify(v.Redeemer)}),
-    ${datumTypes ? `$Datum: new Cast(${JSON.stringify(v.Datum)})` : ""}
-}
-`
+${datumTypes ? `    $Datum: new Cast(${JSON.stringify(v.Datum)}),\n` : ""}`
         )
+
         this.declaration.write(
             `export const ${v.name}: {
     $name: "${v.name}"
@@ -211,9 +230,7 @@ export class LoadedScriptsWriter {
         .join(", ")}]
     $dependsOnOwnHash: boolean
     $Redeemer: Cast<${redeemerTypes[0]}, ${redeemerTypes[1]}>
-    ${datumTypes ? `$Datum: Cast<${datumTypes[0]}, ${datumTypes[1]}>` : ""}
-}
-`
+${datumTypes ? `    $Datum: Cast<${datumTypes[0]}, ${datumTypes[1]}>,\n` : ""}`
         )
 
         this.combined.write(
@@ -225,9 +242,13 @@ export class LoadedScriptsWriter {
     $hashDependencies: [${v.hashDependencies.filter((d) => d != v.name).join(", ")}],
     $dependsOnOwnHash: ${v.hashDependencies.some((d) => d == v.name)} as boolean,
     $Redeemer: new Cast<${redeemerTypes[0]}, ${redeemerTypes[1]}>(${JSON.stringify(v.Redeemer)}),
-    ${datumTypes ? `$Datum: new Cast<${datumTypes[0]}, ${datumTypes[1]}>(${JSON.stringify(v.Datum)})` : ""}
-}
-`
+${datumTypes ? `    $Datum: new Cast<${datumTypes[0]}, ${datumTypes[1]}>(${JSON.stringify(v.Datum)}),\n` : ""}`
         )
+
+        this.writeTypes(v.types)
+
+        this.definition.write(`}\n`)
+        this.declaration.write(`}\n`)
+        this.combined.write(`}\n`)
     }
 }

package/src/compiler/CompilerLib_v0_16.js

@@ -1,5 +1,6 @@
 import { bytesToHex } from "@helios-lang/compiler"
 import { readHeader } from "@helios-lang/compiler-utils"
+import { expectSome } from "@helios-lang/type-utils"
 
 /**
  * @typedef {import("../codegen/index.js").TypeCheckedModule} TypeCheckedModule
@@ -31,18 +32,8 @@ import { readHeader } from "@helios-lang/compiler-utils"
 
 /**
  * @typedef {{
- *   name: string
- * }} EnumStatement
- */
-
-/**
- * @typedef {{
- *   name: string
- * }} StructStatement
- */
-
-/**
- * @typedef {StructStatement | EnumStatement | any} Statement
+ *   name: WordToken
+ * }} Statement
  */
 
 /**
@@ -71,14 +62,34 @@ import { readHeader } from "@helios-lang/compiler-utils"
  * @typedef {{
  *   name: string
  *   purpose: "testing" | "minting" | "spending" | "staking" | "endpoint" | "module" | "unknown"
- *   toIR: (ctx: any, extra: Map<string, IR>) => IR
+ *   toIR(ctx: any, extra: Map<string, IR>): IR
  *   types: UserTypes
  *   mainImportedModules: Module[]
  *   mainModule: Module
  *   mainArgTypes: DataType[]
+ *   throwErrors()
+ *   evalTypes(validatorTypes: {[name: string]: ScriptHashType}): TopScope
  * }} Program
  */
 
+/**
+ * @typedef {{
+ *   getModuleScope(name: WordToken): Scope
+ * }} TopScope
+ */
+
+/**
+ * @typedef {{
+ *   asDataType?: DataType
+ * }} HeliosType
+ */
+
+/**
+ * @typedef {{
+ *   loopTypes(callback: (name: string, type: HeliosType) => void)
+ * }} Scope
+ */
+
 /**
  * @typedef {{
  *   typeDetails?: TypeDetails
@@ -161,6 +172,53 @@ export class CompilerLib_v0_16 {
         }
     }
 
+    /**
+     * @param {string} main
+     * @param {string[]} modules
+     * @param {CompileOptions} options
+     * @returns {CompileOutput}
+     */
+    compile(main, modules, options) {
+        const [purpose, name] = readHeader(main)
+
+        // use `Program.newInternal()` instead of `Program.new()` so we can inject custom IR before finally compiling to a UplcProgram
+        const program = this.lib.Program.newInternal(
+            main,
+            modules,
+            options.allValidatorHashTypes,
+            {
+                allowPosParams: false,
+                invertEntryPoint: true
+            }
+        )
+
+        const extra = this.generateExtraIRDefinitions(
+            name,
+            purpose,
+            program.nPosParams,
+            options
+        )
+        const optimize = options.optimize
+        const ir = program.toIR(new this.lib.ToIRContext(optimize), extra)
+
+        const irProgram =
+            program.nPosParams > 0
+                ? this.lib.IRParametricProgram.new(
+                      ir,
+                      purpose,
+                      program.nPosParams,
+                      optimize
+                  )
+                : this.lib.IRProgram.new(ir, purpose, optimize)
+
+        const cborHex = bytesToHex(irProgram.toUplc().toCbor())
+
+        return {
+            prettyIR: irProgram.program.annotate(),
+            cborHex
+        }
+    }
+
     /**
      * @param {string[]} validators
      * @param {string[]} modules
@@ -200,6 +258,7 @@ export class CompilerLib_v0_16 {
             const purpose = v.purpose
             const sourceCode = v.mainModule.name.site.src.raw
             const hashDependencies = dag[name]
+            const allTypes = this.getProgramTypes(v, validatorTypes)
 
             const allModules = v.mainImportedModules
             const moduleDepedencies = v.mainModule
@@ -212,7 +271,14 @@ export class CompilerLib_v0_16 {
                 sourceCode: sourceCode,
                 hashDependencies: hashDependencies,
                 moduleDepedencies: moduleDepedencies,
-                types: {},
+                types: Object.fromEntries(
+                    Object.entries(allTypes[name]).map(
+                        ([typeName, typeDetails]) => [
+                            typeName,
+                            this.getInternalTypeDetails(typeDetails)
+                        ]
+                    )
+                ),
                 Redeemer: this.getInternalTypeDetails(
                     v.mainArgTypes[purpose == "spending" ? 1 : 0]
                 ),
@@ -238,7 +304,14 @@ export class CompilerLib_v0_16 {
                     moduleDepedencies: m
                         .filterDependencies(allModules)
                         .map((m) => m.name.value),
-                    types: {}
+                    types: Object.fromEntries(
+                        Object.entries(allTypes[name]).map(
+                            ([typeName, typeDetails]) => [
+                                typeName,
+                                this.getInternalTypeDetails(typeDetails)
+                            ]
+                        )
+                    )
                 }
             }
         }
@@ -315,53 +388,6 @@ export class CompilerLib_v0_16 {
         return extra
     }
 
-    /**
-     * @param {string} main
-     * @param {string[]} modules
-     * @param {CompileOptions} options
-     * @returns {CompileOutput}
-     */
-    compile(main, modules, options) {
-        const [purpose, name] = readHeader(main)
-
-        // use `Program.newInternal()` instead of `Program.new()` so we can inject custom IR before finally compiling to a UplcProgram
-        const program = this.lib.Program.newInternal(
-            main,
-            modules,
-            options.allValidatorHashTypes,
-            {
-                allowPosParams: false,
-                invertEntryPoint: true
-            }
-        )
-
-        const extra = this.generateExtraIRDefinitions(
-            name,
-            purpose,
-            program.nPosParams,
-            options
-        )
-        const optimize = options.optimize
-        const ir = program.toIR(new this.lib.ToIRContext(optimize), extra)
-
-        const irProgram =
-            program.nPosParams > 0
-                ? this.lib.IRParametricProgram.new(
-                      ir,
-                      purpose,
-                      program.nPosParams,
-                      optimize
-                  )
-                : this.lib.IRProgram.new(ir, purpose, optimize)
-
-        const cborHex = bytesToHex(irProgram.toUplc().toCbor())
-
-        return {
-            prettyIR: irProgram.program.annotate(),
-            cborHex
-        }
-    }
-
     /**
      * @private
      * @param {string[]} validators
@@ -472,9 +498,72 @@ export class CompilerLib_v0_16 {
         } catch (e) {
             if (e.message.includes("Data")) {
                 return { primitiveType: "Data" }
+            } else if (e.message.includes("DCert")) {
+                return { primitiveType: "DCert" }
+            } else if (e.message.includes("Credential")) {
+                return { primitiveType: "SpendingCredential" }
+            } else if (e.message.includes("OutputDatum")) {
+                return { primitiveType: "TxOutputDatum" }
+            } else if (e.message.includes("PubKey")) {
+                return { primitiveType: "PubKey" }
+            } else if (e.message.includes("ScriptHash")) {
+                return { primitiveType: "ScriptHash" }
             } else {
                 throw e
             }
         }
     }
+
+    /**
+     * @private
+     * @param {Program} program
+     * @param {{[name: string]: ScriptHashType}} validatorTypes
+     * @returns {Record<string, Record<string, DataType>>}}
+     */
+    getProgramTypes(program, validatorTypes) {
+        const topScope = program.evalTypes(validatorTypes)
+
+        program.throwErrors()
+
+        /**
+         * @type {Record<string, Record<string, DataType>>}
+         */
+        const result = {}
+
+        if (program.purpose != "endpoint") {
+            const moduleNames = [program.mainModule.name].concat(
+                program.mainImportedModules.map((m) => m.name)
+            )
+
+            for (let moduleName of moduleNames) {
+                const module_ =
+                    moduleName.value == program.name
+                        ? program.mainModule
+                        : expectSome(
+                              program.mainImportedModules.find(
+                                  (m) => m.name.value == moduleName.value
+                              )
+                          )
+
+                /**
+                 * @type {Record<string, DataType>}
+                 */
+                const moduleTypes = {}
+
+                const moduleScope = topScope.getModuleScope(moduleName)
+
+                moduleScope.loopTypes((name, type) => {
+                    if (module_.statements.some((s) => s.name.value == name)) {
+                        if (type?.asDataType) {
+                            moduleTypes[name] = type.asDataType
+                        }
+                    }
+                })
+
+                result[moduleName.value] = moduleTypes
+            }
+        }
+
+        return result
+    }
 }

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

@@ -1 +1 @@
-{"version":3,"file":"Cast.d.ts","sourceRoot":"","sources":["../../src/cast/Cast.js"],"names":[],"mappings":"AAiCA;;;GAGG;AAEH;;;GAGG;AACH;IAOI;;OAEG;IACH,oBAFW,UAAU,EAIpB;IAXD;;;OAGG;IACH,iBAFU,UAAU,CAEd;IASN;;;OAGG;IACH,mBAHW,QAAQ,GACN,OAAO,CAInB;IAED;;;OAGG;IACH,cAHW,WAAW,GACT,QAAQ,CAIpB;CACJ;uBArCY,OAAO,mBAAmB,EAAE,QAAQ;yBACpC,OAAO,qBAAqB,EAAE,UAAU"}
+{"version":3,"file":"Cast.d.ts","sourceRoot":"","sources":["../../src/cast/Cast.js"],"names":[],"mappings":"AAkCA;;;GAGG;AAEH;;;GAGG;AACH;IAOI;;OAEG;IACH,oBAFW,UAAU,EAIpB;IAXD;;;OAGG;IACH,iBAFU,UAAU,CAEd;IASN;;;OAGG;IACH,mBAHW,QAAQ,GACN,OAAO,CAInB;IAED;;;OAGG;IACH,cAHW,WAAW,GACT,QAAQ,CAIpB;CACJ;uBArCY,OAAO,mBAAmB,EAAE,QAAQ;yBACpC,OAAO,qBAAqB,EAAE,UAAU"}

package/types/codegen/LoadedScriptsWriter.d.ts

@@ -1,6 +1,7 @@
 /**
  * @typedef {import("./TypeCheckedModule.js").TypeCheckedModule} TypeCheckedModule
  * @typedef {import("./TypeCheckedValidator.js").TypeCheckedValidator} TypeCheckedValidator
+ * @typedef {import("./TypeSchema.js").TypeSchema} TypeSchema
  */
 export class LoadedScriptsWriter {
     /**
@@ -40,6 +41,11 @@ export class LoadedScriptsWriter {
      * @private
      */
     private writeHeaders;
+    /**
+     *
+     * @param {Record<string, TypeSchema>} types
+     */
+    writeTypes(types: Record<string, TypeSchema>): void;
     /**
      * @private
      * @param {TypeCheckedModule} m
@@ -53,5 +59,6 @@ export class LoadedScriptsWriter {
 }
 export type TypeCheckedModule = import("./TypeCheckedModule.js").TypeCheckedModule;
 export type TypeCheckedValidator = import("./TypeCheckedValidator.js").TypeCheckedValidator;
+export type TypeSchema = import("./TypeSchema.js").TypeSchema;
 import { StringWriter } from "@helios-lang/codec-utils";
 //# sourceMappingURL=LoadedScriptsWriter.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"LoadedScriptsWriter.d.ts","sourceRoot":"","sources":["../../src/codegen/LoadedScriptsWriter.js"],"names":[],"mappings":"AAGA;;;GAGG;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,oBA8BC;IAED;;;OAGG;IACH,uBA+CC;CACJ;gCApOY,OAAO,wBAAwB,EAAE,iBAAiB;mCAClD,OAAO,2BAA2B,EAAE,oBAAoB;6BALxC,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,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"}

package/types/compiler/CompilerLib_v0_16.d.ts

@@ -24,16 +24,8 @@
  */
 /**
  * @typedef {{
- *   name: string
- * }} EnumStatement
- */
-/**
- * @typedef {{
- *   name: string
- * }} StructStatement
- */
-/**
- * @typedef {StructStatement | EnumStatement | any} Statement
+ *   name: WordToken
+ * }} Statement
  */
 /**
  * @typedef {{
@@ -59,13 +51,30 @@
  * @typedef {{
  *   name: string
  *   purpose: "testing" | "minting" | "spending" | "staking" | "endpoint" | "module" | "unknown"
- *   toIR: (ctx: any, extra: Map<string, IR>) => IR
+ *   toIR(ctx: any, extra: Map<string, IR>): IR
  *   types: UserTypes
  *   mainImportedModules: Module[]
  *   mainModule: Module
  *   mainArgTypes: DataType[]
+ *   throwErrors()
+ *   evalTypes(validatorTypes: {[name: string]: ScriptHashType}): TopScope
  * }} Program
  */
+/**
+ * @typedef {{
+ *   getModuleScope(name: WordToken): Scope
+ * }} TopScope
+ */
+/**
+ * @typedef {{
+ *   asDataType?: DataType
+ * }} HeliosType
+ */
+/**
+ * @typedef {{
+ *   loopTypes(callback: (name: string, type: HeliosType) => void)
+ * }} Scope
+ */
 /**
  * @typedef {{
  *   typeDetails?: TypeDetails
@@ -126,6 +135,13 @@ export class CompilerLib_v0_16 implements CompilerLib {
      * @returns {ScriptHashType}
      */
     getScriptHashType(purpose: string): ScriptHashType;
+    /**
+     * @param {string} main
+     * @param {string[]} modules
+     * @param {CompileOptions} options
+     * @returns {CompileOutput}
+     */
+    compile(main: string, modules: string[], options: CompileOptions): CompileOutput;
     /**
      * @param {string[]} validators
      * @param {string[]} modules
@@ -145,13 +161,6 @@ export class CompilerLib_v0_16 implements CompilerLib {
      * @returns {Map<string, IR>}
      */
     private generateExtraIRDefinitions;
-    /**
-     * @param {string} main
-     * @param {string[]} modules
-     * @param {CompileOptions} options
-     * @returns {CompileOutput}
-     */
-    compile(main: string, modules: string[], options: CompileOptions): CompileOutput;
     /**
      * @private
      * @param {string[]} validators
@@ -188,6 +197,13 @@ export class CompilerLib_v0_16 implements CompilerLib {
      * @returns {InternalTypeDetails}
      */
     private getInternalTypeDetails;
+    /**
+     * @private
+     * @param {Program} program
+     * @param {{[name: string]: ScriptHashType}} validatorTypes
+     * @returns {Record<string, Record<string, DataType>>}}
+     */
+    private getProgramTypes;
 }
 export type TypeCheckedModule = import("../codegen/index.js").TypeCheckedModule;
 export type TypeCheckedValidator = import("../codegen/index.js").TypeCheckedValidator;
@@ -204,13 +220,9 @@ export type ScriptHashType = {};
 export type IR = {
     includes: (m: string) => boolean;
 };
-export type EnumStatement = {
-    name: string;
-};
-export type StructStatement = {
-    name: string;
+export type Statement = {
+    name: WordToken;
 };
-export type Statement = StructStatement | EnumStatement | any;
 export type Site = {
     src: {
         raw: string;
@@ -228,11 +240,24 @@ export type Module = {
 export type Program = {
     name: string;
     purpose: "testing" | "minting" | "spending" | "staking" | "endpoint" | "module" | "unknown";
-    toIR: (ctx: any, extra: Map<string, IR>) => IR;
+    toIR(ctx: any, extra: Map<string, IR>): IR;
     types: UserTypes;
     mainImportedModules: Module[];
     mainModule: Module;
     mainArgTypes: DataType[];
+    throwErrors(): any;
+    evalTypes(validatorTypes: {
+        [name: string]: ScriptHashType;
+    }): TopScope;
+};
+export type TopScope = {
+    getModuleScope(name: WordToken): Scope;
+};
+export type HeliosType = {
+    asDataType?: DataType;
+};
+export type Scope = {
+    loopTypes(callback: (name: string, type: HeliosType) => void): any;
 };
 export type DataType = {
     typeDetails?: TypeDetails;

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

@@ -1 +1 @@
-{"version":3,"file":"CompilerLib_v0_16.d.ts","sourceRoot":"","sources":["../../src/compiler/CompilerLib_v0_16.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"CompilerLib_v0_16.d.ts","sourceRoot":"","sources":["../../src/compiler/CompilerLib_v0_16.js"],"names":[],"mappings":"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"}