fix: automate after upgrade

npenin · Aug 10, 2024 · 02e0707 · 02e0707
1 parent a0f3b80
commit 02e0707
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/packages/automate/src/akala.mts b/packages/automate/src/akala.mts
@@ -30,7 +30,7 @@ export default function (config, cli: NamespaceMiddleware)
                         context.logger.level = LogLevels[levelEntry[0]];
             }
         }
-        const container: workflow.container & Container<CliContext> = await use.call(context, null, 'workflow', require.resolve('../../workflow.json'));
+        const container: workflow.container & Container<CliContext> = await use.call(context, null, 'workflow', new URL('../../workflow.json', import.meta.url));
         var loader: Container<CliContext>;
 
         if (context.options.loader)

diff --git a/packages/automate/src/workflow-commands/process.ts b/packages/automate/src/workflow-commands/process.ts
@@ -22,7 +22,7 @@ export function UsesMiddleware(container: Container<unknown>): MiddlewareRunner<
 {
     return new MiddlewareRunner('uses', (context: CliContext<{ file: string }>, step) =>
     {
-        return use.call(context, container, step.with?.name, path.join(path.dirname(context.options.file), step.uses));
+        return use.call(context, container as any, step.with?.name as string, path.join(path.dirname(context.options.file), step.uses));
     });
 }
 

diff --git a/packages/automate/src/workflow-commands/use.ts b/packages/automate/src/workflow-commands/use.ts
@@ -3,14 +3,15 @@ import { Container, Processors } from "@akala/commands";
 import { isAbsolute, basename } from 'path'
 import { pathToFileURL, fileURLToPath } from 'url'
 
-export default async function use(this: CliContext, self: Container<CliContext>, name: string, pathToCommands: string)
+export default async function use(this: CliContext, self: Container<CliContext>, name: string, pathToCommands: string | URL)
 {
     if (!name)
         var container = self;
     else
         var container = new Container(name, this);
-    if (pathToCommands.startsWith('./') || isAbsolute(pathToCommands))
+    if (pathToCommands instanceof URL || pathToCommands.startsWith('./') || isAbsolute(pathToCommands))
     {
+        pathToCommands = fileURLToPath(pathToCommands);
         if (basename(pathToCommands) == 'package.json')
             await Processors.FileSystem.discoverCommands(pathToCommands.substring(0, pathToCommands.length - 'package.json'.length), container);
         else
-Original file line number
+Diff line change
@@ Expand Up @@
     {
         return new MiddlewareRunner('uses', (context: CliContext<{ file: string }>, step) =>
         {
-            return use.call(context, container, step.with?.name, path.join(path.dirname(context.options.file), step.uses));
+            return use.call(context, container as any, step.with?.name as string, path.join(path.dirname(context.options.file), step.uses));
         });
     }
@@ Expand Down @@