Allowing workflows in the root of workflows folder

projectBundler/projectBundler.go

@@ -65,22 +65,27 @@ func (kw *KindeEnvironment) discover(ctx context.Context, absLocation string) {
 
 			files, _ := os.ReadDir(workflowsPath)
 			for _, file := range files {
-				fileName := strings.ToLower(file.Name())
-				if strings.HasSuffix(fileName, "workflow.ts") || strings.HasSuffix(fileName, "workflow.js") {
-					discoveredWorkflow := KindeWorkflow{
-						WorkflowRootDirectory: workflowsPath,
-						EntryPoints:           []string{file.Name()},
-					}
-					discoveredWorkflow.bundleAndIntrospect(ctx)
-					kw.Workflows = append(kw.Workflows, discoveredWorkflow)
-
-				}
+				maybeAddWorkflow(ctx, file.Name(), workflowsPath, kw)
 			}
 
+		} else {
+			maybeAddWorkflow(ctx, workflow.Name(), workflowsPath, kw)
 		}
 	}
 }
 
+func maybeAddWorkflow(ctx context.Context, file string, rootDirectory string, kw *KindeEnvironment) {
+	fileName := strings.ToLower(file)
+	if strings.HasSuffix(fileName, "workflow.ts") || strings.HasSuffix(fileName, "workflow.js") {
+		discoveredWorkflow := KindeWorkflow{
+			WorkflowRootDirectory: rootDirectory,
+			EntryPoints:           []string{file},
+		}
+		discoveredWorkflow.bundleAndIntrospect(ctx)
+		kw.Workflows = append(kw.Workflows, discoveredWorkflow)
+	}
+}
+
 // Discover implements ProjectBundler.
 func (p *projectBundler) Discover(ctx context.Context) (*KindeProject, error) {
 	result := &KindeProject{}

projectBundler/projectBundler_test.go

@@ -24,7 +24,7 @@ func Test_ProjectBunler(t *testing.T) {
 	}
 	assert.Equal("2024-12-09", kindeProject.Configuration.Version)
 	assert.Equal("kindeSrc", kindeProject.Configuration.RootDir)
-	assert.Equal(2, len(kindeProject.Environment.Workflows))
+	assert.Equal(3, len(kindeProject.Environment.Workflows))
 	assert.Empty(kindeProject.Environment.Workflows[0].Bundle.Errors)
 	assert.Empty(kindeProject.Environment.Workflows[1].Bundle.Errors)
 

runtime_test.go

@@ -143,9 +143,10 @@ func Test_ProjectBunlerE2E(t *testing.T) {
 	}
 	assert.Equal("2024-12-09", kindeProject.Configuration.Version)
 	assert.Equal("kindeSrc", kindeProject.Configuration.RootDir)
-	assert.Equal(2, len(kindeProject.Environment.Workflows))
+	assert.Equal(3, len(kindeProject.Environment.Workflows))
 	assert.Empty(kindeProject.Environment.Workflows[0].Bundle.Errors)
 	assert.Empty(kindeProject.Environment.Workflows[1].Bundle.Errors)
+	assert.Empty(kindeProject.Environment.Workflows[2].Bundle.Errors)
 
 	for _, workflow := range kindeProject.Environment.Workflows {
 		t.Run(fmt.Sprintf("Test_ExecuteWorkflowWithGoja - %v", workflow.WorkflowRootDirectory), testExecution(workflow, assert))

testData/kindeSrc/environment/workflows/rootWorkflow.ts

@@ -0,0 +1,40 @@
+export const workflowSettings = {
+    id: 'tokenGen',
+    trigger: 'onCustomEvent',
+    bindings:{
+        "console": {},
+        "url": {},
+        "util": {},
+        "kinde.fetch": {},
+        "kinde.idToken": {
+            resetClaims: true
+        },
+        "kinde.accessToken": {
+            resetClaims: true
+        }
+    }
+};
+
+
+export default async function handle (event: any) {
+    console.log('logging from root workflow')
+    const ps = new URLSearchParams({"aaa": "bbb", "ccc": "ddd"});
+    console.log('logging url search params', ps.toString());
+    if (ps.toString() !== 'aaa=bbb&ccc=ddd') {
+        throw new Error('URLSearchParams failed');
+    }
+
+    var txt = 'Congratulate %s on his %dth birthday!';
+    var result = util.format(txt, 'Ev', 42);
+    if (result !== 'Congratulate Ev on his 42th birthday!') {
+        throw new Error('util.format failed');
+    }
+    console.log('logging with util formatting', result);
+
+    kinde.idToken.setCustomClaim('random', 'test');
+    kinde.accessToken.setCustomClaim('test2', {'test2': 'hello'});
+    console.log('logging from action', {"balh": "blah"});
+    await kinde.fetch("http://google.com");
+    console.error('error log');
+    return 'testing return';
+}