@platforma-sdk/workflow-tengo 5.3.8 → 5.3.10

package/dist/tengo/lib/pt.expression.lib.tengo

@@ -1122,6 +1122,41 @@ _newExpression = func(expression) {
 
 
 
+_matcherToAxisSpec := func(ctx, processedMatcher) {
+	ll.assert(!is_undefined(ctx.specDistiller), "specDistiller must be defined")
+	ll.assert(is_map(ctx.distilledAxesSpecs), "distilledAxesSpecs must be a map")
+
+	distilledMatcher := ctx.specDistiller.distill(processedMatcher)
+	discriminativeDomains := ctx.specDistiller.getDiscriminativeDomainsSet(distilledMatcher.name)
+	if ((!is_undefined(distilledMatcher.domain) && len(distilledMatcher.domain) > 0) != (!is_undefined(discriminativeDomains) && len(discriminativeDomains) > 0)) ||
+		(!is_undefined(distilledMatcher.domain) && !is_undefined(discriminativeDomains) && len(distilledMatcher.domain) != len(discriminativeDomains)) {
+		ll.panic("Axis matcher %v is not specific enough. Expected discriminative domains %v, got %v", distilledMatcher.name, discriminativeDomains, distilledMatcher.domain)
+	}
+
+	axisSpec := undefined
+	for spec in ctx.distilledAxesSpecs[distilledMatcher.name] {
+		if !is_undefined(distilledMatcher.type) {
+			if distilledMatcher.type != spec.type {
+				continue
+			}
+		}
+		if !is_undefined(distilledMatcher.domain) {
+			if is_undefined(spec.domain) || len(spec.domain) < len(distilledMatcher.domain) {
+				continue
+			}
+			for domainKey, domainValue in distilledMatcher.domain {
+				if spec.domain[domainKey] != domainValue {
+					continue
+				}
+			}
+		}
+		axisSpec = spec
+		break
+	}
+	ll.assert(!is_undefined(axisSpec), "axis spec not found for matcher %v", processedMatcher)
+	return axisSpec
+}
+
 
 
 
@@ -1142,36 +1177,7 @@ axis = func(matcher) {
 		ll.panic("Matcher for axis must be a string (axis name) or an AxisSpec-like map (with at least 'name' and 'type' fields).")
 	}
 	return _newExpression(func(ctx) {
-		ll.assert(!is_undefined(ctx.specDistiller), "specDistiller must be defined")
-		ll.assert(is_map(ctx.distilledAxesSpecs), "distilledAxesSpecs must be a map")
-
-		distilledMatcher := ctx.specDistiller.distill(processedMatcher)
-		discriminativeDomains := ctx.specDistiller.getDiscriminativeDomainsSet(distilledMatcher.name)
-        if ((!is_undefined(distilledMatcher.domain) && len(distilledMatcher.domain) > 0) != (!is_undefined(discriminativeDomains) && len(discriminativeDomains) > 0)) ||
-			(!is_undefined(distilledMatcher.domain) && !is_undefined(discriminativeDomains) && len(distilledMatcher.domain) != len(discriminativeDomains)) {
-            ll.panic("Axis matcher %v is not specific enough. Expected discriminative domains %v, got %v", distilledMatcher.name, discriminativeDomains, distilledMatcher.domain)
-        }
-		
-		axisSpec := undefined
-		for spec in ctx.distilledAxesSpecs[distilledMatcher.name] {
-			if !is_undefined(distilledMatcher.type) {
-				if distilledMatcher.type != spec.type {
-					continue
-				}
-			}
-			if !is_undefined(distilledMatcher.domain) {
-				if is_undefined(spec.domain) || len(spec.domain) < len(distilledMatcher.domain) {
-					continue
-				}
-				for domainKey, domainValue in distilledMatcher.domain {
-					if spec.domain[domainKey] != domainValue {
-						continue
-					}
-				}
-			}
-			axisSpec = spec
-			break
-		}
+		axisSpec := _matcherToAxisSpec(ctx, processedMatcher)
 		return {
 			type: "axis",
 			spec: axisSpec
@@ -1784,10 +1790,24 @@ sc := ll.toStrict({
 
 
 
-	axis: func(spec) {
-		validation.assertType(spec, pframesSpec.P_AXIS_SPEC_SCHEMA)
+
+
+
+	axis: func(matcher) {
+		processedMatcher := undefined
+		if is_string(matcher) {
+			processedMatcher = { name: matcher, domain: {} }
+		} else if is_map(matcher) {
+			processedMatcher = pframesSpec.axisSpecToMatcher(matcher)
+		} else {
+			ll.panic("Matcher for axis must be a string (axis name) or an AxisSpec-like map (with at least 'name' and 'type' fields).")
+		}
 		return _newSelectorExpression(func(ctx) {
-			return {type: "selector_axis", spec: spec}
+			axisSpec := _matcherToAxisSpec(ctx, processedMatcher)
+			return {
+				type: "selector_axis",
+				spec: axisSpec
+			}
 		})
 	},
 	

package/dist/tengo/lib/pt.lib.tengo

@@ -653,7 +653,7 @@ workflow := func() {
 			entries := []
 			aliases := []
 			for axis in options.axes {
-				aliases = append(aliases, exp.axis(axis.spec).alias(axis.column))
+				aliases = append(aliases, exp.sc.axis(axis.spec).alias(axis.column))
 			}
 			for column in options.columns {
 				decoded := json.decode(column)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platforma-sdk/workflow-tengo",
-  "version": "5.3.8",
+  "version": "5.3.10",
   "description": "Tengo SDK library",
   "type": "module",
   "types": "./dist/index.d.ts",
@@ -18,8 +18,8 @@
   "dependencies": {
     "@milaboratories/software-pframes-conv": "2.2.9",
     "@platforma-open/milaboratories.software-small-binaries": "^1.15.23",
-    "@platforma-open/milaboratories.software-ptabler": "1.12.8",
-    "@platforma-open/milaboratories.software-ptexter": "1.1.1"
+    "@platforma-open/milaboratories.software-ptexter": "1.1.1",
+    "@platforma-open/milaboratories.software-ptabler": "1.12.10"
   },
   "devDependencies": {
     "@platforma-sdk/tengo-builder": "2.3.2"