@rockcarver/frodo-cli 2.0.6-1 → 2.0.6-2

package/CHANGELOG.md

@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [2.0.6-1] - 2024-09-09
+
 ## [2.0.6-0] - 2024-08-26
 
 ### Added
@@ -1974,7 +1976,8 @@ Frodo CLI 2.x automatically refreshes session and access tokens before they expi
 - Fixed problem with adding connection profiles
 - Miscellaneous bug fixes
 
-[unreleased]: https://github.com/rockcarver/frodo-cli/compare/v2.0.6-0...HEAD
+[unreleased]: https://github.com/rockcarver/frodo-cli/compare/v2.0.6-1...HEAD
+[2.0.6-1]: https://github.com/rockcarver/frodo-cli/compare/v2.0.6-0...v2.0.6-1
 [2.0.6-0]: https://github.com/rockcarver/frodo-cli/compare/v2.0.5...v2.0.6-0
 [2.0.5]: https://github.com/rockcarver/frodo-cli/compare/v2.0.5-0...v2.0.5
 [2.0.5-0]: https://github.com/rockcarver/frodo-cli/compare/v2.0.4...v2.0.5-0

package/dist/app.cjs

@@ -67475,7 +67475,7 @@ var require_basic_auth = __commonJS2({
       var header = getAuthorization(req);
       return parse7(header);
     }
-    function decodeBase643(str2) {
+    function decodeBase644(str2) {
       return Buffer3.from(str2, "base64").toString();
     }
     function getAuthorization(req) {
@@ -67492,7 +67492,7 @@ var require_basic_auth = __commonJS2({
       if (!match2) {
         return void 0;
       }
-      var userPass = USER_PASS_REGEXP.exec(decodeBase643(match2[1]));
+      var userPass = USER_PASS_REGEXP.exec(decodeBase644(match2[1]));
       if (!userPass) {
         return void 0;
       }
@@ -177537,7 +177537,8 @@ var {
   isBase64Encoded: isBase64Encoded2,
   getFilePath: getFilePath12,
   getWorkingDirectory: getWorkingDirectory10,
-  saveToFile: saveToFile3
+  saveToFile: saveToFile3,
+  decodeBase64
 } = frodo.utils;
 var {
   readScript: readScript2,
@@ -177596,6 +177597,7 @@ async function listScripts(long = false, usage = false, file = null) {
     return true;
   }
   let fullExport = null;
+  let scriptExport = null;
   const headers2 = long ? ["Name", "UUID", "Language", "Context", "Description"] : ["Name"];
   if (usage) {
     try {
@@ -177604,9 +177606,7 @@ async function listScripts(long = false, usage = false, file = null) {
       printError2(error2);
       return false;
     }
-    for (const realmExport of Object.values(fullExport.realm)) {
-      delete realmExport.script;
-    }
+    scriptExport = separateScriptsFromFullExport(fullExport);
     headers2.push("Used");
   }
   const table = createTable(headers2);
@@ -177619,7 +177619,9 @@ async function listScripts(long = false, usage = false, file = null) {
       wordwrap(script.description, 30)
     ] : [wordwrap(script.name, 25, "  ")];
     if (usage) {
-      const locations = getIdLocations(fullExport, script._id, false);
+      const locations = getIdLocations(fullExport, script._id, false).concat(
+        getScriptLocations(scriptExport, script.name)
+      );
       values3.push(
         locations.length > 0 ? `${"yes"["brightGreen"]} (${locations.length === 1 ? `at` : `${locations.length} uses, including:`} ${locations[0]})` : "no"["brightRed"]
       );
@@ -177646,10 +177648,10 @@ async function describeScript(scriptId, scriptName, file, usage = false, json =
     if (usage) {
       try {
         const fullExport = await getFullExportConfig(file);
-        for (const realmExport of Object.values(fullExport.realm)) {
-          delete realmExport.script;
-        }
-        script.locations = getIdLocations(fullExport, script._id, false);
+        const scriptExport = separateScriptsFromFullExport(fullExport);
+        script.locations = getIdLocations(fullExport, script._id, false).concat(
+          getScriptLocations(scriptExport, script.name)
+        );
       } catch (error2) {
         stopProgressIndicator2(
           spinnerId,
@@ -178050,6 +178052,37 @@ async function deleteAllScripts() {
   }
   return false;
 }
+function separateScriptsFromFullExport(fullExport) {
+  const scripts = { realm: {} };
+  for (const [realm2, realmExport] of Object.entries(fullExport.realm)) {
+    if (!scripts.realm[realm2]) {
+      scripts.realm[realm2] = {};
+    }
+    scripts.realm[realm2].script = realmExport.script;
+    delete realmExport.script;
+  }
+  return scripts;
+}
+function getScriptLocations(configuration, scriptName) {
+  const locations = [];
+  const regex2 = new RegExp(`require\\(['|"]${scriptName}['|"]\\)`);
+  for (const [realm2, realmExport] of Object.entries(configuration.realm)) {
+    for (const scriptData of Object.values(realmExport.script)) {
+      let scriptString = scriptData.script;
+      if (Array.isArray(scriptData.script)) {
+        scriptString = scriptData.script.join("\n");
+      } else if (isBase64Encoded2(scriptData.script)) {
+        scriptString = decodeBase64(scriptData.script);
+      }
+      if (regex2.test(scriptString)) {
+        locations.push(
+          `realm.${realm2}.script.${scriptData._id}(name: '${scriptData.name}').script`
+        );
+      }
+    }
+  }
+  return locations;
+}
 
 // src/utils/Config.ts
 var { getFilePath: getFilePath13, readFiles: readFiles4 } = frodo.utils;
@@ -181406,7 +181439,7 @@ _chunkMPPKDFVIcjs.init_cjs_shims.call(void 0, );
 _chunkMPPKDFVIcjs.init_cjs_shims.call(void 0, );
 
 var {
-  decodeBase64,
+  decodeBase64: decodeBase642,
   getFilePath: getFilePath17,
   getTypedFilename: getTypedFilename16,
   getWorkingDirectory: getWorkingDirectory14,
@@ -181476,7 +181509,7 @@ async function listVariables(long = false, usage = false, file = null) {
     const values3 = long ? [
       variable._id,
       wordwrap(
-        variable.valueBase64 ? decodeBase64(variable.valueBase64) : variable.value,
+        variable.valueBase64 ? decodeBase642(variable.valueBase64) : variable.value,
         40
       ),
       variable.loaded ? "loaded"["brightGreen"] : "unloaded"["brightRed"],
@@ -181658,7 +181691,7 @@ async function describeVariable(variableId, file, usage = false, json = false) {
       table.push([
         "Value"["brightCyan"],
         wordwrap(
-          variable.valueBase64 ? decodeBase64(variable.valueBase64) : variable.value,
+          variable.valueBase64 ? decodeBase642(variable.valueBase64) : variable.value,
           40
         )
       ]);
@@ -183489,7 +183522,7 @@ function getTableRowMd5(nodeObj, nodeRef) {
 // src/ops/Saml2Ops.ts
 _chunkMPPKDFVIcjs.init_cjs_shims.call(void 0, );
 
-var { decodeBase64: decodeBase642, saveTextToFile: saveTextToFile4, getFilePath: getFilePath20, getWorkingDirectory: getWorkingDirectory17 } = frodo.utils;
+var { decodeBase64: decodeBase643, saveTextToFile: saveTextToFile4, getFilePath: getFilePath20, getWorkingDirectory: getWorkingDirectory17 } = frodo.utils;
 var { getTypedFilename: getTypedFilename19, saveJsonToFile: saveJsonToFile19, getRealmString: getRealmString3 } = frodo.utils;
 var {
   readSaml2ProviderStubs: readSaml2ProviderStubs2,
@@ -183737,7 +183770,7 @@ async function importFirstSaml2ProviderFromFile(file, options2 = { deps: true })
     const data2 = _fs3.default.readFileSync(getFilePath20(file), "utf8");
     const fileData = JSON.parse(data2);
     const entityId64 = Object.keys(fileData.saml.remote)[0] || Object.keys(fileData.saml.hosted)[0];
-    const entityId = decodeBase642(entityId64);
+    const entityId = decodeBase643(entityId64);
     indicatorId = createProgressIndicator2(
       "indeterminate",
       0,
@@ -188926,7 +188959,7 @@ var compareVersions = (v12, v2) => {
 // package.json
 var package_default2 = {
   name: "@rockcarver/frodo-cli",
-  version: "2.0.6-1",
+  version: "2.0.6-2",
   type: "module",
   description: "A command line interface to manage ForgeRock Identity Cloud tenants, ForgeOps deployments, and classic deployments.",
   keywords: [