jupiter-dynamic-forms 1.20.9 → 1.21.0

package/dist/index.mjs

@@ -16185,9 +16185,10 @@ let JupiterDynamicForm = class extends LitElement {
     }
     return false;
   }
-  _findColumnByDimensions(columns, dims) {
-    var _a;
-    return (_a = columns.find((col) => {
+  // Every column carrying all of `dims`. More than one is normal: a previous-year column copies
+  // its current-year column's dimensions and differs only in period, which callers don't pass.
+  _findColumnsByDimensions(columns, dims) {
+    return columns.filter((col) => {
       if (col.type !== "dimension" || !col.dimensionData)
         return false;
       const combos = col.dimensionData.combinations;
@@ -16199,12 +16200,60 @@ let JupiterDynamicForm = class extends LitElement {
         );
       }
       return dims.length === 1 && this._normalizeAxisId(col.dimensionData.axisId ?? "") === this._normalizeAxisId(dims[0].axis) && this._normalizeMemberId(col.dimensionData.memberId ?? "") === this._normalizeMemberId(dims[0].member);
-    })) == null ? void 0 : _a.id;
+    });
+  }
+  // Which of `candidates` a scrollToConcept call points at in one row. Narrowed first by
+  // `period` (the columns whose fact has that period), then by `targetValue` (the column whose
+  // stored fact equals it — exactly before up-to-scale, visible before hidden); a step that
+  // singles nothing out is skipped. Else the first candidate.
+  _pickColumn(section2, concept, candidates, targetValue, period, hiddenColumnIds) {
+    var _a;
+    let pool = candidates;
+    if (period && pool.length > 1) {
+      const inPeriod = pool.filter((c2) => this._periodMatches(this._cellPeriod(section2, concept, c2.id), period));
+      if (inPeriod.length)
+        pool = inPeriod;
+    }
+    const rowData = this._formData[concept.id];
+    if (pool.length > 1 && targetValue !== null && rowData) {
+      const filled = pool.filter((c2) => rowData[c2.id] !== void 0 && rowData[c2.id] !== null && rowData[c2.id] !== "");
+      const exact = filled.filter((c2) => String(rowData[c2.id]) === targetValue || Number(rowData[c2.id]) === Number(targetValue));
+      const holders = exact.length ? exact : filled.filter((c2) => this._valueLooselyMatches(rowData[c2.id], targetValue));
+      const holder = holders.find((c2) => !(hiddenColumnIds == null ? void 0 : hiddenColumnIds.has(c2.id))) ?? holders[0];
+      if (holder)
+        return holder.id;
+    }
+    return (_a = pool[0]) == null ? void 0 : _a.id;
+  }
+  // The period Save Draft/Submit write for this cell's fact (same fallback chain as
+  // _processConceptsForSubmission), so a period the host read off a saved fact compares equal —
+  // including user-edited periods and periodStartLabel rows' "day before start" instants.
+  _cellPeriod(section2, concept, columnId) {
+    var _a, _b;
+    const column2 = this._findColumnByIdInSection(columnId, section2);
+    const field2 = ((_a = concept.fields) == null ? void 0 : _a.find((f2) => f2.columnId === columnId)) ?? { columnId };
+    const fieldPeriodData = (_b = this._periodData[concept.id]) == null ? void 0 : _b[columnId];
+    if (concept.periodType === "instant") {
+      return { instant: this._resolveSubmissionInstantDate(concept, field2, fieldPeriodData, column2) };
+    }
+    return {
+      startDate: (fieldPeriodData == null ? void 0 : fieldPeriodData.startDate) || (column2 == null ? void 0 : column2.periodStartDate) || field2.periodStartDate || this.periodStartDate,
+      endDate: (fieldPeriodData == null ? void 0 : fieldPeriodData.endDate) || (column2 == null ? void 0 : column2.periodEndDate) || field2.periodEndDate || this.periodEndDate
+    };
+  }
+  // Every date the host gave equals the cell's; an instant only matches an instant cell, a
+  // start/end only a duration cell. Compared as YYYY-MM-DD so a time part doesn't matter.
+  _periodMatches(cell, period) {
+    const day = (d2) => d2 == null ? void 0 : d2.slice(0, 10);
+    const instant = period.instant ?? period.date;
+    if (instant)
+      return day(cell.instant) === day(instant);
+    return !cell.instant && (!period.startDate || day(cell.startDate) === day(period.startDate)) && (!period.endDate || day(cell.endDate) === day(period.endDate));
   }
   // Step 1 of scrollToConcept: pick the section + concept row to navigate to. Precedence:
   // exactConceptId (caller resolved the row) → role (JDF-087: caller named the role) → the
   // original whole-form search (visible sections first, then the rest).
