oc 0.49.6 → 0.49.9

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

@@ -1,21 +1,114 @@
-import * as oc from '../../index';
-import watch from '../domain/watch';
-import { Logger } from '../logger';
-import { Local } from '../../types';
-declare type Registry = ReturnType<typeof oc.Registry>;
-declare const dev: ({ local, logger }: {
-    logger: Logger;
-    local: Local;
-}) => (opts: {
-    prefix: string;
-    dirPath: string;
-    port?: number;
-    baseUrl: string;
-    fallbackRegistryUrl: string;
-    hotReloading?: boolean;
-    components: string[];
-    watch?: boolean;
-    verbose?: boolean;
-    production?: boolean;
-}, callback: (err: Error | string | null, data: Registry) => void) => void;
-export default dev;
+/// <reference types="node" />
+/// <reference types="express" />
+/// <reference types="node/http" />
+/// <reference types="got/dist/source/core/utils/timed-out" />
+import { Logger } from '../logger';
+import { Local } from '../../types';
+declare const dev: ({ local, logger }: {
+    logger: Logger;
+    local: Local;
+}) => {
+    (opts: {
+        prefix: string;
+        dirPath: string;
+        port?: number | undefined;
+        baseUrl: string;
+        fallbackRegistryUrl: string;
+        hotReloading?: boolean | undefined;
+        components?: string[] | undefined;
+        watch?: boolean | undefined;
+        verbose?: boolean | undefined;
+        production?: boolean | undefined;
+    }): Promise<{
+        close: (callback: (err?: string | Error | undefined) => void) => void | import("http").Server;
+        on: <T extends keyof {
+            error: {
+                code: string;
+                message: string;
+            };
+            start: unknown;
+            'cache-poll': number;
+            request: import("../../registry/domain/events-handler").RequestData;
+            'component-retrieved': {
+                headers: import("http").IncomingHttpHeaders;
+                name: string;
+                parameters: import("http").IncomingHttpHeaders;
+                requestVersion: string;
+                duration: number;
+            };
+        }>(eventName: T, listener: (data: {
+            error: {
+                code: string;
+                message: string;
+            };
+            start: unknown;
+            'cache-poll': number;
+            request: import("../../registry/domain/events-handler").RequestData;
+            'component-retrieved': {
+                headers: import("http").IncomingHttpHeaders;
+                name: string;
+                parameters: import("http").IncomingHttpHeaders;
+                requestVersion: string;
+                duration: number;
+            };
+        }[T]) => void) => void;
+        register: (plugin: Omit<import("../../types").Plugin, "callback">, callback?: ((...args: any[]) => void) | undefined) => void;
+        start: (callback: (err: unknown, data: {
+            app: import("express").Express;
+            server: import("http").Server;
+        }) => void) => Promise<void>;
+        app: import("express").Express;
+    }>;
+    (arguments__0: {
+        prefix: string;
+        dirPath: string;
+        port?: number | undefined;
+        baseUrl: string;
+        fallbackRegistryUrl: string;
+        hotReloading?: boolean | undefined;
+        components?: string[] | undefined;
+        watch?: boolean | undefined;
+        verbose?: boolean | undefined;
+        production?: boolean | undefined;
+    }, arguments__1: (error: unknown, value: {
+        close: (callback: (err?: string | Error | undefined) => void) => void | import("http").Server;
+        on: <T extends keyof {
+            error: {
+                code: string;
+                message: string;
+            };
+            start: unknown;
+            'cache-poll': number;
+            request: import("../../registry/domain/events-handler").RequestData;
+            'component-retrieved': {
+                headers: import("http").IncomingHttpHeaders;
+                name: string;
+                parameters: import("http").IncomingHttpHeaders;
+                requestVersion: string;
+                duration: number;
+            };
+        }>(eventName: T, listener: (data: {
+            error: {
+                code: string;
+                message: string;
+            };
+            start: unknown;
+            'cache-poll': number;
+            request: import("../../registry/domain/events-handler").RequestData;
+            'component-retrieved': {
+                headers: import("http").IncomingHttpHeaders;
+                name: string;
+                parameters: import("http").IncomingHttpHeaders;
+                requestVersion: string;
+                duration: number;
+            };
+        }[T]) => void) => void;
+        register: (plugin: Omit<import("../../types").Plugin, "callback">, callback?: ((...args: any[]) => void) | undefined) => void;
+        start: (callback: (err: unknown, data: {
+            app: import("express").Express;
+            server: import("http").Server;
+        }) => void) => Promise<void>;
+        app: import("express").Express;
+    }) => void): void;
+};
+export default dev;

