@intuned/runtime-dev 0.1.0-test.2 → 0.1.0-test.20

package/dist/common/runApi/index.js

@@ -18,7 +18,7 @@ var fs = _fsExtra;
 var _jwtTokenManager = require("../jwtTokenManager");
 var _contextStorageStateHelpers = require("../contextStorageStateHelpers");
 var _neverthrow = require("neverthrow");
-var _errors = require("./errors");
+var _errors = require("./errors.js");
 Object.keys(_errors).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
@@ -32,7 +32,7 @@ Object.keys(_errors).forEach(function (key) {
 });
 var _constants = require("../constants");
 var _getPlaywrightConstructs = require("../getPlaywrightConstructs");
-var _types = require("./types");
+var _types = require("./types.js");
 Object.keys(_types).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
@@ -128,9 +128,7 @@ async function* runApiGenerator({
     var _getExecutionContext;
     if (auth !== null && auth !== void 0 && auth.runCheck) {
       if (!auth.session) {
-        return (0, _neverthrow.err)({
-          code: "AuthRequiredError"
-        });
+        return (0, _neverthrow.err)(new _errors.AuthRequiredError());
       }
       console.log("Running auth check");
       const authCheckResult = await checkAuthSessionWithRetries(page, context, 2);
@@ -142,20 +140,17 @@ async function* runApiGenerator({
         return authCheckResult;
       }
       if (!authCheckResult.value) {
-        return (0, _neverthrow.err)({
-          code: "AuthCheckFailedError"
-        });
+        return (0, _neverthrow.err)(new _errors.AuthCheckFailedError());
       }
     }
-    console.log("Running function", automationFunction.name);
     const args = [...(automationFunction.params ? [automationFunction.params] : []), page, context];
-    const importResult = await importFunction(automationFunction.name);
-    if (importResult.isErr()) {
-      return importResult;
+    const validatedModuleResult = await validateModule(automationFunction.module);
+    if (validatedModuleResult.isErr()) {
+      return validatedModuleResult;
     }
     let result;
-    if (importResult.value.type === "async-generator") {
-      const generator = importResult.value.generator(...args);
+    if (validatedModuleResult.value.type === "async-generator") {
+      const generator = validatedModuleResult.value.generator(...args);
       let next = undefined;
       while (true) {
         const generatorResult = await generator.next(...(next ? [next] : []));
@@ -167,7 +162,7 @@ async function* runApiGenerator({
         break;
       }
     } else {
-      result = await importResult.value.func(...args);
+      result = await validatedModuleResult.value.func(...args);
     }
     return (0, _neverthrow.ok)({
       result,
@@ -217,7 +212,7 @@ async function checkAuthSessionWithRetries(page, context, retries = 3) {
   }
   let tryNumber = 0;
   console.log("Checking auth session with retries", `${_constants.AUTH_SESSIONS_FOLDER_NAME}/check`);
-  const importResult = await importFunction(`${_constants.AUTH_SESSIONS_FOLDER_NAME}/check`);
+  const importResult = await validateModule(`${_constants.AUTH_SESSIONS_FOLDER_NAME}/check`);
   if (importResult.isErr()) {
     return (0, _neverthrow.err)(importResult.error);
   }
@@ -232,57 +227,21 @@ async function checkAuthSessionWithRetries(page, context, retries = 3) {
   }
   return (0, _neverthrow.ok)(false);
 }
-async function importFunction(path) {
-  const functionNameParts = path.split("/");
-  const functionNameDepth = functionNameParts.length;
-  try {
-    let imported = undefined;
-    switch (functionNameDepth) {
-      case 1:
-        imported = await (specifier => new Promise(r => r(specifier)).then(s => _interopRequireWildcard(require(s))))(`${functionNameParts[0]}.ts`);
-        break;
-      case 2:
-        imported = await (specifier => new Promise(r => r(specifier)).then(s => _interopRequireWildcard(require(s))))(`${functionNameParts[0]}/${functionNameParts[1]}.ts`);
-        break;
-      case 3:
-        imported = await (specifier => new Promise(r => r(specifier)).then(s => _interopRequireWildcard(require(s))))(`${functionNameParts[0]}/${functionNameParts[1]}/${functionNameParts[2]}.ts`);
-        break;
-      case 4:
-        imported = await (specifier => new Promise(r => r(specifier)).then(s => _interopRequireWildcard(require(s))))(`${functionNameParts[0]}/${functionNameParts[1]}/${functionNameParts[2]}/${functionNameParts[3]}.ts`);
-        break;
-      case 5:
-        imported = await (specifier => new Promise(r => r(specifier)).then(s => _interopRequireWildcard(require(s))))(`${functionNameParts[0]}/${functionNameParts[1]}/${functionNameParts[2]}/${functionNameParts[3]}/${functionNameParts[4]}.ts`);
-        break;
-      case 6:
-        imported = await (specifier => new Promise(r => r(specifier)).then(s => _interopRequireWildcard(require(s))))(`${functionNameParts[0]}/${functionNameParts[1]}/${functionNameParts[2]}/${functionNameParts[3]}/${functionNameParts[4]}/${functionNameParts[5]}.ts`);
-        break;
-      default:
-        return (0, _neverthrow.err)(new _errors.MaxLevelsExceededError(5));
-    }
-    if (!imported || !imported.default || !imported.default.constructor) {
-      return (0, _neverthrow.err)(new _errors.InvalidApiError("API file path does not have a default export"));
-    }
-    if (imported.default.constructor.name === "AsyncGeneratorFunction") {
-      return (0, _neverthrow.ok)({
-        type: "async-generator",
-        generator: imported.default
-      });
-    }
-    if (imported.default.constructor.name === "AsyncFunction") {
-      return (0, _neverthrow.ok)({
-        type: "async",
-        func: imported.default
-      });
-    }
-    return (0, _neverthrow.err)(new _errors.InvalidApiError("API file path does not have a default async function/generator export"));
-  } catch (error) {
-    if (error.message.includes("Unknown variable dynamic import")) {
-      return (0, _neverthrow.err)(new _errors.ApiNotFoundError(path));
-    }
-    if ((error === null || error === void 0 ? void 0 : error.code) === "ERR_MODULE_NOT_FOUND") {
-      console.log("API not found", error);
-      return (0, _neverthrow.err)(new _errors.ApiNotFoundError(path));
-    }
-    throw error;
+async function validateModule(moduleToValidate) {
+  if (!moduleToValidate || !moduleToValidate.default || !moduleToValidate.default.constructor) {
+    return (0, _neverthrow.err)(new _errors.InvalidApiError("API file path does not have a default export"));
+  }
+  if (moduleToValidate.default.constructor.name === "AsyncGeneratorFunction") {
+    return (0, _neverthrow.ok)({
+      type: "async-generator",
+      generator: moduleToValidate.default
+    });
+  }
+  if (moduleToValidate.default.constructor.name === "AsyncFunction") {
+    return (0, _neverthrow.ok)({
+      type: "async",
+      func: moduleToValidate.default
+    });
   }
+  return (0, _neverthrow.err)(new _errors.InvalidApiError("API file path does not have a default async function/generator export"));
 }

package/dist/common/runApi/types.d.ts

@@ -1,7 +1,7 @@
 import type { IntunedStorageState } from "../contextStorageStateHelpers";
 import type { Payload } from "../../runtime/export";
 import type { Result } from "neverthrow";
-import type { RunAutomationError } from "./errors";
+import type { RunAutomationError } from "./errors.js";
 import z from "zod";
 export interface PayloadToAppend {
     apiName: string;
@@ -127,13 +127,23 @@ export declare const runApiSessionSchema: z.ZodDiscriminatedUnion<"type", [z.Zod
 export declare const runApiParametersSchema: z.ZodObject<{
     functionsToken: z.ZodOptional<z.ZodString>;
     automationFunction: z.ZodObject<{
-        name: z.ZodString;
+        module: z.ZodObject<{
+            default: z.ZodFunction<z.ZodTuple<[], z.ZodUnknown>, z.ZodUnknown>;
+        }, "strip", z.ZodTypeAny, {
+            default: (...args: unknown[]) => unknown;
+        }, {
+            default: (...args: unknown[]) => unknown;
+        }>;
         params: z.ZodOptional<z.ZodAny>;
     }, "strip", z.ZodTypeAny, {
-        name: string;
+        module: {
+            default: (...args: unknown[]) => unknown;
+        };
         params?: any;
     }, {
-        name: string;
+        module: {
+            default: (...args: unknown[]) => unknown;
+        };
         params?: any;
     }>;
     tracing: z.ZodDefault<z.ZodOptional<z.ZodDiscriminatedUnion<"enabled", [z.ZodObject<{
@@ -360,7 +370,9 @@ export declare const runApiParametersSchema: z.ZodObject<{
     retrieveSession: z.ZodDefault<z.ZodBoolean>;
 }, "strip", z.ZodTypeAny, {
     automationFunction: {
-        name: string;
+        module: {
+            default: (...args: unknown[]) => unknown;
+        };
         params?: any;
     };
     tracing: {
@@ -416,7 +428,9 @@ export declare const runApiParametersSchema: z.ZodObject<{
     } | undefined;
 }, {
     automationFunction: {
-        name: string;
+        module: {
+            default: (...args: unknown[]) => unknown;
+        };
         params?: any;
     };
     functionsToken?: string | undefined;

package/dist/common/runApi/types.js

@@ -16,7 +16,11 @@ const runApiSessionSchema = exports.runApiSessionSchema = _zod.default.discrimin
 const runApiParametersSchema = exports.runApiParametersSchema = _zod.default.object({
   functionsToken: _zod.default.string().optional(),
   automationFunction: _zod.default.object({
-    name: _zod.default.string(),
+    module: _zod.default.object({
+      default: _zod.default.function()
+    }, {
+      required_error: "API handler must have a default export function"
+    }),
     params: _zod.default.any().optional()
   }),
   tracing: _zod.default.discriminatedUnion("enabled", [_zod.default.object({

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-export { extendPayload, extendTimeout, runInfo, RunError, requestMultipleChoice, requestOTP, } from "./runtime";
-export { runWithContext, getExecutionContext, } from "./common/asyncLocalStorage";
-export { getDownloadDirectoryPath } from "./runtime/downloadDirectory";
-export { getProductionPlaywrightConstructs } from "./common/getPlaywrightConstructs";
+export { extendPayload, extendTimeout, runInfo, RunError, requestMultipleChoice, requestOTP, } from "./runtime/index.js";
+export { runWithContext, getExecutionContext, } from "./common/asyncLocalStorage/index.js";
+export { getDownloadDirectoryPath } from "./runtime/downloadDirectory.js";
+export { getProductionPlaywrightConstructs } from "./common/getPlaywrightConstructs.js";

package/dist/index.js

@@ -6,19 +6,19 @@ Object.defineProperty(exports, "__esModule", {
 Object.defineProperty(exports, "RunError", {
   enumerable: true,
   get: function () {
-    return _runtime.RunError;
+    return _index.RunError;
   }
 });
 Object.defineProperty(exports, "extendPayload", {
   enumerable: true,
   get: function () {
-    return _runtime.extendPayload;
+    return _index.extendPayload;
   }
 });
 Object.defineProperty(exports, "extendTimeout", {
   enumerable: true,
   get: function () {
-    return _runtime.extendTimeout;
+    return _index.extendTimeout;
   }
 });
 Object.defineProperty(exports, "getDownloadDirectoryPath", {
@@ -30,7 +30,7 @@ Object.defineProperty(exports, "getDownloadDirectoryPath", {
 Object.defineProperty(exports, "getExecutionContext", {
   enumerable: true,
   get: function () {
-    return _asyncLocalStorage.getExecutionContext;
+    return _index2.getExecutionContext;
   }
 });
 Object.defineProperty(exports, "getProductionPlaywrightConstructs", {
@@ -42,28 +42,28 @@ Object.defineProperty(exports, "getProductionPlaywrightConstructs", {
 Object.defineProperty(exports, "requestMultipleChoice", {
   enumerable: true,
   get: function () {
-    return _runtime.requestMultipleChoice;
+    return _index.requestMultipleChoice;
   }
 });
 Object.defineProperty(exports, "requestOTP", {
   enumerable: true,
   get: function () {
-    return _runtime.requestOTP;
+    return _index.requestOTP;
   }
 });
 Object.defineProperty(exports, "runInfo", {
   enumerable: true,
   get: function () {
-    return _runtime.runInfo;
+    return _index.runInfo;
   }
 });
 Object.defineProperty(exports, "runWithContext", {
   enumerable: true,
   get: function () {
-    return _asyncLocalStorage.runWithContext;
+    return _index2.runWithContext;
   }
 });
-var _runtime = require("./runtime");
-var _asyncLocalStorage = require("./common/asyncLocalStorage");
-var _downloadDirectory = require("./runtime/downloadDirectory");
-var _getPlaywrightConstructs = require("./common/getPlaywrightConstructs");
+var _index = require("./runtime/index.js");
+var _index2 = require("./common/asyncLocalStorage/index.js");
+var _downloadDirectory = require("./runtime/downloadDirectory.js");
+var _getPlaywrightConstructs = require("./common/getPlaywrightConstructs.js");

package/dist/runtime/RunError.d.ts

@@ -1,4 +1,4 @@
-import { RunErrorOptions } from "./export";
+import { RunErrorOptions } from "./export.js";
 export declare class RunError extends Error {
     options: RunErrorOptions;
     constructor(message: string, options?: RunErrorOptions);

package/dist/runtime/executionHelpers.test.js

@@ -2,8 +2,8 @@
 
 var _vitest = require("vitest");
 var _asyncLocalStorage = require("../common/asyncLocalStorage");
-var _index = require("./index");
-var _enums = require("./enums");
+var _index = require("./index.js");
+var _enums = require("./enums.js");
 (0, _vitest.describe)("Execution Helpers", () => {
   (0, _vitest.it)("should be able to get execution info", () => {
     (0, _asyncLocalStorage.runWithContext)({

package/dist/runtime/export.d.ts

@@ -1,4 +1,4 @@
-import { RunEnvironment } from "./enums";
+import { RunEnvironment } from "./enums.js";
 
 /**
  * ## Description

package/dist/runtime/extendPayload.d.ts

@@ -1,2 +1,2 @@
-import { Payload } from "./export";
+import { Payload } from "./export.js";
 export declare function extendPayload(payload: Payload | Payload[]): void;

package/dist/runtime/extendPayload.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.extendPayload = extendPayload;
 var _asyncLocalStorage = require("../common/asyncLocalStorage");
-var _extendTimeout = require("./extendTimeout");
+var _extendTimeout = require("./extendTimeout.js");
 function extendPayload(payload) {
   const context = (0, _asyncLocalStorage.getExecutionContext)();
   if (!context) {

package/dist/runtime/index.d.ts

@@ -1,7 +1,7 @@
-export { extendPayload } from "./extendPayload";
-export { extendTimeout } from "./extendTimeout";
-export { runInfo } from "./runInfo";
-export { RunError } from "./RunError";
-export { requestMultipleChoice, requestOTP } from "./requestMoreInfo";
-export type { RequestMoreInfoDetails } from "./requestMoreInfo";
-export { getDownloadDirectoryPath } from "./downloadDirectory";
+export { extendPayload } from "./extendPayload.js";
+export { extendTimeout } from "./extendTimeout.js";
+export { runInfo } from "./runInfo.js";
+export { RunError } from "./RunError.js";
+export { requestMultipleChoice, requestOTP } from "./requestMoreInfo.js";
+export type { RequestMoreInfoDetails } from "./requestMoreInfo.js";
+export { getDownloadDirectoryPath } from "./downloadDirectory.js";

package/dist/runtime/index.js

@@ -45,9 +45,9 @@ Object.defineProperty(exports, "runInfo", {
     return _runInfo.runInfo;
   }
 });
-var _extendPayload = require("./extendPayload");
-var _extendTimeout = require("./extendTimeout");
-var _runInfo = require("./runInfo");
-var _RunError = require("./RunError");
-var _requestMoreInfo = require("./requestMoreInfo");
-var _downloadDirectory = require("./downloadDirectory");
+var _extendPayload = require("./extendPayload.js");
+var _extendTimeout = require("./extendTimeout.js");
+var _runInfo = require("./runInfo.js");
+var _RunError = require("./RunError.js");
+var _requestMoreInfo = require("./requestMoreInfo.js");
+var _downloadDirectory = require("./downloadDirectory.js");

package/dist/runtime/runInfo.d.ts

@@ -1,2 +1,2 @@
-import { RunInfo } from "./export";
+import { RunInfo } from "./export.js";
 export declare function runInfo(): RunInfo;

package/dist/runtime/runInfo.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.runInfo = runInfo;
 var _asyncLocalStorage = require("../common/asyncLocalStorage");
-var _enums = require("./enums");
+var _enums = require("./enums.js");
 function runInfo() {
   const context = (0, _asyncLocalStorage.getExecutionContext)();
   if (!context) {

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@intuned/runtime-dev",
-  "version": "0.1.0-test.2",
+  "version": "0.1.0-test.20",
   "description": "Intuned runtime",
   "exports": {
     ".": "./dist/index.js",
-    "./dist/runtime": "./dist/runtime/index.js",
+    "./runtime": "./dist/runtime/index.js",
     "./dist/common/runApi": "./dist/common/runApi/index.js",
     "./dist/common/settingsSchema": "./dist/common/settingsSchema.js",
     "./dist/common/contextStorageStateHelpers": "./dist/common/contextStorageStateHelpers.js",
@@ -12,8 +12,7 @@
     "./dist/common/jwtTokenManager": "./dist/common/jwtTokenManager.js",
     "./dist/common/asyncLocalStorage": "./dist/common/asyncLocalStorage/index.js",
     "./dist/common/cleanEnvironmentVariables": "./dist/common/cleanEnvironmentVariables.js",
-    "./dist/common/constants": "./dist/common/constants.js",
-    "./dist/commands/interface/run": "./dist/commands/interface/run.js"
+    "./dist/common/constants": "./dist/common/constants.js"
   },
   "types": "./dist/index.d.ts",
   "author": "Intuned Team",
@@ -51,6 +50,7 @@
     "intuned-ts-check": "./bin/intuned-ts-check"
   },
   "dependencies": {
+    "@babel/plugin-syntax-dynamic-import": "^7.8.3",
     "@intuned/playwright": "^1.44.1-4",
     "@intuned/playwright-core": "^1.44.1-4",
     "@rollup/plugin-commonjs": "^25.0.2",
@@ -65,6 +65,7 @@
     "@types/node": "^20.4.1",
     "applicationinsights": "^2.9.2",
     "async-retry": "^1.3.3",
+    "babel-plugin-dynamic-import-node": "^2.3.3",
     "chalk": "^4.1.2",
     "commander": "^11.0.0",
     "cross-fetch": "^4.0.0",
@@ -89,7 +90,6 @@
     "source-map": "^0.7.4",
     "stack-utils": "^2.0.6",
     "ts-morph": "^21.0.1",
-    "ts-node": "^10.9.1",
     "tslib": "^2.6.0",
     "typescript": "^5.1.6",
     "wait-on": "^7.2.0",

package/preserve-dynamic-imports.js

@@ -0,0 +1,16 @@
+module.exports = function ({ template }) {
+  return {
+    visitor: {
+      CallExpression(path) {
+        if (path.node.callee.type === "Import") {
+          const buildRequire = template(`Promise.resolve(require(ARGUMENT))`);
+          path.replaceWith(
+            buildRequire({
+              ARGUMENT: path.node.arguments[0],
+            })
+          );
+        }
+      },
+    },
+  };
+};

package/tsconfig.json

@@ -3,7 +3,7 @@
     "target": "es2021",
     "module": "esnext",
     "esModuleInterop": true,
-    "moduleResolution": "bundler",
+    "moduleResolution": "node",
     "resolveJsonModule": true,
     "outDir": "./dist",
     "strict": false,

package/dist/commands/common/getDefaultExportFromFile.d.ts

@@ -1 +0,0 @@
-export declare function getDefaultExportFromFile(apiFilePath: string): Promise<any>;