Merge pull request #437 from vscheuber/main

MINOR RELEASE

.gitignore

@@ -8,6 +8,9 @@ testResults.json
 frodo
 frodo.exe
 
+# MacOS Desktop Services Store
+.DS_Store
+
 # connections.json
 masterkey.key
 

CHANGELOG.md

@@ -7,6 +7,25 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+
+- Improvements to the `frodo script` commands:
+
+  - Added the `-i`/`--script-id` option to import and export scripts by id.
+  - Added the `--no-deps` option to not include library scripts in exports of single scripts. Similarly adds the option on single script imports using the same flag to not import library dependencies if so desired.
+
+### Changed
+
+- Update to frodo-lib 2.1.0
+
+### Fixed
+
+- Fixes to the handling of scripts in the `frodo script` commands and the `frodo config import` command:
+
+  - Fixing many bugs related to script extraction. For example, there were certain cases where importing wouldn't function correctly due to being unable to find the extracted script(s). For exports, library scripts weren't being extracted correctly either. Therefore, an overhaul was done to try and help simplify the extraction process to that it can work for multiple scripts if dealing with library scripts both on export and import.
+  - Fixing many errors in the watch option for script imports. One big one was if there were several scripts for a single json file (e.g. when exporting scripts with library scripts) that only one of the scripts would correctly be watched. This was fixed by creating mappings before watching begins to map extracted script files with their corresponding json files so it functions correctly.
+  - Fixing a small bug with config imports where, if the working directory started with `.` or `./` it would usually fail due to being unable to locate the expected files it was looking for.
+
 ## [2.0.5-0] - 2024-08-16
 
 ## [2.0.4] - 2024-08-14

package.json

@@ -114,7 +114,7 @@
     ]
   },
   "devDependencies": {
-    "@rockcarver/frodo-lib": "2.0.4-0",
+    "@rockcarver/frodo-lib": "2.1.0",
     "@types/colors": "^1.2.1",
     "@types/fs-extra": "^11.0.1",
     "@types/jest": "^29.2.3",

src/ops/ConnectionProfileOps.ts

@@ -81,6 +81,12 @@ export async function describeConnectionProfile(
       if (profile.logApiSecret) profile.logApiSecret = present;
       if (profile.svcacctJwk) (profile as unknown)['svcacctJwk'] = present;
     }
+    if (profile.allowInsecureConnection === undefined) {
+      delete profile.allowInsecureConnection;
+    }
+    if (!profile.deploymentType) {
+      delete profile.deploymentType;
+    }
     if (!profile.username) {
       delete profile.username;
       delete profile.password;
@@ -97,6 +103,15 @@ export async function describeConnectionProfile(
     }
     if (!profile.svcacctScope) {
       delete profile.svcacctScope;
+    } else {
+      try {
+        profile.svcacctScope = profile.svcacctScope
+          .split(' ')
+          .sort((a, b) => a.localeCompare(b))
+          .join('\n');
+      } catch (error) {
+        // do nothing
+      }
     }
     if (showSecrets && jwk) {
       (profile as unknown)['svcacctJwk'] = 'see below';