oc 0.49.3 → 0.49.7

package/src/registry/domain/extract-package.ts

@@ -10,10 +10,13 @@ export default function extractPackage(
     | {
         [fieldname: string]: Express.Multer.File[];
       },
-  callback: Callback<{
-    outputFolder: string;
-    packageJson: PackageJson;
-  }>
+  callback: (
+    err: Error | null,
+    data: {
+      outputFolder: string;
+      packageJson: PackageJson;
+    }
+  ) => void
 ): void {
   const packageFile: Express.Multer.File = (files as any)[0];
   const packagePath = path.resolve(packageFile.path);

package/src/registry/domain/get-package-json-from-temp-dir.ts

@@ -4,7 +4,7 @@ import { PackageJson } from 'type-fest';
 
 export default function getPackageJsonFromTempDir(
   tempDirPath: string,
-  callback: Callback<PackageJson>
+  callback: (err: Error | null, data: PackageJson) => void
 ): void {
   return fs.readJson(path.join(tempDirPath, 'package.json'), callback);
 }

package/src/registry/domain/nested-renderer.ts

@@ -5,12 +5,12 @@ import settings from '../../resources/settings';
 import strings from '../../resources';
 import { Config } from '../../types';
 
-type Cb = Callback<string, string>;
+type Cb = (err: string | null, data: string) => void;
 type Options = {
   version?: string;
   name?: string;
-  headers?: Dictionary<string>;
-  parameters?: Dictionary<string>;
+  headers?: Record<string, string>;
+  parameters?: Record<string, string>;
 };
 type Params = {
   components: Options[];

package/src/registry/domain/options-sanitiser.ts

@@ -13,7 +13,7 @@ export default function optionsSanitiser(input: Input): Config {
   const options = _.clone(input);
 
   if (!options.publishAuth) {
-    (options as Config).beforePublish = (req, res, next) => next();
+    (options as Config).beforePublish = (_req, _res, next) => next();
   } else {
     (options as Config).beforePublish = auth.middleware(options.publishAuth);
   }
@@ -37,28 +37,28 @@ export default function optionsSanitiser(input: Input): Config {
     options.tempDir = settings.registry.defaultTempPath;
   }
 
-  if (!_.isBoolean(options.hotReloading)) {
+  if (typeof options.hotReloading !== 'boolean') {
     options.hotReloading = !!options.local;
   }
 
-  if (_.isUndefined(options.verbosity)) {
+  if (!options.verbosity) {
     options.verbosity = 0;
   }
 
-  if (_.isUndefined(options.discovery)) {
+  if (typeof options.discovery === 'undefined') {
     options.discovery = true;
   }
 
-  if (_.isUndefined(options.pollingInterval)) {
+  if (typeof options.pollingInterval === 'undefined') {
     options.pollingInterval = 5;
   }
 
-  if (_.isUndefined(options.templates)) {
+  if (!options.templates) {
     options.templates = [];
   }
 
   if (
-    !_.isUndefined(options.fallbackRegistryUrl) &&
+    typeof options.fallbackRegistryUrl !== 'undefined' &&
     _.last(options.fallbackRegistryUrl) !== '/'
   ) {
     options.fallbackRegistryUrl += '/';
@@ -68,7 +68,7 @@ export default function optionsSanitiser(input: Input): Config {
     options.customHeadersToSkipOnWeakVersion || []
   ).map(s => s.toLowerCase());
 
-  options.port = Number(process.env.PORT || options.port);
+  options.port = options.port || process.env['PORT'] || 3000;
   options.timeout = options.timeout || 1000 * 60 * 2;
   options.keepAliveTimeout =
     options.keepAliveTimeout || DEFAULT_NODE_KEEPALIVE_MS;
@@ -85,22 +85,22 @@ export default function optionsSanitiser(input: Input): Config {
   }
 
   if (options.refreshInterval && options.storage) {
-    options.storage.options.refreshInterval = options.refreshInterval;
+    options.storage.options['refreshInterval'] = options.refreshInterval;
   }
 
   if (options.verbosity && options.storage) {
-    options.storage.options.verbosity = options.verbosity;
+    options.storage.options['verbosity'] = options.verbosity;
   }
 
   if (
     options.storage &&
     options.storage.options &&
-    options.storage.options.path
+    options.storage.options['path']
   ) {
-    options.storage.options.path =
-      options.storage.options.path.indexOf('http') === 0
-        ? options.storage.options.path
-        : `https:${options.storage.options.path}`;
+    options.storage.options['path'] =
+      options.storage.options['path'].indexOf('http') === 0
+        ? options.storage.options['path']
+        : `https:${options.storage.options['path']}`;
   }
 
   if (!options.env) {

package/src/registry/domain/plugins-initialiser.ts

@@ -12,9 +12,9 @@ function validatePlugins(plugins: unknown[]): asserts plugins is Plugin[] {
     c++;
     if (
       !_.isObject((plugin as Plugin).register) ||
-      !_.isFunction((plugin as Plugin).register.register) ||
-      !_.isFunction((plugin as Plugin).register.execute) ||
-      !_.isString((plugin as Plugin).name)
+      typeof (plugin as Plugin).register.register !== 'function' ||
+      typeof (plugin as Plugin).register.execute !== 'function' ||
+      typeof (plugin as Plugin).name !== 'string'
     ) {
       throw new Error(
         strings.errors.registry.PLUGIN_NOT_VALID(
@@ -55,9 +55,12 @@ const defer = function (plugin: Plugin, cb: (err?: Error) => void) {
 
 export function init(
   pluginsToRegister: unknown[],
-  callback: Callback<Dictionary<(...args: unknown[]) => void>, unknown>
+  callback: (
+    err: unknown,
+    data: Record<string, (...args: unknown[]) => void>
+  ) => void
 ): void {
-  const registered: Dictionary<(...args: unknown[]) => void> = {};
+  const registered: Record<string, (...args: unknown[]) => void> = {};
 
   try {
     validatePlugins(pluginsToRegister);

package/src/registry/domain/register-templates.ts

@@ -5,7 +5,7 @@ import { Template, TemplateInfo } from '../../types';
 import _ from 'lodash';
 
 export default function registerTemplates(extraTemplates: Template[]): {
-  templatesHash: Dictionary<Template>;
+  templatesHash: Record<string, Template>;
   templatesInfo: TemplateInfo[];
 } {
   const coreTemplates: Template[] = [
@@ -18,7 +18,7 @@ export default function registerTemplates(extraTemplates: Template[]): {
     const type = template.getInfo().type;
     hash[type] = template;
     return hash;
-  }, {} as Dictionary<Template>);
+  }, {} as Record<string, Template>);
 
   const templatesInfo = templates.map(template => {
     return template.getInfo();

package/src/registry/domain/repository.ts

@@ -58,23 +58,25 @@ export default function repository(conf: Config): Repository {
         .toString();
     },
     getComponents(): string[] {
-      const validComponents = fs.readdirSync(conf.path).filter(file => {
-        const isDir = fs.lstatSync(path.join(conf.path, file)).isDirectory();
-        const isValidComponent = isDir
-          ? fs
-              .readdirSync(path.join(conf.path, file))
-              .filter(file => file === '_package').length === 1
-          : false;
-
-        return isValidComponent;
-      });
+      const validComponents =
+        conf.components ||
+        fs.readdirSync(conf.path).filter(file => {
+          const isDir = fs.lstatSync(path.join(conf.path, file)).isDirectory();
+          const isValidComponent = isDir
+            ? fs
+                .readdirSync(path.join(conf.path, file))
+                .filter(file => file === '_package').length === 1
+            : false;
+
+          return isValidComponent;
+        });
 
       validComponents.push('oc-client');
       return validComponents;
     },
     getComponentVersions(
       componentName: string,
-      callback: Callback<string[], string>
+      callback: (err: string | null, data: string[]) => void
     ) {
       if (componentName === 'oc-client') {
         return callback(null, [
@@ -116,7 +118,7 @@ export default function repository(conf: Config): Repository {
     getCompiledView(
       componentName: string,
       componentVersion: string,
-      callback: Callback<string>
+      callback: (err: Error | null, data: string) => void
     ) {
       if (conf.local) {
         return callback(null, local.getCompiledView(componentName));
@@ -129,19 +131,19 @@ export default function repository(conf: Config): Repository {
     },
     getComponent(
       componentName: string,
-      componentVersionOrCallback: string | Callback<Component, string>,
-      callbackMaybe?: Callback<Component, string>
+      componentVersionOrCallback:
+        | string
+        | ((err: string | null, data: Component) => void),
+      callbackMaybe?: (err: string | null, data: Component) => void
     ) {
-      const componentVersion: string | undefined = _.isFunction(
-        componentVersionOrCallback
-      )
-        ? undefined
-        : (componentVersionOrCallback as any);
-      const callback: Callback<Component, string> = _.isFunction(
-        componentVersionOrCallback
-      )
-        ? (componentVersionOrCallback as any)
-        : callbackMaybe!;
+      const componentVersion: string | undefined =
+        typeof componentVersionOrCallback === 'function'
+          ? undefined
+          : (componentVersionOrCallback as any);
+      const callback: (err: string | null, data: Component) => void =
+        typeof componentVersionOrCallback === 'function'
+          ? (componentVersionOrCallback as any)
+          : callbackMaybe!;
 
       repository.getComponentVersions(componentName, (err, allVersions) => {
         if (err) {
@@ -184,7 +186,7 @@ export default function repository(conf: Config): Repository {
                 null as any
               );
             }
-            callback(null, _.extend(component, { allVersions }));
+            callback(null, Object.assign(component, { allVersions }));
           }
         );
       });
@@ -192,7 +194,7 @@ export default function repository(conf: Config): Repository {
     getComponentInfo(
       componentName: string,
       componentVersion: string,
-      callback: Callback<Component, string>
+      callback: (err: string | null, data: Component) => void
     ) {
       if (conf.local) {
         let componentInfo;
@@ -225,10 +227,10 @@ export default function repository(conf: Config): Repository {
     getComponentPath(componentName: string, componentVersion: string) {
       const prefix = conf.local
         ? conf.baseUrl
-        : `${options!.path}${options!.componentsDir}/`;
+        : `${options!['path']}${options!.componentsDir}/`;
       return `${prefix}${componentName}/${componentVersion}/`;
     },
-    getComponents(callback: Callback<string[]>) {
+    getComponents(callback: (err: Error | null, data: string[]) => void) {
       if (conf.local) {
         return callback(null, local.getComponents());
       }
@@ -237,7 +239,9 @@ export default function repository(conf: Config): Repository {
         callback(err, res ? Object.keys(res.components) : (null as any))
       );
     },
-    getComponentsDetails(callback: Callback<ComponentsDetails, string>) {
+    getComponentsDetails(
+      callback: (err: string | null, data: ComponentsDetails) => void
+    ) {
       if (conf.local) {
         return (callback as any)();
       }
@@ -246,7 +250,7 @@ export default function repository(conf: Config): Repository {
     },
     getComponentVersions(
       componentName: string,
-      callback: Callback<string[], string>
+      callback: (err: string | null, data: string[]) => void
     ) {
       if (conf.local) {
         return local.getComponentVersions(componentName, callback);
@@ -264,10 +268,13 @@ export default function repository(conf: Config): Repository {
     getDataProvider(
       componentName: string,
       componentVersion: string,
-      callback: Callback<{
-        content: string;
-        filePath: string;
-      }>
+      callback: (
+        err: Error | null,
+        data: {
+          content: string;
+          filePath: string;
+        }
+      ) => void
     ) {
       if (conf.local) {
         return callback(null, local.getDataProvider(componentName));
@@ -284,14 +291,14 @@ export default function repository(conf: Config): Repository {
       );
     },
     getStaticClientPath: () =>
-      `${options!.path}${getFilePath(
+      `${options!['path']}${getFilePath(
         'oc-client',
         packageInfo.version,
         'src/oc-client.min.js'
       )}`,
 
     getStaticClientMapPath: () =>
-      `${options!.path}${getFilePath(
+      `${options!['path']}${getFilePath(
         'oc-client',
         packageInfo.version,
         'src/oc-client.min.map'
@@ -309,7 +316,7 @@ export default function repository(conf: Config): Repository {
     getTemplatesInfo: () => templatesInfo,
     getTemplate: (type: string) => templatesHash[type],
 
-    init(callback: Callback<ComponentsList | string>) {
+    init(callback: (err: Error | null, data: ComponentsList | string) => void) {
       if (conf.local) {
         return callback(null, 'ok');
       }
@@ -327,7 +334,10 @@ export default function repository(conf: Config): Repository {
       pkgDetails: any,
       componentName: string,
       componentVersion: string,
-      callback: Callback<ComponentsDetails, { code: string; msg: string }>
+      callback: (
+        err: { code: string; msg: string } | null,
+        data: ComponentsDetails
+      ) => void
     ) {
       if (conf.local) {
         return callback(
@@ -362,7 +372,7 @@ export default function repository(conf: Config): Repository {
       }
 
       const validationResult = validator.validatePackageJson(
-        _.extend(pkgDetails, {
+        Object.assign(pkgDetails, {
           componentName,
           customValidator: conf.publishValidation
         })
@@ -382,7 +392,7 @@ export default function repository(conf: Config): Repository {
 
       repository.getComponentVersions(
         componentName,
-        (err, componentVersions) => {
+        (_err, componentVersions) => {
           if (
             !versionHandler.validateNewVersion(
               componentVersion,

package/src/registry/domain/sanitiser.ts

@@ -34,10 +34,10 @@ const sanitise = {
 const toRemove = ['__ocAcceptLanguage'];
 
 export function sanitiseComponentParameters(
-  requestParameters: Dictionary<string | number | boolean>,
-  expectedParameters: Dictionary<OcParameter>
-): Dictionary<string | number | boolean> {
-  const result: Dictionary<string | number | boolean> = {};
+  requestParameters: Record<string, string | number | boolean>,
+  expectedParameters: Record<string, OcParameter>
+): Record<string, string | number | boolean> {
+  const result: Record<string, string | number | boolean> = {};
 
   for (const [requestParameterName, requestParameter] of Object.entries(
     requestParameters

package/src/registry/domain/url-builder.ts

@@ -4,7 +4,7 @@ import url from 'url';
 type Component = {
   name: string;
   version?: string;
-  parameters?: Dictionary<string>;
+  parameters?: Record<string, string>;
 };
 
 function componentForType(
@@ -61,7 +61,7 @@ export function componentPreview(
 
   return href;
 }
-export function queryString(parameters: Dictionary<string> = {}): string {
+export function queryString(parameters: Record<string, string> = {}): string {
   let qs = '';
 
   if (Object.keys(parameters).length > 0) {

package/src/registry/domain/validators/component-parameters.ts

@@ -21,15 +21,15 @@ const validateParameter = function (
 interface ValidationResult {
   isValid: boolean;
   errors: {
-    mandatory?: Dictionary<string>;
-    types?: Dictionary<string>;
+    mandatory?: Record<string, string>;
+    types?: Record<string, string>;
     message?: string;
   };
 }
 
 export default function componentParameters(
-  requestParameters: Dictionary<string | number | boolean>,
-  expectedParameters: Dictionary<OcParameter> = {}
+  requestParameters: Record<string, string | number | boolean>,
+  expectedParameters: Record<string, OcParameter> = {}
 ): ValidationResult {
   const result: ValidationResult = { isValid: true, errors: {} };
   const mandatoryParameters: string[] = [];

package/src/registry/domain/validators/registry-configuration.ts

@@ -105,10 +105,10 @@ export default function registryConfiguration(
     const cdn = conf.storage.adapter(conf.storage.options);
     if (cdn.adapterType === 's3') {
       if (
-        !conf.storage.options.bucket ||
-        !conf.storage.options.region ||
-        (conf.storage.options.key && !conf.storage.options.secret) ||
-        (!conf.storage.options.key && conf.storage.options.secret)
+        !conf.storage.options['bucket'] ||
+        !conf.storage.options['region'] ||
+        (conf.storage.options['key'] && !conf.storage.options['secret']) ||
+        (!conf.storage.options['key'] && conf.storage.options['secret'])
       ) {
         return returnError(
           strings.errors.registry.CONFIGURATION_STORAGE_NOT_VALID(

package/src/registry/index.ts

@@ -5,7 +5,7 @@ import http from 'http';
 import _ from 'lodash';
 
 import appStart from './app-start';
-import * as eventsHandler from './domain/events-handler';
+import eventsHandler from './domain/events-handler';
 import * as middleware from './middleware';
 import * as pluginsInitialiser from './domain/plugins-initialiser';
 import Repository from './domain/repository';
@@ -46,7 +46,10 @@ export default function registry(inputOptions: Input) {
   };
 
   const start = (
-    callback: Callback<{ app: express.Express; server: http.Server }>
+    callback: (
+      err: Error | null,
+      data: { app: express.Express; server: http.Server }
+    ) => void
   ) => {
     // eslint-disable-next-line no-console
     const ok = (msg: string) => console.log(colors.green(msg));
@@ -56,12 +59,16 @@ export default function registry(inputOptions: Input) {
     router.create(app, options, repository);
     async.waterfall(
       [
-        (cb: Callback<Dictionary<(...args: unknown[]) => unknown>, unknown>) =>
-          pluginsInitialiser.init(plugins, cb),
+        (
+          cb: (
+            err: unknown,
+            data: Record<string, (...args: unknown[]) => unknown>
+          ) => void
+        ) => pluginsInitialiser.init(plugins, cb),
 
         (
-          plugins: Dictionary<(...args: unknown[]) => void>,
-          cb: Callback<ComponentsList | string>
+          plugins: Record<string, (...args: unknown[]) => void>,
+          cb: (err: Error | null, data: ComponentsList | string) => void
         ) => {
           options.plugins = plugins;
           repository.init(cb);
@@ -69,7 +76,7 @@ export default function registry(inputOptions: Input) {
 
         (
           componentsInfo: ComponentsList,
-          cb: Callback<ComponentsList, string>
+          cb: (err: string | null, data: ComponentsList) => void
         ) => {
           appStart(repository, options, (err: any) =>
             cb(err ? err.msg : null, componentsInfo)
@@ -117,9 +124,12 @@ export default function registry(inputOptions: Input) {
           callback(null, { app, server });
         });
 
-        server.on('error', message => {
-          eventsHandler.fire('error', { code: 'EXPRESS_ERROR', message });
-          callback(message, undefined as any);
+        server.on('error', error => {
+          eventsHandler.fire('error', {
+            code: 'EXPRESS_ERROR',
+            message: error?.message ?? String(error)
+          });
+          callback(error, undefined as any);
         });
       }
     );

package/src/registry/middleware/cors.ts

@@ -1,7 +1,7 @@
 import { NextFunction, Request, Response } from 'express';
 
 export default function cors(
-  req: Request,
+  _req: Request,
   res: Response,
   next: NextFunction
 ): void {

package/src/registry/middleware/file-uploads.ts

@@ -19,7 +19,7 @@ export default function fileUpload(
     },
     storage: multer.diskStorage({
       destination: res.conf.tempDir,
-      filename: (req, file, cb) =>
+      filename: (_req, file, cb) =>
         cb(null, `${normaliseFileName(file.originalname)}-${Date.now()}.tar.gz`)
     })
   });

package/src/registry/middleware/index.ts

@@ -20,7 +20,7 @@ export const bind = (app: Express, options: Config): Express => {
   app.set('port', options.port);
   app.set('json spaces', 0);
 
-  app.use((req, res, next) => {
+  app.use((_req, res, next) => {
     res.conf = options;
     next();
   });

package/src/registry/middleware/request-handler.ts

@@ -1,26 +1,11 @@
 import { Request, RequestHandler, Response } from 'express';
-import { IncomingHttpHeaders } from 'http';
 import responseTime from 'response-time';
 
-import * as eventsHandler from '../domain/events-handler';
-
-interface ResponseTimeData {
-  body: any;
-  duration: number;
-  headers: IncomingHttpHeaders;
-  method: string;
-  path: string;
-  relativeUrl: string;
-  query: Record<string, any>;
-  url: string;
-  statusCode: number;
-  errorDetails?: string;
-  errorCode?: string;
-}
+import eventsHandler, { RequestData } from '../domain/events-handler';
 
 export default function requestHandler(): RequestHandler {
   return responseTime((req: Request, res: Response, time) => {
-    const data: ResponseTimeData = {
+    const data: RequestData = {
       body: req.body,
       duration: parseInt(String(time * 1000)),
       headers: req.headers,
@@ -32,12 +17,12 @@ export default function requestHandler(): RequestHandler {
       statusCode: res.statusCode
     };
 
-    if ((res as any).errorDetails) {
-      data.errorDetails = (res as any).errorDetails;
+    if (res.errorDetails) {
+      data.errorDetails = res.errorDetails;
     }
 
-    if ((res as any).errorCode) {
-      data.errorCode = (res as any).errorCode;
+    if (res.errorCode) {
+      data.errorCode = res.errorCode;
     }
 
     eventsHandler.fire('request', data);

package/src/registry/router.ts

@@ -31,7 +31,7 @@ export function create(
   const prefix = conf.prefix;
 
   if (prefix !== '/') {
-    app.get('/', (req, res) => res.redirect(prefix));
+    app.get('/', (_req, res) => res.redirect(prefix));
     app.get(prefix.substr(0, prefix.length - 1), routes.index);
   }
 

package/src/registry/routes/component-info.ts

@@ -43,10 +43,11 @@ function componentInfo(
   req: Request,
   res: Response,
   component: Component
-) {
+): void {
   if (err) {
     res.errorDetails = (err as any).registryError || err;
-    return res.status(404).json(err);
+    res.status(404).json(err);
+    return;
   }
 
   const isHtmlRequest =
@@ -63,7 +64,7 @@ function componentInfo(
       typeof component.repository === 'string' ? component.repository : null
     );
 
-    isUrlDiscoverable(href, (err, result) => {
+    isUrlDiscoverable(href, (_err, result) => {
       if (!result.isDiscoverable) {
         href = `//${req.headers.host}${res.conf.prefix}`;
       }
@@ -83,7 +84,7 @@ function componentInfo(
   } else {
     res.status(200).json(
       Object.assign(component, {
-        requestVersion: req.params.componentVersion || ''
+        requestVersion: req.params['componentVersion'] || ''
       })
     );
   }
@@ -95,8 +96,8 @@ export default function componentInfoRoute(
 ) {
   return function (req: Request, res: Response): void {
     repository.getComponent(
-      req.params.componentName,
-      req.params.componentVersion,
+      req.params['componentName'],
+      req.params['componentVersion'],
       (registryError, component) => {
         if (registryError && conf.fallbackRegistryUrl) {
           return getComponentFallback.getComponentInfo(