oc 0.49.6 → 0.49.9

package/dist/cli/facade/mock.js

@@ -1,13 +1,12 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const index_1 = __importDefault(require("../../resources/index"));
-const mock = ({ local, logger }) => (opts, callback) => {
-    local.mock(opts, err => {
-        logger.ok(index_1.default.messages.cli.MOCKED_PLUGIN(opts.targetName, opts.targetValue));
-        callback(err);
-    });
-};
-exports.default = mock;
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const universalify_1 = require("universalify");
+const index_1 = __importDefault(require("../../resources/index"));
+const mock = ({ local, logger }) => (0, universalify_1.fromPromise)(async (opts) => {
+    await local.mock(opts);
+    logger.ok(index_1.default.messages.cli.MOCKED_PLUGIN(opts.targetName, opts.targetValue));
+});
+exports.default = mock;

package/dist/cli/facade/package.d.ts

@@ -1,11 +1,18 @@
-import { Logger } from '../logger';
-import { Component, Local } from '../../types';
-declare const cliPackage: ({ local, logger }: {
-    local: Local;
-    logger: Logger;
-}) => (opts: {
-    componentPath: string;
-    useComponentDependencies?: boolean;
-    compress?: boolean;
-}, callback: (err: string | null, data: Component) => void) => void;
-export default cliPackage;
+import { Logger } from '../logger';
+import { Component, Local } from '../../types';
+declare const cliPackage: ({ local, logger }: {
+    local: Local;
+    logger: Logger;
+}) => {
+    (opts: {
+        componentPath: string;
+        useComponentDependencies?: boolean | undefined;
+        compress?: boolean | undefined;
+    }): Promise<Component>;
+    (arguments__0: {
+        componentPath: string;
+        useComponentDependencies?: boolean | undefined;
+        compress?: boolean | undefined;
+    }, arguments__1: (error: unknown, value: Component) => void): void;
+};
+export default cliPackage;

package/dist/cli/facade/package.js

@@ -1,51 +1,49 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const index_1 = __importDefault(require("../../resources/index"));
-const path_1 = __importDefault(require("path"));
-const handle_dependencies_1 = __importDefault(require("../domain/handle-dependencies"));
-const cliPackage = ({ local, logger }) => (opts, callback) => {
-    const componentPath = opts.componentPath;
-    const useComponentDependencies = opts.useComponentDependencies;
-    const packageDir = path_1.default.resolve(componentPath, '_package');
-    const compressedPackagePath = path_1.default.resolve(componentPath, 'package.tar.gz');
-    logger.warn(index_1.default.messages.cli.PACKAGING(packageDir));
-    (0, handle_dependencies_1.default)({
-        components: [path_1.default.resolve(componentPath)],
-        logger,
-        useComponentDependencies
-    }, err => {
-        if (err) {
-            logger.err(err);
-            return callback(err, undefined);
-        }
-        const packageOptions = {
-            production: true,
-            componentPath: path_1.default.resolve(componentPath)
-        };
-        local.package(packageOptions, (err, component) => {
-            if (err) {
-                logger.err(index_1.default.errors.cli.PACKAGE_CREATION_FAIL(String(err)));
-                return callback(err, undefined);
-            }
-            logger.ok(index_1.default.messages.cli.PACKAGED(packageDir));
-            if (opts.compress) {
-                logger.warn(index_1.default.messages.cli.COMPRESSING(compressedPackagePath));
-                local.compress(packageDir, compressedPackagePath, err => {
-                    if (err) {
-                        logger.err(index_1.default.errors.cli.PACKAGE_CREATION_FAIL(String(err)));
-                        return callback(err, undefined);
-                    }
-                    logger.ok(index_1.default.messages.cli.COMPRESSED(compressedPackagePath));
-                    callback(null, component);
-                });
-            }
-            else {
-                callback(null, component);
-            }
-        });
-    });
-};
-exports.default = cliPackage;
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const index_1 = __importDefault(require("../../resources/index"));
+const path_1 = __importDefault(require("path"));
+const universalify_1 = require("universalify");
+const handle_dependencies_1 = __importDefault(require("../domain/handle-dependencies"));
+const cliPackage = ({ local, logger }) => (0, universalify_1.fromPromise)(async (opts) => {
+    const componentPath = opts.componentPath;
+    const useComponentDependencies = opts.useComponentDependencies;
+    const packageDir = path_1.default.resolve(componentPath, '_package');
+    const compressedPackagePath = path_1.default.resolve(componentPath, 'package.tar.gz');
+    logger.warn(index_1.default.messages.cli.PACKAGING(packageDir));
+    try {
+        await (0, handle_dependencies_1.default)({
+            components: [path_1.default.resolve(componentPath)],
+            logger,
+            useComponentDependencies
+        });
+        const packageOptions = {
+            production: true,
+            componentPath: path_1.default.resolve(componentPath)
+        };
+        const component = await local.package(packageOptions).catch(err => {
+            logger.err(index_1.default.errors.cli.PACKAGE_CREATION_FAIL(String(err)));
+            return Promise.reject(err);
+        });
+        logger.ok(index_1.default.messages.cli.PACKAGED(packageDir));
+        if (opts.compress) {
+            logger.warn(index_1.default.messages.cli.COMPRESSING(compressedPackagePath));
+            await local.compress(packageDir, compressedPackagePath).catch(err => {
+                logger.err(index_1.default.errors.cli.PACKAGE_CREATION_FAIL(String(err)));
+                return Promise.reject(err);
+            });
+            logger.ok(index_1.default.messages.cli.COMPRESSED(compressedPackagePath));
+            return component;
+        }
+        else {
+            return component;
+        }
+    }
+    catch (err) {
+        logger.err(String(err));
+        throw err;
+    }
+});
+exports.default = cliPackage;

