@oclif/core 3.7.1 → 3.9.0

package/lib/config/config.js

@@ -458,11 +458,11 @@ class Config {
                 const marker = performance_1.Performance.mark(performance_1.OCLIF_MARKER_OWNER, `config.runHook#${p.name}(${hook})`);
                 try {
                     /* eslint-disable no-await-in-loop */
-                    const { filePath, isESM, module } = await (0, module_loader_1.loadWithData)(p, (0, node_path_1.join)(p.root, hook));
+                    const { filePath, isESM, module } = await (0, module_loader_1.loadWithData)(p, hook);
                     debug('start', isESM ? '(import)' : '(require)', filePath);
                     const result = timeout
-                        ? await withTimeout(timeout, search(module).call(context, { ...opts, config: this }))
-                        : await search(module).call(context, { ...opts, config: this });
+                        ? await withTimeout(timeout, search(module).call(context, { ...opts, config: this, context }))
+                        : await search(module).call(context, { ...opts, config: this, context });
                     final.successes.push({ plugin: p, result });
                     if (p.name === '@oclif/plugin-legacy' && event === 'init') {
                         this.insertLegacyPlugins(result);

package/lib/config/plugin.js

@@ -163,7 +163,7 @@ class Plugin {
         else {
             this.pjson.oclif = this.pjson['cli-engine'] || {};
         }
-        this.hooks = (0, util_1.mapValues)(this.pjson.oclif.hooks || {}, (i) => (Array.isArray(i) ? i : [i]));
+        this.hooks = (0, util_1.mapValues)(this.pjson.oclif.hooks ?? {}, (i) => (0, util_1.castArray)(i).map((i) => (0, ts_node_1.tsPath)(this.root, i, this)));
         this.manifest = await this._manifest();
         this.commands = Object.entries(this.manifest.commands)
             .map(([id, c]) => ({

package/lib/index.d.ts

@@ -14,6 +14,7 @@ export { toConfiguredId, toStandardizedId } from './help/util';
 export * as Interfaces from './interfaces';
 export { Hook } from './interfaces/hooks';
 export { run } from './main';
+export * as ModuleLoader from './module-loader';
 export * as Parser from './parser';
 export { Performance } from './performance';
 export { Settings, settings } from './settings';

package/lib/index.js

@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.settings = exports.Performance = exports.Parser = exports.run = exports.Interfaces = exports.toStandardizedId = exports.toConfiguredId = exports.loadHelpClass = exports.HelpBase = exports.Help = exports.CommandHelp = exports.Flags = exports.execute = exports.handle = exports.Errors = exports.Plugin = exports.Config = exports.Command = exports.stdout = exports.stderr = exports.flush = exports.ux = exports.Args = void 0;
+exports.settings = exports.Performance = exports.Parser = exports.ModuleLoader = exports.run = exports.Interfaces = exports.toStandardizedId = exports.toConfiguredId = exports.loadHelpClass = exports.HelpBase = exports.Help = exports.CommandHelp = exports.Flags = exports.execute = exports.handle = exports.Errors = exports.Plugin = exports.Config = exports.Command = exports.stdout = exports.stderr = exports.flush = exports.ux = exports.Args = void 0;
 const write_1 = __importDefault(require("./cli-ux/write"));
 function checkCWD() {
     try {
@@ -69,6 +69,7 @@ Object.defineProperty(exports, "toStandardizedId", { enumerable: true, get: func
 exports.Interfaces = __importStar(require("./interfaces"));
 var main_1 = require("./main");
 Object.defineProperty(exports, "run", { enumerable: true, get: function () { return main_1.run; } });
+exports.ModuleLoader = __importStar(require("./module-loader"));
 exports.Parser = __importStar(require("./parser"));
 var performance_1 = require("./performance");
 Object.defineProperty(exports, "Performance", { enumerable: true, get: function () { return performance_1.Performance; } });

package/lib/interfaces/hooks.d.ts

@@ -5,6 +5,16 @@ interface HookMeta {
     options: Record<string, unknown>;
     return: any;
 }
+type Context = {
+    debug(...args: any[]): void;
+    error(message: Error | string, options?: {
+        code?: string;
+        exit?: number;
+    }): void;
+    exit(code?: number): void;
+    log(message?: any, ...args: any[]): void;
+    warn(message: string): void;
+};
 export interface Hooks {
     [event: string]: HookMeta;
     command_incomplete: {
@@ -84,6 +94,7 @@ export interface Hooks {
 }
 export type Hook<T extends keyof P, P extends Hooks = Hooks> = (this: Hook.Context, options: P[T]['options'] & {
     config: Config;
+    context: Context;
 }) => Promise<P[T]['return']>;
 export declare namespace Hook {
     type Init = Hook<'init'>;

package/lib/module-loader.d.ts

@@ -16,7 +16,7 @@ import { Config as IConfig, Plugin as IPlugin } from './interfaces';
  *
  * @returns {Promise<*>} The entire ESM module from dynamic import or CJS module by require.
  */
-export declare function load(config: IConfig | IPlugin, modulePath: string): Promise<any>;
+export declare function load<T = any>(config: IConfig | IPlugin, modulePath: string): Promise<T>;
 /**
  * Loads a module and returns an object with the module and data about the module.
  *
@@ -34,10 +34,10 @@ export declare function load(config: IConfig | IPlugin, modulePath: string): Pro
  * @returns {Promise<{isESM: boolean, module: *, filePath: string}>} An object with the loaded module & data including
  *                                                                   file path and whether the module is ESM.
  */
-export declare function loadWithData(config: IConfig | IPlugin, modulePath: string): Promise<{
+export declare function loadWithData<T = any>(config: IConfig | IPlugin, modulePath: string): Promise<{
     filePath: string;
     isESM: boolean;
-    module: any;
+    module: T;
 }>;
 /**
  * Loads a module and returns an object with the module and data about the module.
@@ -54,10 +54,10 @@ export declare function loadWithData(config: IConfig | IPlugin, modulePath: stri
  * @returns {Promise<{isESM: boolean, module: *, filePath: string}>} An object with the loaded module & data including
  *                                                                   file path and whether the module is ESM.
  */
-export declare function loadWithDataFromManifest(cached: Command.Cached, modulePath: string): Promise<{
+export declare function loadWithDataFromManifest<T = any>(cached: Command.Cached, modulePath: string): Promise<{
     filePath: string;
     isESM: boolean;
-    module: any;
+    module: T;
 }>;
 /**
  * For `.js` files uses `getPackageType` to determine if `type` is set to `module` in associated `package.json`. If

package/lib/module-loader.js

@@ -36,7 +36,7 @@ async function load(config, modulePath) {
     try {
         ;
         ({ filePath, isESM } = resolvePath(config, modulePath));
-        return isESM ? await import((0, node_url_1.pathToFileURL)(filePath).href) : require(filePath);
+        return (isESM ? await import((0, node_url_1.pathToFileURL)(filePath).href) : require(filePath));
     }
     catch (error) {
         if (error.code === 'MODULE_NOT_FOUND' || error.code === 'ERR_MODULE_NOT_FOUND') {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@oclif/core",
   "description": "base library for oclif CLIs",
-  "version": "3.7.1",
+  "version": "3.9.0",
   "author": "Salesforce",
   "bugs": "https://github.com/oclif/core/issues",
   "dependencies": {