Added wetness wiping and removing unecessary parentId in def files

perki · perki · commit cfcb769a1d49 · 2025-09-11T14:41:57.000+02:00
diff --git a/definitions/items/body.yaml b/definitions/items/body.yaml
@@ -18,7 +18,7 @@ body-vulva-mucus-inspect:
 body-vulva-mucus-stretch:
   version: v1
   label: Cervical Fluid Stretch
-  description: Manual strech test of cervical fluid
+  description: Manual strech test of cervical fluid. Short can be streched less than 2 cm, long greater than 2cm. 
   streamId: body-vulva-mucus-stretch
   eventType: ratio/generic
   type: select
@@ -33,7 +33,7 @@ body-vulva-mucus-stretch:
 body-vulva-wetness-feeling:
   version: v1
   label: Vulva Wetness feeling
-  description: Vulava wetness feeling 
+  description: Vulva wetness feeling 
   streamId: body-vulva-wetness-feeling
   eventType: ratio/generic
   type: select
@@ -45,6 +45,21 @@ body-vulva-wetness-feeling:
     - value: 2
       label: Very wet
   repeatable: any
+body-vulva-wetness-wiping:
+  version: v1
+  label: Vulva Wetness when wiping
+  description: Vulva wetness when wiping 
+  streamId: body-vulva-wetness-wiping
+  eventType: ratio/generic
+  type: select
+  options:
+    - value: 0
+      label: Dry
+    - value: 1
+      label: Wet
+    - value: 2
+      label: Very wet
+  repeatable: any
 body-weight:
   version: temporary
   label: 
diff --git a/definitions/streams/body.yaml b/definitions/streams/body.yaml
@@ -4,28 +4,22 @@ parentId: null
 children:
   - id: body-height
     name: Body Height
-    parentId: body
   - id: body-weight
     name: Body Weight
-    parentId: body
   - id: body-vulva
     name: Vulva
-    parentId: body
     children:
       - id: body-vulva-wetness
         name: Vulva Wetness
-        parentId: body-vulva
         children:
+          - id: body-vulva-wetness-wiping
+            name: Vulva Wetness when wiping
           - id: body-vulva-wetness-feeling
             name: Vulva Wetness Feeling
-            parentId: body-vulva-wetness
       - id: body-vulva-mucus
         name: Vulva Mucus
-        parentId: body-vulva
         children:
           - id: body-vulva-mucus-inspect
             name: Vulva Mucus Inspect
-            parentId: body-vulva-mucus
           - id: body-vulva-mucus-stretch
             name: Vulva Mucus Stretch
-            parentId: body-vulva-mucus
diff --git a/definitions/streams/family.yaml b/definitions/streams/family.yaml
@@ -3,5 +3,4 @@ name: Family
 parentId: null
 children:
   - id: family-children
-    name: Children
-    parentId: family
+    name: Children
diff --git a/definitions/streams/fertility.yaml b/definitions/streams/fertility.yaml
@@ -4,23 +4,16 @@ parentId: null
 children:
   - id: fertility-cycles
     name: Cycles
-    parentId: fertility
     children:
       - id: fertility-cycles-start
         name: New Cycle
-        parentId: fertility-cycles
       - id: fertility-cycles-ovulation
         name: Ovulation Day
-        parentId: fertility-cycles
       - id: fertility-cycles-charted-estimation
         name: Cycles charted estimation
-        parentId: fertility-cycles
   - id: fertility-miscarriages
     name: Miscarriages
-    parentId: fertility
   - id: fertility-trainings
     name: Trainings
-    parentId: fertility
   - id: fertility-ttc-tta
     name: Trying to conceive / Avoiding pregnancy
-    parentId: fertility
diff --git a/definitions/streams/profile.yaml b/definitions/streams/profile.yaml
@@ -4,16 +4,11 @@ parentId: null
 children:
   - id: profile-address
     name: Adress
-    parentId: profile
   - id: profile-date-of-birth
     name: Date of Birth
-    parentId: profile
   - id: profile-location
     name: Location
-    parentId: profile
   - id: profile-name
     name: Name
-    parentId: profile
   - id: profile-sex
     name: Sex
