diff --git a/swift/codegen/schema.yml b/swift/codegen/schema.yml
index f2e7837f2b2e..01bb0c2feba1 100644
--- a/swift/codegen/schema.yml
+++ b/swift/codegen/schema.yml
@@ -273,6 +273,9 @@ IfConfigDecl:
 
 ImportDecl:
   _extends: Decl
+  is_exported: predicate
+  module: ModuleDecl
+  declarations: ValueDecl*
 
 MissingMemberDecl:
   _extends: Decl
@@ -1067,6 +1070,8 @@ GenericTypeDecl:
 
 ModuleDecl:
   _extends: TypeDecl
+  is_builtin_module: predicate
+  is_system_module: predicate
 
 ConstructorRefCallExpr:
   _extends: SelfApplyExpr
diff --git a/swift/extractor/SwiftExtractor.cpp b/swift/extractor/SwiftExtractor.cpp
index 65f0ae150cc6..44d2309cb2aa 100644
--- a/swift/extractor/SwiftExtractor.cpp
+++ b/swift/extractor/SwiftExtractor.cpp
@@ -64,8 +64,19 @@ static std::string getTrapFilename(swift::ModuleDecl& module, swift::SourceFile*
   return filename;
 }
 
+static llvm::SmallVector<swift::Decl*> getTopLevelDecls(swift::ModuleDecl& module,
+                                                        swift::SourceFile* primaryFile = nullptr) {
+  llvm::SmallVector<swift::Decl*> ret;
+  ret.push_back(&module);
+  if (primaryFile) {
+    primaryFile->getTopLevelDecls(ret);
+  } else {
+    module.getTopLevelDecls(ret);
+  }
+  return ret;
+}
+
 static void extractDeclarations(const SwiftExtractorConfiguration& config,
-                                llvm::ArrayRef<swift::Decl*> topLevelDecls,
                                 swift::CompilerInstance& compiler,
                                 swift::ModuleDecl& module,
                                 swift::SourceFile* primaryFile = nullptr) {
@@ -119,10 +130,14 @@ static void extractDeclarations(const SwiftExtractorConfiguration& config,
   trap.emit(LocationsTrap{unknownLocationLabel, unknownFileLabel});
 
   SwiftVisitor visitor(compiler.getSourceMgr(), arena, trap, module, primaryFile);
+  auto topLevelDecls = getTopLevelDecls(module, primaryFile);
   for (auto decl : topLevelDecls) {
     visitor.extract(decl);
   }
-  if (topLevelDecls.empty()) {
+  // TODO the following will be moved to the dispatcher when we start caching swift file objects
+  // for the moment, topLevelDecls always contains the current module, which does not have a file
+  // associated with it, so we need a special case when there are no top level declarations
+  if (topLevelDecls.size() == 1) {
     // In the case of empty files, the dispatcher is not called, but we still want to 'record' the
     // fact that the file was extracted
     llvm::SmallString<PATH_MAX> name(filename);
@@ -203,10 +218,7 @@ void codeql::extractSwiftFiles(const SwiftExtractorConfiguration& config,
     // user code twice: once during the module build in a form of a source file, and then as
     // a pre-built module during building of the dependent source files.
     if (module->isSystemModule() || module->isBuiltinModule()) {
-      llvm::SmallVector<swift::Decl*> decls;
-      module->getTopLevelDecls(decls);
-      // TODO: pass ModuleDecl directly when we have module extraction in place?
-      extractDeclarations(config, decls, compiler, *module);
+      extractDeclarations(config, compiler, *module);
     } else {
       for (auto file : module->getFiles()) {
         auto sourceFile = llvm::dyn_cast<swift::SourceFile>(file);
@@ -214,7 +226,7 @@ void codeql::extractSwiftFiles(const SwiftExtractorConfiguration& config,
           continue;
         }
         archiveFile(config, *sourceFile);
-        extractDeclarations(config, sourceFile->getTopLevelDecls(), compiler, *module, sourceFile);
+        extractDeclarations(config, compiler, *module, sourceFile);
       }
     }
   }
diff --git a/swift/extractor/infra/SwiftDispatcher.h b/swift/extractor/infra/SwiftDispatcher.h
index e7aaa5af6128..c7ca43a16143 100644
--- a/swift/extractor/infra/SwiftDispatcher.h
+++ b/swift/extractor/infra/SwiftDispatcher.h
@@ -112,6 +112,12 @@ class SwiftDispatcher {
     return assignNewLabel(&e, std::forward<Args>(args)...);
   }
 
+  // convenience methods for structured C++ creation
+  template <typename E, typename... Args, std::enable_if_t<!std::is_pointer_v<E>>* = nullptr>
+  auto createEntry(const E& e, Args&&... args) {
+    return TrapClassOf<E>{assignNewLabel(&e, std::forward<Args>(args)...)};
+  }
+
   template <typename Tag>
   TrapLabel<Tag> createLabel() {
     auto ret = arena.allocateLabel<Tag>();
@@ -173,6 +179,11 @@ class SwiftDispatcher {
     return ret;
   }
 
+  template <typename... Args>
+  void emitDebugInfo(const Args&... args) {
+    trap.debug(std::forward<Args>(args)...);
+  }
+
   // In order to not emit duplicated entries for declarations, we restrict emission to only
   // Decls declared within the current "scope".
   // Depending on the whether we are extracting a primary source file or not the scope is defined as
@@ -186,7 +197,9 @@ class SwiftDispatcher {
     if (decl.getModuleContext() != &currentModule) {
       return false;
     }
-    if (!currentPrimarySourceFile) {
+    // ModuleDecl is a special case: if it passed the previous test, it is the current module
+    // but it never has a source file, so we short circuit to emit it in any case
+    if (!currentPrimarySourceFile || decl.getKind() == swift::DeclKind::Module) {
       return true;
     }
     if (auto context = decl.getDeclContext()) {
diff --git a/swift/extractor/trap/TrapOutput.h b/swift/extractor/trap/TrapOutput.h
index b9104b9118a4..0e3f61d39e7b 100644
--- a/swift/extractor/trap/TrapOutput.h
+++ b/swift/extractor/trap/TrapOutput.h
@@ -41,8 +41,8 @@ class TrapOutput {
 
   template <typename... Args>
   void debug(const Args&... args) {
-    out_ << "// DEBUG: ";
-    (out_ << ... << args) << '\n';
+    out_ << "/* DEBUG:\n";
+    (out_ << ... << args) << "\n*/\n";
   }
 
  private:
diff --git a/swift/extractor/visitors/DeclVisitor.cpp b/swift/extractor/visitors/DeclVisitor.cpp
index ed47f1e5fb1b..33f746f66345 100644
--- a/swift/extractor/visitors/DeclVisitor.cpp
+++ b/swift/extractor/visitors/DeclVisitor.cpp
@@ -241,16 +241,15 @@ std::variant<codeql::AccessorDecl, codeql::AccessorDeclsTrap> DeclVisitor::trans
 
 std::optional<codeql::SubscriptDecl> DeclVisitor::translateSubscriptDecl(
     const swift::SubscriptDecl& decl) {
-  auto id = dispatcher_.assignNewLabel(decl, mangledName(decl));
-  if (!dispatcher_.shouldEmitDeclBody(decl)) {
+  auto entry = createNamedEntry(decl);
+  if (!entry) {
     return std::nullopt;
   }
-  SubscriptDecl entry{id};
-  entry.element_type = dispatcher_.fetchLabel(decl.getElementInterfaceType());
+  entry->element_type = dispatcher_.fetchLabel(decl.getElementInterfaceType());
   if (auto indices = decl.getIndices()) {
-    entry.params = dispatcher_.fetchRepeatedLabels(*indices);
+    entry->params = dispatcher_.fetchRepeatedLabels(*indices);
   }
-  fillAbstractStorageDecl(decl, entry);
+  fillAbstractStorageDecl(decl, *entry);
   return entry;
 }
 
@@ -262,7 +261,32 @@ codeql::ExtensionDecl DeclVisitor::translateExtensionDecl(const swift::Extension
   return entry;
 }
 
+codeql::ImportDecl DeclVisitor::translateImportDecl(const swift::ImportDecl& decl) {
+  auto entry = dispatcher_.createEntry(decl);
+  entry.is_exported = decl.isExported();
+  entry.module = dispatcher_.fetchLabel(decl.getModule());
+  entry.declarations = dispatcher_.fetchRepeatedLabels(decl.getDecls());
+  return entry;
+}
+
+std::optional<codeql::ModuleDecl> DeclVisitor::translateModuleDecl(const swift::ModuleDecl& decl) {
+  auto entry = createNamedEntry(decl);
+  if (!entry) {
+    return std::nullopt;
+  }
+  entry->is_builtin_module = decl.isBuiltinModule();
+  entry->is_system_module = decl.isSystemModule();
+  fillTypeDecl(decl, *entry);
+  return entry;
+}
+
 std::string DeclVisitor::mangledName(const swift::ValueDecl& decl) {
+  // ASTMangler::mangleAnyDecl crashes when called on `ModuleDecl`
+  // TODO find a more unique string working also when different modules are compiled with the same
+  // name
+  if (decl.getKind() == swift::DeclKind::Module) {
+    return static_cast<const swift::ModuleDecl&>(decl).getRealName().str().str();
+  }
   // prefix adds a couple of special symbols, we don't necessary need them
   return mangler.mangleAnyDecl(&decl, /* prefix = */ false);
 }
diff --git a/swift/extractor/visitors/DeclVisitor.h b/swift/extractor/visitors/DeclVisitor.h
index 0527513d8590..c9a1b43556dd 100644
--- a/swift/extractor/visitors/DeclVisitor.h
+++ b/swift/extractor/visitors/DeclVisitor.h
@@ -50,6 +50,8 @@ class DeclVisitor : public AstVisitorBase<DeclVisitor> {
       const swift::AccessorDecl& decl);
   std::optional<codeql::SubscriptDecl> translateSubscriptDecl(const swift::SubscriptDecl& decl);
   codeql::ExtensionDecl translateExtensionDecl(const swift::ExtensionDecl& decl);
+  codeql::ImportDecl translateImportDecl(const swift::ImportDecl& decl);
+  std::optional<codeql::ModuleDecl> translateModuleDecl(const swift::ModuleDecl& decl);
 
  private:
   std::string mangledName(const swift::ValueDecl& decl);
@@ -66,6 +68,15 @@ class DeclVisitor : public AstVisitorBase<DeclVisitor> {
   void fillAbstractStorageDecl(const swift::AbstractStorageDecl& decl,
                                codeql::AbstractStorageDecl& entry);
 
+  template <typename D>
+  std::optional<TrapClassOf<D>> createNamedEntry(const D& decl) {
+    auto id = dispatcher_.assignNewLabel(decl, mangledName(decl));
+    if (dispatcher_.shouldEmitDeclBody(decl)) {
+      return TrapClassOf<D>{id};
+    }
+    return std::nullopt;
+  }
+
  private:
   swift::Mangle::ASTMangler mangler;
 };
diff --git a/swift/extractor/visitors/TypeVisitor.cpp b/swift/extractor/visitors/TypeVisitor.cpp
index 4514692421e0..4b6733312d33 100644
--- a/swift/extractor/visitors/TypeVisitor.cpp
+++ b/swift/extractor/visitors/TypeVisitor.cpp
@@ -122,13 +122,13 @@ void TypeVisitor::visitParenType(swift::ParenType* type) {
 }
 
 codeql::OptionalType TypeVisitor::translateOptionalType(const swift::OptionalType& type) {
-  auto entry = createEntry(type);
+  auto entry = createTypeEntry(type);
   fillUnarySyntaxSugarType(type, entry);
   return entry;
 }
 
 codeql::ArraySliceType TypeVisitor::translateArraySliceType(const swift::ArraySliceType& type) {
-  auto entry = createEntry(type);
+  auto entry = createTypeEntry(type);
   fillUnarySyntaxSugarType(type, entry);
   return entry;
 }
@@ -163,7 +163,7 @@ void TypeVisitor::visitLValueType(swift::LValueType* type) {
 
 codeql::PrimaryArchetypeType TypeVisitor::translatePrimaryArchetypeType(
     const swift::PrimaryArchetypeType& type) {
-  auto entry = createEntry(type);
+  auto entry = createTypeEntry(type);
   fillArchetypeType(type, entry);
   return entry;
 }
@@ -229,7 +229,7 @@ void TypeVisitor::emitAnyGenericType(swift::AnyGenericType* type,
 
 codeql::NestedArchetypeType TypeVisitor::translateNestedArchetypeType(
     const swift::NestedArchetypeType& type) {
-  auto entry = createEntry(type);
+  auto entry = createTypeEntry(type);
   entry.parent = dispatcher_.fetchLabel(type.getParent());
   entry.associated_type_declaration = dispatcher_.fetchLabel(type.getAssocType());
   fillArchetypeType(type, entry);
@@ -248,26 +248,26 @@ void TypeVisitor::fillArchetypeType(const swift::ArchetypeType& type, ArchetypeT
 }
 
 codeql::ExistentialType TypeVisitor::translateExistentialType(const swift::ExistentialType& type) {
-  auto entry = createEntry(type);
+  auto entry = createTypeEntry(type);
   entry.constraint = dispatcher_.fetchLabel(type.getConstraintType());
   return entry;
 }
 
 codeql::DynamicSelfType TypeVisitor::translateDynamicSelfType(const swift::DynamicSelfType& type) {
-  auto entry = createEntry(type);
+  auto entry = createTypeEntry(type);
   entry.static_self_type = dispatcher_.fetchLabel(type.getSelfType());
   return entry;
 }
 
 codeql::VariadicSequenceType TypeVisitor::translateVariadicSequenceType(
     const swift::VariadicSequenceType& type) {
-  auto entry = createEntry(type);
+  auto entry = createTypeEntry(type);
   fillUnarySyntaxSugarType(type, entry);
   return entry;
 }
 
 codeql::InOutType TypeVisitor::translateInOutType(const swift::InOutType& type) {
-  auto entry = createEntry(type);
+  auto entry = createTypeEntry(type);
   entry.object_type = dispatcher_.fetchLabel(type.getObjectType());
   return entry;
 }
@@ -300,19 +300,19 @@ void TypeVisitor::fillReferenceStorageType(const swift::ReferenceStorageType& ty
 
 codeql::ProtocolCompositionType TypeVisitor::translateProtocolCompositionType(
     const swift::ProtocolCompositionType& type) {
-  auto entry = createEntry(type);
+  auto entry = createTypeEntry(type);
   entry.members = dispatcher_.fetchRepeatedLabels(type.getMembers());
   return entry;
 }
 
 codeql::BuiltinIntegerLiteralType TypeVisitor::translateBuiltinIntegerLiteralType(
     const swift::BuiltinIntegerLiteralType& type) {
-  return createEntry(type);
+  return createTypeEntry(type);
 }
 
 codeql::BuiltinIntegerType TypeVisitor::translateBuiltinIntegerType(
     const swift::BuiltinIntegerType& type) {
-  auto entry = createEntry(type);
+  auto entry = createTypeEntry(type);
   if (type.isFixedWidth()) {
     entry.width = type.getFixedWidth();
   }
@@ -321,51 +321,51 @@ codeql::BuiltinIntegerType TypeVisitor::translateBuiltinIntegerType(
 
 codeql::BuiltinBridgeObjectType TypeVisitor::translateBuiltinBridgeObjectType(
     const swift::BuiltinBridgeObjectType& type) {
-  return createEntry(type);
+  return createTypeEntry(type);
 }
 
 codeql::BuiltinDefaultActorStorageType TypeVisitor::translateBuiltinDefaultActorStorageType(
     const swift::BuiltinDefaultActorStorageType& type) {
-  return createEntry(type);
+  return createTypeEntry(type);
 }
 
 codeql::BuiltinExecutorType TypeVisitor::translateBuiltinExecutorType(
     const swift::BuiltinExecutorType& type) {
-  return createEntry(type);
+  return createTypeEntry(type);
 }
 
 codeql::BuiltinFloatType TypeVisitor::translateBuiltinFloatType(
     const swift::BuiltinFloatType& type) {
-  return createEntry(type);
+  return createTypeEntry(type);
 }
 
 codeql::BuiltinJobType TypeVisitor::translateBuiltinJobType(const swift::BuiltinJobType& type) {
-  return createEntry(type);
+  return createTypeEntry(type);
 }
 
 codeql::BuiltinNativeObjectType TypeVisitor::translateBuiltinNativeObjectType(
     const swift::BuiltinNativeObjectType& type) {
-  return createEntry(type);
+  return createTypeEntry(type);
 }
 
 codeql::BuiltinRawPointerType TypeVisitor::translateBuiltinRawPointerType(
     const swift::BuiltinRawPointerType& type) {
-  return createEntry(type);
+  return createTypeEntry(type);
 }
 
 codeql::BuiltinRawUnsafeContinuationType TypeVisitor::translateBuiltinRawUnsafeContinuationType(
     const swift::BuiltinRawUnsafeContinuationType& type) {
-  return createEntry(type);
+  return createTypeEntry(type);
 }
 
 codeql::BuiltinUnsafeValueBufferType TypeVisitor::translateBuiltinUnsafeValueBufferType(
     const swift::BuiltinUnsafeValueBufferType& type) {
-  return createEntry(type);
+  return createTypeEntry(type);
 }
 
 codeql::BuiltinVectorType TypeVisitor::translateBuiltinVectorType(
     const swift::BuiltinVectorType& type) {
-  return createEntry(type);
+  return createTypeEntry(type);
 }
 
 }  // namespace codeql
diff --git a/swift/extractor/visitors/TypeVisitor.h b/swift/extractor/visitors/TypeVisitor.h
index 99d1ca7fdbb6..77ae8ee13bf2 100644
--- a/swift/extractor/visitors/TypeVisitor.h
+++ b/swift/extractor/visitors/TypeVisitor.h
@@ -81,8 +81,8 @@ class TypeVisitor : public TypeVisitorBase<TypeVisitor> {
   void emitAnyGenericType(swift::AnyGenericType* type, TrapLabel<AnyGenericTypeTag> label);
 
   template <typename T>
-  auto createEntry(const T& type) {
-    TrapClassOf<T> entry{dispatcher_.assignNewLabel(type)};
+  auto createTypeEntry(const T& type) {
+    auto entry = dispatcher_.createEntry(type);
     fillType(type, entry);
     return entry;
   }
diff --git a/swift/integration-tests/posix-only/partial-modules/Modules.expected b/swift/integration-tests/posix-only/partial-modules/Modules.expected
new file mode 100644
index 000000000000..4c738975f343
--- /dev/null
+++ b/swift/integration-tests/posix-only/partial-modules/Modules.expected
@@ -0,0 +1,4 @@
+| file://:0:0:0:0 | A |
+| file://:0:0:0:0 | B |
+| file://:0:0:0:0 | main |
+| file://:0:0:0:0 | partial_modules |
diff --git a/swift/integration-tests/posix-only/partial-modules/Modules.ql b/swift/integration-tests/posix-only/partial-modules/Modules.ql
new file mode 100644
index 000000000000..d456e261a3c1
--- /dev/null
+++ b/swift/integration-tests/posix-only/partial-modules/Modules.ql
@@ -0,0 +1,5 @@
+import swift
+
+from ModuleDecl decl
+where not decl.isBuiltinModule() and not decl.isSystemModule()
+select decl
diff --git a/swift/ql/lib/codeql/swift/generated/decl/ImportDecl.qll b/swift/ql/lib/codeql/swift/generated/decl/ImportDecl.qll
index fdd89db170ad..8f5638ad0694 100644
--- a/swift/ql/lib/codeql/swift/generated/decl/ImportDecl.qll
+++ b/swift/ql/lib/codeql/swift/generated/decl/ImportDecl.qll
@@ -1,6 +1,28 @@
 // generated by codegen/codegen.py
 import codeql.swift.elements.decl.Decl
+import codeql.swift.elements.decl.ModuleDecl
+import codeql.swift.elements.decl.ValueDecl
 
 class ImportDeclBase extends @import_decl, Decl {
   override string getAPrimaryQlClass() { result = "ImportDecl" }
+
+  predicate isExported() { import_decl_is_exported(this) }
+
+  ModuleDecl getModule() {
+    exists(ModuleDecl x |
+      import_decls(this, x) and
+      result = x.resolve()
+    )
+  }
+
+  ValueDecl getDeclaration(int index) {
+    exists(ValueDecl x |
+      import_decl_declarations(this, index, x) and
+      result = x.resolve()
+    )
+  }
+
+  ValueDecl getADeclaration() { result = getDeclaration(_) }
+
+  int getNumberOfDeclarations() { result = count(getADeclaration()) }
 }
diff --git a/swift/ql/lib/codeql/swift/generated/decl/ModuleDecl.qll b/swift/ql/lib/codeql/swift/generated/decl/ModuleDecl.qll
index aad5d00c0c6f..3a1931b2d52f 100644
--- a/swift/ql/lib/codeql/swift/generated/decl/ModuleDecl.qll
+++ b/swift/ql/lib/codeql/swift/generated/decl/ModuleDecl.qll
@@ -3,4 +3,8 @@ import codeql.swift.elements.decl.TypeDecl
 
 class ModuleDeclBase extends @module_decl, TypeDecl {
   override string getAPrimaryQlClass() { result = "ModuleDecl" }
+
+  predicate isBuiltinModule() { module_decl_is_builtin_module(this) }
+
+  predicate isSystemModule() { module_decl_is_system_module(this) }
 }
diff --git a/swift/ql/lib/swift.dbscheme b/swift/ql/lib/swift.dbscheme
index 7937e938e701..83ee84121310 100644
--- a/swift/ql/lib/swift.dbscheme
+++ b/swift/ql/lib/swift.dbscheme
@@ -644,7 +644,20 @@ if_config_decls(  //dir=decl
 );
 
 import_decls(  //dir=decl
-  unique int id: @import_decl
+  unique int id: @import_decl,
+  int module: @module_decl ref
+);
+
+#keyset[id]
+import_decl_is_exported(  //dir=decl
+  int id: @import_decl ref
+);
+
+#keyset[id, index]
+import_decl_declarations(  //dir=decl
+  int id: @import_decl ref,
+  int index: int ref,
+  int declaration: @value_decl ref
 );
 
 missing_member_decls(  //dir=decl
@@ -2018,6 +2031,16 @@ module_decls(  //dir=decl
   unique int id: @module_decl
 );
 
+#keyset[id]
+module_decl_is_builtin_module(  //dir=decl
+  int id: @module_decl ref
+);
+
+#keyset[id]
+module_decl_is_system_module(  //dir=decl
+  int id: @module_decl ref
+);
+
 constructor_ref_call_exprs(  //dir=expr
   unique int id: @constructor_ref_call_expr
 );
diff --git a/swift/ql/test/TestUtils.qll b/swift/ql/test/TestUtils.qll
index 9359944fe904..0c04fcb59897 100644
--- a/swift/ql/test/TestUtils.qll
+++ b/swift/ql/test/TestUtils.qll
@@ -4,6 +4,8 @@ cached
 predicate toBeTested(Element e) {
   e instanceof File
   or
+  exists(ModuleDecl m | m = e and not m.isBuiltinModule() and not m.isSystemModule())
+  or
   exists(Locatable loc |
     loc.getLocation().getFile().getName().matches("%swift/ql/test%") and
     (
diff --git a/swift/ql/test/extractor-tests/generated/File/File.expected b/swift/ql/test/extractor-tests/generated/File/File.expected
index d2ef49d491da..73437ea7a921 100644
--- a/swift/ql/test/extractor-tests/generated/File/File.expected
+++ b/swift/ql/test/extractor-tests/generated/File/File.expected
@@ -1,2 +1,3 @@
+| empty.swift:0:0:0:0 | empty.swift | getName: | empty.swift |
 | file://:0:0:0:0 |  | getName: |  |
-| hello.swift:0:0:0:0 | hello.swift | getName: | hello.swift |
+| non_empty.swift:0:0:0:0 | non_empty.swift | getName: | non_empty.swift |
diff --git a/swift/ql/test/extractor-tests/generated/File/hello.swift b/swift/ql/test/extractor-tests/generated/File/empty.swift
similarity index 100%
rename from swift/ql/test/extractor-tests/generated/File/hello.swift
rename to swift/ql/test/extractor-tests/generated/File/empty.swift
diff --git a/swift/ql/test/extractor-tests/generated/File/non_empty.swift b/swift/ql/test/extractor-tests/generated/File/non_empty.swift
new file mode 100644
index 000000000000..11b15b1a4584
--- /dev/null
+++ b/swift/ql/test/extractor-tests/generated/File/non_empty.swift
@@ -0,0 +1 @@
+print("hello")
diff --git a/swift/ql/test/extractor-tests/generated/decl/ImportDecl/ImportDecl.expected b/swift/ql/test/extractor-tests/generated/decl/ImportDecl/ImportDecl.expected
new file mode 100644
index 000000000000..3e9fd295744c
--- /dev/null
+++ b/swift/ql/test/extractor-tests/generated/decl/ImportDecl/ImportDecl.expected
@@ -0,0 +1,5 @@
+| import.swift:1:1:1:8 | import ... | isExported: | no | getModule: | file://:0:0:0:0 | Swift |
+| import.swift:2:1:2:24 | import ... | isExported: | no | getModule: | file://:0:0:0:0 | Swift |
+| import.swift:3:12:3:32 | import ... | isExported: | yes | getModule: | file://:0:0:0:0 | Swift |
+| import.swift:4:1:4:19 | import ... | isExported: | no | getModule: | file://:0:0:0:0 | Swift |
+| import.swift:5:1:5:23 | import ... | isExported: | no | getModule: | file://:0:0:0:0 | Swift |
diff --git a/swift/ql/test/extractor-tests/generated/decl/ImportDecl/ImportDecl.ql b/swift/ql/test/extractor-tests/generated/decl/ImportDecl/ImportDecl.ql
new file mode 100644
index 000000000000..34978aae118b
--- /dev/null
+++ b/swift/ql/test/extractor-tests/generated/decl/ImportDecl/ImportDecl.ql
@@ -0,0 +1,11 @@
+// generated by codegen/codegen.py
+import codeql.swift.elements
+import TestUtils
+
+from ImportDecl x, string isExported, ModuleDecl getModule
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  (if x.isExported() then isExported = "yes" else isExported = "no") and
+  getModule = x.getModule()
+select x, "isExported:", isExported, "getModule:", getModule
diff --git a/swift/ql/test/extractor-tests/generated/decl/ImportDecl/ImportDecl_getDeclaration.expected b/swift/ql/test/extractor-tests/generated/decl/ImportDecl/ImportDecl_getDeclaration.expected
new file mode 100644
index 000000000000..b877b113bc69
--- /dev/null
+++ b/swift/ql/test/extractor-tests/generated/decl/ImportDecl/ImportDecl_getDeclaration.expected
@@ -0,0 +1,5 @@
+| import.swift:2:1:2:24 | import ... | 0 | file://:0:0:0:0 | Int |
+| import.swift:3:12:3:32 | import ... | 0 | file://:0:0:0:0 | Double |
+| import.swift:4:1:4:19 | import ... | 0 | file://:0:0:0:0 | print(_:separator:terminator:) |
+| import.swift:4:1:4:19 | import ... | 1 | file://:0:0:0:0 | print(_:separator:terminator:to:) |
+| import.swift:5:1:5:23 | import ... | 0 | file://:0:0:0:0 | Hashable |
diff --git a/swift/ql/test/extractor-tests/generated/decl/ImportDecl/ImportDecl_getDeclaration.ql b/swift/ql/test/extractor-tests/generated/decl/ImportDecl/ImportDecl_getDeclaration.ql
new file mode 100644
index 000000000000..852fe518ed2f
--- /dev/null
+++ b/swift/ql/test/extractor-tests/generated/decl/ImportDecl/ImportDecl_getDeclaration.ql
@@ -0,0 +1,7 @@
+// generated by codegen/codegen.py
+import codeql.swift.elements
+import TestUtils
+
+from ImportDecl x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getDeclaration(index)
diff --git a/swift/ql/test/extractor-tests/generated/decl/ImportDecl/MISSING_SOURCE.txt b/swift/ql/test/extractor-tests/generated/decl/ImportDecl/MISSING_SOURCE.txt
deleted file mode 100644
index 0d319d9a6699..000000000000
--- a/swift/ql/test/extractor-tests/generated/decl/ImportDecl/MISSING_SOURCE.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-// generated by codegen/codegen.py
-
-After a swift source file is added in this directory and codegen/codegen.py is run again, test queries
-will appear and this file will be deleted
diff --git a/swift/ql/test/extractor-tests/generated/decl/ImportDecl/import.swift b/swift/ql/test/extractor-tests/generated/decl/ImportDecl/import.swift
new file mode 100644
index 000000000000..bcb562996aef
--- /dev/null
+++ b/swift/ql/test/extractor-tests/generated/decl/ImportDecl/import.swift
@@ -0,0 +1,5 @@
+import Swift
+import typealias Swift.Int
+@_exported import struct Swift.Double
+import func Swift.print  // imports all overloads
+import protocol Swift.Hashable
diff --git a/swift/ql/test/extractor-tests/generated/decl/ModuleDecl/MISSING_SOURCE.txt b/swift/ql/test/extractor-tests/generated/decl/ModuleDecl/MISSING_SOURCE.txt
deleted file mode 100644
index 0d319d9a6699..000000000000
--- a/swift/ql/test/extractor-tests/generated/decl/ModuleDecl/MISSING_SOURCE.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-// generated by codegen/codegen.py
-
-After a swift source file is added in this directory and codegen/codegen.py is run again, test queries
-will appear and this file will be deleted
diff --git a/swift/ql/test/extractor-tests/generated/decl/ModuleDecl/ModuleDecl.expected b/swift/ql/test/extractor-tests/generated/decl/ModuleDecl/ModuleDecl.expected
new file mode 100644
index 000000000000..ef50edbe828b
--- /dev/null
+++ b/swift/ql/test/extractor-tests/generated/decl/ModuleDecl/ModuleDecl.expected
@@ -0,0 +1 @@
+| file://:0:0:0:0 | Foo | getInterfaceType: | module<Foo> | getName: | Foo | isBuiltinModule: | no | isSystemModule: | no |
diff --git a/swift/ql/test/extractor-tests/generated/decl/ModuleDecl/ModuleDecl.ql b/swift/ql/test/extractor-tests/generated/decl/ModuleDecl/ModuleDecl.ql
new file mode 100644
index 000000000000..73e912a82450
--- /dev/null
+++ b/swift/ql/test/extractor-tests/generated/decl/ModuleDecl/ModuleDecl.ql
@@ -0,0 +1,15 @@
+// generated by codegen/codegen.py
+import codeql.swift.elements
+import TestUtils
+
+from
+  ModuleDecl x, Type getInterfaceType, string getName, string isBuiltinModule, string isSystemModule
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  getInterfaceType = x.getInterfaceType() and
+  getName = x.getName() and
+  (if x.isBuiltinModule() then isBuiltinModule = "yes" else isBuiltinModule = "no") and
+  if x.isSystemModule() then isSystemModule = "yes" else isSystemModule = "no"
+select x, "getInterfaceType:", getInterfaceType, "getName:", getName, "isBuiltinModule:",
+  isBuiltinModule, "isSystemModule:", isSystemModule
diff --git a/swift/ql/test/extractor-tests/generated/decl/ModuleDecl/ModuleDecl_getBaseType.expected b/swift/ql/test/extractor-tests/generated/decl/ModuleDecl/ModuleDecl_getBaseType.expected
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/swift/ql/test/extractor-tests/generated/decl/ModuleDecl/ModuleDecl_getBaseType.ql b/swift/ql/test/extractor-tests/generated/decl/ModuleDecl/ModuleDecl_getBaseType.ql
new file mode 100644
index 000000000000..0c0cec75d864
--- /dev/null
+++ b/swift/ql/test/extractor-tests/generated/decl/ModuleDecl/ModuleDecl_getBaseType.ql
@@ -0,0 +1,7 @@
+// generated by codegen/codegen.py
+import codeql.swift.elements
+import TestUtils
+
+from ModuleDecl x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getBaseType(index)
diff --git a/swift/ql/test/extractor-tests/generated/decl/ModuleDecl/modules.swift b/swift/ql/test/extractor-tests/generated/decl/ModuleDecl/modules.swift
new file mode 100644
index 000000000000..bb12ed63ddd8
--- /dev/null
+++ b/swift/ql/test/extractor-tests/generated/decl/ModuleDecl/modules.swift
@@ -0,0 +1 @@
+//codeql-extractor-options: -module-name Foo