@platforma-sdk/workflow-tengo 5.5.7 → 5.5.9

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

@@ -202,9 +202,9 @@ importFileParquet := func(xsvFile, xsvType, spec, ops) {
 	if ops.dataOnly {
 		pfd := smart.mapBuilder()
 		for col in spec.columns {
-			id := util.xsvColumnId(col)
-			field := pf.getFutureInputField(col.column + ".data")
-			pfd.createInputField(id).set(field)
+			colId := util.xsvColumnId(col)
+			colData := pf.getFutureInputField(col.column + ".data")
+			pfd.createInputField(colId).set(colData)
 		}
 		return pfd.lockAndBuild()
 	}
@@ -212,18 +212,17 @@ importFileParquet := func(xsvFile, xsvType, spec, ops) {
 	result := {}
 	axesSpec := slices.map(spec.axes, func(ax) { return ax.spec })
 	for col in spec.columns {
+		colId := util.xsvColumnId(col)
 		colSpec := getColumnSpec(axesSpec, col)
-		data := pf.getFutureInputField(col.column + ".data")
-
-		id := util.xsvColumnId(col)
+		colData := pf.getFutureInputField(col.column + ".data")
 		if ops.splitDataAndSpec {
-			result[id] = {
+			result[colId] = {
 				spec: colSpec,
-				data: data
+				data: colData
 			}
 		} else {
-			result[id + ".spec"] = colSpec
-			result[id + ".data"] = data
+			result[colId + ".spec"] = colSpec
+			result[colId + ".data"] = colData
 		}
 	}
 	return result

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

@@ -305,15 +305,32 @@ workflow := func() {
 
 	inFiles := []
 
+
+
+
+
+
+
+
+
+
 	inFrames := {}
 
 	outFiles := []
 
 	outContentFiles := []
 
-	outFramesSpecs := {}
 
-	outFramesRename := {}
+
+
+
+
+
+
+
+
+
+	outFramesInfo := {}
 
 	anonymousFilesCounter := 0
 	anonymousDFCounter := 0
@@ -710,14 +727,16 @@ workflow := func() {
 		_saveFileContent: func(name) {
 			outContentFiles = append(outContentFiles, name)
 		},
-		_saveFrameSpecs: func(name, rename, specs) {
+		_saveFrameInfo: func(name, rename, colInfo) {
 			ll.assert(
-				outFramesSpecs[name] == undefined,
+				outFramesInfo[name] == undefined,
 				"frame with name '%s' already saved, please pick a different name",
 				name
 			)
-			outFramesSpecs[name] = specs
-			outFramesRename[name] = rename
+			outFramesInfo[name] = {
+				colInfo: colInfo,
+				rename: rename
+			}
 		},
 
 
@@ -857,12 +876,9 @@ workflow := func() {
 			}
 
 			outFrames := {}
-			for frameName, specsById in outFramesSpecs {
-				columnIds := []
-				for columnId, _ in specsById {
-					columnIds = append(columnIds, columnId)
-				}
-				outFrames[outFramesRename[frameName]] = columnIds;
+			for _, frameInfo in outFramesInfo {
+				columnIds := maps.getKeys(frameInfo.colInfo)
+				outFrames[frameInfo.rename] = columnIds
 			}
 
 			inFramesDistilled := maps.mapValues(inFrames, func(frame) {
@@ -924,13 +940,13 @@ workflow := func() {
 
 
 				getFrameDirect: func(frameName) {
-					specs := outFramesSpecs[frameName]
-					ll.assert(!is_undefined(specs), "saveFrameDirect was not called for frame '%s'", frameName)
+					frameInfo := outFramesInfo[frameName]
+					ll.assert(!is_undefined(frameInfo), "saveFrameDirect was not called for frame '%s'", frameName)
 
 					pf := pframesBuilder.pFrameBuilder()
-					for columnId, columnSpec in specs {
-						columnData := ptResult.resolveOutput(["outFrames", outFramesRename[frameName], columnId])
-						pf.add(columnId, columnSpec, columnData)
+					for columnId, columnInfo in frameInfo.colInfo {
+						columnData := ptResult.resolveOutput(["outFrames", frameInfo.rename, columnId])
+						pf.add(columnInfo.id, columnInfo.spec, columnData)
 					}
 					return pf.build()
 				}
@@ -1258,12 +1274,31 @@ _newDataFrame = func(parentWorkflow, dfName) {
 			ll.assert(len(frameName) > 0, "frameName must be a non-empty string")
 			util.validateParamsForSaveFrameDirect(params)
 
-			specs := util.makeFrameSpecs(params)
+			projection := []
+			translation := {}
+			columnCount := 0
+			renameColumn := func(column) {
+				columnCount += 1
+				name := "col" + string(columnCount)
+				translation[column] = name
+				projection = append(projection, exp.col(column).alias(name))
+			}
+			for ax in params.axes {
+				renameColumn(ax.column)
+			}
+			for col in params.columns {
+				renameColumn(col.column)
+			}
+			df := self.select(projection...)
+
+			colInfo := util.makeFrameColumnInfo(params, translation)
 			sequentialFrameName := parentWorkflow._newUniquePFrameName()
-			parentWorkflow._saveFrameSpecs(frameName, sequentialFrameName, specs)
+			parentWorkflow._saveFrameInfo(frameName, sequentialFrameName, colInfo)
 
-			step := util.makeWriteFrameStep(sequentialFrameName, dfName, params)
+			step := util.makeWriteFrameStep(sequentialFrameName, df._getDfName(), params, translation)
 			parentWorkflow.addRawStep(step)
+
+			return self
 		},
 
 

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

@@ -93,7 +93,7 @@ validateParamsForFrameFromColumnBundle := func(params) {
 	validation.assertType(params, _FRAME_FROM_COLUMN_BUNDLE_PARAMS_SCHEMA, "Invalid params structure")
 }
 
-makeFrameSpecs := func(params) {
+makeFrameColumnInfo := func(params, translation) {
 	axes := []
     for entry in params.axes {
         spec := {
@@ -128,25 +128,28 @@ makeFrameSpecs := func(params) {
         if !is_undefined(entry.spec.parentAxes) && len(entry.spec.parentAxes) > 0 {
             spec.parentAxes = slices.sortUnique(entry.spec.parentAxes)
         }
-        columns[entry.column] = spec
+        columns[translation[entry.column]] = {
+            id: entry.column,
+            spec: spec
+        }
     }
     return columns
 }
 
-makeWriteFrameStep := func(frameName, dfName, params) {
+makeWriteFrameStep := func(frameName, dfName, params, translation) {
 	step := {
         type: "write_frame",
         inputTable: dfName,
         frameName: frameName,
         axes: slices.map(params.axes, func(entry) {
             return {
-                column: entry.column,
+                column: translation[entry.column],
                 type: entry.spec.type
             }
         }),
         columns: slices.map(params.columns, func(entry) {
             return {
-                column: entry.column,
+                column: translation[entry.column],
                 type: entry.spec.valueType
             }
         }),
@@ -398,7 +401,7 @@ renameJoinColumns := func(request, rename) {
 export ll.toStrict({
     validateParamsForSaveFrameDirect: validateParamsForSaveFrameDirect,
 	validateParamsForFrameFromColumnBundle: validateParamsForFrameFromColumnBundle,
-    makeFrameSpecs: makeFrameSpecs,
+    makeFrameColumnInfo: makeFrameColumnInfo,
     makeWriteFrameStep: makeWriteFrameStep,
     makeFrameColumnRef: makeFrameColumnRef,
     renameJoinColumns: renameJoinColumns,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platforma-sdk/workflow-tengo",
-  "version": "5.5.7",
+  "version": "5.5.9",
   "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.13.2",
-    "@platforma-open/milaboratories.software-ptexter": "1.2.0"
+    "@platforma-open/milaboratories.software-ptexter": "1.2.0",
+    "@platforma-open/milaboratories.software-ptabler": "1.13.2"
   },
   "devDependencies": {
     "@platforma-sdk/tengo-builder": "2.3.3"