@forgehive/forge-cli 0.2.14 → 0.3.0

package/dist/tasks/bundle/zip.js

@@ -43,54 +43,58 @@ const bytesToMB = (bytes) => {
     return `${MB.toFixed(2)} MB`;
 };
 exports.bytesToMB = bytesToMB;
-exports.zip = (0, task_1.createTask)(schema, boundaries, async function ({ dir, input, output }, { createWriteStream, createArchiver, resolvePathDir, fileExists }) {
-    const outputPath = await resolvePathDir(dir, output);
-    const inputPath = await resolvePathDir(dir, input);
-    const inputMapPath = inputPath + '.map';
-    // Check if input file exists
-    const inputExists = await fileExists(inputPath);
-    if (!inputExists) {
-        throw new Error(`Input file does not exist: ${inputPath}`);
-    }
-    // Check if source map exists before creating Promise
-    const mapExists = await fileExists(inputMapPath);
-    // Handle async operations outside of Promise constructor
-    const outStream = await createWriteStream(outputPath);
-    const archive = await createArchiver('zip', {
-        zlib: { level: 9 } // Sets the compression level
-    });
-    return new Promise((resolve, reject) => {
-        archive.on('error', function (err) {
-            reject(err);
-        });
-        outStream.on('end', function () {
-            console.log('Data has been drained');
-        });
-        outStream.on('close', function () {
-            setTimeout(() => {
-                resolve({
-                    output,
-                    outputPath,
-                    size: archive.pointer()
-                });
-            }, 100);
+exports.zip = (0, task_1.createTask)({
+    schema,
+    boundaries,
+    fn: async function ({ dir, input, output }, { createWriteStream, createArchiver, resolvePathDir, fileExists }) {
+        const outputPath = await resolvePathDir(dir, output);
+        const inputPath = await resolvePathDir(dir, input);
+        const inputMapPath = inputPath + '.map';
+        // Check if input file exists
+        const inputExists = await fileExists(inputPath);
+        if (!inputExists) {
+            throw new Error(`Input file does not exist: ${inputPath}`);
+        }
+        // Check if source map exists before creating Promise
+        const mapExists = await fileExists(inputMapPath);
+        // Handle async operations outside of Promise constructor
+        const outStream = await createWriteStream(outputPath);
+        const archive = await createArchiver('zip', {
+            zlib: { level: 9 } // Sets the compression level
         });
-        archive.on('warning', function (err) {
-            if (err.code === 'ENOENT') {
-                console.warn('ENOENT', err);
-            }
-            else {
+        return new Promise((resolve, reject) => {
+            archive.on('error', function (err) {
                 reject(err);
+            });
+            outStream.on('end', function () {
+                console.log('Data has been drained');
+            });
+            outStream.on('close', function () {
+                setTimeout(() => {
+                    resolve({
+                        output,
+                        outputPath,
+                        size: archive.pointer()
+                    });
+                }, 100);
+            });
+            archive.on('warning', function (err) {
+                if (err.code === 'ENOENT') {
+                    console.warn('ENOENT', err);
+                }
+                else {
+                    reject(err);
+                }
+            });
+            archive.pipe(outStream);
+            // Add the main bundle file
+            archive.file(inputPath, { name: 'index.js' });
+            // Add source map if it exists
+            if (mapExists) {
+                archive.file(inputMapPath, { name: 'index.js.map' });
             }
+            archive.finalize();
         });
-        archive.pipe(outStream);
-        // Add the main bundle file
-        archive.file(inputPath, { name: 'index.js' });
-        // Add source map if it exists
-        if (mapExists) {
-            archive.file(inputMapPath, { name: 'index.js.map' });
-        }
-        archive.finalize();
-    });
+    }
 });
 exports.zip.setDescription(description);

package/dist/tasks/conf/info.js

@@ -47,25 +47,29 @@ const boundaries = {
     readFile: async (filePath) => fs.promises.readFile(filePath, 'utf-8'),
     loadCurrentProfile: loadCurrent_1.loadCurrent.asBoundary()
 };
-exports.info = (0, task_1.createTask)(schema, boundaries, async function (_argv, { loadCurrentProfile, readFile }) {
-    const packageJsonPath = path.join(__dirname, '../../../package.json');
-    const packageJsonContent = await readFile(packageJsonPath);
-    const packageJson = JSON.parse(packageJsonContent);
-    const info = {
-        version: packageJson.version,
-        profile: {}
-    };
-    let profile;
-    try {
-        profile = await loadCurrentProfile({});
-        info.profile = {
-            name: profile.name,
-            url: profile.url,
-            apiKey: profile.apiKey
+exports.info = (0, task_1.createTask)({
+    schema,
+    boundaries,
+    fn: async function (_argv, { loadCurrentProfile, readFile }) {
+        const packageJsonPath = path.join(__dirname, '../../../package.json');
+        const packageJsonContent = await readFile(packageJsonPath);
+        const packageJson = JSON.parse(packageJsonContent);
+        const info = {
+            version: packageJson.version,
+            profile: {}
         };
+        let profile;
+        try {
+            profile = await loadCurrentProfile({});
+            info.profile = {
+                name: profile.name,
+                url: profile.url,
+                apiKey: profile.apiKey
+            };
+        }
+        catch (error) {
+            console.log('No default profile set. Please run forge task:run auth:add to create a profile.');
+        }
+        return info;
     }
-    catch (error) {
-        console.log('No default profile set. Please run forge task:run auth:add to create a profile.');
-    }
-    return info;
 });

package/dist/tasks/conf/load.js

@@ -14,8 +14,12 @@ const boundaries = {
         return await promises_1.default.readFile(filePath, 'utf-8');
     }
 };
-exports.load = (0, task_1.createTask)(schema, boundaries, async function (_, { readFile }) {
-    const forgePath = path_1.default.join(process.cwd(), 'forge.json');
-    const content = await readFile(forgePath);
-    return JSON.parse(content);
+exports.load = (0, task_1.createTask)({
+    schema,
+    boundaries,
+    fn: async function (_, { readFile }) {
+        const forgePath = path_1.default.join(process.cwd(), 'forge.json');
+        const content = await readFile(forgePath);
+        return JSON.parse(content);
+    }
 });

package/dist/tasks/fixture/download.js

@@ -45,38 +45,41 @@ const boundaries = {
         };
     }
 };
-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({});
-    // Download from hive api server first to get the task descriptor
-    let response;
-    try {
-        response = await downloadFixture(uuid, profile);
-    }
-    catch (e) {
-        const error = e;
-        console.error('Error downloading fixture:', error.message, error.status);
-        if (error.status === 404) {
-            throw new Error('Fixture not found');
+exports.download = (0, task_1.createTask)({
+    schema,
+    boundaries,
+    fn: 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({});
+        // Download from hive api server first to get the task descriptor
+        let response;
+        try {
+            response = await downloadFixture(uuid, profile);
         }
-        throw new Error('Failed to download fixture');
-    }
-    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);
-    // 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(`
+        catch (e) {
+            const error = e;
+            console.error('Error downloading fixture:', error.message, error.status);
+            if (error.status === 404) {
+                throw new Error('Fixture not found');
+            }
+            throw new Error('Failed to download fixture');
+        }
+        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);
+        // 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!
 ==================================================
@@ -90,10 +93,11 @@ Replay with:
 forge task:replay ${taskName} --path ${shortPath}
 ==================================================
     `);
-    return {
-        status: 'Downloaded',
-        path: filePath,
-        shortPath: shortPath
-    };
+        return {
+            status: 'Downloaded',
+            path: filePath,
+            shortPath: shortPath
+        };
+    }
 });
 exports.download.setDescription(description);

package/dist/tasks/init.js

@@ -20,36 +20,40 @@ const boundaries = {
     }
 };
 // Create a task with type inference from schema and boundaries
-exports.init = (0, task_1.createTask)(schema, boundaries, async function (argv, { saveFile, getCwd }) {
-    // Handle the dryRun flag
-    const isDryRun = Boolean(argv.dryRun);
-    const cwd = await getCwd();
-    const forgePath = path_1.default.join(cwd, 'forge.json');
-    const config = {
-        project: {
-            name: 'BaseProject'
-        },
-        paths: {
-            logs: 'logs/',
-            fixtures: 'fixtures/',
-            tasks: 'src/tasks/',
-            runners: 'src/runners/',
-            tests: 'src/tests/'
-        },
-        infra: {
-            region: 'us-west-2',
-            bucket: ''
-        },
-        tasks: {},
-        runners: {}
-    };
-    const content = JSON.stringify(config, null, 2);
-    if (!isDryRun) {
-        await saveFile(forgePath, content);
+exports.init = (0, task_1.createTask)({
+    schema,
+    boundaries,
+    fn: async function (argv, { saveFile, getCwd }) {
+        // Handle the dryRun flag
+        const isDryRun = Boolean(argv.dryRun);
+        const cwd = await getCwd();
+        const forgePath = path_1.default.join(cwd, 'forge.json');
+        const config = {
+            project: {
+                name: 'BaseProject'
+            },
+            paths: {
+                logs: 'logs/',
+                fixtures: 'fixtures/',
+                tasks: 'src/tasks/',
+                runners: 'src/runners/',
+                tests: 'src/tests/'
+            },
+            infra: {
+                region: 'us-west-2',
+                bucket: ''
+            },
+            tasks: {},
+            runners: {}
+        };
+        const content = JSON.stringify(config, null, 2);
+        if (!isDryRun) {
+            await saveFile(forgePath, content);
+        }
+        else {
+            console.log('Dry run, not creating forge.json');
+            console.log(content);
+        }
+        return config;
     }
-    else {
-        console.log('Dry run, not creating forge.json');
-        console.log(content);
-    }
-    return config;
 });

package/dist/tasks/runner/bundle.js

@@ -31,19 +31,22 @@ const boundaries = {
         }
     }
 };
-exports.bundle = (0, task_1.createTask)(schema, boundaries, async function ({ runnerName, targetPath }, { loadConf, getCwd, ensureDir }) {
-    // Load forge configuration
-    const forge = await loadConf({});
-    const cwd = await getCwd();
-    // Verify runner exists in forge.json
-    if (!forge.runners || !forge.runners[runnerName]) {
-        throw new Error(`Runner '${runnerName}' not found in forge.json configuration`);
-    }
-    // Get runner entry point from forge.json
-    const runnerConfig = forge.runners[runnerName];
-    const entryPoint = path_1.default.join(cwd, runnerConfig.path);
-    const outputFile = path_1.default.join(targetPath, `${runnerName}.js`);
-    console.log(`
+exports.bundle = (0, task_1.createTask)({
+    schema,
+    boundaries,
+    fn: async function ({ runnerName, targetPath }, { loadConf, getCwd, ensureDir }) {
+        // Load forge configuration
+        const forge = await loadConf({});
+        const cwd = await getCwd();
+        // Verify runner exists in forge.json
+        if (!forge.runners || !forge.runners[runnerName]) {
+            throw new Error(`Runner '${runnerName}' not found in forge.json configuration`);
+        }
+        // Get runner entry point from forge.json
+        const runnerConfig = forge.runners[runnerName];
+        const entryPoint = path_1.default.join(cwd, runnerConfig.path);
+        const outputFile = path_1.default.join(targetPath, `${runnerName}.js`);
+        console.log(`
       ==================================================
       Starting runner creation!
       Creating runner: ${runnerName}
@@ -51,21 +54,22 @@ exports.bundle = (0, task_1.createTask)(schema, boundaries, async function ({ ru
       Output file: ${outputFile}
       ==================================================
     `);
-    // Ensure target directory exists
-    await ensureDir(path_1.default.dirname(targetPath));
-    // Build using esbuild
-    await esbuild_1.default.build({
-        entryPoints: [entryPoint],
-        outfile: outputFile,
-        bundle: true,
-        minify: true,
-        platform: 'node',
-        sourcemap: true
-    });
-    return {
-        status: 'Success',
-        runnerName,
-        entryPoint,
-        outputFile: path_1.default.join(targetPath, `${runnerName}.js`)
-    };
+        // Ensure target directory exists
+        await ensureDir(path_1.default.dirname(targetPath));
+        // Build using esbuild
+        await esbuild_1.default.build({
+            entryPoints: [entryPoint],
+            outfile: outputFile,
+            bundle: true,
+            minify: true,
+            platform: 'node',
+            sourcemap: true
+        });
+        return {
+            status: 'Success',
+            runnerName,
+            entryPoint,
+            outputFile: path_1.default.join(targetPath, `${runnerName}.js`)
+        };
+    }
 });

package/dist/tasks/runner/create.js

@@ -63,35 +63,39 @@ const boundaries = {
         await promises_1.default.writeFile(forgePath, JSON.stringify(forge, null, 2));
     }
 };
-exports.create = (0, task_1.createTask)(schema, boundaries, async function ({ runnerName }, { persistRunner, loadConf, persistConf, getCwd }) {
-    const formattedName = (0, camelCase_1.camelCase)(runnerName);
-    const cwd = await getCwd();
-    const forge = await loadConf({});
-    const runnerPath = forge.paths.runners;
-    console.log(`
+exports.create = (0, task_1.createTask)({
+    schema,
+    boundaries,
+    fn: async function ({ runnerName }, { persistRunner, loadConf, persistConf, getCwd }) {
+        const formattedName = (0, camelCase_1.camelCase)(runnerName);
+        const cwd = await getCwd();
+        const forge = await loadConf({});
+        const runnerPath = forge.paths.runners;
+        console.log(`
     ==================================================
     Starting runner creation!
     Creating runner: ${formattedName}
     Into: ${runnerPath}${formattedName}/index.ts
     ==================================================
     `);
-    const comp = handlebars_1.default.compile(RUNNER_TEMPLATE);
-    const content = comp({
-        runnerName: formattedName
-    });
-    await persistRunner(runnerPath, formattedName, content);
-    if (forge.runners === undefined) {
-        forge.runners = {};
+        const comp = handlebars_1.default.compile(RUNNER_TEMPLATE);
+        const content = comp({
+            runnerName: formattedName
+        });
+        await persistRunner(runnerPath, formattedName, content);
+        if (forge.runners === undefined) {
+            forge.runners = {};
+        }
+        // Create runner descriptor
+        const runnerDescriptor = {
+            path: `${runnerPath}${formattedName}/index.ts`,
+            version: '0.0.1'
+        };
+        forge.runners[formattedName] = runnerDescriptor;
+        await persistConf(forge, cwd);
+        return {
+            runnerPath: `${runnerPath}/${formattedName}`,
+            runnerName: formattedName
+        };
     }
-    // Create runner descriptor
-    const runnerDescriptor = {
-        path: `${runnerPath}${formattedName}/index.ts`,
-        version: '0.0.1'
-    };
-    forge.runners[formattedName] = runnerDescriptor;
-    await persistConf(forge, cwd);
-    return {
-        runnerPath: `${runnerPath}/${formattedName}`,
-        runnerName: formattedName
-    };
 });

package/dist/tasks/runner/remove.js

@@ -32,27 +32,31 @@ const boundaries = {
         await promises_1.default.writeFile(forgePath, JSON.stringify(forge, null, 2));
     }
 };
-exports.remove = (0, task_1.createTask)(schema, boundaries, async function ({ runnerName }, { loadConf, getCwd, removeRunner, persistConf }) {
-    const formattedName = (0, camelCase_1.camelCase)(runnerName);
-    const cwd = await getCwd();
-    const forge = await loadConf({});
-    if (!forge.runners || !forge.runners[formattedName]) {
-        throw new Error(`Runner '${formattedName}' not found in forge.json configuration`);
-    }
-    const runnerConfig = forge.runners[formattedName];
-    const runnerFolder = path_1.default.join(cwd, path_1.default.dirname(runnerConfig.path));
-    console.log(`
+exports.remove = (0, task_1.createTask)({
+    schema,
+    boundaries,
+    fn: async function ({ runnerName }, { loadConf, getCwd, removeRunner, persistConf }) {
+        const formattedName = (0, camelCase_1.camelCase)(runnerName);
+        const cwd = await getCwd();
+        const forge = await loadConf({});
+        if (!forge.runners || !forge.runners[formattedName]) {
+            throw new Error(`Runner '${formattedName}' not found in forge.json configuration`);
+        }
+        const runnerConfig = forge.runners[formattedName];
+        const runnerFolder = path_1.default.join(cwd, path_1.default.dirname(runnerConfig.path));
+        console.log(`
     ==================================================
     Removing runner: ${formattedName}
     Path: ${runnerFolder}
     ==================================================
     `);
-    await removeRunner(runnerFolder);
-    delete forge.runners[formattedName];
-    await persistConf(forge, cwd);
-    return {
-        status: 'success',
-        message: `Runner '${formattedName}' successfully removed`,
-        runnerName: formattedName
-    };
+        await removeRunner(runnerFolder);
+        delete forge.runners[formattedName];
+        await persistConf(forge, cwd);
+        return {
+            status: 'success',
+            message: `Runner '${formattedName}' successfully removed`,
+            runnerName: formattedName
+        };
+    }
 });

package/dist/tasks/task/createTask.js

@@ -20,6 +20,7 @@ const TASK_TEMPLATE = `// TASK: {{ taskName }}
 import { createTask } from '@forgehive/task'
 import { Schema } from '@forgehive/schema'
 
+const name = '{{ taskDescriptor }}'
 const description = 'Add task description here'
 
 const schema = new Schema({
@@ -32,10 +33,12 @@ const boundaries = {
   // example: readFile: async (path: string) => fs.readFile(path, 'utf-8')
 }
 
-export const {{ taskName }} = createTask(
+export const {{ taskName }} = createTask({
+  name,
+  description,
   schema,
   boundaries,
-  async function (argv, boundaries) {
+  fn: async function (argv, boundaries) {
     console.log('input:', argv)
     console.log('boundaries:', boundaries)
     // Your task implementation goes here
@@ -43,9 +46,8 @@ export const {{ taskName }} = createTask(
 
     return status
   }
-)
+})
 
-{{ taskName }}.setDescription(description)
 `;
 const schema = new schema_1.Schema({
     descriptorName: schema_1.Schema.string()
@@ -100,36 +102,41 @@ const boundaries = {
         await promises_1.default.writeFile(forgePath, JSON.stringify(forge, null, 2));
     }
 };
-exports.createTaskCommand = (0, task_1.createTask)(schema, boundaries, async function ({ descriptorName }, { loadTemplate, persistTask, loadConf, persistConf, parseTaskName, getCwd }) {
-    const { taskName, fileName, descriptor, dir } = await parseTaskName(descriptorName);
-    const cwd = await getCwd();
-    const forge = await loadConf({});
-    let taskPath = forge.paths.tasks;
-    if (dir !== undefined) {
-        taskPath = path_1.default.join(taskPath, dir);
-    }
-    console.log(`
+exports.createTaskCommand = (0, task_1.createTask)({
+    schema,
+    boundaries,
+    fn: async function ({ descriptorName }, { loadTemplate, persistTask, loadConf, persistConf, parseTaskName, getCwd }) {
+        const { taskName, fileName, descriptor, dir } = await parseTaskName(descriptorName);
+        const cwd = await getCwd();
+        const forge = await loadConf({});
+        let taskPath = forge.paths.tasks;
+        if (dir !== undefined) {
+            taskPath = path_1.default.join(taskPath, dir);
+        }
+        console.log(`
     ==================================================
     Starting task creation!
     Creating: ${taskName}
+    Descriptor: ${descriptor}
     Dir:  ${dir ?? ''}
     Into: ${taskPath}
     ==================================================
     `);
-    const template = await loadTemplate();
-    const comp = handlebars_1.default.compile(template);
-    const content = comp({
-        taskName,
-        taskDescriptor: descriptor
-    });
-    await persistTask(taskPath, fileName, content, cwd);
-    if (forge.tasks === undefined) {
-        forge.tasks = {};
+        const template = await loadTemplate();
+        const comp = handlebars_1.default.compile(template);
+        const content = comp({
+            taskName,
+            taskDescriptor: descriptor
+        });
+        await persistTask(taskPath, fileName, content, cwd);
+        if (forge.tasks === undefined) {
+            forge.tasks = {};
+        }
+        forge.tasks[descriptor] = {
+            path: `${taskPath}/${fileName}`,
+            handler: taskName
+        };
+        await persistConf(forge, cwd);
+        return { taskPath, fileName };
     }
-    forge.tasks[descriptor] = {
-        path: `${taskPath}/${fileName}`,
-        handler: taskName
-    };
-    await persistConf(forge, cwd);
-    return { taskPath, fileName };
 });