@helios-lang/contract-utils 0.2.56 → 0.2.57
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/src/cast/UserFunc.js +16 -25
- package/src/codegen/LoadedScriptsWriter.js +2 -6
- package/src/codegen/TypeCheckedModule.js +0 -1
- package/types/cast/UserFunc.d.ts +0 -2
- package/types/cast/UserFunc.d.ts.map +1 -1
- package/types/codegen/TypeCheckedModule.d.ts +0 -1
- package/types/codegen/TypeCheckedModule.d.ts.map +1 -1
package/package.json
CHANGED
package/src/cast/UserFunc.js
CHANGED
|
@@ -22,7 +22,6 @@ import { Cast } from "./Cast.js"
|
|
|
22
22
|
* name: string
|
|
23
23
|
* type: TypeSchema
|
|
24
24
|
* isOptional: boolean
|
|
25
|
-
* isIgnored?: boolean
|
|
26
25
|
* }[]
|
|
27
26
|
* returns?: TypeSchema
|
|
28
27
|
* validatorIndices?: Record<string, number>
|
|
@@ -144,36 +143,28 @@ export class UserFunc {
|
|
|
144
143
|
*/
|
|
145
144
|
const args = []
|
|
146
145
|
|
|
147
|
-
this.props.arguments.forEach(
|
|
148
|
-
(
|
|
149
|
-
if (
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
args.push(namedArgs[name])
|
|
154
|
-
}
|
|
155
|
-
} else if (isIgnored) {
|
|
156
|
-
if (name in namedArgs && namedArgs[name]) {
|
|
157
|
-
args.push(namedArgs[name])
|
|
158
|
-
} else {
|
|
159
|
-
args.push(new IntData(0))
|
|
160
|
-
}
|
|
161
|
-
} else {
|
|
162
|
-
args.push(expectSome(namedArgs[name]))
|
|
146
|
+
this.props.arguments.forEach(({ name, type, isOptional }) => {
|
|
147
|
+
if (isMain) {
|
|
148
|
+
if (isOptional) {
|
|
149
|
+
// used for $datum in mixed script
|
|
150
|
+
if (name in namedArgs && namedArgs[name]) {
|
|
151
|
+
args.push(namedArgs[name])
|
|
163
152
|
}
|
|
164
153
|
} else {
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
154
|
+
args.push(expectSome(namedArgs[name]))
|
|
155
|
+
}
|
|
156
|
+
} else {
|
|
157
|
+
if (isOptional) {
|
|
158
|
+
if (name in namedArgs && namedArgs[name]) {
|
|
159
|
+
args.push(new ConstrData(0, [namedArgs[name]]))
|
|
171
160
|
} else {
|
|
172
|
-
args.push(
|
|
161
|
+
args.push(new ConstrData(1, []))
|
|
173
162
|
}
|
|
163
|
+
} else {
|
|
164
|
+
args.push(expectSome(namedArgs[name]))
|
|
174
165
|
}
|
|
175
166
|
}
|
|
176
|
-
)
|
|
167
|
+
})
|
|
177
168
|
|
|
178
169
|
if (this.props.requiresScriptContext) {
|
|
179
170
|
args.push(expectSome(namedArgs["$scriptContext"]))
|
|
@@ -406,12 +406,8 @@ function genFuncType(fn) {
|
|
|
406
406
|
fields.push("$currentScript: string")
|
|
407
407
|
}
|
|
408
408
|
|
|
409
|
-
fn.arguments.forEach(({ name, type, isOptional
|
|
410
|
-
|
|
411
|
-
fields.push(`${name}?: UplcData`)
|
|
412
|
-
} else {
|
|
413
|
-
fields.push(`${name}${isOptional ? "?" : ""}: ${genTypes(type)[1]}`)
|
|
414
|
-
}
|
|
409
|
+
fn.arguments.forEach(({ name, type, isOptional }, i) => {
|
|
410
|
+
fields.push(`${name}${isOptional ? "?" : ""}: ${genTypes(type)[1]}`)
|
|
415
411
|
})
|
|
416
412
|
|
|
417
413
|
const argsTypeStr = `{${fields.join(", ")}}`
|
package/types/cast/UserFunc.d.ts
CHANGED
|
@@ -16,7 +16,6 @@
|
|
|
16
16
|
* name: string
|
|
17
17
|
* type: TypeSchema
|
|
18
18
|
* isOptional: boolean
|
|
19
|
-
* isIgnored?: boolean
|
|
20
19
|
* }[]
|
|
21
20
|
* returns?: TypeSchema
|
|
22
21
|
* validatorIndices?: Record<string, number>
|
|
@@ -87,7 +86,6 @@ export type UserFuncProps = {
|
|
|
87
86
|
name: string;
|
|
88
87
|
type: TypeSchema;
|
|
89
88
|
isOptional: boolean;
|
|
90
|
-
isIgnored?: boolean;
|
|
91
89
|
}[];
|
|
92
90
|
returns?: TypeSchema;
|
|
93
91
|
validatorIndices?: Record<string, number>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UserFunc.d.ts","sourceRoot":"","sources":["../../src/cast/UserFunc.js"],"names":[],"mappings":"AAKA;;;;;;;GAOG;AAEH
|
|
1
|
+
{"version":3,"file":"UserFunc.d.ts","sourceRoot":"","sources":["../../src/cast/UserFunc.js"],"names":[],"mappings":"AAKA;;;;;;;GAOG;AAEH;;;;;;;;;;;;;;;GAeG;AAEH;;;GAGG;AAEH;;;GAGG;AACH,sBAHwC,KAAK,SAAhC;IAAE,CAAC,OAAO,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,EAC1B,IAAI;IAgBb;;;OAGG;IACH,kBAHW,WAAW,SACX,aAAa,EAKvB;IApBD;;;OAGG;IACH,eAFU,WAAW,CAEjB;IAEJ;;;;OAIG;IACH,uBAAK;IAWL;;OAEG;IACH,mBAEC;IAED;;;OAGG;IACH,gBAHW,KAAK,GACH,IAAI,CAyChB;IAED;;;OAGG;IACH,sBAHW,WAAW,CAAC,KAAK,CAAC,GAChB,IAAI,SAAS,IAAI,GAAG,IAAI,GAAG,QAAQ,CAc/C;IAED;;;OAGG;IACH,mBAHW,WAAW,CAAC,KAAK,CAAC,GAChB,SAAS,CAiGrB;CACJ;yBAnOY,OAAO,yBAAyB,EAAE,UAAU;wBAC5C,OAAO,mBAAmB,EAAE,SAAS;uBACrC,OAAO,mBAAmB,EAAE,QAAQ;0BACpC,OAAO,mBAAmB,EAAE,WAAW;wBACvC,OAAO,mBAAmB,EAAE,SAAS;yBACrC,OAAO,WAAW,EAAE,UAAU;;;;4BAK9B;IACZ,IAAQ,EAAE,MAAM,CAAA;IAChB,qBAAyB,EAAE,OAAO,CAAA;IAClC,qBAAyB,EAAE,OAAO,CAAA;IAClC,SAAa,EAAE;QACf,IAAU,EAAE,MAAM,CAAA;QAClB,IAAU,EAAE,UAAU,CAAA;QACtB,UAAgB,EAAE,OAAO,CAAA;KACpB,EAAE,CAAA;IACP,OAAW,CAAC,EAAE,UAAU,CAAA;IACxB,gBAAoB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC7C,UAAc,EAAE,UAAU,CAAA;CACvB;wBAIS,KAAK,IACL,GAAE,CAAgB,IAAX,MAAM,KAAK,GAAG,CAAC,SAAS,gBAAgB,GAAG,MAAM,GAAG,QAAQ,GAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TypeCheckedModule.d.ts","sourceRoot":"","sources":["../../src/codegen/TypeCheckedModule.js"],"names":[],"mappings":"yBAGa,OAAO,iBAAiB,EAAE,UAAU;;;;kCAKpC;IACZ,IAAQ,EAAE,MAAM,CAAA;IAChB,qBAAyB,EAAE,OAAO,CAAA;IAClC,qBAAyB,EAAE,OAAO,CAAA;IAClC,SAAa,EAAE;QACf,IAAU,EAAE,MAAM,CAAA;QAClB,IAAU,EAAE,UAAU,CAAA;QACtB,UAAgB,EAAE,OAAO,CAAA;
|
|
1
|
+
{"version":3,"file":"TypeCheckedModule.d.ts","sourceRoot":"","sources":["../../src/codegen/TypeCheckedModule.js"],"names":[],"mappings":"yBAGa,OAAO,iBAAiB,EAAE,UAAU;;;;kCAKpC;IACZ,IAAQ,EAAE,MAAM,CAAA;IAChB,qBAAyB,EAAE,OAAO,CAAA;IAClC,qBAAyB,EAAE,OAAO,CAAA;IAClC,SAAa,EAAE;QACf,IAAU,EAAE,MAAM,CAAA;QAClB,IAAU,EAAE,UAAU,CAAA;QACtB,UAAgB,EAAE,OAAO,CAAA;KACpB,EAAE,CAAA;IACP,OAAW,CAAC,EAAE,UAAU,CAAA;CACrB;gCAIS;IACZ,IAAQ,EAAE,MAAM,CAAA;IAChB,OAAW,EAAE,MAAM,CAAA;IACnB,UAAc,EAAE,MAAM,CAAA;IACtB,iBAAqB,EAAE,MAAM,EAAE,CAAA;IAC/B,KAAS,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAA;IACrC,SAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAA;CAChD"}
|