Read the session, epoch and software blocks of either schema; tests for the merged shape

- ndi.dataset.dir, the bodies navigator and ndi.vintage.objectClass read
  through ndi.v2.blockOf, so an entity of type session/epoch/software is read
- TestHaleyWrite: value.data_type (was datum_type); fits found by leaf name
- TestDatasetMetadataHaley: a web resource's host is reported unrepresented
  when the schema has no hosted_by

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01FxKLA8Tbf9cpvDe7fuVeKf

Author: claude

src/ndi/+ndi/+dataset/dir.m

@@ -86,11 +86,12 @@
                     % a query-shaped grep does not find it -- the daqsystem
                     % lesson. A dataset can hold a session document of either
                     % vintage, so both spellings are accepted.
-                    session_blk = candidate_session_doc{1}.document_properties.session;
-                    if isfield(session_blk,'local_identifier')
-                        ref = session_blk.local_identifier;
-                    else
-                        ref = session_blk.reference;
+                    % and from 2026-10-08 the session may be an `entity` of
+                    % type session (ndi.v2.blockOf reads either block)
+                    p_session = candidate_session_doc{1}.document_properties;
+                    ref = ndi.v2.blockOf(p_session, 'session', 'local_identifier');
+                    if isempty(ref)
+                        ref = ndi.v2.blockOf(p_session, 'session', 'reference');
                     end
                     session_id = candidate_session_doc{1}.document_properties.base.session_id;
                     ndi_dataset_dir_obj.session = ndi.session.dir(ref,ndi_dataset_dir_obj.session.path,session_id);

src/ndi/+ndi/+file/+navigator/bodies.m

@@ -197,7 +197,7 @@
                 e = S.database_search(ndi.query('base.id', 'exact_string', referent, '') & ...
                     ndi.v2.isaQuery('epoch'));
                 if numel(e) == 1
-                    id = e{1}.document_properties.epoch.local_identifier;
+                    id = ndi.v2.blockOf(e{1}.document_properties, 'epoch', 'local_identifier');
                     return;
                 end
             end

src/ndi/+ndi/+vintage/objectClass.m

@@ -101,13 +101,14 @@
 end
 
 swProps = swDocs{1}.document_properties;
-if ~isfield(swProps, 'software') || ~isstruct(swProps.software) ...
-        || ~isfield(swProps.software, 'name') || isempty(swProps.software.name)
+% the `software` block, or from 2026-10-08 an `entity` of type software
+objClass = ndi.v2.blockOf(swProps, 'software', 'name');
+if isempty(objClass)
     error('NDI:vintage:softwareHasNoName', ...
         ['software document %s carries no `name`, and `name` is where ' ...
          'jSoftware puts the implementation class string'], swId);
 end
-objClass = swProps.software.name;
+objClass = char(objClass);
 end
 
 function v = assertionValue(ndi_document_obj, ndi_session_obj, label)

tests/+ndi/+unittest/+setup/+V2/TestDatasetMetadataHaley.m

@@ -211,6 +211,17 @@ function testUnrepresentedContentIsReportedNotDropped(testCase)
                 testCase.verifyEqual(nnz(isType), numel(testCase.Spec.formulations));
             end
             u = u(~isType);
+            % with one entity class a web resource's host has no relation
+            % (hosted_by retired, 2026-10-08): one row per resource naming one
+            isHost = strcmp({u.field}, 'host');
+            if ndi.setup.V2.mergedEntities()
+                wr = testCase.Spec.web_resources;
+                if isstruct(wr), wr = num2cell(wr); end
+                testCase.verifyEqual(nnz(isHost), sum(cellfun(@(x) isfield(x, 'host'), wr)));
+            else
+                testCase.verifyFalse(any(isHost));
+            end
+            u = u(~isHost);
             testCase.verifyEqual(unique({u.field}), {'vendor'});
             % one row per software entry that names a vendor (the analysis
             % package and macOS name none)

tests/+ndi/+unittest/+setup/+V2/TestHaleyWrite.m

@@ -489,7 +489,8 @@ function testGeometry(testCase)
             testCase.verifyEqual(edge(a, 'software_id'), ids('haley_analysis'));
             testCase.verifyEqual(edge(a, 'interpreter_id'), ids('matlab'));
             testCase.verifyEqual(edge(a, 'operating_system_id'), ids('macos'));
-            testCase.verifyEqual(a.value.datum_type, 'bool');
+            % `datum_type` was renamed `data_type` on 2026-10-08
+            testCase.verifyEqual(ndi.v2.blockOf(a, 'value', 'data_type', ndi.v2.blockOf(a, 'value', 'datum_type')), 'bool');
             mp = entries(a.interaction.method_parameters);
             testCase.verifyEqual(mp{1}.variable.name, 'arena diameter');
 
@@ -755,7 +756,7 @@ function testDensity(testCase)
             testCase.verifyEmpty(de.checks.encounterDisagrees, 'encounter.mat reproduces from the fits');
 
             dd = de.datasetDocuments;
-            dc = cellfun(@(d) d.document_class.class_name, dd, 'UniformOutput', false);
+            dc = cellfun(@ndi.v2.leafName, dd, 'UniformOutput', false);
             fits = dd(strcmp(dc, 'model_fit_calculation'));
             groups = dd(strcmp(dc, 'subject'));
             testCase.verifyNumElements(groups, 2);