-    parentId: profile
diff --git a/docs/index.html b/docs/index.html
@@ -49,8 +49,9 @@ <h3>Items</h3>
         </thead>
         <tbody>
           <tr><td>Id: body-vulva-mucus-inspect<br>Type: select</td><td>Cervical Fluid Inspect<br>Visual aspect of cervical fluid inspection</td><td>streamId: body-vulva-mucus-inspect<br>eventType(s): - variations -</td><td><pre></pre></td></tr>
-<tr><td>Id: body-vulva-mucus-stretch<br>Type: select</td><td>Cervical Fluid Stretch<br>Manual strech test of cervical fluid</td><td>streamId: body-vulva-mucus-stretch<br>eventType(s): - variations -</td><td><pre></pre></td></tr>
-<tr><td>Id: body-vulva-wetness-feeling<br>Type: select</td><td>Vulva Wetness feeling<br>Vulava wetness feeling</td><td>streamId: body-vulva-wetness-feeling<br>eventType(s): - variations -</td><td><pre></pre></td></tr>
+<tr><td>Id: body-vulva-mucus-stretch<br>Type: select</td><td>Cervical Fluid Stretch<br>Manual strech test of cervical fluid. Short can be streched less than 2 cm, long greater than 2cm.</td><td>streamId: body-vulva-mucus-stretch<br>eventType(s): - variations -</td><td><pre></pre></td></tr>
+<tr><td>Id: body-vulva-wetness-feeling<br>Type: select</td><td>Vulva Wetness feeling<br>Vulva wetness feeling</td><td>streamId: body-vulva-wetness-feeling<br>eventType(s): - variations -</td><td><pre></pre></td></tr>
+<tr><td>Id: body-vulva-wetness-wiping<br>Type: select</td><td>Vulva Wetness when wiping<br>Vulva wetness when wiping</td><td>streamId: body-vulva-wetness-wiping<br>eventType(s): - variations -</td><td><pre></pre></td></tr>
 <tr><td>Id: body-weight<br>Type: number</td><td>Body weight<br>Measured body weight</td><td>streamId: body-weight<br>eventType(s): - variations -</td><td><pre>eventType:
   mass/kg:
     label:
diff --git a/docs/items.json b/docs/items.json
@@ -44,7 +44,7 @@
       "en": "Cervical Fluid Stretch"
     },
     "description": {
-      "en": "Manual strech test of cervical fluid"
+      "en": "Manual strech test of cervical fluid. Short can be streched less than 2 cm, long greater than 2cm."
     },
     "streamId": "body-vulva-mucus-stretch",
     "eventType": "ratio/generic",
@@ -77,7 +77,7 @@
       "en": "Vulva Wetness feeling"
     },
     "description": {
-      "en": "Vulava wetness feeling"
+      "en": "Vulva wetness feeling"
     },
     "streamId": "body-vulva-wetness-feeling",
     "eventType": "ratio/generic",
@@ -104,6 +104,39 @@
     ],
     "repeatable": "any"
   },
+  "body-vulva-wetness-wiping": {
+    "version": "v1",
+    "label": {
+      "en": "Vulva Wetness when wiping"
+    },
+    "description": {
+      "en": "Vulva wetness when wiping"
+    },
+    "streamId": "body-vulva-wetness-wiping",
+    "eventType": "ratio/generic",
+    "type": "select",
+    "options": [
+      {
+        "value": 0,
+        "label": {
+          "en": "Dry"
+        }
+      },
+      {
+        "value": 1,
+        "label": {
+          "en": "Wet"
+        }
+      },
+      {
+        "value": 2,
+        "label": {
+          "en": "Very wet"
+        }
+      }
+    ],
+    "repeatable": "any"
+  },
   "body-weight": {
     "version": "temporary",
     "label": {
diff --git a/docs/pack.json b/docs/pack.json
@@ -1,5 +1,5 @@
 {
-  "publicationDate": "2025-07-17T08:54:13.045Z",
+  "publicationDate": "2025-09-11T12:39:27.351Z",
   "streams": [
     {
       "id": "body",
@@ -19,24 +19,27 @@
         {
           "id": "body-vulva",
           "name": "Vulva",
-          "parentId": "body",
           "children": [
             {
               "id": "body-vulva-wetness",
               "name": "Vulva Wetness",
-              "parentId": "body-vulva",
               "children": [
+                {
+                  "id": "body-vulva-wetness-wiping",
+                  "name": "Vulva Wetness when wiping",
+                  "parentId": "body-vulva-wetness"
+                },
                 {
                   "id": "body-vulva-wetness-feeling",
                   "name": "Vulva Wetness Feeling",
                   "parentId": "body-vulva-wetness"
                 }
-              ]
+              ],
+              "parentId": "body-vulva"
             },
             {
               "id": "body-vulva-mucus",
               "name": "Vulva Mucus",
-              "parentId": "body-vulva",
               "children": [
                 {
                   "id": "body-vulva-mucus-inspect",
@@ -48,9 +51,11 @@
                   "name": "Vulva Mucus Stretch",
                   "parentId": "body-vulva-mucus"
                 }
-              ]
+              ],
+              "parentId": "body-vulva"
             }
-          ]
+          ],
+          "parentId": "body"
         }
       ]
     },
