Polishment

Author: CompuIves

packages/app/src/sandbox/eval/transpilers/babel/__snapshots__/convert-esmodule.test.ts.snap

@@ -66,3 +66,11 @@ exports[`convert-esmodule can handle as imports 1`] = `
 "var $csb__b = require('./b');
 var b = $csb__b.a;"
 `;
+
+exports[`convert-esmodule can handle inline comments 1`] = `
+"var $csb__b = require('./b');
+var b = $csb__b.a;
+var c = $csb__b.c;"
+`;
+
+exports[`convert-esmodule ignores comments 1`] = `""`;

packages/app/src/sandbox/eval/transpilers/babel/convert-esmodule.test.ts

@@ -65,4 +65,18 @@ describe('convert-esmodule', () => {
     `;
     expect(convertEsModule('/index.js', code)).toMatchSnapshot();
   });
+
+  it('ignores comments', () => {
+    const code = `
+      // import { a as b } from './b';
+    `;
+    expect(convertEsModule('/index.js', code)).toMatchSnapshot();
+  });
+
+  it('can handle inline comments', () => {
+    const code = `
+      import { a as b, /* HELLO WORLD */ c } from './b';
+    `;
+    expect(convertEsModule('/index.js', code)).toMatchSnapshot();
+  });
 });

packages/app/src/sandbox/eval/transpilers/babel/convert-esmodule.ts

@@ -1,3 +1,5 @@
+// This code is written to be performant, that's why we opted to ignore these linting issues
+/* eslint-disable no-loop-func, no-continue */
 import * as esprima from 'esprima';
 import escodegen from 'escodegen';
 import { basename } from 'path';
@@ -427,6 +429,7 @@ export function convertEsModule(path: string, code: string) {
       }
       const varName = getVarName(`$csb__${basename(source.value, '.js')}`);
 
+      // Create require statement instead of the import
       program.body[i] = generateRequireStatement(varName, source.value);
       i++;
 
@@ -435,13 +438,18 @@ export function convertEsModule(path: string, code: string) {
         let importName: string;
 
         if (specifier.type === n.ImportDefaultSpecifier) {
+          // const _test = require('test');
+          // var default = _test.default;
           localName = 'default';
           importName = 'default';
         } else if (specifier.type === n.ImportSpecifier) {
+          // const _test = require('test');
+          // var $localName = _test.$importName;
           localName = specifier.local.name;
           importName = specifier.imported.name;
         } else if (specifier.type === n.ImportNamespaceSpecifier) {
-          // Wildcard, TODO
+          // const _test = require('test');
+          // var $localName = _test;
           localName = specifier.local.name;
           importName = null;
         }

packages/app/src/sandbox/utils/metrics.ts

@@ -8,8 +8,16 @@ const runningMeasurements = new Map<string, number>();
 const measurements: { [measurement: string]: number } = {};
 
 export function measure(key: MeasurementKey) {
-  performance.mark(`${key}_start`);
-  runningMeasurements.set(key, performance.now());
+  if (process.env.NODE_ENV !== 'production') {
+    return;
+  }
+
+  try {
+    performance.mark(`${key}_start`);
+    runningMeasurements.set(key, performance.now());
+  } catch (e) {
+    console.warn(`Something went wrong while adding measure: ${e.message}`);
+  }
 }
 
 export function endMeasure(
@@ -19,26 +27,34 @@ export function endMeasure(
     lastTime?: number;
   } = {}
 ) {
-  const { lastTime } = options;
-  performance.mark(`${key}_end`);
-
-  const lastMeasurement =
-    typeof lastTime === 'undefined' ? runningMeasurements.get(key) : lastTime;
-
-  if (typeof lastMeasurement === 'undefined') {
-    console.warn(
-      `Measurement for '${key}' was requested, but never was started`
-    );
+  if (process.env.NODE_ENV !== 'production') {
     return;
   }
 
-  const nowMeasurement = performance.now();
+  try {
+    const { lastTime } = options;
+    performance.mark(`${key}_end`);
+
+    const lastMeasurement =
+      typeof lastTime === 'undefined' ? runningMeasurements.get(key) : lastTime;
+
+    if (typeof lastMeasurement === 'undefined') {
+      console.warn(
+        `Measurement for '${key}' was requested, but never was started`
+      );
+      return;
+    }
 
-  measurements[key] = nowMeasurement - lastMeasurement;
-  debug(`${name || key} Time: ${measurements[key].toFixed(2)}ms`);
-  const hadKey = runningMeasurements.delete(key);
+    const nowMeasurement = performance.now();
 
-  performance.measure(key, hadKey ? `${key}_start` : undefined, `${key}_end`);
+    measurements[key] = nowMeasurement - lastMeasurement;
+    debug(`${name || key} Time: ${measurements[key].toFixed(2)}ms`);
+    const hadKey = runningMeasurements.delete(key);
+
+    performance.measure(key, hadKey ? `${key}_start` : undefined, `${key}_end`);
+  } catch (e) {
+    console.warn(`Something went wrong while adding measure: ${e.message}`);
+  }
 }
 
 const MEASUREMENT_API = `https://30vlq6h5qc.execute-api.eu-west-1.amazonaws.com/prod/metrics`;