@rockcarver/frodo-lib 0.15.1 → 0.15.2

package/CHANGELOG.md

@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.15.2] - 2022-10-17
+
+### Added
+
+-   fileByIdTreeExportResolver now supports resolving journey files from subdirectories.
+
 ## [0.15.1] - 2022-10-16
 
 ### Added
@@ -647,7 +653,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 -   Fixed problem with adding connection profiles
 -   Miscellaneous bug fixes
 
-[Unreleased]: https://github.com/rockcarver/frodo-lib/compare/v0.15.1...HEAD
+[Unreleased]: https://github.com/rockcarver/frodo-lib/compare/v0.15.2...HEAD
+
+[0.15.2]: https://github.com/rockcarver/frodo-lib/compare/v0.15.1...v0.15.2
 
 [0.15.1]: https://github.com/rockcarver/frodo-lib/compare/v0.15.0...v0.15.1
 

package/cjs/ops/JourneyOps.js

@@ -1435,13 +1435,14 @@ var fileByIdTreeExportResolver = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator(function* (treeId) {
     (0, _Console.debug)("fileByIdTreeExportResolver(".concat(treeId, ")"));
     var treeExport = createSingleTreeExportTemplate();
-    var file = (0, _ExportImportUtils.getTypedFilename)("".concat(treeId), 'journey');
-    (0, _Console.debug)("fileByIdTreeExportResolver: resolving '".concat(treeId, "' to ").concat(file));
+    var files = (0, _ExportImportUtils.findFilesByName)((0, _ExportImportUtils.getTypedFilename)("".concat(treeId), 'journey'));
 
     try {
       var _jsonData$tree;
 
-      var jsonData = JSON.parse(_fs.default.readFileSync(file, 'utf8')); // did we resolve the tree we were asked to resolved?
+      var file = files.pop();
+      var jsonData = JSON.parse(_fs.default.readFileSync(file, 'utf8'));
+      (0, _Console.debug)("fileByIdTreeExportResolver: resolved '".concat(treeId, "' to ").concat(file)); // did we resolve the tree we were asked to resolved?
 
       if (((_jsonData$tree = jsonData.tree) === null || _jsonData$tree === void 0 ? void 0 : _jsonData$tree._id) === treeId) {
         treeExport = jsonData;
@@ -1449,7 +1450,8 @@ var fileByIdTreeExportResolver = /*#__PURE__*/function () {
       else if (jsonData.trees && jsonData.trees[treeId]) {
         treeExport = jsonData.trees[treeId];
       }
-    } catch (error) {//
+    } catch (error) {
+      (0, _Console.debug)("fileByIdTreeExportResolver: unable to resolve '".concat(treeId, "' to a file."));
     }
 
     return treeExport;
@@ -1500,8 +1502,7 @@ function createFileParamTreeExportResolver(file) {
     };
   }();
 
-  (0, _Console.debug)('fileParamTreeExportResolver:');
-  (0, _Console.debug)(fileParamTreeExportResolver);
+  (0, _Console.debug)("fileParamTreeExportResolver: file=".concat(file));
   return fileParamTreeExportResolver;
 }
 /**