@cloud-cli/dx 1.8.2 → 1.8.3

package/dist/containers.d.ts

@@ -1,16 +1,18 @@
 import { ServerParams } from '@cloud-cli/cli';
 export declare function getRunningContainers(): Promise<string[]>;
 interface GetLogsOptions {
+    _?: string[];
     name: string;
     lines?: string;
 }
 interface ContainerName {
+    _?: string[];
     name: string;
 }
-export declare function getLogs({ name, lines }: GetLogsOptions): Promise<string>;
+export declare function getLogs(options: GetLogsOptions): Promise<string>;
 export declare function startAll(_: any, cli: any): Promise<boolean>;
 export declare function refreshContainer(options: ContainerName, { run }: ServerParams): Promise<void>;
-export declare function restartContainer(options: ContainerName, { run }: ServerParams): Promise<string>;
+export declare function restartContainer(options: ContainerName, { run }: ServerParams): Promise<boolean>;
 export declare function startContainer(options: ContainerName, { run }: ServerParams): Promise<boolean>;
 export declare function stopContainer(options: ContainerName, { run }: ServerParams): Promise<boolean>;
 export {};

package/dist/containers.js

@@ -1,7 +1,7 @@
 import { exec } from '@cloud-cli/exec';
 import { findContainer, listContainers } from './store.js';
 import { getConfig } from './config.js';
-import { addExecFlag, getEnvVars, getListFromString, getPorts } from './utils.js';
+import { addExecFlag, getEnvVars, getListFromString, getPorts, readTargetName, } from './utils.js';
 export async function getRunningContainers() {
     const ps = await exec('docker', ['ps', '--format', '{{.Names}}']);
     if (!ps.ok) {
@@ -9,7 +9,9 @@ export async function getRunningContainers() {
     }
     return getListFromString(ps.stdout).sort();
 }
-export async function getLogs({ name, lines }) {
+export async function getLogs(options) {
+    readTargetName(options);
+    const { name, lines } = options;
     if (!name) {
         throw new Error('Name not specified');
     }
@@ -18,10 +20,7 @@ export async function getLogs({ name, lines }) {
         args.push('-n', String(Number(lines)));
     }
     const sh = await exec('docker', args);
-    if (sh.ok) {
-        return [sh.stdout, sh.stderr].join('\n');
-    }
-    return '';
+    return [sh.stdout, sh.stderr].join('\n\n').trim();
 }
 export async function startAll(_, cli) {
     const list = await listContainers({});
@@ -36,6 +35,7 @@ export async function startAll(_, cli) {
     return true;
 }
 export async function refreshContainer(options, { run }) {
+    readTargetName(options);
     if (!options.name) {
         throw new Error('Name is required');
     }
@@ -47,12 +47,14 @@ export async function refreshContainer(options, { run }) {
     await run('dx.start', { name });
 }
 export async function restartContainer(options, { run }) {
+    readTargetName(options);
     const { name } = options;
     await run('dx.stop', { name });
     await run('dx.start', { name });
-    return name;
+    return true;
 }
 export async function startContainer(options, { run }) {
+    readTargetName(options);
     const { name } = options;
     if (!name) {
         throw new Error('Name is required');
@@ -87,11 +89,13 @@ export async function startContainer(options, { run }) {
     ];
     const output = await exec('docker', execArgs.filter(Boolean), { env });
     if (!output.ok) {
+        console.log([output.stdout, output.stderr].join('\n\n'));
         throw new Error('Failed to start ' + name);
     }
     return true;
 }
 export async function stopContainer(options, { run }) {
+    readTargetName(options);
     let { name } = options;
     if (!name) {
         throw new Error('Name is required');
@@ -101,7 +105,6 @@ export async function stopContainer(options, { run }) {
     const containers = [await findContainer(name)].filter(Boolean);
     for (const container of containers) {
         await run('dns.remove', { domain: container.host });
-        await run('dns.reload', {});
     }
     return true;
 }

package/dist/images.js

@@ -1,5 +1,7 @@
 import { exec } from '@cloud-cli/exec';
+import { readTargetImage } from './utils';
 export async function pull(options) {
+    readTargetImage(options);
     if (!options.image) {
         throw new Error('Image is required');
     }

package/dist/store.d.ts

@@ -8,6 +8,7 @@ export declare class Container extends Resource {
     volumes: string;
 }
 interface ContainerName {
+    _?: string[];
     name: string;
 }
 interface AddContainerOptions extends ContainerName {

package/dist/store.js

@@ -5,6 +5,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 import { Model, Resource, Primary, NotNull, Property, Query } from '@cloud-cli/store';
+import { readTargetImage, readTargetName } from './utils';
 let Container = class Container extends Resource {
 };
 __decorate([
@@ -37,6 +38,8 @@ Container = __decorate([
 ], Container);
 export { Container };
 export async function addContainer(options) {
+    readTargetName(options);
+    readTargetImage(options);
     const { name, image } = options;
     if (!name)
         throw new Error('Name required');
@@ -51,6 +54,7 @@ export async function addContainer(options) {
     return container;
 }
 export async function removeContainer(options) {
+    readTargetName(options);
     const found = await findContainer(options.name);
     if (found) {
         await found.remove();
@@ -59,10 +63,12 @@ export async function removeContainer(options) {
     throw new Error('Container not found: ' + options.name);
 }
 export async function getContainer(options) {
+    readTargetName(options);
     return await findContainer(options.name);
 }
 const optionSplitter = /,\s*/;
 export async function updateContainer(options) {
+    readTargetName(options);
     let { ports, volumes, name, image, host } = options;
     const container = await findContainer(name);
     if (!container) {

package/dist/utils.d.ts

@@ -11,3 +11,5 @@ export declare function getEnvVars(vars: EnvList): Promise<{
 }>;
 export declare function getListFromString(string: string): string[];
 export declare function addExecFlag(string: string, flag: string): string[];
+export declare function readTargetName(args: any): void;
+export declare function readTargetImage(args: any): void;

package/dist/utils.js

@@ -26,3 +26,14 @@ export function addExecFlag(string, flag) {
         .filter(Boolean)
         .map((p) => `-${flag}${p}`);
 }
+export function readTargetName(args) {
+    readPositionalArgs(args, 'name');
+}
+export function readTargetImage(args) {
+    readPositionalArgs(args, 'image');
+}
+function readPositionalArgs(args, name) {
+    if (!args[name]) {
+        args[name] = (args._ || []).shift();
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloud-cli/dx",
-  "version": "1.8.2",
+  "version": "1.8.3",
   "description": "Docker container management",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",