@forgehive/forge-cli 0.3.15 → 0.3.17

package/dist/tasks/bundle/create.d.ts

@@ -1,6 +1,11 @@
+import { type ForgeConf } from '../types';
 export declare const create: import("@forgehive/task").TaskInstanceType<(argv: {
     entryPoint: string;
     outputFile: string;
-}, boundaries: import("@forgehive/task").WrappedBoundaries<{}>) => Promise<{
+}, boundaries: import("@forgehive/task").WrappedBoundaries<{
+    loadConf: (args: {}) => Promise<Promise<ForgeConf>>;
+}>) => Promise<{
     outputFile: string;
-}>, {}>;
+}>, {
+    loadConf: (args: {}) => Promise<Promise<ForgeConf>>;
+}>;

package/dist/tasks/bundle/create.js

@@ -10,15 +10,22 @@ exports.create = void 0;
 const task_1 = require("@forgehive/task");
 const schema_1 = require("@forgehive/schema");
 const esbuild_1 = __importDefault(require("esbuild"));
+const load_1 = require("../conf/load");
 const schema = new schema_1.Schema({
     entryPoint: schema_1.Schema.string(),
     outputFile: schema_1.Schema.string()
 });
-const boundaries = {};
+const boundaries = {
+    loadConf: load_1.load.asBoundary()
+};
 exports.create = (0, task_1.createTask)({
     schema,
     boundaries,
-    fn: async function ({ entryPoint, outputFile }) {
+    fn: async function ({ entryPoint, outputFile }, { loadConf }) {
+        // Load forge configuration
+        const forge = await loadConf({});
+        // Get external packages from config, default to empty array
+        const externalPackages = forge.build?.externalPackages ?? [];
         // Build using esbuild
         await esbuild_1.default.build({
             entryPoints: [entryPoint],
@@ -26,7 +33,8 @@ exports.create = (0, task_1.createTask)({
             bundle: true,
             minify: true,
             platform: 'node',
-            sourcemap: true
+            sourcemap: true,
+            external: externalPackages
         });
         return { outputFile };
     }

package/dist/tasks/bundle/fingerprint.js

@@ -122,6 +122,8 @@ exports.fingerprint = (0, task_1.createTask)({
         console.log(`Generating bundle with fingerprints for task: ${descriptorName}`);
         console.log(`Entry point: ${entryPoint}`);
         console.log(`Output: ${outputFile}`);
+        // Get external packages from config, default to empty array
+        const externalPackages = forgeJson.build?.externalPackages ?? [];
         // Build with fingerprinting plugin
         const result = await esbuild_1.default.build({
             entryPoints: [entryPoint],
@@ -131,7 +133,8 @@ exports.fingerprint = (0, task_1.createTask)({
             platform: 'node',
             sourcemap: true,
             plugins: [taskFingerprintPlugin()],
-            metafile: true
+            metafile: true,
+            external: externalPackages
         });
         // Extract fingerprints from build result
         const taskFingerprints = result.fingerprints || [];

package/dist/tasks/bundle/zip.d.ts

@@ -5,6 +5,7 @@ export declare const zip: import("@forgehive/task").TaskInstanceType<(argv: {
     dir: string;
     input: string;
     output: string;
+    forgeJsonPath?: string | undefined;
 }, boundaries: import("@forgehive/task").WrappedBoundaries<{
     createWriteStream: (outputPath: string) => Promise<fs.WriteStream>;
     createArchiver: (format: "zip", options: {

package/dist/tasks/bundle/zip.js

@@ -16,7 +16,8 @@ const description = 'Zip a bundle file for distribution';
 const schema = new schema_1.Schema({
     dir: schema_1.Schema.string(),
     input: schema_1.Schema.string(),
-    output: schema_1.Schema.string()
+    output: schema_1.Schema.string(),
+    forgeJsonPath: schema_1.Schema.string().optional() // Optional path to forge.json - if provided, it will be included
 });
 const boundaries = {
     createWriteStream: async (outputPath) => {
@@ -36,7 +37,7 @@ const boundaries = {
         catch {
             return false;
         }
-    }
+    },
 };
 const bytesToMB = (bytes) => {
     const MB = bytes / (1024 * 1024);
@@ -46,7 +47,7 @@ exports.bytesToMB = bytesToMB;
 exports.zip = (0, task_1.createTask)({
     schema,
     boundaries,
-    fn: async function ({ dir, input, output }, { createWriteStream, createArchiver, resolvePathDir, fileExists }) {
+    fn: async function ({ dir, input, output, forgeJsonPath }, { createWriteStream, createArchiver, resolvePathDir, fileExists }) {
         const outputPath = await resolvePathDir(dir, output);
         const inputPath = await resolvePathDir(dir, input);
         const inputMapPath = inputPath + '.map';
@@ -57,6 +58,17 @@ exports.zip = (0, task_1.createTask)({
         }
         // Check if source map exists before creating Promise
         const mapExists = await fileExists(inputMapPath);
+        // Handle forge.json inclusion - only if path is provided
+        let finalForgeJsonPath = null;
+        if (forgeJsonPath) {
+            const exists = await fileExists(forgeJsonPath);
+            if (exists) {
+                finalForgeJsonPath = forgeJsonPath;
+            }
+            else {
+                console.warn(`forge.json not found at provided path: ${forgeJsonPath}`);
+            }
+        }
         // Handle async operations outside of Promise constructor
         const outStream = await createWriteStream(outputPath);
         const archive = await createArchiver('zip', {
@@ -93,6 +105,11 @@ exports.zip = (0, task_1.createTask)({
             if (mapExists) {
                 archive.file(inputMapPath, { name: 'index.js.map' });
             }
+            // Add forge.json if path was provided and found
+            if (finalForgeJsonPath) {
+                archive.file(finalForgeJsonPath, { name: 'forge.json' });
+                console.log(`Added forge.json from: ${finalForgeJsonPath}`);
+            }
             archive.finalize();
         });
     }

package/dist/tasks/runner/bundle.js

@@ -56,6 +56,8 @@ exports.bundle = (0, task_1.createTask)({
     `);
         // Ensure target directory exists
         await ensureDir(path_1.default.dirname(targetPath));
+        // Get external packages from config, default to empty array
+        const externalPackages = forge.build?.externalPackages ?? [];
         // Build using esbuild
         await esbuild_1.default.build({
             entryPoints: [entryPoint],
@@ -63,7 +65,8 @@ exports.bundle = (0, task_1.createTask)({
             bundle: true,
             minify: true,
             platform: 'node',
-            sourcemap: true
+            sourcemap: true,
+            external: externalPackages
         });
         return {
             status: 'Success',

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

@@ -19,6 +19,7 @@ export declare const publish: import("@forgehive/task").TaskInstanceType<(argv:
         dir: string;
         input: string;
         output: string;
+        forgeJsonPath?: string | undefined;
     }) => Promise<Promise<unknown>>;
     bundleFingerprint: (args: {
         descriptorName: string;
@@ -73,6 +74,7 @@ export declare const publish: import("@forgehive/task").TaskInstanceType<(argv:
         dir: string;
         input: string;
         output: string;
+        forgeJsonPath?: string | undefined;
     }) => Promise<Promise<unknown>>;
     bundleFingerprint: (args: {
         descriptorName: string;

package/dist/tasks/task/publish.js

@@ -108,11 +108,12 @@ exports.publish = (0, task_1.createTask)({
             outputFile
         });
         console.log('Bundle created...');
-        // Zip the bundle
+        // Zip the bundle with forge.json included
         await bundleZip({
             dir: buildsPath,
             input: `${descriptorName}.js`,
-            output: zipFile
+            output: zipFile,
+            forgeJsonPath: path_1.default.join(cwd, 'forge.json')
         });
         console.log('Bundle zipped...');
         // Generate task fingerprint

package/dist/tasks/types.d.ts

@@ -31,6 +31,9 @@ export interface ForgeConf {
     infra: Infra;
     tasks: Record<string, TaskDescriptor>;
     runners: Record<string, RunnerDescriptor>;
+    build?: {
+        externalPackages?: string[];
+    };
 }
 export interface TaskName {
     descriptor: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forgehive/forge-cli",
-  "version": "0.3.15",
+  "version": "0.3.17",
   "description": "TypeScript CLI application",
   "license": "MIT",
   "main": "dist/index.js",
@@ -10,11 +10,11 @@
   "publishConfig": {
     "access": "public",
     "dependencies": {
-      "@forgehive/hive-sdk": "^0.1.5",
-      "@forgehive/record-tape": "^0.2.6",
-      "@forgehive/runner": "^0.2.6",
+      "@forgehive/hive-sdk": "^0.1.6",
+      "@forgehive/record-tape": "^0.2.7",
+      "@forgehive/runner": "^0.2.7",
       "@forgehive/schema": "^0.1.4",
-      "@forgehive/task": "^0.2.6",
+      "@forgehive/task": "^0.2.7",
       "esbuild": "^0.25.0",
       "handlebars": "^4.7.8",
       "minimist": "^1.2.8",
@@ -30,11 +30,11 @@
     "minimist": "^1.2.8",
     "typescript": "^5.3.3",
     "uuid": "^11.1.0",
+    "@forgehive/runner": "0.2.7",
     "@forgehive/schema": "0.1.4",
-    "@forgehive/task": "0.2.6",
-    "@forgehive/hive-sdk": "0.1.5",
-    "@forgehive/record-tape": "0.2.6",
-    "@forgehive/runner": "0.2.6"
+    "@forgehive/task": "0.2.7",
+    "@forgehive/record-tape": "0.2.7",
+    "@forgehive/hive-sdk": "0.1.6"
   },
   "devDependencies": {
     "@types/archiver": "^6.0.3",

package/src/tasks/bundle/create.ts

@@ -5,18 +5,28 @@
 import { createTask } from '@forgehive/task'
 import { Schema } from '@forgehive/schema'
 import esbuild from 'esbuild'
+import { load as loadConf } from '../conf/load'
+import { type ForgeConf } from '../types'
 
 const schema = new Schema({
   entryPoint: Schema.string(),
   outputFile: Schema.string()
 })
 
-const boundaries = {}
+const boundaries = {
+  loadConf: loadConf.asBoundary()
+}
 
 export const create = createTask({
   schema,
   boundaries,
-  fn: async function ({ entryPoint, outputFile }) {
+  fn: async function ({ entryPoint, outputFile }, { loadConf }) {
+    // Load forge configuration
+    const forge: ForgeConf = await loadConf({})
+
+    // Get external packages from config, default to empty array
+    const externalPackages = forge.build?.externalPackages ?? []
+
     // Build using esbuild
     await esbuild.build({
       entryPoints: [entryPoint],
@@ -24,7 +34,8 @@ export const create = createTask({
       bundle: true,
       minify: true,
       platform: 'node',
-      sourcemap: true
+      sourcemap: true,
+      external: externalPackages
     })
 
     return { outputFile }

package/src/tasks/bundle/fingerprint.ts

@@ -174,6 +174,9 @@ export const fingerprint = createTask({
     console.log(`Entry point: ${entryPoint}`)
     console.log(`Output: ${outputFile}`)
 
+    // Get external packages from config, default to empty array
+    const externalPackages = forgeJson.build?.externalPackages ?? []
+
     // Build with fingerprinting plugin
     const result = await esbuild.build({
       entryPoints: [entryPoint],
@@ -183,7 +186,8 @@ export const fingerprint = createTask({
       platform: 'node',
       sourcemap: true,
       plugins: [taskFingerprintPlugin()],
-      metafile: true
+      metafile: true,
+      external: externalPackages
     })
 
     // Extract fingerprints from build result

package/src/tasks/bundle/zip.ts

@@ -13,7 +13,8 @@ const description = 'Zip a bundle file for distribution'
 const schema = new Schema({
   dir: Schema.string(),
   input: Schema.string(),
-  output: Schema.string()
+  output: Schema.string(),
+  forgeJsonPath: Schema.string().optional() // Optional path to forge.json - if provided, it will be included
 })
 
 const boundaries = {
@@ -33,7 +34,7 @@ const boundaries = {
     } catch {
       return false
     }
-  }
+  },
 }
 
 export const bytesToMB = (bytes: number): string => {
@@ -44,7 +45,7 @@ export const bytesToMB = (bytes: number): string => {
 export const zip = createTask({
   schema,
   boundaries,
-  fn: async function ({ dir, input, output }, { createWriteStream, createArchiver, resolvePathDir, fileExists }) {
+  fn: async function ({ dir, input, output, forgeJsonPath }, { createWriteStream, createArchiver, resolvePathDir, fileExists }) {
     const outputPath = await resolvePathDir(dir, output)
     const inputPath = await resolvePathDir(dir, input)
     const inputMapPath = inputPath + '.map'
@@ -58,6 +59,17 @@ export const zip = createTask({
     // Check if source map exists before creating Promise
     const mapExists = await fileExists(inputMapPath)
 
+    // Handle forge.json inclusion - only if path is provided
+    let finalForgeJsonPath: string | null = null
+    if (forgeJsonPath) {
+      const exists = await fileExists(forgeJsonPath)
+      if (exists) {
+        finalForgeJsonPath = forgeJsonPath
+      } else {
+        console.warn(`forge.json not found at provided path: ${forgeJsonPath}`)
+      }
+    }
+
     // Handle async operations outside of Promise constructor
     const outStream = await createWriteStream(outputPath)
     const archive = await createArchiver('zip', {
@@ -101,6 +113,12 @@ export const zip = createTask({
         archive.file(inputMapPath, { name: 'index.js.map' })
       }
 
+      // Add forge.json if path was provided and found
+      if (finalForgeJsonPath) {
+        archive.file(finalForgeJsonPath, { name: 'forge.json' })
+        console.log(`Added forge.json from: ${finalForgeJsonPath}`)
+      }
+
       archive.finalize()
     })
   }

package/src/tasks/runner/bundle.ts

@@ -59,6 +59,9 @@ export const bundle = createTask({
     // Ensure target directory exists
     await ensureDir(path.dirname(targetPath))
 
+    // Get external packages from config, default to empty array
+    const externalPackages = forge.build?.externalPackages ?? []
+
     // Build using esbuild
     await esbuild.build({
       entryPoints: [entryPoint],
@@ -66,7 +69,8 @@ export const bundle = createTask({
       bundle: true,
       minify: true,
       platform: 'node',
-      sourcemap: true
+      sourcemap: true,
+      external: externalPackages
     })
 
     return {

package/src/tasks/task/publish.ts

@@ -139,11 +139,12 @@ export const publish = createTask({
 
     console.log('Bundle created...')
 
-    // Zip the bundle
+    // Zip the bundle with forge.json included
     await bundleZip({
       dir: buildsPath,
       input: `${descriptorName}.js`,
-      output: zipFile
+      output: zipFile,
+      forgeJsonPath: path.join(cwd, 'forge.json')
     })
 
     console.log('Bundle zipped...')

package/src/tasks/types.ts

@@ -34,6 +34,9 @@ export interface ForgeConf {
   infra: Infra
   tasks: Record<string, TaskDescriptor>
   runners: Record<string, RunnerDescriptor>
+  build?: {
+    externalPackages?: string[]
+  }
 }
 
 export interface TaskName {