jupiter-dynamic-forms 1.22.5 → 1.22.6

package/dist/index.mjs

@@ -2894,6 +2894,7 @@ function collectAllCandidates(formData) {
   return candidates;
 }
 function indexConceptTree(concept, conceptByQName, conceptById, conceptIdByQName, conceptIdByQNameHasChildren, childrenIndex) {
+  var _a;
   const info = {
     conceptId: concept.id,
     qname: concept.name,
@@ -2904,8 +2905,11 @@ function indexConceptTree(concept, conceptByQName, conceptById, conceptIdByQName
   (conceptByQName.get(concept.name) ?? conceptByQName.set(concept.name, []).get(concept.name)).push(info);
   const children = concept.children || [];
   const hasOwnChildren = children.length > 0;
+  const existingConceptId = conceptIdByQName.get(concept.name);
   const alreadyHasChildren = conceptIdByQNameHasChildren.get(concept.name) === true;
-  if (!conceptIdByQName.has(concept.name) || hasOwnChildren && !alreadyHasChildren) {
+  const existingEffectivePeriodRole = existingConceptId ? (_a = conceptById.get(existingConceptId)) == null ? void 0 : _a.effectivePeriodRole : void 0;
+  const shouldPreferPeriodEnd = hasOwnChildren && alreadyHasChildren && concept.effectivePeriodRole === "periodEndLabel" && existingEffectivePeriodRole === "periodStartLabel";
+  if (!conceptIdByQName.has(concept.name) || hasOwnChildren && !alreadyHasChildren || shouldPreferPeriodEnd) {
     conceptIdByQName.set(concept.name, concept.id);
     conceptIdByQNameHasChildren.set(concept.name, hasOwnChildren);
   }
@@ -3360,6 +3364,42 @@ function uncoveredExplicitDimensionAxisIds(variable, ctx) {
   }
   return axisIds;
 }
+function coveredExplicitDimensionAxisIds(variable, ctx) {
+  const axisIds = /* @__PURE__ */ new Set();
+  for (const filter2 of variable.filters) {
+    if (filter2.type !== "EXPLICIT_DIMENSION" || !filter2.cover)
+      continue;
+    const axisId = ctx.dimensionQNameToId.get(filter2.attributes["dimension.qname"] ?? "");
+    if (axisId)
+      axisIds.add(axisId);
+  }
+  return axisIds;
+}
+function axisIdsOnCandidates(candidates, ctx) {
+  const axisIds = /* @__PURE__ */ new Set();
+  candidates.forEach((candidate) => {
+    var _a;
+    const dimensionData = (_a = getColumn(ctx, candidate)) == null ? void 0 : _a.dimensionData;
+    if (!dimensionData)
+      return;
+    if (dimensionData.axisId)
+      axisIds.add(dimensionData.axisId);
+    (dimensionData.combinations || []).forEach((combo) => {
+      if (combo.axisId)
+        axisIds.add(combo.axisId);
+    });
+  });
+  return axisIds;
+}
+function impliedUncoveredAxisIds(variable, candidates, ctx) {
+  const axisIds = uncoveredExplicitDimensionAxisIds(variable, ctx);
+  const covered = coveredExplicitDimensionAxisIds(variable, ctx);
+  axisIdsOnCandidates(candidates, ctx).forEach((axisId) => {
+    if (!covered.has(axisId))
+      axisIds.add(axisId);
+  });
+  return axisIds;
+}
 function candidateMemberIdForAxis(ctx, candidate, axisId) {
   var _a;
   const column2 = getColumn(ctx, candidate);
@@ -3369,21 +3409,39 @@ function candidateMemberIdForAxis(ctx, candidate, axisId) {
     return column2.dimensionData.memberId;
   return (_a = (column2.dimensionData.combinations || []).find((combo) => combo.axisId === axisId)) == null ? void 0 : _a.memberId;
 }
+function coveredMemberIdForAxis(variable, axisId, ctx) {
+  for (const filter2 of variable.filters) {
+    if (filter2.type !== "EXPLICIT_DIMENSION" || !filter2.cover || filter2.complement)
+      continue;
+    if (filter2.attributes["member.axis"])
+      continue;
+    if (ctx.dimensionQNameToId.get(filter2.attributes["dimension.qname"] ?? "") !== axisId)
+      continue;
+    const memberId = ctx.memberQNameToId.get(filter2.attributes["member.qname"] ?? "");
+    if (memberId)
+      return memberId;
+  }
+  return void 0;
+}
 function findUncoveredAxisAnchor(variables, axisId, candidatesByName, ctx) {
   for (const variable of variables) {
     if (variable.bindAsSequence)
       continue;
-    if (!uncoveredExplicitDimensionAxisIds(variable, ctx).has(axisId))
-      continue;
     const candidates = candidatesByName.get(variable.name) || [];
-    const memberIds = new Set(
-      candidates.map((candidate) => candidateMemberIdForAxis(ctx, candidate, axisId)).filter((id) => id !== void 0)
-    );
-    if (memberIds.size === 1)
-      return { memberId: [...memberIds][0], variableName: variable.name, ambiguous: false };
-    const rootMembers = [...memberIds].filter((id) => !ctx.memberIdsWithParent.has(id));
-    if (rootMembers.length === 1)
-      return { memberId: rootMembers[0], variableName: variable.name, ambiguous: true };
+    if (impliedUncoveredAxisIds(variable, candidates, ctx).has(axisId)) {
+      const memberIds = new Set(
+        candidates.map((candidate) => candidateMemberIdForAxis(ctx, candidate, axisId)).filter((id) => id !== void 0)
+      );
+      if (memberIds.size === 1)
+        return { memberId: [...memberIds][0], variableName: variable.name, ambiguous: false };
+      const rootMembers = [...memberIds].filter((id) => !ctx.memberIdsWithParent.has(id));
+      if (rootMembers.length === 1)
+        return { memberId: rootMembers[0], variableName: variable.name, ambiguous: true };
+      continue;
+    }
+    const pinnedMemberId = coveredMemberIdForAxis(variable, axisId, ctx);
+    if (pinnedMemberId)
+      return { memberId: pinnedMemberId, variableName: variable.name, ambiguous: false };
   }
   return void 0;
 }
@@ -3392,13 +3450,15 @@ function computeAssertionNarrowedCandidatesByName(variables, ctx, implicitFilter
   variables.forEach((variable) => candidatesByName.set(variable.name, resolveNarrowedCandidates(variable, ctx, roleURI)));
   if (implicitFiltering) {
     const axisIds = /* @__PURE__ */ new Set();
-    variables.forEach((variable) => uncoveredExplicitDimensionAxisIds(variable, ctx).forEach((axisId) => axisIds.add(axisId)));
+    variables.forEach(
+      (variable) => impliedUncoveredAxisIds(variable, candidatesByName.get(variable.name) || [], ctx).forEach((axisId) => axisIds.add(axisId))
+    );
     axisIds.forEach((axisId) => {
       const anchor = findUncoveredAxisAnchor(variables, axisId, candidatesByName, ctx);
       if (!anchor)
         return;
       variables.forEach((variable) => {
-        const isNarrowableSequence = variable.bindAsSequence && uncoveredExplicitDimensionAxisIds(variable, ctx).has(axisId);
+        const isNarrowableSequence = variable.bindAsSequence && impliedUncoveredAxisIds(variable, candidatesByName.get(variable.name) || [], ctx).has(axisId);
         const isAmbiguousAnchorItself = anchor.ambiguous && variable.name === anchor.variableName;
         if (!isNarrowableSequence && !isAmbiguousAnchorItself)
           return;
@@ -5011,6 +5071,15 @@ let JupiterFormField = class extends LitElement {
     this._availableUnits = [];
     this._numericDraftValue = null;
     this._focused = false;
+    this._boundHandlePeriodPopupKeydown = this._handlePeriodPopupKeydown.bind(this);
+  }
+  connectedCallback() {
+    super.connectedCallback();
+    window.addEventListener("keydown", this._boundHandlePeriodPopupKeydown);
+  }
+  disconnectedCallback() {
+    window.removeEventListener("keydown", this._boundHandlePeriodPopupKeydown);
+    super.disconnectedCallback();
   }
   willUpdate(changedProperties) {
     var _a;
@@ -5936,18 +6005,14 @@ let JupiterFormField = class extends LitElement {
     }
     return html``;
   }
-  // JDF-118: the period popup is a plain Lit overlay, not a native <dialog>, so it doesn't get
-  // Escape-to-close for free the way the info/text dialogs do. Keydown on the overlay catches it
-  // as it bubbles up from whichever control inside the popup has focus.
   _handlePeriodPopupKeydown(e2) {
-    if (e2.key === "Escape") {
-      e2.stopPropagation();
+    if (this._showPeriodPopup && e2.key === "Escape") {
       this._closePeriodPopup();
     }
   }
   _renderPeriodPopup() {
     return html`
-      <div class="period-popup-overlay" @click="${this._handlePopupOverlayClick}" @keydown="${this._handlePeriodPopupKeydown}">
+      <div class="period-popup-overlay" @click="${this._handlePopupOverlayClick}">
         <div class="period-popup" @click="${(e2) => e2.stopPropagation()}">
           <div class="period-popup-header">
             <div class="period-popup-title">${I18n.t("field.editPeriod")}</div>
@@ -7671,6 +7736,7 @@ let JupiterAddColumnDialog = class extends LitElement {
     this._selectedType = "duration";
     this._selectedDimensions = /* @__PURE__ */ new Map();
     this._typedValueErrors = {};
+    this._boundHandleKeydown = this._handleKeydown.bind(this);
   }
   updated(changedProperties) {
     if (changedProperties.has("open") && this.open) {
@@ -7682,6 +7748,11 @@ let JupiterAddColumnDialog = class extends LitElement {
   connectedCallback() {
     super.connectedCallback();
     this._resetForm();
+    window.addEventListener("keydown", this._boundHandleKeydown);
+  }
+  disconnectedCallback() {
+    window.removeEventListener("keydown", this._boundHandleKeydown);
+    super.disconnectedCallback();
   }
   willUpdate(changedProperties) {
     super.willUpdate(changedProperties);
@@ -7689,6 +7760,11 @@ let JupiterAddColumnDialog = class extends LitElement {
       this._resetForm();
     }
   }
+  _handleKeydown(event) {
+    if (this.open && event.key === "Escape") {
+      this._handleCancel();
+    }
+  }
   _handleCancel() {
     this.open = false;
     this.dispatchEvent(new CustomEvent("dialog-cancel", { bubbles: true }));
@@ -10265,6 +10341,7 @@ let JupiterAdvancedFilter = class extends LitElement {
         return;
       }
       if (e2.key === "Escape") {
+        e2.stopPropagation();
         this._showSuggestions = false;
         this._activeSuggestionIndex = -1;
         return;
@@ -10579,11 +10656,22 @@ let JupiterFilterRolesDialog = class extends LitElement {
     this._showFactsOnly = false;
     this._conceptSearchText = "";
     this._collapsedRoles = /* @__PURE__ */ new Set();
+    this._boundHandleKeydown = this._handleKeydown.bind(this);
   }
   connectedCallback() {
     super.connectedCallback();
     this._initializeTempSelection();
     this._initializePeriodPreferences();
+    window.addEventListener("keydown", this._boundHandleKeydown);
+  }
+  disconnectedCallback() {
+    window.removeEventListener("keydown", this._boundHandleKeydown);
+    super.disconnectedCallback();
+  }
+  _handleKeydown(event) {
+    if (this.open && event.key === "Escape") {
+      this._handleCancel();
+    }
   }
   updated(changedProperties) {
     if (changedProperties.has("selectedRoleIds") || changedProperties.has("open")) {
@@ -13027,6 +13115,7 @@ let JupiterDynamicForm = class extends LitElement {
     this._showFactsOnly = false;
     this._conceptSearchText = "";
     this._lastFocusedFieldIdentity = null;
+    this._dimensionColumnDriftDiagnostics = [];
     this._periodPreferences = {};
     this._activeSidePanelRoleId = null;
     this._sidePanelSearchQuery = "";
@@ -15919,6 +16008,7 @@ let JupiterDynamicForm = class extends LitElement {
     });
     this._formData = { ...this._formData, ...restoredFormData };
     console.log(`🔄 Restored ${Object.keys(restoredFormData).length} concepts with data`);
+    this._diagnoseDimensionColumnDrift(formData);
     this._seedLegacyManuallyEditedTotals(restoredFormData);
     this._initializeGlobalDecimalsFromRoundingData();
     this._periodData = {
@@ -16415,6 +16505,70 @@ let JupiterDynamicForm = class extends LitElement {
     }
     return null;
   }
+  /**
+   * JDF-133 Phase 0: diagnostics-only. Walks the raw draft `formData` array `_restoreFromDraft`
+   * was given — not `restoredFormData`, which has already dropped each entry's own `dimension`
+   * string by the time this runs — and flags any entry whose saved `dimension` tag disagrees with
+   * what its `columnId` resolves to in the schema just rebuilt for this session. Read-only:
+   * populates `_dimensionColumnDriftDiagnostics` and logs, never writes to `_formData` or any
+   * other state a render or a later save could observe. Builds a one-time conceptId->section index
+   * (`_allSections` can run to hundreds of sections/thousands of concepts) rather than repeating
+   * `_findSectionForConcept`'s linear scan once per fact, so this stays cheap enough to run
+   * unconditionally on every restore without being itself a measurable behavior change.
+   */
+  _diagnoseDimensionColumnDrift(formData) {
+    var _a, _b, _c;
+    const sectionByConceptId = /* @__PURE__ */ new Map();
+    const indexConcepts = (concepts, section2) => {
+      concepts.forEach((concept) => {
+        var _a2;
+        sectionByConceptId.set(concept.id, section2);
+        if ((_a2 = concept.children) == null ? void 0 : _a2.length)
+          indexConcepts(concept.children, section2);
+      });
+    };
+    this._allSections.forEach((section2) => indexConcepts(section2.concepts, section2));
+    const drifted = [];
+    for (const entry of formData) {
+      const savedDimension = entry == null ? void 0 : entry.dimension;
+      if (!savedDimension || typeof savedDimension !== "string")
+        continue;
+      const section2 = sectionByConceptId.get(entry.conceptId);
+      const column2 = (_a = section2 == null ? void 0 : section2.columns) == null ? void 0 : _a.find((c2) => c2.id === entry.columnId);
+      const currentColumnDimension = (_b = column2 == null ? void 0 : column2.dimensionData) == null ? void 0 : _b.dimensionIdKey;
+      if (!currentColumnDimension)
+        continue;
+      if (!this._dimensionKeysMatch(savedDimension, currentColumnDimension)) {
+        drifted.push({
+          conceptId: entry.conceptId,
+          columnId: entry.columnId,
+          roleURI: ((_c = section2 == null ? void 0 : section2.metadata) == null ? void 0 : _c.roleURI) || (section2 == null ? void 0 : section2.id) || "unknown",
+          value: entry.value,
+          savedDimension,
+          currentColumnDimension
+        });
+      }
+    }
+    this._dimensionColumnDriftDiagnostics = drifted;
+    if (drifted.length > 0) {
+      console.warn(
+        `⚠️ [JDF-133] Detected ${drifted.length} fact(s) whose saved dimension tag no longer matches their column's current dimension — see form._dimensionColumnDriftDiagnostics. Diagnostics-only: nothing was changed or corrected.`
+      );
+      console.table(drifted);
+    }
+  }
+  /** Order-independent comparison of two `axisId|memberId::axisId|memberId...` dimensionIdKey-shaped strings. */
+  _dimensionKeysMatch(a2, b2) {
+    const setA = new Set(a2.split("::").filter(Boolean));
+    const setB = new Set(b2.split("::").filter(Boolean));
+    if (setA.size !== setB.size)
+      return false;
+    for (const item of setA) {
+      if (!setB.has(item))
+        return false;
+    }
+    return true;
+  }
   _findSectionForConcept(conceptId) {
     for (const section2 of this._allSections) {
       const concept = this._findConceptInSection(section2.concepts, conceptId);