@intuned/runtime-dev 1.3.8-deploy.1 → 1.3.8-deploy.11

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

@@ -15,15 +15,17 @@ var _save = require("./save");
 var _constants2 = require("../../../common/constants");
 var _path = _interopRequireDefault(require("path"));
 var fs = _interopRequireWildcard(require("fs-extra"));
+var _prompts = _interopRequireDefault(require("prompts"));
+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 _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 async function runDeployProject(projectName, auth) {
   const result = await (0, _save.runSaveProject)(projectName, auth);
-  const state = result?.state ?? "not-deployed";
-  let firstRun = undefined;
-  if (state === "not-deployed") {
-    firstRun = await handleFirstRunExperience();
+  const shouldPromptFirstRunExperience = result?.state === "UNPUBLISHED";
+  let firstRunInfo = undefined;
+  const settings = await (0, _helpers.loadIntunedJson)();
+  if (shouldPromptFirstRunExperience) {
+    firstRunInfo = await promptFirstRunExperience(settings);
   }
   const {
     workspaceId,
@@ -39,7 +41,7 @@ async function runDeployProject(projectName, auth) {
     headers,
     method: "POST",
     body: JSON.stringify({
-      firstRun: firstRun
+      firstRunInfo
     })
   });
   if (!response.ok) {
@@ -97,12 +99,39 @@ async function runDeployProject(projectName, auth) {
       }
       if (status === "completed") {
         const url = (0, _helpers.getBaseUrl)();
-        const projectUrl = `${url}/projects/${projectId}`;
+        const hasDefaultJob = await getDefaultJobExists({
+          baseUrl,
+          workspaceId,
+          projectName,
+          apiKey
+        });
         (0, _terminal.terminal)(`\n^g^+Project deployed successfully!^:\n`);
-        (0, _terminal.terminal)(`^+View project:^s ^c^_${projectUrl}/runs^:\n`);
-        (0, _terminal.terminal)(`^+Run playground:^s ^c^_${projectUrl}/runs?playground=open^:\n`);
-        (0, _terminal.terminal)(`^+Manage jobs:^s ^c^_${projectUrl}/jobs^:\n`);
-        (0, _terminal.terminal)(`^+Trigger default job:^s ^c^_${projectUrl}/jobs/default?action=trigger^:\n`);
+        const projectUrl = `${url}/projects/${projectId}`;
+        const runsUrl = `${projectUrl}/runs`;
+        const jobsUrl = `${projectUrl}/jobs`;
+        const runsPlaygroundUrl = `${runsUrl}?playground=open`;
+        const defaultJobTriggerUrl = `${jobsUrl}/default?action=trigger`;
+        const terminalLink = (await Promise.resolve().then(() => _interopRequireWildcard(require("terminal-link")))).default;
+        if (terminalLink.isSupported) {
+          (0, _terminal.terminal)(`^+[${terminalLink("View project", projectUrl)}]^ `);
+          if (settings.apiAccess.enabled) {
+            (0, _terminal.terminal)(`^+[${terminalLink("Run playground", runsPlaygroundUrl)}]^ `);
+          }
+          (0, _terminal.terminal)(`^+[${terminalLink("Manage jobs", jobsUrl)}]^ `);
+          if (hasDefaultJob) {
+            (0, _terminal.terminal)(`^+[${terminalLink("Trigger default job", defaultJobTriggerUrl)}]^ `);
+          }
+          (0, _terminal.terminal)("\n");
+        } else {
+          (0, _terminal.terminal)(`^+View project:^s ^c^_${projectUrl}/runs^:\n`);
+          if (settings.apiAccess.enabled) {
+            (0, _terminal.terminal)(`^+Run playground:^s ^c^_${projectUrl}/runs?playground=open^:\n`);
+          }
+          (0, _terminal.terminal)(`^+Manage jobs:^s ^c^_${projectUrl}/jobs^:\n`);
+          if (hasDefaultJob) {
+            (0, _terminal.terminal)(`^+Trigger default job:^s ^c^_${projectUrl}/jobs/default?action=trigger^:\n`);
+          }
+        }
         return;
       }
       let errorMessage = `^r^+An error occurred while deploying project:^:\n^R${message}^:\n`;
@@ -154,13 +183,12 @@ const checkIntunedProjectDeployStatus = async (workspaceId, projectName, apiKey)
   };
 };
 {}
-async function handleFirstRunExperience() {
-  let testAuthSessionInput = null;
-  const settings = await (0, _helpers.loadIntunedJson)();
+async function promptFirstRunExperience(settings) {
+  let testAuthSessionInput = undefined;
   const shouldPromptForTestAuthSession = settings.authSessions.enabled && settings.authSessions.type === "API";
   let shouldPromptForDefaultJob = true;
   if (shouldPromptForTestAuthSession) {
-    testAuthSessionInput = getFirstRunExperienceTestAuthSessionParameters({
+    testAuthSessionInput = await promptFirstRunExperienceTestAuthSessionParameters({
       shouldPromptForDefaultJob
     });
     if (!testAuthSessionInput) {
@@ -169,10 +197,12 @@ async function handleFirstRunExperience() {
   }
   return {
     testAuthSessionInput,
-    defaultJobInput: shouldPromptForDefaultJob ? getFirstRunExperienceDefaultJobParameters(settings["metadata"].defaultJobInput) : undefined
+    defaultJobInput: shouldPromptForDefaultJob ? await promptFirstRunExperienceDefaultJobParameters({
+      defaultJobInput: settings["metadata"].defaultJobInput
+    }) : undefined
   };
 }
-async function getFirstRunExperienceTestAuthSessionParameters({
+async function promptFirstRunExperienceTestAuthSessionParameters({
   shouldPromptForDefaultJob
 }) {
   const authSessionsDirectoryPath = _path.default.join(process.cwd(), _constants2.AUTH_SESSIONS_INSTANCES_FOLDER_NAME);
@@ -182,29 +212,56 @@ async function getFirstRunExperienceTestAuthSessionParameters({
       metadata
     } = await (0, _helpers.loadAuthSessionInstance)(authSessionId);
     if (metadata.authSessionInput) {
-      const message = shouldPromptForDefaultJob ? "\n^cCreate a test auth session using ^:^+%s^:^c's parameters? (required for creating default job)^ " : "\n^cCreate a test auth session using ^:^+%s^:^c's parameters?^ ";
-      (0, _terminal.terminal)(message, authSessionId);
-      const answer = await _terminal.terminal.yesOrNo({
-        yes: ["y", "ENTER"],
-        no: ["n"]
-      }).promise;
-      (0, _terminal.terminal)("\n");
-      if (answer) {
+      const message = shouldPromptForDefaultJob ? `^:^+Create a test auth session using^ ^c${authSessionId}^:^+ parameters?^ ^/(required for creating default job)^:` : `^:^+Create a test auth session using^ ^c${authSessionId}^:^+ parameters?^:`;
+      const {
+        value
+      } = await (0, _prompts.default)({
+        type: "confirm",
+        name: "value",
+        message: _terminal.terminal.str(message).toString(),
+        initial: true
+      });
+      if (value) {
         return metadata.authSessionInput;
       }
     }
   }
 }
-async function getFirstRunExperienceDefaultJobParameters({
+async function promptFirstRunExperienceDefaultJobParameters({
   defaultJobInput
 }) {
-  (0, _terminal.terminal)("\n^cCreate a default job?^");
-  const answer = await _terminal.terminal.yesOrNo({
-    yes: ["y", "ENTER"],
-    no: ["n"]
-  }).promise;
-  (0, _terminal.terminal)("\n");
-  if (answer) {
+  const {
+    value
+  } = await (0, _prompts.default)({
+    type: "confirm",
+    name: "value",
+    message: _terminal.terminal.str(`^:^+Create a default job with sample parameters?^:`).toString(),
+    initial: true
+  });
+  if (value) {
     return defaultJobInput;
   }
+}
+async function getDefaultJobExists({
+  baseUrl,
+  workspaceId,
+  projectName,
+  apiKey
+}) {
+  const url = `${baseUrl}/api/v1/workspace/${workspaceId}/projects/${projectName}/jobs/default`;
+  const headers = {
+    [_constants2.API_KEY_HEADER_NAME]: apiKey,
+    "Content-Type": "application/json"
+  };
+  const response = await fetch(url, {
+    headers,
+    method: "GET"
+  });
+  if (response.status === 404) {
+    return false;
+  }
+  if (!response.ok) {
+    throw new _helpers.CLIError(`Error checking default job existence ${response.status}: ${await response.text()}`);
+  }
+  return true;
 }

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

@@ -2,7 +2,7 @@ import { z } from "zod";
 import type { AuthCredentials } from "../types";
 export declare function runSaveProject(projectName: string, auth: AuthCredentials): Promise<{
     projectId: string;
-    state: string;
+    state: string | undefined;
 } | undefined>;
 export declare const projectNameSchema: z.ZodEffects<z.ZodString, string, string>;
 export declare const validateProjectName: (projectName: string) => {

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

@@ -33,7 +33,8 @@ const saveProjectApiResponseSchema = _zod.z.string().transform((val, ctx) => {
     return _zod.z.NEVER;
   }
 }).pipe(_zod.z.object({
-  id: _zod.z.string().uuid()
+  id: _zod.z.string().uuid(),
+  state: _zod.z.string().optional()
 }));
 async function runSaveProject(projectName, auth) {
   const {
@@ -86,7 +87,8 @@ async function runSaveProject(projectName, auth) {
     return;
   }
   const {
-    id: projectId
+    id: projectId,
+    state
   } = parseResult.data;
   const dotEnvPath = path.join(projectPath, ".env");
   if (!(await fs.exists(dotEnvPath))) {
@@ -113,7 +115,7 @@ ${_constants2.API_KEY_ENV_VAR_KEY}=${apiKey}`);
   }
   return {
     projectId,
-    state: "not-deployed"
+    state
   };
 }
 const projectNameSchema = exports.projectNameSchema = _zod.z.string().min(1, "Project Name is required").max(200, "Name must be 200 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, {

package/dist/commands/intuned-cli/helpers/backend.js

@@ -23,5 +23,5 @@ async function getAuthCredentials(options) {
   };
 }
 function getBaseUrl() {
-  return process.env[_constants.API_BASE_URL_ENV_VAR_KEY] || process.env.INTUNED_API_DOMAIN || `https://app.intuned.io`;
+  return new URL(process.env[_constants.API_BASE_URL_ENV_VAR_KEY] || process.env.INTUNED_API_DOMAIN || `https://app.intuned.io`).origin;
 }

package/dist/commands/intuned-cli/helpers/intunedJson.d.ts

@@ -1,30 +1,43 @@
 import { z } from "zod";
-export declare const intunedJsonSchema: z.ZodObject<{
-    authSessions: z.ZodUnion<[z.ZodObject<{
+export declare const intunedJsonSchema: z.ZodIntersection<z.ZodObject<{
+    projectName: z.ZodOptional<z.ZodString>;
+    workspaceId: z.ZodOptional<z.ZodString>;
+}, "passthrough", z.ZodTypeAny, z.objectOutputType<{
+    projectName: z.ZodOptional<z.ZodString>;
+    workspaceId: z.ZodOptional<z.ZodString>;
+}, z.ZodTypeAny, "passthrough">, z.objectInputType<{
+    projectName: z.ZodOptional<z.ZodString>;
+    workspaceId: z.ZodOptional<z.ZodString>;
+}, z.ZodTypeAny, "passthrough">>, z.ZodUnion<[z.ZodObject<{
+    authSessions: z.ZodObject<{
         enabled: z.ZodLiteral<false>;
     }, "strip", z.ZodTypeAny, {
         enabled: false;
     }, {
         enabled: false;
-    }>, z.ZodObject<{
-        enabled: z.ZodLiteral<true>;
-        type: z.ZodEnum<["MANUAL", "API"]>;
-        startUrl: z.ZodOptional<z.ZodString>;
-        finishUrl: z.ZodOptional<z.ZodString>;
+    }>;
+    apiAccess: z.ZodObject<{
+        enabled: z.ZodLiteral<false>;
     }, "strip", z.ZodTypeAny, {
-        type: "API" | "MANUAL";
-        enabled: true;
-        startUrl?: string | undefined;
-        finishUrl?: string | undefined;
+        enabled: false;
     }, {
-        type: "API" | "MANUAL";
-        enabled: true;
-        startUrl?: string | undefined;
-        finishUrl?: string | undefined;
-    }>]>;
-    projectName: z.ZodOptional<z.ZodString>;
-    workspaceId: z.ZodOptional<z.ZodString>;
-}, "passthrough", z.ZodTypeAny, z.objectOutputType<{
+        enabled: false;
+    }>;
+}, "strip", z.ZodTypeAny, {
+    authSessions: {
+        enabled: false;
+    };
+    apiAccess: {
+        enabled: false;
+    };
+}, {
+    authSessions: {
+        enabled: false;
+    };
+    apiAccess: {
+        enabled: false;
+    };
+}>, z.ZodObject<{
     authSessions: z.ZodUnion<[z.ZodObject<{
         enabled: z.ZodLiteral<false>;
     }, "strip", z.ZodTypeAny, {
@@ -47,62 +60,65 @@ export declare const intunedJsonSchema: z.ZodObject<{
         startUrl?: string | undefined;
         finishUrl?: string | undefined;
     }>]>;
-    projectName: z.ZodOptional<z.ZodString>;
-    workspaceId: z.ZodOptional<z.ZodString>;
-}, z.ZodTypeAny, "passthrough">, z.objectInputType<{
-    authSessions: z.ZodUnion<[z.ZodObject<{
-        enabled: z.ZodLiteral<false>;
+    apiAccess: z.ZodObject<{
+        enabled: z.ZodLiteral<true>;
     }, "strip", z.ZodTypeAny, {
-        enabled: false;
+        enabled: true;
     }, {
+        enabled: true;
+    }>;
+}, "strip", z.ZodTypeAny, {
+    authSessions: {
         enabled: false;
-    }>, z.ZodObject<{
-        enabled: z.ZodLiteral<true>;
-        type: z.ZodEnum<["MANUAL", "API"]>;
-        startUrl: z.ZodOptional<z.ZodString>;
-        finishUrl: z.ZodOptional<z.ZodString>;
-    }, "strip", z.ZodTypeAny, {
+    } | {
         type: "API" | "MANUAL";
         enabled: true;
         startUrl?: string | undefined;
         finishUrl?: string | undefined;
-    }, {
+    };
+    apiAccess: {
+        enabled: true;
+    };
+}, {
+    authSessions: {
+        enabled: false;
+    } | {
         type: "API" | "MANUAL";
         enabled: true;
         startUrl?: string | undefined;
         finishUrl?: string | undefined;
-    }>]>;
-    projectName: z.ZodOptional<z.ZodString>;
-    workspaceId: z.ZodOptional<z.ZodString>;
-}, z.ZodTypeAny, "passthrough">>;
+    };
+    apiAccess: {
+        enabled: true;
+    };
+}>]>>;
 export type IntunedJson = z.infer<typeof intunedJsonSchema>;
 export declare const intunedSettingsFileNames: readonly ["Intuned.json", "Intuned.jsonc", "Intuned.yaml", "Intuned.yml", "Intuned.toml"];
-export declare function loadIntunedJson(): Promise<z.objectOutputType<{
-    authSessions: z.ZodUnion<[z.ZodObject<{
-        enabled: z.ZodLiteral<false>;
-    }, "strip", z.ZodTypeAny, {
+export declare function loadIntunedJson(): Promise<{
+    projectName?: string | undefined;
+    workspaceId?: string | undefined;
+} & {
+    [k: string]: unknown;
+} & ({
+    authSessions: {
         enabled: false;
-    }, {
+    };
+    apiAccess: {
         enabled: false;
-    }>, z.ZodObject<{
-        enabled: z.ZodLiteral<true>;
-        type: z.ZodEnum<["MANUAL", "API"]>;
-        startUrl: z.ZodOptional<z.ZodString>;
-        finishUrl: z.ZodOptional<z.ZodString>;
-    }, "strip", z.ZodTypeAny, {
+    };
+} | {
+    authSessions: {
+        enabled: false;
+    } | {
         type: "API" | "MANUAL";
         enabled: true;
         startUrl?: string | undefined;
         finishUrl?: string | undefined;
-    }, {
-        type: "API" | "MANUAL";
+    };
+    apiAccess: {
         enabled: true;
-        startUrl?: string | undefined;
-        finishUrl?: string | undefined;
-    }>]>;
-    projectName: z.ZodOptional<z.ZodString>;
-    workspaceId: z.ZodOptional<z.ZodString>;
-}, z.ZodTypeAny, "passthrough">>;
+    };
+})>;
 export declare function getIntunedSettingsFile(): Promise<{
     name: typeof intunedSettingsFileNames[number];
     path: string;

package/dist/commands/intuned-cli/helpers/intunedJson.js

@@ -18,6 +18,16 @@ function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return
 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 _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const intunedJsonSchema = exports.intunedJsonSchema = _zod.z.object({
+  projectName: _zod.z.string().optional(),
+  workspaceId: _zod.z.string().optional()
+}).passthrough().and(_zod.z.union([_zod.z.object({
+  authSessions: _zod.z.object({
+    enabled: _zod.z.literal(false)
+  }),
+  apiAccess: _zod.z.object({
+    enabled: _zod.z.literal(false)
+  })
+}), _zod.z.object({
   authSessions: _zod.z.union([_zod.z.object({
     enabled: _zod.z.literal(false)
   }), _zod.z.object({
@@ -26,9 +36,10 @@ const intunedJsonSchema = exports.intunedJsonSchema = _zod.z.object({
     startUrl: _zod.z.string().optional(),
     finishUrl: _zod.z.string().optional()
   })]),
-  projectName: _zod.z.string().optional(),
-  workspaceId: _zod.z.string().optional()
-}).passthrough();
+  apiAccess: _zod.z.object({
+    enabled: _zod.z.literal(true)
+  })
+})]));
 const intunedSettingsFileNames = exports.intunedSettingsFileNames = ["Intuned.json", "Intuned.jsonc", "Intuned.yaml", "Intuned.yml", "Intuned.toml"];
 async function loadIntunedJson() {
   const settingsFile = await getIntunedSettingsFile();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@intuned/runtime-dev",
-  "version": "1.3.8-deploy.1",
+  "version": "1.3.8-deploy.11",
   "description": "Intuned runtime",
   "exports": {
     ".": "./dist/index.js",
@@ -83,10 +83,12 @@
     "portfinder": "^1.0.37",
     "prettier": "2.8.0",
     "promptly": "3.2.0",
+    "prompts": "^2.4.2",
     "rollup": "3.26.2",
     "smol-toml": "^1.4.2",
     "source-map": "0.7.4",
     "terminal-kit": "^3.1.2",
+    "terminal-link": "^5.0.0",
     "ts-morph": "21.0.1",
     "ts-node": "10.9.1",
     "tslib": "2.6.0",
@@ -108,6 +110,7 @@
     "@types/jsdom": "^21.1.1",
     "@types/ms": "^2.1.0",
     "@types/promptly": "^3.0.4",
+    "@types/prompts": "^2.4.9",
     "@types/terminal-kit": "^2.5.7",
     "@types/wait-on": "^5.3.4",
     "@typescript-eslint/eslint-plugin": "^5.47.1",