@@ -74,7 +79,6 @@
         {
           "id": "fertility-cycles",
           "name": "Cycles",
-          "parentId": "fertility",
           "children": [
             {
               "id": "fertility-cycles-start",
@@ -91,7 +95,8 @@
               "name": "Cycles charted estimation",
               "parentId": "fertility-cycles"
             }
-          ]
+          ],
+          "parentId": "fertility"
         },
         {
           "id": "fertility-miscarriages",
@@ -189,7 +194,7 @@
         "en": "Cervical Fluid Stretch"
       },
       "description": {
-        "en": "Manual strech test of cervical fluid"
+        "en": "Manual strech test of cervical fluid. Short can be streched less than 2 cm, long greater than 2cm."
       },
       "streamId": "body-vulva-mucus-stretch",
       "eventType": "ratio/generic",
@@ -222,7 +227,7 @@
         "en": "Vulva Wetness feeling"
       },
       "description": {
-        "en": "Vulava wetness feeling"
+        "en": "Vulva wetness feeling"
       },
       "streamId": "body-vulva-wetness-feeling",
       "eventType": "ratio/generic",
@@ -249,6 +254,39 @@
       ],
       "repeatable": "any"
     },
+    "body-vulva-wetness-wiping": {
+      "version": "v1",
+      "label": {
+        "en": "Vulva Wetness when wiping"
+      },
+      "description": {
+        "en": "Vulva wetness when wiping"
+      },
+      "streamId": "body-vulva-wetness-wiping",
+      "eventType": "ratio/generic",
+      "type": "select",
+      "options": [
+        {
+          "value": 0,
+          "label": {
+            "en": "Dry"
+          }
+        },
+        {
+          "value": 1,
+          "label": {
+            "en": "Wet"
+          }
+        },
+        {
+          "value": 2,
+          "label": {
+            "en": "Very wet"
+          }
+        }
+      ],
+      "repeatable": "any"
+    },
     "body-weight": {
       "version": "temporary",
       "label": {
diff --git a/docs/streamsTree.json b/docs/streamsTree.json
@@ -17,24 +17,27 @@
       {
         "id": "body-vulva",
         "name": "Vulva",
-        "parentId": "body",
         "children": [
           {
             "id": "body-vulva-wetness",
             "name": "Vulva Wetness",
-            "parentId": "body-vulva",
             "children": [
+              {
+                "id": "body-vulva-wetness-wiping",
+                "name": "Vulva Wetness when wiping",
+                "parentId": "body-vulva-wetness"
+              },
               {
                 "id": "body-vulva-wetness-feeling",
                 "name": "Vulva Wetness Feeling",
                 "parentId": "body-vulva-wetness"
               }
-            ]
+            ],
+            "parentId": "body-vulva"
           },
           {
             "id": "body-vulva-mucus",
             "name": "Vulva Mucus",
-            "parentId": "body-vulva",
             "children": [
               {
                 "id": "body-vulva-mucus-inspect",
@@ -46,9 +49,11 @@
                 "name": "Vulva Mucus Stretch",
                 "parentId": "body-vulva-mucus"
               }
-            ]
+            ],
+            "parentId": "body-vulva"
           }
-        ]
+        ],
+        "parentId": "body"
       }
     ]
   },
