@rockcarver/frodo-cli 3.0.4 → 3.0.5

package/CHANGELOG.md

@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+
+- \#494: Frodo CLI now properly imports script from separate files using `frodo script import -A`.
+
+## [3.0.4] - 2025-04-04
+
 ### Changed
 
 - Update to frodo-lib 3.0.4
@@ -2065,7 +2071,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/v3.0.4-1...HEAD
+[unreleased]: https://github.com/rockcarver/frodo-cli/compare/v3.0.4...HEAD
+[3.0.4]: https://github.com/rockcarver/frodo-cli/compare/v3.0.4-1...v3.0.4
 [3.0.4-1]: https://github.com/rockcarver/frodo-cli/compare/v3.0.4-0...v3.0.4-1
 [3.0.4-0]: https://github.com/rockcarver/frodo-cli/compare/v3.0.3...v3.0.4-0
 [3.0.3]: https://github.com/rockcarver/frodo-cli/compare/v3.0.2...v3.0.3

package/dist/app.cjs

@@ -167829,13 +167829,20 @@ async function importScriptsFromFile(id7 = "", name = "", file, options = {
   return false;
 }
 async function importScriptsFromFiles(watch2, options, validateScripts) {
+  debugMessage2(`Cli.ScriptOps.importScriptsFromFiles: start`);
   options.reUuid = watch2 ? false : options.reUuid;
   let initialImport = true;
   const scriptPathToJsonMapping = {};
   const scriptPathToIdMapping = {};
   async function onChange(path9, _stats) {
+    debugMessage2(
+      `Cli.ScriptOps.importScriptsFromFiles.onChange: start [initialImport=${initialImport}, path=${path9}]`
+    );
     try {
       if (initialImport && path9.endsWith(".script.json")) {
+        debugMessage2(
+          `Cli.ScriptOps.importScriptsFromFiles.onChange: initial import of ${path9}`
+        );
         if (watch2) {
           scriptPathToJsonMapping[path9] = path9;
           for (const extracted of getExtractedPathsAndNames(path9)) {
@@ -167857,43 +167864,47 @@ async function importScriptsFromFiles(watch2, options, validateScripts) {
     } catch (error2) {
       printError2(error2, `${path9}`);
     }
-  }
-  const watcher = esm_default2.watch(
-    [
-      `${getWorkingDirectory11()}/**/*.script.json`,
-      `${getWorkingDirectory11()}/**/*.script.js`,
-      `${getWorkingDirectory11()}/**/*.script.groovy`
-    ],
-    {
-      persistent: watch2,
-      ignoreInitial: false
-    }
-  );
+    debugMessage2(`Cli.ScriptOps.importScriptsFromFiles.onChange: end`);
+  }
+  const watcher = esm_default2.watch(getWorkingDirectory11(), {
+    // ignored: (path, stats) =>
+    //   watch
+    //     ? // in watch mode, ignore everything but raw scripts
+    //       stats?.isFile() &&
+    //       !path?.endsWith('.script.js') &&
+    //       !path?.endsWith('.script.groovy')
+    //     : // in regular mode, ignore everything but frodo script exports
+    //       stats?.isFile() && !path?.endsWith('.script.json'),
+    ignored: (path9, stats) => _optionalChain([stats, 'optionalAccess', _372 => _372.isFile, 'call', _373 => _373()]) && !_optionalChain([path9, 'optionalAccess', _374 => _374.endsWith, 'call', _375 => _375(".script.json")]) && !_optionalChain([path9, 'optionalAccess', _376 => _376.endsWith, 'call', _377 => _377(".script.js")]) && !_optionalChain([path9, 'optionalAccess', _378 => _378.endsWith, 'call', _379 => _379(".script.groovy")]),
+    persistent: watch2,
+    ignoreInitial: false
+  });
   watcher.on("add", onChange).on("change", onChange).on("error", (error2) => {
     printError2(error2, `Watcher error`);
     watcher.close();
-  }).on("ready", () => {
+  }).on("ready", async () => {
+    debugMessage2(
+      `Cli.ScriptOps.importScriptsFromFiles: Watcher ready: ${JSON.stringify(watcher.getWatched())}`
+    );
     if (watch2) {
       initialImport = false;
       printMessage2("Watching for changes...");
     } else {
-      watcher.close();
-      printMessage2("Done.");
+      await watcher.close();
     }
   });
+  debugMessage2(`Cli.ScriptOps.importScriptsFromFiles: end`);
 }
 async function handleScriptFileImport(id7 = "", name = "", file, options, validateScripts) {
   debugMessage2(`Cli.ScriptOps.handleScriptFileImport: start`);
   const script = getScriptExportByScriptFile(file);
-  const imported = await importScripts3(
-    id7,
-    name,
-    script,
-    options,
-    validateScripts
-  );
-  if (imported) {
-    printMessage2(`Imported '${file}'`);
+  const indicatorId = createProgressIndicator2("determinate", 1, `${file}`);
+  try {
+    await importScripts3(id7, name, script, options, validateScripts);
+    updateProgressIndicator2(indicatorId, `${file}`);
+    stopProgressIndicator2(indicatorId, `${file}`);
+  } catch (error2) {
+    stopProgressIndicator2(indicatorId, `${file}: ${error2}`);
   }
   debugMessage2(`Cli.ScriptOps.handleScriptFileImport: end`);
 }
@@ -169250,7 +169261,7 @@ async function tailLogs(source, levels, txid, cookie, nf) {
       filteredLogs = logsObject.result.filter(
         (el) => !noiseFilter.includes(
           el.payload.logger
-        ) && !noiseFilter.includes(el.type) && (levels[0] === "ALL" || levels.includes(resolvePayloadLevel2(el))) && (typeof txid === "undefined" || txid === null || _optionalChain([el, 'access', _372 => _372.payload, 'access', _373 => _373.transactionId, 'optionalAccess', _374 => _374.includes, 'call', _375 => _375(
+        ) && !noiseFilter.includes(el.type) && (levels[0] === "ALL" || levels.includes(resolvePayloadLevel2(el))) && (typeof txid === "undefined" || txid === null || _optionalChain([el, 'access', _380 => _380.payload, 'access', _381 => _381.transactionId, 'optionalAccess', _382 => _382.includes, 'call', _383 => _383(
           txid
         )]))
       );
@@ -169274,7 +169285,7 @@ async function fetchLogs(source, startTs, endTs, levels, txid, ffString, cookie,
       filteredLogs = logsObject.result.filter(
         (el) => !noiseFilter.includes(
           el.payload.logger
-        ) && !noiseFilter.includes(el.type) && (levels[0] === "ALL" || levels.includes(resolvePayloadLevel2(el))) && (typeof txid === "undefined" || txid === null || _optionalChain([el, 'access', _376 => _376.payload, 'access', _377 => _377.transactionId, 'optionalAccess', _378 => _378.includes, 'call', _379 => _379(
+        ) && !noiseFilter.includes(el.type) && (levels[0] === "ALL" || levels.includes(resolvePayloadLevel2(el))) && (typeof txid === "undefined" || txid === null || _optionalChain([el, 'access', _384 => _384.payload, 'access', _385 => _385.transactionId, 'optionalAccess', _386 => _386.includes, 'call', _387 => _387(
           txid
         )]))
       );
@@ -169428,9 +169439,9 @@ function setup79() {
                 `Created log API key ${creds.api_key_id} and secret.`
               );
             } catch (error2) {
-              printMessage2(_optionalChain([error2, 'access', _380 => _380.response, 'optionalAccess', _381 => _381.data]), "error");
+              printMessage2(_optionalChain([error2, 'access', _388 => _388.response, 'optionalAccess', _389 => _389.data]), "error");
               printMessage2(
-                `Error creating log API key and secret: ${_optionalChain([error2, 'access', _382 => _382.response, 'optionalAccess', _383 => _383.data, 'optionalAccess', _384 => _384.message])}`,
+                `Error creating log API key and secret: ${_optionalChain([error2, 'access', _390 => _390.response, 'optionalAccess', _391 => _391.data, 'optionalAccess', _392 => _392.message])}`,
                 "error"
               );
               process.exitCode = 1;
@@ -170136,7 +170147,7 @@ function setup86() {
           printMessage2(updatesTable.toString(), "data");
         }
         if (!options.checkOnly) {
-          if (_optionalChain([updates, 'access', _385 => _385.secrets, 'optionalAccess', _386 => _386.length]) || _optionalChain([updates, 'access', _387 => _387.variables, 'optionalAccess', _388 => _388.length]) || options.force) {
+          if (_optionalChain([updates, 'access', _393 => _393.secrets, 'optionalAccess', _394 => _394.length]) || _optionalChain([updates, 'access', _395 => _395.variables, 'optionalAccess', _396 => _396.length]) || options.force) {
             const ok = options.yes || await (0, import_yesno.default)({
               question: `
 Changes may take up to 10 minutes to propagate, during which time you will not be able to make further updates.
@@ -173845,7 +173856,7 @@ function getNodeClassificationMd(nodeType) {
 function getOneLineDescription5(nodeObj, nodeRef) {
   const description = `[${nodeObj._id["brightCyan"]}] (${getNodeClassification2(
     nodeObj._type._id
-  ).join(", ")}) ${nodeObj._type._id}${nodeRef ? " - " + _optionalChain([nodeRef, 'optionalAccess', _389 => _389.displayName]) : ""}`;
+  ).join(", ")}) ${nodeObj._type._id}${nodeRef ? " - " + _optionalChain([nodeRef, 'optionalAccess', _397 => _397.displayName]) : ""}`;
   return description;
 }
 function getTableHeaderMd5() {
@@ -174581,7 +174592,7 @@ async function listJourneys(long = false, analyze = false) {
           table.push([
             `${journeyStub._id}`,
             journeyStub.enabled === false ? "disabled"["brightRed"] : "enabled"["brightGreen"],
-            _optionalChain([journeyStub, 'access', _390 => _390.uiConfig, 'optionalAccess', _391 => _391.categories]) ? wordwrap(
+            _optionalChain([journeyStub, 'access', _398 => _398.uiConfig, 'optionalAccess', _399 => _399.categories]) ? wordwrap(
               JSON.parse(journeyStub.uiConfig.categories).join(", "),
               60
             ) : ""
@@ -174623,7 +174634,7 @@ async function listJourneys(long = false, analyze = false) {
               `${journeyExport.tree._id}`,
               journeyExport.tree.enabled === false ? "disabled"["brightRed"] : "enabled"["brightGreen"],
               getJourneyClassification2(journeyExport).join(", "),
-              _optionalChain([journeyExport, 'access', _392 => _392.tree, 'access', _393 => _393.uiConfig, 'optionalAccess', _394 => _394.categories]) ? wordwrap(
+              _optionalChain([journeyExport, 'access', _400 => _400.tree, 'access', _401 => _401.uiConfig, 'optionalAccess', _402 => _402.categories]) ? wordwrap(
                 JSON.parse(journeyExport.tree.uiConfig.categories).join(
                   ", "
                 ),
@@ -175028,7 +175039,7 @@ async function describeJourney(journeyData, resolveTreeExport = onlineTreeExport
         nodeTypeMap[nodeData._type._id] = 1;
       }
     }
-    if (!state.getAmVersion() && _optionalChain([journeyData, 'access', _395 => _395.meta, 'optionalAccess', _396 => _396.originAmVersion])) {
+    if (!state.getAmVersion() && _optionalChain([journeyData, 'access', _403 => _403.meta, 'optionalAccess', _404 => _404.originAmVersion])) {
       state.setAmVersion(journeyData.meta.originAmVersion);
     }
     printMessage2(`${getOneLineDescription8(journeyData.tree)}`, "data");
@@ -175052,7 +175063,7 @@ ${getJourneyClassification2(journeyData).join(", ")}`,
         "data"
       );
     }
-    if (_optionalChain([journeyData, 'access', _397 => _397.tree, 'access', _398 => _398.uiConfig, 'optionalAccess', _399 => _399.categories]) && journeyData.tree.uiConfig.categories != "[]") {
+    if (_optionalChain([journeyData, 'access', _405 => _405.tree, 'access', _406 => _406.uiConfig, 'optionalAccess', _407 => _407.categories]) && journeyData.tree.uiConfig.categories != "[]") {
       printMessage2("\nCategories/Tags", "data");
       printMessage2(
         `${JSON.parse(journeyData.tree.uiConfig.categories).join(", ")}`,
@@ -175094,7 +175105,7 @@ Nodes (${Object.entries(allNodes).length}):`, "data");
         );
       }
     }
-    if (_optionalChain([journeyData, 'access', _400 => _400.themes, 'optionalAccess', _401 => _401.length])) {
+    if (_optionalChain([journeyData, 'access', _408 => _408.themes, 'optionalAccess', _409 => _409.length])) {
       printMessage2(`
 Themes (${journeyData.themes.length}):`, "data");
       for (const themeData of journeyData.themes) {
@@ -175188,14 +175199,14 @@ async function describeJourneyMd(journeyData, resolveTreeExport = onlineTreeExpo
         nodeTypeMap[nodeData._type._id] = 1;
       }
     }
-    if (!state.getAmVersion() && _optionalChain([journeyData, 'access', _402 => _402.meta, 'optionalAccess', _403 => _403.originAmVersion])) {
+    if (!state.getAmVersion() && _optionalChain([journeyData, 'access', _410 => _410.meta, 'optionalAccess', _411 => _411.originAmVersion])) {
       state.setAmVersion(journeyData.meta.originAmVersion);
     }
     printMessage2(
       `# ${getOneLineDescriptionMd(journeyData.tree)} - ${journeyData.tree.enabled === false ? ":o: `disabled`" : ":white_check_mark: `enabled`"}, ${getJourneyClassificationMd(journeyData).join(", ")}`,
       "data"
     );
-    if (_optionalChain([journeyData, 'access', _404 => _404.tree, 'access', _405 => _405.uiConfig, 'optionalAccess', _406 => _406.categories]) && journeyData.tree.uiConfig.categories != "[]") {
+    if (_optionalChain([journeyData, 'access', _412 => _412.tree, 'access', _413 => _413.uiConfig, 'optionalAccess', _414 => _414.categories]) && journeyData.tree.uiConfig.categories != "[]") {
       printMessage2(
         `\`${JSON.parse(journeyData.tree.uiConfig.categories).join("`, `")}\``,
         "data"
@@ -175239,7 +175250,7 @@ ${journeyData.tree.description}`, "data");
         );
       }
     }
-    if (_optionalChain([journeyData, 'access', _407 => _407.themes, 'optionalAccess', _408 => _408.length])) {
+    if (_optionalChain([journeyData, 'access', _415 => _415.themes, 'optionalAccess', _416 => _416.length])) {
       printMessage2(`## Themes (${journeyData.themes.length})`, "data");
       printMessage2(getTableHeaderMd7(), "data");
       for (const themeData of journeyData.themes) {
@@ -175509,9 +175520,9 @@ function setup127() {
             journeyData = fileData.trees[options.journeyId];
           } else if (typeof options.journeyId === "undefined" && fileData.trees) {
             [journeyData] = Object.values(fileData.trees);
-          } else if (typeof options.journeyId !== "undefined" && options.journeyId === _optionalChain([fileData, 'access', _409 => _409.tree, 'optionalAccess', _410 => _410._id])) {
+          } else if (typeof options.journeyId !== "undefined" && options.journeyId === _optionalChain([fileData, 'access', _417 => _417.tree, 'optionalAccess', _418 => _418._id])) {
             journeyData = fileData;
-          } else if (typeof options.journeyId === "undefined" && _optionalChain([fileData, 'access', _411 => _411.tree, 'optionalAccess', _412 => _412._id])) {
+          } else if (typeof options.journeyId === "undefined" && _optionalChain([fileData, 'access', _419 => _419.tree, 'optionalAccess', _420 => _420._id])) {
             journeyData = fileData;
           } else {
             throw new Error(
@@ -177387,7 +177398,7 @@ async function importServiceFromFile(serviceId, file, options = {
     );
     const data2 = fs35.default.readFileSync(filePath, "utf8");
     const importData = JSON.parse(data2);
-    if (_optionalChain([importData, 'optionalAccess', _413 => _413.service, 'access', _414 => _414[serviceId]])) {
+    if (_optionalChain([importData, 'optionalAccess', _421 => _421.service, 'access', _422 => _422[serviceId]])) {
       await importService2(serviceId, importData, options);
       stopProgressIndicator2(
         indicatorId,
@@ -178604,7 +178615,7 @@ async function listRealms(long = false) {
   } catch (error2) {
     printMessage2(error2, "error");
     printMessage2(`Error listing realms: ${error2.message}`, "error");
-    printMessage2(_optionalChain([error2, 'access', _415 => _415.response, 'optionalAccess', _416 => _416.data]), "error");
+    printMessage2(_optionalChain([error2, 'access', _423 => _423.response, 'optionalAccess', _424 => _424.data]), "error");
   }
 }
 async function exportRealmById(realmId, file, includeMeta = true) {
@@ -180433,7 +180444,7 @@ function setup182() {
         if (!outcome) process.exitCode = 1;
       } else if (options.allSeparate && await getTokens2()) {
         verboseMessage2(
-          `Importing script(s) into realm "${state.getRealm()}"...`
+          `Importing all script files into realm "${state.getRealm()}"...`
         );
         try {
           await importScriptsFromFiles(
@@ -181401,7 +181412,7 @@ var compareVersions = (v12, v2) => {
 // package.json
 var package_default2 = {
   name: "@rockcarver/frodo-cli",
-  version: "3.0.4",
+  version: "3.0.5",
   type: "module",
   description: "A command line interface to manage ForgeRock Identity Cloud tenants, ForgeOps deployments, and classic deployments.",
   keywords: [