oc 0.49.6 → 0.49.9

package/dist/cli/domain/registry.js

@@ -1,149 +1,136 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const fs_extra_1 = __importDefault(require("fs-extra"));
-const path_1 = __importDefault(require("path"));
-const minimal_request_1 = __importDefault(require("minimal-request"));
-const lodash_1 = __importDefault(require("lodash"));
-const put_1 = __importDefault(require("../../utils/put"));
-const settings_1 = __importDefault(require("../../resources/settings"));
-const urlBuilder = __importStar(require("../../registry/domain/url-builder"));
-const urlParser = __importStar(require("../domain/url-parser"));
-const getOcVersion = () => {
-    const ocPackagePath = path_1.default.join(__dirname, '../../../package.json');
-    const ocInfo = fs_extra_1.default.readJsonSync(ocPackagePath);
-    return ocInfo.version;
-};
-function registry(opts = {}) {
-    let requestsHeaders = {
-        'user-agent': `oc-cli-${getOcVersion()}/${process.version}-${process.platform}-${process.arch}`
-    };
-    return {
-        add(registry, callback) {
-            if (registry.slice(registry.length - 1) !== '/') {
-                registry += '/';
-            }
-            (0, minimal_request_1.default)({
-                url: registry,
-                headers: requestsHeaders,
-                json: true
-            }, (err, apiResponse) => {
-                if (err || !apiResponse) {
-                    return callback('oc registry not available', null);
-                }
-                else if (apiResponse.type !== 'oc-registry') {
-                    return callback('not a valid oc registry', null);
-                }
-                fs_extra_1.default.readJson(settings_1.default.configFile.src, (err, res) => {
-                    if (err) {
-                        res = {};
-                    }
-                    if (!res.registries) {
-                        res.registries = [];
-                    }
-                    if (!lodash_1.default.includes(res.registries, registry)) {
-                        res.registries.push(registry);
-                    }
-                    fs_extra_1.default.writeJson(settings_1.default.configFile.src, res, callback);
-                });
-            });
-        },
-        get(callback) {
-            if (opts.registry) {
-                return callback(null, [opts.registry]);
-            }
-            fs_extra_1.default.readJson(settings_1.default.configFile.src, (err, res) => {
-                if (err || !res.registries || res.registries.length === 0) {
-                    return callback('No oc registries', undefined);
-                }
-                return callback(null, res.registries);
-            });
-        },
-        getApiComponentByHref(href, callback) {
-            (0, minimal_request_1.default)({
-                url: href + settings_1.default.registry.componentInfoPath,
-                headers: requestsHeaders,
-                json: true
-            }, callback);
-        },
-        getComponentPreviewUrlByUrl(componentHref, callback) {
-            (0, minimal_request_1.default)({
-                url: componentHref,
-                headers: requestsHeaders,
-                json: true
-            }, (err, res) => {
-                if (err) {
-                    return callback(err, undefined);
-                }
-                const parsed = urlParser.parse(res);
-                callback(null, urlBuilder.componentPreview(parsed, parsed.registryUrl));
-            });
-        },
-        putComponent(options, callback) {
-            if (!!options.username && !!options.password) {
-                requestsHeaders = Object.assign(requestsHeaders, {
-                    Authorization: 'Basic ' +
-                        Buffer.from(options.username + ':' + options.password).toString('base64')
-                });
-            }
-            (0, put_1.default)(options.route, options.path, requestsHeaders, (err, res) => {
-                if (err) {
-                    if (!lodash_1.default.isObject(err)) {
-                        try {
-                            err = JSON.parse(String(err));
-                        }
-                        catch (er) { }
-                    }
-                    const parsedError = err;
-                    if (!!parsedError.code && parsedError.code === 'ECONNREFUSED') {
-                        err = 'Connection to registry has not been established';
-                    }
-                    else if (parsedError.code !== 'cli_version_not_valid' &&
-                        parsedError.code !== 'node_version_not_valid' &&
-                        !!parsedError.error) {
-                        err = parsedError.error;
-                    }
-                    return callback(err, undefined);
-                }
-                callback(err, res);
-            });
-        },
-        remove(registry, callback) {
-            if (registry.slice(registry.length - 1) !== '/') {
-                registry += '/';
-            }
-            fs_extra_1.default.readJson(settings_1.default.configFile.src, (err, res) => {
-                if (err) {
-                    res = {};
-                }
-                if (!res.registries) {
-                    res.registries = [];
-                }
-                res.registries = lodash_1.default.without(res.registries, registry);
-                fs_extra_1.default.writeJson(settings_1.default.configFile.src, res, callback);
-            });
-        }
-    };
-}
-exports.default = registry;
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const fs_extra_1 = __importDefault(require("fs-extra"));
+const path_1 = __importDefault(require("path"));
+const got_1 = __importDefault(require("got"));
+const lodash_1 = __importDefault(require("lodash"));
+const put_1 = __importDefault(require("../../utils/put"));
+const settings_1 = __importDefault(require("../../resources/settings"));
+const urlBuilder = __importStar(require("../../registry/domain/url-builder"));
+const urlParser = __importStar(require("../domain/url-parser"));
+const getOcVersion = () => {
+    const ocPackagePath = path_1.default.join(__dirname, '../../../package.json');
+    const ocInfo = fs_extra_1.default.readJsonSync(ocPackagePath);
+    return ocInfo.version;
+};
+function registry(opts = {}) {
+    let requestsHeaders = {
+        'user-agent': `oc-cli-${getOcVersion()}/${process.version}-${process.platform}-${process.arch}`
+    };
+    return {
+        async add(registry) {
+            if (registry.slice(registry.length - 1) !== '/') {
+                registry += '/';
+            }
+            try {
+                const apiResponse = await (0, got_1.default)(registry, {
+                    headers: requestsHeaders
+                }).json();
+                if (!apiResponse)
+                    throw 'oc registry not available';
+                if (apiResponse.type !== 'oc-registry')
+                    throw 'not a valid oc registry';
+                const res = await fs_extra_1.default
+                    .readJson(settings_1.default.configFile.src)
+                    .catch(() => ({}));
+                if (!res.registries) {
+                    res.registries = [];
+                }
+                if (!lodash_1.default.includes(res.registries, registry)) {
+                    res.registries.push(registry);
+                }
+                return fs_extra_1.default.writeJson(settings_1.default.configFile.src, res);
+            }
+            catch (err) {
+                throw 'oc registry not available';
+            }
+        },
+        async get() {
+            if (opts.registry) {
+                return [opts.registry];
+            }
+            try {
+                const res = await fs_extra_1.default.readJson(settings_1.default.configFile.src);
+                if (!res.registries || res.registries.length === 0)
+                    throw 'No oc registries';
+                return res.registries;
+            }
+            catch (err) {
+                throw 'No oc registries';
+            }
+        },
+        getApiComponentByHref(href) {
+            return (0, got_1.default)(href + settings_1.default.registry.componentInfoPath, {
+                headers: requestsHeaders
+            }).json();
+        },
+        async getComponentPreviewUrlByUrl(componentHref) {
+            const res = await (0, got_1.default)(componentHref, { headers: requestsHeaders }).json();
+            const parsed = urlParser.parse(res);
+            return urlBuilder.componentPreview(parsed, parsed.registryUrl);
+        },
+        async putComponent(options) {
+            if (!!options.username && !!options.password) {
+                requestsHeaders = Object.assign(requestsHeaders, {
+                    Authorization: 'Basic ' +
+                        Buffer.from(options.username + ':' + options.password).toString('base64')
+                });
+            }
+            try {
+                await (0, put_1.default)(options.route, options.path, requestsHeaders);
+            }
+            catch (err) {
+                let parsedError = err;
+                let errMsg = '';
+                if (!lodash_1.default.isObject(err)) {
+                    try {
+                        parsedError = JSON.parse(String(err));
+                    }
+                    catch (er) { }
+                }
+                if (!!parsedError.code && parsedError.code === 'ECONNREFUSED') {
+                    errMsg = 'Connection to registry has not been established';
+                }
+                else if (parsedError.code !== 'cli_version_not_valid' &&
+                    parsedError.code !== 'node_version_not_valid' &&
+                    !!parsedError.error) {
+                    errMsg = parsedError.error;
+                }
+                throw errMsg;
+            }
+        },
+        async remove(registry) {
+            if (registry.slice(registry.length - 1) !== '/') {
+                registry += '/';
+            }
+            const res = await fs_extra_1.default
+                .readJson(settings_1.default.configFile.src)
+                .catch(() => ({ registries: [] }));
+            res.registries = lodash_1.default.without(res.registries, registry);
+            await fs_extra_1.default.writeJson(settings_1.default.configFile.src, res);
+        }
+    };
+}
+exports.default = registry;

