@isrd-isi-edu/ermrestjs 2.5.0 → 2.6.1

package/src/models/reference/reference.ts

@@ -33,6 +33,7 @@ import {
   RelatedReference,
   BulkCreateForeignKeyObject,
 } from '@isrd-isi-edu/ermrestjs/src/models/reference';
+import ActiveListCondition from '@isrd-isi-edu/ermrestjs/src/models/active-list-condition';
 
 // services
 import ConfigService from '@isrd-isi-edu/ermrestjs/src/services/config';
@@ -41,7 +42,7 @@ import ErrorService from '@isrd-isi-edu/ermrestjs/src/services/error';
 import $log from '@isrd-isi-edu/ermrestjs/src/services/logger';
 
 // utils
-import { createPseudoColumn, isAllOutboundColumn, isRelatedColumn } from '@isrd-isi-edu/ermrestjs/src/utils/column-utils';
+import { createPseudoColumn, isRelatedColumn } from '@isrd-isi-edu/ermrestjs/src/utils/column-utils';
 import {
   computeReadPath,
   generateFacetColumns,
@@ -71,7 +72,6 @@ import { onload } from '@isrd-isi-edu/ermrestjs/js/setup/node';
 import {
   _getPagingValues,
   _getRecursiveAnnotationValue,
-  _isEntryContext,
   _isValidForeignKeyName,
   _isValidSortElement,
   compareColumnPositions,
@@ -81,6 +81,14 @@ import { _compressFacetObject, _sourceColumnHelpers } from '@isrd-isi-edu/ermres
 
 import type { CommentType } from '@isrd-isi-edu/ermrestjs/src/models/comment';
 import type { DisplayName } from '@isrd-isi-edu/ermrestjs/src/models/display-name';
+import {
+  ActiveListBuilder,
+  ActiveListRequestTypes,
+  type ActiveList,
+  type ActiveListRequest,
+  type ActiveListRelatedEntityRequest,
+} from '@isrd-isi-edu/ermrestjs/src/services/active-list';
+
 import { _exportHelpers, _getDefaultExportTemplate, _referenceExportOutput, validateExportTemplate } from '@isrd-isi-edu/ermrestjs/js/export';
 
 /**
@@ -117,7 +125,7 @@ import { _exportHelpers, _getDefaultExportTemplate, _referenceExportOutput, vali
  * @return Promise when resolved passes the
  * {@link Reference} object. If rejected, passes one of the ermrest errors
  */
-export const resolve = async (uri: string, contextHeaderParams?: any): Promise<Reference> => {
+export const resolve = async (uri: string, contextHeaderParams?: unknown): Promise<Reference> => {
   verify(uri, "'uri' must be specified");
   // make sure all the dependencies are loaded
   await onload();
@@ -148,22 +156,6 @@ export const _createPage = (reference: Reference, etag: string, data: any, hasPr
   return new Page(reference, etag, data, hasPrevious, hasNext);
 };
 
-type ActiveList = {
-  // TODO
-  // requests: {
-  //   column: ReferenceColumn;
-  //   objects: Array<{ index: number; column?: boolean; related?: boolean; inline?: boolean; citation?: boolean }>;
-  //   type: 'column' | 'related' | 'inline' | 'citation';
-  //   // TODO backwards compatibility:
-  //   inline?: boolean;
-  //   related?: boolean;
-  //   citation?: boolean;
-  // };
-  requests: any[];
-  allOutBounds: Array<ForeignKeyPseudoColumn | PseudoColumn>;
-  selfLinks: Array<KeyPseudoColumn>;
-};
-
 export type VisibleColumn =
   | ReferenceColumn
   | PseudoColumn
@@ -229,9 +221,9 @@ export class Reference {
   private _canUseTRS?: boolean;
   private _canUseTCRS?: boolean;
   private _readPath?: string;
-  private _readAttributeGroupPathProps_cached?: any;
+  private _readAttributeGroupPathProps_cached?: unknown;
   private _display?: ReferenceDisplay;
-  private _defaultExportTemplate?: any;
+  private _defaultExportTemplate?: unknown;
   private _csvDownloadLink?: string | null;
   private _searchColumns?: Array<VisibleColumn> | false;
   private _cascadingDeletedItems?: Array<Table | RelatedReference | Reference>;
@@ -239,7 +231,7 @@ export class Reference {
   private _related?: Array<RelatedReference>;
   private _facetColumns?: Array<FacetColumn>;
   private _facetColumnsStructure?: Array<number | FacetGroup>;
-  private _activeList?: any;
+  private _activeList?: ActiveList;
   private _citation?: Citation | null;
   private _googleDatasetMetadata?: GoogleDatasetMetadata | null;
 
@@ -328,6 +320,10 @@ export class Reference {
     return this._pseudoColumn;
   }
 
+  /**
+   * The column-directive that is used for creating this reference.
+   * Allows access to props defined on the column-directive (display props, condition, waitFor, etc)
+   */
   setPseudoColumn(value: VisibleColumn) {
     this._pseudoColumn = value;
   }
@@ -604,7 +600,7 @@ export class Reference {
   /**
    * Generate the list of columns for this reference based on context and annotations
    */
-  generateColumnsList(tuple?: Tuple, columnsList?: any[], dontChangeReference?: boolean, skipLog?: boolean): ReferenceColumn[] {
+  generateColumnsList(tuple?: Tuple, columnsList?: Array<unknown>, dontChangeReference?: boolean, skipLog?: boolean): ReferenceColumn[] {
     const resultColumns = generateColumnsList(this, tuple, columnsList, skipLog);
 
     if (!dontChangeReference) {
@@ -849,7 +845,7 @@ export class Reference {
     if (this._activeList === undefined) {
       this.generateActiveList();
     }
-    return this._activeList;
+    return this._activeList!;
   }
 
   /**
@@ -878,182 +874,80 @@ export class Reference {
    * @private
    */
   generateActiveList(tuple?: Tuple): ActiveList {
-    // VARIABLES:
-    const allOutBounds: Array<PseudoColumn | ForeignKeyPseudoColumn> = [];
-    const requests: any[] = [];
-    const selfLinks: Array<KeyPseudoColumn> = [];
-    const consideredUniqueFiltered: { [key: string]: number } = {};
-    const consideredSets: { [key: string]: number } = {};
-    const consideredOutbounds: { [key: string]: boolean } = {};
-    const consideredAggregates: { [key: string]: number } = {};
-    const consideredSelfLinks: { [key: string]: boolean } = {};
-    const consideredEntryWaitFors: { [key: string]: number } = {};
-
-    const sds = this.table.sourceDefinitions;
-
-    // in detailed, we want related and citation
     const isDetailed = this._context === _contexts.DETAILED;
-    // in entry, don't include waitfors in the activelist used for loading the page.
-    // the waitfors will be used in chaise instead prior to submission.
-    const isEntry = _isEntryContext(this._context);
-
-    const COLUMN_TYPE = 'column';
-    const RELATED_TYPE = 'related';
-    const CITATION_TYPE = 'citation';
-    const INLINE_TYPE = 'inline';
-
-    // FUNCTIONS:
-    const hasAggregate = (col: VisibleColumn) => {
-      return col.hasWaitForAggregate || ((col as PseudoColumn).isPathColumn && (col as PseudoColumn).hasAggregate);
-    };
-
-    // col: the column that we need its data
-    // isWaitFor: whether it was part of waitFor or just visible
-    // type: where in the page it belongs to
-    // index: the container index (column index, or related index) (optional)
-    const addColToActiveList = (col: VisibleColumn, isWaitFor: boolean, type: string, index?: number) => {
-      const obj: any = { isWaitFor: isWaitFor };
-
-      // add the type
-      obj[type] = true;
-
-      // add index if available (not available in citation)
-      if (Number.isInteger(index)) {
-        obj.index = index;
-      }
-
-      if (isWaitFor && isEntry) {
-        if (col.name in consideredEntryWaitFors) {
-          requests[consideredEntryWaitFors[col.name]].objects.push(obj);
-          return;
-        }
-        consideredEntryWaitFors[col.name] = requests.length;
-        requests.push({ firstOutbound: true, column: col, objects: [obj] });
-        return;
-      }
-
-      // unique filtered
-      // TODO FILTER_IN_SOURCE chaise should use this type of column as well?
-      // TODO FILTER_IN_SOURCE should be added to documentation as well
-      if ((col as PseudoColumn).sourceObjectWrapper?.isUniqueFiltered) {
-        // duplicate
-        if (col.name in consideredUniqueFiltered) {
-          requests[consideredUniqueFiltered[col.name]].objects.push(obj);
-          return;
-        }
-
-        // new
-        consideredUniqueFiltered[col.name] = requests.length;
-        requests.push({ entity: true, column: col, objects: [obj] });
-        return;
-      }
-
-      // aggregates
-      if ((col as PseudoColumn).isPathColumn && (col as PseudoColumn).hasAggregate) {
-        // duplicate
-        if (col.name in consideredAggregates) {
-          requests[consideredAggregates[col.name]].objects.push(obj);
-          return;
-        }
-
-        // new
-        consideredAggregates[col.name] = requests.length;
-        requests.push({ aggregate: true, column: col, objects: [obj] });
-        return;
-      }
+    const builder = new ActiveListBuilder(this, tuple, isDetailed);
 
-      //entitysets
-      if (isRelatedColumn(col)) {
-        if (!isDetailed) {
-          return; // only acceptable in detailed
-        }
-
-        if (col.name in consideredSets) {
-          requests[consideredSets[col.name]].objects.push(obj);
-          return;
-        }
-
-        consideredSets[col.name] = requests.length;
-        requests.push({ entityset: true, column: col, objects: [obj] });
-      }
-
-      // all outbounds
-      if (isAllOutboundColumn(col)) {
-        if (col.name in consideredOutbounds) return;
-        consideredOutbounds[col.name] = true;
-        allOutBounds.push(col as PseudoColumn | ForeignKeyPseudoColumn);
-      }
-
-      // self-links
-      if ((col as KeyPseudoColumn).isKey) {
-        if (col.name in consideredSelfLinks) return;
-        consideredSelfLinks[col.name] = true;
-        selfLinks.push(col as KeyPseudoColumn);
-      }
-    };
-
-    const addInlineColumn = (col: VisibleColumn, i: number) => {
-      if (isRelatedColumn(col)) {
-        requests.push({ inline: true, index: i });
-      } else {
-        addColToActiveList(col, false, COLUMN_TYPE, i);
-      }
-
-      col.waitFor.forEach((wf: any) => {
-        addColToActiveList(wf, true, isRelatedColumn(col) ? INLINE_TYPE : COLUMN_TYPE, i);
-      });
+    /**
+     * Helper for the condition branch shared across the columns / related loops.
+     * Returns true if the column was routed through a conditional group (so the
+     * caller should NOT add the column directly), false if there was no
+     * applicable condition (caller adds normally).
+     */
+    const tryCondition = (
+      condition: ActiveListCondition | null | undefined,
+      conditionedItem: { column?: boolean; inline?: boolean; related?: boolean; index: number },
+      addToDeps: (deps: Array<ActiveListRequest | ActiveListRelatedEntityRequest>) => void,
+    ): boolean => {
+      if (!isDetailed || !condition) return false;
+      builder.processConditionedItem(condition, conditionedItem, addToDeps);
+      return true;
     };
 
-    // THE CODE STARTS HERE:
     const columns = this.generateColumnsList(tuple);
 
     // citation
     if (isDetailed && this.citation) {
       this.citation.waitFor.forEach((col) => {
-        addColToActiveList(col, true, CITATION_TYPE);
+        builder.addCol(col, true, ActiveListRequestTypes.CITATION);
       });
     }
 
     // columns without aggregate
     columns.forEach((col, i: number) => {
-      if (!hasAggregate(col)) {
-        addInlineColumn(col, i);
-      }
+      if (builder.hasAggregate(col)) return;
+      const rc = col.resolvedCondition;
+      const item = isRelatedColumn(col) ? { inline: true, index: i } : { column: true, index: i };
+      if (tryCondition(rc, item, (deps) => builder.addInlineToDependent(deps, col, i))) return;
+      builder.addInline(col, i);
     });
 
     // columns with aggregate
     columns.forEach((col, i: number) => {
-      if (hasAggregate(col)) {
-        addInlineColumn(col, i);
-      }
+      if (!builder.hasAggregate(col)) return;
+      const rc = col.resolvedCondition;
+      const item = isRelatedColumn(col) ? { inline: true, index: i } : { column: true, index: i };
+      if (tryCondition(rc, item, (deps) => builder.addInlineToDependent(deps, col, i))) return;
+      builder.addInline(col, i);
     });
 
     // related tables
     if (isDetailed) {
       this.generateRelatedList(tuple).forEach((rel, i) => {
-        requests.push({ related: true, index: i });
-
-        if (rel.pseudoColumn) {
-          rel.pseudoColumn.waitFor.forEach((wf) => {
-            addColToActiveList(wf, true, RELATED_TYPE, i);
+        const rc = rel.pseudoColumn?.resolvedCondition;
+        /**
+         * if there's a condition, we have to capture the requests generated for the related entity as its dependencies.
+         * So when the condition is evaludated, we can decide whether to run those requests or not.
+         */
+        const addRelatedToDeps = (deps: Array<ActiveListRequest | ActiveListRelatedEntityRequest>) => {
+          deps.push({ related: true, index: i });
+          rel.pseudoColumn?.waitFor.forEach((wf) => {
+            builder.addColToDependent(deps, wf, true, ActiveListRequestTypes.RELATED, i);
           });
-        }
+        };
+        if (tryCondition(rc, { related: true, index: i }, addRelatedToDeps)) return;
+        builder.requests.push({ related: true, index: i });
+        rel.pseudoColumn?.waitFor.forEach((wf) => {
+          builder.addCol(wf, true, ActiveListRequestTypes.RELATED, i);
+        });
       });
     }
 
-    //fkeys
-    sds.fkeys.forEach((fk) => {
-      if (fk.name in consideredOutbounds) return;
-      consideredOutbounds[fk.name] = true;
-      allOutBounds.push(new ForeignKeyPseudoColumn(this, fk));
+    // fkeys
+    this.table.sourceDefinitions.fkeys.forEach((fk) => {
+      builder.addAllOutBound(new ForeignKeyPseudoColumn(this, fk));
     });
 
-    this._activeList = {
-      requests: requests,
-      allOutBounds: allOutBounds,
-      selfLinks: selfLinks,
-    };
-
+    this._activeList = builder.build();
     return this._activeList;
   }
 
@@ -1074,7 +968,7 @@ export class Reference {
   }
 
   /**
-   * Will return the expor templates that are available for this reference.
+   * Will return the export templates that are available for this reference.
    * It will validate the templates that are defined in annotations.
    * If its `detailed` context and annotation was missing,
    * it will return the default export template.
@@ -1088,6 +982,7 @@ export class Reference {
 
     // annotation is missing
     if (!Array.isArray(templates)) {
+      // eslint-disable-next-line eqeqeq
       const canUseDefault = useDefault && this.context === _contexts.DETAILED && this.defaultExportTemplate != null;
 
       return canUseDefault ? [this.defaultExportTemplate] : [];
@@ -1128,7 +1023,7 @@ export class Reference {
    */
   getColumnByName(name: string): VisibleColumn {
     // given an array of columns, find column by name
-    const findCol = (list: any[]): any => {
+    const findCol = (list: Array<VisibleColumn | Column>): VisibleColumn | Column | false => {
       for (let i = 0; i < list.length; i++) {
         if (list[i].name === name) {
           return list[i];
@@ -1140,13 +1035,13 @@ export class Reference {
     // search in visible columns
     let c = findCol(this.columns);
     if (c) {
-      return c;
+      return c as VisibleColumn;
     }
 
     // search in table columns
     c = findCol(this.table.columns.all());
     if (c) {
-      return new ReferenceColumn(this, [c]);
+      return new ReferenceColumn(this, [c as Column]);
     }
 
     // backward compatibility, look at fks and keys using constraint name

package/src/models/reference-column/asset-pseudo-column.ts

@@ -232,7 +232,7 @@ export class AssetPseudoColumn extends ReferenceColumn {
       return { isHTML: false, value: data[this._baseCol.name], unformatted: data[this._baseCol.name] };
     }
 
-    if (this.hasWaitFor && !options.skipWaitFor) {
+    if ((this.hasWaitFor || this.hasCondition) && !options.skipWaitFor) {
       return nullValue;
     }
 

package/src/models/reference-column/foreign-key-pseudo-column.ts

@@ -14,6 +14,7 @@ import { isObjectAndNotNull, isStringAndNotEmpty, isObjectAndKeyExists } from '@
 import { fixedEncodeURIComponent } from '@isrd-isi-edu/ermrestjs/src/utils/value-utils';
 import { renderMarkdown } from '@isrd-isi-edu/ermrestjs/src/utils/markdown-utils';
 import { _annotations, _foreignKeyInputModes } from '@isrd-isi-edu/ermrestjs/src/utils/constants';
+import { buildSelfTemplateVariables } from '@isrd-isi-edu/ermrestjs/src/utils/template-utils';
 import { Reference } from '@isrd-isi-edu/ermrestjs/src/models/reference';
 
 // legacy
@@ -323,8 +324,8 @@ export class ForeignKeyPseudoColumn extends ReferenceColumn {
       unformatted: this._getNullValue(context!),
     };
 
-    // if there's wait_for, this should return null.
-    if (this.hasWaitFor && !options.skipWaitFor) {
+    // if there's wait_for or async condition, this should return null.
+    if ((this.hasWaitFor || this.hasCondition) && !options.skipWaitFor) {
       return nullValue;
     }
 
@@ -347,12 +348,7 @@ export class ForeignKeyPseudoColumn extends ReferenceColumn {
     const context = this._context;
 
     if (this.display.sourceMarkdownPattern) {
-      let selfTemplateVariables = {};
-      if (mainTuple.linkedData[this.name]) {
-        selfTemplateVariables = {
-          $self: _getRowTemplateVariables(this.table, context, mainTuple.linkedData[this.name]),
-        };
-      }
+      const selfTemplateVariables = buildSelfTemplateVariables(this, mainTuple, columnValue);
 
       const keyValues = {};
       Object.assign(keyValues, templateVariables, selfTemplateVariables);

package/src/models/reference-column/key-pseudo-column.ts

@@ -8,6 +8,7 @@ import { Reference, Tuple } from '@isrd-isi-edu/ermrestjs/src/models/reference';
 // utils
 import { renderMarkdown } from '@isrd-isi-edu/ermrestjs/src/utils/markdown-utils';
 import { isStringAndNotEmpty } from '@isrd-isi-edu/ermrestjs/src/utils/type-utils';
+import { buildSelfTemplateVariables } from '@isrd-isi-edu/ermrestjs/src/utils/template-utils';
 
 // legacy
 import { Key, Table } from '@isrd-isi-edu/ermrestjs/js/core';
@@ -95,7 +96,7 @@ export class KeyPseudoColumn extends ReferenceColumn {
       unformatted: this._getNullValue(context!),
     };
 
-    if (this.hasWaitFor && !options.skipWaitFor) {
+    if ((this.hasWaitFor || this.hasCondition) && !options.skipWaitFor) {
       return nullValue;
     }
 
@@ -118,9 +119,7 @@ export class KeyPseudoColumn extends ReferenceColumn {
     const context = this._context;
 
     if (this.display.sourceMarkdownPattern) {
-      const selfTemplateVariables = {
-        $self: _getRowTemplateVariables(this.table, context, mainTuple.data),
-      };
+      const selfTemplateVariables = buildSelfTemplateVariables(this, mainTuple, columnValue);
 
       const keyValues = {};
       Object.assign(keyValues, templateVariables, selfTemplateVariables);

package/src/models/reference-column/pseudo-column.ts

@@ -15,6 +15,7 @@ import { renderMarkdown } from '@isrd-isi-edu/ermrestjs/src/utils/markdown-utils
 import { isDefinedAndNotNull, isObject, isObjectAndNotNull, isStringAndNotEmpty, verify } from '@isrd-isi-edu/ermrestjs/src/utils/type-utils';
 import { fixedEncodeURIComponent } from '@isrd-isi-edu/ermrestjs/src/utils/value-utils';
 import { processAggregateValue } from '@isrd-isi-edu/ermrestjs/src/utils/column-utils';
+import { buildSelfTemplateVariables } from '@isrd-isi-edu/ermrestjs/src/utils/template-utils';
 import {
   _pseudoColAggregateFns,
   _pseudoColEntityAggregateFns,
@@ -148,7 +149,7 @@ export class PseudoColumn extends ReferenceColumn {
       return nullValue;
     }
 
-    if (this.hasWaitFor && !options.skipWaitFor) {
+    if ((this.hasWaitFor || this.hasCondition) && !options.skipWaitFor) {
       return nullValue;
     }
 
@@ -193,42 +194,10 @@ export class PseudoColumn extends ReferenceColumn {
   }
 
   sourceFormatPresentation(templateVariables: any, columnValue: any, mainTuple: Tuple) {
-    const baseCol = this.baseColumn;
     const context = this._context;
-    let selfTemplateVariables: any = {};
 
     if (this.display.sourceMarkdownPattern) {
-      // for aggregate, the columnValue has the value precomputed
-      if (this.hasAggregate && columnValue) {
-        selfTemplateVariables = columnValue.templateVariables;
-      }
-      // all-outbound paths
-      else if (this.hasPath && this.isUnique) {
-        // use the linked data if exists
-        if (!mainTuple.linkedData[this.name]) {
-          selfTemplateVariables = {};
-        }
-        // scalar default
-        else if (!this.isEntityMode) {
-          selfTemplateVariables = {
-            $self: baseCol.formatvalue(mainTuple.linkedData[this.name][baseCol.name], context),
-            $_self: mainTuple.linkedData[this.name][baseCol.name],
-          };
-        }
-        // entity default
-        else {
-          selfTemplateVariables = {
-            $self: _getRowTemplateVariables(this.table, context, mainTuple.linkedData[this.name]),
-          };
-        }
-      }
-      // any other paths
-      else if (baseCol) {
-        selfTemplateVariables = {
-          $self: baseCol.formatvalue(mainTuple.data[baseCol.name], context),
-          $_self: mainTuple.data[baseCol.name],
-        };
-      }
+      const selfTemplateVariables = buildSelfTemplateVariables(this, mainTuple, columnValue);
 
       const keyValues = {};
       Object.assign(keyValues, templateVariables, selfTemplateVariables);

package/src/models/reference-column/reference-column.ts

@@ -5,13 +5,17 @@ import { CommentType } from '@isrd-isi-edu/ermrestjs/src/models/comment';
 import { DisplayName } from '@isrd-isi-edu/ermrestjs/src/models/display-name';
 import { ColumnAggregateFn, ColumnGroupAggregateFn } from '@isrd-isi-edu/ermrestjs/src/models/reference-column';
 import { Tuple, Reference } from '@isrd-isi-edu/ermrestjs/src/models/reference';
+import type { ConditionDefinition } from '@isrd-isi-edu/ermrestjs/src/models/table-source-definitions';
 
 // services
+import $log from '@isrd-isi-edu/ermrestjs/src/services/logger';
 
 // utils
 import { renderMarkdown } from '@isrd-isi-edu/ermrestjs/src/utils/markdown-utils';
 import { isObjectAndKeyExists, isObjectAndNotNull, isStringAndNotEmpty } from '@isrd-isi-edu/ermrestjs/src/utils/type-utils';
 import { _annotations, _contexts } from '@isrd-isi-edu/ermrestjs/src/utils/constants';
+import { buildSelfTemplateVariables } from '@isrd-isi-edu/ermrestjs/src/utils/template-utils';
+import ActiveListCondition from '@isrd-isi-edu/ermrestjs/src/models/active-list-condition';
 
 // legacy
 import { Column, Table, Type } from '@isrd-isi-edu/ermrestjs/js/core';
@@ -122,6 +126,8 @@ export class ReferenceColumn {
   protected _hasWaitFor?: boolean;
   protected _hasWaitForAggregate?: boolean;
   protected _waitFor?: ReferenceColumn[];
+  protected _hasCondition?: boolean;
+  protected _resolvedCondition?: ActiveListCondition | null;
   /**
    * the reference that this column is defined on
    */
@@ -441,6 +447,69 @@ export class ReferenceColumn {
     return this._waitFor!;
   }
 
+  /**
+   * Whether the column has an async condition that requires a secondary request.
+   * Only true in detailed context for conditions whose source has an inbound path or aggregate.
+   */
+  get hasCondition(): boolean {
+    if (this._hasCondition === undefined) {
+      // triggers resolution
+      void this.resolvedCondition;
+    }
+    return this._hasCondition!;
+  }
+
+  /**
+   * The resolved condition for this column, or null if no condition or not applicable.
+   */
+  get resolvedCondition(): ActiveListCondition | null {
+    if (this._resolvedCondition === undefined) {
+      this._resolvedCondition = this._resolveCondition();
+      this._hasCondition = this._resolvedCondition?.isAsync ?? false;
+    }
+    return this._resolvedCondition;
+  }
+
+  /**
+   * Resolve the condition definition and source for this column.
+   */
+  protected _resolveCondition(): ActiveListCondition | null {
+    // only applicable in detailed context
+    if (this._context !== _contexts.DETAILED) {
+      return null;
+    }
+
+    if (!this.sourceObjectWrapper) {
+      return null;
+    }
+
+    // get condition def: inline condition or condition_key
+    let condDef: ConditionDefinition | undefined, condKey: string | undefined;
+    const sourceObject = this.sourceObjectWrapper.sourceObject;
+    if (isStringAndNotEmpty(sourceObject.condition_key)) {
+      condKey = sourceObject.condition_key as string;
+      condDef = this._currentTable.sourceDefinitions.getCondition(condKey);
+      if (!condDef) {
+        $log.info('condition_key `' + condKey + '` not found in source-definitions conditions.');
+        return null;
+      }
+    } else if (isObjectAndNotNull(sourceObject.condition)) {
+      condDef = sourceObject.condition as Record<string, unknown>;
+    } else if (!condDef) {
+      return null;
+    }
+
+    let condition: ActiveListCondition;
+    try {
+      condition = new ActiveListCondition(condDef, this._baseReference, this._mainTuple, condKey);
+    } catch (e: unknown) {
+      $log.warn(e instanceof Error ? e.message : String(e));
+      return null;
+    }
+
+    return condition;
+  }
+
   /**
    * Formats a value corresponding to this reference-column definition.
    */
@@ -465,7 +534,13 @@ export class ReferenceColumn {
       context = this._context;
     }
 
-    // if there's wait_for, this should return null.
+    // wait_for placeholder: the column depends on data that isn't ready, so
+    // return a null placeholder. Note: hasCondition is intentionally NOT in
+    // this check — the column's value is independent of the condition; the
+    // condition only controls *visibility* (chaise's `conditionHide` flag).
+    // Returning null here for an async-conditioned local column would
+    // permanently blank it, since there's no secondary fetch to flip the
+    // value back in chaise.
     if (this.hasWaitFor && !options.skipWaitFor) {
       return {
         isHTML: false,
@@ -608,17 +683,13 @@ export class ReferenceColumn {
   }
 
   sourceFormatPresentation(templateVariables: any, columnValue: any, mainTuple: Tuple): any {
-    const baseCol = this.baseColumns[0];
     const context = this._context;
 
     if (this.display.sourceMarkdownPattern) {
       let selfTemplateVariables = {};
-      // children pseudo-column have already set the $self and $_self
-      if (!this.isPseudo && baseCol) {
-        selfTemplateVariables = {
-          $self: baseCol.formatvalue(mainTuple.data[baseCol.name], context),
-          $_self: mainTuple.data[baseCol.name],
-        };
+      // children pseudo-columns build $self in their own override via buildSelfTemplateVariables
+      if (!this.isPseudo) {
+        selfTemplateVariables = buildSelfTemplateVariables(this, mainTuple, columnValue);
       }
 
       const keyValues = {};

package/src/models/source-object-wrapper.ts

@@ -77,7 +77,7 @@ export type InputIframePropsType = {
  */
 export default class SourceObjectWrapper {
   /**
-   * the source object
+   * the raw source object (column-directive object)
    */
   public sourceObject: Record<string, unknown>;
   /**