@forgehive/forge-cli 0.2.10 → 0.2.11

package/dist/index.js

@@ -7,9 +7,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const minimist_1 = __importDefault(require("minimist"));
 const runner_1 = __importDefault(require("./runner"));
 const args = (0, minimist_1.default)(process.argv.slice(2));
-runner_1.default.handler(args).then(data => {
+runner_1.default.handler(args).then((data) => {
+    const { silent, outcome, result } = data;
+    if (silent) {
+        return;
+    }
     console.log('===============================================');
-    console.log('Outcome', data);
+    console.log(`Outcome: ${outcome}`);
+    console.log('===============================================');
+    console.log('Result', result);
     console.log('===============================================');
 }).catch((e) => {
     console.error(e);

package/dist/runner.js

@@ -57,9 +57,10 @@ runner.load('auth:remove', remove_3.remove);
 runner.setHandler(async (data) => {
     const parsedArgs = runner.parseArguments(data);
     const { taskName, action, args } = parsedArgs;
-    console.log('========================================');
+    console.log('===============================================');
     console.log(`Running: ${taskName} ${action ? action : ''} ${JSON.stringify(args)}`);
-    console.log('========================================');
+    console.log('===============================================');
+    let silent = false;
     const task = runner.getTask(taskName);
     if (!task) {
         throw new Error(`Task "${taskName}" not found`);
@@ -111,6 +112,7 @@ runner.setHandler(async (data) => {
                 descriptorName: action,
                 uuid
             });
+            silent = true;
         }
         else if (taskName === 'auth:add') {
             const { apiKey, apiSecret, url } = args;
@@ -130,6 +132,7 @@ runner.setHandler(async (data) => {
             result = await task.run(args);
         }
         return {
+            silent,
             outcome: 'Success',
             taskName,
             result

package/dist/tasks/fixture/download.d.ts

@@ -1,6 +1,7 @@
 import { Profile } from '../types';
 interface FixtureData {
     name: string;
+    boundaries: Record<string, unknown>;
     [key: string]: unknown;
 }
 interface FixtureResponse {
@@ -17,10 +18,10 @@ export declare const download: import("@forgehive/task").TaskInstanceType<(argv:
     persistFixture: (filePath: string, data: FixtureData) => Promise<{
         path: string;
     }>;
-    checkFileExists: (filePath: string) => Promise<boolean>;
 }>) => Promise<{
     status: string;
     path: string;
+    shortPath: string;
 }>, {
     loadCurrentProfile: (args: {}) => Promise<Promise<Profile>>;
     loadConf: (args: {}) => Promise<Promise<import("../types").ForgeConf>>;
@@ -29,6 +30,5 @@ export declare const download: import("@forgehive/task").TaskInstanceType<(argv:
     persistFixture: (filePath: string, data: FixtureData) => Promise<{
         path: string;
     }>;
-    checkFileExists: (filePath: string) => Promise<boolean>;
 }>;
 export {};

package/dist/tasks/fixture/download.js

@@ -43,20 +43,12 @@ const boundaries = {
         return {
             path: filePath
         };
-    },
-    checkFileExists: async (filePath) => {
-        try {
-            await promises_1.default.access(filePath);
-            return true;
-        }
-        catch {
-            return false;
-        }
     }
 };
-exports.download = (0, task_1.createTask)(schema, boundaries, async function ({ uuid }, { downloadFixture, getCwd, persistFixture, checkFileExists, loadCurrentProfile, loadConf }) {
+exports.download = (0, task_1.createTask)(schema, boundaries, async function ({ uuid }, { downloadFixture, getCwd, persistFixture, loadCurrentProfile, loadConf }) {
     console.log('==================================================');
     console.log(`Attempting to download fixture with uuid: ${uuid}`);
+    console.log('==================================================');
     const profile = await loadCurrentProfile({});
     const cwd = await getCwd();
     const forge = await loadConf({});
@@ -73,34 +65,35 @@ exports.download = (0, task_1.createTask)(schema, boundaries, async function ({
         }
         throw new Error('Failed to download fixture');
     }
-    // Extract task descriptor from the response
-    const taskName = response.fixture.name;
+    const fixture = response.fixture;
+    const taskName = fixture.taskName;
     // Determine the output path using forge fixtures path and task descriptor
     const fixturesBasePath = forge.paths.fixtures || 'fixtures';
     const fixtureDir = path_1.default.join(fixturesBasePath, taskName);
     const fixturePath = path_1.default.join(fixtureDir, `${uuid}.json`);
     const filePath = path_1.default.resolve(cwd, fixturePath);
-    console.log(`Fixture will be saved to: ${filePath}`);
-    // Check if file already exists
-    const fileExists = await checkFileExists(filePath);
-    if (fileExists) {
-        console.log(`Fixture will be updated at ${filePath}`);
-    }
-    console.log(`
-    ==================================================
-    Starting fixture download!
-    Fixture UUID: ${uuid}
-    Task Name: ${taskName}
-    Saving to: ${filePath}
-    ==================================================
-    Replay with: forge task:replay --path ${filePath}
-    ==================================================
-    `);
     // Persist fixture to file
     await persistFixture(filePath, response.fixture);
+    // Get the relative path for display in the replay command
+    const shortPath = path_1.default.join(taskName, `${uuid}.json`);
+    console.log(`
+==================================================
+Fixture download completed!
+==================================================
+Fixture UUID: ${uuid}
+Task Name: ${taskName}
+Saved to: ${filePath}
+==================================================
+Boundaries: ${Object.keys(fixture.boundaries).join(', ')}
+==================================================
+Replay with:
+forge task:replay ${taskName} --path ${shortPath}
+==================================================
+    `);
     return {
         status: 'Downloaded',
-        path: filePath
+        path: filePath,
+        shortPath: shortPath
     };
 });
 exports.download.setDescription(description);

package/dist/tasks/task/replay.d.ts

@@ -1,7 +1,8 @@
 import { type ForgeConf, type Profile } from '../types';
 interface Fixture {
     fixtureUUID: string;
-    name: string;
+    taskName: string;
+    projectName: string;
     type: 'success' | 'error';
     input: Record<string, unknown>;
     output: Record<string, unknown>;
@@ -10,6 +11,7 @@ interface Fixture {
 }
 export declare const replay: import("@forgehive/task").TaskInstanceType<(argv: {
     path: string;
+    descriptorName: string;
     cache?: string | undefined;
 }, boundaries: import("@forgehive/task").WrappedBoundaries<{
     readFixture: (filePath: string) => Promise<Fixture>;

package/dist/tasks/task/replay.js

@@ -19,6 +19,7 @@ const load_2 = require("../conf/load");
 const loadCurrent_1 = require("../auth/loadCurrent");
 const description = 'Replay a task execution from a specified path';
 const schema = new schema_1.Schema({
+    descriptorName: schema_1.Schema.string(),
     path: schema_1.Schema.string(),
     cache: schema_1.Schema.string().optional()
 });
@@ -79,18 +80,23 @@ const boundaries = {
         }
     }
 };
-exports.replay = (0, task_1.createTask)(schema, boundaries, async function (argv, { readFixture, loadConf, loadCurrentProfile, bundleCreate, bundleLoad, ensureBuildsFolder, verifyLogFolder, sendLogToAPI }) {
-    console.log('Input path:', argv.path);
-    // Read the file from the provided path
-    const fixture = await readFixture(argv.path);
+exports.replay = (0, task_1.createTask)(schema, boundaries, async function ({ descriptorName, path: fixturePath, cache }, { readFixture, loadConf, loadCurrentProfile, bundleCreate, bundleLoad, ensureBuildsFolder, verifyLogFolder, sendLogToAPI }) {
+    console.log('Input descriptorName:', descriptorName);
+    console.log('Input path:', fixturePath);
+    console.log('Input cache:', cache);
     // Load forge configuration
     const forge = await loadConf({});
-    const taskName = fixture.name;
-    const taskDescriptor = forge.tasks[taskName];
+    const taskDescriptor = forge.tasks[descriptorName];
     const projectName = forge.project.name;
     if (taskDescriptor === undefined) {
-        throw new Error(`Task ${taskName} is not defined in forge.json`);
+        throw new Error(`Task ${descriptorName} is not defined in forge.json`);
     }
+    // Resolve the fixture path (check if absolute, if not make it relative to logs folder)
+    const resolvedFixturePath = path_1.default.isAbsolute(fixturePath)
+        ? fixturePath
+        : path_1.default.join(process.cwd(), forge.paths.fixtures, fixturePath);
+    // Read the file from the provided path
+    const fixture = await readFixture(resolvedFixturePath);
     // Try to load profile, but continue if not found
     let profile = null;
     try {
@@ -109,7 +115,7 @@ exports.replay = (0, task_1.createTask)(schema, boundaries, async function (argv
     // Prepare paths
     const entryPoint = path_1.default.join(process.cwd(), taskDescriptor.path);
     const buildsPath = await ensureBuildsFolder();
-    const outputFile = path_1.default.join(buildsPath, `${taskName}.js`);
+    const outputFile = path_1.default.join(buildsPath, `${descriptorName}.js`);
     // Bundle the task
     await bundleCreate({
         entryPoint,
@@ -126,20 +132,21 @@ exports.replay = (0, task_1.createTask)(schema, boundaries, async function (argv
     }
     // Configure boundaries based on cache parameter if provided
     const boundaryConfig = {};
-    if (argv.cache) {
+    if (cache) {
         // Parse the comma-separated list and trim each item
-        const cacheBoundaries = argv.cache.split(',').map(b => b.trim());
+        const cacheBoundaries = cache.split(',').map((b) => b.trim());
         // Log which boundaries will use cache mode
         if (cacheBoundaries.length > 0) {
             // Set each specified boundary to 'replay' mode
-            cacheBoundaries.forEach(boundary => {
+            cacheBoundaries.forEach((boundary) => {
                 boundaryConfig[boundary] = 'replay';
             });
         }
     }
     console.log('==================================================');
     console.log('UUID:', fixture.fixtureUUID);
-    console.log('Name:', fixture.name);
+    console.log('Task name:', fixture.taskName);
+    console.log('Project name:', fixture.projectName);
     console.log('Context:', fixture.context);
     console.log('==================================================');
     console.log('Replay:', fixture.input);
@@ -158,7 +165,7 @@ exports.replay = (0, task_1.createTask)(schema, boundaries, async function (argv
     // Send the log to API if profile is available
     if (profile) {
         try {
-            await sendLogToAPI(profile, projectName, taskName, record, fixture.fixtureUUID);
+            await sendLogToAPI(profile, projectName, descriptorName, record, fixture.fixtureUUID);
         }
         catch (e) {
             console.error('Failed to send log to API:', e);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forgehive/forge-cli",
-  "version": "0.2.10",
+  "version": "0.2.11",
   "description": "TypeScript CLI application",
   "license": "MIT",
   "main": "dist/index.js",
@@ -10,10 +10,10 @@
   "publishConfig": {
     "access": "public",
     "dependencies": {
-      "@forgehive/record-tape": "^0.1.3",
-      "@forgehive/runner": "^0.1.9",
+      "@forgehive/record-tape": "^0.1.4",
+      "@forgehive/runner": "^0.1.10",
       "@forgehive/schema": "^0.1.4",
-      "@forgehive/task": "^0.1.9",
+      "@forgehive/task": "^0.1.11",
       "esbuild": "^0.25.0",
       "handlebars": "^4.7.8",
       "minimist": "^1.2.8"
@@ -25,10 +25,10 @@
     "esbuild": "^0.25.0",
     "handlebars": "^4.7.8",
     "minimist": "^1.2.8",
-    "@forgehive/runner": "0.1.9",
+    "@forgehive/runner": "0.1.10",
+    "@forgehive/record-tape": "0.1.4",
     "@forgehive/schema": "0.1.4",
-    "@forgehive/task": "0.1.9",
-    "@forgehive/record-tape": "0.1.3"
+    "@forgehive/task": "0.1.11"
   },
   "devDependencies": {
     "@types/jest": "^29.5.3",

package/src/index.ts

@@ -5,9 +5,23 @@ import runner from './runner'
 
 const args = minimist(process.argv.slice(2))
 
-runner.handler(args).then(data => {
+type RunnerResult = {
+  silent: boolean
+  outcome: 'Success' | 'Failure'
+  taskName: string
+  result: unknown
+}
+
+runner.handler(args).then((data) => {
+  const { silent, outcome, result } = data as RunnerResult
+  if (silent) {
+    return
+  }
+
+  console.log('===============================================')
+  console.log(`Outcome: ${outcome}`)
   console.log('===============================================')
-  console.log('Outcome', data)
+  console.log('Result', result)
   console.log('===============================================')
 }).catch((e) => {
   console.error(e)

package/src/runner.ts

@@ -72,10 +72,11 @@ runner.setHandler(async (data: ParsedArgs): Promise<unknown> => {
   const parsedArgs = runner.parseArguments(data)
   const { taskName, action, args } = parsedArgs
 
-  console.log('========================================')
+  console.log('===============================================')
   console.log(`Running: ${taskName} ${action ? action : ''} ${JSON.stringify(args)}`)
-  console.log('========================================')
+  console.log('===============================================')
 
+  let silent = false
   const task = runner.getTask(taskName)
   if (!task) {
     throw new Error(`Task "${taskName}" not found`)
@@ -128,6 +129,7 @@ runner.setHandler(async (data: ParsedArgs): Promise<unknown> => {
         descriptorName: action,
         uuid
       })
+      silent = true
     } else if (taskName === 'auth:add') {
       const { apiKey, apiSecret, url } = args as { name: string, apiKey: string, apiSecret: string, url: string }
 
@@ -146,6 +148,7 @@ runner.setHandler(async (data: ParsedArgs): Promise<unknown> => {
     }
 
     return {
+      silent,
       outcome: 'Success',
       taskName,
       result

package/src/tasks/fixture/download.ts

@@ -14,6 +14,7 @@ import { Profile } from '../types'
 // Define the Fixture data structure
 interface FixtureData {
   name: string;
+  boundaries: Record<string, unknown>;
   [key: string]: unknown;
 }
 
@@ -58,14 +59,6 @@ const boundaries = {
     return {
       path: filePath
     }
-  },
-  checkFileExists: async (filePath: string): Promise<boolean> => {
-    try {
-      await fs.access(filePath)
-      return true
-    } catch {
-      return false
-    }
   }
 }
 
@@ -76,12 +69,12 @@ export const download = createTask(
     downloadFixture,
     getCwd,
     persistFixture,
-    checkFileExists,
     loadCurrentProfile,
     loadConf
   }) {
     console.log('==================================================')
     console.log(`Attempting to download fixture with uuid: ${uuid}`)
+    console.log('==================================================')
 
     const profile = await loadCurrentProfile({})
     const cwd = await getCwd()
@@ -102,8 +95,8 @@ export const download = createTask(
       throw new Error('Failed to download fixture')
     }
 
-    // Extract task descriptor from the response
-    const taskName = response.fixture.name
+    const fixture = response.fixture as FixtureData
+    const taskName = fixture.taskName as string
 
     // Determine the output path using forge fixtures path and task descriptor
     const fixturesBasePath = forge.paths.fixtures || 'fixtures'
@@ -111,31 +104,31 @@ export const download = createTask(
     const fixturePath = path.join(fixtureDir, `${uuid}.json`)
     const filePath = path.resolve(cwd, fixturePath)
 
-    console.log(`Fixture will be saved to: ${filePath}`)
+    // Persist fixture to file
+    await persistFixture(filePath, response.fixture)
 
-    // Check if file already exists
-    const fileExists = await checkFileExists(filePath)
-    if (fileExists) {
-      console.log(`Fixture will be updated at ${filePath}`)
-    }
+    // Get the relative path for display in the replay command
+    const shortPath = path.join(taskName, `${uuid}.json`)
 
     console.log(`
-    ==================================================
-    Starting fixture download!
-    Fixture UUID: ${uuid}
-    Task Name: ${taskName}
-    Saving to: ${filePath}
-    ==================================================
-    Replay with: forge task:replay --path ${filePath}
-    ==================================================
+==================================================
+Fixture download completed!
+==================================================
+Fixture UUID: ${uuid}
+Task Name: ${taskName}
+Saved to: ${filePath}
+==================================================
+Boundaries: ${Object.keys(fixture.boundaries).join(', ')}
+==================================================
+Replay with:
+forge task:replay ${taskName} --path ${shortPath}
+==================================================
     `)
 
-    // Persist fixture to file
-    await persistFixture(filePath, response.fixture)
-
     return {
       status: 'Downloaded',
-      path: filePath
+      path: filePath,
+      shortPath: shortPath
     }
   }
 )

package/src/tasks/task/replay.ts

@@ -18,7 +18,8 @@ import { type ForgeConf, type Profile } from '../types'
 // Define the fixture structure type
 interface Fixture {
   fixtureUUID: string;
-  name: string;
+  taskName: string;
+  projectName: string;
   type: 'success' | 'error';
   input: Record<string, unknown>;
   output: Record<string, unknown>;
@@ -29,6 +30,7 @@ interface Fixture {
 const description = 'Replay a task execution from a specified path'
 
 const schema = new Schema({
+  descriptorName: Schema.string(),
   path: Schema.string(),
   cache: Schema.string().optional()
 })
@@ -97,22 +99,28 @@ const boundaries = {
 export const replay = createTask(
   schema,
   boundaries,
-  async function (argv, { readFixture, loadConf, loadCurrentProfile, bundleCreate, bundleLoad, ensureBuildsFolder, verifyLogFolder, sendLogToAPI }) {
-    console.log('Input path:', argv.path)
-
-    // Read the file from the provided path
-    const fixture = await readFixture(argv.path)
+  async function ({ descriptorName, path: fixturePath, cache }, { readFixture, loadConf, loadCurrentProfile, bundleCreate, bundleLoad, ensureBuildsFolder, verifyLogFolder, sendLogToAPI }) {
+    console.log('Input descriptorName:', descriptorName)
+    console.log('Input path:', fixturePath)
+    console.log('Input cache:', cache)
 
     // Load forge configuration
     const forge: ForgeConf = await loadConf({})
-    const taskName = fixture.name
-    const taskDescriptor = forge.tasks[taskName as keyof typeof forge.tasks]
+    const taskDescriptor = forge.tasks[descriptorName as keyof typeof forge.tasks]
     const projectName = forge.project.name
 
     if (taskDescriptor === undefined) {
-      throw new Error(`Task ${taskName} is not defined in forge.json`)
+      throw new Error(`Task ${descriptorName} is not defined in forge.json`)
     }
 
+    // Resolve the fixture path (check if absolute, if not make it relative to logs folder)
+    const resolvedFixturePath = path.isAbsolute(fixturePath)
+      ? fixturePath
+      : path.join(process.cwd(), forge.paths.fixtures, fixturePath)
+
+    // Read the file from the provided path
+    const fixture = await readFixture(resolvedFixturePath)
+
     // Try to load profile, but continue if not found
     let profile = null
     try {
@@ -132,7 +140,7 @@ export const replay = createTask(
     // Prepare paths
     const entryPoint = path.join(process.cwd(), taskDescriptor.path)
     const buildsPath = await ensureBuildsFolder()
-    const outputFile = path.join(buildsPath, `${taskName}.js`)
+    const outputFile = path.join(buildsPath, `${descriptorName}.js`)
 
     // Bundle the task
     await bundleCreate({
@@ -155,14 +163,14 @@ export const replay = createTask(
     // Configure boundaries based on cache parameter if provided
     const boundaryConfig: Record<string, string> = {}
 
-    if (argv.cache) {
+    if (cache) {
       // Parse the comma-separated list and trim each item
-      const cacheBoundaries = argv.cache.split(',').map(b => b.trim())
+      const cacheBoundaries = cache.split(',').map((b: string) => b.trim())
 
       // Log which boundaries will use cache mode
       if (cacheBoundaries.length > 0) {
         // Set each specified boundary to 'replay' mode
-        cacheBoundaries.forEach(boundary => {
+        cacheBoundaries.forEach((boundary: string) => {
           boundaryConfig[boundary] = 'replay'
         })
       }
@@ -170,7 +178,8 @@ export const replay = createTask(
 
     console.log('==================================================')
     console.log('UUID:', fixture.fixtureUUID)
-    console.log('Name:', fixture.name)
+    console.log('Task name:', fixture.taskName)
+    console.log('Project name:', fixture.projectName)
     console.log('Context:', fixture.context)
     console.log('==================================================')
     console.log('Replay:', fixture.input)
@@ -194,7 +203,7 @@ export const replay = createTask(
     // Send the log to API if profile is available
     if (profile) {
       try {
-        await sendLogToAPI(profile, projectName, taskName, record, fixture.fixtureUUID)
+        await sendLogToAPI(profile, projectName, descriptorName, record, fixture.fixtureUUID)
       } catch (e) {
         console.error('Failed to send log to API:', e)
       }