@scandipwa/magento-scripts 2.0.3 → 2.0.4

package/lib/tasks/docker/containers/container-api.js

@@ -1,5 +1,5 @@
 /* eslint-disable max-len */
-const { execAsyncSpawn } = require('../../../util/exec-async-command');
+const { execAsyncSpawn } = require('../../../util/exec-async-command')
 
 /**
  * @param {import('./container-api').ContainerRunOptions} options
@@ -26,25 +26,39 @@ const runCommand = (options) => {
         rm = false,
         tty = false,
         user
-    } = options;
-
-    const detachArg = detach && '-d';
-    const rmArg = rm && '--rm';
-    const ttyArg = tty && '-it';
-    const exposeArg = expose && expose.map((e) => `--expose=${ e }`);
-    const restartArg = !rm && restart && `--restart=${ restart }`;
-    const networkArg = network && `--network=${ network }`;
-    const portsArgs = ports && ports.length > 0 && ports.map((port) => `-p=${ port }`);
-    const mountsArgs = mounts && mounts.map((mount) => `--mount="${ mount }"`);
-    const mountVolumesArgs = mountVolumes && mountVolumes.map((mount) => `-v="${mount}"`);
-    const envArgs = !env ? '' : Object.entries(env).map(([key, value]) => `--env=${ key }='${ value }'`);
-    const nameArg = name && `--name=${name}`;
-    const entrypointArg = entrypoint && `--entrypoint="${entrypoint}"`;
-    const healthCheckArg = healthCheck && Object.entries(healthCheck).map(([key, value]) => `--health-${key}='${value}'`);
-    const securityArg = securityOptions.length > 0 && securityOptions.map((opt) => `--security-opt=${opt}`);
-    const tmpfsArg = tmpfs.length > 0 && tmpfs.map((t) => `--tmpfs=${t}`);
-    const userArg = user && `--user=${user}`;
-    const addHostArg = addHost && `--add-host=${addHost}`;
+    } = options
+
+    const detachArg = (detach && '-d') || ''
+    const rmArg = (rm && '--rm') || ''
+    const ttyArg = (tty && '-it') || ''
+    const exposeArg = (expose && expose.map((e) => `--expose=${e}`)) || ''
+    const restartArg = (!rm && restart && `--restart=${restart}`) || ''
+    const networkArg = (network && `--network=${network}`) || ''
+    const portsArgs =
+        (ports && ports.length > 0 && ports.map((port) => `-p=${port}`)) || ''
+    const mountsArgs =
+        (mounts && mounts.map((mount) => `--mount="${mount}"`)) || ''
+    const mountVolumesArgs =
+        (mountVolumes && mountVolumes.map((mount) => `-v="${mount}"`)) || ''
+    const envArgs = !env
+        ? ''
+        : Object.entries(env).map(([key, value]) => `--env=${key}='${value}'`)
+    const nameArg = (name && `--name=${name}`) || ''
+    const entrypointArg = (entrypoint && `--entrypoint="${entrypoint}"`) || ''
+    const healthCheckArg =
+        (healthCheck &&
+            Object.entries(healthCheck).map(
+                ([key, value]) => `--health-${key}='${value}'`
+            )) ||
+        ''
+    const securityArg =
+        (securityOptions.length > 0 &&
+            securityOptions.map((opt) => `--security-opt=${opt}`)) ||
+        ''
+    const tmpfsArg =
+        (tmpfs.length > 0 && tmpfs.map((t) => `--tmpfs=${t}`)) || ''
+    const userArg = (user && `--user=${user}`) || ''
+    const addHostArg = (addHost && `--add-host=${addHost}`) || ''
 
     const dockerCommand = [
         'docker',
@@ -68,16 +82,19 @@ const runCommand = (options) => {
         addHostArg,
         image,
         command
-    ].flat().filter(Boolean).filter((arg) => typeof arg === 'string');
+    ]
+        .flat()
+        .filter((arg) => !!arg && typeof arg === 'string')
 
-    return dockerCommand;
-};
+    return dockerCommand
+}
 
 /**
  * @param {import('./container-api').ContainerRunOptions} options
  * @param {import('../../../util/exec-async-command').ExecAsyncSpawnOptions<false>} execOptions
  */
