@platforma-sdk/workflow-tengo 2.15.1 → 2.15.3

package/dist/index.d.ts

@@ -1,4 +1,4 @@
 declare type TemplateFromFile = { readonly type: "from-file"; readonly path: string; };
-declare type TplName = "ll.get-field" | "pframes.export-single-pcolumn" | "pframes.import-dir" | "pframes.remove-nulls" | "waiter.waiter" | "workdir.save" | "workflow.build-ctx" | "exec.R.create-renv" | "exec.python.install-deps" | "pframes.export-multiple-pcolumns" | "exec.python.create-venv" | "exec.monetization_to_json" | "exec.exec" | "pframes.xsv-export-pframe" | "pframes.xsv-import-if-not-null" | "pframes.xsv-import-map" | "pframes.process-pcolumn-data" | "pframes.export-pframe";
+declare type TplName = "ll.get-field" | "pframes.export-single-pcolumn" | "pframes.import-dir" | "pframes.remove-nulls" | "waiter.waiter" | "workdir.save" | "workflow.build-ctx" | "exec.R.create-renv" | "exec.python.install-deps" | "pframes.export-multiple-pcolumns" | "exec.python.create-venv" | "exec.monetization_to_json" | "exec.exec" | "exec.monetization_info" | "pframes.xsv-export-pframe" | "pframes.xsv-import-if-not-null" | "pframes.xsv-import-map" | "pframes.process-pcolumn-data" | "pframes.export-pframe";
 declare const Templates: Record<TplName, TemplateFromFile>;
 export { Templates };

package/dist/index.js

