@maizzle/framework 6.0.4 → 6.0.6

package/node_modules/maizzle/node_modules/commander/lib/command.js

@@ -1,16 +1,17 @@
-const EventEmitter = require('node:events').EventEmitter;
-const childProcess = require('node:child_process');
-const path = require('node:path');
-const fs = require('node:fs');
-const process = require('node:process');
+import { EventEmitter } from 'node:events';
+import childProcess from 'node:child_process';
+import path from 'node:path';
+import fs from 'node:fs';
+import process from 'node:process';
+import { stripVTControlCharacters } from 'node:util';
 
-const { Argument, humanReadableArgName } = require('./argument.js');
-const { CommanderError } = require('./error.js');
-const { Help, stripColor } = require('./help.js');
-const { Option, DualOptions } = require('./option.js');
-const { suggestSimilar } = require('./suggestSimilar');
+import { Argument, humanReadableArgName } from './argument.js';
+import { CommanderError } from './error.js';
+import { Help } from './help.js';
+import { Option, DualOptions } from './option.js';
+import { suggestSimilar } from './suggestSimilar.js';
 
-class Command extends EventEmitter {
+export class Command extends EventEmitter {
   /**
    * Initialize a new `Command`.
    *
@@ -70,7 +71,7 @@ class Command extends EventEmitter {
         useColor() ?? (process.stdout.isTTY && process.stdout.hasColors?.()),
       getErrHasColors: () =>
         useColor() ?? (process.stderr.isTTY && process.stderr.hasColors?.()),
-      stripColor: (str) => stripColor(str),
+      stripColor: (str) => stripVTControlCharacters(str),
     };
 
     this._hidden = false;
@@ -674,17 +675,7 @@ Expecting one of '${allowedValues.join("', '")}'`);
     const name = option.attributeName();
 
     // store default value
-    if (option.negate) {
-      // --no-foo is special and defaults foo to true, unless a --foo option is already defined
-      const positiveLongFlag = option.long.replace(/^--no-/, '--');
-      if (!this._findOption(positiveLongFlag)) {
-        this.setOptionValueWithSource(
-          name,
-          option.defaultValue === undefined ? true : option.defaultValue,
-          'default',
-        );
-      }
-    } else if (option.defaultValue !== undefined) {
+    if (option.defaultValue !== undefined) {
       this.setOptionValueWithSource(name, option.defaultValue, 'default');
     }
 
@@ -1125,7 +1116,29 @@ Expecting one of '${allowedValues.join("', '")}'`);
   }
 
   _prepareForParse() {
+    // Save the state the first time, then restore the state before each subsequent parse.
     if (this._savedState === null) {
+      // Do the special default of lone negated option to true, now that we have all the options.
+      // Filter for negated options that have not been processed already.
+      this.options
+        .filter(
+          (option) =>
+            option.negate &&
+            option.defaultValue === undefined &&
+            this.getOptionValue(option.attributeName()) === undefined,
+        )
+        .forEach((option) => {
+          // check for lone negated option: --no-foo without a --foo option
+          const positiveLongFlag = option.long.replace(/^--no-/, '--');
+          if (!this._findOption(positiveLongFlag)) {
+            this.setOptionValueWithSource(
+              option.attributeName(),
+              true,
+              'default',
+            );
+          }
+        });
+
       this.saveStateBeforeParse();
     } else {
       this.restoreStateBeforeParse();
@@ -1201,7 +1214,6 @@ Expecting one of '${allowedValues.join("', '")}'`);
 
   _executeSubCommand(subcommand, args) {
     args = args.slice();
-    let launchWithNode = false; // Use node for source targets so do not need to get permissions correct, and on Windows.
     const sourceExt = ['.js', '.ts', '.tsx', '.mjs', '.cjs'];
 
     function findFile(baseDir, baseName) {
@@ -1262,7 +1274,7 @@ Expecting one of '${allowedValues.join("', '")}'`);
       executableFile = localFile || executableFile;
     }
 
-    launchWithNode = sourceExt.includes(path.extname(executableFile));
+    const launchWithNode = sourceExt.includes(path.extname(executableFile));
 
     let proc;
     if (process.platform !== 'win32') {
@@ -2148,8 +2160,10 @@ Expecting one of '${allowedValues.join("', '")}'`);
 
     const expected = this.registeredArguments.length;
     const s = expected === 1 ? '' : 's';
+    const received = receivedArgs.length;
     const forSubcommand = this.parent ? ` for '${this.name()}'` : '';
-    const message = `error: too many arguments${forSubcommand}. Expected ${expected} argument${s} but got ${receivedArgs.length}.`;
+    const details = receivedArgs.join(', ');
+    const message = `error: too many arguments${forSubcommand}. Expected ${expected} argument${s} but got ${received}: ${details}.`;
     this.error(message, { code: 'commander.excessArguments' });
   }
 
@@ -2405,12 +2419,12 @@ Expecting one of '${allowedValues.join("', '")}'`);
 
   /**
    * Set the name of the command from script filename, such as process.argv[1],
-   * or require.main.filename, or __filename.
+   * or import.meta.filename.
    *
    * (Used internally and public although not documented in README.)
    *
    * @example
-   * program.nameFromFilename(require.main.filename);
+   * program.nameFromFilename(import.meta.filename);
    *
    * @param {string} filename
    * @return {Command}
@@ -2426,7 +2440,7 @@ Expecting one of '${allowedValues.join("', '")}'`);
    * Get or set the directory for searching for executable subcommands of this command.
    *
    * @example
-   * program.executableDir(__dirname);
+   * program.executableDir(import.meta.dirname);
    * // or
    * program.executableDir('subcommands');
    *
@@ -2746,10 +2760,12 @@ function incrementNodeInspectorPort(args) {
 }
 
 /**
+ * Exported for using from tests, not otherwise used outside this file.
+ *
  * @returns {boolean | undefined}
  * @package
  */
-function useColor() {
+export function useColor() {
   // Test for common conventions.
   // NB: the observed behaviour is in combination with how author adds color! For example:
   //   - we do not test NODE_DISABLE_COLORS, but util:styletext does
@@ -2772,6 +2788,3 @@ function useColor() {
     return true;
   return undefined;
 }
-
-exports.Command = Command;
-exports.useColor = useColor; // exporting for tests

package/node_modules/maizzle/node_modules/commander/lib/error.js

@@ -1,7 +1,7 @@
 /**
  * CommanderError class
  */
-class CommanderError extends Error {
+export class CommanderError extends Error {
   /**
    * Constructs the CommanderError class
    * @param {number} exitCode suggested exit code which could be used with process.exit
@@ -22,7 +22,7 @@ class CommanderError extends Error {
 /**
  * InvalidArgumentError class
  */
-class InvalidArgumentError extends CommanderError {
+export class InvalidArgumentError extends CommanderError {
   /**
    * Constructs the InvalidArgumentError class
    * @param {string} [message] explanation of why argument is invalid
@@ -34,6 +34,3 @@ class InvalidArgumentError extends CommanderError {
     this.name = this.constructor.name;
   }
 }
-
-exports.CommanderError = CommanderError;
-exports.InvalidArgumentError = InvalidArgumentError;

package/node_modules/maizzle/node_modules/commander/lib/help.js

@@ -1,4 +1,5 @@
-const { humanReadableArgName } = require('./argument.js');
+import { humanReadableArgName } from './argument.js';
+import { stripVTControlCharacters } from 'node:util';
 
 /**
  * TypeScript import types for JSDoc, used by Visual Studio Code IntelliSense and `npm run typescript-checkJS`
@@ -9,7 +10,7 @@ const { humanReadableArgName } = require('./argument.js');
  */
 
 // Although this is a class, methods are static in style to allow override using subclass or just functions.
-class Help {
+export class Help {
   constructor() {
     this.helpWidth = undefined;
     this.minWidthToWrap = 40;
@@ -533,7 +534,7 @@ class Help {
    * @returns {number}
    */
   displayWidth(str) {
-    return stripColor(str).length;
+    return stripVTControlCharacters(str).length;
   }
 
   /**
@@ -728,20 +729,3 @@ class Help {
     return wrappedLines.join('\n');
   }
 }
-
-/**
- * Strip style ANSI escape sequences from the string. In particular, SGR (Select Graphic Rendition) codes.
- *
- * @param {string} str
- * @returns {string}
- * @package
- */
-
-function stripColor(str) {
-  // eslint-disable-next-line no-control-regex
-  const sgrPattern = /\x1b\[\d*(;\d*)*m/g;
-  return str.replace(sgrPattern, '');
-}
-
-exports.Help = Help;
-exports.stripColor = stripColor;

package/node_modules/maizzle/node_modules/commander/lib/option.js

@@ -1,6 +1,6 @@
-const { InvalidArgumentError } = require('./error.js');
+import { InvalidArgumentError } from './error.js';
 
-class Option {
+export class Option {
   /**
    * Initialize a new `Option` with the given `flags` and `description`.
    *
@@ -265,7 +265,7 @@ class Option {
  * use cases, but is tricky for others where we want separate behaviours despite
  * the single shared option value.
  */
-class DualOptions {
+export class DualOptions {
   /**
    * @param {Option[]} options
    */
@@ -375,6 +375,3 @@ function splitOptionFlags(flags) {
 
   return { shortFlag, longFlag };
 }
-
-exports.Option = Option;
-exports.DualOptions = DualOptions;

package/node_modules/maizzle/node_modules/commander/lib/suggestSimilar.js

@@ -24,7 +24,7 @@ function editDistance(a, b) {
   // fill matrix
   for (let j = 1; j <= b.length; j++) {
     for (let i = 1; i <= a.length; i++) {
-      let cost = 1;
+      let cost;
       if (a[i - 1] === b[j - 1]) {
         cost = 0;
       } else {
@@ -53,7 +53,7 @@ function editDistance(a, b) {
  * @returns {string}
  */
 
-function suggestSimilar(word, candidates) {
+export function suggestSimilar(word, candidates) {
   if (!candidates || candidates.length === 0) return '';
   // remove possible duplicates
   candidates = Array.from(new Set(candidates));
@@ -97,5 +97,3 @@ function suggestSimilar(word, candidates) {
   }
   return '';
 }
-
-exports.suggestSimilar = suggestSimilar;

package/node_modules/maizzle/node_modules/commander/package.json

@@ -1,6 +1,6 @@
 {
   "name": "commander",
-  "version": "14.0.3",
+  "version": "15.0.0",
   "description": "the complete solution for node.js command-line programs",
   "keywords": [
     "commander",
@@ -28,55 +28,37 @@
     "fix": "npm run fix:lint && npm run fix:format",
     "fix:format": "prettier --write .",
     "fix:lint": "eslint --fix .",
-    "test": "jest && npm run check:type:ts",
-    "test-all": "jest && npm run test-esm && npm run check",
-    "test-esm": "node ./tests/esm-imports-test.mjs"
+    "test": "node --test && npm run check:type:ts",
+    "test-all": "node --test && npm run check"
   },
   "files": [
     "index.js",
     "lib/*.js",
-    "esm.mjs",
     "typings/index.d.ts",
-    "typings/esm.d.mts",
     "package-support.json"
   ],
-  "type": "commonjs",
+  "type": "module",
   "main": "./index.js",
   "exports": {
     ".": {
-      "require": {
-        "types": "./typings/index.d.ts",
-        "default": "./index.js"
-      },
-      "import": {
-        "types": "./typings/esm.d.mts",
-        "default": "./esm.mjs"
-      },
+      "types": "./typings/index.d.ts",
       "default": "./index.js"
-    },
-    "./esm.mjs": {
-      "types": "./typings/esm.d.mts",
-      "import": "./esm.mjs"
     }
   },
   "devDependencies": {
-    "@eslint/js": "^9.4.0",
-    "@types/jest": "^30.0.0",
+    "@eslint/js": "^10.0.1",
     "@types/node": "^22.7.4",
-    "eslint": "^9.17.0",
+    "eslint": "^10.0.2",
     "eslint-config-prettier": "^10.0.1",
-    "eslint-plugin-jest": "^29.0.1",
-    "globals": "^16.0.0",
-    "jest": "^30.0.3",
+    "globals": "^17.3.0",
     "prettier": "^3.2.5",
-    "ts-jest": "^29.0.3",
     "tsd": "^0.33.0",
-    "typescript": "^5.0.4",
+    "typescript": "^6.0.2",
     "typescript-eslint": "^8.12.2"
   },
   "types": "typings/index.d.ts",
   "engines": {
-    "node": ">=20"
+    "node": ">=22.12.0"
   },
   "support": true
 }

package/node_modules/maizzle/node_modules/commander/typings/index.d.ts

@@ -958,13 +958,13 @@ export class Command {
 
   /**
    * Set the name of the command from script filename, such as process.argv[1],
-   * or require.main.filename, or __filename.
+   * or import.meta.filename.
    *
    * (Used internally and public although not documented in README.)
    *
    * @example
    * ```ts
-   * program.nameFromFilename(require.main.filename);
+   * program.nameFromFilename(import.meta.filename);
    * ```
    *
    * @returns `this` command for chaining
@@ -976,7 +976,7 @@ export class Command {
    *
    * @example
    * ```ts
-   * program.executableDir(__dirname);
+   * program.executableDir(import.meta.dirname);
    * // or
    * program.executableDir('subcommands');
    * ```

package/node_modules/maizzle/package.json

@@ -1,6 +1,6 @@
 {
   "name": "maizzle",
-  "version": "1.2.1",
+  "version": "1.2.3",
   "description": "CLI tool for the Maizzle Email Framework",
   "license": "MIT",
   "type": "module",
@@ -27,7 +27,7 @@
   },
   "dependencies": {
     "@clack/prompts": "^1.2.0",
-    "commander": "^14.0.3",
+    "commander": "^15.0.0",
     "giget": "^3.2.0",
     "nypm": "^0.6.5",
     "picocolors": "^1.1.1"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maizzle/framework",
-  "version": "6.0.4",
+  "version": "6.0.6",
   "description": "Maizzle is a framework that helps you quickly build HTML emails with Tailwind CSS.",
   "license": "MIT",
   "type": "module",
@@ -58,7 +58,7 @@
     "markdown-exit": "^1.1.0-beta.2",
     "nodemailer": "^9.0.0",
     "ora": "^9.3.0",
-    "oxfmt": "^0.55.0",
+    "oxfmt": "^0.57.0",
     "pathe": "^2.0.3",
     "postcss": "^8.5.6",
     "postcss-calc": "^10.1.1",

package/node_modules/maizzle/node_modules/commander/esm.mjs

@@ -1,16 +0,0 @@
-import commander from './index.js';
-
-// wrapper to provide named exports for ESM.
-export const {
-  program,
-  createCommand,
-  createArgument,
-  createOption,
-  CommanderError,
-  InvalidArgumentError,
-  InvalidOptionArgumentError, // deprecated old name
-  Command,
-  Argument,
-  Option,
-  Help,
-} = commander;

package/node_modules/maizzle/node_modules/commander/typings/esm.d.mts

@@ -1,3 +0,0 @@
-// Just reexport the types from cjs
-// This is a bit indirect. There is not an index.js, but TypeScript will look for index.d.ts for types.
-export * from './index.js';