@builttocreate/engine-utils 2.10.1-beta.v593.28 → 2.10.1-beta.v593.4

package/dist/fieldHelper.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isTargetOptionDeleted = exports.isFieldEmpty = exports.handleMultiSelectOptionToggle = exports.getTemplateWithLookups = exports.getMultiSelectFieldValue = exports.getImportFieldValues = exports.getDefaultOption = exports.getDefaultFieldValuesFromTemplate = exports.getChartFieldValue = exports.flattenSchemaTree = exports["default"] = void 0;
+exports.isTargetOptionDeleted = exports.isFieldEmpty = exports.handleMultiSelectOptionToggle = exports.getTemplateWithLookups = exports.getMultiSelectFieldValue = exports.getImportFieldValues = exports.getDefaultOption = exports.getDefaultFieldValuesFromTemplate = exports.getChartFieldValue = exports["default"] = void 0;
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
@@ -298,45 +298,6 @@ var isTargetOptionDeleted = exports.isTargetOptionDeleted = function isTargetOpt
   var result = !(undeletedOptions.length > 0);
   return result;
 };
-
-/**
- *
- * Flattens a nested schema tree into an array of objects and adds a depth property to each object.
- *
- * @param {Object} schemaObj
- * @returns {Array} // An array of objects with the schema's id, depth, and other properties.
- */
-var flattenSchemaTree = exports.flattenSchemaTree = function flattenSchemaTree(schemaObj) {
-  var flattened = [];
-
-  // Recursive function to traverse the tree.
-  function traverse(schemaId, depth, parentId) {
-    var node = schemaObj[schemaId];
-    if (!node) return;
-
-    // Create a new object that includes the schema's id and its depth.
-    flattened.push(_objectSpread({
-      id: schemaId,
-      parentId: parentId,
-      depth: depth
-    }, node));
-
-    // If the node has children, traverse them with increased depth.
-    if (node.children && node.children.length > 0) {
-      node.children.forEach(function (childId) {
-        return traverse(childId, depth + 1, schemaId);
-      });
-    }
-  }
-
-  // Find and traverse each root node.
-  Object.keys(schemaObj).forEach(function (schemaId) {
-    if (schemaObj[schemaId].root) {
-      traverse(schemaId, 0);
-    }
-  });
-  return flattened;
-};
 var _default = exports["default"] = {
   getDefaultOption: getDefaultOption,
   getChartFieldValue: getChartFieldValue,

package/dist/generateReadableId.js

@@ -1,6 +1,5 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -9,7 +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; }
@@ -114,20 +112,13 @@ function generateReadableId(parts, type) {
     throw new Error('generateReadableId: at least one of fields, pages, or views is required');
   }
   if (!fields) console.warn('generateReadableId: fields parameter is missing');
-
+  var 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); 
 
-  var count = fields.length ? getFieldsCount(fields, type) : 0;
-  var readableId = "".concat(type).concat(splitterId).concat(count + 1);
-  while (fields.some(function (field) {
-    return field._id === readableId;
-  })) {
-    count++;
-    readableId = "".concat(type).concat(splitterId).concat(count + 1);
-  }
-  return readableId;
+  return "".concat(type).concat(splitterId).concat(count + 1);
 }
 ;
 
@@ -139,11 +130,8 @@ function generateReadableId(parts, type) {
 * @returns {String} - An ID in the format "{tableId}Column{count+1}" (e.g. "table1Column1")
 */
 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 = {};
@@ -155,31 +143,13 @@ function generateReadableTableColumnId(tableId, tableColumns, columnId) {
   var _iterator = _createForOfIteratorHelper(validColumns),
     _step;
   try {
-    var _loop = function _loop() {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
       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.
-         */
-        while (validColumns.some(function (column) {
-          return column._id === readableId;
-        })) {
-          counts[type]++;
-          readableId = "".concat(type).concat(counts[type]);
-        }
-        return {
-          v: readableId
-        };
+        return "".concat(type).concat(counts[type]);
       }
-    };
-    for (_iterator.s(); !(_step = _iterator.n()).done;) {
-      var _ret = _loop();
-      if ((0, _typeof2["default"])(_ret) === "object") return _ret.v;
     }
   } catch (err) {
     _iterator.e(err);

package/dist/joyDocHelper.js

@@ -100,12 +100,11 @@ var getDefaultJoyDoc = exports.getDefaultJoyDoc = function getDefaultJoyDoc() {
  */
 var getFieldId = function getFieldId(existingId, type, doc) {
   // If existing ID is a valid ObjectId or readableId, maintain it
-  //Note: readableId validation is already done when it's being generated
-
   if (existingId && (0, _validateObjectId["default"])(existingId)) {
     return existingId;
+  } else if (existingId && (0, _validateReadableId["default"])(existingId)) {
+    return existingId;
   }
-  if (existingId) return existingId;
 
   // Otherwise, generate a readable ID
   if (type) {

package/dist/validateReadableId.js

@@ -7,8 +7,6 @@ Object.defineProperty(exports, "__esModule", {
 exports["default"] = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
-var _fieldHelper = require("./fieldHelper");
-var _FieldTypes = _interopRequireDefault(require("./constants/FieldTypes"));
 // Check if value follows a valid readableId pattern for use in JavaScript formulas
 // Note to test this please run npm test src/validateReadableId.test.js
 
@@ -83,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, fields, tableColumns, fieldId) {
+var _default = exports["default"] = function _default(readableId) {
   // 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)));
@@ -144,49 +142,5 @@ var _default = exports["default"] = function _default(readableId, fields, tableC
     console.warn("validateReadableId: \"".concat(readableId, "\" is invalid - it's an Excel function name"));
     return false;
   }
-
-  //6. Check for duplicates in readableIds
-
-  if (Array.isArray(fields)) {
-    //DuplicateId check for fieldIds
-    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;
-    }
-
-    /**
-     * DuplicateId check for nested tables of collection fields
-     * When readableIds for nestedTables are passed in, we need the fieldId to retrieve the collection fields that houses the nestedTable
-     */
-    if (fieldId) {
-      var targetField = fields.find(function (field) {
-        return field._id === fieldId;
-      });
-      if ((targetField === null || targetField === void 0 ? void 0 : targetField.type) === _FieldTypes["default"].collection) {
-        var flattenedSchema = (0, _fieldHelper.flattenSchemaTree)(targetField.schema);
-        var readableIdExists = flattenedSchema.some(function (schema) {
-          return schema.id === readableId;
-        });
-        if (readableIdExists) {
-          console.warn("validateReadableId: \"".concat(readableId, "\" is invalid - it already exists in fields"));
-          return false;
-        }
-      }
-    }
-  }
-
-  //DuplicateId check for columnIds
-  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.v593.28",
+  "version": "2.10.1-beta.v593.4",
   "description": "Utility library for common logic shared across web and mobile",
   "main": "dist/index.js",
   "files": [