@oclif/core 5.1.8 → 5.1.10

package/lib/config/config.js

@@ -242,7 +242,11 @@ class Config {
             displayWarnings();
         (0, logger_1.setLogger)(this.options);
         const marker = performance_1.Performance.mark(performance_1.OCLIF_MARKER_OWNER, 'config.load');
-        this.pluginLoader = new plugin_loader_1.default({ plugins: this.options.plugins, root: this.options.root });
+        this.pluginLoader = new plugin_loader_1.default({
+            ignoreManifest: this.options.ignoreManifest,
+            plugins: this.options.plugins,
+            root: this.options.root,
+        });
         this.rootPlugin = await this.pluginLoader.loadRoot({ pjson: this.options.pjson });
         // Cache the root plugin so that we can reference it later when determining if
         // we should skip ts-node registration for an ESM plugin.

package/lib/config/plugin-loader.d.ts

@@ -1,6 +1,7 @@
 import { type PJSON } from '../interfaces';
 import { type Plugin as IPlugin } from '../interfaces/plugin';
 type PluginLoaderOptions = {
+    ignoreManifest?: boolean | undefined;
     plugins?: IPlugin[] | PluginsMap | undefined;
     root: string;
 };

package/lib/config/plugin-loader.js

@@ -40,7 +40,12 @@ class PluginLoader {
         }
         else {
             const marker = performance_1.Performance.mark(performance_1.OCLIF_MARKER_OWNER, 'plugin.load#root');
-            rootPlugin = new plugin_1.Plugin({ isRoot: true, pjson, root: this.options.root });
+            rootPlugin = new plugin_1.Plugin({
+                ignoreManifest: this.options.ignoreManifest,
+                isRoot: true,
+                pjson,
+                root: this.options.root,
+            });
             await rootPlugin.load();
             marker?.addDetails({
                 commandCount: rootPlugin.commands.length,
@@ -118,6 +123,7 @@ class PluginLoader {
             try {
                 const name = typeof plugin === 'string' ? plugin : plugin.name;
                 const opts = {
+                    ignoreManifest: this.options.ignoreManifest,
                     name,
                     root,
                     type,

package/lib/execute.d.ts

@@ -1,4 +1,7 @@
-import { type LoadOptions } from './interfaces';
+import type { LoadOptions, Options } from './interfaces';
+type ExecuteOptions = Omit<Options, 'root'> & {
+    root?: string;
+};
 /**
  * Load and run oclif CLI
  *
@@ -36,9 +39,15 @@ import { type LoadOptions } from './interfaces';
  * })()
  * ```
  */
-export declare function execute(options: {
+type ExecuteArguments = {
     args?: string[];
     development?: boolean;
+};
+export declare function execute(options: (ExecuteArguments & {
+    dir: string;
+    loadOptions?: LoadOptions | ExecuteOptions;
+}) | (ExecuteArguments & {
     dir?: string;
-    loadOptions?: LoadOptions;
-}): Promise<unknown>;
+    loadOptions: Exclude<LoadOptions, undefined>;
+})): Promise<unknown>;
+export {};

package/lib/execute.js

@@ -1,48 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.execute = execute;
+const node_url_1 = require("node:url");
 const errors_1 = require("./errors");
 const handle_1 = require("./errors/handle");
 const flush_1 = require("./flush");
 const main_1 = require("./main");
 const settings_1 = require("./settings");
-/**
- * Load and run oclif CLI
- *
- * @example For ESM dev.js
- * ```
- * #!/usr/bin/env -S node --loader ts-node/esm --no-warnings=ExperimentalWarning
- * import { execute } from '@oclif/core'
- *
- * await execute({development: true, dir: import.meta.url})
- * ```
- *
- * @example For ESM run.js
- * ```
- * #!/usr/bin/env node
- * import { execute } from '@oclif/core'
- *
- * await execute({dir: import.meta.url})
- * ```
- *
- * @example For CJS dev.js
- * ```
- * #!/usr/bin/env ts-node
- * void (async () => {
- *   const oclif = await import('@oclif/core')
- *   await oclif.execute({development: true, dir: __dirname})
- * })()
- * ```
- *
- * @example For CJS run.js
- * ```
- * #!/usr/bin/env node
- * void (async () => {
- *   const oclif = await import('@oclif/core')
- *   await oclif.execute({dir: __dirname})
- * })()
- * ```
- */
+function isOptions(loadOptions) {
+    return typeof loadOptions === 'object' && loadOptions !== null && !('runCommand' in loadOptions);
+}
+function normalizeLoadOptions(dir, loadOptions) {
+    if (!loadOptions || !isOptions(loadOptions))
+        return loadOptions ?? dir;
+    const root = loadOptions.root ?? (dir?.startsWith('file://') ? (0, node_url_1.fileURLToPath)(dir) : dir);
+    if (!root)
+        throw new errors_1.CLIError('dir or loadOptions.root is required.');
+    return { ...loadOptions, root };
+}
 async function execute(options) {
     if (!options.dir && !options.loadOptions) {
         throw new errors_1.CLIError('dir or loadOptions is required.');
@@ -52,10 +27,12 @@ async function execute(options) {
         process.env.NODE_ENV = 'development';
         settings_1.settings.debug = true;
     }
-    return (0, main_1.run)(options.args ?? process.argv.slice(2), options.loadOptions ?? options.dir)
-        .then(async (result) => {
-        (0, flush_1.flush)();
+    try {
+        const result = await (0, main_1.run)(options.args ?? process.argv.slice(2), normalizeLoadOptions(options.dir, options.loadOptions));
+        await (0, flush_1.flush)();
         return result;
-    })
-        .catch(async (error) => (0, handle_1.handle)(error));
+    }
+    catch (error) {
+        return (0, handle_1.handle)(error instanceof Error ? error : new Error(String(error)));
+    }
 }

package/lib/help/command.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CommandHelp = void 0;
 const ansis_1 = __importDefault(require("ansis"));
+const string_width_1 = __importDefault(require("string-width"));
 const ensure_arg_object_1 = require("../util/ensure-arg-object");
 const ids_1 = require("../util/ids");
 const util_1 = require("../util/util");
@@ -208,7 +209,8 @@ class CommandHelp extends formatter_1.HelpFormatter {
             if (!flag.char)
                 flagHelp = flagHelp.replace(' '.repeat(4), '');
             flagHelp +=
-                flagHelp.length + summary.length + 2 < this.opts.maxWidth
+                // maxWidth is a terminal width, so compare against display width instead of code unit count
+                (0, string_width_1.default)(flagHelp) + (0, string_width_1.default)(summary) + 2 < this.opts.maxWidth
                     ? '  ' + summary
                     : '\n\n' + this.indent(this.wrap(summary, this.indentSpacing * 2));
             return `${flagHelp}\n\n${this.indent(this.wrap(flag.description || '', this.indentSpacing * 2))}`;

package/lib/parser/parse.js

@@ -42,7 +42,9 @@ const readStdin = async () => {
         const lines = [];
         const ac = new AbortController();
         const { signal } = ac;
-        const timeout = setTimeout(() => { ac.abort(); }, Number(process.env.OCLIF_STDIN_TIMEOUT_MS) || 10);
+        const timeout = setTimeout(() => {
+            ac.abort();
+        }, Number(process.env.OCLIF_STDIN_TIMEOUT_MS) || 10);
         const rl = (0, node_readline_1.createInterface)({
             input: stdin,
             output: stdout,

package/package.json

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