Merge pull request #1255 from opencomponents/noPropertyAccessFromIndexSignature

ricardo-devis-agullo · web-flow · commit 2b9ba3fc3899 · 2021-10-22T17:25:08.000+02:00
[INTERNAL] enable noPropertyAccessFromIndexSignature option and fix problems
diff --git a/src/registry/app-start.ts b/src/registry/app-start.ts
@@ -28,7 +28,7 @@ export default function appStart(
 
   logger.log(
     colors.yellow(
-      `Connecting to library: ${options.storage.options.bucket}/${options.storage.options.componentsDir}`
+      `Connecting to library: ${options.storage.options['bucket']}/${options.storage.options.componentsDir}`
     )
   );
 
diff --git a/src/registry/domain/options-sanitiser.ts b/src/registry/domain/options-sanitiser.ts
@@ -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 = Number(process.env['PORT'] || options.port);
   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) {
diff --git a/src/registry/domain/repository.ts b/src/registry/domain/repository.ts
@@ -225,7 +225,7 @@ 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[]>) {
@@ -284,14 +284,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'
diff --git a/src/registry/domain/validators/registry-configuration.ts b/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(
diff --git a/src/registry/routes/component-info.ts b/src/registry/routes/component-info.ts
@@ -83,7 +83,7 @@ function componentInfo(
   } else {
     res.status(200).json(
       Object.assign(component, {
-        requestVersion: req.params.componentVersion || ''
+        requestVersion: req.params['componentVersion'] || ''
       })
     );
   }
@@ -95,8 +95,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(
diff --git a/src/registry/routes/component-preview.ts b/src/registry/routes/component-preview.ts
@@ -38,7 +38,7 @@ function componentPreview(
   } else {
     res.status(200).json(
       Object.assign(component, {
-        requestVersion: req.params.componentVersion || ''
+        requestVersion: req.params['componentVersion'] || ''
       })
     );
   }
@@ -50,8 +50,8 @@ export default function componentPreviewRoute(
 ) {
   return (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.getComponentPreview(
diff --git a/src/registry/routes/component.ts b/src/registry/routes/component.ts
@@ -18,9 +18,9 @@ export default function component(
         conf: res.conf,
         headers: req.headers,
         ip: req.ip,
-        name: req.params.componentName,
+        name: req.params['componentName'],
         parameters: req.query as any,
-        version: req.params.componentVersion
+        version: req.params['componentVersion']
       },
       result => {
         if (result.response.error) {
diff --git a/src/registry/routes/helpers/get-component-fallback.ts b/src/registry/routes/helpers/get-component-fallback.ts
@@ -27,8 +27,8 @@ function getComponentFallbackForViewType(
 ) {
   const path = buildUrl(
     {
-      name: req.params.componentName,
-      version: req.params.componentVersion
+      name: req.params['componentName'],
+      version: req.params['componentVersion']
     },
     conf.fallbackRegistryUrl
   );
diff --git a/src/registry/routes/helpers/get-component.ts b/src/registry/routes/helpers/get-component.ts
@@ -236,13 +236,13 @@ export default function getComponent(conf: Config, repository: Repository) {
 
           const parseTemplatesHeader = (t: string) =>
             t.split(';').map(t => t.split(',')[0]);
-          const supportedTemplates = options.headers.templates
-            ? parseTemplatesHeader(options.headers.templates as string)
+          const supportedTemplates = options.headers['templates']
+            ? parseTemplatesHeader(options.headers['templates'] as string)
             : [];
 
           const isTemplateSupportedByClient = Boolean(
             isValidClientRequest &&
-              options.headers.templates &&
+              options.headers['templates'] &&
               (_.includes(
                 supportedTemplates,
                 component.oc.files.template.type
@@ -521,7 +521,7 @@ export default function getComponent(conf: Config, repository: Repository) {
 
                 try {
                   vm.runInNewContext(dataProvider.content, context, options);
-                  const processData = context.module.exports.data;
+                  const processData = context.module.exports['data'];
                   cache.set('file-contents', cacheKey, processData);
 
                   domain.on('error', handleError);
diff --git a/src/registry/routes/index.ts b/src/registry/routes/index.ts
@@ -96,7 +96,7 @@ export default function (repository: Repository) {
                     }),
                     componentsHistory:
                       !res.conf.local && getComponentsHistory(details),
-                    q: req.query.q || '',
+                    q: req.query['q'] || '',
                     stateCounts,
                     templates: repository.getTemplatesInfo(),
                     title: 'OpenComponents Registry'
diff --git a/src/registry/routes/publish.ts b/src/registry/routes/publish.ts
@@ -6,7 +6,7 @@ import { Repository } from '../../types';
 
 export default function publish(repository: Repository) {
   return function (req: Request, res: Response): void {
-    if (!req.params.componentName || !req.params.componentVersion) {
+    if (!req.params['componentName'] || !req.params['componentVersion']) {
       res.errorDetails = 'malformed request';
       res.status(409).json({ error: res.errorDetails });
       return;
@@ -63,8 +63,8 @@ export default function publish(repository: Repository) {
 
       repository.publishComponent(
         pkgDetails,
-        req.params.componentName,
-        req.params.componentVersion,
+        req.params['componentName'],
+        req.params['componentVersion'],
         err => {
           if (err) {
             if (err.code === 'not_allowed') {
diff --git a/src/registry/routes/static-redirector.ts b/src/registry/routes/static-redirector.ts
@@ -31,14 +31,14 @@ export default function staticRedirector(repository: Repository) {
       } else {
         return res.redirect(repository.getStaticClientMapPath());
       }
-    } else if (req.params.componentName === 'oc-client') {
+    } else if (req.params['componentName'] === 'oc-client') {
       filePath = path.join(
         __dirname,
         '../../components/oc-client/_package/' + req.params[0]
       );
     } else {
       filePath =
-        path.join(res.conf.path, req.params.componentName) +
+        path.join(res.conf.path, req.params['componentName']) +
         '/_package/' +
         req.params[0];
     }
diff --git a/tsconfig.json b/tsconfig.json
@@ -91,7 +91,7 @@
     "noFallthroughCasesInSwitch": true /* Enable error reporting for fallthrough cases in switch statements. */,
     // "noUncheckedIndexedAccess": true /* Include 'undefined' in index signature results */,
     "noImplicitOverride": true /* Ensure overriding members in derived classes are marked with an override modifier. */,
-    // "noPropertyAccessFromIndexSignature": true /* Enforces using indexed accessors for keys declared using an indexed type */,
+    "noPropertyAccessFromIndexSignature": true /* Enforces using indexed accessors for keys declared using an indexed type */,
     "allowUnusedLabels": false /* Disable error reporting for unused labels. */,
     "allowUnreachableCode": false /* Disable error reporting for unreachable code. */,
 

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ export default function appStart(`
`28`	`28`
`29`	`29`	`logger.log(`
`30`	`30`	`colors.yellow(`
`31`		- `Connecting to library: ${options.storage.options.bucket}/${options.storage.options.componentsDir}`
	`31`	+ `Connecting to library: ${options.storage.options['bucket']}/${options.storage.options.componentsDir}`
`32`	`32`	`)`
`33`	`33`	`);`
`34`	`34`