Merge branch 'master' into reduce-null-assertions

Author: ricardo-devis-agullo

.eslintrc.json

@@ -59,6 +59,7 @@
     "no-useless-constructor": "error",
     "no-useless-return": "error",
     "no-warning-comments": "error",
+    "one-var": ["error", "never"],
     "prefer-promise-reject-errors": "error",
     "require-await": "error",
     "symbol-description": "error"

src/cli/domain/get-components-by-dir.ts

@@ -5,8 +5,8 @@ import { Component } from '../../types';
 export default function getComponentsByDir() {
   return (componentsDir: string, callback: Callback<string[]>): void => {
     const isOcComponent = function (file: string) {
-      const filePath = path.resolve(componentsDir, file),
-        packagePath = path.join(filePath, 'package.json');
+      const filePath = path.resolve(componentsDir, file);
+      const packagePath = path.join(filePath, 'package.json');
       let content: Component;
 
       try {

src/cli/domain/registry.ts

@@ -10,8 +10,8 @@ import * as urlParser from '../domain/url-parser';
 import { RegistryCli } from '../../types';
 
 const getOcVersion = (): string => {
-  const ocPackagePath = path.join(__dirname, '../../../package.json'),
-    ocInfo = fs.readJsonSync(ocPackagePath);
+  const ocPackagePath = path.join(__dirname, '../../../package.json');
+  const ocInfo = fs.readJsonSync(ocPackagePath);
 
   return ocInfo.version;
 };

src/cli/domain/url-parser.ts

@@ -20,17 +20,19 @@ export function parse(parsed: {
   requestVersion: string;
   href: string;
 }): UrlParsed {
-  const requestedVersion = parsed.requestVersion,
-    href = url.parse(parsed.href),
-    relativePath = removeFinalSlashes(href.pathname || ''),
-    withoutVersion = removeFinalSlashes(
-      relativePath.replace(requestedVersion, '')
-    ),
-    componentName = withoutVersion.substr(withoutVersion.lastIndexOf('/') + 1),
-    withoutComponent = removeFinalSlashes(
-      withoutVersion.replace(componentName, '')
-    ),
-    registryUrl = href.protocol + '//' + href.host + withoutComponent + '/';
+  const requestedVersion = parsed.requestVersion;
+  const href = url.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',

src/cli/facade/package.ts

@@ -14,10 +14,10 @@ const cliPackage =
     },
     callback: Callback<Component, string>
   ): void => {
-    const componentPath = opts.componentPath,
-      useComponentDependencies = opts.useComponentDependencies,
-      packageDir = path.resolve(componentPath, '_package'),
-      compressedPackagePath = path.resolve(componentPath, 'package.tar.gz');
+    const componentPath = opts.componentPath;
+    const useComponentDependencies = opts.useComponentDependencies;
+    const packageDir = path.resolve(componentPath, '_package');
+    const compressedPackagePath = path.resolve(componentPath, 'package.tar.gz');
 
     logger.warn(strings.messages.cli.PACKAGING(packageDir));
     handleDependencies(

src/cli/facade/publish.ts

@@ -29,10 +29,10 @@ const publish =
     },
     callback: (err?: Error | string) => void
   ): void => {
-    const componentPath = opts.componentPath,
-      skipPackage = opts.skipPackage,
-      packageDir = path.resolve(componentPath, '_package'),
-      compressedPackagePath = path.resolve(componentPath, 'package.tar.gz');
+    const componentPath = opts.componentPath;
+    const skipPackage = opts.skipPackage;
+    const packageDir = path.resolve(componentPath, '_package');
+    const compressedPackagePath = path.resolve(componentPath, 'package.tar.gz');
 
     let errorMessage;
 
@@ -115,9 +115,10 @@ const publish =
             });
           } else if ((err as any).code === 'cli_version_not_valid') {
             const upgradeCommand = strings.commands.cli.UPGRADE(
-                (err as any).details.suggestedVersion
-              ),
-              errorDetails = strings.errors.cli.OC_CLI_VERSION_NEEDS_UPGRADE(
+              (err as any).details.suggestedVersion
+            );
+            const errorDetails =
+              strings.errors.cli.OC_CLI_VERSION_NEEDS_UPGRADE(
                 colors.blue(upgradeCommand)
               );
 
@@ -156,8 +157,8 @@ const publish =
       async.eachSeries(
         registryLocations,
         (registryUrl, next) => {
-          const registryNormalised = registryUrl.replace(/\/$/, ''),
-            componentRoute = `${registryNormalised}/${component.name}/${component.version}`;
+          const registryNormalised = registryUrl.replace(/\/$/, '');
+          const componentRoute = `${registryNormalised}/${component.name}/${component.version}`;
           putComponentToRegistry(
             { route: componentRoute, path: compressedPackagePath },
             next as any

src/registry/routes/helpers/get-component.ts

@@ -52,18 +52,18 @@ export type GetComponentResult = {
 };
 
 export default function getComponent(conf: Config, repository: Repository) {
-  const client = Client({ templates: conf.templates }),
-    cache = new Cache({
-      verbose: !!conf.verbosity,
-      refreshInterval: conf.refreshInterval
-    });
+  const client = Client({ templates: conf.templates });
+  const cache = new Cache({
+    verbose: !!conf.verbosity,
+    refreshInterval: conf.refreshInterval
+  });
 
   const renderer = function (
     options: Options,
     cb: (result: GetComponentResult) => void
   ) {
-    const nestedRenderer = NestedRenderer(renderer, options.conf),
-      retrievingInfo = GetComponentRetrievingInfo(options);
+    const nestedRenderer = NestedRenderer(renderer, options.conf);
+    const retrievingInfo = GetComponentRetrievingInfo(options);
     let responseHeaders: Dictionary<string> = {};
 
     const getLanguage = () => {
@@ -155,18 +155,18 @@ export default function getComponent(conf: Config, repository: Repository) {
 
         // sanitise and check params
         const appliedParams = applyDefaultValues(
-            requestedComponent.parameters,
-            component.oc.parameters
-          ),
-          params = sanitiser.sanitiseComponentParameters(
-            appliedParams,
-            component.oc.parameters
-          ),
-          validationResult = validator.validateComponentParameters(
-            // @ts-ignore
-            params,
-            component.oc.parameters
-          );
+          requestedComponent.parameters,
+          component.oc.parameters
+        );
+        const params = sanitiser.sanitiseComponentParameters(
+          appliedParams,
+          component.oc.parameters
+        );
+        const validationResult = validator.validateComponentParameters(
+          // @ts-ignore
+          params,
+          component.oc.parameters
+        );
 
         if (!validationResult.isValid) {
           return callback({

src/registry/routes/static-redirector.ts

@@ -56,8 +56,8 @@ export default function staticRedirector(repository: Repository) {
       return;
     }
 
-    const fileStream = fs.createReadStream(filePath),
-      fileInfo = getFileInfo(filePath);
+    const fileStream = fs.createReadStream(filePath);
+    const fileInfo = getFileInfo(filePath);
 
     if (fileInfo.mimeType) {
       res.set('Content-Type', fileInfo.mimeType);