fix(input-schema): replace escaya with acorn (#461)

packages/input_schema/package.json

@@ -39,7 +39,7 @@
     },
     "homepage": "https://apify.com",
     "scripts": {
-        "build": "npm run clean && npm run compile && npm run copy && ts-node -T scripts/fix-esm.ts",
+        "build": "npm run clean && npm run compile && npm run copy",
         "clean": "rimraf ./dist",
         "compile": "tsup",
         "copy": "ts-node -T ../../scripts/copy.ts"
@@ -50,7 +50,7 @@
     "dependencies": {
         "@apify/consts": "^2.28.0",
         "countries-list": "^3.0.0",
-        "escaya": "^0.0.61"
+        "acorn-loose": "^8.4.0"
     },
     "peerDependencies": {
         "ajv": "^8.0.0"

packages/input_schema/src/utilities.ts

@@ -1,7 +1,7 @@
 import { PROXY_URL_REGEX, URL_REGEX } from '@apify/consts';
 import { countries } from 'countries-list';
 import { ValidateFunction } from 'ajv';
-import { parseScript } from 'escaya';
+import { parse } from 'acorn-loose';
 import { m } from './intl';
 import { parseAjvError } from './input_schema';
 
@@ -273,25 +273,18 @@ export function makeInputJsFieldsReadable(json: string, jsFields: string[], json
 
         let ast;
         try {
-            ast = parseScript(maybeFunction, { cst: true });
+            ast = parse(maybeFunction, { ecmaVersion: 'latest' });
         } catch (err) {
             // Don't do anything in a case of invalid JS code.
             return;
         }
 
         const isMultiline = maybeFunction.includes('\n');
         const isSingleFunction = ast
-            && ast.leafs
-            && ast.leafs.length === 1 // Must have only one expression inside!
-            && ast.leafs[0]
+            && ast.body.length === 1
             && (
-                // Normal function ...
-                ast.leafs[0].type === 'FunctionDeclaration'
-                // or arrow function
-                || (
-                    ast.leafs[0].type === 'ExpressionStatement'
-                    && (ast.leafs[0] as { expression: { type: string } }).expression.type === 'ArrowFunction'
-                )
+                ast.body[0].type === 'FunctionDeclaration'
+                || (ast.body[0].type === 'ExpressionStatement' && ast.body[0].expression.type === 'ArrowFunctionExpression')
             );
 
         // If it's not a function declaration or multiline JS code then we do nothing.

test/utilities.test.ts

@@ -313,7 +313,11 @@ describe('timeoutPromise()', () => {
     "cookiesPersistence": "PER_PROCESS",
     "arrowFunction": async (a, b) => a + b,
     "loadCss": false,
-    "normalFunction": "function INVALID!!! pageFunction(context) {\\n    // called on every page the crawler visits, use it to extract data from it\\n    const $ = context.jQuery;\\n    return 'xxxx';\\n}"
+    "normalFunction": function INVALID!!! pageFunction(context) {
+        // called on every page the crawler visits, use it to extract data from it
+        const $ = context.jQuery;
+        return 'xxxx';
+    }
 }`;
             /* eslint-enable */