npm workspaces and bug fixes

packages/concerto-core/lib/introspect/decorator.js

@@ -95,7 +95,14 @@ class Decorator {
      * @throws {IllegalModelException}
      * @private
      */
-    validate() { }
+    validate() {
+        // check that all type ref arguments can be resolved
+        const typeRefs = this.arguments.filter(a => a?.type === 'Identifier');
+        typeRefs.forEach(typeRef => {
+            const mf = this.getParent().getModelFile();
+            mf.resolveType(`Decorator ${this.getName()} on ${this.getParent().getName()}`, typeRef.name);
+        });
+    }
 
     /**
      * Returns the name of a decorator

packages/concerto-core/lib/introspect/modelfile.js

@@ -384,7 +384,7 @@ class ModelFile extends Decorated {
 
         throw new IllegalModelException(formatter({
             'type': type,
-            'imports': this.imports,
+            'imports': JSON.stringify(this.imports),
             'namespace': this.getNamespace()
         }),this);
     }

packages/concerto-core/test/data/decorators/categories-empty.cto

@@ -0,0 +1,15 @@
+/*
+ * 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 categories@1.0.0

packages/concerto-core/test/data/decorators/categories.cto

@@ -0,0 +1,17 @@
+/*
+ * 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 categories@1.0.0
+
+abstract concept Ok {}

packages/concerto-core/test/data/decorators/invalid-typeref.cto

@@ -0,0 +1,20 @@
+/*
+ * 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 org.acme
+
+@category(Missing)
+asset Car identified by id {
+  o String id
+}

packages/concerto-core/test/data/decorators/valid-typeref-imported.cto

@@ -0,0 +1,22 @@
+/*
+ * 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 org.acme@1.0.0
+
+import categories@1.0.0.{Ok}
+
+@category(Ok)
+asset Car identified by id {
+  o String id
+}

packages/concerto-core/test/data/decorators/valid-typeref.cto

@@ -0,0 +1,22 @@
+/*
+ * 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 org.acme
+
+abstract concept Ok {}
+
+@category(Ok)
+asset Car identified by id {
+  o String id
+}

packages/concerto-core/test/introspect/decorators.js

@@ -179,6 +179,44 @@ describe('Decorators', () => {
                 modelManager.addCTOModel(modelDefinitions);
             }).should.throw(/Duplicate decorator/);
         });
+
+        it('should fail to validate type refs that are not defined locally', () => {
+
+            (() => {
+                const modelManager = new ModelManager();
+                Util.addComposerModel(modelManager);
+                let modelDefinitions = fs.readFileSync('test/data/decorators/invalid-typeref.cto', 'utf8');
+                modelManager.addCTOModel(modelDefinitions);
+            }).should.throw(/Undeclared type "Missing"/);
+        });
+
+        it('should fail to validate type refs that are not in imported namespace', () => {
+
+            (() => {
+                const modelManager = new ModelManager();
+                Util.addComposerModel(modelManager);
+                let modelDefinitions = fs.readFileSync('test/data/decorators/categories-empty.cto', 'utf8');
+                modelManager.addCTOModel(modelDefinitions);
+                modelDefinitions = fs.readFileSync('test/data/decorators/valid-typeref-imported.cto', 'utf8');
+                modelManager.addCTOModel(modelDefinitions);
+            }).should.throw(/Type "Ok" is not defined in namespace/);
+        });
+
+        it('should valdiate type refs that are defined locally', () => {
+            const modelManager = new ModelManager();
+            Util.addComposerModel(modelManager);
+            let modelDefinitions = fs.readFileSync('test/data/decorators/valid-typeref.cto', 'utf8');
+            modelManager.addCTOModel(modelDefinitions);
+        });
+
+        it('should valdiate type refs that are imported', () => {
+            const modelManager = new ModelManager();
+            Util.addComposerModel(modelManager);
+            let modelDefinitions = fs.readFileSync('test/data/decorators/categories.cto', 'utf8');
+            modelManager.addCTOModel(modelDefinitions);
+            modelDefinitions = fs.readFileSync('test/data/decorators/valid-typeref-imported.cto', 'utf8');
+            modelManager.addCTOModel(modelDefinitions);
+        });
     });
 
     describe('#factories', () => {