oc 0.49.7 → 0.49.8

package/dist/cli/facade/publish.js

@@ -3,163 +3,143 @@ 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 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 publish = ({ logger, registry, local }) => (opts, callback) => {
+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 = (cb) => fs_extra_1.default.readJson(path_1.default.join(packageDir, 'package.json'), cb);
-    const getCredentials = (cb) => {
+    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);
-            return cb(null, lodash_1.default.pick(opts, 'username', 'password'));
+            const { username, password } = opts;
+            return { 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 username = await read({});
+        logger.warn(index_1.default.messages.cli.ENTER_PASSWORD);
+        const password = await read({ silent: true });
+        return { username, password };
     };
-    const packageAndCompress = (cb) => {
+    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)
         };
-        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 component = await local.package(packageOptions);
+        logger.warn(index_1.default.messages.cli.COMPRESSING(compressedPackagePath));
+        await compress();
+        return component;
     };
-    const putComponentToRegistry = (options, cb) => {
+    const putComponentToRegistry = async (options) => {
         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);
+        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;
                 }
-                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);
+                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 (lodash_1.default.isObject(err)) {
-                        try {
-                            err = JSON.stringify(err);
-                        }
-                        catch (er) { }
+                else if (err && typeof err === 'object') {
+                    try {
+                        // eslint-disable-next-line no-ex-assign
+                        err = JSON.stringify(err);
                     }
-                    errorMessage = index_1.default.errors.cli.PUBLISHING_FAIL(err);
-                    logger.err(errorMessage);
-                    return cb(errorMessage, undefined);
+                    catch (er) { }
                 }
+                errorMessage = index_1.default.errors.cli.PUBLISHING_FAIL(String(err));
+                logger.err(errorMessage);
+                throw errorMessage;
             }
-            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 publishToRegistries = async (registryLocations, component) => {
+        for (const registryUrl of registryLocations) {
             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);
+            await putComponentToRegistry({
+                route: componentRoute,
+                path: compressedPackagePath
             });
-        });
-    };
-    getRegistries((err, registryLocations) => {
-        if (err) {
-            logger.err(err);
-            return callback(err);
         }
+        await local.cleanup(compressedPackagePath);
+    };
+    try {
+        const registryLocations = opts.registries || (await registry.get());
         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);
-                });
+            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)) {
-                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);
-                    });
+                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);
-                return callback(errorMessage);
+                throw errorMessage;
             }
         }
-    });
-};
+    }
+    catch (err) {
+        logger.err(String(err));
+        throw err;
+    }
+});
 exports.default = publish;

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

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

package/dist/cli/facade/registry-add.js

@@ -3,15 +3,16 @@ 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 registryAdd = ({ registry, logger }) => (opts, callback) => {
-    registry.add(opts.registryUrl, err => {
-        if (err) {
-            logger.err(err);
-            return callback(err, undefined);
-        }
+const registryAdd = ({ registry, logger }) => (0, universalify_1.fromPromise)(async (opts) => {
+    try {
+        await registry.add(opts.registryUrl);
         logger.ok(index_1.default.messages.cli.REGISTRY_ADDED);
-        callback(null, 'ok');
-    });
-};
+    }
+    catch (err) {
+        logger.err(String(err));
+        throw err;
+    }
+});
 exports.default = registryAdd;

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

@@ -3,5 +3,8 @@ import { Logger } from '../logger';
 declare const registryLs: ({ registry, logger }: {
     logger: Logger;
     registry: RegistryCli;
-}) => (_opts: unknown, callback: (err: string | null, data: string[]) => void) => void;
+}) => {
+    (_opts: unknown): Promise<string[]>;
+    (arguments__0: unknown, arguments__1: (error: unknown, value: string[]) => void): void;
+};
 export default registryLs;

package/dist/cli/facade/registry-ls.js

