@helios-lang/contract-utils 0.1.2 → 0.1.6

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@helios-lang/contract-utils",
-    "version": "0.1.2",
+    "version": "0.1.6",
     "description": "Convenience and type-safety utilities for using Helios validators from within Typescript",
     "main": "src/index.js",
     "type": "module",
@@ -30,10 +30,10 @@
         "singleQuote": false
     },
     "dependencies": {
-        "@helios-lang/codec-utils": "^0.1.23",
-        "@helios-lang/compiler-utils": "^0.1.4",
-        "@helios-lang/ledger": "^0.1.9",
-        "@helios-lang/type-utils": "^0.1.3",
-        "@helios-lang/uplc": "^0.1.0"
+        "@helios-lang/codec-utils": "^0.1.26",
+        "@helios-lang/compiler-utils": "^0.1.20",
+        "@helios-lang/ledger": "^0.1.10",
+        "@helios-lang/type-utils": "^0.1.8",
+        "@helios-lang/uplc": "^0.1.21"
     }
 }

package/src/codegen/TypeSchema.js

@@ -46,6 +46,8 @@ export function genTypes(schema) {
                 return ["number[]", "number[]"]
             case "Credential":
                 return ["Credential", "Credential | PubKeyHash | ValidatorHash"]
+            case "Data":
+                return ["UplcData", "UplcData"]
             case "Duration":
                 return ["bigint", "bigint | number"]
             case "Int":
@@ -79,7 +81,7 @@ export function genTypes(schema) {
             case "String":
                 return ["string", "string"]
             case "Time":
-                return ["Date", "Data | bigint | number"]
+                return ["Date", "Date | bigint | number"]
             case "TimeRange":
                 return [
                     "TimeRange",

package/src/codegen/TypescriptWriter.js

@@ -98,6 +98,14 @@ export class TypescriptWriter {
         )
     }
 
+    writeHeaders() {
+        this.wjs.writeLine("import { Cast } from \"@helios-lang/contract-utils\";")
+
+        this.wdts.writeLine("import type {UplcData} from \"@helios-lang/ledger\";")
+        this.wdts.writeLine("import { Address, AssetClass, Credential, DatumHash, MintingPolicyHash, PubKeyHash, StakingCredential, StakingHash, StakingValidatorHash, TimeRange, TxId, TxOutputDatum, ValidatorHash, Value} from \"@helios-lang/ledger\";")
+        this.wdts.writeLine("import { Cast } from \"@helios-lang/contract-utils\";")
+    }
+
     /**
      * @param {{[name: string]: Module}} ms
      */

package/src/codegen/index.js

@@ -3,12 +3,6 @@ export { Writer } from "./Writer.js"
 
 /**
  * @typedef {import("./Module.js").Module} Module
- */
-
-/**
  * @typedef {import("./TypeSchema.js").TypeSchema} TypeSchema
- */
-
-/**
  * @typedef {import("./Validator.js").Validator} Validator
  */

package/src/hl2ts.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-import { promises, readFileSync } from "node:fs"
+import { promises, readFileSync, writeFileSync } from "node:fs"
 import { dirname, join, resolve } from "node:path"
 import { readHeader, translateImportPaths } from "@helios-lang/compiler-utils"
 import { TypescriptWriter } from "./codegen/index.js"
@@ -8,23 +8,16 @@ import { loadLibrary } from "./lib/index.js"
 
 /**
  * @typedef {import("./lib/Lib.js").Lib} Lib
- */
-
-/**
  * @typedef {import("./lib/Lib.js").SourceDetails} SourceDetails
- */
-
-/**
  * @typedef {import("./lib/Lib.js").ModuleDetails} ModuleDetails
- */
-
-/**
  * @typedef {import("./lib/Lib.js").ValidatorDetails} ValidatorDetails
  */
 
 async function main() {
     console.log("hl2ts")
 
+    const { outDir } = parseArgs(process.argv)
+
     const lib = await loadLibrary()
     const filePaths = await listFiles(process.cwd(), ".hl")
     const files = readFiles(filePaths)
@@ -32,17 +25,37 @@ async function main() {
     const { modules, validators } = typeCheck(lib, sources)
 
     const w = new TypescriptWriter()
-    console.log(modules, validators)
+
     w.writeModules(modules)
     w.writeValidators(validators)
     const [js, dts] = w.finalize()
 
-    console.log(js)
-    console.log(dts)
+    const jsPath = join(outDir, "index.js")
+    const dtsPath = join(outDir, "index.d.ts")
+
+    writeFileSync(jsPath, js)
+    writeFileSync(dtsPath, dts)
 }
 
 main()
 
+/**
+ * @param {string[]} args
+ * @returns {{outDir: string}}
+ */
+function parseArgs(args) {
+    let i = args.indexOf("-o")
+    if (i != -1) {
+        if (i == args.length - 1) {
+            throw new Error("expected argument after -o")
+        }
+
+        return { outDir: resolve(args[i + 1]) }
+    } else {
+        return { outDir: process.cwd() }
+    }
+}
+
 /**
  * @param {string} dir
  * @param {string} ext
@@ -109,7 +122,7 @@ function preparseFiles(files) {
         const sourceCode = translateImportPaths(files[path], (relPath) => {
             const absPath = resolve(join(dirname(path), relPath))
 
-            const d = partialSources[absPath]
+            const d = partialSources[absPath] ?? partialSources[absPath + ".hl"]
 
             if (!d) {
                 throw new Error(`'${relPath}' not found`)

package/src/lib/Libg_v0_16.js

@@ -327,8 +327,16 @@ export class Lib_v0_16 {
      * @returns {InternalTypeDetails}
      */
     getInternalTypeDetails(dt) {
-        const it = dt?.typeDetails?.internalType ?? { type: "Any" }
-
-        return this.convertInternalType(it)
+        try {
+            const it = dt?.typeDetails?.internalType ?? { type: "Any" }
+
+            return this.convertInternalType(it)
+        } catch (e) {
+            if (e.message.includes("Data")) {
+                return { primitiveType: "Data" }
+            } else {
+                throw e
+            }
+        }
     }
 }

package/src/runtime/Cast.js

@@ -91,6 +91,8 @@ function schemaToUplc(schema, x) {
             case "Credential":
             case "PaymentCredential":
                 return Credential.fromAlike(x).toUplcData()
+            case "Data":
+                return x
             case "DatumHash":
                 return DatumHash.fromAlike(x).toUplcData()
             case "DCert":
@@ -199,6 +201,8 @@ function uplcToSchema(schema, data) {
                 return ByteArrayData.expect(data).bytes
             case "Credential":
                 return Credential.fromUplcData(data)
+            case "Data":
+                return data
             case "DCert":
                 throw new Error(
                     "can't convert UplcData back into DCert (significant loss of information)"