@platforma-sdk/workflow-tengo 4.2.1 → 4.2.2

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

@@ -232,8 +232,9 @@ createBuilder := func(ctx) {
 			bundle := smart.mapBuilder(pConstants.RTYPE_P_COLUMN_BUNDLE)
 
 			for refKey, ref in refs {
-				if is_string(ref) {
+				if is_string(ref) { // ref is anchor id
 					bundle.addRef(refKey, resolveResult.getAnchor(ref))
+					bundle.addRef(ref, resolveResult.getAnchor(ref))
 				} else {
 					bundle.addRef(refKey, bquery.resolve(ref, ctx))
 				}

package/dist/tengo/lib/smart.lib.tengo

@@ -632,6 +632,21 @@ resource = func(r) {
 
 
 
+		getFieldOrResource: func(name) {
+			field := self.getField(name)
+			if field.isSet() {
+				return field.getValue()
+			} else {
+				return field
+			}
+		},
+
+
+
+
+
+
+
 
 		kvGet: func(key) {
 			return tx.resourceKeyValueGet(self.id, key)

package/dist/tengo/lib/tpl.base.lib.tengo

@@ -67,6 +67,29 @@ _unmarshal := func(resource, preprocessors) {
 	}
 }
 
+AWAIT_TEMPLATES := {
+	"BQueryResultSingle": [
+		["ref", "ResourceReady"],
+		["spec", "ResourceReady"]
+	],
+	"BQueryResultMulti": [
+		["spec", "ResourceReady"],
+		["data", "InputsLocked"]
+	],
+	"BQueryResultMultiNoData": [
+		["spec", "ResourceReady"]
+	],
+	"PColumnBundle": [
+		[{ wildcard: "*" }, "ref", "ResourceReady"],
+		[{ wildcard: "*" }, "spec", "ResourceReady"]
+	],
+	"PColumnBundleWithPartitions": [
+		[{ wildcard: "*" }, "ref", "ResourceReady"],
+		[{ wildcard: "*" }, "spec", "ResourceReady"],
+		[{ wildcard: "*" }, "data", "InputsLocked"]
+	]
+}
+
 
 
 
@@ -208,6 +231,15 @@ tpl := func(ops) {
 
 
 
+
+
+
+
+
+
+
+
+
 
 
 
@@ -248,6 +280,15 @@ tpl := func(ops) {
 
 
 
+
+
+
+
+
+
+
+
+
 
 
 
@@ -264,10 +305,22 @@ tpl := func(ops) {
 			}
 			path := pathAndState[:len(pathAndState) - 1]
 			state := pathAndState[len(pathAndState) - 1]
-			_stateRequests = append(_stateRequests, {
-				path: path,
-				state: state
-			})
+			template := AWAIT_TEMPLATES[state]
+			if is_undefined(template) {
+				_stateRequests = append(_stateRequests, {
+					path: path,
+					state: state
+				})
+			} else {
+				for tPathAndState in template {
+					tPath := tPathAndState[:len(tPathAndState) - 1]
+					tState := tPathAndState[len(tPathAndState) - 1]
+					_stateRequests = append(_stateRequests, {
+						path: append(copy(path), tPath...),
+						state: tState
+					})
+				}
+			}
 		},
 
 

package/dist/tengo/lib/workflow.bquery.lib.tengo

@@ -184,6 +184,19 @@ resultUnmarshaller := func() {
 
 			ops := resource.get("ops").getDataAsJson()
 
+
+
+
+
+			getData := func(res, fieldName) {
+				field := res.getField(fieldName)
+				if field.isSet() {
+					return parser(field.getValue())
+				} else {
+					return field
+				}
+			}
+
 			if ops.first {
 
 
@@ -201,41 +214,34 @@ resultUnmarshaller := func() {
 					spec: resource.get("spec").getDataAsJson()
 				}
 
-
 				if resource.hasInputField("data") {
-
-
-					if isNR(resource.get("data")) {
-						result.data = undefined
-					} else {
-						result.data = parser(resource.get("data"))
-					}
+					result.data = getData(resource, "data")
 				}
 
 				return ll.toStrict(result)
 			} else {
 
 
-				spec := resource.get("spec").inputs()
-				data := undefined
+				specs := resource.get("spec").inputs() // map of specs
+				datas := undefined
 				if resource.hasInputField("data") {
-					data = resource.get("data").inputs()
+					datas = resource.get("data") // map of datas
 				}
 
 				result := []
-				for ref, s in spec {
-					r  := {
+				maps.forEach(specs, func(ref, s) {
+					r := {
 						ref: json.decode(ref),
 						spec: s.getValueAsJson()
 					}
 
 
-					if !is_undefined(data) {
-						r.data = parser(data[ref].getValue())
+					if !is_undefined(datas) {
+						r.data = getData(datas, ref)
 					}
 
 					result = append(result, ll.toStrict(r))
-				}
+				})
 
 				if ops.single {
 					ll.assert(len(result) == 1, "expected single element, got ", len(result))

package/dist/tengo/lib/workflow.lib.tengo

@@ -408,6 +408,7 @@ export ll.toStrict({
 	body: body,
 	setPreRun: setPreRun,
 	blockId: blockId,
+	getBlockId: getBlockId,
 	validateArgs: validateArgs,
 	createPBundleBuilder: createPBundleBuilder
 })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platforma-sdk/workflow-tengo",
-  "version": "4.2.1",
+  "version": "4.2.2",
   "description": "Tengo SDK library",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",