package/dist/cli/facade/dev.js

@@ -1,190 +1,176 @@
-"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 async_1 = __importDefault(require("async"));
-const safe_1 = __importDefault(require("colors/safe"));
-const getport_1 = __importDefault(require("getport"));
-const livereload_1 = __importDefault(require("livereload"));
-const path_1 = __importDefault(require("path"));
-const lodash_1 = __importDefault(require("lodash"));
-const get_mocked_plugins_1 = __importDefault(require("../domain/get-mocked-plugins"));
-const handle_dependencies_1 = __importDefault(require("../domain/handle-dependencies"));
-const oc = __importStar(require("../../index"));
-const index_1 = __importDefault(require("../../resources/index"));
-const watch_1 = __importDefault(require("../domain/watch"));
-const cliMessages = index_1.default.messages.cli;
-const cliErrors = index_1.default.errors.cli;
-const dev = ({ local, logger }) => (opts, callback) => {
-    const componentsDir = opts.dirPath;
-    const port = opts.port || 3000;
-    const baseUrl = opts.baseUrl || `http://localhost:${port}/`;
-    const fallbackRegistryUrl = opts.fallbackRegistryUrl;
-    const hotReloading = typeof opts.hotReloading === 'undefined' ? true : opts.hotReloading;
-    const optWatch = typeof opts.watch === 'undefined' ? true : opts.watch;
-    let packaging = false;
-    const watchForChanges = function ({ components, refreshLiveReload }, cb) {
-        (0, watch_1.default)(components, componentsDir, (err, changedFile, componentDir) => {
-            if (err) {
-                logger.err(index_1.default.errors.generic(String(err)));
-            }
-            else {
-                logger.warn(cliMessages.CHANGES_DETECTED(changedFile));
-                if (!hotReloading) {
-                    logger.warn(cliMessages.HOT_RELOADING_DISABLED);
-                }
-                else if (!componentDir) {
-                    cb(components, refreshLiveReload);
-                }
-                else {
-                    cb([componentDir], refreshLiveReload);
-                }
-            }
-        });
-    };
-    const packageComponents = (componentsDirs, optCb) => {
-        const cb = typeof optCb === 'function' ? optCb : lodash_1.default.noop;
-        let i = 0;
-        if (!packaging) {
-            packaging = true;
-            logger.warn(cliMessages.PACKAGING_COMPONENTS, false);
-            async_1.default.eachSeries(componentsDirs, (dir, cb) => {
-                logger.warn(cliMessages.PACKAGING(dir), false);
-                const packageOptions = {
-                    componentPath: dir,
-                    minify: false,
-                    verbose: opts.verbose,
-                    production: opts.production
-                };
-                local.package(packageOptions, err => {
-                    if (!err)
-                        i++;
-                    cb(err);
-                });
-            }, error => {
-                if (error) {
-                    const errorDescription = error instanceof SyntaxError || !!error.message
-                        ? error.message
-                        : error;
-                    logger.err(cliErrors.PACKAGING_FAIL(componentsDirs[i], String(errorDescription)));
-                    logger.warn(cliMessages.RETRYING_10_SECONDS);
-                    setTimeout(() => {
-                        packaging = false;
-                        packageComponents(componentsDirs);
-                    }, 10000);
-                }
-                else {
-                    packaging = false;
-                    logger.ok('OK');
-                    cb();
-                }
-            });
-        }
-    };
-    const registerPlugins = (registry) => {
-        const mockedPlugins = (0, get_mocked_plugins_1.default)(logger, componentsDir);
-        mockedPlugins.forEach(p => registry.register(p));
-        registry.on('request', data => {
-            if (data.errorCode === 'PLUGIN_MISSING_FROM_REGISTRY') {
-                logger.err(cliErrors.PLUGIN_MISSING_FROM_REGISTRY(data.errorDetails, safe_1.default.blue(index_1.default.commands.cli.MOCK_PLUGIN)));
-            }
-        });
-    };
-    logger.warn(cliMessages.SCANNING_COMPONENTS, true);
-    local.getComponentsByDir(componentsDir, opts.components, (err, components) => {
-        if (lodash_1.default.isEmpty(components)) {
-            err = cliErrors.DEV_FAIL(cliErrors.COMPONENTS_NOT_FOUND);
-            callback(err, undefined);
-            return logger.err(String(err));
-        }
-        logger.ok('OK');
-        lodash_1.default.forEach(components, component => logger.log(safe_1.default.green('├── ') + component));
-        (0, handle_dependencies_1.default)({ components, logger }, (err, dependencies) => {
-            if (err) {
-                logger.err(err);
-                return callback(err, undefined);
-            }
-            packageComponents(components, () => {
-                async_1.default.waterfall([
-                    (next) => {
-                        if (hotReloading) {
-                            (0, getport_1.default)(port + 1, (error, otherPort) => {
-                                if (error) {
-                                    return next(error);
-                                }
-                                const liveReloadServer = livereload_1.default.createServer({
-                                    port: otherPort
-                                });
-                                const refresher = () => liveReloadServer.refresh('/');
-                                next(null, { refresher, port: otherPort });
-                            });
-                        }
-                        else {
-                            next(null, { refresher: lodash_1.default.noop, port: null });
-                        }
-                    }
-                ], (err, liveReload) => {
-                    if (err) {
-                        logger.err(String(err));
-                        return callback(err, undefined);
-                    }
-                    const registry = oc.Registry({
-                        baseUrl,
-                        prefix: opts.prefix || '',
-                        dependencies: dependencies.modules,
-                        discovery: true,
-                        env: { name: 'local' },
-                        fallbackRegistryUrl,
-                        hotReloading,
-                        liveReloadPort: liveReload.port,
-                        local: true,
-                        components: opts.components,
-                        path: path_1.default.resolve(componentsDir),
-                        port,
-                        templates: dependencies.templates,
-                        verbosity: 1
-                    });
-                    registerPlugins(registry);
-                    logger.warn(cliMessages.REGISTRY_STARTING(baseUrl));
-                    if (liveReload.port) {
-                        logger.warn(cliMessages.REGISTRY_LIVERELOAD_STARTING(liveReload.port));
-                    }
-                    registry.start(err => {
-                        if (err) {
-                            if (err.code === 'EADDRINUSE') {
-                                err = cliErrors.PORT_IS_BUSY(port);
-                            }
-                            logger.err(String(err));
-                            return callback(err, undefined);
-                        }
-                        if (optWatch) {
-                            watchForChanges({ components, refreshLiveReload: liveReload.refresher }, packageComponents);
-                        }
-                        callback(null, registry);
-                    });
-                });
-            });
-        });
-    });
-};
-exports.default = dev;
+"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 safe_1 = __importDefault(require("colors/safe"));
+const getport_1 = __importDefault(require("getport"));
+const livereload_1 = __importDefault(require("livereload"));
+const path_1 = __importDefault(require("path"));
+const util_1 = require("util");
+const universalify_1 = require("universalify");
+const get_mocked_plugins_1 = __importDefault(require("../domain/get-mocked-plugins"));
+const handle_dependencies_1 = __importDefault(require("../domain/handle-dependencies"));
+const oc = __importStar(require("../../index"));
+const index_1 = __importDefault(require("../../resources/index"));
+const watch_1 = __importDefault(require("../domain/watch"));
+const cliMessages = index_1.default.messages.cli;
+const cliErrors = index_1.default.errors.cli;
+const delay = (time = 0) => new Promise(res => setTimeout(res, time));
+const getPort = (0, util_1.promisify)(getport_1.default);
+const dev = ({ local, logger }) => (0, universalify_1.fromPromise)(async (opts) => {
+    const componentsDir = opts.dirPath;
+    const port = opts.port || 3000;
+    const baseUrl = opts.baseUrl || `http://localhost:${port}/`;
+    const fallbackRegistryUrl = opts.fallbackRegistryUrl;
+    const hotReloading = typeof opts.hotReloading === 'undefined' ? true : opts.hotReloading;
+    const optWatch = typeof opts.watch === 'undefined' ? true : opts.watch;
+    let packaging = false;
+    const watchForChanges = function ({ components, refreshLiveReload }, cb) {
+        (0, watch_1.default)(components, componentsDir, (err, changedFile, componentDir) => {
+            if (err) {
+                logger.err(index_1.default.errors.generic(String(err)));
+            }
+            else {
+                logger.warn(cliMessages.CHANGES_DETECTED(changedFile));
+                if (!hotReloading) {
+                    logger.warn(cliMessages.HOT_RELOADING_DISABLED);
+                }
+                else if (!componentDir) {
+                    cb(components, refreshLiveReload);
+                }
+                else {
+                    cb([componentDir], refreshLiveReload);
+                }
+            }
+        });
+    };
+    const packageComponents = async (componentsDirs) => {
+        if (!packaging) {
+            packaging = true;
+            logger.warn(cliMessages.PACKAGING_COMPONENTS, false);
+            for (const dir of componentsDirs) {
+                logger.warn(cliMessages.PACKAGING(dir), false);
+                const packageOptions = {
+                    componentPath: dir,
+                    minify: false,
+                    verbose: opts.verbose,
+                    production: opts.production
+                };
+                try {
+                    await local.package(packageOptions);
+                    packaging = false;
+                    logger.ok('OK');
+                }
+                catch (error) {
+                    const errorDescription = error instanceof SyntaxError || !!error.message
+                        ? error.message
+                        : error;
+                    logger.err(cliErrors.PACKAGING_FAIL(dir, String(errorDescription)));
+                    logger.warn(cliMessages.RETRYING_10_SECONDS);
+                    await delay(10000);
+                    packaging = false;
+                    packageComponents(componentsDirs);
+                }
+            }
+        }
+    };
+    const registerPlugins = (registry) => {
+        const mockedPlugins = (0, get_mocked_plugins_1.default)(logger, componentsDir);
+        mockedPlugins.forEach(p => registry.register(p));
+        registry.on('request', data => {
+            if (data.errorCode === 'PLUGIN_MISSING_FROM_REGISTRY') {
+                logger.err(cliErrors.PLUGIN_MISSING_FROM_REGISTRY(String(data.errorDetails), safe_1.default.blue(index_1.default.commands.cli.MOCK_PLUGIN)));
+            }
+        });
+    };
+    logger.warn(cliMessages.SCANNING_COMPONENTS, true);
+    const components = await local.getComponentsByDir(componentsDir, opts.components);
+    if (!components.length) {
+        const err = cliErrors.DEV_FAIL(cliErrors.COMPONENTS_NOT_FOUND);
+        logger.err(err);
+        throw err;
+    }
+    logger.ok('OK');
+    components.forEach(component => logger.log(safe_1.default.green('├── ') + component));
+    const dependencies = await (0, handle_dependencies_1.default)({
+        components,
+        logger
+    }).catch(err => {
+        logger.err(err);
+        return Promise.reject(err);
+    });
+    await packageComponents(components);
+    let liveReload = {
+        // eslint-disable-next-line @typescript-eslint/no-empty-function
+        refresher: () => { },
+        port: undefined
+    };
+    if (hotReloading) {
+        const otherPort = await getPort(port + 1).catch(err => {
+            logger.err(String(err));
+            return Promise.reject(err);
+        });
+        const liveReloadServer = livereload_1.default.createServer({
+            port: otherPort
+        });
+        const refresher = () => liveReloadServer.refresh('/');
+        liveReload = { refresher, port: otherPort };
+    }
+    const registry = oc.Registry({
+        baseUrl,
+        prefix: opts.prefix || '',
+        dependencies: dependencies.modules,
+        discovery: true,
+        env: { name: 'local' },
+        fallbackRegistryUrl,
+        hotReloading,
+        liveReloadPort: liveReload.port,
+        local: true,
+        components: opts.components,
+        path: path_1.default.resolve(componentsDir),
+        port,
+        templates: dependencies.templates,
+        verbosity: 1
+    });
+    registerPlugins(registry);
+    logger.warn(cliMessages.REGISTRY_STARTING(baseUrl));
+    if (liveReload.port) {
+        logger.warn(cliMessages.REGISTRY_LIVERELOAD_STARTING(String(liveReload.port)));
+    }
+    try {
+        await (0, util_1.promisify)(registry.start)();
+        if (optWatch) {
+            watchForChanges({ components, refreshLiveReload: liveReload.refresher }, packageComponents);
+        }
+        return registry;
+    }
+    catch (err) {
+        if (err.code === 'EADDRINUSE') {
+            // eslint-disable-next-line no-ex-assign
+            err = cliErrors.PORT_IS_BUSY(port);
+        }
+        logger.err(String(err));
+        throw err;
+    }
+});
+exports.default = dev;

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

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

