@builttocreate/engine-utils 2.11.0-beta.1 → 2.11.0-beta.1629.1

package/dist/index.js

@@ -86,7 +86,8 @@ var _generateObjectId = _interopRequireDefault(require("./generateObjectId"));
 var _validateObjectId = _interopRequireDefault(require("./validateObjectId"));
 var _generateReadableId = require("./generateReadableId");
 var _validateReadableId = _interopRequireDefault(require("./validateReadableId"));
-function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) { if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } } return n["default"] = e, t && t.set(e, n), n; }
 var _default = exports["default"] = {
   fileHelper: fileHelper,
   tableHelper: tableHelper,

package/dist/joyDocHelper.js

@@ -186,7 +186,7 @@ var getCleanedJoyDoc = exports.getCleanedJoyDoc = function getCleanedJoyDoc(doc)
       /**
       * Step 1.5: Replace view page ids and field ids if they are not valid
       */
-      if ((nextFile === null || nextFile === void 0 || (_nextFile$views = nextFile.views) === null || _nextFile$views === void 0 ? void 0 : _nextFile$views.length) > 0) {
+      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);
@@ -211,13 +211,28 @@ var removeOrphanedFieldsFromJoydoc = exports.removeOrphanedFieldsFromJoydoc = fu
   if (!doc) return getDefaultJoyDoc();
   var nextDoc = _objectSpread({}, doc);
   var associatedFieldIdLookup = {};
-  nextDoc === null || nextDoc === void 0 || (_nextDoc$files = nextDoc.files) === null || _nextDoc$files === void 0 || _nextDoc$files.forEach(function (file) {
-    var _file$views;
+  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$header, _file$header$fieldPos, _file$footer, _file$footer$fieldPos, _file$pages, _file$views;
+    /**
+     * Header 
+     */
+    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) (_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.forEach(function (page) {
-      page === null || page === void 0 || page.fieldPositions.forEach(function (fieldPosition) {
+    (_file$pages = file.pages) === null || _file$pages === void 0 ? void 0 : _file$pages.forEach(function (page) {
+      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;
       });
     });
@@ -225,10 +240,11 @@ var removeOrphanedFieldsFromJoydoc = exports.removeOrphanedFieldsFromJoydoc = fu
     /**
      * Alternative view
      */
-    (_file$views = file.views) === null || _file$views === void 0 || _file$views.forEach(function (view) {
+    (_file$views = file.views) === null || _file$views === void 0 ? void 0 : _file$views.forEach(function (view) {
       var _view$pages;
-      view === null || view === void 0 || (_view$pages = view.pages) === null || _view$pages === void 0 || _view$pages.forEach(function (page) {
-        page === null || page === void 0 || page.fieldPositions.forEach(function (fieldPosition) {
+      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$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;
         });
       });
@@ -270,7 +286,7 @@ var getCleanedJoyDocPages = exports.getCleanedJoyDocPages = function getCleanedJ
       * Step 1: Replace pages[x]._id if it is not valid (always use objectId for pages)
       */
       var nextPage = _objectSpread({}, page);
-      if (nextPage._id && !(0, _validateObjectId["default"])(nextPage._id)) nextPage._id = (0, _generateObjectId["default"])();
+      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) {
         nextPage.fieldPositions = nextPage.fieldPositions.map(function (fieldPosition) {
           /**
@@ -280,7 +296,7 @@ var getCleanedJoyDocPages = exports.getCleanedJoyDocPages = function getCleanedJ
           var nextFieldPosition = _objectSpread({}, fieldPosition);
 
           // Clean fieldPosition _id
-          nextFieldPosition._id = nextFieldPosition._id && (0, _validateObjectId["default"])(nextFieldPosition._id) ? nextFieldPosition._id : (0, _generateObjectId["default"])();
+          nextFieldPosition._id = nextFieldPosition._id && ((0, _validateObjectId["default"])(nextFieldPosition._id) || (0, _validateReadableId["default"])(nextFieldPosition._id)) ? nextFieldPosition._id : (0, _generateObjectId["default"])();
 
           // Clean fieldPosition.field reference
           nextFieldPosition.field = getFieldId(nextFieldPosition.field, fieldPosition.type, doc);
@@ -437,6 +453,7 @@ var getDocumentFromTemplate = exports.getDocumentFromTemplate = function getDocu
 var duplicateDocumentPage = exports.duplicateDocumentPage = function duplicateDocumentPage(doc, fileId, pageId) {
   var _nextDoc$fields;
   var pageDefaults = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
+  console.log('duplicateDocumentPage', doc, fileId, pageId, pageDefaults);
   var changelogInfo = {
     primaryPages: {
       targetIndex: 0,
@@ -451,8 +468,8 @@ var duplicateDocumentPage = exports.duplicateDocumentPage = function duplicateDo
   });
   var newPageId = (0, _generateObjectId["default"])();
   var fieldLookup = {};
-  (_nextDoc$fields = nextDoc.fields) === null || _nextDoc$fields === void 0 || _nextDoc$fields.forEach(function (field) {
-    if (field.file === fileId) fieldLookup[field._id] = field;
+  (_nextDoc$fields = nextDoc.fields) === null || _nextDoc$fields === void 0 ? void 0 : _nextDoc$fields.forEach(function (field) {
+    fieldLookup[field._id] = field;
   });
 
   /**
@@ -484,6 +501,7 @@ var duplicateDocumentPage = exports.duplicateDocumentPage = function duplicateDo
   var newFieldsLookupByOldId = {};
   var duplicatedFields = [];
   fieldIdsToDuplicate.forEach(function (fieldId) {
+    var _nextDoc$files$fileIn, _nextDoc$files$fileIn2;
     /**
      * Why do we check if a new field has already been created?
      *
@@ -494,9 +512,22 @@ var duplicateDocumentPage = exports.duplicateDocumentPage = function duplicateDo
      */
     if (newFieldsLookupByOldId[fieldId]) return;
     var field = fieldLookup[fieldId];
+
+    // Skip if field not found in lookup
+    if (!field) return;
+
+    // Generate readable ID using current fields plus already duplicated fields
+    var allFields = [].concat((0, _toConsumableArray2["default"])(nextDoc.fields), (0, _toConsumableArray2["default"])(duplicatedFields));
+    var readableId = pageDefaults.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) : (0, _generateObjectId["default"])();
     var duplicateField = _objectSpread(_objectSpread({}, field), {}, {
-      _id: (0, _generateObjectId["default"])()
+      _id: readableId
     });
+    // Remove formulas property when duplicating
+    delete duplicateField.formulas;
     duplicatedFields.push(duplicateField);
 
     /**
@@ -646,7 +677,7 @@ var duplicateDocumentPage = exports.duplicateDocumentPage = function duplicateDo
  */
 var getMobileViewFromFile = exports.getMobileViewFromFile = function getMobileViewFromFile(file) {
   var _file$views2;
-  var mobileViewIndex = file !== null && file !== void 0 && file.views && (file === null || file === void 0 || (_file$views2 = file.views) === null || _file$views2 === void 0 ? void 0 : _file$views2.length) > 0 ? file.views.findIndex(function (view) {
+  var mobileViewIndex = file !== null && file !== void 0 && file.views && (file === null || file === void 0 ? void 0 : (_file$views2 = file.views) === null || _file$views2 === void 0 ? void 0 : _file$views2.length) > 0 ? file.views.findIndex(function (view) {
     return view.type === _FileViews["default"].mobile;
   }) : -1;
   if (mobileViewIndex !== -1) {
@@ -754,10 +785,10 @@ var generateMobilePageFieldPositions = exports.generateMobilePageFieldPositions
  */
 var mergeAssoicatedFieldPositionsForMobilePage = exports.mergeAssoicatedFieldPositionsForMobilePage = function mergeAssoicatedFieldPositionsForMobilePage(fieldPositions) {
   var filteredFieldPositions = [];
-  fieldPositions === null || fieldPositions === void 0 || fieldPositions.forEach(function (fieldPosition) {
+  fieldPositions === null || fieldPositions === void 0 ? void 0 : fieldPositions.forEach(function (fieldPosition) {
     var fieldPositionIndex = filteredFieldPositions.findIndex(function (filtered) {
       var _filtered$field, _fieldPosition$field;
-      return (filtered === null || filtered === void 0 || (_filtered$field = filtered.field) === null || _filtered$field === void 0 ? void 0 : _filtered$field.toString()) === (fieldPosition === null || fieldPosition === void 0 || (_fieldPosition$field = fieldPosition.field) === null || _fieldPosition$field === void 0 ? void 0 : _fieldPosition$field.toString());
+      return (filtered === null || filtered === void 0 ? void 0 : (_filtered$field = filtered.field) === null || _filtered$field === void 0 ? void 0 : _filtered$field.toString()) === (fieldPosition === null || fieldPosition === void 0 ? void 0 : (_fieldPosition$field = fieldPosition.field) === null || _fieldPosition$field === void 0 ? void 0 : _fieldPosition$field.toString());
     });
 
     //Only add field to the list if it hasn't already been added

package/dist/tableHelper.js

@@ -15,7 +15,8 @@ var _Table = _interopRequireWildcard(require("./constants/Table"));
 var _FieldTypes = _interopRequireDefault(require("./constants/FieldTypes"));
 var _FieldTableColumnTypes = _interopRequireDefault(require("./constants/FieldTableColumnTypes"));
 var _FieldTableCustomColumnIds = _interopRequireDefault(require("./constants/FieldTableCustomColumnIds"));
-function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof3(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof3(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) { if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } } return n["default"] = e, t && t.set(e, n), n; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var parser = new _hotFormulaParser.Parser();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@builttocreate/engine-utils",
-  "version": "2.11.0-beta.1",
+  "version": "2.11.0-beta.1629.1",
   "description": "Utility library for common logic shared across web and mobile",
   "main": "dist/index.js",
   "files": [