fix(vocabularymanager) analysis fails with scalar. issue 723 (accordp…

…roject#724) Signed-off-by: Dan Selman <[email protected]>
ekarademir · Oct 3, 2023 · c637f19 · c637f19
1 parent f3970a2
commit c637f19
Show file tree

Hide file tree

Showing 10 changed files with 127 additions and 102 deletions.
diff --git a/packages/concerto-vocabulary/lib/vocabulary.js b/packages/concerto-vocabulary/lib/vocabulary.js
@@ -144,12 +144,16 @@ class Vocabulary {
      * @returns {*} an object with missingTerms and additionalTerms properties
      */
     validate(modelFile) {
+        const getOwnProperties = (d) => {
+            // ensures we have a valid return, even for scalars
+            return d.getOwnProperties?.() ? d.getOwnProperties?.() : [];
+        };
         const result = {
             missingTerms: modelFile.getAllDeclarations().flatMap( d => this.getTerm(d.getName())
-                ? d.getOwnProperties().flatMap( p => this.getTerm(d.getName(), p.getName()) ? null : `${d.getName()}.${p.getName()}`)
+                ? getOwnProperties(d).flatMap( p => this.getTerm(d.getName(), p.getName()) ? null : `${d.getName()}.${p.getName()}`)
                 : d.getName() ).filter( i => i !== null),
             additionalTerms: this.content.declarations.flatMap( k => modelFile.getLocalType(Object.keys(k)[0])
-                ? k.properties ? k.properties.flatMap( p => modelFile.getLocalType(Object.keys(k)[0]).getOwnProperty(Object.keys(p)[0]) ? null : `${Object.keys(k)[0]}.${Object.keys(p)[0]}`) : null
+                ? Array.isArray(k.properties) ? k.properties.flatMap( p => modelFile.getLocalType(Object.keys(k)[0]).getOwnProperty(Object.keys(p)[0]) ? null : `${Object.keys(k)[0]}.${Object.keys(p)[0]}`) : null
                 : k ).filter( i => i !== null)
         };
 

diff --git a/packages/concerto-vocabulary/test/__snapshots__/vocabularymanager.js.snap b/packages/concerto-vocabulary/test/__snapshots__/vocabularymanager.js.snap
@@ -19,7 +19,7 @@ Object {
       "target": Object {
         "$class": "[email protected]",
         "declaration": "Color",
-        "namespace": "org.acme",
+        "namespace": "org.acme@1.0.0",
       },
       "type": "UPSERT",
     },
@@ -38,7 +38,7 @@ Object {
       "target": Object {
         "$class": "[email protected]",
         "declaration": "Color",
-        "namespace": "org.acme",
+        "namespace": "org.acme@1.0.0",
         "property": "RED",
       },
       "type": "UPSERT",
@@ -58,7 +58,7 @@ Object {
       "target": Object {
         "$class": "[email protected]",
         "declaration": "Color",
-        "namespace": "org.acme",
+        "namespace": "org.acme@1.0.0",
         "property": "BLUE",
       },
       "type": "UPSERT",
@@ -78,7 +78,7 @@ Object {
       "target": Object {
         "$class": "[email protected]",
         "declaration": "Color",
-        "namespace": "org.acme",
+        "namespace": "org.acme@1.0.0",
         "property": "GREEN",
       },
       "type": "UPSERT",
@@ -98,7 +98,26 @@ Object {
       "target": Object {
         "$class": "[email protected]",
         "declaration": "SSN",
-        "namespace": "org.acme",
+        "namespace": "[email protected]",
+      },
+      "type": "UPSERT",
+    },
+    Object {
+      "$class": "[email protected]",
+      "decorator": Object {
+        "$class": "[email protected]",
+        "arguments": Array [
+          Object {
+            "$class": "[email protected]",
+            "value": "A vehicle identification number",
+          },
+        ],
+        "name": "Term",
+      },
+      "target": Object {
+        "$class": "[email protected]",
+        "declaration": "VIN",
+        "namespace": "[email protected]",
       },
       "type": "UPSERT",
     },
@@ -117,7 +136,7 @@ Object {
       "target": Object {
         "$class": "[email protected]",
         "declaration": "Vehicle",
-        "namespace": "org.acme",
+        "namespace": "org.acme@1.0.0",
       },
       "type": "UPSERT",
     },
@@ -136,7 +155,7 @@ Object {
       "target": Object {
         "$class": "[email protected]",
         "declaration": "Vehicle",
-        "namespace": "org.acme",
+        "namespace": "org.acme@1.0.0",
         "property": "vin",
       },
       "type": "UPSERT",
@@ -156,7 +175,7 @@ Object {
       "target": Object {
         "$class": "[email protected]",
         "declaration": "Vehicle",
-        "namespace": "org.acme",
+        "namespace": "org.acme@1.0.0",
         "property": "vin",
       },
       "type": "UPSERT",
@@ -176,7 +195,7 @@ Object {
       "target": Object {
         "$class": "[email protected]",
         "declaration": "Vehicle",
-        "namespace": "org.acme",
+        "namespace": "org.acme@1.0.0",
         "property": "color",
       },
       "type": "UPSERT",
@@ -196,7 +215,7 @@ Object {
       "target": Object {
         "$class": "[email protected]",
         "declaration": "Vehicle",
-        "namespace": "org.acme",
+        "namespace": "org.acme@1.0.0",
         "property": "$identifier",
       },
       "type": "UPSERT",
@@ -216,7 +235,7 @@ Object {
       "target": Object {
         "$class": "[email protected]",
         "declaration": "Truck",
-        "namespace": "org.acme",
+        "namespace": "org.acme@1.0.0",
       },
       "type": "UPSERT",
     },
@@ -235,7 +254,7 @@ Object {
       "target": Object {
         "$class": "[email protected]",
         "declaration": "Truck",
-        "namespace": "org.acme",
+        "namespace": "org.acme@1.0.0",
       },
       "type": "UPSERT",
     },
@@ -254,7 +273,7 @@ Object {
       "target": Object {
         "$class": "[email protected]",
         "declaration": "Truck",
-        "namespace": "org.acme",
+        "namespace": "org.acme@1.0.0",
         "property": "weight",
       },
       "type": "UPSERT",
@@ -274,7 +293,7 @@ Object {
       "target": Object {
         "$class": "[email protected]",
         "declaration": "Truck",
-        "namespace": "org.acme",
+        "namespace": "org.acme@1.0.0",
         "property": "weight",
       },
       "type": "UPSERT",
@@ -294,7 +313,7 @@ Object {
       "target": Object {
         "$class": "[email protected]",
         "declaration": "Truck",
-        "namespace": "org.acme",
+        "namespace": "org.acme@1.0.0",
         "property": "weight",
       },
       "type": "UPSERT",
@@ -314,7 +333,7 @@ Object {
       "target": Object {
         "$class": "[email protected]",
         "declaration": "Truck",
-        "namespace": "org.acme",
+        "namespace": "org.acme@1.0.0",
         "property": "vin",
       },
       "type": "UPSERT",
@@ -334,7 +353,7 @@ Object {
       "target": Object {
         "$class": "[email protected]",
         "declaration": "Truck",
-        "namespace": "org.acme",
+        "namespace": "org.acme@1.0.0",
         "property": "vin",
       },
       "type": "UPSERT",
@@ -354,7 +373,7 @@ Object {
       "target": Object {
         "$class": "[email protected]",
         "declaration": "Truck",
-        "namespace": "org.acme",
+        "namespace": "org.acme@1.0.0",
         "property": "color",
       },
       "type": "UPSERT",
@@ -374,7 +393,7 @@ Object {
       "target": Object {
         "$class": "[email protected]",
         "declaration": "Truck",
-        "namespace": "org.acme",
+        "namespace": "org.acme@1.0.0",
         "property": "$identifier",
       },
       "type": "UPSERT",
@@ -394,7 +413,7 @@ Object {
       "target": Object {
         "$class": "[email protected]",
         "declaration": "Thing",
-        "namespace": "org.accordproject",
+        "namespace": "org.accordproject@1.0.0",
       },
       "type": "UPSERT",
     },
@@ -413,7 +432,7 @@ Object {
       "target": Object {
         "$class": "[email protected]",
         "declaration": "Thing",
-        "namespace": "org.accordproject",
+        "namespace": "org.accordproject@1.0.0",
         "property": "name",
       },
       "type": "UPSERT",

diff --git a/...ncerto-vocabulary/test/com.example_en.voc → ...-vocabulary/test/[email protected]_en.voc b/...ncerto-vocabulary/test/com.example_en.voc → ...-vocabulary/test/[email protected]_en.voc
@@ -1,5 +1,5 @@
 locale: en
-namespace: com.example
+namespace: com.example@1.0.0
 declarations:
   - Person: A person
     properties:

diff --git a/...rto-vocabulary/test/org.accordproject.cto → ...cabulary/test/[email protected] b/...rto-vocabulary/test/org.accordproject.cto → ...cabulary/test/[email protected]
@@ -1,4 +1,4 @@
-namespace org.accordproject
+namespace org.accordproject@1.0.0
 
 concept Thing {
     o String name

diff --git a/...ges/concerto-vocabulary/test/org.acme.cto → ...ncerto-vocabulary/test/[email protected] b/...ges/concerto-vocabulary/test/org.acme.cto → ...ncerto-vocabulary/test/[email protected]
@@ -1,4 +1,4 @@
-namespace org.acme
+namespace org.acme@1.0.0
 
 enum Color {
     o RED
@@ -7,9 +7,10 @@ enum Color {
 }
 
 scalar SSN extends String default="000-00-0000"
+scalar VIN extends String
 
 asset Vehicle identified by vin {
-    o String vin
+    o VIN vin
     o Color color
 }
 

diff --git a/...ncerto-vocabulary/test/org.acme_en-gb.voc → ...-vocabulary/test/[email protected]_en-gb.voc b/...ncerto-vocabulary/test/org.acme_en-gb.voc → ...-vocabulary/test/[email protected]_en-gb.voc
@@ -1,5 +1,5 @@
 locale: en-gb
-namespace: org.acme
+namespace: org.acme@1.0.0
 declarations:
   - Truck: A lorry
     description: A heavy goods vehicle

diff --git a/.../concerto-vocabulary/test/org.acme_en.voc → ...rto-vocabulary/test/[email protected]_en.voc b/.../concerto-vocabulary/test/org.acme_en.voc → ...rto-vocabulary/test/[email protected]_en.voc
@@ -1,6 +1,7 @@
 locale: en
-namespace: org.acme
+namespace: org.acme@1.0.0
 declarations:
+  - VIN: A vehicle identification number
   - Color: A color
   - Vehicle: A road vehicle
     properties:

diff --git a/.../concerto-vocabulary/test/org.acme_fr.voc → ...rto-vocabulary/test/[email protected]_fr.voc b/.../concerto-vocabulary/test/org.acme_fr.voc → ...rto-vocabulary/test/[email protected]_fr.voc
@@ -1,5 +1,5 @@
 locale: fr
-namespace: org.acme
+namespace: org.acme@1.0.0
 declarations:
   - Vehicle: Véhicule
     properties:

diff --git a/...ncerto-vocabulary/test/org.acme_zh-cn.voc → ...-vocabulary/test/[email protected]_zh-cn.voc b/...ncerto-vocabulary/test/org.acme_zh-cn.voc → ...-vocabulary/test/[email protected]_zh-cn.voc
@@ -1,5 +1,5 @@
 locale: zh-cn
-namespace: org.acme
+namespace: org.acme@1.0.0
 declarations:
   - Color: 颜色
     properties: