cdifTabularData: give the row and column counts a propertyID

_sources/cdifDataType/cdifTabularData/cdifTabularDataSchema.json

@@ -122,11 +122,12 @@
                 "$ref": "../../cdifDataType/cdifPhysicalMapping/cdifPhysicalMappingSchema.json"
             }
         },
-        "countRows": {
-            "type": "integer"
-        },
-        "countColumns": {
-            "type": "integer"
+        "schema:additionalProperty": {
+            "description": "Soft-typed extension properties. The row and column counts live here rather than as bare properties, so that each carries a schema:propertyID identifying the concept it quantifies - DDI Discovery caseQuantity for the row count and variableQuantity for the column count. As bare unprefixed `countRows`/`countColumns` they were the only two properties on this class with no namespace and no definition, so nothing said what they meant or tied them to a vocabulary.",
+            "type": "array",
+            "items": {
+                "$ref": "#/$defs/AdditionalProperty"
+            }
         }
     },
     "oneOf": [
@@ -160,5 +161,10 @@
     "required": [
         "@type",
         "cdif:hasPhysicalMapping"
-    ]
+    ],
+    "$defs": {
+        "AdditionalProperty": {
+            "$ref": "../../schemaorgProperties/additionalProperty/additionalPropertySchema.json"
+        }
+    }
 }

_sources/cdifDataType/cdifTabularData/exampleCdifTabularData.json

@@ -16,8 +16,28 @@
   "cdi:commentPrefix": "#",
   "cdi:skipBlankRows": false,
   "cdi:skipInitialSpace": true,
-  "countRows": 1500,
-  "countColumns": 5,
+  "schema:additionalProperty": [
+    {
+      "@type": [
+        "schema:PropertyValue"
+      ],
+      "schema:propertyID": [
+        "http://rdf-vocabulary.ddialliance.org/discovery#caseQuantity"
+      ],
+      "schema:name": "countRows",
+      "schema:value": 1500
+    },
+    {
+      "@type": [
+        "schema:PropertyValue"
+      ],
+      "schema:propertyID": [
+        "http://rdf-vocabulary.ddialliance.org/discovery#variableQuantity"
+      ],
+      "schema:name": "countColumns",
+      "schema:value": 5
+    }
+  ],
   "cdif:hasPhysicalMapping": [
     {
       "cdif:index": 0,

_sources/cdifDataType/cdifTabularData/exampleCdifTabularDataComplete.json

@@ -30,8 +30,28 @@
   "cdi:tableDirection": "Ltr",
   "cdi:textDirection": "Inherit",
   "cdi:trim": "Both",
-  "countRows": 1500,
-  "countColumns": 3,
+  "schema:additionalProperty": [
+    {
+      "@type": [
+        "schema:PropertyValue"
+      ],
+      "schema:propertyID": [
+        "http://rdf-vocabulary.ddialliance.org/discovery#caseQuantity"
+      ],
+      "schema:name": "countRows",
+      "schema:value": 1500
+    },
+    {
+      "@type": [
+        "schema:PropertyValue"
+      ],
+      "schema:propertyID": [
+        "http://rdf-vocabulary.ddialliance.org/discovery#variableQuantity"
+      ],
+      "schema:name": "countColumns",
+      "schema:value": 3
+    }
+  ],
   "cdif:hasPhysicalMapping": [
     {
       "cdif:index": 0,

_sources/cdifDataType/cdifTabularData/examples.yaml

@@ -13,7 +13,8 @@
     Delimited tabular dataset exercising every CSVW dialect property
     (delimiter, quote/escape, header, lineTerminators, skipBlankRows/
     skipColumns/skipRows, table/text direction, trim), plus arrayBase,
-    headerIsCaseSensitive, treatConsecutiveDelimitersAsOne, countRows/Cols,
+    headerIsCaseSensitive, treatConsecutiveDelimitersAsOne, the row and column
+    counts as DDI Discovery-identified schema:additionalProperty entries,
     and three physical-mapping entries.
   prefixes:
     cdi: http://ddialliance.org/Specification/DDI-CDI/1.0/RDF/