@@ -3,23 +3,25 @@ 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 registryLs = ({ registry, logger }) => (_opts, callback) => {
-    registry.get((err, registries) => {
-        if (err) {
-            logger.err(index_1.default.errors.generic(err));
-            return callback(err, undefined);
+const registryLs = ({ registry, logger }) => 
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+(0, universalify_1.fromPromise)(async (_opts) => {
+    try {
+        const registries = await registry.get();
+        logger.warn(index_1.default.messages.cli.REGISTRY_LIST);
+        if (registries.length === 0) {
+            const err = index_1.default.errors.cli.REGISTRY_NOT_FOUND;
+            logger.err(err);
+            throw err;
         }
-        else {
-            logger.warn(index_1.default.messages.cli.REGISTRY_LIST);
-            if (registries.length === 0) {
-                err = index_1.default.errors.cli.REGISTRY_NOT_FOUND;
-                logger.err(err);
-                return callback(err, undefined);
-            }
-            registries.forEach(registryLocation => logger.ok(registryLocation));
-            callback(null, registries);
-        }
-    });
-};
+        registries.forEach(registryLocation => logger.ok(registryLocation));
+        return registries;
+    }
+    catch (err) {
+        logger.err(index_1.default.errors.generic(String(err)));
+        throw err;
+    }
+});
 exports.default = registryLs;

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

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

package/dist/cli/facade/registry-remove.js

@@ -3,15 +3,16 @@ 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 registryRemove = ({ registry, logger }) => (opts, callback) => {
-    registry.remove(opts.registryUrl, err => {
-        if (err) {
-            logger.err(String(err));
-            return callback(err, undefined);
-        }
+const registryRemove = ({ registry, logger }) => (0, universalify_1.fromPromise)(async (opts) => {
+    try {
+        await registry.remove(opts.registryUrl);
         logger.ok(index_1.default.messages.cli.REGISTRY_REMOVED);
-        callback(null, 'ok');
-    });
-};
+    }
+    catch (err) {
+        logger.err(String(err));
+        throw err;
+    }
+});
 exports.default = registryRemove;

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

@@ -1,2 +1,5 @@
-declare const registry: () => (_opts: unknown, callback: (err: Error | null, data: 'ok') => void) => void;
+declare const registry: () => {
+    (_opts: unknown): Promise<void>;
+    (arguments__0: unknown, arguments__1: (error: unknown, value: void) => void): void;
+};
 export default registry;

package/dist/cli/facade/registry.js

@@ -1,6 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const registry = () => (_opts, callback) => {
-    callback(null, 'ok');
-};
+const universalify_1 = require("universalify");
+const registry = () => 
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+(0, universalify_1.fromPromise)((_opts) => {
+    return Promise.resolve();
+});
 exports.default = registry;

package/dist/cli/index.js

@@ -68,11 +68,9 @@ function processCommand(command, commandName, cli, lvl, prefix = '') {
         }
         return yargs;
     }, options => {
-        // @ts-ignore Not callable
-        facade(options, (error) => {
-            if (error) {
-                return process.exit(1);
-            }
+        // @ts-ignore not callable
+        facade(options).catch(() => {
+            process.exit(1);
         });
     });
 }

package/dist/cli/programmatic-api.d.ts