package/dist/cli/facade/preview.d.ts

@@ -1,9 +1,14 @@
-import { RegistryCli } from '../../types';
-import { Logger } from '../logger';
-declare const preview: ({ logger, registry }: {
-    logger: Logger;
-    registry: RegistryCli;
-}) => (opts: {
-    componentHref: string;
-}, callback: (err: string | null, data: string) => void) => void;
-export default preview;
+import { RegistryCli } from '../../types';
+import { Logger } from '../logger';
+declare const preview: ({ logger, registry }: {
+    logger: Logger;
+    registry: RegistryCli;
+}) => {
+    (opts: {
+        componentHref: string;
+    }): Promise<string>;
+    (arguments__0: {
+        componentHref: string;
+    }, arguments__1: (error: unknown, value: string) => void): void;
+};
+export default preview;

package/dist/cli/facade/preview.js

@@ -1,18 +1,20 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const open_1 = __importDefault(require("open"));
-const index_1 = __importDefault(require("../../resources/index"));
-const preview = ({ logger, registry }) => (opts, callback) => {
-    registry.getComponentPreviewUrlByUrl(opts.componentHref, (err, href) => {
-        if (err) {
-            logger.err(index_1.default.errors.cli.COMPONENT_HREF_NOT_FOUND);
-            return callback(index_1.default.errors.cli.COMPONENT_HREF_NOT_FOUND, undefined);
-        }
-        (0, open_1.default)(href);
-        callback(null, href);
-    });
-};
-exports.default = preview;
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const open_1 = __importDefault(require("open"));
+const universalify_1 = require("universalify");
+const index_1 = __importDefault(require("../../resources/index"));
+const preview = ({ logger, registry }) => (0, universalify_1.fromPromise)(async (opts) => {
+    try {
+        const href = await registry.getComponentPreviewUrlByUrl(opts.componentHref);
+        await (0, open_1.default)(href);
+        return href;
+    }
+    catch (err) {
+        logger.err(index_1.default.errors.cli.COMPONENT_HREF_NOT_FOUND);
+        throw index_1.default.errors.cli.COMPONENT_HREF_NOT_FOUND;
+    }
+});
+exports.default = preview;

package/dist/cli/facade/publish.d.ts

@@ -1,14 +1,23 @@
-import { Logger } from '../logger';
-import { RegistryCli, Local } from '../../types';
-declare const publish: ({ logger, registry, local }: {
-    logger: Logger;
-    registry: RegistryCli;
-    local: Local;
-}) => (opts: {
-    componentPath: string;
-    skipPackage?: boolean;
-    username?: string;
-    password?: string;
-    registries?: string[];
-}, callback: (err?: string | Error | undefined) => void) => void;
-export default publish;
+import { Logger } from '../logger';
+import { RegistryCli, Local } from '../../types';
+declare const publish: ({ logger, registry, local }: {
+    logger: Logger;
+    registry: RegistryCli;
+    local: Local;
+}) => {
+    (opts: {
+        componentPath: string;
+        skipPackage?: boolean | undefined;
+        username?: string | undefined;
+        password?: string | undefined;
+        registries?: string[] | undefined;
+    }): Promise<void>;
+    (arguments__0: {
+        componentPath: string;
+        skipPackage?: boolean | undefined;
+        username?: string | undefined;
+        password?: string | undefined;
+        registries?: string[] | undefined;
+    }, arguments__1: (error: unknown, value: void) => void): void;
+};
+export default publish;

