@platforma-sdk/workflow-tengo 4.0.1 → 4.0.2

package/dist/tengo/lib/maps.lib.tengo

@@ -20,6 +20,21 @@ getKeys := func(map) {
 
 
 
+
+
+getValues := func(map) {
+	keys := getKeys(map)
+	res := []
+	for _, k in keys {
+		res = append(res, map[k])
+	}
+	return res
+}
+
+
+
+
+
 containsKey := func(map, key) {
 	for k, _ in map {
 		if key == k {
@@ -221,5 +236,6 @@ export ll.toStrict({
 	filterKeys : filterKeys,
 	filterKeysValues : filterKeysValues,
 	getKeys: getKeys,
+	getValues: getValues,
 	containsKey: containsKey
 })

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

@@ -11,6 +11,7 @@ ll := import("@platforma-sdk/workflow-tengo:ll")
 xsv := import("@platforma-sdk/workflow-tengo:pframes.xsv")
 assets := import("@platforma-sdk/workflow-tengo:assets")
 render := import("@platforma-sdk/workflow-tengo:render")
+strings := import("@platforma-sdk/workflow-tengo:strings")
 
 
 
@@ -167,11 +168,7 @@ createBuilder := func(ctx) {
 	return self
 }
 
-nameCleanPattern := text.re_compile("[-_,.:; \\[\\]}{\"\\\\/:]+")
 
-cleanColumnName := func(name) {
-	return nameCleanPattern.replace(name, "_")
-}
 
 
 
@@ -179,9 +176,43 @@ cleanColumnName := func(name) {
 
 
 
+pColumnBundleUnmarshaller := func() {
 
+	processColumnId := func(id) {
+		columnKey := undefined
+		columnAxisFilters := undefined
+		serializedId := undefined
+
+		if is_string(id) {
+			serializedId = id
+			decodedId := json.decode(id)
+
+			if is_map(decodedId) && !is_undefined(decodedId.source) && !is_undefined(decodedId.axisFilters) {
+				columnKey = canonical.encode(decodedId.source)
+				columnAxisFilters = decodedId.axisFilters
+			} else {
+				columnKey = id
+			}
+		} else if is_map(id) {
+			if !is_undefined(id.source) && !is_undefined(id.axisFilters) {
+				columnKey = canonical.encode(id.source)
+				columnAxisFilters = id.axisFilters
+				serializedId = canonical.encode(id)
+			} else {
+				columnKey = canonical.encode(id)
+				serializedId = columnKey
+			}
+		} else {
+			ll.panic("Invalid column ID type. Expected string or object.")
+		}
+
+		return {
+			columnKey: columnKey,
+			axisFilters: columnAxisFilters,
+			canonicalId: serializedId
+		}
+	}
 
-pColumnBundleUnmarshaller := func() {
 	return {
 		canParse: func(resource) {
 			return smart.isResource(resource) &&
@@ -235,6 +266,33 @@ pColumnBundleUnmarshaller := func() {
 
 
 
+				getSpec: func(id) {
+					processedId := processColumnId(id)
+					columnKey := processedId.columnKey
+					columnAxisFilters := processedId.axisFilters // Filters from FilteredPColumnId
+
+					if is_undefined(pool[columnKey]) {
+						ll.panic("Column not found in bundle: " + columnKey)
+					}
+
+					baseSpec := pool[columnKey].spec
+
+
+					if !is_undefined(columnAxisFilters) && len(columnAxisFilters) > 0 {
+						prepared := pSpec.prepareAxisFilters(columnAxisFilters, baseSpec)
+						return prepared.columnSpec
+					} else {
+
+						return baseSpec
+					}
+				},
+
+
+
+
+
+
+
 				setAxisHeader: func(matcher, header) {
 					if is_string(matcher) {
 						matcher = { name: matcher, domain: {} }
@@ -253,14 +311,35 @@ pColumnBundleUnmarshaller := func() {
 					requests := []
 					addedColumns := {}
 
+					distiller := undefined
+
+					getSpecDistiller := func() {
+						if is_undefined(distiller) {
+							columnsToDistill := []
+							for request in requests {
+								col := pool[request.key]
+								columnsToDistill = append(columnsToDistill, col.spec)
+							}
+							distiller = pSpec.createSpecDistiller(columnsToDistill)
+						}
+						return distiller
+					}
+
 					findAxisHeaderOverride := func(spec) {
 						for _, override in localAxisHeaderOverrides {
 							matcher := override[0]
 
 							if matcher.name == spec.name {
+								specDistiller := getSpecDistiller()
+								discriminativeDomains := specDistiller.getDiscriminativeDomainsSet(spec.name)
+
 								domainsMatch := true
 
 								for domainKey, domainValue in matcher.domain {
+									if is_undefined(discriminativeDomains[domainKey]) {
+										continue
+									}
+
 									if is_undefined(spec.domain) ||
 									   is_undefined(spec.domain[domainKey]) ||
 									   spec.domain[domainKey] != domainValue {
@@ -277,20 +356,6 @@ pColumnBundleUnmarshaller := func() {
 						return undefined
 					}
 
-					distiller := undefined
-
-					getSpecDistiller := func() {
-						if is_undefined(distiller) {
-							columnsToDistill := []
-							for request in requests {
-								col := pool[request.key]
-								columnsToDistill = append(columnsToDistill, col.spec)
-							}
-							distiller = pSpec.createSpecDistiller(columnsToDistill)
-						}
-						return distiller
-					}
-
 					generateLabelForAxis := func(spec) {
 						name := spec.name
 						label := undefined
@@ -302,7 +367,7 @@ pColumnBundleUnmarshaller := func() {
 							discriminativeDomains := specDistiller.getDiscriminativeDomains(name)
 
 							if len(discriminativeDomains) == 0 {
-								label = cleanColumnName(name)
+								label = strings.substituteSpecialCharacters(name)
 							} else {
 								ll.panic("Cannot deduce header for %s in axis. Discriminative domains: %s. Please provide a header override.",
 									name, discriminativeDomains)
@@ -318,39 +383,16 @@ pColumnBundleUnmarshaller := func() {
 					}
 
 
-					processColumnId := func(id) {
-						columnKey := undefined
-						columnAxisFilters := undefined
-						serializedId := undefined
-
-						if is_string(id) {
-							serializedId = id
-							decodedId := json.decode(id)
-
-							if is_map(decodedId) && !is_undefined(decodedId.source) && !is_undefined(decodedId.axisFilters) {
-								columnKey = canonical.encode(decodedId.source)
-								columnAxisFilters = decodedId.axisFilters
-							} else {
-								columnKey = id
+					findRequestByItem := func(item) {
+						serializedId := processColumnId(item).canonicalId
+						for _, request in requests {
+							if request.canonicalId == serializedId {
+								return request
 							}
-						} else if is_map(id) {
-							if !is_undefined(id.source) && !is_undefined(id.axisFilters) {
-								columnKey = canonical.encode(id.source)
-								columnAxisFilters = id.axisFilters
-								serializedId = canonical.encode(id)
-							} else {
-								columnKey = canonical.encode(id)
-								serializedId = columnKey
-							}
-						} else {
-							ll.panic("Invalid column ID type. Expected string or object.")
 						}
 
-						return {
-							columnKey: columnKey,
-							axisFilters: columnAxisFilters,
-							canonicalId: serializedId
-						}
+						ll.panic("Column not found in the table: %s. Make sure to call add() first.",
+							serializedId)
 					}
 
 					tableBuilder := undefined
@@ -420,7 +462,7 @@ pColumnBundleUnmarshaller := func() {
 
 							addedColumns[request.canonicalId] = true
 
-							request.safeId = cleanColumnName(request.canonicalId)
+							request.safeId = strings.substituteSpecialCharacters(request.canonicalId)
 
 							if !is_undefined(request.headerOverride) {
 								request.header = request.headerOverride
@@ -519,16 +561,22 @@ pColumnBundleUnmarshaller := func() {
 								return generateLabelForAxis(item)
 							}
 
-							serializedId := processColumnId(item).canonicalId
 
-							for _, request in requests {
-								if request.canonicalId == serializedId {
-									return request.header
-								}
-							}
+							request := findRequestByItem(item)
+							return request.header
+						},
+
+
+
+
+
+
+
+
+						getSpec: func(item) {
 
-							ll.panic("Column not found in the table: %s. Make sure to call add() before getHeader().",
-								serializedId)
+							request := findRequestByItem(item)
+							return request.columnSpec
 						}
 					}
 

package/dist/tengo/lib/pframes.xsv-import-file.lib.tengo

@@ -57,6 +57,14 @@ importFile := func(xsvFile, xsvType, spec, ...ops) {
 
 	validation.assertType(spec, util.PFCONV_IMPORT_CFG_SCHEMA)
 
+
+	ll.assert(
+		spec.partitionKeyLength == undefined || spec.partitionKeyLength < len(spec.axes),
+		"partitionKeyLength (%d) must be strictly less than the number of axes (%d)",
+		spec.partitionKeyLength,
+		len(spec.axes)
+	)
+
 	xsvFileName := "file." + xsvType
 
 	ops := renderOps({ dataOnly: false, splitDataAndSpec: false }, ops...)

package/dist/tengo/lib/strings.lib.tengo

@@ -0,0 +1,26 @@
+ll := import("@platforma-sdk/workflow-tengo:ll")
+text := import("text")
+
+specialCharactersPattern := text.re_compile("[-_,.:; +()!<>\\[\\]}{\"\\\\/:$%^#@*&]+")
+
+
+
+
+
+
+
+
+
+
+substituteSpecialCharacters := func(name, ...replacementVarargs) {
+	ll.assert(len(replacementVarargs) <= 1, "substituteSpecialCharacters: expects at most one optional replacement argument")
+	replacement := "_"
+	if len(replacementVarargs) == 1 {
+		replacement = replacementVarargs[0]
+	}
+	return specialCharactersPattern.replace(name, replacement)
+}
+
+export ll.toStrict({
+	substituteSpecialCharacters: substituteSpecialCharacters
+})

package/package.json

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