package/dist/cli/domain/url-parser.d.ts

@@ -1,14 +1,14 @@
-/// <reference types="node" />
-import querystring from 'querystring';
-interface UrlParsed {
-    clientHref: string;
-    name: string;
-    parameters: querystring.ParsedUrlQuery;
-    registryUrl: string;
-    version: string;
-}
-export declare function parse(parsed: {
-    requestVersion: string;
-    href: string;
-}): UrlParsed;
-export {};
+/// <reference types="node" />
+import querystring from 'querystring';
+interface UrlParsed {
+    clientHref: string;
+    name: string;
+    parameters: querystring.ParsedUrlQuery;
+    registryUrl: string;
+    version: string;
+}
+export declare function parse(parsed: {
+    requestVersion: string;
+    href: string;
+}): UrlParsed;
+export {};

package/dist/cli/domain/url-parser.js

@@ -1,31 +1,31 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.parse = void 0;
-const querystring_1 = __importDefault(require("querystring"));
-const url_1 = __importDefault(require("url"));
-const removeFinalSlashes = function (s) {
-    while (s.slice(-1) === '/') {
-        s = s.slice(0, -1);
-    }
-    return s;
-};
-function parse(parsed) {
-    const requestedVersion = parsed.requestVersion;
-    const href = url_1.default.parse(parsed.href);
-    const relativePath = removeFinalSlashes(href.pathname || '');
-    const withoutVersion = removeFinalSlashes(relativePath.replace(requestedVersion, ''));
-    const componentName = withoutVersion.substr(withoutVersion.lastIndexOf('/') + 1);
-    const withoutComponent = removeFinalSlashes(withoutVersion.replace(componentName, ''));
-    const registryUrl = href.protocol + '//' + href.host + withoutComponent + '/';
-    return {
-        clientHref: registryUrl + 'oc-client/client.js',
-        name: componentName,
-        parameters: querystring_1.default.parse(href.query || ''),
-        registryUrl: registryUrl,
-        version: requestedVersion
-    };
-}
-exports.parse = parse;
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parse = void 0;
+const querystring_1 = __importDefault(require("querystring"));
+const url_1 = __importDefault(require("url"));
+const removeFinalSlashes = function (s) {
+    while (s.slice(-1) === '/') {
+        s = s.slice(0, -1);
+    }
+    return s;
+};
+function parse(parsed) {
+    const requestedVersion = parsed.requestVersion;
+    const href = url_1.default.parse(parsed.href);
+    const relativePath = removeFinalSlashes(href.pathname || '');
+    const withoutVersion = removeFinalSlashes(relativePath.replace(requestedVersion, ''));
+    const componentName = withoutVersion.substr(withoutVersion.lastIndexOf('/') + 1);
+    const withoutComponent = removeFinalSlashes(withoutVersion.replace(componentName, ''));
+    const registryUrl = href.protocol + '//' + href.host + withoutComponent + '/';
+    return {
+        clientHref: registryUrl + 'oc-client/client.js',
+        name: componentName,
+        parameters: querystring_1.default.parse(href.query || ''),
+        registryUrl: registryUrl,
+        version: requestedVersion
+    };
+}
+exports.parse = parse;

