Merge branch 'main' into jonathan/use_modelfile_get_type

accordproject · Nov 7, 2023 · 6ce4b73 · 6ce4b73
2 parents bbf51ac + b4140f6
commit 6ce4b73
Show file tree

Hide file tree

Showing 9 changed files with 191 additions and 60 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/concerto-core/lib/decoratormanager.js b/packages/concerto-core/lib/decoratormanager.js
@@ -439,7 +439,7 @@ class DecoratorManager {
                         this.applyDecorator(declaration.value, type, decorator);
                     }
                 }
-            } else if (!target.property && !target.type) {
+            } else if (!(target.property || target.properties || target.type)) {
                 this.applyDecorator(declaration, type, decorator);
             } else {
                 // scalars are declarations but do not have properties

diff --git a/packages/concerto-core/lib/introspect/field.js b/packages/concerto-core/lib/introspect/field.js
@@ -199,6 +199,7 @@ class Field extends Property {
 
         fieldAst.name = this.ast.name;
         this.scalarField = new Field(this.getParent(), fieldAst);
+        this.scalarField.array = this.isArray();
         return this.scalarField;
     }
 }

diff --git a/packages/concerto-core/test/data/decoratorcommands/test.cto b/packages/concerto-core/test/data/decoratorcommands/test.cto
@@ -11,6 +11,8 @@ concept Person {
     o SSN ssn
     o String address1
     o String address2
+    o String city
+    o String country
     o Integer zip
     o Dictionary dictionary
 }

diff --git a/packages/concerto-core/test/data/decoratorcommands/web.json b/packages/concerto-core/test/data/decoratorcommands/web.json
@@ -92,6 +92,37 @@
                 ]
             }
         },
+        {
+            "$class" : "[email protected]",
+            "type" : "UPSERT",
+            "target" : {
+                "$class" : "[email protected]",
+                "namespace" : "test",
+                "declaration" : "Person",
+                "property" : "address1"
+            },
+            "decorator" : {
+                "$class" : "[email protected]",
+                "name" : "Address",
+                "arguments" : []
+            }
+        },
+        {
+            "$class" : "[email protected]",
+            "type" : "UPSERT",
+            "target" : {
+                "$class" : "[email protected]",
+                "namespace" : "test",
+                "declaration" : "Person",
+                "property" : "country",
+                "type" : "[email protected]"
+            },
+            "decorator" : {
+                "$class" : "[email protected]",
+                "name" : "Address",
+                "arguments" : []
+            }
+        },
         {
             "$class" : "[email protected]",
             "type" : "UPSERT",
@@ -100,7 +131,22 @@
                 "namespace" : "test",
                 "declaration" : "Person",
                 "type" : "[email protected]",
-                "properties" : ["address1", "address2", "zip"]
+                "properties" : ["address2", "zip"]
+            },
+            "decorator" : {
+                "$class" : "[email protected]",
+                "name" : "Address",
+                "arguments" : []
+            }
+        },
+        {
+            "$class" : "[email protected]",
+            "type" : "UPSERT",
+            "target" : {
+                "$class" : "[email protected]",
+                "namespace" : "test",
+                "declaration" : "Person",
+                "properties" : ["city"]
             },
             "decorator" : {
                 "$class" : "[email protected]",

diff --git a/packages/concerto-core/test/data/parser/classdeclaration.scalararray.cto b/packages/concerto-core/test/data/parser/classdeclaration.scalararray.cto
@@ -0,0 +1,21 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace com.testing
+
+scalar SSN extends String default="000-00-0000" regex=/\d{3}-\d{2}-\{4}+/
+
+concept Persons {
+    o SSN[] ssnArray
+}
diff --git a/packages/concerto-core/test/decoratormanager.js b/packages/concerto-core/test/decoratormanager.js
@@ -157,13 +157,19 @@ describe('DecoratorManager', () => {
             const decoratorUnversionedNamespace = bioProperty.getDecorator('UnversionedNamespace');
             decoratorUnversionedNamespace.should.not.be.null;
 
-            // applied using properties
+            // applied using property, no type
             const address1Property = decl.getProperty('address1');
             address1Property.should.not.be.null;
             const decoratorAddress1Property = address1Property.getDecorator('Address');
             decoratorAddress1Property.should.not.be.null;
 
-            // applied using properties
+            // applied using property, string type
+            const countryProperty = decl.getProperty('country');
+            countryProperty.should.not.be.null;
+            const decoratorCountryProperty = countryProperty.getDecorator('Address');
+            decoratorCountryProperty.should.not.be.null;
+
+            // applied using properties, string types only
             const address2Property = decl.getProperty('address2');
             address2Property.should.not.be.null;
             const decoratorAddress2Property = address2Property.getDecorator('Address');
@@ -174,6 +180,12 @@ describe('DecoratorManager', () => {
             zipProperty.should.not.be.null;
             const decoratorZipProperty = zipProperty.getDecorator('Address');
             (decoratorZipProperty ===null).should.be.true;
+
+            // applied using properties, no type
+            const cityProperty = decl.getProperty('city');
+            cityProperty.should.not.be.null;
+            const decoratorCity2Property = cityProperty.getDecorator('Address');
+            decoratorCity2Property.should.not.be.null;
         });
 
         it('should decorate the specified element on the specified Map Declaration (Map Key)', async function() {