chore: version bump

.gitignore

@@ -63,6 +63,7 @@ typings/
 # IDE
 .idea
 *.iml
+.nova
 
 # OS
 .DS_Store

lerna.json

@@ -1,4 +1,6 @@
 {
-  "packages": ["schemas/*"],
-  "version": "2.6.10"
+  "packages": [
+    "schemas/*"
+  ],
+  "version": "2.11.0"
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datastream/schema-monorepo",
-  "version": "2.10.3",
+  "version": "2.11.0",
   "description": "DataStream Water Quality Exchange (WQX): JSON Schema and JSON Table Schema for DataStream",
   "private": true,
   "type": "module",

schemas/data/bin/build-logic.js

@@ -6,7 +6,6 @@ import { subset, sort } from './build-lib.js'
 const __dirname = dirname(fileURLToPath(import.meta.url))
 
 const wqxRequiredIf = async (file) => {
-  console.log(file)
   const [columnFrom, columnTo] = file.split('-')
 
   const logicJSON = await readFile(
@@ -26,8 +25,28 @@ const wqxRequiredIf = async (file) => {
   }
 
   // TODO - remove once included in WQX look up
-  object.if.properties[columnFrom].enum.push('Nitrogen-15/Nitrogen-14 ratio')
-  object.if.properties[columnFrom].enum.push('Sulfur Delta 34')
+  if (file === 'CharacteristicName-MethodSpeciation') {
+    const stableIsotopes = await readFile(
+      join(
+        __dirname,
+        `/../src/logic/CharacteristicName-StableIsotope-MethodSpeciation.json`
+      )
+    )
+      .then((res) => JSON.parse(res))
+      .catch(() => ({}))
+
+    for (const characteristicName of stableIsotopes.if.properties
+      .CharacteristicName.enum) {
+      if (!object.if.properties[columnFrom].enum.includes(characteristicName)) {
+        console.log(
+          'CharacteristicName-MethodSpeciation missing (StableIsotope rule)',
+          characteristicName
+        )
+        object.if.properties[columnFrom].enum.push(characteristicName)
+      }
+    }
+  }
+  // END TODO
 
   const list = [...new Set(sort(object.if.properties[columnFrom].enum))]
 

schemas/data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datastreamapp/data-schema",
-  "version": "2.10.3",
+  "version": "2.11.0",
   "description": "DataStream Water Quality Data Schema",
   "publishConfig": {
     "cache": "~/.npm",

schemas/data/src/logic/CharacteristicName-MethodSpeciation.json

@@ -20,6 +20,7 @@
           "Kjeldahl nitrogen",
           "Nitrate",
           "Nitrite",
+          "Nitrogen Delta 15",
           "Nitrogen-15",
           "Nitrogen-15/Nitrogen-14 ratio",
           "Organic Nitrogen",

schemas/data/src/quality-control/CharacteristicName-MethodSpeciation.json

@@ -21,6 +21,7 @@
             "Kjeldahl nitrogen",
             "Nitrate",
             "Nitrite",
+            "Nitrogen Delta 15",
             "Nitrogen-15",
             "Nitrogen-15/Nitrogen-14 ratio",
             "Organic Nitrogen",

schemas/data/test/logic.js

@@ -97,10 +97,7 @@ test('Should rejects CharacteristicName AND NOT ResultSampleFraction', async (t)
     CharacteristicName: 'Silver'
   })
   t.false(valid)
-  t.is(
-    checkProperty(validate.errors, 'required', 'ResultSampleFraction'),
-    true
-  )
+  t.is(checkProperty(validate.errors, 'required', 'ResultSampleFraction'), true)
 })
 test('Should accept CharacteristicName AND ResultSampleFraction', async (t) => {
   const valid = validate({
@@ -115,6 +112,34 @@ test('Should accept CharacteristicName AND ResultSampleFraction', async (t) => {
   )
 })
 
+// CharacteristicName-StableIsotope-ResultSampleFraction
+test('Should reject StableIsotope CharacteristicName, MethodSpeciation required', async (t) => {
+  const valid = validate({
+    CharacteristicName: 'Nitrogen Delta 15'
+  })
+  t.false(valid)
+  t.is(checkProperty(validate.errors, 'required', 'CharacteristicName'), false)
+  t.is(checkProperty(validate.errors, 'required', 'MethodSpeciation'), true)
+})
+test('Should reject StableIsotope CharacteristicName', async (t) => {
+  const valid = validate({
+    CharacteristicName: 'Nitrogen Delta 15',
+    MethodSpeciation: 'as NH4'
+  })
+  t.false(valid)
+  t.is(checkProperty(validate.errors, 'required', 'CharacteristicName'), false)
+  t.is(checkProperty(validate.errors, 'enum', 'MethodSpeciation'), true)
+})
+test('Should accept StableIsotope CharacteristicName', async (t) => {
+  const valid = validate({
+    CharacteristicName: 'Nitrogen Delta 15',
+    MethodSpeciation: 'of NH4'
+  })
+  t.false(valid)
+  t.is(checkProperty(validate.errors, 'required', 'CharacteristicName'), false)
+  t.is(checkProperty(validate.errors, 'required', 'MethodSpeciation'), false)
+})
+
 // CharacteristicName-Nutrient-ResultSampleFraction
 test('Should reject Nutrient CharacteristicName AND ResultSampleFraction', async (t) => {
   const valid = validate({
@@ -579,10 +604,7 @@ test('Should accept columns without potential csv injection', async (t) => {
   t.false(valid)
   // console.log(valid, JSON.stringify(validate.errors, null, 2))
   t.is(checkProperty(validate.errors, 'pattern', 'DatasetName'), false)
-  t.is(
-    checkProperty(validate.errors, 'pattern', 'MonitoringLocationID'),
-    false
-  )
+  t.is(checkProperty(validate.errors, 'pattern', 'MonitoringLocationID'), false)
   t.is(
     checkProperty(validate.errors, 'pattern', 'MonitoringLocationName'),
     false
@@ -608,14 +630,7 @@ test('Should accept when Salinity and expected unit', async (t) => {
     ResultUnit: 'PSU'
   })
   t.is(valid, false)
-  t.is(
-    checkProperty(
-      validate.errors,
-      'enum',
-      'ResultUnit'
-    ),
-    false
-  )
+  t.is(checkProperty(validate.errors, 'enum', 'ResultUnit'), false)
 })
 test('Should reject when Salinity and `ppt`', async (t) => {
   const valid = validate({
@@ -626,7 +641,6 @@ test('Should reject when Salinity and `ppt`', async (t) => {
   t.is(checkProperty(validate.errors, 'enum', 'ResultUnit'), true)
 })
 
-
 // *** ResultDetectionQuantitationLimitUnit-Salinity *** //
 test('Should accept when Salinity and expected ResultDetectionQuantitationLimitUnit', async (t) => {
   const valid = validate({
@@ -659,4 +673,4 @@ test('Should reject when Salinity and ResultDetectionQuantitationLimitUnit=`ppt`
     ),
     true
   )
-})
+})