package/dist/cli/domain/watch.d.ts

@@ -1 +1 @@
-export default function watch(dirs: string[], baseDir: string, changed: (err: Error | null, fileName: string, componentDir?: string) => void): void;
+export default function watch(dirs: string[], baseDir: string, changed: (err: Error | null, fileName: string, componentDir?: string) => void): void;

package/dist/cli/domain/watch.js

@@ -1,29 +1,29 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const path_1 = __importDefault(require("path"));
-const chokidar_1 = __importDefault(require("chokidar"));
-const settings_1 = __importDefault(require("../../resources/settings"));
-function watch(dirs, baseDir, changed) {
-    const watcher = chokidar_1.default.watch(path_1.default.resolve(baseDir), {
-        ignored: settings_1.default.filesToIgnoreOnDevWatch,
-        persistent: true,
-        ignoreInitial: true,
-        usePolling: false
-    });
-    const onChange = (fileName) => {
-        const componentDir = dirs.find(dir => Boolean(fileName.match(escapeRegularExpression(dir + path_1.default.sep))));
-        changed(null, fileName, componentDir);
-    };
-    watcher
-        .on('add', onChange)
-        .on('change', onChange)
-        .on('unlink', onChange)
-        .on('error', changed);
-}
-exports.default = watch;
-function escapeRegularExpression(text) {
-    return text.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, '\\$&');
-}
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const path_1 = __importDefault(require("path"));
+const chokidar_1 = __importDefault(require("chokidar"));
+const settings_1 = __importDefault(require("../../resources/settings"));
+function watch(dirs, baseDir, changed) {
+    const watcher = chokidar_1.default.watch(path_1.default.resolve(baseDir), {
+        ignored: settings_1.default.filesToIgnoreOnDevWatch,
+        persistent: true,
+        ignoreInitial: true,
+        usePolling: true
+    });
+    const onChange = (fileName) => {
+        const componentDir = dirs.find(dir => Boolean(fileName.match(escapeRegularExpression(dir + path_1.default.sep))));
+        changed(null, fileName, componentDir);
+    };
+    watcher
+        .on('add', onChange)
+        .on('change', onChange)
+        .on('unlink', onChange)
+        .on('error', changed);
+}
+exports.default = watch;
+function escapeRegularExpression(text) {
+    return text.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, '\\$&');
+}

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

