@zohodesk/testinglibrary 0.0.57-n20-experimental → 0.0.58-n20-experimental

package/build/core/dataGenerator/DataGenerator.js

@@ -10,6 +10,7 @@ var _fs = _interopRequireDefault(require("fs"));
 var _logger = require("../../utils/logger");
 var _timeFormat = require("../../utils/timeFormat");
 var _DataGeneratorHelper = require("./DataGeneratorHelper");
+var _datePlaceholders = require("../../utils/datePlaceholders");
 var _DataGeneratorError = require("./DataGeneratorError");
 var _readConfigFile = require("../playwright/readConfigFile");
 var _configConstants = _interopRequireDefault(require("../playwright/constants/configConstants"));
@@ -38,8 +39,18 @@ class DataGenerator {
       } else {
         generators = await _assertClassBrand(_DataGenerator_brand, this, _getGenerator).call(this, generatorName);
       }
-      const resolvedDataTable = await (0, _DataGeneratorHelper.resolveCacheReferences)(dataTable, cacheLayer);
-      const processedGenerators = await (0, _DataGeneratorHelper.processGenerator)(generators, resolvedDataTable);
+
+      // Clone to prevent cross-test mutation of the cached generator index.
+      const generatorsCopy = generators.map(g => ({
+        ...g,
+        params: g.params ? {
+          ...g.params
+        } : undefined
+      }));
+      (0, _datePlaceholders.resolveDatePlaceholdersInGenerators)(generatorsCopy);
+      const dateResolvedTable = (0, _datePlaceholders.resolveDatePlaceholders)(dataTable);
+      const resolvedDataTable = await (0, _DataGeneratorHelper.resolveCacheReferences)(dateResolvedTable, cacheLayer);
+      const processedGenerators = await (0, _DataGeneratorHelper.processGenerator)(generatorsCopy, resolvedDataTable);
       const apiPayload = await _assertClassBrand(_DataGenerator_brand, this, _constructApiPayload).call(this, scenarioName, processedGenerators, actorInfo);
       const featureFlags = process.env.featureflags ? process.env.featureflags : '';
       const headers = {

package/build/utils/datePlaceholders.js

@@ -0,0 +1,170 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.resolveDatePlaceholders = resolveDatePlaceholders;
+exports.resolveDatePlaceholdersInGenerators = resolveDatePlaceholdersInGenerators;
+exports.resolveDatePlaceholdersInValue = resolveDatePlaceholdersInValue;
+// Matches a full-cell date placeholder: ${TOKEN} or ${TOKEN:N}
+// Uppercase-only token names never clash with TitleCase cache refs.
+const DATE_PLACEHOLDER = /^\$\{([A-Z][A-Z_]*)(?::(\d+))?\}$/;
+function _pad(n, width = 2) {
+  return String(n).padStart(width, '0');
+}
+
+// UTC day arithmetic — avoids DST boundary issues.
+function _shiftDays(baseDate, days) {
+  const d = new Date(baseDate.getTime());
+  d.setUTCDate(d.getUTCDate() + days);
+  return d;
+}
+function _toISODate(d) {
+  return `${d.getUTCFullYear()}-${_pad(d.getUTCMonth() + 1)}-${_pad(d.getUTCDate())}`;
+}
+function _toISODateTime(d) {
+  return d.toISOString();
+}
+function _toEpochMs(d) {
+  return String(d.getTime());
+}
+function _toUIDate(d) {
+  return `${_pad(d.getUTCDate())}/${_pad(d.getUTCMonth() + 1)}/${d.getUTCFullYear()}`;
+}
+const TOKEN_HANDLERS = {
+  CURRENT_DATE: {
+    requiresN: false,
+    resolve: d => _toISODate(d)
+  },
+  PAST_DATE: {
+    requiresN: true,
+    resolve: (d, n) => _toISODate(_shiftDays(d, -n))
+  },
+  FUTURE_DATE: {
+    requiresN: true,
+    resolve: (d, n) => _toISODate(_shiftDays(d, n))
+  },
+  CURRENT_DATETIME: {
+    requiresN: false,
+    resolve: d => _toISODateTime(d)
+  },
+  PAST_DATETIME: {
+    requiresN: true,
+    resolve: (d, n) => _toISODateTime(_shiftDays(d, -n))
+  },
+  FUTURE_DATETIME: {
+    requiresN: true,
+    resolve: (d, n) => _toISODateTime(_shiftDays(d, n))
+  },
+  CURRENT_TIMESTAMP: {
+    requiresN: false,
+    resolve: d => _toEpochMs(d)
+  },
+  PAST_TIMESTAMP: {
+    requiresN: true,
+    resolve: (d, n) => _toEpochMs(_shiftDays(d, -n))
+  },
+  FUTURE_TIMESTAMP: {
+    requiresN: true,
+    resolve: (d, n) => _toEpochMs(_shiftDays(d, n))
+  },
+  CURRENT_DATE_UI: {
+    requiresN: false,
+    resolve: d => _toUIDate(d)
+  },
+  PAST_DATE_UI: {
+    requiresN: true,
+    resolve: (d, n) => _toUIDate(_shiftDays(d, -n))
+  },
+  FUTURE_DATE_UI: {
+    requiresN: true,
+    resolve: (d, n) => _toUIDate(_shiftDays(d, n))
+  }
+};
+const VALID_TOKENS = Object.keys(TOKEN_HANDLERS).join(', ');
+
+/**
+ * Resolve a single dataTable cell value.
+ * Non-strings and strings without "${" are returned as-is.
+ * @param {*} value
+ * @param {Date} [now]
+ * @returns {*}
+ */
+function resolveDatePlaceholdersInValue(value, now = new Date()) {
+  if (typeof value !== 'string' || !value.includes('${')) {
+    return value;
+  }
+  const match = value.match(DATE_PLACEHOLDER);
+  if (!match) {
+    return value;
+  }
+  const [, token, rawN] = match;
+  const handler = TOKEN_HANDLERS[token];
+  if (!handler) {
+    throw new Error(`DataGenerator: Unknown date placeholder token "\${${token}}". Valid tokens are: ${VALID_TOKENS}.`);
+  }
+  if (handler.requiresN) {
+    if (rawN === undefined) {
+      throw new Error(`DataGenerator: Placeholder "\${${token}}" requires a day offset N, e.g. "\${${token}:7}".`);
+    }
+    const n = parseInt(rawN, 10);
+    if (!Number.isFinite(n) || n < 1) {
+      throw new Error(`DataGenerator: Placeholder "\${${token}:${rawN}}" — N must be a positive integer ≥ 1.`);
+    }
+    return handler.resolve(now, n);
+  } else {
+    if (rawN !== undefined) {
+      const suggestionToken = token.replace('CURRENT_', 'FUTURE_');
+      throw new Error(`DataGenerator: Placeholder "\${${token}}" does not accept an offset. Did you mean "\${${suggestionToken}:${rawN}}"?`);
+    }
+    return handler.resolve(now);
+  }
+}
+
+/**
+ * Resolve date placeholders in all cells of a dataTable rows array.
+ * @param {Object[]} rows
+ * @param {Date} [now]
+ * @returns {Object[]}
+ */
+function resolveDatePlaceholders(rows, now = new Date()) {
+  if (!rows || !rows.length) {
+    return rows || [];
+  }
+  return rows.map(row => {
+    const resolved = {};
+    for (const [key, value] of Object.entries(row)) {
+      resolved[key] = resolveDatePlaceholdersInValue(value, now);
+    }
+    return resolved;
+  });
+}
+function _resolveObjectValues(obj, now) {
+  for (const key of Object.keys(obj)) {
+    const val = obj[key];
+    if (typeof val === 'string') {
+      obj[key] = resolveDatePlaceholdersInValue(val, now);
+    } else if (val !== null && typeof val === 'object') {
+      _resolveObjectValues(val, now);
+    }
+  }
+}
+
+/**
+ * Resolve date placeholders in static params of a loaded generators array.
+ * Mutates in place — call only on a cloned copy of the generator index entry.
+ * @param {Object[]} generators
+ * @param {Date} [now]
+ * @returns {Object[]}
+ */
+function resolveDatePlaceholdersInGenerators(generators, now = new Date()) {
+  if (!generators || !generators.length) {
+    return generators || [];
+  }
+  for (const gen of generators) {
+    if (gen.params && typeof gen.params === 'object') {
+      _resolveObjectValues(gen.params, now);
+    }
+  }
+  return generators;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zohodesk/testinglibrary",
-  "version": "0.0.57-n20-experimental",
+  "version": "0.0.58-n20-experimental",
   "main": "./build/index.js",
   "scripts": {
     "postinstall": "node bin/postinstall.js",