@intuned/runtime 1.3.0 → 1.3.2

package/dist/commands/intuned-cli/controller/deploy.js

@@ -3,147 +3,32 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.convertProjectToCodeTree = convertProjectToCodeTree;
 exports.projectNameSchema = void 0;
 exports.runDeployProject = runDeployProject;
-exports.validateProjectName = exports.validateIntunedProject = void 0;
-var fs = _interopRequireWildcard(require("fs-extra"));
-var path = _interopRequireWildcard(require("path"));
-var _minimatch = require("minimatch");
 var _zod = require("zod");
-var _projectExclusions = _interopRequireDefault(require("../../common/projectExclusions"));
 var _constants = require("../constants");
 var _helpers = require("../helpers");
-var _lodash = require("lodash");
-var _uuid = require("uuid");
 var _terminal = require("../helpers/terminal");
 var _promises = require("timers/promises");
 var _ms = _interopRequireDefault(require("ms"));
-var _build = require("./build");
+var _save = require("./save");
+var _constants2 = require("../../../common/constants");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-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 && {}.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; }
-function ignoreFilesByPattern(filePath, patterns, projectPath) {
-  const relativePath = path.relative(projectPath, filePath);
-  if (relativePath.startsWith("node_modules")) {
-    return true;
-  }
-  for (const pattern of patterns) {
-    if (!pattern || pattern.startsWith("#")) continue;
-    if (pattern.startsWith("!")) {
-      if ((0, _minimatch.minimatch)(relativePath, pattern.substring(1))) {
-        return false;
-      }
-    } else if ((0, _minimatch.minimatch)(relativePath, pattern)) {
-      return true;
-    }
-  }
-  return false;
-}
-function listFilesNotIgnored(projectPath, ignorePatterns) {
-  const results = [];
-  function traverseDirectory(dirPath) {
-    try {
-      const entries = fs.readdirSync(dirPath);
-      for (const entry of entries) {
-        const fullPath = path.join(dirPath, entry);
-        if (ignoreFilesByPattern(fullPath, ignorePatterns, projectPath)) {
-          continue;
-        }
-        try {
-          const stats = fs.statSync(fullPath);
-          if (stats.isDirectory()) {
-            traverseDirectory(fullPath);
-          } else if (stats.isFile()) {
-            results.push(path.relative(projectPath, fullPath));
-          }
-        } catch (error) {
-          (0, _terminal.terminal)(`^yWarning: Could not access ${fullPath}^:\n`);
-        }
-      }
-    } catch (error) {
-      (0, _terminal.terminal)(`^YWarning: Could not read directory ${dirPath}^:\n`);
-    }
-  }
-  traverseDirectory(projectPath);
-  return results;
-}
-async function convertProjectToCodeTree(projectPath) {
-  const filesToDeploy = listFilesNotIgnored(projectPath, _projectExclusions.default);
-  const filesToDeployText = "  " + filesToDeploy.join("\n  ");
-  (0, _terminal.terminal)("^CFiles to be deployed:^:\n");
-  (0, _terminal.terminal)(filesToDeployText + "\n");
-  function readDirectory(dirPath) {
-    const tree = {};
-    try {
-      const entries = fs.readdirSync(dirPath);
-      for (const entry of entries) {
-        const entryPath = path.join(dirPath, entry);
-        if (ignoreFilesByPattern(entryPath, _projectExclusions.default, projectPath)) {
-          continue;
-        }
-        try {
-          const stats = fs.statSync(entryPath);
-          if (stats.isFile()) {
-            try {
-              const content = fs.readFileSync(entryPath, "utf-8");
-              tree[entry] = {
-                file: {
-                  contents: content
-                }
-              };
-            } catch (error) {
-              (0, _terminal.terminal)(`^yWarning: Could not read file ${entryPath}^:\n`);
-            }
-          } else if (stats.isDirectory()) {
-            const subTree = readDirectory(entryPath);
-            if (Object.keys(subTree).length > 0) {
-              tree[entry] = {
-                directory: subTree
-              };
-            }
-          }
-        } catch (error) {
-          (0, _terminal.terminal)(`^yWarning: Could not access ${entryPath}^:\n`);
-        }
-      }
-    } catch (error) {
-      (0, _terminal.terminal)(`^YWarning: Could not read directory ${dirPath}^:\n`);
-    }
-    return tree;
-  }
-  const tree = readDirectory(projectPath);
-  await mapToIDEParams(tree);
-  return tree;
-}
 async function runDeployProject(projectName, auth) {
+  await (0, _save.runSaveProject)(projectName, auth);
   const {
     workspaceId,
     apiKey
   } = auth;
   const baseUrl = (0, _helpers.getBaseUrl)();
-  const url = `${baseUrl}/api/v1/workspace/${workspaceId}/projects/create`;
+  const url = `${baseUrl}/api/v1/workspace/${workspaceId}/projects/${projectName}/deploy`;
   const headers = {
-    "x-api-key": apiKey,
+    [_constants2.API_KEY_HEADER_NAME]: apiKey,
     "Content-Type": "application/json"
   };
-  const projectPath = process.cwd();
-  const codeTree = await convertProjectToCodeTree(projectPath);
-  codeTree["tsconfig.json"] = {
-    file: {
-      contents: JSON.stringify(_constants.tsConfigCli, null, 2)
-    }
-  };
-  const deployProjectPayload = {
-    name: projectName,
-    codeTree,
-    isCli: true,
-    language: "typescript"
-  };
   const response = await fetch(url, {
     headers,
-    method: "POST",
-    body: JSON.stringify(deployProjectPayload)
+    method: "POST"
   });
   if (!response.ok) {
     if (response.status === 401) {
@@ -223,117 +108,11 @@ async function runDeployProject(projectName, auth) {
 const projectNameSchema = exports.projectNameSchema = _zod.z.string().min(1, "Project Name is required").max(50, "Name must be 50 characters or less").regex(/^[a-z0-9]+(?:[-_][a-z0-9]+)*$/, "Name can only contain lowercase letters, numbers, hyphens, and underscores in between").refine(value => !_zod.z.string().uuid().safeParse(value).success, {
   message: "Name cannot be a UUID"
 });
-const validateProjectName = projectName => {
-  const validation = projectNameSchema.safeParse(projectName);
-  if (!validation.success) {
-    return {
-      isValid: false,
-      errorMessage: validation.error.errors[0].message
-    };
-  }
-  return {
-    isValid: true
-  };
-};
-exports.validateProjectName = validateProjectName;
-const validateIntunedProject = async () => {
-  const currentDirectoryToDeploy = process.cwd();
-  const validationSteps = [{
-    name: "build",
-    check: async () => {
-      try {
-        const buildResult = await (0, _build.runBuild)();
-        if (!buildResult) {
-          return {
-            isValid: false,
-            errorMessage: "Build failed"
-          };
-        }
-        return {
-          isValid: true
-        };
-      } catch (error) {
-        return {
-          isValid: false,
-          errorMessage: "Build failed"
-        };
-      }
-    }
-  }, {
-    name: "package.json",
-    check: async () => {
-      try {
-        const packageJsonPath = path.join(currentDirectoryToDeploy, "package.json");
-        await fs.exists(packageJsonPath);
-        const packageJson = JSON.parse(await fs.readFile(packageJsonPath, {
-          encoding: "utf-8"
-        }));
-        const userCodePlaywrightVersion = packageJson.dependencies?.playwright;
-        if (userCodePlaywrightVersion !== _constants.CURRENT_PLAYWRIGHT_VERSION) {
-          return {
-            isValid: false,
-            errorMessage: `Playwright version mismatch: expected ${_constants.CURRENT_PLAYWRIGHT_VERSION}, found ${userCodePlaywrightVersion || "none"}`
-          };
-        }
-        return {
-          isValid: true
-        };
-      } catch (error) {
-        return {
-          isValid: false,
-          errorMessage: "Package.json file not found or cannot be read"
-        };
-      }
-    }
-  }, {
-    name: "Intuned.json",
-    check: async () => {
-      try {
-        const intunedJsonPath = path.join(currentDirectoryToDeploy, "Intuned.json");
-        await fs.exists(intunedJsonPath);
-        return {
-          isValid: true
-        };
-      } catch (error) {
-        return {
-          isValid: false,
-          errorMessage: "Intuned.json file not found"
-        };
-      }
-    }
-  }, {
-    name: "api folder",
-    check: async () => {
-      try {
-        const apiFolderPath = path.join(currentDirectoryToDeploy, "api");
-        await fs.access(apiFolderPath);
-        return {
-          isValid: true
-        };
-      } catch (error) {
-        return {
-          isValid: false,
-          errorMessage: "API folder not found"
-        };
-      }
-    }
-  }];
-  for (const step of validationSteps) {
-    const result = await step.check();
-    if (!result.isValid) {
-      return result;
-    }
-  }
-  return {
-    isValid: true
-  };
-};
-exports.validateIntunedProject = validateIntunedProject;
 const checkIntunedProjectDeployStatus = async (workspaceId, projectName, apiKey) => {
   const baseUrl = (0, _helpers.getBaseUrl)();
-  const url = `${baseUrl}/api/v1/workspace/${workspaceId}/projects/create/${projectName}/result`;
+  const url = `${baseUrl}/api/v1/workspace/${workspaceId}/projects/${projectName}/deploy/result`;
   const headers = {
-    "x-api-key": apiKey,
+    [_constants2.API_KEY_HEADER_NAME]: apiKey,
     "Content-Type": "application/json"
   };
   const response = await fetch(url, {
@@ -357,58 +136,4 @@ const checkIntunedProjectDeployStatus = async (workspaceId, projectName, apiKey)
     status: "failed",
     message: `Deployment failed, please try again: ${data.message}`
   };
-};
-async function mapToIDEParams(tree) {
-  if (!tree) {
-    return;
-  }
-  if (!tree["parameters"] || "file" in tree["parameters"]) {
-    return;
-  }
-  const apiParametersMap = {};
-  const cliParameters = Object.keys(tree["parameters"].directory);
-  const ____testParameters = {
-    directory: {}
-  };
-  for (const parameterKey of cliParameters) {
-    const parameter = tree["parameters"].directory[parameterKey];
-    if ("directory" in parameter) {
-      continue;
-    }
-    if ((0, _lodash.isEmpty)(parameter.file.contents)) {
-      continue;
-    }
-    const parameterPayload = JSON.parse(parameter.file.contents);
-    if (!parameterPayload["__api-name"]) {
-      continue;
-    }
-    const api = parameterPayload["__api-name"];
-    const {
-      "__api-name": _,
-      ...parameterValue
-    } = parameterPayload;
-    const testParameter = {
-      name: parameterKey.replace(".json", ""),
-      lastUsed: false,
-      id: (0, _uuid.v4)(),
-      value: JSON.stringify(parameterValue)
-    };
-    if (!apiParametersMap[api]) {
-      apiParametersMap[api] = [];
-    }
-    apiParametersMap[api].push(testParameter);
-  }
-  for (const api in apiParametersMap) {
-    if (apiParametersMap[api].length > 0) {
-      apiParametersMap[api][apiParametersMap[api].length - 1].lastUsed = true;
-    }
-    ____testParameters.directory[`${api}.json`] = {
-      file: {
-        contents: JSON.stringify(apiParametersMap[api], null, 2)
-      }
-    };
-  }
-  delete tree["parameters"];
-  tree["____testParameters"] = ____testParameters;
-  return;
-}
+};

package/dist/commands/intuned-cli/controller/save.d.ts

@@ -0,0 +1,14 @@
+import { z } from "zod";
+import type { AuthCredentials } from "../types";
+export declare function runSaveProject(projectName: string, auth: AuthCredentials): Promise<void>;
+export declare const projectNameSchema: z.ZodEffects<z.ZodString, string, string>;
+export declare const validateProjectName: (projectName: string) => {
+    isValid: true;
+} | {
+    isValid: false;
+    errorMessage: string;
+};
+export declare const validateIntunedProject: () => Promise<{
+    isValid: boolean;
+    errorMessage?: string;
+}>;