package/dist/cli/facade/init.js

@@ -1,37 +1,39 @@
-"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 index_1 = __importDefault(require("../../resources/index"));
-const init = ({ local, logger }) => (opts, callback) => {
-    const templateType = typeof opts.templateType === 'undefined'
-        ? 'oc-template-es6'
-        : opts.templateType;
-    const errors = index_1.default.errors.cli;
-    const messages = index_1.default.messages.cli;
-    const componentPath = path_1.default.join(process.cwd(), opts.componentPath);
-    const componentName = path_1.default.basename(componentPath);
-    local.init({
-        componentName,
-        componentPath,
-        templateType,
-        logger
-    }, err => {
-        if (err) {
-            if (err === 'name not valid') {
-                err = errors.NAME_NOT_VALID;
-            }
-            if (err === 'template type not valid') {
-                err = errors.TEMPLATE_TYPE_NOT_VALID(templateType);
-            }
-            logger.err(errors.INIT_FAIL(err));
-        }
-        else {
-            logger.log(messages.initSuccess(componentName, componentPath));
-        }
-        callback(err, componentName);
-    });
-};
-exports.default = init;
+"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 universalify_1 = require("universalify");
+const index_1 = __importDefault(require("../../resources/index"));
+const init = ({ local, logger }) => (0, universalify_1.fromPromise)(async (opts) => {
+    const templateType = typeof opts.templateType === 'undefined'
+        ? 'oc-template-es6'
+        : opts.templateType;
+    const errors = index_1.default.errors.cli;
+    const messages = index_1.default.messages.cli;
+    const componentPath = path_1.default.join(process.cwd(), opts.componentPath);
+    const componentName = path_1.default.basename(componentPath);
+    try {
+        await local.init({
+            componentName,
+            componentPath,
+            templateType,
+            logger
+        });
+        logger.log(messages.initSuccess(componentName, componentPath));
+        return componentName;
+    }
+    catch (err) {
+        let errMsg = String(err);
+        if (err === 'name not valid') {
+            errMsg = errors.NAME_NOT_VALID;
+        }
+        else if (err === 'template type not valid') {
+            errMsg = errors.TEMPLATE_TYPE_NOT_VALID(templateType);
+        }
+        logger.err(errors.INIT_FAIL(errMsg));
+        throw err;
+    }
+});
+exports.default = init;

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

@@ -1,11 +1,18 @@
-import { Local } from '../../types';
-import { Logger } from '../logger';
-declare const mock: ({ local, logger }: {
-    local: Local;
-    logger: Logger;
-}) => (opts: {
-    targetType: string;
-    targetValue: string;
-    targetName: string;
-}, callback: (err: unknown) => void) => void;
-export default mock;
+import { Local } from '../../types';
+import { Logger } from '../logger';
+declare const mock: ({ local, logger }: {
+    local: Local;
+    logger: Logger;
+}) => {
+    (opts: {
+        targetType: string;
+        targetValue: string;
+        targetName: string;
+    }): Promise<void>;
+    (arguments__0: {
+        targetType: string;
+        targetValue: string;
+        targetName: string;
+    }, arguments__1: (error: unknown, value: void) => void): void;
+};
+export default mock;