@builttocreate/engine-utils 2.10.1-beta.v593.26 → 2.10.1-beta.v593.27

package/dist/generateReadableId.js

@@ -1,6 +1,5 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -9,10 +8,6 @@ exports.generateReadableTableColumnId = generateReadableTableColumnId;
 exports.getFieldPositionsCount = getFieldPositionsCount;
 exports.getFieldsCount = getFieldsCount;
 exports.getViewsFieldPositionsCount = getViewsFieldPositionsCount;
-var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
-function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
-function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
-function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) { n[e] = r[e]; } return n; }
 /**
 * Counts fields of a specific type in an array of fields
 * 
@@ -115,28 +110,9 @@ function generateReadableId(parts, type) {
   }
   if (!fields) console.warn('generateReadableId: fields parameter is missing');
 
-  // let count = 0;
-
-  // if (fields) count += getFieldsCount(fields, type);
-  // // Note: leaving for now until we allow targeting fieldPositions 
-  // // if (pages) count += getFieldPositionsCount(pages, type);
-  // // if (views && views.length > 1) count += getViewsFieldPositionsCount(views, type); 
-
-  // let readableId =  `${type}${splitterId}${count + 1}`
-  // count++;
-
-  // /**
-  //  * If the user drags one text field and renames it to text 2, we need to ensure
-  //  * the newly generatedId is different than text2
-  //  * */
-
-  // fields.forEach((field ) => {
-
-  //   if(field._id === readableId) readableId = `${type}${splitterId}${count + 1}`
-
-  // })
-
-  // return readableId;
+  // Note: leaving for now until we allow targeting fieldPositions 
+  // if (pages) count += getFieldPositionsCount(pages, type);
+  // if (views && views.length > 1) count += getViewsFieldPositionsCount(views, type); 
 
   var count = fields.length ? getFieldsCount(fields, type) : 0;
   var readableId = "".concat(type).concat(splitterId).concat(count + 1);
@@ -165,43 +141,53 @@ function generateReadableTableColumnId(tableId, tableColumns, columnId) {
     console.warn('generateReadableTableColumnId: tableColumns parameter is missing or not an array');
     return "".concat(tableId, "Column1");
   }
-  var counts = {};
 
-  //Filter out undefined and null values from tableColumns
-  var validColumns = tableColumns.filter(function (column) {
-    return column !== undefined && column !== null;
+  // const counts = {};
+
+  // //Filter out undefined and null values from tableColumns
+  // const validColumns = tableColumns.filter(column => column !== undefined && column !== null);
+
+  // for (const col of validColumns) {
+
+  //   const type = (col.type || 'unknown').toLowerCase();
+
+  //   counts[type] = (counts[type] || 0) + 1;
+
+  //   let readableId = `${type}${counts[type]}`
+
+  //   if (col._id === columnId) {
+
+  //     /**
+  //      * If the generatedReadableId is already present in the tableColumns,
+  //      * we need to increment the count until we find a unique ID.
+  //      * This ensures that the new column ID is unique.
+  //      */
+  //     validColumns.forEach((column) => {
+  //       if (column._id === readableId) {
+  //         readableId = `${type}${counts[type] + 1}`;
+  //       }
+  //     });
+
+  //     return readableId;
+
+  //   }
+  // }
+
+  var validColumns = tableColumns.filter(Boolean);
+  var targetColumn = validColumns.find(function (col) {
+    return col._id === columnId;
   });
-  var _iterator = _createForOfIteratorHelper(validColumns),
-    _step;
-  try {
-    var _loop = function _loop() {
-      var col = _step.value;
-      var type = (col.type || 'unknown').toLowerCase();
-      counts[type] = (counts[type] || 0) + 1;
-      var readableId = "".concat(type).concat(counts[type]);
-      if (col._id === columnId) {
-        /**
-         * If the generatedReadableId is already present in the tableColumns,
-         * we need to increment the count until we find a unique ID.
-         * This ensures that the new column ID is unique.
-         */
-        validColumns.forEach(function (column) {
-          if (column._id === readableId) {
-            readableId = "".concat(type).concat(counts[type] + 1);
-          }
-        });
-        return {
-          v: readableId
-        };
-      }
-    };
-    for (_iterator.s(); !(_step = _iterator.n()).done;) {
-      var _ret = _loop();
-      if ((0, _typeof2["default"])(_ret) === "object") return _ret.v;
-    }
-  } catch (err) {
-    _iterator.e(err);
-  } finally {
-    _iterator.f();
+  var type = ((targetColumn === null || targetColumn === void 0 ? void 0 : targetColumn.type) || 'unknown').toLowerCase();
+  var count = validColumns.filter(function (col) {
+    return (col.type || 'unknown').toLowerCase() === type;
+  }).length;
+  var readableId = "".concat(type).concat(count + 1);
+  var existingIds = new Set(validColumns.map(function (col) {
+    return col._id;
+  }));
+  while (existingIds.has(readableId)) {
+    count++;
+    readableId = "".concat(type).concat(count + 1);
   }
+  return readableId;
 }

package/package.json

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