@platforma-sdk/workflow-tengo 6.5.1 → 6.6.1

package/dist/tengo/lib/pframes.process-column-batch.lib.tengo

@@ -12,6 +12,12 @@
 
 
 
+
+
+
+
+
+
 
 ll := import("@platforma-sdk/workflow-tengo:ll")
 maps := import("@platforma-sdk/workflow-tengo:maps")
@@ -231,13 +237,13 @@ processColumnBatch := func(input, bodyTpl, outputs, opts) {
 
 
 
+
+
+
 			batchKeyColumnsNames := output.settings.batchKeyColumns
 			ll.assert(!is_undefined(batchKeyColumnsNames),
 				"Xsv output %q is missing settings.batchKeyColumns (required in batch mode; list the axis names emitted by the body)",
 				output.name)
-			ll.assert(is_undefined(output.settings.axes),
-				"Xsv output %q cannot set both batchKeyColumns and axes in settings; these are mutually exclusive — keep batchKeyColumns only",
-				output.name)
 
 			batchAxes := slices.map(batchKeyColumnsNames, func(colName) {
 				axSpec := batchKeyAxisByName[colName]
@@ -247,14 +253,62 @@ processColumnBatch := func(input, bodyTpl, outputs, opts) {
 				return { column: colName, spec: axSpec }
 			})
 
+			additionalAxes := slices.normalize(output.settings.axes)
+
+
+
+
+
+
+
+
+
+			_outputHeaders := {}
+			_axisNames := {}
+			for axSpec in isolationAxesSpec {
+				_axisNames[axSpec.name] = "isolation axis"
+			}
+			for axName in batchKeyColumnsNames {
+				_outputHeaders[axName] = "batch-key axis"
+				_axisNames[axName] = "batch-key axis"
+			}
+			for col in output.settings.columns {
+				_outputHeaders[col.column] = "value column"
+			}
+			for axis in additionalAxes {
+				priorHeader := _outputHeaders[axis.column]
+				ll.assert(is_undefined(priorHeader),
+					"Xsv output %q: additional axis column %q collides with %s of the same name; rename one of them",
+					output.name, axis.column, priorHeader)
+				_outputHeaders[axis.column] = "additional axis"
+
+				priorName := _axisNames[axis.spec.name]
+				ll.assert(is_undefined(priorName),
+					"Xsv output %q: additional axis %q has spec.name %q colliding with %s; give every axis a unique name",
+					output.name, axis.column, axis.spec.name, priorName)
+				_axisNames[axis.spec.name] = "additional axis"
+			}
+
+
+
+
+
+			storageFormat := output.settings.storageFormat
+			if is_undefined(storageFormat) {
+				storageFormat = "Parquet"
+			}
+			ll.assert(storageFormat == "Json" || storageFormat == "Binary" || storageFormat == "Parquet",
+				"Xsv output %q has invalid storageFormat %q; expected \"Json\", \"Binary\", or \"Parquet\"",
+				output.name, storageFormat)
 
 
 
 
 			modifiedSettings := maps.merge(output.settings, {
-				axes: batchAxes,
+				axes: batchAxes + additionalAxes,
 				batchKeyColumns: undefined,
-				partitionKeyLength: 0
+				partitionKeyLength: 0,
+				storageFormat: storageFormat
 			})
 			decomposition := pUtil.decomposePfconvImportCfg(modifiedSettings, {
 				additionalAxesSpec: iterationAxesSpec

package/dist/tengo/lib/pframes.process-pcolumn-batch-helpers.lib.tengo

@@ -233,10 +233,44 @@ groupColumnData := func(data, isolationIndices, batchKeyIndices, batchKeyLength,
 	return groups
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+xsvDataResTypes := func(storageFormat) {
+	if storageFormat == "Binary" {
+		return {
+			partitioned: pConstants.RTYPE_P_COLUMN_DATA_BINARY_PARTITIONED,
+			superPartitioned: pConstants.RTYPE_P_COLUMN_DATA_BINARY_SUPER_PARTITIONED
+		}
+	} else if storageFormat == "Json" {
+		return {
+			partitioned: pConstants.RTYPE_P_COLUMN_DATA_JSON_PARTITIONED,
+			superPartitioned: pConstants.RTYPE_P_COLUMN_DATA_JSON_SUPER_PARTITIONED
+		}
+	} else if storageFormat == "Parquet" {
+		return {
+			partitioned: pConstants.RTYPE_P_COLUMN_DATA_PARQUET_PARTITIONED,
+			superPartitioned: pConstants.RTYPE_P_COLUMN_DATA_PARQUET_SUPER_PARTITIONED
+		}
+	}
+	ll.panic("Unknown storageFormat for batch Xsv output: %v (expected \"Json\", \"Binary\", or \"Parquet\")", storageFormat)
+}
+
 export ll.toStrict({
 	resolveData: resolveData,
 	classifyPColumnData: classifyPColumnData,
 	recordsInGroup: recordsInGroup,
 	forEachOutputField: forEachOutputField,
-	groupColumnData: groupColumnData
+	groupColumnData: groupColumnData,
+	xsvDataResTypes: xsvDataResTypes
 })

package/dist/tengo/lib/workdir.dirs.lib.tengo

@@ -0,0 +1,28 @@
+
+
+
+
+ll := import("@platforma-sdk/workflow-tengo:ll")
+sets := import("@platforma-sdk/workflow-tengo:sets")
+path := import("@platforma-sdk/workflow-tengo:path")
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+addNestedDirs := func(set, dir) {
+	return sets.add(set, path.getBasenameDirs(dir)...)
+}
+
+export ll.toStrict({
+	addNestedDirs: addNestedDirs
+})

package/dist/tengo/lib/workdir.lib.tengo

@@ -16,6 +16,7 @@ oop := import("@platforma-sdk/workflow-tengo:oop")
 sets := import("@platforma-sdk/workflow-tengo:sets")
 slices := import("@platforma-sdk/workflow-tengo:slices")
 path := import("@platforma-sdk/workflow-tengo:path")
+workdirDirs := import("@platforma-sdk/workflow-tengo:workdir.dirs")
 render := import("@platforma-sdk/workflow-tengo:render")
 maps := import("@platforma-sdk/workflow-tengo:maps")
 
@@ -327,7 +328,8 @@ _fill := func() {
 
 
 		mkDir: func(dir) {
-			sets.add(dirs, path.getBasenameDirs(dir))
+			validation.assertType(dir, "string")
+			dirs = workdirDirs.addNestedDirs(dirs, dir)
 			return self
 		},
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platforma-sdk/workflow-tengo",
-  "version": "6.5.1",
+  "version": "6.6.1",
   "description": "Tengo SDK library",
   "type": "module",
   "types": "./dist/index.d.ts",
@@ -16,14 +16,14 @@
     "./dist/**/*"
   ],
   "dependencies": {
-    "@milaboratories/pframes-rs-wasip2": "1.1.44",
+    "@milaboratories/pframes-rs-wasip2": "1.1.46",
     "@milaboratories/software-pframes-conv": "2.2.9",
     "@platforma-open/milaboratories.software-small-binaries": "^2.1.1",
     "@platforma-open/milaboratories.software-ptabler": "2.1.1",
     "@platforma-open/milaboratories.software-ptexter": "1.2.2"
   },
   "devDependencies": {
-    "@platforma-sdk/tengo-builder": "4.0.7"
+    "@platforma-sdk/tengo-builder": "4.0.8"
   },
   "scripts": {
     "type-check": "pl-tengo check",