@builttocreate/engine-utils 2.10.1-beta.593v2 → 2.10.1-beta.v593.10

package/dist/generateReadableId.js

@@ -1,5 +1,6 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -8,6 +9,10 @@ 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,7 +120,17 @@ function generateReadableId(parts, type) {
   // if (pages) count += getFieldPositionsCount(pages, type);
   // if (views && views.length > 1) count += getViewsFieldPositionsCount(views, type); 
 
-  return "".concat(type).concat(splitterId).concat(count + 1);
+  var readableId = "".concat(type).concat(splitterId).concat(count + 1);
+
+  /**
+   * 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(function (field) {
+    if (field._id === readableId) readableId = "".concat(type).concat(splitterId).concat(count + 2);
+  });
+  return readableId;
 }
 ;
 
@@ -126,16 +141,50 @@ function generateReadableId(parts, type) {
 * @param {Array} tableColumns - Array of table column objects
 * @returns {String} - An ID in the format "{tableId}Column{count+1}" (e.g. "table1Column1")
 */
-function generateReadableTableColumnId(tableId, tableColumns) {
+function generateReadableTableColumnId(tableId, tableColumns, columnId) {
+  //Add logic that ensures that created Id is not a duplicate 
   if (!tableId) throw new Error('generateReadableTableColumnId: tableId is required');
+  if (!columnId) throw new Error('generateReadableTableColumnId: columnId is required');
   if (!tableColumns || !Array.isArray(tableColumns)) {
+    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
+  //Filter out undefined and null values from tableColumns
   var validColumns = tableColumns.filter(function (column) {
     return column !== undefined && column !== null;
   });
-  var count = validColumns.length;
-  return "".concat(tableId, "Column").concat(count + 1);
+  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 user drags one text column it would have text1 as the id. If he renames it to text2, we 
+         * need to esnure the newly generatedId is different than text2
+         */
+        tableColumns.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();
+  }
 }

package/dist/validateReadableId.js

@@ -81,7 +81,7 @@ var JOYDOC_PROPERTIES = new Set(['_id', 'identifier', 'name', 'type', 'files', '
  * @param {*} readableId - The ID to validate
  * @returns {boolean} - True if valid, false otherwise
  */
-var _default = exports["default"] = function _default(readableId) {
+var _default = exports["default"] = function _default(readableId, fields, tableColumns) {
   // Must be a non-empty string
   if (typeof readableId !== 'string' || readableId.length === 0) {
     console.warn("validateReadableId: Invalid input - expected non-empty string, got ".concat(typeof readableId === 'string' ? 'empty string' : (0, _typeof2["default"])(readableId)));
@@ -142,5 +142,25 @@ var _default = exports["default"] = function _default(readableId) {
     console.warn("validateReadableId: \"".concat(readableId, "\" is invalid - it's an Excel function name"));
     return false;
   }
+
+  //6. Check for duplicateIds
+  if (fields && Array.isArray(fields)) {
+    var duplicateField = fields.find(function (field) {
+      return field._id === readableId;
+    });
+    if (duplicateField) {
+      console.warn("validateReadableId: \"".concat(readableId, "\" is invalid - it already exists in fields"));
+      return false;
+    }
+  }
+  if (tableColumns && Array.isArray(tableColumns)) {
+    var duplicateColumnId = tableColumns.find(function (column) {
+      return column._id === readableId;
+    });
+    if (duplicateColumnId) {
+      console.warn("validateReadableId: \"".concat(readableId, "\" is invalid - it already exists in fields"));
+      return false;
+    }
+  }
   return true;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@builttocreate/engine-utils",
-  "version": "2.10.1-beta.593v2",
+  "version": "2.10.1-beta.v593.10",
   "description": "Utility library for common logic shared across web and mobile",
   "main": "dist/index.js",
   "files": [
@@ -30,7 +30,7 @@
   },
   "homepage": "https://github.com/zionlabs/engine-utils#readme",
   "devDependencies": {
-    "@babel/cli": "^7.12.10",
+    "@babel/cli": "^7.27.2",
     "@babel/core": "^7.12.10",
     "@babel/plugin-proposal-class-properties": "^7.12.1",
     "@babel/plugin-transform-regenerator": "^7.12.1",