@milaboratories/pl-deployments 2.2.0 → 2.2.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@milaboratories/pl-deployments",
-  "version": "2.2.0",
+  "version": "2.2.2",
   "pl-version": "1.33.4",
   "description": "MiLaboratories Platforma Backend code service run wrapper",
   "engines": {
@@ -41,7 +41,7 @@
     "typescript": "~5.5.4",
     "utility-types": "^3.11.0",
     "vite": "^5.4.11",
-    "vitest": "^2.1.8",
+    "vitest": "^2.1.9",
     "@milaboratories/eslint-config": "^1.0.4",
     "@milaboratories/platforma-build-configs": "1.0.3"
   },
@@ -53,8 +53,8 @@
     "undici": "~7.5.0",
     "yaml": "^2.7.0",
     "zod": "~3.23.8",
-    "@milaboratories/ts-helpers": "^1.2.0",
-    "@milaboratories/pl-config": "^1.4.9"
+    "@milaboratories/pl-config": "^1.4.10",
+    "@milaboratories/ts-helpers": "^1.3.0"
   },
   "scripts": {
     "type-check": "tsc --noEmit --composite false",

package/src/local/pl.test.ts

@@ -139,120 +139,137 @@ const mergeDefaultOpsCases: {
   };
   expected: LocalPlOptionsFull;
 }[] = [
-  {
-    name: 'should set default values when minimal input is provided',
-    input: {
-      ops: { 
-        workingDir: '/test', 
+    {
+      name: 'should set default values when minimal input is provided',
+      input: {
+        ops: {
+          workingDir: '/test',
+          config: 'config',
+          plBinary: { type: 'Download', version: '1.29.2' },
+        },
+        numCpu: 4,
+      },
+      expected: {
+        workingDir: '/test',
         config: 'config',
         plBinary: { type: 'Download', version: '1.29.2' },
+        spawnOptions: {
+          env: {
+            GOMAXPROCS: '4',
+          },
+        },
+        closeOld: true,
       },
-      numCpu: 4,
     },
-    expected: {
-      workingDir: '/test',
-      config: 'config',
-      plBinary: { type: 'Download', version: '1.29.2' },
-      spawnOptions: {
-        env: {
-          GOMAXPROCS: '4',
+    {
+      name: 'should override outermost options when provided',
+      input: {
+        ops: {
+          workingDir: '/test',
+          config: 'config',
+          // we provided plBinary and closeOld, they should appear in the result
+          plBinary: { type: 'Local', path: '/custom/binary' },
+          closeOld: false,
         },
+        numCpu: 2,
       },
-      closeOld: true,
-    },
-  },
-  {
-    name: 'should override outermost options when provided',
-    input: {
-      ops: { 
-        workingDir: '/test', 
+      expected: {
+        workingDir: '/test',
         config: 'config',
-        // we provided plBinary and closeOld, they should appear in the result
+        spawnOptions: {
+          env: {
+            GOMAXPROCS: '2',
+          },
+        },
         plBinary: { type: 'Local', path: '/custom/binary' },
         closeOld: false,
       },
-      numCpu: 2,      
     },
-    expected: {
-      workingDir: '/test',
-      config: 'config',
-      spawnOptions: {
-        env: {
-          GOMAXPROCS: '2',
+    {
+      name: 'should merge env variables when provided',
+      input: {
+        ops: {
+          workingDir: '/test',
+          config: 'config',
+          plBinary: { type: 'Download', version: '1.29.2' },
+          spawnOptions: {
+            env: {
+              NODE_ENV: 'test',
+              DEBUG: 'true',
+            },
+          },
         },
+        numCpu: 3,
       },
-      plBinary: { type: 'Local', path: '/custom/binary' },
-      closeOld: false,
-    },
-  },
-  {
-    name: 'should merge env variables when provided',
-    input: {
-      ops: { 
-        workingDir: '/test', 
+      expected: {
+        workingDir: '/test',
         config: 'config',
         plBinary: { type: 'Download', version: '1.29.2' },
         spawnOptions: {
           env: {
+            GOMAXPROCS: '3',
             NODE_ENV: 'test',
             DEBUG: 'true',
           },
         },
+        closeOld: true,
       },
-      numCpu: 3,
     },
-    expected: {
-      workingDir: '/test',
-      config: 'config',
-      plBinary: { type: 'Download', version: '1.29.2' },
-      spawnOptions: {
-        env: {
-          GOMAXPROCS: '3',
-          NODE_ENV: 'test',
-          DEBUG: 'true',
+    {
+      name: 'should override other spawnOptions properties',
+      input: {
+        ops: {
+          workingDir: '/test',
+          config: 'config',
+          plBinary: { type: 'Download', version: '1.29.2' },
+          spawnOptions: {
+            stdio: 'inherit',
+            detached: true,
+          },
         },
+        numCpu: 2,
       },
-      closeOld: true,
-    },
-  },
-  {
-    name: 'should override other spawnOptions properties',
-    input: {
-      ops: {
+      expected: {
         workingDir: '/test',
         config: 'config',
         plBinary: { type: 'Download', version: '1.29.2' },
         spawnOptions: {
+          env: {
+            GOMAXPROCS: '2',
+          },
           stdio: 'inherit',
           detached: true,
         },
+        closeOld: true,
       },
-      numCpu: 2,
     },
-    expected: {
-      workingDir: '/test',
-      config: 'config',
-      plBinary: { type: 'Download', version: '1.29.2' },
-      spawnOptions: {
-        env: {
-          GOMAXPROCS: '2',
+    {
+      name: 'should handle complex case with multiple overrides',
+      input: {
+        ops: {
+          workingDir: '/test',
+          config: 'config',
+          plBinary: { type: 'Local', path: '/custom/binary' },
+          closeOld: false,
+          spawnOptions: {
+            env: {
+              NODE_ENV: 'production',
+              LOG_LEVEL: 'debug',
+            },
+            cwd: '/custom/dir',
+            windowsHide: false,
+          },
         },
-        stdio: 'inherit',
-        detached: true,
+        numCpu: 6,
       },
-      closeOld: true,
-    },
-  },
-  {
-    name: 'should handle complex case with multiple overrides',
-    input: {
-      ops: { 
-        workingDir: '/test', 
+      expected: {
+        workingDir: '/test',
         config: 'config',
         plBinary: { type: 'Local', path: '/custom/binary' },
         closeOld: false,
         spawnOptions: {
           env: {
+            GOMAXPROCS: '6',
             NODE_ENV: 'production',
             LOG_LEVEL: 'debug',
           },
@@ -260,25 +277,8 @@ const mergeDefaultOpsCases: {
           windowsHide: false,
         },
       },
-      numCpu: 6,
-    },
-    expected: {
-      workingDir: '/test',
-      config: 'config',
-      plBinary: { type: 'Local', path: '/custom/binary' },
-      closeOld: false,
-      spawnOptions: {
-        env: {
-          GOMAXPROCS: '6',
-          NODE_ENV: 'production',
-          LOG_LEVEL: 'debug',
-        },
-        cwd: '/custom/dir',
-        windowsHide: false,
-      },
     },
-  },
-];
+  ];
 
 test.each(mergeDefaultOpsCases)('mergeDefaultOps: $name', ({ name, input, expected }) => {
   const result = mergeDefaultOps(input.ops, input.numCpu);
@@ -296,139 +296,139 @@ const plProcessOpsCases: {
   };
   expected: ProcessOptions;
 }[] = [
-  {
-    name: 'should set basic options with minimal input',
-    input: {
-      binaryPath: '/path/to/binary',
-      configPath: '/path/to/config.yaml',
-      ops: {
-        workingDir: '/work/dir',
-        config: 'config-content',
-        plBinary: { type: 'Download', version: '1.29.2' },
-        spawnOptions: {},
-        closeOld: true,
+    {
+      name: 'should set basic options with minimal input',
+      input: {
+        binaryPath: '/path/to/binary',
+        configPath: '/path/to/config.yaml',
+        ops: {
+          workingDir: '/work/dir',
+          config: 'config-content',
+          plBinary: { type: 'Download', version: '1.29.2' },
+          spawnOptions: {},
+          closeOld: true,
+        },
+        workDir: '/work/dir',
       },
-      workDir: '/work/dir',
-    },
-    expected: {
-      cmd: '/path/to/binary',
-      args: ['--config', '/path/to/config.yaml'],
-      opts: {
-        env: {},
-        cwd: '/work/dir',
-        stdio: ['pipe', 'ignore', 'inherit'],
-        windowsHide: true,
+      expected: {
+        cmd: '/path/to/binary',
+        args: ['--config', '/path/to/config.yaml'],
+        opts: {
+          env: {},
+          cwd: '/work/dir',
+          stdio: ['pipe', 'ignore', 'inherit'],
+          windowsHide: true,
+        },
       },
     },
-  },
-  {
-    name: 'should merge environment variables when provided',
-    input: {
-      binaryPath: '/path/to/binary',
-      configPath: '/config.yaml',
-      ops: {
-        workingDir: '/work',
-        config: 'content',
-        plBinary: { type: 'Download', version: '1.29.2' },
-        spawnOptions: {
+    {
+      name: 'should merge environment variables when provided',
+      input: {
+        binaryPath: '/path/to/binary',
+        configPath: '/config.yaml',
+        ops: {
+          workingDir: '/work',
+          config: 'content',
+          plBinary: { type: 'Download', version: '1.29.2' },
+          spawnOptions: {
+            env: {
+              DEBUG: 'true',
+              LOG_LEVEL: 'info',
+            },
+          },
+          closeOld: true,
+        },
+        workDir: '/work',
+      },
+      expected: {
+        cmd: '/path/to/binary',
+        args: ['--config', '/config.yaml'],
+        opts: {
           env: {
             DEBUG: 'true',
             LOG_LEVEL: 'info',
           },
+          cwd: '/work',
+          stdio: ['pipe', 'ignore', 'inherit'],
+          windowsHide: true,
         },
-        closeOld: true,
       },
-      workDir: '/work',
     },
-    expected: {
-      cmd: '/path/to/binary',
-      args: ['--config', '/config.yaml'],
-      opts: {
-        env: { 
-          DEBUG: 'true',
-          LOG_LEVEL: 'info',
+    {
+      name: 'should override spawn options when provided',
+      input: {
+        binaryPath: '/binary',
+        configPath: '/config.yaml',
+        ops: {
+          workingDir: '/work',
+          config: 'content',
+          plBinary: { type: 'Download', version: '1.29.2' },
+          spawnOptions: {
+            stdio: 'inherit',
+            detached: true,
+            shell: true,
+          },
+          closeOld: true,
         },
-        cwd: '/work',
-        stdio: ['pipe', 'ignore', 'inherit'],
-        windowsHide: true,
+        workDir: '/work',
       },
-    },
-  },
-  {
-    name: 'should override spawn options when provided',
-    input: {
-      binaryPath: '/binary',
-      configPath: '/config.yaml',
-      ops: {
-        workingDir: '/work',
-        config: 'content',
-        plBinary: { type: 'Download', version: '1.29.2' },
-        spawnOptions: {
+      expected: {
+        cmd: '/binary',
+        args: ['--config', '/config.yaml'],
+        opts: {
+          env: {},
+          cwd: '/work',
           stdio: 'inherit',
           detached: true,
           shell: true,
+          windowsHide: true,
         },
-        closeOld: true,
       },
-      workDir: '/work',
     },
-    expected: {
-      cmd: '/binary',
-      args: ['--config', '/config.yaml'],
-      opts: {
-        env: {},
-        cwd: '/work',
-        stdio: 'inherit',
-        detached: true,
-        shell: true,
-        windowsHide: true,
+    {
+      name: 'should handle complex case with multiple options',
+      input: {
+        binaryPath: '/bin/platforma',
+        configPath: '/etc/platforma/config.yaml',
+        ops: {
+          workingDir: '/var/platforma',
+          config: 'yaml content',
+          plBinary: { type: 'Download', version: '1.29.2' },
+          spawnOptions: {
+            env: {
+              PL_DEBUG: 'true',
+              PL_MODE: 'development',
+              GOMAXPROCS: '4',
+            },
+            stdio: ['ignore', 'pipe', 'pipe'],
+            detached: false,
+            windowsHide: false,
+            uid: 1000,
+            gid: 1000,
+          },
+          closeOld: true,
+        },
+        workDir: '/var/platforma/runtime',
       },
-    },
-  },
-  {
-    name: 'should handle complex case with multiple options',
-    input: {
-      binaryPath: '/bin/platforma',
-      configPath: '/etc/platforma/config.yaml',
-      ops: {
-        workingDir: '/var/platforma',
-        config: 'yaml content',
-        plBinary: { type: 'Download', version: '1.29.2' },
-        spawnOptions: {
+      expected: {
+        cmd: '/bin/platforma',
+        args: ['--config', '/etc/platforma/config.yaml'],
+        opts: {
           env: {
             PL_DEBUG: 'true',
             PL_MODE: 'development',
             GOMAXPROCS: '4',
           },
+          cwd: '/var/platforma/runtime',
           stdio: ['ignore', 'pipe', 'pipe'],
           detached: false,
           windowsHide: false,
           uid: 1000,
           gid: 1000,
         },
-        closeOld: true,
-      },
-      workDir: '/var/platforma/runtime',
-    },
-    expected: {
-      cmd: '/bin/platforma',
-      args: ['--config', '/etc/platforma/config.yaml'],
-      opts: {
-        env: {
-          PL_DEBUG: 'true',
-          PL_MODE: 'development',
-          GOMAXPROCS: '4',
-        },
-        cwd: '/var/platforma/runtime',
-        stdio: ['ignore', 'pipe', 'pipe'],
-        detached: false,
-        windowsHide: false,
-        uid: 1000,
-        gid: 1000,
       },
     },
-  },
-];
+  ];
 
 test.each(plProcessOpsCases)('plProcessOps: $name', ({ name, input, expected }) => {
   const result = plProcessOps(