@intuned/runtime-dev 0.1.0-test.4 → 0.1.0-test.41

package/WebTemplate/controllers/runApi/helpers.ts

@@ -1,4 +1,8 @@
-import { getTraceFilePath, waitWithExtendableTimeout } from "../../utils";
+import {
+  getTraceFilePath,
+  importModule,
+  waitWithExtendableTimeout,
+} from "../../utils";
 import * as fs from "fs-extra";
 import { getExecutionContext } from "@intuned/runtime";
 import { backendFunctionsTokenManager } from "@intuned/runtime/dist/common/jwtTokenManager";
@@ -61,21 +65,22 @@ export async function runApi({
 
   const abortController = new AbortController();
 
+  backendFunctionsTokenManager.token = functionsToken;
   const resultWithTimeout = await waitWithExtendableTimeout({
     promise: runApiInternal({
       automationFunction: {
         name: `api/${functionName}`,
-        params: params ?? {},
+        params,
       },
-      auth: !isAuthSessionEnabled
-        ? undefined
-        : {
+      auth: isAuthSessionEnabled
+        ? {
             session: {
               type: "state",
               state: session,
             },
             runCheck: isAuthSessionEnabled,
-          },
+          }
+        : undefined,
       runOptions: {
         environment: "deployed",
         headless,
@@ -87,8 +92,8 @@ export async function runApi({
             filePath: getTraceFilePath(runId, attemptNumber),
           }
         : { enabled: false },
-      functionsToken,
       abortSignal: abortController.signal,
+      importFunction: importModule,
     }),
     initialTimeout: requestTimeout,
     abortController,

package/WebTemplate/index.playwright.ts

@@ -6,52 +6,42 @@ import { getExecutionContext } from "@intuned/runtime";
 import { app } from "./app";
 import { RUN_ID_HEADER } from "./headers";
 import { ShutdownController } from "./shutdown";
-import { registerApiEndpoints } from "./api";
-import { runJobsLoop } from "./jobs";
-import { isJobRunMachine } from "./utils";
 
-void main();
+const port = process.env.PORT ? parseInt(process.env.PORT) : 4000;
 
-async function main() {
-  const port = process.env.PORT ? parseInt(process.env.PORT) : 4000;
+initializeAppInsights();
 
-  initializeAppInsights();
-
-  app.use((req, res, next) => {
-    // Cleanup after the response is sent
-    res.on("finish", () => {
-      console.log("finished", req.headers[RUN_ID_HEADER]);
-      void ShutdownController.instance.checkForShutdown();
-    });
-
-    next();
-  });
-
-  registerApiEndpoints();
-  if (isJobRunMachine()) {
-    console.log("Running in job v3 mode");
-    void runJobsLoop();
-  }
-
-  const server = app.listen(port, () => {
-    // when deployed on flyio, the server will be turned on and
-    // will shutdown after the specified time in TIME_TO_SHUTDOWN env variable
-    ShutdownController.initialize(server);
+app.use((req, res, next) => {
+  // Cleanup after the response is sent
+  res.on("finish", () => {
+    console.log("finished", req.headers[RUN_ID_HEADER]);
     void ShutdownController.instance.checkForShutdown();
-    console.log(`Server is running on port ${port}`);
   });
 
-  process.on("unhandledRejection", (reason, promise) => {
-    const telemetryClient = getTelemetryClient();
-    console.error("Unhandled Rejection at:", promise, "reason:", reason);
-    const context = getExecutionContext();
-    telemetryClient?.trackEvent({
-      name: "UNHANDLED_REJECTION",
-      properties: {
-        runId: context?.runId,
-        promise,
-        reason,
-      },
-    });
+  next();
+});
+
+export * from "./api";
+export * from "./jobs";
+
+const server = app.listen(port, () => {
+  // when deployed on flyio, the server will be turned on and
+  // will shutdown after the specified time in TIME_TO_SHUTDOWN env variable
+  ShutdownController.initialize(server);
+  void ShutdownController.instance.checkForShutdown();
+  console.log(`Server is running on port ${port}`);
+});
+
+process.on("unhandledRejection", (reason, promise) => {
+  const telemetryClient = getTelemetryClient();
+  console.error("Unhandled Rejection at:", promise, "reason:", reason);
+  const context = getExecutionContext();
+  telemetryClient?.trackEvent({
+    name: "UNHANDLED_REJECTION",
+    properties: {
+      runId: context?.runId,
+      promise,
+      reason,
+    },
   });
-}
+});

package/WebTemplate/jobs.ts

@@ -6,7 +6,13 @@ import {
   RUN_ID_HEADER,
   SHOULD_SHUTDOWN_HEADER,
 } from "./headers";
-import { getErrorResponse, isHeadless, ProxyConfig, proxyToUrl } from "./utils";
+import {
+  getErrorResponse,
+  isHeadless,
+  isJobRunMachine,
+  ProxyConfig,
+  proxyToUrl,
+} from "./utils";
 import {
   callBackendFunctionWithToken,
   backendFunctionsTokenManager,
@@ -26,6 +32,11 @@ type JobPayload = {
   traceSignedUrl?: string;
 };
 
+if (isJobRunMachine()) {
+  console.log("Running in job v3 mode");
+  void jobsV3();
+}
+
 async function runApiInContext(
   jobPayload: JobPayload
 ): Promise<Awaited<ReturnType<typeof runApi>>> {
@@ -72,7 +83,7 @@ async function runApiInContext(
   }
 }
 
-export async function runJobsLoop() {
+async function jobsV3() {
   await reportReady();
   const initialDelay = 1000;
   let delay = initialDelay;

package/WebTemplate/utils.ts

@@ -1,7 +1,7 @@
 import * as playwright from "@intuned/playwright-core";
 import { Handler, Response } from "@tinyhttp/app";
 import * as path from "path";
-import { getExecutionContext } from "@intuned/runtime/dist/common/asyncLocalStorage";
+import { getExecutionContext } from "@intuned/runtime";
 import { setTimeout } from "timers/promises";
 
 export class FunctionNotFoundError extends Error {
@@ -208,3 +208,50 @@ export async function waitWithExtendableTimeout<T>({
     result: await promise,
   };
 }
+
+export async function importModule(path: string) {
+  const [folderName, ...functionNameParts] = path.split("/");
+  const functionNameDepth = functionNameParts.length;
+
+  // string literals should be inline
+  // currently we support only 5 levels of depth
+  // rollup dynamic import does not support multiple levels of dynamic imports so we need to specify the possible paths explicitly
+  try {
+    let imported: any = undefined;
+    switch (functionNameDepth) {
+      case 1:
+        imported = await import(`./${folderName}/${functionNameParts[0]}.ts`);
+        break;
+      case 2:
+        imported = await import(
+          `./${folderName}/${functionNameParts[0]}/${functionNameParts[1]}.ts`
+        );
+        break;
+      case 3:
+        imported = await import(
+          `./${folderName}/${functionNameParts[0]}/${functionNameParts[1]}/${functionNameParts[2]}.ts`
+        );
+        break;
+      case 4:
+        imported = await import(
+          `./${folderName}/${functionNameParts[0]}/${functionNameParts[1]}/${functionNameParts[2]}/${functionNameParts[3]}.ts`
+        );
+        break;
+      case 5:
+        imported = await import(
+          `./${folderName}/${functionNameParts[0]}/${functionNameParts[1]}/${functionNameParts[2]}/${functionNameParts[3]}/${functionNameParts[4]}.ts`
+        );
+        break;
+      default:
+        throw new Error(
+          "intuned supports maximum 5 levels of depth in the api folder"
+        );
+    }
+    return imported;
+  } catch (error: any) {
+    if (error.message.includes("Unknown variable dynamic import")) {
+      throw new FunctionNotFoundError("", path);
+    }
+    throw error;
+  }
+}

package/api/test2.ts

@@ -1,8 +1,7 @@
 import { Page, BrowserContext } from "@intuned/playwright-core";
-import { extendTimeout } from "../src/runtime/extendTimeout";
-import { requestOTP } from "../src/runtime/requestMoreInfo";
+import { extendTimeout, extendPayload } from "../src/runtime";
 
-export default async function* test2(
+export default async function test2(
   { n }: { n?: number },
   page: Page,
   context: BrowserContext
@@ -10,8 +9,6 @@ export default async function* test2(
   await page.goto("https://wikipedia.org/");
   await page.waitForTimeout(1000);
 
-  yield requestOTP("Please enter the OTP");
-
   const titles: string[] = [];
 
   for (let i = 0; i < (n ?? 2); i++) {
@@ -21,5 +18,10 @@ export default async function* test2(
     extendTimeout();
   }
 
+  extendPayload({
+    api: "test",
+    parameters: {},
+  });
+
   return { titles };
 }

package/auth-sessions/check.ts

@@ -5,5 +5,7 @@ export default async function check(
   _context: BrowserContext
 ): Promise<boolean> {
   await page.goto("https://setcookie.net");
-  return (await page.locator("ul li code").all()).length > 0;
+  const result = (await page.locator("ul li code").all()).length > 0;
+  console.log("Check result", result);
+  return result;
 }

package/auth-sessions/create.ts

@@ -15,16 +15,16 @@ export default async function* create(
   await page.locator("#value").fill("password");
   await page.locator("input[type=submit]").click();
 
-  console.log("Received", yield requestOTP("Enter useless otp"));
-  console.log(
-    "Received",
-    yield requestMultipleChoice("Choose the correct answer", [
-      "A",
-      "B",
-      "C",
-      "D",
-    ])
-  );
+  // console.log("Received", yield requestOTP("Enter useless otp"));
+  // console.log(
+  //   "Received",
+  //   yield requestMultipleChoice("Choose the correct answer", [
+  //     "A",
+  //     "B",
+  //     "C",
+  //     "D",
+  //   ])
+  // );
 
   await page.goto("http://www.sharonminsuk.com/code/storage-test.html");
   await page.locator("#local").fill("intuned");

package/bin/intuned-ts-check

@@ -1,2 +1,2 @@
 #!/usr/bin/env node
-require("../dist/commands/ts-check.js");
+require("../dist/commands/ts-check.js");

package/dist/commands/api/run.js

@@ -16,6 +16,7 @@ var _Logger = require("../../common/Logger");
 var _nanoid = require("nanoid");
 var _chalk = _interopRequireDefault(require("chalk"));
 var _runApi = require("../../common/runApi");
+var _tsNodeImport = require("../common/tsNodeImport");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
@@ -39,7 +40,7 @@ async function executeCLI(apiName, mode, inputData, options) {
   const runApiResult = await (0, _runApi.runApi)({
     automationFunction: {
       name: `api/${apiName}`,
-      params: inputData ?? {}
+      params: inputData
     },
     auth: authSessionPathToUse ? {
       session: {
@@ -52,14 +53,15 @@ async function executeCLI(apiName, mode, inputData, options) {
       environment: "ide",
       cdpAddress: options.cdpAddress,
       mode
-    }
+    },
+    importFunction: _tsNodeImport.tsNodeImport
   });
   if (runApiResult.isErr()) {
     if (runApiResult.error instanceof _runApi.AutomationError) {
       throw runApiResult.error.error;
     }
-    console.error("An error occurred while running the API", runApiResult.error);
-    return;
+    console.error(runApiResult.error);
+    throw new Error("An error occurred while running the API");
   }
   const {
     result,

package/dist/commands/auth-sessions/run-check.js

@@ -8,6 +8,7 @@ var _settings = require("../common/utils/settings");
 var _dotenv = _interopRequireDefault(require("dotenv"));
 var _constants = require("../../common/constants");
 var _runApi = require("../../common/runApi");
+var _tsNodeImport = require("../common/tsNodeImport");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
@@ -41,10 +42,15 @@ _commander.program.description("run auth session check").option("--cdpAddress <c
         path: authSessionPath
       },
       runCheck: false
-    }
+    },
+    importFunction: _tsNodeImport.tsNodeImport
   });
   if (runApiResult.isErr()) {
-    throw new Error(runApiResult.error);
+    if (runApiResult.error instanceof _runApi.AutomationError) {
+      throw runApiResult.error.error;
+    }
+    console.error(runApiResult.error);
+    throw new Error("Error running auth session check");
   }
   const result = runApiResult.value.result;
   console.log("check result", result);

package/dist/commands/auth-sessions/run-create.js

@@ -12,6 +12,7 @@ var _runApi = require("../../common/runApi");
 var _asyncLocalStorage = require("../../common/asyncLocalStorage");
 var _nanoid = require("nanoid");
 var _enums = require("../../runtime/enums");
+var _tsNodeImport = require("../common/tsNodeImport");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
@@ -43,15 +44,16 @@ _commander.program.description("run auth session create").option("--cdpAddress <
   async function runCreate() {
     const generator = (0, _runApi.runApiGenerator)({
       automationFunction: {
-        name: "auth-sessions/create",
-        params: inputData ?? {}
+        name: `${_constants.AUTH_SESSIONS_FOLDER_NAME}/create`,
+        params: inputData
       },
       runOptions: {
         environment: "ide",
         mode,
         cdpAddress
       },
-      retrieveSession: true
+      retrieveSession: true,
+      importFunction: _tsNodeImport.tsNodeImport
     });
     let nextGeneratorParam = undefined;
     while (true) {
@@ -61,8 +63,11 @@ _commander.program.description("run auth session create").option("--cdpAddress <
       } = await generator.next(...(nextGeneratorParam ? [nextGeneratorParam] : []));
       if (done) {
         if (value.isErr()) {
-          console.log(value.error);
-          throw new Error(value.error);
+          if (value.error instanceof _runApi.AutomationError) {
+            throw value.error.error;
+          }
+          console.error(value.error);
+          throw new Error("Error while running create");
         }
         const fullState = value.value.session;
         if (pathToSave) {

package/dist/commands/build.js

@@ -10,7 +10,7 @@ var _pluginDynamicImportVars = _interopRequireDefault(require("@rollup/plugin-dy
 var _pluginJson = _interopRequireDefault(require("@rollup/plugin-json"));
 var fs = _interopRequireWildcard(require("fs-extra"));
 var path = _interopRequireWildcard(require("path"));
-var _webTemplate = require("./common/utils/webTemplate");
+var _template = require("./common/utils/template");
 var _dotenv = _interopRequireDefault(require("dotenv"));
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
@@ -21,18 +21,20 @@ function isThirdPartyWarning(warning) {
   return false;
 }
 _dotenv.default.config();
-_commander.program.description("build the intuned server").addArgument(new _commander.Argument("<mode>", "mode of execution").choices(["vanilla", "playwright"]).default("playwright").argOptional()).argument("[outfile]", "output bundle", "./output/bundle_v2.js").allowUnknownOption().action(async (mode, outfile) => {
-  await (0, _webTemplate.moveWebTemplateFiles)();
-  const currentTemplateTsConfig = path.resolve(__dirname, "..", "..", "template.tsconfig.json");
-  await fs.copy(currentTemplateTsConfig, "./intuned/WebTemplate/tsconfig.json");
-  await build(outfile, mode);
+_commander.program.description("build the intuned server").option("-t, --template <type>", "template to use", "WebTemplate").addArgument(new _commander.Argument("<mode>", "mode of execution").choices(["vanilla", "playwright"]).default("playwright").argOptional()).argument("[outfile]", "output bundle", "./output/bundle_v2.js").allowUnknownOption().action(async (mode, outfile, {
+  template
+}) => {
+  await (0, _template.moveTemplateFiles)(template);
+  const currentTemplateTsConfig = path.resolve(path.dirname(__filename), "..", "..", "template.tsconfig.json");
+  await fs.copy(currentTemplateTsConfig, `./intuned/${template}/tsconfig.json`);
+  await build(outfile, mode, template);
 });
-async function build(outfile, mode) {
+async function build(outfile, mode, template) {
   let bundle = null;
   let buildFailed = false;
   try {
     bundle = await (0, _rollup.rollup)({
-      input: `./intuned/WebTemplate/index.${mode}.ts`,
+      input: `./intuned/${template}/index.${mode}.ts`,
       output: {
         globals: {
           crypto: "crypto"
@@ -42,14 +44,15 @@ async function build(outfile, mode) {
         exportConditions: ["node"],
         preferBuiltins: true
       }), (0, _pluginTypescript.default)({
-        tsconfig: "./intuned/WebTemplate/tsconfig.json"
+        tsconfig: `./intuned/${template}/tsconfig.json`
       }), (0, _pluginCommonjs.default)({
-        include: ["node_modules/**", "intuned/WebTemplate/**", "dist", "../typescript-sdk/**", "../typescript-runtime/**"],
+        include: ["node_modules/**", `intuned/${template}/**`, "dist", "../typescript-sdk/**", "../typescript-runtime/**"],
         extensions: [".js"],
         ignoreGlobal: false,
         sourceMap: false,
-        dynamicRequireTargets: ["**/node_modules/**"],
-        requireReturnsDefault: "preferred"
+        dynamicRequireTargets: ["api/**/*.js", "auth-sessions/**/*.js"],
+        requireReturnsDefault: "auto",
+        transformMixedEsModules: true
       }), (0, _pluginDynamicImportVars.default)({
         include: ["**/*.js", "**/*.ts"],
         exclude: ["**/*.d.ts", "**/*.js.map"]
@@ -62,7 +65,7 @@ async function build(outfile, mode) {
     });
     console.log(`📦 Building ${outfile}`);
     const outfileFolder = path.dirname(outfile);
-    const assetsDir = path.resolve(__dirname, "..", "common", "assets");
+    const assetsDir = path.resolve(path.dirname(__filename), "..", "common", "assets");
     await fs.copy(assetsDir, `${outfileFolder}/assets`);
     await bundle.write({
       format: "cjs",

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

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

package/dist/commands/common/{getDefaultExportFromFile.js → tsNodeImport.js}

@@ -3,17 +3,18 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getDefaultExportFromFile = getDefaultExportFromFile;
+exports.tsNodeImport = tsNodeImport;
+var _fileUtils = require("./utils/fileUtils");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
-async function getDefaultExportFromFile(apiFilePath) {
+async function tsNodeImport(apiName) {
   require("ts-node").register({
     transpileOnly: true,
     compilerOptions: {
       lib: ["dom", "es2020"]
     }
   });
-  const imported = await (specifier => new Promise(r => r(`${specifier}`)).then(s => _interopRequireWildcard(require(s))))(apiFilePath);
-  const defaultExport = imported.default;
-  return defaultExport;
+  const path = (0, _fileUtils.getFullPathInProject)(...apiName.split("/"));
+  const imported = await (specifier => new Promise(r => r(`${specifier}`)).then(s => _interopRequireWildcard(require(s))))(path);
+  return imported;
 }

package/dist/commands/common/utils/settings.js

@@ -6,14 +6,14 @@ Object.defineProperty(exports, "__esModule", {
 exports.getSettings = getSettings;
 var _fileUtils = require("./fileUtils");
 var _settingsSchema = require("../../../common/settingsSchema");
-var _fsExtra = require("fs-extra");
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 async function getSettings() {
   const settingsFilePath = (0, _fileUtils.getFullPathInProject)("Intuned.json");
   console.log("loading settings");
-  const settings = await (0, _fsExtra.readJSON)(settingsFilePath);
-  if (settings) {
-    const parsed = _settingsSchema.settingsSchema.safeParse(settings);
-    console.log(parsed);
+  const settings = await (specifier => new Promise(r => r(`${specifier}`)).then(s => _interopRequireWildcard(require(s))))(settingsFilePath);
+  if (settings.default) {
+    const parsed = _settingsSchema.settingsSchema.safeParse(settings.default);
     if (parsed.success) {
       return parsed.data;
     } else {

package/dist/commands/common/utils/template.d.ts

@@ -0,0 +1,2 @@
+export type TemplateName = "WebTemplate" | "InterfaceTemplate";
+export declare const moveTemplateFiles: (templateName: TemplateName) => Promise<void>;

package/dist/commands/common/utils/{webTemplate.js → template.js}

@@ -3,18 +3,18 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.moveWebTemplateFiles = void 0;
+exports.moveTemplateFiles = void 0;
 var fs = _interopRequireWildcard(require("fs-extra"));
 var path = _interopRequireWildcard(require("path"));
 var _fileUtils = require("./fileUtils");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
-const moveWebTemplateFiles = async () => {
+const moveTemplateFiles = async templateName => {
   await fs.remove("./intuned");
   await fs.ensureDir("./intuned");
-  const currentFileLocation = path.resolve(__dirname, "..", "..", "..", "..", "WebTemplate");
-  await fs.copy(`${currentFileLocation}`, "./intuned/WebTemplate", {
-    filter: (src, dest) => {
+  const currentFileLocation = path.resolve(__dirname, "..", "..", "..", "..", templateName);
+  await fs.copy(`${currentFileLocation}`, `./intuned/${templateName}`, {
+    filter: (src, _) => {
       if (src.includes(".d.ts")) {
         return false;
       }
@@ -25,7 +25,7 @@ const moveWebTemplateFiles = async () => {
   const pathsIgnoreList = [(0, _fileUtils.getFullPathInProject)("intuned"), (0, _fileUtils.getFullPathInProject)("node_modules"), (0, _fileUtils.getFullPathInProject)("package.json"), (0, _fileUtils.getFullPathInProject)("yarn.lock"), (0, _fileUtils.getFullPathInProject)(".env")];
   const filesToCopy = filesAndFolders.filter(file => !pathsIgnoreList.includes(file.fullPath));
   for (const file of filesToCopy) {
-    await fs.copy(file.fullPath, `./intuned/WebTemplate/${file.name}`);
+    await fs.copy(file.fullPath, `./intuned/${templateName}/${file.name}`);
   }
 };
-exports.moveWebTemplateFiles = moveWebTemplateFiles;
+exports.moveTemplateFiles = moveTemplateFiles;

package/dist/commands/interface/run.d.ts

@@ -1,2 +1,2 @@
 #!/usr/bin/env node
-export {};
+export declare function runAutomationCLI(importFunction?: (path: string) => Promise<any>): void;