@platforma-sdk/workflow-tengo 6.10.3 → 6.10.4

package/dist/tengo/lib/exec.lib.tengo

@@ -1349,7 +1349,17 @@ builder := func() {
 				tmpdirCompat.isSizedRequest(scratchFreeSpace, scratchFormulaAst)
 			)
 			if tmpdirCompatNeeded {
-				filesToWrite[tmpdirCompat.SCRIPT_FILE_NAME] = tmpdirCompat.script()
+
+
+
+				inContainer := false
+				if !is_undefined(soft) {
+					inContainer = tmpdirCompat.usesDocker(
+						ll.fromStrict(soft.descriptor), feats.isDockerAvailable)
+				}
+				for name, content in tmpdirCompat.filesToStage(inContainer) {
+					filesToWrite[name] = content
+				}
 
 
 

package/dist/tengo/lib/exec.tmpdir-compat.lib.tengo

@@ -22,6 +22,10 @@
 
 
 
+
+
+
+
 
 
 
@@ -42,6 +46,12 @@ SCRIPT_FILE_NAME := ".pl-run-compat-f9b7eca1b8.sh"
 
 
 
+SCRIPT_FILE_NAME_WINDOWS := ".pl-run-compat-f9b7eca1b8.cmd"
+
+
+
+
+
 
 
 
@@ -61,6 +71,14 @@ WORKDIR_TMP_REL_PATH := ".pl/tmp"
 
 
 
+
+WORKDIR_TMP_REL_PATH_WINDOWS := ".pl\\tmp"
+
+
+
+
+
+
 script := func() {
 	return `#!/bin/sh
 
@@ -87,6 +105,59 @@ exec "$@"
 
 
 
+_toCRLF := func(value) {
+	return text.replace(text.replace(value, "\r\n", "\n", -1), "\n", "\r\n", -1)
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+scriptWindows := func() {
+	return _toCRLF(`@echo off
+
+rem Compatibility layer between a current workflow-tengo SDK and a Platforma Backend from before
+rem the temporary-directory contract. Update the backend and this file stops appearing here.
+rem
+rem Written by exec.tmpdirCompat in @platforma-sdk/workflow-tengo.
+
+setlocal
+
+set "pl_tmp=%CD%\` + WORKDIR_TMP_REL_PATH_WINDOWS + `"
+if not exist "%pl_tmp%" md "%pl_tmp%"
+
+set "TMPDIR=%pl_tmp%"
+set "TMP=%pl_tmp%"
+set "TEMP=%pl_tmp%"
+
+%*
+exit /b %ERRORLEVEL%
+`)
+}
+
+
+
+
+
+
+
 
 
 isNeeded := func(feats, scratchSized) {
@@ -148,11 +219,43 @@ concat := func(prefix, tail) {
 
 
 
-_assertNotWindows := func() {
-	ll.assert(!isWindows(),
-		"exec.builder: this Platforma Backend is too old to provide a temporary directory (TMPDIR),"+
-			" and the workaround for it is POSIX-shell only, so it cannot run on Windows."+
-			" Update Platforma Backend to a version >=4.4.5")
+
+
+
+usesDocker := func(descriptor, isDockerAvailable) {
+	return isDockerAvailable && !is_undefined(descriptor.docker)
+}
+
+
+
+
+
+
+
+
+wrapperPrefix := func(inContainer) {
+	if !inContainer && isWindows() {
+		return [".\\" + SCRIPT_FILE_NAME_WINDOWS]
+	}
+
+	return ["sh", "./" + SCRIPT_FILE_NAME]
+}
+
+
+
+
+
+
+filesToStage := func(inContainer) {
+	files := {}
+
+	if !inContainer && isWindows() {
+		files[SCRIPT_FILE_NAME_WINDOWS] = scriptWindows()
+		return files
+	}
+
+	files[SCRIPT_FILE_NAME] = script()
+	return files
 }
 
 
@@ -167,12 +270,12 @@ _assertNotWindows := func() {
 
 
 patchSoftwareDescriptor := func(descriptor, isDockerAvailable) {
-	if isDockerAvailable && !is_undefined(descriptor.docker) {
+	if usesDocker(descriptor, isDockerAvailable) {
 		docker := ll.fromStrict(descriptor.docker)
 
 		entrypoint := docker.entrypoint
 		if is_undefined(entrypoint) { entrypoint = [] }
-		docker.entrypoint = concat(["sh", "./" + SCRIPT_FILE_NAME], entrypoint)
+		docker.entrypoint = concat(wrapperPrefix(true), entrypoint)
 
 		descriptor.docker = docker
 		return descriptor
@@ -180,7 +283,6 @@ patchSoftwareDescriptor := func(descriptor, isDockerAvailable) {
 
 
 
-	_assertNotWindows()
 
 	for kind in ["local", "binary"] {
 		if is_undefined(descriptor[kind]) { continue }
@@ -189,7 +291,7 @@ patchSoftwareDescriptor := func(descriptor, isDockerAvailable) {
 		ll.assert(is_array(pkg.cmd) && len(pkg.cmd) != 0,
 			"exec.tmpdirCompat: software descriptor %q has no 'cmd' to wrap", kind)
 
-		pkg.cmd = concat(["sh", "./" + SCRIPT_FILE_NAME], pkg.cmd)
+		pkg.cmd = concat(wrapperPrefix(false), pkg.cmd)
 		descriptor[kind] = pkg
 	}
 
@@ -202,11 +304,11 @@ patchSoftwareDescriptor := func(descriptor, isDockerAvailable) {
 
 
 wrapCommand := func(cmd) {
-	_assertNotWindows()
+	prefix := wrapperPrefix(false)
 
 	return {
-		cmd: "sh",
-		prependArgs: ["./" + SCRIPT_FILE_NAME, cmd]
+		cmd: prefix[0],
+		prependArgs: concat(prefix[1:], [cmd])
 	}
 }
 
@@ -255,11 +357,17 @@ rewriteScratchExpressions := func(value) {
 
 export ll.toStrict({
 	SCRIPT_FILE_NAME: SCRIPT_FILE_NAME,
+	SCRIPT_FILE_NAME_WINDOWS: SCRIPT_FILE_NAME_WINDOWS,
 	WORKDIR_TMP_REL_PATH: WORKDIR_TMP_REL_PATH,
+	WORKDIR_TMP_REL_PATH_WINDOWS: WORKDIR_TMP_REL_PATH_WINDOWS,
 	SCRATCH_PATH_VARIABLE: SCRATCH_PATH_VARIABLE,
 	SCRATCH_SIZE_VARIABLES: SCRATCH_SIZE_VARIABLES,
 
 	script: script,
+	scriptWindows: scriptWindows,
+	filesToStage: filesToStage,
+	usesDocker: usesDocker,
+	wrapperPrefix: wrapperPrefix,
 	isNeeded: isNeeded,
 	isSizedRequest: isSizedRequest,
 	isWindows: isWindows,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platforma-sdk/workflow-tengo",
-  "version": "6.10.3",
+  "version": "6.10.4",
   "description": "Tengo SDK library",
   "type": "module",
   "types": "./dist/index.d.ts",
@@ -16,11 +16,11 @@
     "./dist/**/*"
   ],
   "dependencies": {
-    "@milaboratories/pframes-rs-wasip2": "1.1.60",
+    "@milaboratories/pframes-rs-wasip2": "1.1.61",
     "@milaboratories/software-pframes-conv": "2.2.9",
     "@platforma-open/milaboratories.software-small-binaries": "^2.1.1",
     "@platforma-open/milaboratories.software-ptexter": "1.2.4",
-    "@platforma-open/milaboratories.software-ptabler": "2.1.10"
+    "@platforma-open/milaboratories.software-ptabler": "2.1.11"
   },
   "devDependencies": {
     "@platforma-sdk/tengo-builder": "4.0.27"