@@ -72,7 +77,6 @@
       {
         "id": "fertility-cycles",
         "name": "Cycles",
-        "parentId": "fertility",
         "children": [
           {
             "id": "fertility-cycles-start",
@@ -89,7 +93,8 @@
             "name": "Cycles charted estimation",
             "parentId": "fertility-cycles"
           }
-        ]
+        ],
+        "parentId": "fertility"
       },
       {
         "id": "fertility-miscarriages",
diff --git a/src/streams.js b/src/streams.js
@@ -37,10 +37,15 @@ for (const file of fs.readdirSync(streamsFilePath)) {
 }
 
 function indexStreams (stream, parentId) {
+  if (stream.id == null) throw new Error('missing id for stream: ' + JSON.stringify(stream));
+  if (stream.name == null) throw new Error('missing name for stream: ' + JSON.stringify(stream));
   if (streamsById[stream.id] !== undefined) {
     throw new Error(`Stream with id ${stream.id} already exists, cannot add: ${JSON.stringify(stream)}`);
   }
-  stream.parentId = parentId || null;
+  if (stream.parentId && parentId !== null) {
+    console.log(`${stream.id} does not need parentId : ${stream.parentId}`);
+  }
+  stream.parentId = parentId;
   streamsById[stream.id] = stream;
   if (stream.children) {
     for (const child of stream.children) {

Original file line number	Diff line number	Diff line change
`@@ -17,24 +17,27 @@`
`17`	`17`	`{`
`18`	`18`	`"id": "body-vulva",`
`19`	`19`	`"name": "Vulva",`
`20`		`- "parentId": "body",`
`21`	`20`	`"children": [`
`22`	`21`	`{`
`23`	`22`	`"id": "body-vulva-wetness",`
`24`	`23`	`"name": "Vulva Wetness",`
`25`		`- "parentId": "body-vulva",`
`26`	`24`	`"children": [`
	`25`	`+ {`
	`26`	`+ "id": "body-vulva-wetness-wiping",`
	`27`	`+ "name": "Vulva Wetness when wiping",`
	`28`	`+ "parentId": "body-vulva-wetness"`
	`29`	`+ },`
`27`	`30`	`{`
`28`	`31`	`"id": "body-vulva-wetness-feeling",`
`29`	`32`	`"name": "Vulva Wetness Feeling",`
`30`	`33`	`"parentId": "body-vulva-wetness"`
`31`	`34`	`}`
`32`		`- ]`
	`35`	`+ ],`
	`36`	`+ "parentId": "body-vulva"`
`33`	`37`	`},`
`34`	`38`	`{`
`35`	`39`	`"id": "body-vulva-mucus",`
`36`	`40`	`"name": "Vulva Mucus",`
`37`		`- "parentId": "body-vulva",`
`38`	`41`	`"children": [`
`39`	`42`	`{`
`40`	`43`	`"id": "body-vulva-mucus-inspect",`
`@@ -46,9 +49,11 @@`
`46`	`49`	`"name": "Vulva Mucus Stretch",`
`47`	`50`	`"parentId": "body-vulva-mucus"`
`48`	`51`	`}`
`49`		`- ]`
	`52`	`+ ],`
	`53`	`+ "parentId": "body-vulva"`
`50`	`54`	`}`
`51`		`- ]`
	`55`	`+ ],`
	`56`	`+ "parentId": "body"`
`52`	`57`	`}`
`53`	`58`	`]`
`54`	`59`	`},`
`@@ -72,7 +77,6 @@`
`72`	`77`	`{`
`73`	`78`	`"id": "fertility-cycles",`
`74`	`79`	`"name": "Cycles",`
`75`		`- "parentId": "fertility",`
`76`	`80`	`"children": [`
`77`	`81`	`{`
`78`	`82`	`"id": "fertility-cycles-start",`
`@@ -89,7 +93,8 @@`
`89`	`93`	`"name": "Cycles charted estimation",`
`90`	`94`	`"parentId": "fertility-cycles"`
`91`	`95`	`}`
`92`		`- ]`
	`96`	`+ ],`
	`97`	`+ "parentId": "fertility"`
`93`	`98`	`},`
`94`	`99`	`{`
`95`	`100`	`"id": "fertility-miscarriages",`