@oclif/plugin-command-snapshot 3.3.3 → 3.3.4

package/lib/commands/schema/compare.js

@@ -9,6 +9,7 @@ const core_1 = require("@oclif/core");
 const snapshot_command_1 = require("../../snapshot-command");
 const generate_1 = require("./generate");
 const chalk_1 = require("chalk");
+const util_1 = require("../../util");
 function isNumber(n) {
     return Number.isInteger(Number(n));
 }
@@ -98,7 +99,7 @@ class SchemaCompare extends snapshot_command_1.SnapshotCommand {
         else {
             for (const file of schemaFiles) {
                 const schema = JSON.parse(fs.readFileSync(file).toString('utf8'));
-                const key = path.basename(file.replace(/-/g, ':')).replace('.json', '');
+                const key = path.basename((0, util_1.getKeyNameFromFilename)(file));
                 if (file.split(path.sep).includes('hooks')) {
                     schemas.hooks[key] = schema;
                 }

package/lib/commands/schema/generate.js

@@ -7,6 +7,7 @@ const core_1 = require("@oclif/core");
 const ts_json_schema_generator_1 = require("ts-json-schema-generator");
 const snapshot_command_1 = require("../../snapshot-command");
 const chalk_1 = require("chalk");
+const util_1 = require("../../util");
 function getAllFiles(dirPath, ext, allFiles = []) {
     let files = [];
     try {
@@ -180,7 +181,7 @@ class SchemaGenerate extends snapshot_command_1.SnapshotCommand {
         }
         else {
             for (const [cmdId, schema] of Object.entries(schemas.commands)) {
-                const fileName = `${cmdId.replace(/:/g, '-')}.json`;
+                const fileName = (0, util_1.getSchemaFileName)(cmdId);
                 const filePath = path.join(directory, fileName);
                 fs.writeFileSync(filePath, JSON.stringify(schema, null, 2));
                 this.log(`Generated JSON schema file "${filePath}"`);
@@ -190,7 +191,7 @@ class SchemaGenerate extends snapshot_command_1.SnapshotCommand {
                 const hooksDir = path.join(directory, 'hooks');
                 fs.mkdirSync(hooksDir, { recursive: true });
                 for (const [hookId, schema] of Object.entries(schemas.hooks)) {
-                    const fileName = `${hookId.replace(/:/g, '-')}.json`;
+                    const fileName = (0, util_1.getSchemaFileName)(hookId);
                     const filePath = path.join(hooksDir, fileName);
                     fs.writeFileSync(filePath, JSON.stringify(schema, null, 2));
                     this.log(`Generated JSON schema file "${filePath}"`);

package/lib/util.d.ts

@@ -0,0 +1,12 @@
+/**
+ * Get the file name for a given command ID replacing "-" with "__" and ":" with "-"
+ * @param cmdId - command ID
+ * @returns {string} - file name
+ */
+export declare const getSchemaFileName: (cmdId: string) => string;
+/**
+ * Get the command ID from a given file name replacing "-" with ":" and "__" with "-"
+ * @param file - file name
+ * @returns {string} - command ID
+ */
+export declare const getKeyNameFromFilename: (file: string) => string;

package/lib/util.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getKeyNameFromFilename = exports.getSchemaFileName = void 0;
+/**
+ * Get the file name for a given command ID replacing "-" with "__" and ":" with "-"
+ * @param cmdId - command ID
+ * @returns {string} - file name
+ */
+const getSchemaFileName = (cmdId) => {
+    const baseName = cmdId.replace(/-/g, '__').replace(/:/g, '-');
+    return `${baseName}.json`;
+};
+exports.getSchemaFileName = getSchemaFileName;
+/**
+ * Get the command ID from a given file name replacing "-" with ":" and "__" with "-"
+ * @param file - file name
+ * @returns {string} - command ID
+ */
+const getKeyNameFromFilename = (file) => {
+    return file.replace(/-/g, ':')
+        .replace(/__/g, '-')
+        .replace('.json', '');
+};
+exports.getKeyNameFromFilename = getKeyNameFromFilename;

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "3.3.3",
+  "version": "3.3.4",
   "commands": {
     "schema:compare": {
       "id": "schema:compare",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@oclif/plugin-command-snapshot",
   "description": "generates and compares OCLIF plugins snapshot files",
-  "version": "3.3.3",
+  "version": "3.3.4",
   "author": "Salesforce",
   "bugs": "https://github.com/oclif/plugin-command-snapshot/issues",
   "dependencies": {
@@ -29,10 +29,10 @@
     "husky": "6",
     "mocha": "^8",
     "nyc": "^15",
-    "oclif": "^3.6.1",
+    "oclif": "^3.6.2",
     "sinon": "^11.1.2",
     "ts-node": "^10",
-    "typescript": "^4.9.4"
+    "typescript": "^4.9.5"
   },
   "engines": {
     "node": ">=12.0.0"