@forgehive/forge-cli 0.2.14 → 0.3.0

package/src/tasks/task/replay.ts

@@ -96,10 +96,10 @@ const boundaries = {
   }
 }
 
-export const replay = createTask(
+export const replay = createTask({
   schema,
   boundaries,
-  async function ({ descriptorName, path: fixturePath, cache }, { readFixture, loadConf, loadCurrentProfile, bundleCreate, bundleLoad, ensureBuildsFolder, verifyLogFolder, sendLogToAPI }) {
+  fn: 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)
@@ -215,6 +215,6 @@ export const replay = createTask(
 
     return result
   }
-)
+})
 
 replay.setDescription(description)

package/src/tasks/task/run.ts

@@ -1,6 +1,7 @@
 // TASK: run
 // Run this task with:
-// shadow-cli task:run
+// most recursive call on the project
+// forge task:run task:run
 
 import path from 'path'
 import fs from 'fs/promises'
@@ -78,10 +79,10 @@ const boundaries = {
   }
 }
 
-export const run = createTask(
+export const run = createTask({
   schema,
   boundaries,
-  async function ({ descriptorName, args }, {
+  fn: async function ({ descriptorName, args }, {
     loadConf,
     bundleCreate,
     bundleLoad,
@@ -187,4 +188,4 @@ export const run = createTask(
 
     return result
   }
-)
+})

package/src/test/tasks/create.test.ts

@@ -1,5 +1,5 @@
 import { createTaskCommand } from '../../tasks/task/createTask'
-import { createFsFromVolume, Volume } from 'memfs'
+import { createFsFromVolume, Volume, type IFs } from 'memfs'
 import path from 'path'
 import { createMockBoundary } from '../testUtils'
 import { ForgeConf } from '../../tasks/types'
@@ -12,6 +12,7 @@ const expectedContent = `// TASK: newTask
 import { createTask } from '@forgehive/task'
 import { Schema } from '@forgehive/schema'
 
+const name = 'sample:newTask'
 const description = 'Add task description here'
 
 const schema = new Schema({
@@ -24,10 +25,12 @@ const boundaries = {
   // example: readFile: async (path: string) => fs.readFile(path, 'utf-8')
 }
 
-export const newTask = createTask(
+export const newTask = 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
@@ -35,15 +38,13 @@ export const newTask = createTask(
 
     return status
   }
-)
+})
 
-newTask.setDescription(description)
 `
 
 describe('Create task', () => {
   let volume: InstanceType<typeof Volume>
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  let fs: any
+  let fs: IFs
   let rootDir: string
 
   beforeEach(() => {
@@ -96,11 +97,10 @@ describe('Create task', () => {
 
     // Read the created task file
     const fileContent = await fs.promises.readFile(path.join(rootDir, 'src/tasks/sample', 'newTask.ts'), 'utf-8')
-
     expect(fileContent).toBe(expectedContent)
 
     // Read the updated forge.json
-    const forgeContent = await fs.promises.readFile(path.join(rootDir, 'forge.json'), 'utf-8')
+    const forgeContent = await fs.promises.readFile(path.join(rootDir, 'forge.json'), 'utf-8') as string
     const forgeConf = JSON.parse(forgeContent)
     expect(forgeConf.tasks['sample:newTask']).toBeDefined()
   })

package/src/utils/taskAnalysis.ts

@@ -0,0 +1,419 @@
+import * as ts from 'typescript'
+
+interface TaskLocation {
+  file: string
+  line: number
+  column: number
+}
+
+interface SchemaProperty {
+  type: string
+  optional?: boolean
+  default?: string
+}
+
+interface InputSchema {
+  type: string
+  properties: Record<string, SchemaProperty>
+}
+
+interface OutputType {
+  type: string
+  properties?: Record<string, SchemaProperty>
+}
+
+interface TaskFingerprint {
+  name: string
+  description?: string
+  location: TaskLocation
+  inputSchema: InputSchema
+  outputType: OutputType
+  boundaries: string[]
+  hash: string
+}
+
+// Simplified interface for filesystem output (excludes name, location, hash)
+export interface TaskFingerprintOutput {
+  description?: string
+  inputSchema: InputSchema
+  outputType: OutputType
+  boundaries: string[]
+}
+
+// Hash generation function
+function generateHash(input: string): string {
+  let hash = 0
+  for (let i = 0; i < input.length; i++) {
+    const char = input.charCodeAt(i)
+    hash = ((hash << 5) - hash) + char
+    hash = hash & hash // Convert to 32-bit integer
+  }
+  return Math.abs(hash).toString(36)
+}
+
+// TypeScript AST analysis function
+function extractTaskFingerprints(sourceCode: string, filePath: string): TaskFingerprint[] {
+  const sourceFile = ts.createSourceFile(
+    filePath,
+    sourceCode,
+    ts.ScriptTarget.Latest,
+    true
+  )
+
+  const fingerprints: TaskFingerprint[] = []
+  let schemaNode: ts.Expression | null = null
+  let boundariesNode: ts.Expression | null = null
+
+  // First pass: find schema and boundaries variable declarations
+  function findVariables(node: ts.Node): void {
+    if (ts.isVariableStatement(node)) {
+      node.declarationList.declarations.forEach(decl => {
+        if (ts.isIdentifier(decl.name)) {
+          if (decl.name.text === 'schema' && decl.initializer) {
+            schemaNode = decl.initializer
+          } else if (decl.name.text === 'boundaries' && decl.initializer) {
+            boundariesNode = decl.initializer
+          }
+        }
+      })
+    }
+    ts.forEachChild(node, findVariables)
+  }
+
+  // Second pass: find createTask calls
+  function findCreateTask(node: ts.Node): void {
+    // Look for createTask calls
+    if (ts.isCallExpression(node) &&
+        ts.isIdentifier(node.expression) &&
+        node.expression.text === 'createTask') {
+
+      const taskName = extractTaskName(node, sourceFile)
+      if (taskName) {
+        const fingerprint = analyzeCreateTaskCall(node, sourceFile, filePath, taskName, schemaNode, boundariesNode)
+        if (fingerprint) {
+          fingerprints.push(fingerprint)
+        }
+      }
+    }
+
+    // Look for exported createTask assignments
+    if (ts.isVariableStatement(node) && node.modifiers?.some(m => m.kind === ts.SyntaxKind.ExportKeyword)) {
+      node.declarationList.declarations.forEach(decl => {
+        if (ts.isVariableDeclaration(decl) &&
+            decl.initializer &&
+            ts.isCallExpression(decl.initializer) &&
+            ts.isIdentifier(decl.initializer.expression) &&
+            decl.initializer.expression.text === 'createTask') {
+
+          const taskName = ts.isIdentifier(decl.name) ? decl.name.text : 'unknown'
+          const fingerprint = analyzeCreateTaskCall(decl.initializer, sourceFile, filePath, taskName, schemaNode, boundariesNode)
+          if (fingerprint) {
+            fingerprints.push(fingerprint)
+          }
+        }
+      })
+    }
+
+    ts.forEachChild(node, findCreateTask)
+  }
+
+  // Execute both passes
+  findVariables(sourceFile)
+  findCreateTask(sourceFile)
+
+  return fingerprints
+}
+
+function extractTaskName(node: ts.CallExpression, _sourceFile: ts.SourceFile): string | null {
+  // Try to find the task name from variable assignment or export
+  let parent = node.parent
+  while (parent) {
+    if (ts.isVariableDeclaration(parent) && ts.isIdentifier(parent.name)) {
+      return parent.name.text
+    }
+    parent = parent.parent
+  }
+  return null
+}
+
+function analyzeCreateTaskCall(
+  node: ts.CallExpression,
+  sourceFile: ts.SourceFile,
+  filePath: string,
+  taskName: string,
+  schemaNode: ts.Expression | null = null,
+  boundariesNode: ts.Expression | null = null
+): TaskFingerprint | null {
+  try {
+    const position = sourceFile.getLineAndCharacterOfPosition(node.getStart())
+    const args = node.arguments
+
+    // Use pre-found schema or fall back to argument analysis
+    let inputSchema: InputSchema = { type: 'object', properties: {} }
+    if (schemaNode) {
+      inputSchema = analyzeSchemaArg(schemaNode, sourceFile)
+    } else if (args[0]) {
+      inputSchema = analyzeSchemaArg(args[0], sourceFile)
+    }
+
+    // Use pre-found boundaries or fall back to argument analysis - simplified to just names
+    let boundaries: string[] = []
+    if (boundariesNode) {
+      boundaries = analyzeBoundariesArg(boundariesNode, sourceFile)
+    } else if (args[1]) {
+      boundaries = analyzeBoundariesArg(args[1], sourceFile)
+    }
+
+    // Extract function output type with better detection
+    let outputType: OutputType = { type: 'unknown' }
+    const functionArg = args[2]
+
+    if (functionArg) {
+      if (ts.isFunctionExpression(functionArg) || ts.isArrowFunction(functionArg)) {
+        // Better return type extraction
+        if (functionArg.type) {
+          const typeString = cleanTypeString(functionArg.type.getText(sourceFile))
+          outputType = { type: typeString }
+        } else {
+          // Try to infer from return statements with better object analysis
+          outputType = inferDetailedReturnType(functionArg, sourceFile)
+        }
+      }
+    }
+
+    // Generate hash from task signature
+    const hashInput = `${taskName}:${JSON.stringify(inputSchema)}:${JSON.stringify(boundaries)}`
+    const hash = generateHash(hashInput)
+
+    return {
+      name: taskName,
+      location: {
+        file: filePath,
+        line: position.line + 1,
+        column: position.character + 1
+      },
+      inputSchema,
+      outputType,
+      boundaries,
+      hash
+    }
+  } catch (error) {
+    console.warn(`Failed to analyze createTask call for ${taskName}:`, error)
+    return null
+  }
+}
+
+// Enhanced return type inference with detailed object analysis
+function inferDetailedReturnType(func: ts.FunctionExpression | ts.ArrowFunction, _sourceFile: ts.SourceFile): OutputType {
+  let returnType: OutputType = { type: 'unknown' }
+
+  function visitReturnStatements(node: ts.Node): void {
+    if (ts.isReturnStatement(node) && node.expression) {
+      if (ts.isObjectLiteralExpression(node.expression)) {
+        // Analyze object literal properties
+        const properties: Record<string, SchemaProperty> = {}
+        node.expression.properties.forEach(prop => {
+          if (ts.isPropertyAssignment(prop) && ts.isIdentifier(prop.name)) {
+            // Handle explicit property assignments: { propName: value }
+            const propName = prop.name.text
+            let propType = 'unknown'
+
+            // Try to infer property type from the initializer
+            if (ts.isStringLiteral(prop.initializer)) {
+              propType = 'string'
+            } else if (ts.isNumericLiteral(prop.initializer)) {
+              propType = 'number'
+            } else if (prop.initializer.kind === ts.SyntaxKind.TrueKeyword ||
+                       prop.initializer.kind === ts.SyntaxKind.FalseKeyword) {
+              propType = 'boolean'
+            } else if (ts.isIdentifier(prop.initializer)) {
+              // Variable reference - try to infer from name
+              const varName = prop.initializer.text
+              propType = inferTypeFromVariableName(varName)
+            } else if (ts.isPropertyAccessExpression(prop.initializer)) {
+              // Property access like response.handler
+              propType = 'unknown'
+            }
+
+            properties[propName] = { type: propType }
+          } else if (ts.isShorthandPropertyAssignment(prop)) {
+            // Handle shorthand properties: { propName } (equivalent to { propName: propName })
+            const propName = prop.name.text
+            const propType = inferTypeFromVariableName(propName)
+            properties[propName] = { type: propType }
+          }
+        })
+
+        if (Object.keys(properties).length > 0) {
+          returnType = {
+            type: 'object',
+            properties
+          }
+        } else {
+          returnType = { type: 'object' }
+        }
+      } else if (ts.isStringLiteral(node.expression)) {
+        returnType = { type: 'string' }
+      } else if (ts.isNumericLiteral(node.expression)) {
+        returnType = { type: 'number' }
+      } else if (node.expression.kind === ts.SyntaxKind.TrueKeyword ||
+                 node.expression.kind === ts.SyntaxKind.FalseKeyword) {
+        returnType = { type: 'boolean' }
+      } else if (ts.isIdentifier(node.expression)) {
+        // Single variable return
+        const varType = inferTypeFromVariableName(node.expression.text)
+        returnType = { type: varType }
+      }
+    }
+    ts.forEachChild(node, visitReturnStatements)
+  }
+
+  if (func.body) {
+    visitReturnStatements(func.body)
+  }
+
+  return returnType
+}
+
+// Helper function to infer types from variable names
+function inferTypeFromVariableName(varName: string): string {
+  // Common patterns for type inference based on variable names
+  if (varName.includes('path') || varName.includes('Path') ||
+      varName.includes('name') || varName.includes('Name') ||
+      varName.includes('descriptor') || varName.includes('Descriptor') ||
+      varName.includes('fileName') || varName.includes('handler') ||
+      varName.includes('url') || varName.includes('id') ||
+      varName.includes('uuid') || varName.includes('token')) {
+    return 'string'
+  } else if (varName.includes('count') || varName.includes('Count') ||
+             varName.includes('size') || varName.includes('Size') ||
+             varName.includes('length') || varName.includes('Length') ||
+             varName.includes('index') || varName.includes('Index')) {
+    return 'number'
+  } else if (varName.includes('is') || varName.includes('has') ||
+             varName.includes('can') || varName.includes('should') ||
+             varName.includes('enabled') || varName.includes('success')) {
+    return 'boolean'
+  } else if (varName.includes('config') || varName.includes('Config') ||
+             varName.includes('options') || varName.includes('Options') ||
+             varName.includes('data') || varName.includes('result') ||
+             varName.includes('response') || varName.includes('error')) {
+    return 'unknown'
+  }
+
+  return 'unknown'
+}
+
+// Clean up type strings (remove Promise wrappers for boundaries)
+function cleanTypeString(typeString: string): string {
+  // Remove Promise wrapper for boundary functions
+  const promiseMatch = typeString.match(/Promise<(.+)>/)
+  if (promiseMatch) {
+    return promiseMatch[1]
+  }
+  return typeString
+}
+
+function analyzeSchemaArg(node: ts.Expression, sourceFile: ts.SourceFile): InputSchema {
+  // Handle variable references (e.g., when schema is defined as const schema = ...)
+  if (ts.isIdentifier(node) && node.text === 'schema') {
+    // This case is now handled by pre-finding the schema node
+    return { type: 'object', properties: {} }
+  }
+
+  // Handle direct Schema constructor calls
+  if (ts.isNewExpression(node) && ts.isIdentifier(node.expression) && node.expression.text === 'Schema') {
+    const arg = node.arguments?.[0]
+    if (arg && ts.isObjectLiteralExpression(arg)) {
+      const properties: Record<string, SchemaProperty> = {}
+      arg.properties.forEach(prop => {
+        if (ts.isPropertyAssignment(prop) && ts.isIdentifier(prop.name)) {
+          const propName = prop.name.text
+          const propValue = analyzeSchemaProp(prop.initializer, sourceFile)
+          properties[propName] = propValue
+        }
+      })
+      return { type: 'object', properties }
+    }
+  }
+  return { type: 'object', properties: {} }
+}
+
+// Enhanced schema property analysis
+function analyzeSchemaProp(node: ts.Expression, _sourceFile: ts.SourceFile): SchemaProperty {
+  // Analyze Schema.string(), Schema.number(), etc.
+  if (ts.isCallExpression(node)) {
+    if (ts.isPropertyAccessExpression(node.expression) &&
+        ts.isIdentifier(node.expression.expression) &&
+        node.expression.expression.text === 'Schema') {
+
+      const methodName = node.expression.name.text
+      let baseType: SchemaProperty = { type: getSchemaTypeFromMethod(methodName) }
+
+      // Check for chained methods like .optional() or .default()
+      let current = node
+      while (current.parent && ts.isCallExpression(current.parent)) {
+        current = current.parent
+        if (ts.isPropertyAccessExpression(current.expression)) {
+          const chainedMethod = current.expression.name.text
+          if (chainedMethod === 'optional') {
+            baseType = { ...baseType, optional: true }
+          } else if (chainedMethod === 'default' && current.arguments[0]) {
+            baseType = { ...baseType, default: current.arguments[0].getText() }
+          }
+        }
+      }
+
+      return baseType
+    }
+  }
+  return { type: 'unknown' }
+}
+
+function getSchemaTypeFromMethod(methodName: string): string {
+  const typeMap: Record<string, string> = {
+    string: 'string',
+    number: 'number',
+    boolean: 'boolean',
+    array: 'array',
+    object: 'object'
+  }
+  return typeMap[methodName] || 'unknown'
+}
+
+function analyzeBoundariesArg(node: ts.Expression, _sourceFile: ts.SourceFile): string[] {
+  const boundaries: string[] = []
+
+  // Handle variable references (e.g., when boundaries is defined as const boundaries = ...)
+  if (ts.isIdentifier(node) && node.text === 'boundaries') {
+    // This case is now handled by pre-finding the boundaries node
+    return []
+  }
+
+  if (ts.isObjectLiteralExpression(node)) {
+    node.properties.forEach(prop => {
+      if (ts.isPropertyAssignment(prop) && ts.isIdentifier(prop.name)) {
+        const boundaryName = prop.name.text
+        boundaries.push(boundaryName)
+      }
+    })
+  }
+
+  return boundaries
+}
+
+// Export the core analysis function for reuse
+export function analyzeTaskFile(sourceCode: string, filePath: string, _expectedTaskName?: string): TaskFingerprintOutput | null {
+  const taskFingerprint = extractTaskFingerprints(sourceCode, filePath)[0]
+  if (!taskFingerprint) {
+    return null
+  }
+
+  // Return simplified output without name, location, hash
+  return {
+    description: taskFingerprint.description,
+    inputSchema: taskFingerprint.inputSchema,
+    outputType: taskFingerprint.outputType,
+    boundaries: taskFingerprint.boundaries
+  }
+}