@api-client/core 0.17.0 → 0.17.1

package/data/models/example-generator-api.json

@@ -42062,16 +42062,16 @@
 "@id": "#209"
 },
 {
-"@id": "#200"
+"@id": "#194"
 },
 {
 "@id": "#191"
 },
 {
-"@id": "#194"
+"@id": "#197"
 },
 {
-"@id": "#197"
+"@id": "#200"
 },
 {
 "@id": "#203"
@@ -42816,10 +42816,10 @@
 "@id": "#213"
 },
 {
-"@id": "#216"
+"@id": "#219"
 },
 {
-"@id": "#219"
+"@id": "#216"
 }
 ],
 "doc:root": false,
@@ -43457,7 +43457,7 @@
 "doc:ExternalDomainElement",
 "doc:DomainElement"
 ],
-"doc:raw": "code: '5'\ndescription: 'Limited company'\n",
+"doc:raw": "countryCode: \"BE\"\ngraydonEnterpriseId: 1057155523\nregistrationId: \"0422319093\"\nvatNumber: \"BE0422319093\"\ngraydonCompanyId: \"0422319093\"\nisBranchOffice: false\n",
 "core:mediaType": "application/yaml",
 "sourcemaps:sources": [
 {
@@ -43478,7 +43478,7 @@
 "doc:ExternalDomainElement",
 "doc:DomainElement"
 ],
-"doc:raw": "class: '3'\ndescription: '150 - 300'\nnumberOfFte: 5500\nnumberOfEmployees: 5232\n",
+"doc:raw": "code: '5'\ndescription: 'Limited company'\n",
 "core:mediaType": "application/yaml",
 "sourcemaps:sources": [
 {
@@ -43499,7 +43499,7 @@
 "doc:ExternalDomainElement",
 "doc:DomainElement"
 ],
-"doc:raw": "countryCode: \"BE\"\ngraydonEnterpriseId: 1057155523\nregistrationId: \"0422319093\"\nvatNumber: \"BE0422319093\"\ngraydonCompanyId: \"0422319093\"\nisBranchOffice: false\n",
+"doc:raw": "class: '3'\ndescription: '150 - 300'\nnumberOfFte: 5500\nnumberOfEmployees: 5232\n",
 "core:mediaType": "application/yaml",
 "sourcemaps:sources": [
 {
@@ -44274,7 +44274,7 @@
 "doc:ExternalDomainElement",
 "doc:DomainElement"
 ],
-"doc:raw": "-\n  type: 'GENERAL'\n  value: 'info@company.be'\n-\n  type: 'IT_DEPT'\n  value: 'it-service@company.be'\n",
+"doc:raw": "type: \"GENERAL\"\nvalue: \"www.company.be\"\n",
 "core:mediaType": "application/yaml",
 "sourcemaps:sources": [
 {
@@ -44295,7 +44295,7 @@
 "doc:ExternalDomainElement",
 "doc:DomainElement"
 ],
-"doc:raw": "type: \"GENERAL\"\nvalue: \"www.company.be\"\n",
+"doc:raw": "-\n  type: 'GENERAL'\n  value: 'info@company.be'\n-\n  type: 'IT_DEPT'\n  value: 'it-service@company.be'\n",
 "core:mediaType": "application/yaml",
 "sourcemaps:sources": [
 {
@@ -44761,17 +44761,17 @@
 {
 "@id": "#196/source-map/lexical/element_0",
 "sourcemaps:element": "amf://id#196",
-"sourcemaps:value": "[(1,0)-(3,0)]"
+"sourcemaps:value": "[(1,0)-(7,0)]"
 },
 {
 "@id": "#199/source-map/lexical/element_0",
 "sourcemaps:element": "amf://id#199",
-"sourcemaps:value": "[(1,0)-(5,0)]"
+"sourcemaps:value": "[(1,0)-(3,0)]"
 },
 {
 "@id": "#202/source-map/lexical/element_0",
 "sourcemaps:element": "amf://id#202",
-"sourcemaps:value": "[(1,0)-(7,0)]"
+"sourcemaps:value": "[(1,0)-(5,0)]"
 },
 {
 "@id": "#205/source-map/lexical/element_0",
@@ -45126,12 +45126,12 @@
 {
 "@id": "#218/source-map/lexical/element_0",
 "sourcemaps:element": "amf://id#218",
-"sourcemaps:value": "[(1,0)-(7,0)]"
+"sourcemaps:value": "[(1,0)-(3,0)]"
 },
 {
 "@id": "#221/source-map/lexical/element_0",
 "sourcemaps:element": "amf://id#221",
-"sourcemaps:value": "[(1,0)-(3,0)]"
+"sourcemaps:value": "[(1,0)-(7,0)]"
 },
 {
 "@id": "#338/source-map/synthesized-field/element_1",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@api-client/core",
   "description": "The API Client's core client library. Works in NodeJS and in a ES enabled browser.",
-  "version": "0.17.0",
+  "version": "0.17.1",
   "license": "Apache-2.0",
   "exports": {
     "./browser.js": {

package/src/modeling/GraphUtils.ts

@@ -1,5 +1,6 @@
 import type { Graph } from '@api-client/graph/graph/Graph.js'
 import type { DomainGraphEdge, DomainGraphNodeType } from './types.js'
+import { DomainAssociationKind } from '../models/kinds.js'
 
 /**
  * Recursively removes a node and all its children from the graph.
@@ -9,18 +10,28 @@ export function removeGraphNode(graph: Graph<unknown, DomainGraphNodeType, Domai
   if (!graph.hasNode(key)) {
     return
   }
+  const node = graph.node(key)
+  if (!node) {
+    return
+  }
+  if (node.kind === DomainAssociationKind) {
+    // If the node is an association, remove the association from the graph,
+    // but do not follow its children, as it would remove entities associated with it.
+    graph.removeNode(key)
+    return
+  }
   for (const child of graph.children(key)) {
     removeGraphNode(graph, child)
   }
+  // Remove all edges from the node.
   for (const edge of graph.outEdges(key)) {
     const label = graph.edge(edge)
     if (!label) {
       continue
     }
-    // While associations should be associated with the entity through an edge,
-    // I am still on a fence about properties being the same...
-    // We won't be reusing properties within a domain model.
-    if (['property', 'association'].includes(label.type)) {
+    if (label.type === 'association') {
+      removeGraphNode(graph, edge.w)
+    } else if (label.type === 'property') {
       removeGraphNode(graph, edge.w)
     }
   }

package/tests/unit/modeling/api_model.spec.ts

@@ -8,7 +8,10 @@ import {
   type ExposedEntity,
 } from '../../../src/index.js'
 
-test.group('ApiModel.createSchema()', () => {
+test.group('ApiModel.createSchema()', (g) => {
+  g.tests.forEach((test) => {
+    test.tags(['@modeling', '@api', '@schema'])
+  })
   test('creates a schema with default values', ({ assert }) => {
     const schema = ApiModel.createSchema()
     assert.equal(schema.kind, ApiModelKind)
@@ -64,7 +67,11 @@ test.group('ApiModel.createSchema()', () => {
   })
 })
 
-test.group('ApiModel.constructor()', () => {
+test.group('ApiModel.constructor()', (g) => {
+  g.tests.forEach((test) => {
+    test.tags(['@modeling', '@api', '@creation'])
+  })
+
   test('creates an instance with default values', ({ assert }) => {
     const model = new ApiModel()
     assert.equal(model.kind, ApiModelKind)
@@ -133,7 +140,10 @@ test.group('ApiModel.constructor()', () => {
   })
 })
 
-test.group('ApiModel.toJSON()', () => {
+test.group('ApiModel.toJSON()', (g) => {
+  g.tests.forEach((test) => {
+    test.tags(['@modeling', '@api', '@serialization'])
+  })
   test('serializes default values', ({ assert }) => {
     const model = new ApiModel()
     const json = model.toJSON()
@@ -181,7 +191,10 @@ test.group('ApiModel.toJSON()', () => {
   })
 })
 
-test.group('ApiModel.exposeEntity()', () => {
+test.group('ApiModel.exposeEntity()', (g) => {
+  g.tests.forEach((test) => {
+    test.tags(['@modeling', '@api'])
+  })
   test('exposes a new entity', ({ assert }) => {
     const model = new ApiModel()
     const entityKey = 'new-entity'
@@ -228,7 +241,10 @@ test.group('ApiModel.exposeEntity()', () => {
   })
 })
 
-test.group('ApiModel.removeEntity()', () => {
+test.group('ApiModel.removeEntity()', (g) => {
+  g.tests.forEach((test) => {
+    test.tags(['@modeling', '@api'])
+  })
   test('removes an existing entity', ({ assert }) => {
     const model = new ApiModel()
     const entityKey = 'entity-to-remove'
@@ -274,7 +290,10 @@ test.group('ApiModel.removeEntity()', () => {
   })
 })
 
-test.group('ApiModel.getExposedEntity()', () => {
+test.group('ApiModel.getExposedEntity()', (g) => {
+  g.tests.forEach((test) => {
+    test.tags(['@modeling', '@api'])
+  })
   test('returns an existing exposed entity', ({ assert }) => {
     const model = new ApiModel()
     const entityKey = 'get-entity'

package/tests/unit/modeling/data_domain.spec.ts

@@ -17,13 +17,13 @@ test.group('DataDomain', () => {
     assert.isNotEmpty(dataDomain.key)
     assert.isDefined(dataDomain.graph)
     assert.deepEqual(dataDomain.fields, [])
-  })
+  }).tags(['@modeling', '@datadomain', '@core', '@unit', '@fast'])
 
   test('notifyChange dispatches a change event', async ({ assert }) => {
     const dataDomain = new DataDomain()
     dataDomain.notifyChange()
     await assert.dispatches(dataDomain, 'change', { timeout: 20 })
-  })
+  }).tags(['@modeling', '@datadomain', '@core', '@unit', '@events', '@async'])
 })
 
 test.group('DataDomain.removeDomainElement()', () => {
@@ -33,7 +33,7 @@ test.group('DataDomain.removeDomainElement()', () => {
     dataDomain.removeDomainElement(namespace.key, DomainNamespaceKind)
     assert.isUndefined(dataDomain.findNamespace(namespace.key))
     assert.isFalse(dataDomain.graph.hasNode(namespace.key))
-  })
+  }).tags(['@modeling', '@datadomain', '@crud', '@removal'])
 
   test('removes a data model', ({ assert }) => {
     const dataDomain = new DataDomain()
@@ -41,7 +41,7 @@ test.group('DataDomain.removeDomainElement()', () => {
     dataDomain.removeDomainElement(model.key, DomainModelKind)
     assert.isUndefined(dataDomain.findModel(model.key))
     assert.isFalse(dataDomain.graph.hasNode(model.key))
-  })
+  }).tags(['@modeling', '@datadomain', '@crud', '@removal'])
 
   test('removes an entity', ({ assert }) => {
     const dataDomain = new DataDomain()
@@ -50,7 +50,7 @@ test.group('DataDomain.removeDomainElement()', () => {
     dataDomain.removeDomainElement(entity.key, DomainEntityKind)
     assert.isUndefined(dataDomain.findEntity(entity.key))
     assert.isFalse(dataDomain.graph.hasNode(entity.key))
-  })
+  }).tags(['@modeling', '@datadomain', '@crud', '@removal'])
 
   test('removes a property', ({ assert }) => {
     const dataDomain = new DataDomain()
@@ -60,7 +60,7 @@ test.group('DataDomain.removeDomainElement()', () => {
     dataDomain.removeDomainElement(property.key, DomainPropertyKind)
     assert.isUndefined(dataDomain.findProperty(property.key))
     assert.isFalse(dataDomain.graph.hasNode(property.key))
-  })
+  }).tags(['@modeling', '@datadomain', '@crud', '@removal'])
 
   test('removes an association', ({ assert }) => {
     const dataDomain = new DataDomain()
@@ -70,49 +70,49 @@ test.group('DataDomain.removeDomainElement()', () => {
     dataDomain.removeDomainElement(association.key, DomainAssociationKind)
     assert.isUndefined(dataDomain.findAssociation(association.key))
     assert.isFalse(dataDomain.graph.hasNode(association.key))
-  })
+  }).tags(['@modeling', '@datadomain', '@crud', '@removal'])
 
   test('throws an error for an unknown kind', ({ assert }) => {
     const dataDomain = new DataDomain()
     assert.throws(() => {
       dataDomain.removeDomainElement('test-unknown', 'unknown-kind')
     }, 'Unknown kind unknown-kind for the object test-unknown')
-  })
+  }).tags(['@modeling', '@datadomain', '@crud', '@removal'])
 
   test('throws an error when removing a non-existing namespace', ({ assert }) => {
     const dataDomain = new DataDomain()
     assert.throws(() => {
       dataDomain.removeDomainElement('non-existent-namespace', DomainNamespaceKind)
     }, `Namespace non-existent-namespace does not exist`)
-  })
+  }).tags(['@modeling', '@datadomain', '@crud', '@removal'])
 
   test('throws an error when removing a non-existing model', ({ assert }) => {
     const dataDomain = new DataDomain()
     assert.throws(() => {
       dataDomain.removeDomainElement('non-existent-model', DomainModelKind)
     }, `Data model non-existent-model does not exist`)
-  })
+  }).tags(['@modeling', '@datadomain', '@crud', '@removal'])
 
   test('throws an error when removing a non-existing entity', ({ assert }) => {
     const dataDomain = new DataDomain()
     assert.throws(() => {
       dataDomain.removeDomainElement('non-existent-entity', DomainEntityKind)
     }, `Entity non-existent-entity does not exist`)
-  })
+  }).tags(['@modeling', '@datadomain', '@crud', '@removal'])
 
   test('throws an error when removing a non-existing property', ({ assert }) => {
     const dataDomain = new DataDomain()
     assert.throws(() => {
       dataDomain.removeDomainElement('non-existent-property', DomainPropertyKind)
     }, `Property non-existent-property does not exist`)
-  })
+  }).tags(['@modeling', '@datadomain', '@crud', '@removal'])
 
   test('throws an error when removing a non-existing association', ({ assert }) => {
     const dataDomain = new DataDomain()
     assert.throws(() => {
       dataDomain.removeDomainElement('non-existent-association', DomainAssociationKind)
     }, `Association non-existent-association does not exist`)
-  })
+  }).tags(['@modeling', '@datadomain', '@crud', '@removal'])
 
   test('removes a namespace with children', ({ assert }) => {
     const dataDomain = new DataDomain()
@@ -138,7 +138,7 @@ test.group('DataDomain.removeDomainElement()', () => {
     assert.isFalse(dataDomain.graph.hasNode(entity.key))
     assert.isFalse(dataDomain.graph.hasNode(property.key))
     assert.isFalse(dataDomain.graph.hasNode(association.key))
-  })
+  }).tags(['@modeling', '@datadomain', '@crud', '@removal'])
 })
 
 test.group('DataDomain.createSchema()', () => {
@@ -151,7 +151,7 @@ test.group('DataDomain.createSchema()', () => {
     assert.isUndefined(schema.graph)
     assert.isUndefined(schema.dependencyList)
     assert.isUndefined(schema.fields)
-  })
+  }).tags(['@modeling', '@datadomain', '@schema', '@factory'])
 
   test('creates a schema with provided values', ({ assert }) => {
     const schema = DataDomain.createSchema({
@@ -167,7 +167,7 @@ test.group('DataDomain.createSchema()', () => {
     assert.deepEqual(schema.graph, { nodes: [], edges: [], options: {} })
     assert.deepEqual(schema.dependencyList, [{ key: 'dep1', version: '1.0.0' }])
     assert.deepEqual(schema.fields, [{ key: 'field1', type: 'namespace' }])
-  })
+  }).tags(['@modeling', '@datadomain', '@schema', '@factory'])
 
   test('creates a schema with partial info', ({ assert }) => {
     const schema = DataDomain.createSchema({
@@ -177,7 +177,7 @@ test.group('DataDomain.createSchema()', () => {
     assert.typeOf(schema.key, 'string')
     assert.isNotEmpty(schema.key)
     assert.deepInclude(schema.info, { name: 'Test Domain' })
-  })
+  }).tags(['@modeling', '@datadomain', '@schema', '@factory'])
 
   test('creates a schema with empty info', ({ assert }) => {
     const schema = DataDomain.createSchema({
@@ -187,7 +187,7 @@ test.group('DataDomain.createSchema()', () => {
     assert.typeOf(schema.key, 'string')
     assert.isNotEmpty(schema.key)
     assert.deepInclude(schema.info, { name: 'Unnamed domain' })
-  })
+  }).tags(['@modeling', '@datadomain', '@schema', '@factory'])
 
   test('creates a schema with dependencyList', ({ assert }) => {
     const schema = DataDomain.createSchema({
@@ -198,7 +198,7 @@ test.group('DataDomain.createSchema()', () => {
     assert.isNotEmpty(schema.key)
     assert.deepInclude(schema.info, { name: 'Unnamed domain' })
     assert.deepEqual(schema.dependencyList, [{ key: 'dep1', version: '1.0.0' }])
-  })
+  }).tags(['@modeling', '@datadomain', '@schema', '@factory'])
 
   test('creates a schema with graph', ({ assert }) => {
     const schema = DataDomain.createSchema({
@@ -209,7 +209,7 @@ test.group('DataDomain.createSchema()', () => {
     assert.isNotEmpty(schema.key)
     assert.deepInclude(schema.info, { name: 'Unnamed domain' })
     assert.deepEqual(schema.graph, { nodes: [], edges: [], options: {} })
-  })
+  }).tags(['@modeling', '@datadomain', '@schema', '@factory'])
 
   test('creates a schema with fields', ({ assert }) => {
     const schema = DataDomain.createSchema({
@@ -220,7 +220,7 @@ test.group('DataDomain.createSchema()', () => {
     assert.isNotEmpty(schema.key)
     assert.deepInclude(schema.info, { name: 'Unnamed domain' })
     assert.deepEqual(schema.fields, [{ key: 'field1', type: 'namespace' }])
-  })
+  }).tags(['@modeling', '@datadomain', '@schema', '@factory'])
 })
 
 test.group('DataDomain.constructor()', () => {
@@ -233,7 +233,7 @@ test.group('DataDomain.constructor()', () => {
     assert.deepInclude(dataDomain.info.toJSON(), { name: 'Unnamed domain' })
     assert.isDefined(dataDomain.graph)
     assert.deepEqual(dataDomain.dependencyList, [])
-  })
+  }).tags(['@modeling', '@datadomain', '@constructor', '@initialization'])
 
   test('creates a new DataDomain with provided values', ({ assert }) => {
     const dataDomain = new DataDomain({
@@ -247,7 +247,7 @@ test.group('DataDomain.constructor()', () => {
     assert.deepInclude(dataDomain.info.toJSON(), { name: 'Test Domain', description: 'A test domain' })
     assert.isDefined(dataDomain.graph)
     assert.deepEqual(dataDomain.dependencyList, [{ key: 'dep1', version: '1.0.0' }])
-  })
+  }).tags(['@modeling', '@datadomain', '@constructor', '@initialization'])
 
   test('creates a new DataDomain with partial info', ({ assert }) => {
     const dataDomain = new DataDomain({
@@ -258,7 +258,7 @@ test.group('DataDomain.constructor()', () => {
     assert.isNotEmpty(dataDomain.key)
     assert.instanceOf(dataDomain.info, Thing)
     assert.deepInclude(dataDomain.info.toJSON(), { name: 'Test Domain' })
-  })
+  }).tags(['@modeling', '@datadomain', '@constructor', '@initialization'])
 
   test('creates a new DataDomain with empty info', ({ assert }) => {
     const dataDomain = new DataDomain({
@@ -269,7 +269,7 @@ test.group('DataDomain.constructor()', () => {
     assert.isNotEmpty(dataDomain.key)
     assert.instanceOf(dataDomain.info, Thing)
     assert.deepInclude(dataDomain.info.toJSON(), { name: 'Unnamed domain' })
-  })
+  }).tags(['@modeling', '@datadomain', '@constructor', '@initialization'])
 
   test('creates a new DataDomain with dependencyList', ({ assert }) => {
     const dataDomain = new DataDomain({
@@ -281,40 +281,40 @@ test.group('DataDomain.constructor()', () => {
     assert.instanceOf(dataDomain.info, Thing)
     assert.deepInclude(dataDomain.info.toJSON(), { name: 'Unnamed domain' })
     assert.deepEqual(dataDomain.dependencyList, [{ key: 'dep1', version: '1.0.0' }])
-  })
+  }).tags(['@modeling', '@datadomain', '@constructor', '@initialization'])
 
   test('creates a new DataDomain with a custom key', ({ assert }) => {
     const dataDomain = new DataDomain({ key: 'custom-key' })
     assert.equal(dataDomain.key, 'custom-key')
-  })
+  }).tags(['@modeling', '@datadomain', '@constructor', '@initialization'])
 
   test('creates a new DataDomain with custom info', ({ assert }) => {
     const customInfo = { name: 'Custom Name', description: 'Custom Description' }
     const dataDomain = new DataDomain({ info: customInfo })
     assert.deepInclude(dataDomain.info.toJSON(), customInfo)
-  })
+  }).tags(['@modeling', '@datadomain', '@constructor', '@initialization'])
 
   test('initializes the graph', ({ assert }) => {
     const dataDomain = new DataDomain()
     assert.isDefined(dataDomain.graph)
-  })
+  }).tags(['@modeling', '@datadomain', '@constructor', '@initialization'])
 
   test('initializes the dependencies map', ({ assert }) => {
     const dataDomain = new DataDomain()
     assert.instanceOf(dataDomain.dependencies, Map)
     assert.equal(dataDomain.dependencies.size, 0)
-  })
+  }).tags(['@modeling', '@datadomain', '@constructor', '@initialization'])
 
   test('initializes the dependencyList array', ({ assert }) => {
     const dataDomain = new DataDomain()
     assert.isArray(dataDomain.dependencyList)
     assert.equal(dataDomain.dependencyList.length, 0)
-  })
+  }).tags(['@modeling', '@datadomain', '@constructor', '@initialization'])
 
   test('does not notify change during initialization', async ({ assert }) => {
     const dataDomain = new DataDomain()
     await assert.notDispatches(dataDomain, 'change', { timeout: 20 })
-  })
+  }).tags(['@modeling', '@datadomain', '@constructor', '@initialization'])
 
   test('restores the graph from a serialized state', ({ assert }) => {
     const dataDomain1 = new DataDomain()
@@ -326,7 +326,7 @@ test.group('DataDomain.constructor()', () => {
     const restoredEntity = dataDomain2.findEntity(entity.key)
     assert.isDefined(restoredEntity)
     assert.equal(restoredEntity!.key, entity.key)
-  })
+  }).tags(['@modeling', '@datadomain', '@constructor', '@initialization'])
 
   test('restores the graph with dependencies', ({ assert }) => {
     const dataDomain1 = new DataDomain()
@@ -338,7 +338,7 @@ test.group('DataDomain.constructor()', () => {
     const dataDomain2 = new DataDomain(serialized, [dataDomain1])
     const restoredEntity = dataDomain2.findForeignEntity(entity.key, dataDomain1.key)
     assert.ok(restoredEntity)
-  })
+  }).tags(['@modeling', '@datadomain', '@constructor', '@initialization'])
 })
 
 test.group('DataDomain.hasFields()', () => {
@@ -346,31 +346,31 @@ test.group('DataDomain.hasFields()', () => {
     const dataDomain = new DataDomain()
     dataDomain.addNamespace()
     assert.isTrue(dataDomain.hasFields())
-  })
+  }).tags(['@modeling', '@datadomain', '@fields', '@query'])
 
   test('returns true if there are child models', ({ assert }) => {
     const dataDomain = new DataDomain()
     dataDomain.addModel()
     assert.isTrue(dataDomain.hasFields())
-  })
+  }).tags(['@modeling', '@datadomain', '@fields', '@query'])
 
   test('returns true if there are both namespaces and models', ({ assert }) => {
     const dataDomain = new DataDomain()
     dataDomain.addNamespace()
     dataDomain.addModel()
     assert.isTrue(dataDomain.hasFields())
-  })
+  }).tags(['@modeling', '@datadomain', '@fields', '@query'])
 
   test('returns false if there are no child namespaces or models', ({ assert }) => {
     const dataDomain = new DataDomain()
     assert.isFalse(dataDomain.hasFields())
-  })
+  }).tags(['@modeling', '@datadomain', '@fields', '@query'])
 
   test('returns false if the data domain has no fields', ({ assert }) => {
     const dataDomain = new DataDomain()
     dataDomain.fields = []
     assert.isFalse(dataDomain.hasFields())
-  })
+  }).tags(['@modeling', '@datadomain', '@fields', '@query'])
 
   test('returns true if there are only foreign namespaces or models', ({ assert }) => {
     const dataDomain = new DataDomain()
@@ -379,7 +379,7 @@ test.group('DataDomain.hasFields()', () => {
     dataDomain.registerForeignDomain(foreignDomain)
     foreignDomain.addNamespace()
     assert.isFalse(dataDomain.hasFields())
-  })
+  }).tags(['@modeling', '@datadomain', '@fields', '@query'])
 })
 
 test.group('DataDomain.listFields()', () => {
@@ -391,13 +391,13 @@ test.group('DataDomain.listFields()', () => {
     assert.lengthOf(fields, 2)
     assert.deepInclude(fields, namespace)
     assert.deepInclude(fields, model)
-  })
+  }).tags(['@modeling', '@datadomain', '@fields', '@listing'])
 
   test('returns an empty array if there are no child namespaces or models', ({ assert }) => {
     const dataDomain = new DataDomain()
     const fields = [...dataDomain.listFields()]
     assert.lengthOf(fields, 0)
-  })
+  }).tags(['@modeling', '@datadomain', '@fields', '@listing'])
 
   test('returns only namespaces and models', ({ assert }) => {
     const dataDomain = new DataDomain()
@@ -408,7 +408,7 @@ test.group('DataDomain.listFields()', () => {
     assert.lengthOf(fields, 2)
     assert.deepInclude(fields, namespace)
     assert.deepInclude(fields, model)
-  })
+  }).tags(['@modeling', '@datadomain', '@fields', '@listing'])
 
   test('namespaces and models in the list are of type DomainNamespace and DomainModel', ({ assert }) => {
     const dataDomain = new DataDomain()
@@ -417,7 +417,7 @@ test.group('DataDomain.listFields()', () => {
     const fields = [...dataDomain.listFields()]
     assert.instanceOf(fields[0], DomainNamespace)
     assert.instanceOf(fields[1], DomainModel)
-  })
+  }).tags(['@modeling', '@datadomain', '@fields', '@listing'])
 
   test('lists namespaces and models in the order they were added', ({ assert }) => {
     const dataDomain = new DataDomain()
@@ -425,13 +425,13 @@ test.group('DataDomain.listFields()', () => {
     const model = dataDomain.addModel()
     const fields = [...dataDomain.listFields()]
     assert.deepEqual(fields, [namespace, model])
-  })
+  }).tags(['@modeling', '@datadomain', '@fields', '@listing'])
 
   test('lists namespaces and models when there are no namespaces or models', ({ assert }) => {
     const dataDomain = new DataDomain()
     const fields = [...dataDomain.listFields()]
     assert.deepEqual(fields, [])
-  })
+  }).tags(['@modeling', '@datadomain', '@fields', '@listing'])
 
   test('lists namespaces and models when there are other domain elements', ({ assert }) => {
     const dataDomain = new DataDomain()
@@ -440,5 +440,5 @@ test.group('DataDomain.listFields()', () => {
     dataDomain.addEntity(model.key) // Add an entity to make sure it's not included
     const fields = [...dataDomain.listFields()]
     assert.deepEqual(fields, [namespace, model])
-  })
+  }).tags(['@modeling', '@datadomain', '@fields', '@listing'])
 })