@@ -1,10 +1,16 @@
-import { Local } from '../../types';
-import { Logger } from '../logger';
-declare const clean: ({ local: { clean: { fetchList, remove } }, logger }: {
-    local: Local;
-    logger: Logger;
-}) => (opts: {
-    dirPath: string;
-    yes: boolean;
-}, callback: (err?: unknown) => void) => void;
-export default clean;
+import { Local } from '../../types';
+import { Logger } from '../logger';
+declare const clean: ({ local: { clean: { fetchList, remove } }, logger }: {
+    local: Local;
+    logger: Logger;
+}) => {
+    (opts: {
+        dirPath: string;
+        yes: boolean;
+    }): Promise<void>;
+    (arguments__0: {
+        dirPath: string;
+        yes: boolean;
+    }, arguments__1: (error: unknown, value: void) => void): void;
+};
+export default clean;

package/dist/cli/facade/clean.js

@@ -1,48 +1,58 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const read_1 = __importDefault(require("read"));
-const index_1 = __importDefault(require("../../resources/index"));
-const clean = ({ local: { clean: { fetchList, remove } }, logger }) => {
-    const { cleanAlreadyClean, cleanList, cleanPrompt, cleanPromptDefault, cleanSuccess } = index_1.default.messages.cli;
-    const prompt = (cb) => (0, read_1.default)({ prompt: cleanPrompt, default: cleanPromptDefault }, (err, result) => {
-        if (err)
-            return cb(false);
-        const lowered = result.toLowerCase().trim();
-        const proceed = lowered === 'y' || lowered === 'yes';
-        cb(proceed);
-    });
-    const removeFolders = (list, cb) => remove(list, err => {
-        if (err) {
-            logger.err(index_1.default.errors.cli.cleanRemoveError(String(err)));
-            return cb(err);
-        }
-        logger.ok(cleanSuccess);
-        cb();
-    });
-    return (opts, callback) => {
-        fetchList(opts.dirPath, (err, list) => {
-            if (err) {
-                logger.err(index_1.default.errors.generic(String(err)));
-                return callback(err);
-            }
-            if (list.length === 0) {
-                logger.ok(cleanAlreadyClean);
-                return callback();
-            }
-            logger.warn(cleanList(list));
-            const shouldConfirm = !opts.yes;
-            if (shouldConfirm) {
-                return prompt(confirmed => {
-                    if (!confirmed)
-                        return callback();
-                    return removeFolders(list, callback);
-                });
-            }
-            removeFolders(list, callback);
-        });
-    };
-};
-exports.default = clean;
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const read_1 = __importDefault(require("read"));
+const universalify_1 = require("universalify");
+const util_1 = require("util");
+const index_1 = __importDefault(require("../../resources/index"));
+const read = (0, util_1.promisify)(read_1.default);
+const clean = ({ local: { clean: { fetchList, remove } }, logger }) => {
+    const { cleanAlreadyClean, cleanList, cleanPrompt, cleanPromptDefault, cleanSuccess } = index_1.default.messages.cli;
+    const prompt = async () => {
+        try {
+            const result = await read({
+                prompt: cleanPrompt,
+                default: cleanPromptDefault
+            });
+            const lowered = result.toLowerCase().trim();
+            return lowered === 'y' || lowered === 'yes';
+        }
+        catch (err) {
+            return false;
+        }
+    };
+    const removeFolders = async (list) => {
+        try {
+            await remove(list);
+            logger.ok(cleanSuccess);
+        }
+        catch (err) {
+            logger.err(index_1.default.errors.cli.cleanRemoveError(String(err)));
+            throw err;
+        }
+    };
+    return (0, universalify_1.fromPromise)(async (opts) => {
+        try {
+            const list = await fetchList(opts.dirPath);
+            if (list.length === 0) {
+                logger.ok(cleanAlreadyClean);
+                return;
+            }
+            logger.warn(cleanList(list));
+            const shouldConfirm = !opts.yes;
+            if (shouldConfirm) {
+                const confirmed = await prompt();
+                if (!confirmed)
+                    return;
+            }
+            await removeFolders(list);
+        }
+        catch (err) {
+            logger.err(index_1.default.errors.generic(String(err)));
+            throw err;
+        }
+    });
+};
+exports.default = clean;