@platforma-sdk/workflow-tengo 2.15.10 → 2.15.12

package/dist/tengo/lib/exec.lib.tengo

@@ -487,6 +487,9 @@ builder := func() {
 
 		enableMnz: func(productKey) {
 			monetization.enable(mnz, productKey)
+
+			monetization.appendRun(mnz)
+
 			return self
 		},
 
@@ -507,7 +510,7 @@ builder := func() {
 
 			fileName = path.canonize(fileName)
 			filesToAdd[fileName] = file
-			monetization.addOption(mnz, fileName, opts...)
+			monetization.addOptionalArg(mnz, fileName, opts...)
 			return self
 		},
 
@@ -540,7 +543,7 @@ builder := func() {
 			fileName = path.canonize(fileName)
 
 			filesToWrite[fileName] = data
-			monetization.addOption(mnz, fileName, opts...)
+			monetization.addOptionalArg(mnz, fileName, opts...)
 
 			return self
 		},

package/dist/tengo/lib/exec.monetization.lib.tengo

@@ -4,7 +4,6 @@ ll := import("@platforma-sdk/workflow-tengo:ll")
 monetization := import("@platforma-sdk/workflow-tengo:exec.monetization_internal")
 assets := import("@platforma-sdk/workflow-tengo:assets")
 render := import("@platforma-sdk/workflow-tengo:render")
-path := import("@platforma-sdk/workflow-tengo:path")
 smart := import("@platforma-sdk/workflow-tengo:smart")
 validation := import("@platforma-sdk/workflow-tengo:validation")
 
@@ -31,30 +30,80 @@ builder := func(productKey) {
 			return self
 		},
 
-		addFile: func(fileName, file, params) {
-			ll.assert(is_string(fileName), "monetization.builder().addFile: fileName must be a string")
+
+
+
+
+
+
+
+
+
+
+
+
+
+		addRun: func(...args) {
+			validation.assertType(args, [{
+				file: ["or", validation.reference, "string", "bytes"],
+				params: monetization.argSchema
+			}])
+
+			monetization.appendRun(mnz)
+
+			for _, arg in args {
+				if smart.isReference(arg.file) {
+					self.addFile(arg.file, arg.params)
+				} else {
+					self.writeFile(arg.file, arg.params)
+				}
+			}
+
+			return self
+		},
+
+
+
+
+
+
+
+
+
+
+		addFile: func(file, params) {
 			ll.assert(smart.isReference(file), "monetization.builder().addFile: file must be a reference")
 
-			fileName = path.canonize(fileName)
-			filesToAdd[fileName] = file
-			monetization.addFileParams(mnz, fileName, params)
+			filesToAdd[params.arg] = file
+			monetization.addArgToLastRun(mnz, params.arg, params)
+
 			return self
 		},
 
-		writeFile: func(fileName, data, params) {
+
+
+
+
+
+
+
+
+
+		writeFile: func(data, params) {
 			validation.assertType(data, ["or",
 				"string",
 				"bytes",
 				validation.reference])
 
-			fileName = path.canonize(fileName)
-
-			filesToWrite[fileName] = data
-			monetization.addFileParams(mnz, fileName, params)
+			filesToWrite[params.arg] = data
+			monetization.addArgToLastRun(mnz, params.arg, params)
 
 			return self
 		},
 
+
+
+
 		setUrl: func(url) {
 			monetization.setUrl(mnz, url)
 			return self

package/dist/tengo/lib/exec.monetization_internal.lib.tengo

@@ -54,44 +54,31 @@ init := func() {
 		isDryRun: false,
 
 
-		fileParams: {},
+
+		runs: [],
 
 
 		url: undefined
 	})
 }
 
-fileParamsSchema := {
-	"arg": "string",
-	"collect": [`string,regex=size|lines|sha256`]
+argSchema := {
+	arg: "string",
+	metrics: [`string,regex=size|lines|sha256`]
+}
+
+runSchema := {
+	"any": argSchema
 }
 
 schema := {
 	"enabled": "bool",
 	"productKey": "string",
 	"isDryRun": "bool",
-	"fileParams": {"any": fileParamsSchema},
+	"runs": [runSchema],
 	"url,?": "string"
 }
 
-
-
-_validateParams := func(params) {
-	ll.assert(ll.isMap(params), "monetization.validateParams(): mnz params must be a map")
-
-	ll.assert(is_string(params.arg), "monetization.validateParams(): 'arg' in addFileParams must be string")
-
-	ll.assert(is_array(params.collect) && len(params.collect) > 0, "monetization.validateParams(): 'collect' in {\"mnz\": {...}} param must be non-empty an array")
-
-	ll.assert(slices.every(params.collect, func(elem) {
-		return {
-			size: true,
-			lines: true,
-			sha256: true
-		}[elem]
-	}), "monetization.validateParams(): params in 'collect' must be either 'size', 'lines' or 'sha256'")
-}
-
 _validateIsReady := func(mnz) {
 	validation.assertType(mnz, schema,
 		"monetization.assertIsReady(): monetization does not fit schema")
@@ -132,23 +119,54 @@ toJson := func(mnz) {
 	return ll.fromStrict(mnz)
 }
 
+appendRun := func(mnz) {
+	validation.assertType(mnz, schema,
+		"monetization.appendRun(): monetization object does not fit json schema")
+
+	ll.assert(mnz.enabled,
+		"monetization.appendRun(): monetization must be explicitly enabled by enableMnz(productKey) function")
 
-addFileParams := func(mnz, fileName, params) {
+	mnz.runs = append(mnz.runs, {})
+}
+
+
+
+_validateArgToLastRun := func(arg) {
+	ll.assert(ll.isMap(arg), "monetization.validateArgToLastRun(): mnz arg must be a map")
+
+	ll.assert(is_string(arg.arg), "monetization.validateArgToLastRun(): 'arg' in addArgToLastRun must be string")
+
+	ll.assert(is_array(arg.metrics) && len(arg.metrics) > 0, "monetization.validateArgToLastRun(): 'metrics' in {\"mnz\": {...}} param must be a non-empty array")
+
+	ll.assert(slices.every(arg.metrics, func(elem) {
+		return {
+			size: true,
+			lines: true,
+			sha256: true
+		}[elem]
+	}), "monetization.validateArgToLastRun(): params in 'metrics' must be either 'size', 'lines' or 'sha256'")
+}
+
+
+addArgToLastRun := func(mnz, fileName, arg) {
 	validation.assertType(mnz, schema,
-		"monetization.addFileParams(): monetization object does not fit json schema")
+		"monetization.addArgToLastRun(): monetization object does not fit json schema")
 
-	_validateParams(params)
+	_validateArgToLastRun(arg)
 
-	validation.assertType(params, fileParamsSchema,
-		"monetization.addFileParams(): file params does not fit json schema")
+	validation.assertType(arg, argSchema,
+		"monetization.addArgToLastRun(): arg does not fit json schema")
 
 	ll.assert(mnz.enabled,
-		"monetization.addFileParams(): monetization must be explicitly enabled by enableMnz(productKey) function")
+		"monetization.addArgToLastRun(): monetization must be explicitly enabled by enableMnz(productKey) function")
 
 	ll.assert(is_string(fileName),
-		"monetization.addFileParams(): file name must be a string.")
+		"monetization.addArgToLastRun(): file name must be a string.")
 
-	mnz.fileParams[fileName] = params
+	ll.assert(len(mnz.runs) > 0,
+		"monetization.addArgToLastRun(): appendRun must be added first")
+
+	mnz.runs[len(mnz.runs) - 1][fileName] = arg
 }
 
 setDryRun := func(mnz, isDryRun) {
@@ -215,11 +233,13 @@ run := func(mnz, wd, queue) {
 	builder.arg("-productKey").arg(mnz.productKey)
 
 
-	for fileName, param in mnz.fileParams {
+	for i, run in mnz.runs {
+		for fileName, arg in run {
 
-		toCollect := text.join(param.collect, ",")
-		arg := fmt.sprintf("%s:file:%s:%s", param.arg, fileName, toCollect)
-		builder.arg(arg)
+			toCollect := text.join(arg.metrics, ",")
+			runSpecPart := fmt.sprintf("%d:%s:file:%s:%s", i, arg.arg, fileName, toCollect)
+			builder.arg(runSpecPart)
+		}
 	}
 
 	builder.inQueue(queue)
@@ -266,23 +286,25 @@ _extractOption := func(...opts) {
 }
 
 
-addOption := func(mnz, fileName, ...opts) {
+addOptionalArg := func(mnz, fileName, ...opts) {
 	opt := _extractOption(opts...)
 	if !is_undefined(opt) {
-		addFileParams(mnz, fileName, opt)
+		addArgToLastRun(mnz, fileName, opt)
 	}
 }
 
 export ll.toStrict({
 	init: init,
 	schema: schema,
+	argSchema: argSchema,
 	enable: enable,
 	setDryRun: setDryRun,
 	setUrl: setUrl,
 	shouldRun: shouldRun,
 	toJson: toJson,
-	addFileParams: addFileParams,
-	addOption: addOption,
+	appendRun: appendRun,
+	addArgToLastRun: addArgToLastRun,
+	addOptionalArg: addOptionalArg,
 	run: run,
 	mnzClientStdoutSchema: mnzClientStdoutSchema
 })

package/dist/tengo/lib/pframes.lib.tengo

@@ -204,8 +204,8 @@ processColumn := func(input, bodyTpl, outputs, ...opts) {
 
 
 	trace := undefined
-	if !is_undefined(opts.traceSteps) {
-		trace = pSpec.makeTrace(input.spec, opts.traceSteps...)
+	if !is_undefined(opts.traceSteps) || !is_undefined(input.spec.annotations[pSpec.A_TRACE]) {
+		trace = pSpec.makeTrace(input.spec, (opts.traceSteps ? opts.traceSteps : [])...)
 	}
 
 

package/dist/tengo/lib/pframes.spec.lib.tengo

@@ -235,7 +235,9 @@ makeTrace := func(input, ...steps) {
 		validation.assertType(currentTrace, _TRACE_SCHEMA)
 	}
 
-	currentTrace = append(currentTrace, steps...)
+	if len(steps) > 0 {
+		currentTrace = append(currentTrace, steps...)
+	}
 	currentTraceStr := string(json.encode(currentTrace))
 
 	return ll.toStrict({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platforma-sdk/workflow-tengo",
-  "version": "2.15.10",
+  "version": "2.15.12",
   "description": "Tengo SDK library",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",
@@ -17,7 +17,7 @@
   ],
   "dependencies": {
     "@milaboratories/software-pframes-conv": "2.1.16",
-    "@platforma-open/milaboratories.software-small-binaries": "^1.15.15"
+    "@platforma-open/milaboratories.software-small-binaries": "^1.15.16"
   },
   "devDependencies": {
     "@platforma-sdk/tengo-builder": "^1.19.2"