@akala/pm 5.2.40 → 6.0.0

package/src/commands/$init.ts

@@ -50,7 +50,7 @@ export function isRunningContainer(c: Container<unknown>): c is RunningContainer
     return 'running' in c;
 }
 
-export default async function (this: State, container: RunningContainer & pmContainer.container, context: CliContext<{ config: string, keepAttached: boolean, args: string[] }>): Promise<void>
+export default async function (this: State, container: RunningContainer & pmContainer.container, context: CliContext<{ configFile: string, keepAttached: boolean, args: string[] }>): Promise<void>
 {
     this.isDaemon = true;
     this.processes = {};
@@ -86,7 +86,7 @@ export default async function (this: State, container: RunningContainer & pmCont
         , killed: false
     });
 
-    const configPath = context.options.config || join(homedir(), './.pm.config.json');
+    const configPath = context.options.configFile || join(homedir(), './.pm.config.json');
     this.config = await Configuration.load<StateConfiguration>(configPath, true);
 
     if (this.config?.mapping?.pm)
@@ -95,11 +95,11 @@ export default async function (this: State, container: RunningContainer & pmCont
             process.chdir(this.config.mapping.pm.cwd);
     }
     else
-        this.config = Configuration.new<StateConfiguration>(configPath, {
-            containers: { pm: { commandable: true, stateless: false, path: fileURLToPath(new URL('../../../commands.json', import.meta.url)) } },
-            mapping: { pm: { cwd: process.cwd(), container: 'pm' } },
-            plugins: []
-        }) as State['config'];
+    {
+        this.config.set('containers', { pm: { commandable: true, stateless: false, path: fileURLToPath(new URL('../../../commands.json', import.meta.url)) } });
+        this.config.set('mapping', { pm: { cwd: process.cwd(), container: 'pm' } })
+        this.config.set('plugins', [])
+    }
 
     this.config.mapping['pm'].set('connect', serveMetadata('pm', { options: context.options, args: context.options.args } as unknown as ServeOptions));
 

package/src/commands/discover.ts

@@ -99,6 +99,4 @@ export default async function discover(this: State, packageName: string, folder:
         return pm.dispatch('map', packageName, commandsJsonFile, path, { commandable: true });
 
     return pm.dispatch('map', packageName, moduleRequire.resolve('./' + packageConfig.main), path, { commandable: false });
-}
-
-exports.default.$inject = ['param.0', 'param.1', '$container']
+}

package/src/commands/map.ts

@@ -1,11 +1,11 @@
 import State from '../state.js';
 import { isAbsolute, resolve } from "path";
 
-export default async function map<TName extends string>(this: State, name: TName, targetPath: string, cwd?: string, options?: { commandable?: boolean, stateless?: boolean }): Promise<State['config']['mapping'][TName]>
+export default async function map<TName extends string>(this: State, name: TName, targetPath: string, cwd?: string, options?: { commandable?: boolean }): Promise<State['config']['mapping'][TName]>
 {
     if (!isAbsolute(targetPath))
         targetPath = resolve(cwd || process.cwd(), targetPath);
-    this.config.containers.set(name, { path: targetPath, commandable: !!options?.commandable, stateless: !!options?.stateless });
+    this.config.containers.set(name, { path: targetPath, commandable: !!options?.commandable });
     await this.config.commit();
     return this.config.mapping[name]
 }

package/src/commands/start.ts

@@ -4,7 +4,7 @@ import { spawn, ChildProcess, StdioOptions } from "child_process";
 import pmContainer from '../container.js';
 import { Deferred, eachAsync } from "@akala/core";
 import { NewLinePrefixer } from "../new-line-prefixer.js";
-import { CliContext } from "@akala/cli";
+import { CliContext, unparseOptions } from "@akala/cli";
 import { ErrorWithStatus } from "@akala/core";
 import getRandomName from "./name.js";
 import { ProxyConfiguration } from "@akala/config";
@@ -47,7 +47,7 @@ export default async function start(this: State, pm: pmContainer.container & Con
             throw new ErrorWithStatus(404, `No mapping was found for ${name}. Did you want to run \`pm install ${name}\` or maybe are you missing the folder to ${name} ?`)
         }
 
-        args.unshift(...context.args, ...Object.entries(context.options).filter(e => e[0] != 'program' && e[0] != 'new' && e[0] != 'inspect').map(entries => ['--' + entries[0] + '=' + entries[1]]).flat());
+        args.unshift(...context.args, ...unparseOptions({ ...context.options, program: undefined, new: undefined, inspect: undefined }, { ignoreUndefined: true }));
         if (def && def.get('path'))
             args.unshift('--program=' + def.get('path'));
         else
@@ -58,11 +58,14 @@ export default async function start(this: State, pm: pmContainer.container & Con
         if (name != 'pm')
             throw new ErrorWithStatus(40, 'this command needs to run through daemon process');
 
-        args = [...context.args, ...Object.entries(context.options).filter(p => ['inspect'].indexOf(p[0]) == -1).map(entries => ['--' + entries[0] + '=' + entries[1]]).flat()];
+        args = [...context.args, ...unparseOptions({ ...context.options, inspect: undefined })];
     }
 
     if (!def?.type || def.type == 'nodejs')
+    {
+
         args.unshift(path.resolve(_dirname, '../fork'))
+    }
 
     if (context.options && context.options.inspect)
         args.unshift('--inspect-brk');
@@ -153,6 +156,7 @@ export default async function start(this: State, pm: pmContainer.container & Con
             {
                 // console.log(metaContainer);
                 updateCommands(metaContainer.commands, null, container);
+                container.stateless = metaContainer.stateless;
                 pm.register(name, container, true);
             });
         }, () =>

package/src/fork.ts

@@ -36,6 +36,7 @@ const controller = new AbortController();
 program.option<string, 'program'>('program', { needsValue: true, normalize: true, positional: true, position: 0 }).
     option<string, 'name'>('name', { needsValue: true, positional: true, position: 1, optional: true }).
     option<boolean, 'tls'>('tls', { needsValue: false }).
+    option<string, 'configFile'>('configFile', { needsValue: false }).
     options<{
         port?: number,
         tcpPort?: string,