@oclif/plugin-command-snapshot 5.2.28 → 5.2.29

package/lib/commands/schema/compare.js

@@ -6,7 +6,7 @@ import fs from 'node:fs';
 import path from 'node:path';
 import * as semver from 'semver';
 import SnapshotCommand from '../../snapshot-command.js';
-import { GLOB_PATTERNS, getAllFiles, getKeyNameFromFilename } from '../../util.js';
+import { getAllFiles, getKeyNameFromFilename, GLOB_PATTERNS } from '../../util.js';
 import { SchemaGenerator } from './generate.js';
 function isNumber(n) {
     return Number.isInteger(Number(n));
@@ -24,6 +24,7 @@ export default class SchemaCompare extends SnapshotCommand {
             description: 'path of the generated snapshot file',
         }),
     };
+    // eslint-disable-next-line complexity
     async run() {
         const strategy = typeof this.config.pjson.oclif?.commands === 'string' ? 'pattern' : this.config.pjson.oclif?.commands?.strategy;
         const commandsDir = typeof this.config.pjson.oclif?.commands === 'string'
@@ -68,10 +69,6 @@ export default class SchemaCompare extends SnapshotCommand {
             const lastElementIsNum = isNumber(lastPathElement);
             const basePath = lastElementIsNum ? readablePath.replace(`.${lastPathElement}`, '') : readablePath;
             switch (change.op) {
-                case 'replace': {
-                    humanReadableChanges[commandId].push(`${underline(readablePath)} was changed from ${cyan(existing)} to ${cyan(latest)}`);
-                    break;
-                }
                 case 'add': {
                     humanReadableChanges[commandId].push(lastElementIsNum
                         ? `Array item at ${underline(basePath)} was ${cyan('added')} to latest schema`
@@ -84,6 +81,10 @@ export default class SchemaCompare extends SnapshotCommand {
                         : `${underline(readablePath)} was ${cyan('not found')} in latest schema`);
                     break;
                 }
+                case 'replace': {
+                    humanReadableChanges[commandId].push(`${underline(readablePath)} was changed from ${cyan(existing)} to ${cyan(latest)}`);
+                    break;
+                }
                 default: {
                     break;
                 }
@@ -103,7 +104,7 @@ export default class SchemaCompare extends SnapshotCommand {
             }
         }
         this.log();
-        const bin = process.platform === 'win32' ? 'bin\\dev.cmd' : 'bin/dev.js';
+        const bin = process.platform === 'win32' ? String.raw `bin\dev.cmd` : 'bin/dev.js';
         this.log('If intended, please update the schema file(s) and run again:', bold(`${bin} ${toConfiguredId('schema:generate', this.config)}`));
         process.exitCode = 1;
         return changes;

package/lib/commands/schema/generate.js

@@ -5,7 +5,7 @@ import fs from 'node:fs';
 import path from 'node:path';
 import { createGenerator } from 'ts-json-schema-generator';
 import SnapshotCommand from '../../snapshot-command.js';
-import { GLOB_PATTERNS, getAllFiles, getSchemaFileName } from '../../util.js';
+import { getAllFiles, getSchemaFileName, GLOB_PATTERNS } from '../../util.js';
 export class SchemaGenerator {
     base;
     classToId = {};

package/lib/commands/snapshot/compare.d.ts

@@ -4,12 +4,12 @@ interface Change {
     name: string;
     removed?: boolean;
 }
-type CommandChange = {
+type CommandChange = Change & {
     alias: Change[];
     chars: Change[];
     flags: Change[];
     plugin: string;
-} & Change;
+};
 export type CompareResponse = {
     addedCommands?: string[];
     diffCommands?: CommandChange[];
@@ -30,7 +30,7 @@ export default class Compare extends SnapshotCommand {
     compareSnapshot(initialCommands: SnapshotEntry[], updatedCommands: CommandChange[]): Promise<CompareResponse>;
     /**
      * compares two command's properties to each other
-     * @return a list of added, removed, updated, and changed properties
+     * @returns a list of added, removed, updated, and changed properties
      * @param initial initial command property to compare against
      * @param updated generated command property to compare with
      */

package/lib/commands/snapshot/compare.js

@@ -107,7 +107,7 @@ export default class Compare extends SnapshotCommand {
     }
     /**
      * compares two command's properties to each other
-     * @return a list of added, removed, updated, and changed properties
+     * @returns a list of added, removed, updated, and changed properties
      * @param initial initial command property to compare against
      * @param updated generated command property to compare with
      */

package/lib/commands/snapshot/generate.js

@@ -16,7 +16,7 @@ export default class Generate extends SnapshotCommand {
             throw new Error(`Command "${duplicatedChar.command}" has duplicate short-flag characters "${duplicatedChar.flagChars.filter((item, index) => duplicatedChar.flagChars.indexOf(item) !== index)}"`);
         }
         const charConflictCommand = resultCommands.find((command) => command.flags.length > 1 &&
-            new Set([...command.flags, ...command.flagChars, ...command.flagAliases]).size !==
+            new Set([...command.flagAliases, ...command.flagChars, ...command.flags]).size !==
                 [...command.flags, ...command.flagChars, ...command.flagAliases].length);
         if (charConflictCommand) {
             const conflictFlags = [

package/oclif.manifest.json

@@ -145,5 +145,5 @@
       ]
     }
   },
-  "version": "5.2.28"
+  "version": "5.2.29"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@oclif/plugin-command-snapshot",
   "description": "generates and compares OCLIF plugins snapshot files",
-  "version": "5.2.28",
+  "version": "5.2.29",
   "author": "Salesforce",
   "bugs": "https://github.com/oclif/plugin-command-snapshot/issues",
   "dependencies": {
@@ -12,11 +12,12 @@
     "lodash.difference": "^4.5.0",
     "lodash.get": "^4.4.2",
     "lodash.sortby": "^4.7.0",
-    "semver": "^7.6.3",
+    "semver": "^7.7.0",
     "ts-json-schema-generator": "^1.5.1"
   },
   "devDependencies": {
     "@commitlint/config-conventional": "^19",
+    "@eslint/compat": "^1.2.6",
     "@oclif/plugin-help": "^6",
     "@oclif/prettier-config": "^0.2.1",
     "@oclif/test": "^4",
@@ -30,15 +31,14 @@
     "@types/sinon": "^17.0.3",
     "chai": "^4",
     "commitlint": "^19",
-    "eslint": "^8.57.1",
-    "eslint-config-oclif": "^5.2.2",
-    "eslint-config-oclif-typescript": "^3.1.13",
-    "eslint-config-prettier": "^9.1.0",
+    "eslint": "^9.19.0",
+    "eslint-config-oclif": "^6.0.0",
+    "eslint-config-prettier": "^10.0.1",
     "husky": "^9.1.7",
-    "lint-staged": "^15.3.0",
+    "lint-staged": "^15.4.3",
     "mocha": "^10.8.2",
     "nyc": "^15",
-    "oclif": "^4.17.13",
+    "oclif": "^4.17.17",
     "prettier": "^3.4.2",
     "shx": "^0.3.4",
     "sinon": "^18.0.1",
@@ -81,7 +81,7 @@
     "build": "shx rm -rf lib && tsc",
     "clean": "shx rm -f oclif.manifest.json",
     "compile": "tsc",
-    "lint": "eslint . --ext .ts",
+    "lint": "eslint",
     "postpack": "yarn run clean",
     "posttest": "yarn lint",
     "prepack": "yarn build && oclif manifest && oclif readme",