@@ -18,7 +18,7 @@ declare const _default: {
         baseUrl: string;
         fallbackRegistryUrl: string;
         hotReloading?: boolean | undefined;
-        components: string[];
+        components?: string[] | undefined;
         watch?: boolean | undefined;
         verbose?: boolean | undefined;
         production?: boolean | undefined;

package/dist/components/oc-client/_package/package.json

@@ -1 +1 @@
-{"name":"oc-client","description":"The OpenComponents client-side javascript client","version":"0.49.7","repository":"https://github.com/opencomponents/oc/tree/master/components/oc-client","author":"Matteo Figus <matteofigus@gmail.com>","oc":{"container":false,"renderInfo":false,"minify":false,"parameters":{},"files":{"template":{"type":"oc-template-es6","hashKey":"4bdbbf7249b210dee9a729e8a611eac3dc5eae82","src":"template.js","version":"1.0.7"},"static":["src"],"dataProvider":{"type":"node.js","hashKey":"96eb8b28d43ce2093e13753e54d3f2f938dd0f7d","src":"server.js"}},"version":"0.49.7","packaged":true,"date":1639558995829},"devDependencies":{"oc-template-es6-compiler":"^1.0.1"}}
+{"name":"oc-client","description":"The OpenComponents client-side javascript client","version":"0.49.8","repository":"https://github.com/opencomponents/oc/tree/master/components/oc-client","author":"Matteo Figus <matteofigus@gmail.com>","oc":{"container":false,"renderInfo":false,"minify":false,"parameters":{},"files":{"template":{"type":"oc-template-es6","hashKey":"4bdbbf7249b210dee9a729e8a611eac3dc5eae82","src":"template.js","version":"1.0.7"},"static":["src"],"dataProvider":{"type":"node.js","hashKey":"96eb8b28d43ce2093e13753e54d3f2f938dd0f7d","src":"server.js"}},"version":"0.49.8","packaged":true,"date":1648119460751},"devDependencies":{"oc-template-es6-compiler":"^1.0.1"}}

package/dist/components/oc-client/package.json

@@ -1,7 +1,7 @@
 {
   "name": "oc-client",
   "description": "The OpenComponents client-side javascript client",
-  "version": "0.49.7",
+  "version": "0.49.8",
   "repository": "https://github.com/opencomponents/oc/tree/master/components/oc-client",
   "author": "Matteo Figus <matteofigus@gmail.com>",
   "oc": {

package/dist/registry/app-start.d.ts

@@ -1,2 +1,2 @@
-import { ComponentsDetails, Config, Repository } from '../types';
-export default function appStart(repository: Repository, options: Config, callback: (err: any | null, data: ComponentsDetails | string) => void): void;
+import { Config, Repository } from '../types';
+export default function appStart(repository: Repository, options: Config): Promise<void>;

package/dist/registry/app-start.js

@@ -5,40 +5,40 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const safe_1 = __importDefault(require("colors/safe"));
 const path_1 = __importDefault(require("path"));
-const lodash_1 = __importDefault(require("lodash"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const packageInfo = fs_extra_1.default.readJsonSync(path_1.default.join(__dirname, '..', 'components', 'oc-client', '_package', 'package.json'));
-function appStart(repository, options, callback) {
+async function appStart(repository, options) {
     if (options.local) {
-        return callback(null, 'ok');
+        return;
     }
-    const logger = options.verbosity ? console : { log: lodash_1.default.noop };
+    // eslint-disable-next-line @typescript-eslint/no-empty-function
+    const logger = options.verbosity ? console : { log: () => { } };
     logger.log(safe_1.default.yellow(`Connecting to library: ${options.storage.options['bucket']}/${options.storage.options.componentsDir}`));
-    repository.getComponentVersions('oc-client', (err, componentInfo) => {
-        if (err) {
-            return logger.log(safe_1.default.red(err));
-        }
+    try {
+        const componentInfo = await repository.getComponentVersions('oc-client');
         logger.log(safe_1.default.yellow(`Ensuring oc-client@${packageInfo.version} is available on library...`));
-        if (!lodash_1.default.includes(componentInfo, packageInfo.version)) {
+        if (!componentInfo.includes(packageInfo.version)) {
             logger.log(safe_1.default.yellow('Component not found. Publishing it...'));
             const pkgInfo = {
                 outputFolder: path_1.default.resolve(__dirname, '../components/oc-client/_package'),
                 packageJson: packageInfo
             };
-            repository.publishComponent(pkgInfo, 'oc-client', packageInfo.version, (err, res) => {
-                if (!err) {
-                    logger.log(safe_1.default.green('Component published.'));
-                }
-                else {
-                    logger.log(safe_1.default.red(`Component not published: ${err.message}`));
-                }
-                callback(err, res);
-            });
+            try {
+                await repository.publishComponent(pkgInfo, 'oc-client', packageInfo.version);
+                logger.log(safe_1.default.green('Component published.'));
+            }
+            catch (err) {
+                logger.log(safe_1.default.red(`Component not published: ${err.message}`));
+                throw err;
+            }
         }
         else {
             logger.log(safe_1.default.green('Component is available on library.'));
-            callback(null, 'ok');
         }
-    });
+    }
+    catch (err) {
+        logger.log(safe_1.default.red(String(err)));
+        throw err;
+    }
 }
 exports.default = appStart;

package/dist/registry/domain/components-cache/components-list.d.ts

@@ -1,7 +1,8 @@
-import { Cdn, ComponentsList, Config } from '../../../types';
-export default function componentsList(conf: Config, cdn: Cdn): {
-    getFromJson: (callback: (err: string | null, data: any) => void) => void;
-    getFromDirectories: (callback: (err: string | null, data: ComponentsList) => void) => void;
-    refresh(callback: (err: string | null, data: ComponentsList) => void): void;
-    save: (data: ComponentsList, callback: (err: string | null, data: unknown) => void) => void;
+import { ComponentsList, Config } from '../../../types';
+import { StorageAdapter } from 'oc-storage-adapters-utils';
+export default function componentsList(conf: Config, cdn: StorageAdapter): {
+    getFromJson: () => Promise<ComponentsList>;
+    getFromDirectories: () => Promise<ComponentsList>;
+    refresh(): Promise<ComponentsList>;
+    save: (data: ComponentsList) => Promise<unknown>;
 };