package/dist/cli/facade/publish.js

@@ -1,165 +1,145 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const async_1 = __importDefault(require("async"));
-const safe_1 = __importDefault(require("colors/safe"));
-const path_1 = __importDefault(require("path"));
-const fs_extra_1 = __importDefault(require("fs-extra"));
-const read_1 = __importDefault(require("read"));
-const lodash_1 = __importDefault(require("lodash"));
-const handle_dependencies_1 = __importDefault(require("../domain/handle-dependencies"));
-const index_1 = __importDefault(require("../../resources/index"));
-const publish = ({ logger, registry, local }) => (opts, callback) => {
-    const componentPath = opts.componentPath;
-    const skipPackage = opts.skipPackage;
-    const packageDir = path_1.default.resolve(componentPath, '_package');
-    const compressedPackagePath = path_1.default.resolve(componentPath, 'package.tar.gz');
-    let errorMessage;
-    const readPackageJson = (cb) => fs_extra_1.default.readJson(path_1.default.join(packageDir, 'package.json'), cb);
-    const getCredentials = (cb) => {
-        if (opts.username && opts.password) {
-            logger.ok(index_1.default.messages.cli.USING_CREDS);
-            return cb(null, lodash_1.default.pick(opts, 'username', 'password'));
-        }
-        logger.warn(index_1.default.messages.cli.ENTER_USERNAME);
-        (0, read_1.default)({}, (_err, username) => {
-            logger.warn(index_1.default.messages.cli.ENTER_PASSWORD);
-            (0, read_1.default)({ silent: true }, (_err, password) => {
-                cb(null, { username, password });
-            });
-        });
-    };
-    const compress = (cb) => {
-        local.compress(packageDir, compressedPackagePath, cb);
-    };
-    const packageAndCompress = (cb) => {
-        logger.warn(index_1.default.messages.cli.PACKAGING(packageDir));
-        const packageOptions = {
-            production: true,
-            componentPath: path_1.default.resolve(componentPath)
-        };
-        local.package(packageOptions, (err, component) => {
-            if (err) {
-                return cb(err, undefined);
-            }
-            logger.warn(index_1.default.messages.cli.COMPRESSING(compressedPackagePath));
-            compress(err => {
-                if (err) {
-                    return cb(err, undefined);
-                }
-                cb(null, component);
-            });
-        });
-    };
-    const getRegistries = (cb) => {
-        if (opts.registries)
-            return cb(null, opts.registries);
-        registry.get(cb);
-    };
-    const putComponentToRegistry = (options, cb) => {
-        logger.warn(index_1.default.messages.cli.PUBLISHING(options.route));
-        registry.putComponent(options, err => {
-            if (err) {
-                if (err === 'Unauthorized') {
-                    if (!!options.username || !!options.password) {
-                        logger.err(index_1.default.errors.cli.PUBLISHING_FAIL(index_1.default.errors.cli.INVALID_CREDENTIALS));
-                        return cb(err, undefined);
-                    }
-                    logger.warn(index_1.default.messages.cli.REGISTRY_CREDENTIALS_REQUIRED);
-                    return getCredentials((_err, credentials) => {
-                        putComponentToRegistry(Object.assign(options, credentials), cb);
-                    });
-                }
-                else if (err.code === 'cli_version_not_valid') {
-                    const upgradeCommand = index_1.default.commands.cli.UPGRADE(err.details.suggestedVersion);
-                    const errorDetails = index_1.default.errors.cli.OC_CLI_VERSION_NEEDS_UPGRADE(safe_1.default.blue(upgradeCommand));
-                    errorMessage = index_1.default.errors.cli.PUBLISHING_FAIL(errorDetails);
-                    logger.err(errorMessage);
-                    return cb(errorMessage, undefined);
-                }
-                else if (err.code === 'node_version_not_valid') {
-                    const details = index_1.default.errors.cli.NODE_CLI_VERSION_NEEDS_UPGRADE(err.details.suggestedVersion);
-                    errorMessage = index_1.default.errors.cli.PUBLISHING_FAIL(details);
-                    logger.err(errorMessage);
-                    return cb(errorMessage, undefined);
-                }
-                else {
-                    if (lodash_1.default.isObject(err)) {
-                        try {
-                            err = JSON.stringify(err);
-                        }
-                        catch (er) { }
-                    }
-                    errorMessage = index_1.default.errors.cli.PUBLISHING_FAIL(err);
-                    logger.err(errorMessage);
-                    return cb(errorMessage, undefined);
-                }
-            }
-            else {
-                logger.ok(index_1.default.messages.cli.PUBLISHED(options.route));
-                return cb(null, 'ok');
-            }
-        });
-    };
-    const publishToRegistries = (registryLocations, component) => {
-        async_1.default.eachSeries(registryLocations, (registryUrl, next) => {
-            const registryNormalised = registryUrl.replace(/\/$/, '');
-            const componentRoute = `${registryNormalised}/${component.name}/${component.version}`;
-            putComponentToRegistry({ route: componentRoute, path: compressedPackagePath }, next);
-        }, err => {
-            local.cleanup(compressedPackagePath, err2 => {
-                if (err) {
-                    return callback(err);
-                }
-                callback(err2);
-            });
-        });
-    };
-    getRegistries((err, registryLocations) => {
-        if (err) {
-            logger.err(err);
-            return callback(err);
-        }
-        if (!skipPackage) {
-            (0, handle_dependencies_1.default)({ components: [path_1.default.resolve(componentPath)], logger }, err => {
-                if (err) {
-                    logger.err(err);
-                    return callback(err);
-                }
-                packageAndCompress((err, component) => {
-                    if (err) {
-                        errorMessage = index_1.default.errors.cli.PACKAGE_CREATION_FAIL(String(err));
-                        logger.err(errorMessage);
-                        return callback(errorMessage);
-                    }
-                    publishToRegistries(registryLocations, component);
-                });
-            });
-        }
-        else {
-            if (fs_extra_1.default.existsSync(packageDir)) {
-                readPackageJson((err, component) => {
-                    if (err) {
-                        logger.err(String(err));
-                        return callback(err);
-                    }
-                    compress(err => {
-                        if (err) {
-                            logger.err(String(err));
-                            return callback(err);
-                        }
-                        publishToRegistries(registryLocations, component);
-                    });
-                });
-            }
-            else {
-                errorMessage = index_1.default.errors.cli.PACKAGE_FOLDER_MISSING;
-                logger.err(errorMessage);
-                return callback(errorMessage);
-            }
-        }
-    });
-};
-exports.default = publish;
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const safe_1 = __importDefault(require("colors/safe"));
+const path_1 = __importDefault(require("path"));
+const fs_extra_1 = __importDefault(require("fs-extra"));
+const read_1 = __importDefault(require("read"));
+const util_1 = require("util");
+const universalify_1 = require("universalify");
+const handle_dependencies_1 = __importDefault(require("../domain/handle-dependencies"));
+const index_1 = __importDefault(require("../../resources/index"));
+const read = (0, util_1.promisify)(read_1.default);
+const publish = ({ logger, registry, local }) => (0, universalify_1.fromPromise)(async (opts) => {
+    const componentPath = opts.componentPath;
+    const skipPackage = opts.skipPackage;
+    const packageDir = path_1.default.resolve(componentPath, '_package');
+    const compressedPackagePath = path_1.default.resolve(componentPath, 'package.tar.gz');
+    let errorMessage;
+    const readPackageJson = () => fs_extra_1.default.readJson(path_1.default.join(packageDir, 'package.json'));
+    const getCredentials = async () => {
+        if (opts.username && opts.password) {
+            logger.ok(index_1.default.messages.cli.USING_CREDS);
+            const { username, password } = opts;
+            return { username, password };
+        }
+        logger.warn(index_1.default.messages.cli.ENTER_USERNAME);
+        const username = await read({});
+        logger.warn(index_1.default.messages.cli.ENTER_PASSWORD);
+        const password = await read({ silent: true });
+        return { username, password };
+    };
+    const compress = () => local.compress(packageDir, compressedPackagePath);
+    const packageAndCompress = async () => {
+        logger.warn(index_1.default.messages.cli.PACKAGING(packageDir));
+        const packageOptions = {
+            production: true,
+            componentPath: path_1.default.resolve(componentPath)
+        };
+        const component = await local.package(packageOptions);
+        logger.warn(index_1.default.messages.cli.COMPRESSING(compressedPackagePath));
+        await compress();
+        return component;
+    };
+    const putComponentToRegistry = async (options) => {
+        logger.warn(index_1.default.messages.cli.PUBLISHING(options.route));
+        try {
+            await registry.putComponent(options);
+            logger.ok(index_1.default.messages.cli.PUBLISHED(options.route));
+        }
+        catch (err) {
+            if (err === 'Unauthorized' || err.message === 'Unauthorized') {
+                if (!!options.username || !!options.password) {
+                    logger.err(index_1.default.errors.cli.PUBLISHING_FAIL(index_1.default.errors.cli.INVALID_CREDENTIALS));
+                    throw err;
+                }
+                logger.warn(index_1.default.messages.cli.REGISTRY_CREDENTIALS_REQUIRED);
+                const credentials = await getCredentials();
+                await putComponentToRegistry(Object.assign(options, credentials));
+            }
+            else if (err.code === 'cli_version_not_valid') {
+                const upgradeCommand = index_1.default.commands.cli.UPGRADE(err.details.suggestedVersion);
+                const errorDetails = index_1.default.errors.cli.OC_CLI_VERSION_NEEDS_UPGRADE(safe_1.default.blue(upgradeCommand));
+                errorMessage = index_1.default.errors.cli.PUBLISHING_FAIL(errorDetails);
+                logger.err(errorMessage);
+                throw errorMessage;
+            }
+            else if (err.code === 'node_version_not_valid') {
+                const details = index_1.default.errors.cli.NODE_CLI_VERSION_NEEDS_UPGRADE(err.details.suggestedVersion);
+                errorMessage = index_1.default.errors.cli.PUBLISHING_FAIL(details);
+                logger.err(errorMessage);
+                throw errorMessage;
+            }
+            else {
+                if (err.message) {
+                    // eslint-disable-next-line no-ex-assign
+                    err = err.message;
+                }
+                else if (err && typeof err === 'object') {
+                    try {
+                        // eslint-disable-next-line no-ex-assign
+                        err = JSON.stringify(err);
+                    }
+                    catch (er) { }
+                }
+                errorMessage = index_1.default.errors.cli.PUBLISHING_FAIL(String(err));
+                logger.err(errorMessage);
+                throw errorMessage;
+            }
+        }
+    };
+    const publishToRegistries = async (registryLocations, component) => {
+        for (const registryUrl of registryLocations) {
+            const registryNormalised = registryUrl.replace(/\/$/, '');
+            const componentRoute = `${registryNormalised}/${component.name}/${component.version}`;
+            await putComponentToRegistry({
+                route: componentRoute,
+                path: compressedPackagePath
+            });
+        }
+        await local.cleanup(compressedPackagePath);
+    };
+    try {
+        const registryLocations = opts.registries || (await registry.get());
+        if (!skipPackage) {
+            await (0, handle_dependencies_1.default)({
+                components: [path_1.default.resolve(componentPath)],
+                logger
+            }).catch(err => {
+                logger.err(err);
+                return Promise.reject(err);
+            });
+            const component = await packageAndCompress().catch(err => {
+                errorMessage = index_1.default.errors.cli.PACKAGE_CREATION_FAIL(String(err));
+                logger.err(errorMessage);
+                return Promise.reject(errorMessage);
+            });
+            await publishToRegistries(registryLocations, component);
+        }
+        else {
+            if (fs_extra_1.default.existsSync(packageDir)) {
+                const component = await readPackageJson().catch(err => {
+                    logger.err(String(err));
+                    return Promise.reject(err);
+                });
+                await compress().catch(err => {
+                    logger.err(String(err));
+                    return Promise.reject(err);
+                });
+                await publishToRegistries(registryLocations, component);
+            }
+            else {
+                errorMessage = index_1.default.errors.cli.PACKAGE_FOLDER_MISSING;
+                logger.err(errorMessage);
+                throw errorMessage;
+            }
+        }
+    }
+    catch (err) {
+        logger.err(String(err));
+        throw err;
+    }
+});
+exports.default = publish;

package/dist/cli/facade/registry-add.d.ts

@@ -1,9 +1,14 @@
-import { RegistryCli } from '../../types';
-import { Logger } from '../logger';
-declare const registryAdd: ({ registry, logger }: {
-    logger: Logger;
-    registry: RegistryCli;
-}) => (opts: {
-    registryUrl: string;
-}, callback: (err: string | null, data: string) => void) => void;
-export default registryAdd;
+import { RegistryCli } from '../../types';
+import { Logger } from '../logger';
+declare const registryAdd: ({ registry, logger }: {
+    logger: Logger;
+    registry: RegistryCli;
+}) => {
+    (opts: {
+        registryUrl: string;
+    }): Promise<void>;
+    (arguments__0: {
+        registryUrl: string;
+    }, arguments__1: (error: unknown, value: void) => void): void;
+};
+export default registryAdd;