-const run = (options, execOptions = {}) => execAsyncSpawn(runCommand(options).join(' '), execOptions);
+const run = (options, execOptions = {}) =>
+    execAsyncSpawn(runCommand(options).join(' '), execOptions)
 
 /**
  * @param {string} command
@@ -86,16 +103,15 @@ const run = (options, execOptions = {}) => execAsyncSpawn(runCommand(options).jo
  * @param {import('../../../util/exec-async-command').ExecAsyncSpawnOptions<false>} execOptions
  */
 const exec = (command, container, options = {}, execOptions = {}) => {
-    const {
-        env,
-        tty,
-        user,
-        workdir
-    } = options;
-    const envArgs = !env ? '' : Object.entries(env).map(([key, value]) => `--env ${ key }='${ value }'`).join(' ');
-    const ttyArg = tty ? '--tty' : '';
-    const userArg = user ? `--user=${user}` : '';
-    const workdirArg = workdir ? `--workdir=${workdir}` : '';
+    const { env, tty, user, workdir } = options
+    const envArgs = !env
+        ? ''
+        : Object.entries(env)
+              .map(([key, value]) => `--env ${key}='${value}'`)
+              .join(' ')
+    const ttyArg = tty ? '--tty' : ''
+    const userArg = user ? `--user=${user}` : ''
+    const workdirArg = workdir ? `--workdir=${workdir}` : ''
 
     const execCommand = [
         'docker',
@@ -107,14 +123,15 @@ const exec = (command, container, options = {}, execOptions = {}) => {
         workdirArg,
         container,
         command
-    ].filter(Boolean).join(' ');
+    ]
+        .filter(Boolean)
+        .join(' ')
 
-    return execAsyncSpawn(execCommand, execOptions);
-};
+    return execAsyncSpawn(execCommand, execOptions)
+}
 
 /**
- * @param {import('./container-api').ContainerLsOptions} options
- * @param {import('../../../util/exec-async-command').ExecAsyncSpawnOptions<false>} execOptions
+ * @type {typeof import('./container-api')['ls']}
  */
 const ls = async (options = {}, execOptions = {}) => {
     const {
@@ -125,45 +142,47 @@ const ls = async (options = {}, execOptions = {}) => {
         latest,
         noTrunc,
         quiet
-    } = options;
-
-    const allArg = all && '--all';
-    const filterArg = filter && typeof filter === 'string'
-        ? `--filter=${filter}`
-        : filter && Array.isArray(filter) && filter.every((f) => typeof f === 'string') && filter.map((f) => `--filter=${f}`).join(' ');
-    const formatArg = !formatToJSON && format
-        ? `--format=${format}`
-        : formatToJSON && '--format=\'{{json .}}\'';
-    const latestArg = latest && '--latest';
-    const noTruncArg = noTrunc && '--no-trunc';
-    const quietArg = quiet && '--quiet';
-
-    const args = [
-        allArg,
-        filterArg,
-        formatArg,
-        latestArg,
-        noTruncArg,
-        quietArg
-    ].filter(Boolean).join(' ');
+    } = options
+
+    const allArg = all && '--all'
+    const filterArg =
+        filter && typeof filter === 'string'
+            ? `--filter=${filter}`
+            : filter &&
+              Array.isArray(filter) &&
+              filter.every((f) => typeof f === 'string') &&
+              filter.map((f) => `--filter=${f}`).join(' ')
+    const formatArg =
+        !formatToJSON && format
+            ? `--format=${format}`
+            : formatToJSON && "--format='{{json .}}'"
+    const latestArg = latest && '--latest'
+    const noTruncArg = noTrunc && '--no-trunc'
+    const quietArg = quiet && '--quiet'
+
+    const args = [allArg, filterArg, formatArg, latestArg, noTruncArg, quietArg]
+        .filter(Boolean)
+        .join(' ')
 
     if (formatToJSON) {
-        const result = await execAsyncSpawn(`docker container ls ${args}`, execOptions);
+        const result = await execAsyncSpawn(
+            `docker container ls ${args}`,
+            execOptions
+        )
         if (result.startsWith('[')) {
-            return JSON.parse(result);
+            return JSON.parse(result)
         }
 
-        return JSON.parse(`[${result.split('\n').join(', ')}]`);
+        return JSON.parse(`[${result.split('\n').join(', ')}]`)
     }
 
-    return execAsyncSpawn(`docker container ls ${args}`, execOptions);
-};
+    return execAsyncSpawn(`docker container ls ${args}`, execOptions)
+}
 
 /**
- * @param {import('./container-api').ContainerLogsOptions} options
- * @param {import('../../../util/exec-async-command').ExecAsyncSpawnOptions<false>} execOptions
+ * @type {typeof import('./container-api')['logs']}
  */
