- compiler-utils lib upgrade

- Cip68 tag parsing in parseDataFields  bug fix

package.json

@@ -1,6 +1,6 @@
 {
     "name": "@helios-lang/compiler",
-    "version": "0.17.0-44",
+    "version": "0.17.0-45",
     "description": "Helios is a Domain Specific Language that compiles to Plutus-Core (i.e. Cardano on-chain validator scripts). Helios is a non-Haskell alternative to Plutus. With this library you can compile Helios scripts and build Cardano transactions, all you need to build 100% client-side dApps for Cardano.",
     "main": "src/index.js",
     "types": "types/index.d.ts",
@@ -52,7 +52,7 @@
     },
     "dependencies": {
         "@helios-lang/codec-utils": "^0.1.32",
-        "@helios-lang/compiler-utils": "^0.1.53",
+        "@helios-lang/compiler-utils": "^0.1.54",
         "@helios-lang/ir": "^0.1.26",
         "@helios-lang/type-utils": "^0.1.21",
         "@helios-lang/uplc": "^0.1.35"

src/parse/parseDataFields.js

@@ -1,5 +1,6 @@
 import {
     StringLiteral,
+    TokenReader,
     Word,
     strlit,
     symbol
@@ -89,6 +90,9 @@ export function parseDataFields(ctx, allowTags = false) {
             let typeReader = r.readUntil(anyName, symbol(":"))
 
             if ((m = typeReader.findLastMatch(strlit()))) {
+                /**
+                 * @satisfies {[TokenReader, StringLiteral]}
+                 */
                 const [before, tag] = m
                 typeReader.end()
                 typeReader = before
@@ -99,7 +103,7 @@ export function parseDataFields(ctx, allowTags = false) {
                     assertUniqueTag(tag.site, tag.value)
                 }
 
-                tags.set(name.value, tag.value)
+                tags.set(name.value, tag)
             } else {
                 r.endMatch(false)
 

src/program/multi.test.js

@@ -111,4 +111,27 @@ describe(analyzeMulti.name, () => {
             true
         )
     })
+
+    it("detects module function", () => {
+        const src1 = `spending s
+        import { ok } from utils
+        func main(_, _) -> Bool {
+            ok()
+        }`
+
+        const src2 = `minting m 
+        func main(_) -> Bool {
+            true
+        }`
+
+        const mod = `module utils
+
+        func ok() -> Bool {
+            true
+        }`
+
+        const analysis = analyzeMulti([src1, src2], [mod])
+
+        console.log(analysis.modules)
+    })
 })

src/program/version.js

@@ -1 +1 @@
-export const VERSION = "0.17.0-44"
+export const VERSION = "0.17.0-45"

src/statements/DataDefinition.js

@@ -232,12 +232,12 @@ export class DataDefinition {
     fieldsToSchema(parents) {
         const fieldSchemas = []
 
-        this.fieldNames.forEach((fn, i) => {
-            const externalName = this.hasTags() ? this.#fields[i].tag : fn
-            const ts = expectSome(this.getFieldType(i).toSchema(parents))
+        this.#fields.forEach((f) => {
+            const externalName = this.hasTags() ? f.tag : f.name.value
+            const ts = expectSome(f.type.toSchema(parents))
             fieldSchemas.push({
-                type: ts,
-                name: externalName
+                name: externalName,
+                type: ts
             })
         })