clipanion - npm Package Compare versions

Comparing version 3.2.0-rc.9 to 3.2.0-rc.10

lib/advanced/builtins/definitions.js

@@ -5,3 +5,3 @@ 'use strict';
 
-var Command = require('../Command.js');
+var advanced_Command = require('../Command.js');
 
@@ -11,3 +11,3 @@ /**
  */
-class DefinitionsCommand extends Command.Command {
+class DefinitionsCommand extends advanced_Command.Command {
     async execute() {
@@ -14,0 +14,0 @@ this.context.stdout.write(`${JSON.stringify(this.cli.definitions(), null, 2)}\n`);

lib/advanced/builtins/help.js

@@ -5,3 +5,3 @@ 'use strict';
 
-var Command = require('../Command.js');
+var advanced_Command = require('../Command.js');
 
@@ -13,3 +13,3 @@ /**
  */
-class HelpCommand extends Command.Command {
+class HelpCommand extends advanced_Command.Command {
     async execute() {
@@ -16,0 +16,0 @@ this.context.stdout.write(this.cli.usage());

lib/advanced/builtins/index.js

@@ -5,10 +5,10 @@ 'use strict';
 
-var definitions = require('./definitions.js');
-var help = require('./help.js');
-var version = require('./version.js');
+var advanced_builtins_definitions = require('./definitions.js');
+var advanced_builtins_help = require('./help.js');
+var advanced_builtins_version = require('./version.js');
 
 
 
-exports.DefinitionsCommand = definitions.DefinitionsCommand;
-exports.HelpCommand = help.HelpCommand;
-exports.VersionCommand = version.VersionCommand;
+exports.DefinitionsCommand = advanced_builtins_definitions.DefinitionsCommand;
+exports.HelpCommand = advanced_builtins_help.HelpCommand;
+exports.VersionCommand = advanced_builtins_version.VersionCommand;

lib/advanced/builtins/version.js

@@ -5,3 +5,3 @@ 'use strict';
 
-var Command = require('../Command.js');
+var advanced_Command = require('../Command.js');
 
@@ -13,3 +13,3 @@ /**
  */
-class VersionCommand extends Command.Command {
+class VersionCommand extends advanced_Command.Command {
     async execute() {
@@ -16,0 +16,0 @@ var _a;

lib/advanced/Cli.js

@@ -6,22 +6,9 @@ 'use strict';
 var constants = require('../constants.js');
-var Command = require('./Command.js');
 var core = require('../core.js');
 var format = require('../format.js');
-var HelpCommand = require('./HelpCommand.js');
+var platform = require('../platform');
+var advanced_Command = require('./Command.js');
+var advanced_HelpCommand = require('./HelpCommand.js');
 
 const errorCommandSymbol = Symbol(`clipanion/errorCommand`);
-let tty;
-try {
-    tty = require(`tty`);
-}
-catch (_a) { }
-function getDefaultColorDepth() {
-    if (process.env.FORCE_COLOR === `0`)
-        return 1;
-    if (process.env.FORCE_COLOR === `1`)
-        return 8;
-    if (typeof process.stdout !== `undefined` && process.stdout.isTTY)
-        return 8;
-    return 1;
-}
 async function runExit(...args) {
@@ -52,3 +39,3 @@ const { resolvedOptions, resolvedCommandClasses, resolvedArgv, resolvedContext, } = resolveRunParameters(args);
             {
-                if (args[0] && (args[0].prototype instanceof Command.Command) || Array.isArray(args[0])) {
+                if (args[0] && (args[0].prototype instanceof advanced_Command.Command) || Array.isArray(args[0])) {
                     resolvedCommandClasses = args[0];
@@ -75,3 +62,3 @@ if (Array.isArray(args[1])) {
                 }
-                else if (args[0] && (args[0].prototype instanceof Command.Command) || Array.isArray(args[0])) {
+                else if (args[0] && (args[0].prototype instanceof advanced_Command.Command) || Array.isArray(args[0])) {
                     resolvedCommandClasses = args[0];
@@ -143,3 +130,3 @@ resolvedArgv = args[1];
             const value = command[key];
-            if (typeof value === `object` && value !== null && value[Command.Command.isOption]) {
+            if (typeof value === `object` && value !== null && value[advanced_Command.Command.isOption]) {
                 specs.set(key, value);
@@ -171,3 +158,3 @@ }
                 {
-                    const command = HelpCommand.HelpCommand.from(state, contexts);
+                    const command = advanced_HelpCommand.HelpCommand.from(state, contexts);
                     command.context = context;
@@ -199,3 +186,3 @@ return command;
     async run(input, userContext) {
-        var _a;
+        var _a, _b;
         let command;
@@ -238,4 +225,3 @@ const context = {
         const activate = this.enableCapture
-            ? getCaptureActivator(context)
-            : noopCaptureActivator;
+            ? (_b = platform.getCaptureActivator(context)) !== null && _b !== void 0 ? _b : noopCaptureActivator : noopCaptureActivator;
         let exitCode;
@@ -311,3 +297,3 @@ try {
         // @ts-ignore
-        const commandClass = command !== null && command instanceof Command.Command
+        const commandClass = command !== null && command instanceof advanced_Command.Command
             ? command.constructor
@@ -389,3 +375,3 @@ : command;
                     result += `\n`;
-                    result += `${format.richFormat.header(`Options`)}\n`;
+                    result += `${this.format(colored).header(`Options`)}\n`;
                     const maxDefinitionLength = options.reduce((length, option) => {
@@ -468,33 +454,4 @@ return Math.max(length, option.definition.length);
     stderr: process.stderr,
-    colorDepth: tty && `getColorDepth` in tty.WriteStream.prototype
-        ? tty.WriteStream.prototype.getColorDepth()
-        : getDefaultColorDepth(),
+    colorDepth: platform.getDefaultColorDepth(),
 };
-let gContextStorage;
-function getCaptureActivator(context) {
-    let contextStorage = gContextStorage;
-    if (typeof contextStorage === `undefined`) {
-        if (context.stdout === process.stdout && context.stderr === process.stderr)
-            return noopCaptureActivator;
-        const { AsyncLocalStorage: LazyAsyncLocalStorage } = require(`async_hooks`);
-        contextStorage = gContextStorage = new LazyAsyncLocalStorage();
-        const origStdoutWrite = process.stdout._write;
-        process.stdout._write = function (chunk, encoding, cb) {
-            const context = contextStorage.getStore();
-            if (typeof context === `undefined`)
-                return origStdoutWrite.call(this, chunk, encoding, cb);
-            return context.stdout.write(chunk, encoding, cb);
-        };
-        const origStderrWrite = process.stderr._write;
-        process.stderr._write = function (chunk, encoding, cb) {
-            const context = contextStorage.getStore();
-            if (typeof context === `undefined`)
-                return origStderrWrite.call(this, chunk, encoding, cb);
-            return context.stderr.write(chunk, encoding, cb);
-        };
-    }
-    return (fn) => {
-        return contextStorage.run(context, fn);
-    };
-}
 function noopCaptureActivator(fn) {
@@ -501,0 +458,0 @@ return fn();

lib/advanced/Command.js

@@ -5,3 +5,3 @@ 'use strict';
 
-var utils = require('./options/utils.js');
+var advanced_options_utils = require('./options/utils.js');
 
@@ -60,3 +60,3 @@ function _interopNamespace(e) {
             if (!check)
-                throw utils.formatError(`Invalid option schema`, errors);
+                throw advanced_options_utils.formatError(`Invalid option schema`, errors);
             for (const [, op] of coercions) {
@@ -81,3 +81,3 @@ op();
  */
-Command.isOption = utils.isOptionSymbol;
+Command.isOption = advanced_options_utils.isOptionSymbol;
 /**
@@ -84,0 +84,0 @@ * Just an helper to use along with the `paths` fields, to make it

lib/advanced/HelpCommand.js

@@ -5,5 +5,5 @@ 'use strict';
 
-var Command = require('./Command.js');
+var advanced_Command = require('./Command.js');
 
-class HelpCommand extends Command.Command {
+class HelpCommand extends advanced_Command.Command {
     constructor(contexts) {
@@ -10,0 +10,0 @@ super();

lib/advanced/index.js

@@ -6,7 +6,7 @@ 'use strict';
 var errors = require('../errors.js');
-var Command = require('./Command.js');
 var format = require('../format.js');
-var Cli = require('./Cli.js');
-var index = require('./builtins/index.js');
-var index$1 = require('./options/index.js');
+var advanced_Command = require('./Command.js');
+var advanced_Cli = require('./Cli.js');
+var advanced_builtins_index = require('./builtins/index.js');
+var advanced_options_index = require('./options/index.js');
 
@@ -16,8 +16,8 @@
 exports.UsageError = errors.UsageError;
-exports.Command = Command.Command;
 exports.formatMarkdownish = format.formatMarkdownish;
-exports.Cli = Cli.Cli;
-exports.run = Cli.run;
-exports.runExit = Cli.runExit;
-exports.Builtins = index;
-exports.Option = index$1;
+exports.Command = advanced_Command.Command;
+exports.Cli = advanced_Cli.Cli;
+exports.run = advanced_Cli.run;
+exports.runExit = advanced_Cli.runExit;
+exports.Builtins = advanced_builtins_index;
+exports.Option = advanced_options_index;

lib/advanced/options/Array.js

@@ -5,10 +5,10 @@ 'use strict';
 
-var utils = require('./utils.js');
+var advanced_options_utils = require('./utils.js');
 
 function Array(descriptor, initialValueBase, optsBase) {
-    const [initialValue, opts] = utils.rerouteArguments(initialValueBase, optsBase !== null && optsBase !== void 0 ? optsBase : {});
+    const [initialValue, opts] = advanced_options_utils.rerouteArguments(initialValueBase, optsBase !== null && optsBase !== void 0 ? optsBase : {});
     const { arity = 1 } = opts;
     const optNames = descriptor.split(`,`);
     const nameSet = new Set(optNames);
-    return utils.makeCommandOption({
+    return advanced_options_utils.makeCommandOption({
         definition(builder) {
@@ -15,0 +15,0 @@ builder.addOption({

lib/advanced/options/Boolean.js

@@ -5,9 +5,9 @@ 'use strict';
 
-var utils = require('./utils.js');
+var advanced_options_utils = require('./utils.js');
 
 function Boolean(descriptor, initialValueBase, optsBase) {
-    const [initialValue, opts] = utils.rerouteArguments(initialValueBase, optsBase !== null && optsBase !== void 0 ? optsBase : {});
+    const [initialValue, opts] = advanced_options_utils.rerouteArguments(initialValueBase, optsBase !== null && optsBase !== void 0 ? optsBase : {});
     const optNames = descriptor.split(`,`);
     const nameSet = new Set(optNames);
-    return utils.makeCommandOption({
+    return advanced_options_utils.makeCommandOption({
         definition(builder) {
@@ -14,0 +14,0 @@ builder.addOption({

lib/advanced/options/Counter.js

@@ -5,9 +5,9 @@ 'use strict';
 
-var utils = require('./utils.js');
+var advanced_options_utils = require('./utils.js');
 
 function Counter(descriptor, initialValueBase, optsBase) {
-    const [initialValue, opts] = utils.rerouteArguments(initialValueBase, optsBase !== null && optsBase !== void 0 ? optsBase : {});
+    const [initialValue, opts] = advanced_options_utils.rerouteArguments(initialValueBase, optsBase !== null && optsBase !== void 0 ? optsBase : {});
     const optNames = descriptor.split(`,`);
     const nameSet = new Set(optNames);
-    return utils.makeCommandOption({
+    return advanced_options_utils.makeCommandOption({
         definition(builder) {
@@ -14,0 +14,0 @@ builder.addOption({

lib/advanced/options/index.js

@@ -5,23 +5,23 @@ 'use strict';
 
-var utils = require('./utils.js');
-var _Array = require('./Array.js');
-var _Boolean = require('./Boolean.js');
-var Counter = require('./Counter.js');
-var _Proxy = require('./Proxy.js');
-var Rest = require('./Rest.js');
-var _String = require('./String.js');
+var advanced_options_utils = require('./utils.js');
+var advanced_options_Array = require('./Array.js');
+var advanced_options_Boolean = require('./Boolean.js');
+var advanced_options_Counter = require('./Counter.js');
+var advanced_options_Proxy = require('./Proxy.js');
+var advanced_options_Rest = require('./Rest.js');
+var advanced_options_String = require('./String.js');
 
 
 
-exports.applyValidator = utils.applyValidator;
-exports.cleanValidationError = utils.cleanValidationError;
-exports.formatError = utils.formatError;
-exports.isOptionSymbol = utils.isOptionSymbol;
-exports.makeCommandOption = utils.makeCommandOption;
-exports.rerouteArguments = utils.rerouteArguments;
-exports.Array = _Array.Array;
-exports.Boolean = _Boolean.Boolean;
-exports.Counter = Counter.Counter;
-exports.Proxy = _Proxy.Proxy;
-exports.Rest = Rest.Rest;
-exports.String = _String.String;
+exports.applyValidator = advanced_options_utils.applyValidator;
+exports.cleanValidationError = advanced_options_utils.cleanValidationError;
+exports.formatError = advanced_options_utils.formatError;
+exports.isOptionSymbol = advanced_options_utils.isOptionSymbol;
+exports.makeCommandOption = advanced_options_utils.makeCommandOption;
+exports.rerouteArguments = advanced_options_utils.rerouteArguments;
+exports.Array = advanced_options_Array.Array;
+exports.Boolean = advanced_options_Boolean.Boolean;
+exports.Counter = advanced_options_Counter.Counter;
+exports.Proxy = advanced_options_Proxy.Proxy;
+exports.Rest = advanced_options_Rest.Rest;
+exports.String = advanced_options_String.String;

lib/advanced/options/Proxy.js

@@ -5,3 +5,3 @@ 'use strict';
 
-var utils = require('./utils.js');
+var advanced_options_utils = require('./utils.js');
 
@@ -22,3 +22,3 @@ /**
 function Proxy(opts = {}) {
-    return utils.makeCommandOption({
+    return advanced_options_utils.makeCommandOption({
         definition(builder, key) {
@@ -25,0 +25,0 @@ var _a;

lib/advanced/options/Rest.js

@@ -5,4 +5,4 @@ 'use strict';
 
-var utils = require('./utils.js');
 var core = require('../../core.js');
+var advanced_options_utils = require('./utils.js');
 
@@ -23,3 +23,3 @@ /**
 function Rest(opts = {}) {
-    return utils.makeCommandOption({
+    return advanced_options_utils.makeCommandOption({
         definition(builder, key) {
@@ -26,0 +26,0 @@ var _a;

lib/advanced/options/String.js

@@ -5,11 +5,11 @@ 'use strict';
 
-var utils = require('./utils.js');
 var core = require('../../core.js');
+var advanced_options_utils = require('./utils.js');
 
 function StringOption(descriptor, initialValueBase, optsBase) {
-    const [initialValue, opts] = utils.rerouteArguments(initialValueBase, optsBase !== null && optsBase !== void 0 ? optsBase : {});
+    const [initialValue, opts] = advanced_options_utils.rerouteArguments(initialValueBase, optsBase !== null && optsBase !== void 0 ? optsBase : {});
     const { arity = 1 } = opts;
     const optNames = descriptor.split(`,`);
     const nameSet = new Set(optNames);
-    return utils.makeCommandOption({
+    return advanced_options_utils.makeCommandOption({
         definition(builder) {
@@ -38,3 +38,3 @@ builder.addOption({
             if (typeof currentValue === `string`) {
-                return utils.applyValidator(usedName !== null && usedName !== void 0 ? usedName : key, currentValue, opts.validator);
+                return advanced_options_utils.applyValidator(usedName !== null && usedName !== void 0 ? usedName : key, currentValue, opts.validator);
             }
@@ -49,3 +49,3 @@ else {
     const { required = true } = opts;
-    return utils.makeCommandOption({
+    return advanced_options_utils.makeCommandOption({
         definition(builder, key) {
@@ -75,3 +75,3 @@ var _a;
                 const [positional] = state.positionals.splice(i, 1);
-                return utils.applyValidator((_a = opts.name) !== null && _a !== void 0 ? _a : key, positional.value, opts.validator);
+                return advanced_options_utils.applyValidator((_a = opts.name) !== null && _a !== void 0 ? _a : key, positional.value, opts.validator);
             }
@@ -78,0 +78,0 @@ return undefined;

package.json

@@ -14,3 +14,3 @@ {
   ],
-  "version": "3.2.0-rc.9",
+  "version": "3.2.0-rc.10",
   "main": "lib/advanced/index",
@@ -52,2 +52,4 @@ "license": "MIT",
     "rollup": "^2.16.1",
+    "rollup-plugin-copy": "^3.4.0",
+    "rollup-plugin-multi-input": "^1.3.1",
     "ts-node": "^8.10.2",
@@ -62,3 +64,3 @@ "tslib": "^2.0.0",
     "lint": "eslint --max-warnings 0 .",
-    "demo": "node --require ts-node/register sources/demos/advanced.ts"
+    "demo": "node --require ts-node/register demos/advanced.ts"
   },
@@ -65,0 +67,0 @@ "publishConfig": {

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Dynamic require

Supply chain risk

Dynamic require can indicate the package is performing dangerous or unsafe dynamic code execution.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

219989

increased by1.03%

Number of package files

69

increased by9.52%

Number of low supply chain risk alerts

8

decreased by-20%

Worsened metrics

Dev dependency count

24

increased by9.09%

Lines of code

5095

decreased by-0.02%

No dependency changes