@platforma-sdk/workflow-tengo 2.9.3 → 2.9.5

package/dist/tengo/lib/exec.R.internal.lib.tengo

@@ -15,17 +15,28 @@ rDescriptor: desc.runEnvScheme,
 R: validation.reference
 }
 
-runRBuilder := func(wd, rPackage, rDescriptor) {
+runRBuilder := func(operationMode, wd, rPackage, rDescriptor) {
 t := desc.canBackendUseExpressions() ? constants.ARG_TYPE_EXPRESSION : constants.ARG_TYPE_VAR
 rule := desc.canBackendUseExpressions() ? "R" : "{R}"
 
-return runcmd.builder(wd).
+builder := runcmd.builder(wd).
 ref("r-run-environment", rPackage).
 substitutionRule(rule, "r-run-environment").
 addToPath(t, path.join("{R}", rDescriptor.binDir)).
-envTyped("R_HOME_DIR", t, "{R}").
 envTyped("RHOME", t, "{R}").
-envTyped("RENV_PATHS_ROOT", t, path.join("{R}", "renv-root"))
+envTyped("R_HOME_DIR", t, "{R}").
+envTyped("RENV_PATHS_ROOT", t, path.join("{R}", "renv-root")).
+envTyped("RENV_PATHS_BINARY", t, path.join("{R}", "renv-root", "binaries")).
+envTyped("RENV_PATHS_SOURCE", t, path.join("{R}", "renv-root", "sources")).
+envTyped("RENV_PATHS_CACHE", t, path.join("{R}", "renv-root", "cache"))
+
+if (operationMode != "dev-local") {
+
+
+builder.envTyped("RENV_CONFIG_REPOS_OVERRIDE", t, path.join("{R}", "packages"))
+}
+
+return builder
 }
 
 export ll.toStrict({

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

@@ -162,20 +162,31 @@ rRefVar := _newRefVar(_ARG_VAR_R, rRefKey, rPackage)
 rEnvRefKey := softName + "/R-virtual-env"
 rEnvRefVar := _newRefVar(_ARG_VAR_R_VENV, rEnvRefKey, rEnv)
 
+renvRootArg := path.join(_expr(_ARG_VAR_R), "renv-root")
+
+envs := {
+"RHOME": _newArg(false, _expr(_ARG_VAR_R)), // for Rscript (it uses RHOME instead of R_HOME)
+"R_HOME_DIR": _newArg(false, _expr(_ARG_VAR_R)), // for R startup script. It configures all the rest required for R to start.
+"RENV_PATHS_ROOT": _newArg(false, renvRootArg),
+"RENV_PATHS_BINARY": _newArg(false, path.join(renvRootArg, "binaries")),
+"RENV_PATHS_SOURCE": _newArg(false, path.join(renvRootArg, "sources")),
+"RENV_PATHS_CACHE": _newArg(false, path.join(renvRootArg, "cache")),
+"RENV_PATHS_RENV": _newArg(false, path.join(_expr(_ARG_VAR_R_VENV), "renv")),
+"RENV_PATHS_LOCKFILE": _newArg(false, path.join(_expr(_ARG_VAR_PKG), descriptor.dependencies.lockFile))
+}
+
+if (operationMode != "dev-local") {
+
+
+envs["RENV_CONFIG_REPOS_OVERRIDE"] = _newArg(false, path.join(_expr(_ARG_VAR_R), "packages"))
+}
+
 return ll.toStrict({
 runEnvType: "R",
 
 variables: [ rRefVar, rEnvRefVar ],
 customPaths: [ _newArg(false, rBinDir) ],
-envs: {
-"R_HOME_DIR": _newArg(false, _expr(_ARG_VAR_R)),
-"RHOME": _newArg(false, _expr(_ARG_VAR_R)),
-"RENV_PATHS_ROOT": _newArg(false, path.join(_expr(_ARG_VAR_R), "renv-root")),
-"RENV_PATHS_RENV": _newArg(false, path.join(_expr(_ARG_VAR_R_VENV), "renv")),
-"RENV_PATHS_LOCKFILE": _newArg(false, path.join(_expr(_ARG_VAR_PKG), descriptor.dependencies.lockFile)),
-"RENV_CONFIG_AUTO_SNAPSHOT": _newArg(true, "FALSE"),
-"RENV_CONFIG_SYNCHRONIZED_CHECK": _newArg(true, "FALSE")
-}
+envs: envs
 })
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platforma-sdk/workflow-tengo",
-  "version": "2.9.3",
+  "version": "2.9.5",
   "description": "Tengo SDK library",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",
@@ -16,7 +16,7 @@
     "./dist/**/*"
   ],
   "dependencies": {
-    "@milaboratories/software-pframes-conv": "2.1.3",
+    "@milaboratories/software-pframes-conv": "2.1.4",
     "@platforma-open/milaboratories.software-small-binaries": "^1.15.6"
   },
   "devDependencies": {