@oclif/core 1.0.7 → 1.0.11

package/CHANGELOG.md

@@ -2,6 +2,29 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [1.0.11](https://github.com/oclif/core/compare/v1.0.10...v1.0.11) (2021-12-17)
+
+
+### Bug Fixes
+
+* update imports in errors/cli.ts ([#325](https://github.com/oclif/core/issues/325)) ([b3d6e9b](https://github.com/oclif/core/commit/b3d6e9bf34928ac59486807576a2ee2643b22464))
+
+### [1.0.10](https://github.com/oclif/core/compare/v1.0.9...v1.0.10) (2021-12-08)
+
+
+### Bug Fixes
+
+* bump deps ([#317](https://github.com/oclif/core/issues/317)) ([3e656e0](https://github.com/oclif/core/commit/3e656e0b6909bedb879a267bf341cfb992f4d208))
+
+### [1.0.9](https://github.com/oclif/core/compare/v1.0.8...v1.0.9) (2021-12-08)
+
+### [1.0.8](https://github.com/oclif/core/compare/v1.0.7...v1.0.8) (2021-12-07)
+
+
+### Bug Fixes
+
+* bump deps ([#314](https://github.com/oclif/core/issues/314)) ([e989d1c](https://github.com/oclif/core/commit/e989d1c078d24df3023f2abf61dd454435f08956))
+
 ### [1.0.7](https://github.com/oclif/core/compare/v1.0.6...v1.0.7) (2021-12-02)
 
 

package/README.md

@@ -1,5 +1,5 @@
 @oclif/core
-==============
+===========
 
 base library for oclif CLIs
 
@@ -9,6 +9,11 @@ base library for oclif CLIs
 [![License](https://img.shields.io/npm/l/@oclif/core.svg)](https://github.com/oclif/core/blob/main/package.json)
 
 
+Migrating
+=====
+
+If you're migrating from the old oclif libraries (`@oclif/config`, `@oclif/command`, `@oclif/error`, `@oclif/parser`), see the [migration guide](./MIGRATION.md).
+
 Usage
 =====
 
@@ -33,7 +38,7 @@ class LS extends Command {
   }
 
   async run() {
-    const {flags} = this.parse(LS)
+    const {flags} = await this.parse(LS)
     let files = fs.readdirSync(flags.dir)
     for (let f of files) {
       this.log(f)

package/lib/config/plugin.js

@@ -23,23 +23,34 @@ function topicsToArray(input, base) {
         return [{ ...input[k], name: `${base}${k}` }].concat(topicsToArray(input[k].subtopics, `${base}${input[k].name}`));
     });
 }
-// eslint-disable-next-line valid-jsdoc
+// essentially just "cd .."
+function* up(from) {
+    while (path.dirname(from) !== from) {
+        yield from;
+        from = path.dirname(from);
+    }
+    yield from;
+}
+async function findSourcesRoot(root) {
+    for (const next of up(root)) {
+        const cur = path.join(next, 'package.json');
+        // eslint-disable-next-line no-await-in-loop
+        if (await (0, util_3.exists)(cur))
+            return path.dirname(cur);
+    }
+}
 /**
+ * @returns string
+ * @param name string
+ * @param root string
  * find package root
  * for packages installed into node_modules this will go up directories until
  * it finds a node_modules directory with the plugin installed into it
  *
- * This is needed because of the deduping npm does
+ * This is needed because some oclif plugins do not declare the `main` field in their package.json
+ * https://github.com/oclif/config/pull/289#issuecomment-983904051
  */
-async function findRoot(name, root) {
-    // essentially just "cd .."
-    function* up(from) {
-        while (path.dirname(from) !== from) {
-            yield from;
-            from = path.dirname(from);
-        }
-        yield from;
-    }
+async function findRootLegacy(name, root) {
     for (const next of up(root)) {
         let cur;
         if (name) {
@@ -63,6 +74,17 @@ async function findRoot(name, root) {
         }
     }
 }
+async function findRoot(name, root) {
+    if (name) {
+        let pkgPath;
+        try {
+            pkgPath = (0, util_3.resolvePackage)(name, { paths: [__dirname, root] });
+        }
+        catch { }
+        return pkgPath ? findSourcesRoot(path.dirname(pkgPath)) : findRootLegacy(name, root);
+    }
+    return findSourcesRoot(root);
+}
 class Plugin {
     // eslint-disable-next-line no-useless-constructor
     constructor(options) {

package/lib/config/util.d.ts

@@ -5,6 +5,9 @@ export declare function mapValues<T extends Record<string, any>, TResult>(obj: {
     [P in keyof T]: TResult;
 };
 export declare function exists(path: string): Promise<boolean>;
+export declare function resolvePackage(id: string, paths: {
+    paths: string[];
+}): string;
 export declare function loadJSON(path: string): Promise<any>;
 export declare function compact<T>(a: (T | undefined)[]): T[];
 export declare function uniq<T>(arr: T[]): T[];

package/lib/config/util.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Debug = exports.uniq = exports.compact = exports.loadJSON = exports.exists = exports.mapValues = exports.flatMap = void 0;
+exports.Debug = exports.uniq = exports.compact = exports.loadJSON = exports.resolvePackage = exports.exists = exports.mapValues = exports.flatMap = void 0;
 const fs = require("fs");
 const debug = require('debug');
 function flatMap(arr, fn) {
@@ -20,6 +20,10 @@ function exists(path) {
     return new Promise(resolve => resolve(fs.existsSync(path)));
 }
 exports.exists = exists;
+function resolvePackage(id, paths) {
+    return require.resolve(id, paths);
+}
+exports.resolvePackage = resolvePackage;
 function loadJSON(path) {
     debug('config')('loadJSON %s', path);
     return new Promise((resolve, reject) => {

package/lib/errors/errors/cli.d.ts

@@ -17,11 +17,11 @@ export declare class CLIError extends Error implements OclifError {
      * @return {string} returns a string representing the dispay of the error
      */
     render(): string;
-    get bang(): string;
+    get bang(): string | undefined;
 }
 export declare namespace CLIError {
     class Warn extends CLIError {
         constructor(err: string | Error);
-        get bang(): string;
+        get bang(): string | undefined;
     }
 }

package/lib/errors/errors/cli.js

@@ -1,7 +1,11 @@
 "use strict";
-// tslint:disable no-implicit-dependencies
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CLIError = exports.addOclifExitCode = void 0;
+const chalk = require("chalk");
+const indent = require("indent-string");
+const cs = require("clean-stack");
+const wrap = require("wrap-ansi");
+const screen = require("../../screen");
 const config_1 = require("../config");
 /**
  * properties specific to internal oclif error handling
@@ -22,8 +26,7 @@ class CLIError extends Error {
         this.code = options.code;
     }
     get stack() {
-        const clean = require('clean-stack');
-        return clean(super.stack, { pretty: true });
+        return cs(super.stack, { pretty: true });
     }
     /**
      * @deprecated `render` Errors display should be handled by display function, like pretty-print
@@ -33,23 +36,18 @@ class CLIError extends Error {
         if (config_1.config.debug) {
             return this.stack;
         }
-        const wrap = require('wrap-ansi');
-        const indent = require('indent-string');
         let output = `${this.name}: ${this.message}`;
-        // eslint-disable-next-line node/no-missing-require
-        output = wrap(output, require('../screen').errtermwidth - 6, { trim: false, hard: true });
+        output = wrap(output, screen.errtermwidth - 6, { trim: false, hard: true });
         output = indent(output, 3);
         output = indent(output, 1, { indent: this.bang, includeEmptyLines: true });
         output = indent(output, 1);
         return output;
     }
     get bang() {
-        let red = ((s) => s);
         try {
-            red = require('chalk').red;
+            return chalk.red(process.platform === 'win32' ? '»' : '›');
         }
         catch { }
-        return red(process.platform === 'win32' ? '»' : '›');
     }
 }
 exports.CLIError = CLIError;
@@ -60,12 +58,10 @@ exports.CLIError = CLIError;
             this.name = 'Warning';
         }
         get bang() {
-            let yellow = ((s) => s);
             try {
-                yellow = require('chalk').yellow;
+                return chalk.yellow(process.platform === 'win32' ? '»' : '›');
             }
             catch { }
-            return yellow(process.platform === 'win32' ? '»' : '›');
         }
     }
     CLIError.Warn = Warn;

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@oclif/core",
   "description": "base library for oclif CLIs",
-  "version": "1.0.7",
+  "version": "1.0.11",
   "author": "Salesforce",
   "bugs": "https://github.com/oclif/core/issues",
   "dependencies": {
     "@oclif/linewrap": "^1.0.0",
     "chalk": "^4.1.2",
     "clean-stack": "^3.0.1",
-    "cli-ux": "^6.0.3",
+    "cli-ux": "6.0.5",
     "debug": "^4.3.3",
     "fs-extra": "^9.1.0",
     "get-package-type": "^0.1.0",
@@ -25,8 +25,8 @@
   },
   "devDependencies": {
     "@commitlint/config-conventional": "^12.1.4",
-    "@oclif/plugin-help": "^5.1.5",
-    "@oclif/plugin-plugins": "^2.0.2",
+    "@oclif/plugin-help": "^5.1.7",
+    "@oclif/plugin-plugins": "^2.0.8",
     "@oclif/test": "^1.2.8",
     "@types/chai": "^4.2.22",
     "@types/chai-as-promised": "^7.1.4",
@@ -62,7 +62,7 @@
     "typescript": "4.5.2"
   },
   "resolutions": {
-    "@oclif/command": "1.8.6",
+    "@oclif/command": "1.8.9",
     "@oclif/parser": "3.8.6"
   },
   "engines": {