fix(filter) : remove imports of filtered types

packages/concerto-core/lib/basemodelmanager.js

@@ -741,10 +741,51 @@ class BaseModelManager {
      */
     filter(predicate){
         const modelManager = new BaseModelManager({...this.options}, this.processFile);
-        const filteredModels = Object.values(this.modelFiles)
-            .map((modelFile) => modelFile.filter(predicate, modelManager))
+        const removedFqns = []; // the list of FQN of types that have been removed
+
+        // remove the types from model files, populating removedFqns
+        let filteredModels = Object.values(this.modelFiles)
+            .map((modelFile) => modelFile.filter(predicate, modelManager, removedFqns))
             .filter(Boolean);
-        modelManager.addModelFiles(filteredModels);
+
+        // remove concerto model files - as these are automatically added
+        // when we recreate the model manager below
+        filteredModels = filteredModels.filter(mf => !mf.isSystemModelFile());
+
+        // now update filteredModels to remove any imports of removed types
+        const modelsWithValidImports = filteredModels.map( modelFile => {
+            const ast = modelFile.getAst();
+            let modified = false;
+            removedFqns.forEach( removedFqn => {
+                const ns = ModelUtil.getNamespace(removedFqn);
+                const isSystemImport = ns.startsWith('concerto@') || ns === 'concerto';
+                if(!isSystemImport && modelFile.getImports().includes(removedFqn)) {
+                    const removeName = ModelUtil.getShortName(removedFqn);
+                    const removeNamespace = ModelUtil.getNamespace(removedFqn);
+                    ast.imports = ast.imports.filter(imp => {
+                        const remove = ModelUtil.getShortName(imp.$class) === 'ImportType' &&
+                            imp.name === removeName &&
+                            imp.namespace === removeNamespace;
+                        return !remove;
+                    });
+                    ast.imports.forEach( imp => {
+                        if(imp.namespace === removeNamespace) {
+                            if(ModelUtil.getShortName(imp.$class) === 'ImportTypes') {
+                                imp.types = imp.types.filter((type) => type !== removeName);
+                            }
+                        }
+                    });
+                    modified = true;
+                }
+            });
+            if(modified) {
+                return new ModelFile(this, ast, undefined, modelFile.fileName);
+            }
+            else {
+                return modelFile;
+            }
+        });
+        modelManager.addModelFiles(modelsWithValidImports);
         return modelManager;
     }
 }

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

@@ -200,7 +200,8 @@ class ModelFile extends Decorated {
     /**
      * Returns the types that have been imported into this ModelFile.
      *
-     * @return {string[]} The array of imports for this ModelFile
+     * @return {string[]} The array of fully-qualified names for types imported by
+     * this ModelFile
      */
     getImports() {
         let result = [];
@@ -830,11 +831,23 @@ class ModelFile extends Decorated {
      *
      * @param {FilterFunction} predicate - the filter function over a Declaration object
      * @param {ModelManager} modelManager - the target ModelManager for the filtered ModelFile
+     * @param {string[]} removedDeclarations - an array that will be populated with the FQN of removed declarations
      * @returns {ModelFile?} - the filtered ModelFile
      * @private
      */
-    filter(predicate, modelManager){
-        const declarations = this.declarations?.filter(predicate).map(declaration => declaration.ast);
+    filter(predicate, modelManager, removedDeclarations){
+
+        let declarations = []; // ast for all included declarations
+        this.declarations?.forEach( declaration => {
+            const included = predicate(declaration);
+            if(!included) {
+                removedDeclarations.push(declaration.getFullyQualifiedName());
+            }
+            else {
+                declarations.push(declaration.ast);
+            }
+        } );
+
         const ast = {
             ...this.ast,
             declarations: declarations,

packages/concerto-core/test/modelmanager.js

@@ -1072,5 +1072,24 @@ concept Bar {
 
             filtered.validateModelFiles();
         });
+
+        it('should remove imports for filtered types', () => {
+            modelManager.addCTOModel(`namespace [email protected]
+            concept Used {}
+            concept Unused {}
+            `, 'child.cto', true);
+
+            modelManager.addCTOModel(`namespace [email protected]
+            import [email protected]
+            import [email protected]
+            import [email protected].{Used,Unused}
+            concept Person {
+                o Used used
+            }
+            `, 'test.cto');
+            const filtered = modelManager.filter(declaration =>
+                ['[email protected]','[email protected]','[email protected]'].includes(declaration.getFullyQualifiedName()));
+            filtered.validateModelFiles();
+        });
     });
 });