-const logs = async (options = {}, execOptions = {}) => {
+const logs = async (options, execOptions = {}) => {
     const {
         name,
         details = false,
@@ -173,13 +192,13 @@ const logs = async (options = {}, execOptions = {}) => {
         timestamps = false,
         until = '',
         parser
-    } = options;
-    const detailsArg = details && '--details';
-    const followArg = follow && '--follow';
-    const sinceArg = since && `--since=${since}`;
-    const tailArg = tail && `--tail=${tail}`;
-    const timestampsArg = timestamps && '--timestamps';
-    const untilArg = until && `--until=${until}`;
+    } = options
+    const detailsArg = details && '--details'
+    const followArg = follow && '--follow'
+    const sinceArg = since && `--since=${since}`
+    const tailArg = tail && `--tail=${tail}`
+    const timestampsArg = timestamps && '--timestamps'
+    const untilArg = until && `--until=${until}`
 
     const logsCommand = [
         'docker',
@@ -192,20 +211,30 @@ const logs = async (options = {}, execOptions = {}) => {
         timestampsArg,
         untilArg,
         name
-    ].filter(Boolean).join(' ');
+    ]
+        .filter(Boolean)
+        .join(' ')
 
     if (parser) {
-        const result = await execAsyncSpawn(logsCommand, execOptions);
+        const result = await execAsyncSpawn(logsCommand, execOptions)
 
-        return result.split('\n').map((line) => parser(line));
+        return result.split('\n').map((line) => parser(line))
     }
 
-    return execAsyncSpawn(logsCommand, execOptions);
-};
+    return execAsyncSpawn(logsCommand, execOptions)
+}
 
-const stop = (containers, execOptions = {}) => execAsyncSpawn(`docker container stop ${containers.join(' ')}`, execOptions);
+/**
+ * @type {typeof import('./container-api')['stop']}
+ */
+const stop = (containers, execOptions = {}) =>
+    execAsyncSpawn(`docker container stop ${containers.join(' ')}`, execOptions)
 
-const rm = (containers, execOptions = {}) => execAsyncSpawn(`docker container rm ${containers.join(' ')}`, execOptions);
+/**
+ * @type {typeof import('./container-api')['rm']}
+ */
+const rm = (containers, execOptions = {}) =>
+    execAsyncSpawn(`docker container rm ${containers.join(' ')}`, execOptions)
 
 module.exports = {
     run,
@@ -215,4 +244,4 @@ module.exports = {
     logs,
     stop,
     rm
-};
+}

package/lib/tasks/docker/containers/index.js

@@ -5,8 +5,8 @@ const {
     statusContainers,
     checkContainersAreRunning,
     getContainerStatus
-} = require('./tasks');
-const containerApi = require('./container-api');
+} = require('./tasks')
+const containerApi = require('./container-api')
 
 module.exports = {
     startContainers,
@@ -16,4 +16,4 @@ module.exports = {
     checkContainersAreRunning,
     getContainerStatus,
     containerApi
-};
+}