@@ -12,6 +12,7 @@ module.exports = { Templates: {
   'exec.python.create-venv': { type: 'from-file', path: require.resolve('./tengo/tpl/exec.python.create-venv.plj.gz') },
   'exec.monetization_to_json': { type: 'from-file', path: require.resolve('./tengo/tpl/exec.monetization_to_json.plj.gz') },
   'exec.exec': { type: 'from-file', path: require.resolve('./tengo/tpl/exec.exec.plj.gz') },
+  'exec.monetization_info': { type: 'from-file', path: require.resolve('./tengo/tpl/exec.monetization_info.plj.gz') },
   'pframes.xsv-export-pframe': { type: 'from-file', path: require.resolve('./tengo/tpl/pframes.xsv-export-pframe.plj.gz') },
   'pframes.xsv-import-if-not-null': { type: 'from-file', path: require.resolve('./tengo/tpl/pframes.xsv-import-if-not-null.plj.gz') },
   'pframes.xsv-import-map': { type: 'from-file', path: require.resolve('./tengo/tpl/pframes.xsv-import-map.plj.gz') },

package/dist/index.mjs

@@ -13,6 +13,7 @@ export const Templates = {
   'exec.python.create-venv': { type: 'from-file', path: resolve(import.meta.dirname, './tengo/tpl/exec.python.create-venv.plj.gz') },
   'exec.monetization_to_json': { type: 'from-file', path: resolve(import.meta.dirname, './tengo/tpl/exec.monetization_to_json.plj.gz') },
   'exec.exec': { type: 'from-file', path: resolve(import.meta.dirname, './tengo/tpl/exec.exec.plj.gz') },
+  'exec.monetization_info': { type: 'from-file', path: resolve(import.meta.dirname, './tengo/tpl/exec.monetization_info.plj.gz') },
   'pframes.xsv-export-pframe': { type: 'from-file', path: resolve(import.meta.dirname, './tengo/tpl/pframes.xsv-export-pframe.plj.gz') },
   'pframes.xsv-import-if-not-null': { type: 'from-file', path: resolve(import.meta.dirname, './tengo/tpl/pframes.xsv-import-if-not-null.plj.gz') },
   'pframes.xsv-import-map': { type: 'from-file', path: resolve(import.meta.dirname, './tengo/tpl/pframes.xsv-import-map.plj.gz') },

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

@@ -174,7 +174,7 @@ _loadRRunEnvironment := func(operationMode, descriptor, softName, softPkg) {
 		"RENV_PATHS_SOURCE": _newArg(false, path.join(renvRootArg, "sources")),
 		"RENV_PATHS_CACHE": _newArg(false, path.join(renvRootArg, "cache")),
 		"RENV_PATHS_RENV": _newArg(false, path.join(_expr(_ARG_VAR_R_VENV), "renv")),
-		"RENV_PATHS_LOCKFILE": _newArg(false, path.join(_expr(_ARG_VAR_PKG), descriptor.dependencies.lockFile))
+		"RENV_PATHS_LOCKFILE": _newArg(false, path.join(renvRootArg, "renv.lock"))
 	}
 
 	if (operationMode != "dev-local") {

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

@@ -490,8 +490,8 @@ builder := func() {
 			return self
 		},
 
-		setMnzDryRun: func() {
-			monetization.setDryRun(mnz, true)
+		setMnzUrl: func(url) {
+			monetization.setUrl(mnz, url)
 			return self
 		},
 

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

@@ -2,22 +2,35 @@
 
 ll := import("@platforma-sdk/workflow-tengo:ll")
 monetization := import("@platforma-sdk/workflow-tengo:exec.monetization_internal")
-workdir := import("@platforma-sdk/workflow-tengo:workdir")
+assets := import("@platforma-sdk/workflow-tengo:assets")
+render := import("@platforma-sdk/workflow-tengo:render")
 path := import("@platforma-sdk/workflow-tengo:path")
-constants := import("@platforma-sdk/workflow-tengo:exec.constants")
 smart := import("@platforma-sdk/workflow-tengo:smart")
 validation := import("@platforma-sdk/workflow-tengo:validation")
 
+
+
+
+
+
+
+
 builder := func(productKey) {
 	mnz := monetization.init()
 	monetization.enable(mnz, productKey)
 	monetization.setDryRun(mnz, true)
 
+	date := undefined
 	filesToAdd := {}
 	filesToWrite := {}
 
 	self := undefined
 	self = ll.toStrict({
+		setDate: func(newDate) {
+			date = newDate
+			return self
+		},
+
 		addFile: func(fileName, file, params) {
 			ll.assert(is_string(fileName), "monetization.builder().addFile: fileName must be a string")
 			ll.assert(smart.isReference(file), "monetization.builder().addFile: file must be a reference")
@@ -42,15 +55,29 @@ builder := func(productKey) {
 			return self
 		},
 
+		setUrl: func(url) {
+			monetization.setUrl(mnz, url)
+			return self
+		},
+
 		build: func() {
-			wd := workdir.builder().
-				addFiles(filesToAdd).
-				writeFiles(filesToWrite).
-				build()
+			ll.assert(!is_undefined(date), "monetization.builder().build: date must be set")
+
+
+
+
 
-			result := monetization.run(mnz, wd, constants.UI_TASKS_QUEUE)
+			result := render.create(
+				assets.importTemplate("@platforma-sdk/workflow-tengo:exec.monetization_info"),
+				{
+					date: date, // solely for deduplication
+					monetization: monetization.toJson(mnz),
+					filesToAdd: filesToAdd,
+					filesToWrite: filesToWrite
+				}
+			)
 
-			return result
+			return result.output("info")
 		}
 	})
 

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

@@ -31,7 +31,7 @@ mnzClientStdoutSchema := ["or",
 			spentRuns: "number",
 			runsToSpend: "number",
 			willRemainAfterRun: "number",
-			subscription: {
+			"subscription,?": {
 				availableRuns: "number",
 				startsAt: "string",
 				expiresAt: "string"
@@ -53,7 +53,10 @@ init := func() {
 		isDryRun: false,
 
 
-		fileParams: {}
+		fileParams: {},
+
+
+		url: undefined
 	})
 }
 
@@ -66,7 +69,8 @@ schema := {
 	"enabled": "bool",
 	"productKey": "string",
 	"isDryRun": "bool",
-	"fileParams": {"any": fileParamsSchema}
+	"fileParams": {"any": fileParamsSchema},
+	"url,?": "string"
 }
 
 
@@ -110,19 +114,6 @@ enable := func(mnz, productKey) {
 	mnz.productKey = productKey
 }
 
-setDryRun := func(mnz, isDryRun) {
-	ll.assert(mnz.enabled,
-		"monetization.setDryRun(): monetization must be explicitly enabled by enableMnz(productKey) function")
-
-	ll.assert(is_bool(isDryRun),
-		"monetization.setDryRun(): isDryRun must be boolean, got %v", isDryRun)
-
-	validation.assertType(mnz, schema,
-		"monetization.setDryRun(): mnz object does not fit schema")
-
-	mnz.isDryRun = isDryRun
-}
-
 
 shouldRun := func(mnz) {
 	if mnz.enabled {
@@ -159,6 +150,32 @@ addFileParams := func(mnz, fileName, params) {
 	mnz.fileParams[fileName] = params
 }
 
+setDryRun := func(mnz, isDryRun) {
+	ll.assert(mnz.enabled,
+		"monetization.setDryRun(): monetization must be explicitly enabled by enableMnz(productKey) function")
+
+	ll.assert(is_bool(isDryRun),
+		"monetization.setDryRun(): isDryRun must be boolean, got %v", isDryRun)
+
+	validation.assertType(mnz, schema,
+		"monetization.setDryRun(): mnz object does not fit schema")
+
+	mnz.isDryRun = isDryRun
+}
+
+setUrl := func(mnz, url) {
+	ll.assert(mnz.enabled,
+		"monetization.setUrl(): monetization must be explicitly enabled by enableMnz(productKey) function")
+
+	ll.assert(is_string(url),
+		"monetization.setUrl(): url must be string, got %v", url)
+
+	validation.assertType(mnz, schema,
+		"monetization.setUrl(): mnz object does not fit schema")
+
+	mnz.url = url
+}
+
 
 
 
@@ -191,6 +208,9 @@ run := func(mnz, wd, queue) {
 	if mnz.isDryRun {
 		builder.arg("-dry-run")
 	}
+	if mnz.url {
+		builder.arg(mnz.isDryRun ? "-dry-run-url" : "-url").arg(mnz.url)
+	}
 	builder.arg("-productKey").arg(mnz.productKey)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platforma-sdk/workflow-tengo",
-  "version": "2.15.1",
+  "version": "2.15.3",
   "description": "Tengo SDK library",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",
@@ -20,7 +20,7 @@
     "@platforma-open/milaboratories.software-small-binaries": "^1.15.13"
   },
   "devDependencies": {
-    "@platforma-sdk/tengo-builder": "^1.19.1"
+    "@platforma-sdk/tengo-builder": "^1.19.2"
   },
   "scripts": {
     "type-check": "pl-tengo check",