-  _resolveScrollTarget(conceptName, dimensions, columnId, exactConceptId, role, targetValue) {
+  _resolveScrollTarget(conceptName, dimensions, columnId, exactConceptId, role, targetValue, period) {
     var _a;
     const sectionsToSearch = [
       ...((_a = this._currentSchema) == null ? void 0 : _a.sections) ?? [],
@@ -16227,7 +16276,7 @@ let JupiterDynamicForm = class extends LitElement {
       const matches = rankMatchingSections(role, sectionsToSearch);
       console.log(`[scrollToConcept] role="${role}" matched ${matches.length} section(s): ${matches.slice(0, 5).map((m) => `${m.section.id} (tier ${m.tier})`).join(", ")}`);
       for (const { section: section2, tier } of matches) {
-        const hit = this._resolveConceptInSection(section2, conceptName, dimensions, columnId, targetValue);
+        const hit = this._resolveConceptInSection(section2, conceptName, dimensions, columnId, targetValue, period);
         if (!hit)
           continue;
         if (tier >= ROLE_MATCH_TIER.SUBSTRING) {
@@ -16237,67 +16286,75 @@ let JupiterDynamicForm = class extends LitElement {
       }
       console.warn(`[scrollToConcept] "${conceptName}" not found in any section matching role="${role}" — falling back to whole-form search`);
     }
+    let columnOnly = null;
     let tentative = null;
     for (const section2 of sectionsToSearch) {
-      const hit = this._resolveConceptInSection(section2, conceptName, dimensions, columnId, targetValue);
+      const hit = this._resolveConceptInSection(section2, conceptName, dimensions, columnId, targetValue, period);
       if (!hit)
         continue;
-      if (hit.strong)
+      if (hit.strong && hit.inPeriod)
         return { section: section2, concept: hit.concept, viaRole: false };
-      tentative ?? (tentative = { section: section2, concept: hit.concept });
+      if (hit.strong)
+        columnOnly ?? (columnOnly = { section: section2, concept: hit.concept });
+      else
+        tentative ?? (tentative = { section: section2, concept: hit.concept });
     }
-    return tentative ? { ...tentative, viaRole: false } : null;
+    const fallback = columnOnly ?? tentative;
+    return fallback ? { ...fallback, viaRole: false } : null;
   }
   // Finds conceptName's row in one section. `strong` is false when the concept is there but the
   // requested column (columnId, or one matching `dimensions`) isn't — the whole-form search keeps
   // such a hit only as a fallback while it looks for a section where the column is present.
-  _resolveConceptInSection(section2, conceptName, dimensions, columnId, targetValue) {
+  // `inPeriod` is false when `period` was given but none of those columns has it (same idea).
+  _resolveConceptInSection(section2, conceptName, dimensions, columnId, targetValue, period) {
     const candidates = this._findAllConceptsByName(section2.concepts, conceptName);
     if (!candidates.length)
       return null;
     const hasValueMatch = targetValue !== null;
     const cols = section2.columns ?? this._columns;
-    const resolvedColumnId = columnId ?? ((dimensions == null ? void 0 : dimensions.length) ? this._findColumnByDimensions(cols, dimensions) : void 0);
+    const resolvedColumnIds = columnId ? [columnId] : (dimensions == null ? void 0 : dimensions.length) ? this._findColumnsByDimensions(cols, dimensions).map((c2) => c2.id) : [];
+    const cellMatches = (row, id, usePeriod) => {
+      var _a;
+      const cellValue = (_a = this._formData[row.id]) == null ? void 0 : _a[id];
+      if (cellValue === void 0 || cellValue === null || cellValue === "")
+        return false;
+      if (hasValueMatch && !this._valueLooselyMatches(cellValue, targetValue))
+        return false;
+      return !usePeriod || this._periodMatches(this._cellPeriod(section2, row, id), period);
+    };
+    const rowMatches = (row, usePeriod) => {
+      if (resolvedColumnIds.length)
+        return resolvedColumnIds.some((id) => cellMatches(row, id, usePeriod));
+      if (!hasValueMatch && !usePeriod)
+        return false;
+      return Object.keys(this._formData[row.id] ?? {}).some((id) => cellMatches(row, id, usePeriod));
+    };
     let picked;
     if (candidates.length > 1) {
-      picked = candidates.find((c2) => {
-        const rowData = this._formData[c2.id];
-        if (!rowData)
-          return false;
-        if (resolvedColumnId) {
-          const cellValue = rowData[resolvedColumnId];
-          if (cellValue === void 0 || cellValue === null || cellValue === "")
-            return false;
-          return !hasValueMatch || this._valueLooselyMatches(cellValue, targetValue);
-        }
-        if (hasValueMatch) {
-          return Object.values(rowData).some(
-            (v) => v !== void 0 && v !== null && v !== "" && this._valueLooselyMatches(v, targetValue)
-          );
-        }
-        return false;
-      });
+      picked = (period ? candidates.find((c2) => rowMatches(c2, true)) : void 0) ?? candidates.find((c2) => rowMatches(c2, false));
       console.log(`[scrollToConcept] Section "${section2.id}" has ${candidates.length} rows named "${conceptName}" | disambiguated=${(picked == null ? void 0 : picked.id) ?? "none (using first)"}`);
     }
     const found = picked ?? candidates[0];
+    const inPeriod = (ids) => !period || ids.some((id) => this._periodMatches(this._cellPeriod(section2, found, id), period));
     if (columnId) {
       const hasColumn = cols.some((c2) => c2.id === columnId);
       console.log(`[scrollToConcept] Section "${section2.id}" has concept "${found.id}" | columnId="${columnId}" present=${hasColumn}`);
-      return { concept: found, strong: hasColumn };
+      return { concept: found, strong: hasColumn, inPeriod: inPeriod(hasColumn ? [columnId] : []) };
     }
     if (dimensions == null ? void 0 : dimensions.length) {
-      console.log(`[scrollToConcept] Section "${section2.id}" has concept "${found.id}" | colMatch=${resolvedColumnId ?? "null"} | cols=${cols.map((c2) => c2.id).join(",")}`);
-      return { concept: found, strong: !!resolvedColumnId };
+      console.log(`[scrollToConcept] Section "${section2.id}" has concept "${found.id}" | colMatch=${resolvedColumnIds.join(",") || "null"} | cols=${cols.map((c2) => c2.id).join(",")}`);
+      return { concept: found, strong: resolvedColumnIds.length > 0, inPeriod: inPeriod(resolvedColumnIds) };
     }
     console.log(`[scrollToConcept] Section "${section2.id}" has concept "${found.id}" (no dims, taking first)`);
-    return { concept: found, strong: true };
+    return { concept: found, strong: true, inPeriod: inPeriod(cols.map((c2) => c2.id)) };
   }
   async scrollToConcept(conceptName, dimensions, match, columnId, exactConceptId, role) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o;
-    console.log(`[scrollToConcept] ▶ START conceptName=${conceptName} value=${match == null ? void 0 : match.value} dims=${JSON.stringify(dimensions)} columnId=${columnId} exactConceptId=${exactConceptId} role=${role}`);
+    console.log(`[scrollToConcept] ▶ START conceptName=${conceptName} value=${match == null ? void 0 : match.value} period=${JSON.stringify(match == null ? void 0 : match.period)} dims=${JSON.stringify(dimensions)} columnId=${columnId} exactConceptId=${exactConceptId} role=${role}`);
     const hasValueMatch = (match == null ? void 0 : match.value) !== void 0 && (match == null ? void 0 : match.value) !== null;
     const targetValue = hasValueMatch ? String(match.value) : null;
-    const resolved = this._resolveScrollTarget(conceptName, dimensions, columnId, exactConceptId, role, targetValue);
+    const period = (match == null ? void 0 : match.period) && (match.period.instant || match.period.date || match.period.startDate || match.period.endDate) ? match.period : void 0;
+    const resolved = this._resolveScrollTarget(conceptName, dimensions, columnId, exactConceptId, role, targetValue, period);
     if (!resolved) {
       console.warn(`[scrollToConcept] Concept not found: ${conceptName}`);
       return;
@@ -16331,7 +16388,16 @@ let JupiterDynamicForm = class extends LitElement {
     if (columnId) {
       targetColumnId = columnId;
     } else if (dimensions == null ? void 0 : dimensions.length) {
-      targetColumnId = this._findColumnByDimensions(columns, dimensions) ?? null;
+      targetColumnId = this._pickColumn(
+        targetSection,
+        targetConcept,
+        this._findColumnsByDimensions(columns, dimensions),
+        targetValue,
+        period,
+        hiddenColumnIds
+      ) ?? null;
+    } else if (period && columns.some((c2) => this._periodMatches(this._cellPeriod(targetSection, targetConcept, c2.id), period))) {
+      targetColumnId = this._pickColumn(targetSection, targetConcept, columns, targetValue, period, hiddenColumnIds) ?? null;
     } else if (!hasValueMatch) {
       targetColumnId = ((_c = columns.find((c2) => !(hiddenColumnIds == null ? void 0 : hiddenColumnIds.has(c2.id))) ?? columns[0]) == null ? void 0 : _c.id) ?? null;
     }
@@ -16356,7 +16422,8 @@ let JupiterDynamicForm = class extends LitElement {
         this._showColumn(targetSection.id, columnToShow);
       }
     }
-    console.log(`[scrollToConcept] targetColumnId=${targetColumnId} hasValueMatch=${hasValueMatch} targetValue=${targetValue}`);
+    const periodPinned = !!period && !!targetColumnId && this._periodMatches(this._cellPeriod(targetSection, targetConcept, targetColumnId), period);
+    console.log(`[scrollToConcept] targetColumnId=${targetColumnId} hasValueMatch=${hasValueMatch} targetValue=${targetValue} periodPinned=${periodPinned}`);
     this._conceptSearchText = conceptName.includes(":") ? conceptName.split(":").pop() : conceptName;
     this.requestUpdate();
     await this.updateComplete;
@@ -16417,7 +16484,7 @@ let JupiterDynamicForm = class extends LitElement {
         if (targetFieldEl)
           return;
         const columnMatch = targetColumnId ? fieldEl.conceptId === conceptId && fieldEl.columnId === targetColumnId : fieldEl.conceptId === conceptId;
-        const valueMatch = !hasValueMatch || valueMatchesTarget(fieldEl, targetValue);
+        const valueMatch = !hasValueMatch || periodPinned || valueMatchesTarget(fieldEl, targetValue);
         if (columnMatch) {
           phase1FieldCount++;
           console.log(`[scrollToConcept] Phase1 candidate: conceptId=${fieldEl.conceptId} columnId=${fieldEl.columnId} value=${fieldEl.value} scale=${getFieldScaleFactor(fieldEl)} valueMatch=${valueMatch}`);