Merge pull request #1252 from opencomponents/reduce-null-assertions

[INTERNAL] reduce usage of null assertions

Author: ricardo-devis-agullo

src/cli/domain/package-components.ts

@@ -60,7 +60,7 @@ const packageComponents =
         compiler: true,
         componentPath
       });
-      ocTemplate.compile!(compileOptions, callback);
+      ocTemplate.compile(compileOptions, callback);
     } catch (err) {
       return callback(err as any, undefined as any);
     }

src/cli/index.ts

@@ -80,7 +80,10 @@ function processCommand(
       }
 
       if (command.example) {
-        yargs.example(command.example.cmd, command.example.description!);
+        yargs.example(
+          command.example.cmd,
+          command.example.description || command.description
+        );
       }
 
       return yargs;

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

@@ -1,6 +1,11 @@
 type ValidationResponse =
   | {
       isValid: true;
+      files:
+        | Express.Multer.File[]
+        | {
+            [fieldname: string]: Express.Multer.File[];
+          };
     }
   | {
       isValid: false;
@@ -40,5 +45,5 @@ export default function uploadedPackage(
     return returnError('not_valid');
   }
 
-  return { isValid: true };
+  return { isValid: true, files: input };
 }

src/registry/routes/helpers/apply-default-values.ts

@@ -1,18 +1,26 @@
 import { OcParameter } from '../../../types';
 
+interface OptionalParameterWithDefault extends OcParameter {
+  mandatory: false;
+  default: Exclude<OcParameter['default'], undefined>;
+}
+
 export default function applyDefaultValues(
   requestParameters: Dictionary<string | number | boolean> = {},
   expectedParameters: Dictionary<OcParameter> = {}
 ): Dictionary<string | number | boolean> {
   const optionalParametersWithDefaults = Object.entries(
     expectedParameters
-  ).filter(([, p]) => !p.mandatory && typeof p.default !== 'undefined');
+  ).filter(
+    (params): params is [string, OptionalParameterWithDefault] =>
+      !params[1].mandatory && typeof params[1].default !== 'undefined'
+  );
 
   optionalParametersWithDefaults.forEach(
     ([expectedParameterName, expectedParameter]) => {
       const param = requestParameters[expectedParameterName];
       if (param === null || param === undefined) {
-        requestParameters[expectedParameterName] = expectedParameter.default!;
+        requestParameters[expectedParameterName] = expectedParameter.default;
       }
     }
   );

src/registry/routes/publish.ts

@@ -12,11 +12,13 @@ export default function publish(repository: Repository) {
       return;
     }
 
-    if (!validator.validatePackage(req.files).isValid) {
+    const packageValidation = validator.validatePackage(req.files);
+    if (!packageValidation.isValid) {
       res.errorDetails = 'package is not valid';
       res.status(409).json({ error: res.errorDetails });
       return;
     }
+    const files = packageValidation.files;
 
     const ocCliValidationResult = validator.validateOcCliVersion(
       req.headers['user-agent']
@@ -51,7 +53,7 @@ export default function publish(repository: Repository) {
       return;
     }
 
-    extractPackage(req.files!, (err, pkgDetails) => {
+    extractPackage(files, (err, pkgDetails) => {
       if (err) {
         res.errorDetails = `Package is not valid: ${err}`;
         return res