@builttocreate/engine-utils 2.11.0-beta.v1364.0 → 3.0.0

package/dist/joyDocHelper.js

@@ -83,7 +83,8 @@ var getDefaultJoyDoc = exports.getDefaultJoyDoc = function getDefaultJoyDoc() {
     identifier: "doc_".concat(id),
     name: 'New Doc',
     files: [getDefaultJoyDocFile(fileDefaults, pageDefaults)],
-    fields: []
+    fields: [],
+    formulas: []
   }, defaults);
 };
 
@@ -138,9 +139,9 @@ var getFieldId = function getFieldId(existingId, type, doc) {
  * @param {Object} doc
  * @returns {Object}
  */
-var getCleanedJoyDoc = exports.getCleanedJoyDoc = function getCleanedJoyDoc(doc, licenseValidation) {
+var getCleanedJoyDoc = exports.getCleanedJoyDoc = function getCleanedJoyDoc(doc) {
   if (!doc) return getDefaultJoyDoc();
-  var _removeOrphanedFields = removeOrphanedFieldsFromJoydoc(doc, licenseValidation),
+  var _removeOrphanedFields = removeOrphanedFieldsFromJoydoc(doc),
     nextDoc = _removeOrphanedFields.nextDoc;
 
   /**
@@ -166,20 +167,6 @@ var getCleanedJoyDoc = exports.getCleanedJoyDoc = function getCleanedJoyDoc(doc,
       return nextField;
     });
   }
-
-  /**
-   * Step 1.3: Filter collection fields based on license validation
-   */
-  if (nextDoc.fields && nextDoc.fields.length > 0) {
-    // Check if collection fields should be removed based on license validation
-    var shouldRemoveCollectionFields = !licenseValidation || !licenseValidation.decodedData || licenseValidation.decodedData.collectionField === false;
-    if (shouldRemoveCollectionFields) {
-      // Remove collection fields from the fields array
-      nextDoc.fields = nextDoc.fields.filter(function (field) {
-        return field.type !== _FieldTypes["default"].collection;
-      });
-    }
-  }
   if (nextDoc.files && nextDoc.files.length > 0) {
     nextDoc.files = nextDoc.files.map(function (file) {
       var _nextFile$views;
@@ -194,7 +181,7 @@ var getCleanedJoyDoc = exports.getCleanedJoyDoc = function getCleanedJoyDoc(doc,
       /**
       * Step 1.4: Replace page ids and field ids if they are not valid
       */
-      nextFile.pages = getCleanedJoyDocPages(nextFile.pages, nextDoc, licenseValidation);
+      nextFile.pages = getCleanedJoyDocPages(nextFile.pages, nextDoc);
       nextFile.pageOrder = cleanPageOrder(getPageOrder(nextFile.pageOrder, nextFile.pages), nextFile.pages);
 
       /**
@@ -203,7 +190,7 @@ var getCleanedJoyDoc = exports.getCleanedJoyDoc = function getCleanedJoyDoc(doc,
       if ((nextFile === null || nextFile === void 0 ? void 0 : (_nextFile$views = nextFile.views) === null || _nextFile$views === void 0 ? void 0 : _nextFile$views.length) > 0) {
         nextFile.views = nextFile.views.map(function (view) {
           var nextView = _objectSpread({}, view);
-          nextView.pages = getCleanedJoyDocPages(nextView.pages, nextDoc, licenseValidation);
+          nextView.pages = getCleanedJoyDocPages(nextView.pages, nextDoc);
           nextView.pageOrder = cleanPageOrder(getPageOrder(nextView.pageOrder, nextView.pages), nextView.pages);
           return nextView;
         });
@@ -220,76 +207,33 @@ var getCleanedJoyDoc = exports.getCleanedJoyDoc = function getCleanedJoyDoc(doc,
  * Remove orphaned fields from doc
  */
 
-var removeOrphanedFieldsFromJoydoc = exports.removeOrphanedFieldsFromJoydoc = function removeOrphanedFieldsFromJoydoc(doc, licenseValidation) {
+var removeOrphanedFieldsFromJoydoc = exports.removeOrphanedFieldsFromJoydoc = function removeOrphanedFieldsFromJoydoc(doc) {
   var _nextDoc$files;
   if (!doc) return getDefaultJoyDoc();
   var nextDoc = _objectSpread({}, doc);
   var associatedFieldIdLookup = {};
-  var shouldRemoveCollectionFields = !licenseValidation || !licenseValidation.decodedData || licenseValidation.decodedData.collectionField === false;
   nextDoc === null || nextDoc === void 0 ? void 0 : (_nextDoc$files = nextDoc.files) === null || _nextDoc$files === void 0 ? void 0 : _nextDoc$files.forEach(function (file) {
-    var _file$pages, _file$views;
+    var _file$header, _file$header$fieldPos, _file$footer, _file$footer$fieldPos, _file$pages, _file$views;
     /**
-     * Header
+     * Header 
      */
-    if (file.header) {
-      var _file$header, _file$header$fieldPos2;
-      if (shouldRemoveCollectionFields) {
-        var _file$header$fieldPos;
-        // Filter collection field positions from header
-        file.header.fieldPositions = ((_file$header$fieldPos = file.header.fieldPositions) === null || _file$header$fieldPos === void 0 ? void 0 : _file$header$fieldPos.filter(function (fieldPosition) {
-          var _nextDoc$fields;
-          var referencedField = (_nextDoc$fields = nextDoc.fields) === null || _nextDoc$fields === void 0 ? void 0 : _nextDoc$fields.find(function (field) {
-            return field._id === fieldPosition.field;
-          });
-          // Keep field position only if the referenced field exists AND is not a collection field
-          return referencedField && referencedField.type !== _FieldTypes["default"].collection;
-        })) || [];
-      }
-      (_file$header = file.header) === null || _file$header === void 0 ? void 0 : (_file$header$fieldPos2 = _file$header.fieldPositions) === null || _file$header$fieldPos2 === void 0 ? void 0 : _file$header$fieldPos2.forEach(function (fieldPosition) {
-        return associatedFieldIdLookup[fieldPosition.field] = true;
-      });
-    }
+    if (file.header) (_file$header = file.header) === null || _file$header === void 0 ? void 0 : (_file$header$fieldPos = _file$header.fieldPositions) === null || _file$header$fieldPos === void 0 ? void 0 : _file$header$fieldPos.forEach(function (fieldPosition) {
+      return associatedFieldIdLookup[fieldPosition.field] = true;
+    });
 
     /**
      * Footer
      */
-    if (file.footer) {
-      var _file$footer, _file$footer$fieldPos2;
-      if (shouldRemoveCollectionFields) {
-        var _file$footer$fieldPos;
-        // Filter collection field positions from footer
-        file.footer.fieldPositions = ((_file$footer$fieldPos = file.footer.fieldPositions) === null || _file$footer$fieldPos === void 0 ? void 0 : _file$footer$fieldPos.filter(function (fieldPosition) {
-          var _nextDoc$fields2;
-          var referencedField = (_nextDoc$fields2 = nextDoc.fields) === null || _nextDoc$fields2 === void 0 ? void 0 : _nextDoc$fields2.find(function (field) {
-            return field._id === fieldPosition.field;
-          });
-          // Keep field position only if the referenced field exists AND is not a collection field
-          return referencedField && referencedField.type !== _FieldTypes["default"].collection;
-        })) || [];
-      }
-      (_file$footer = file.footer) === null || _file$footer === void 0 ? void 0 : (_file$footer$fieldPos2 = _file$footer.fieldPositions) === null || _file$footer$fieldPos2 === void 0 ? void 0 : _file$footer$fieldPos2.forEach(function (fieldPosition) {
-        return associatedFieldIdLookup[fieldPosition.field] = true;
-      });
-    }
+    if (file.footer) (_file$footer = file.footer) === null || _file$footer === void 0 ? void 0 : (_file$footer$fieldPos = _file$footer.fieldPositions) === null || _file$footer$fieldPos === void 0 ? void 0 : _file$footer$fieldPos.forEach(function (fieldPosition) {
+      return associatedFieldIdLookup[fieldPosition.field] = true;
+    });
 
     /**
      * Primary view
      */
     (_file$pages = file.pages) === null || _file$pages === void 0 ? void 0 : _file$pages.forEach(function (page) {
-      var _page$fieldPositions2;
-      if (shouldRemoveCollectionFields) {
-        var _page$fieldPositions;
-        // Filter collection field positions from primary view pages
-        page.fieldPositions = ((_page$fieldPositions = page.fieldPositions) === null || _page$fieldPositions === void 0 ? void 0 : _page$fieldPositions.filter(function (fieldPosition) {
-          var _nextDoc$fields3;
-          var referencedField = (_nextDoc$fields3 = nextDoc.fields) === null || _nextDoc$fields3 === void 0 ? void 0 : _nextDoc$fields3.find(function (field) {
-            return field._id === fieldPosition.field;
-          });
-          // Keep field position only if the referenced field exists AND is not a collection field
-          return referencedField && referencedField.type !== _FieldTypes["default"].collection;
-        })) || [];
-      }
-      page === null || page === void 0 ? void 0 : (_page$fieldPositions2 = page.fieldPositions) === null || _page$fieldPositions2 === void 0 ? void 0 : _page$fieldPositions2.forEach(function (fieldPosition) {
+      var _page$fieldPositions;
+      page === null || page === void 0 ? void 0 : (_page$fieldPositions = page.fieldPositions) === null || _page$fieldPositions === void 0 ? void 0 : _page$fieldPositions.forEach(function (fieldPosition) {
         return associatedFieldIdLookup[fieldPosition.field] = true;
       });
     });
@@ -300,20 +244,8 @@ var removeOrphanedFieldsFromJoydoc = exports.removeOrphanedFieldsFromJoydoc = fu
     (_file$views = file.views) === null || _file$views === void 0 ? void 0 : _file$views.forEach(function (view) {
       var _view$pages;
       view === null || view === void 0 ? void 0 : (_view$pages = view.pages) === null || _view$pages === void 0 ? void 0 : _view$pages.forEach(function (page) {
-        var _page$fieldPositions4;
-        if (shouldRemoveCollectionFields) {
-          var _page$fieldPositions3;
-          // Filter collection field positions from alternative view pages
-          page.fieldPositions = ((_page$fieldPositions3 = page.fieldPositions) === null || _page$fieldPositions3 === void 0 ? void 0 : _page$fieldPositions3.filter(function (fieldPosition) {
-            var _nextDoc$fields4;
-            var referencedField = (_nextDoc$fields4 = nextDoc.fields) === null || _nextDoc$fields4 === void 0 ? void 0 : _nextDoc$fields4.find(function (field) {
-              return field._id === fieldPosition.field;
-            });
-            // Keep field position only if the referenced field exists AND is not a collection field
-            return referencedField && referencedField.type !== _FieldTypes["default"].collection;
-          })) || [];
-        }
-        page === null || page === void 0 ? void 0 : (_page$fieldPositions4 = page.fieldPositions) === null || _page$fieldPositions4 === void 0 ? void 0 : _page$fieldPositions4.forEach(function (fieldPosition) {
+        var _page$fieldPositions2;
+        page === null || page === void 0 ? void 0 : (_page$fieldPositions2 = page.fieldPositions) === null || _page$fieldPositions2 === void 0 ? void 0 : _page$fieldPositions2.forEach(function (fieldPosition) {
           return associatedFieldIdLookup[fieldPosition.field] = true;
         });
       });
@@ -346,10 +278,9 @@ var removeOrphanedFieldsFromJoydoc = exports.removeOrphanedFieldsFromJoydoc = fu
  *
  * @param {Array} pages
  * @param {Object} doc - The full document (needed for readableId generation)
- * @param {Object} licenseValidation - License validation object for filtering collection fields
  * @returns {Object}
  */
-var getCleanedJoyDocPages = exports.getCleanedJoyDocPages = function getCleanedJoyDocPages(pages, doc, licenseValidation) {
+var getCleanedJoyDocPages = exports.getCleanedJoyDocPages = function getCleanedJoyDocPages(pages, doc) {
   if ((pages === null || pages === void 0 ? void 0 : pages.length) > 0) {
     return pages.map(function (page) {
       /**
@@ -358,21 +289,7 @@ var getCleanedJoyDocPages = exports.getCleanedJoyDocPages = function getCleanedJ
       var nextPage = _objectSpread({}, page);
       if (nextPage._id && !(0, _validateObjectId["default"])(nextPage._id) && !(0, _validateReadableId["default"])(nextPage._id)) nextPage._id = (0, _generateObjectId["default"])();
       if (nextPage.fieldPositions && nextPage.fieldPositions.length > 0) {
-        // First, filter out collection field positions based on license validation
-        var shouldRemoveCollectionFields = !licenseValidation || !licenseValidation.decodedData || licenseValidation.decodedData.collectionField === false;
-        var filteredFieldPositions = nextPage.fieldPositions;
-        if (shouldRemoveCollectionFields) {
-          // Remove field positions that reference collection fields
-          filteredFieldPositions = nextPage.fieldPositions.filter(function (fieldPosition) {
-            var _doc$fields;
-            var referencedField = (_doc$fields = doc.fields) === null || _doc$fields === void 0 ? void 0 : _doc$fields.find(function (field) {
-              return field._id === fieldPosition.field;
-            });
-            // Keep field position only if the referenced field exists AND is not a collection field
-            return referencedField && referencedField.type !== _FieldTypes["default"].collection;
-          });
-        }
-        nextPage.fieldPositions = filteredFieldPositions.map(function (fieldPosition) {
+        nextPage.fieldPositions = nextPage.fieldPositions.map(function (fieldPosition) {
           /**
           * Step 1.2: Replace fieldPosition _id and field reference if they are not valid
           * Use simplified approach: respect ObjectIds, otherwise generate readable IDs
@@ -521,7 +438,8 @@ var getDocumentFromTemplate = exports.getDocumentFromTemplate = function getDocu
     template: temp.identifier,
     source: temp.identifier,
     files: temp.files,
-    fields: temp.fields
+    fields: temp.fields,
+    formulas: temp.formulas
   };
 };
 
@@ -535,8 +453,9 @@ var getDocumentFromTemplate = exports.getDocumentFromTemplate = function getDocu
  * @returns {Object}
  */
 var duplicateDocumentPage = exports.duplicateDocumentPage = function duplicateDocumentPage(doc, fileId, pageId) {
-  var _nextDoc$fields5;
+  var _nextDoc$fields;
   var pageDefaults = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
+  var config = arguments.length > 4 ? arguments[4] : undefined;
   var changelogInfo = {
     primaryPages: {
       targetIndex: 0,
@@ -545,13 +464,14 @@ var duplicateDocumentPage = exports.duplicateDocumentPage = function duplicateDo
     viewPages: [],
     fields: []
   };
+  var useReadableIds = (config === null || config === void 0 ? void 0 : config.useReadableIds) || false;
   var nextDoc = JSON.parse(JSON.stringify(doc));
   var fileIndex = nextDoc.files.findIndex(function (file) {
     return file._id === fileId;
   });
   var newPageId = (0, _generateObjectId["default"])();
   var fieldLookup = {};
-  (_nextDoc$fields5 = nextDoc.fields) === null || _nextDoc$fields5 === void 0 ? void 0 : _nextDoc$fields5.forEach(function (field) {
+  (_nextDoc$fields = nextDoc.fields) === null || _nextDoc$fields === void 0 ? void 0 : _nextDoc$fields.forEach(function (field) {
     fieldLookup[field._id] = field;
   });
 
@@ -602,12 +522,13 @@ var duplicateDocumentPage = exports.duplicateDocumentPage = function duplicateDo
     // Generate readable ID using current fields plus already duplicated fields
     var allFields = [].concat((0, _toConsumableArray2["default"])(nextDoc.fields), (0, _toConsumableArray2["default"])(duplicatedFields));
     var duplicateField = _objectSpread(_objectSpread({}, field), {}, {
-      _id: (0, _generateReadableId.generateReadableId)({
+      _id: useReadableIds ? (0, _generateReadableId.generateReadableId)({
         fields: allFields,
         pages: (_nextDoc$files$fileIn = nextDoc.files[fileIndex]) === null || _nextDoc$files$fileIn === void 0 ? void 0 : _nextDoc$files$fileIn.pages,
         views: (_nextDoc$files$fileIn2 = nextDoc.files[fileIndex]) === null || _nextDoc$files$fileIn2 === void 0 ? void 0 : _nextDoc$files$fileIn2.views
-      }, field.type)
+      }, field.type) : (0, _generateObjectId["default"])()
     });
+
     // Remove formulas property when duplicating
     delete duplicateField.formulas;
     duplicatedFields.push(duplicateField);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@builttocreate/engine-utils",
-  "version": "2.11.0-beta.v1364.0",
+  "version": "3.0.0",
   "description": "Utility library for common logic shared across web and mobile",
   "main": "dist/index.js",
   "files": [
@@ -36,6 +36,7 @@
     "@babel/plugin-transform-regenerator": "^7.12.1",
     "@babel/plugin-transform-runtime": "^7.12.10",
     "@babel/preset-env": "^7.12.11",
+    "@babel/runtime": "^7.28.6",
     "babel-eslint": "^10.1.0",
     "cross-env": "^7.0.3",
     "eslint": "^7.18.0",