refactor(visibility): improve type visibility

1. 类型默认为 public
2. 添加 internal 可见性修饰符, 即包内可见, 在这里包的概念是`workspace.library`引入的内容
3. 删除 ---@export

Author: xuhuanzy

crates/emmylua_code_analysis/locales/lint.yml

@@ -261,10 +261,10 @@ Cannot use `...` outside a vararg function.:
   en: "type recursion"
   zh_CN: "类型递归"
   zh_HK: "類型遞歸"
-"Module '%{module}' is not visible. It has @export restrictions.":
-  en: "Module '%{module}' is not visible. It has @export restrictions."
-  zh_CN: "模块 '%{module}' 不可见。它有 @export 限制。"
-  zh_HK: "模組 '%{module}' 不可見。它有 @export 限制。"
+"module '%{module}' visibility is not `public`":
+  en: "module '%{module}' visibility is not `public`"
+  zh_CN: "模块 '%{module}' 可见性不为 `public`"
+  zh_HK: "模組 '%{module}' 可見性不為 `public`"
 "Unknown doc tag: `%{name}`":
   en: "Unknown doc tag: `%{name}`"
   # TODO: translate

crates/emmylua_code_analysis/resources/schema.json

@@ -138,7 +138,6 @@
         "arrayIndex": true,
         "docBaseConstMatchBaseType": true,
         "metaOverrideFileDefine": true,
-        "requireExportGlobal": false,
         "requirePath": false,
         "typeCall": false
       }
@@ -442,6 +441,16 @@
           "description": "Call to a non-callable value",
           "type": "string",
           "const": "call-non-callable"
+        },
+        {
+          "description": "invisible-type-reference",
+          "type": "string",
+          "const": "invisible-type-reference"
+        },
+        {
+          "description": "inconsistent-type-visibility",
+          "type": "string",
+          "const": "inconsistent-type-visibility"
         }
       ]
     },
@@ -1100,11 +1109,6 @@
           "type": "boolean",
           "default": true
         },
-        "requireExportGlobal": {
-          "description": "This option limits the visibility of third-party libraries.\n\nWhen enabled, third-party libraries must use `---@export global` annotation to be importable (i.e., no diagnostic errors and visible in auto-import).",
-          "type": "boolean",
-          "default": false
-        },
         "requirePath": {
           "description": "Whether to enable strict mode require path.",
           "type": "boolean",

crates/emmylua_code_analysis/src/compilation/analyzer/decl/docs.rs

@@ -7,8 +7,8 @@ use flagset::FlagSet;
 use rowan::TextRange;
 
 use crate::{
-    LuaTypeDecl, LuaTypeDeclId,
-    db_index::{LuaDeclTypeKind, LuaTypeFlag},
+    LuaTypeDecl, LuaTypeDeclId, ModuleVisibility,
+    db_index::{LuaDeclTypeKind, LuaTypeFlag, WorkspaceId},
 };
 
 use super::DeclAnalyzer;
@@ -30,7 +30,7 @@ fn get_type_flag_value(
     let mut attr: FlagSet<LuaTypeFlag> = if analyzer.is_meta {
         LuaTypeFlag::Meta.into()
     } else {
-        LuaTypeFlag::None.into()
+        FlagSet::default()
     };
 
     if let Some(flag) = flag {
@@ -48,6 +48,12 @@ fn get_type_flag_value(
                 "constructor" => {
                     attr |= LuaTypeFlag::Constructor;
                 }
+                "public" => {
+                    attr |= LuaTypeFlag::Public;
+                }
+                "internal" => {
+                    attr |= LuaTypeFlag::Internal;
+                }
                 "private" => {
                     attr |= LuaTypeFlag::Private;
                 }
@@ -91,7 +97,7 @@ pub fn analyze_doc_tag_attribute(
         &name,
         range,
         LuaDeclTypeKind::Attribute,
-        LuaTypeFlag::None.into(),
+        FlagSet::default(),
     );
     Some(())
 }
@@ -136,7 +142,7 @@ pub fn analyze_doc_tag_meta(analyzer: &mut DeclAnalyzer, tag: LuaDocTagMeta) ->
             analyzer
                 .db
                 .get_module_index_mut()
-                .set_module_visibility(file_id, false);
+                .set_module_visibility(file_id, ModuleVisibility::Hide);
         } else {
             let workspace_id = analyzer
                 .db
@@ -183,6 +189,12 @@ fn add_type_decl(
     flag: FlagSet<LuaTypeFlag>,
 ) {
     let file_id = analyzer.get_file_id();
+    let workspace_id = analyzer
+        .db
+        .get_module_index()
+        .get_workspace_id(file_id)
+        .or(analyzer.context.workspace_id)
+        .unwrap_or(WorkspaceId::MAIN);
     let type_index = analyzer.db.get_type_index_mut();
 
     let basic_name = name;
@@ -198,6 +210,14 @@ fn add_type_decl(
     let simple_name = id.get_simple_name();
     type_index.add_type_decl(
         file_id,
-        LuaTypeDecl::new(file_id, range, simple_name.to_string(), kind, flag, id),
+        LuaTypeDecl::new(
+            file_id,
+            range,
+            workspace_id,
+            simple_name.to_string(),
+            kind,
+            flag,
+            id,
+        ),
     );
 }

crates/emmylua_code_analysis/src/compilation/analyzer/doc/mod.rs

@@ -10,9 +10,9 @@ mod type_ref_tags;
 
 use super::AnalyzeContext;
 use crate::{
-    FileId, LuaSemanticDeclId, WorkspaceId,
+    FileId, LuaSemanticDeclId,
     compilation::analyzer::AnalysisPipeline,
-    db_index::{DbIndex, LuaTypeDeclId},
+    db_index::{DbIndex, LuaTypeDeclId, WorkspaceId},
     profile::Profile,
 };
 use emmylua_parser::{LuaAstNode, LuaComment, LuaSyntaxNode};

crates/emmylua_code_analysis/src/compilation/analyzer/doc/property_tags.rs

@@ -1,25 +1,55 @@
 use crate::{
-    AsyncState, LuaDeclId, LuaExport, LuaExportScope, LuaNoDiscard, LuaSemanticDeclId,
-    LuaSignatureId, PropertyDeclFeature,
+    AsyncState, LuaDeclId, LuaNoDiscard, LuaSemanticDeclId, LuaSignatureId, PropertyDeclFeature,
+    compilation::analyzer::doc::tags::report_orphan_tag,
 };
 
 use super::{
     DocAnalyzer,
     tags::{find_owner_closure_or_report, get_owner_id_or_report},
 };
-use crate::compilation::analyzer::doc::tags::report_orphan_tag;
 use emmylua_parser::{
     LuaAst, LuaAstNode, LuaDocDescriptionOwner, LuaDocTagAsync, LuaDocTagDeprecated,
-    LuaDocTagExport, LuaDocTagNodiscard, LuaDocTagReadonly, LuaDocTagSource, LuaDocTagVersion,
-    LuaDocTagVisibility, LuaExpr,
+    LuaDocTagNodiscard, LuaDocTagReadonly, LuaDocTagSource, LuaDocTagVersion, LuaDocTagVisibility,
+    LuaExpr,
 };
 
 pub fn analyze_visibility(
     analyzer: &mut DocAnalyzer,
     visibility: LuaDocTagVisibility,
 ) -> Option<()> {
+    let Some(owner) = analyzer.comment.get_owner() else {
+        report_orphan_tag(analyzer, &visibility);
+        return None;
+    };
+    let owner_id = match owner {
+        LuaAst::LuaReturnStat(return_stat) => {
+            let expr = return_stat.child::<LuaExpr>()?;
+            match expr {
+                // 返回变量不能附加可见性
+                // LuaExpr::NameExpr(name_expr) => {
+                //     let name = name_expr.get_name_text()?;
+                //     let tree = analyzer
+                //         .db
+                //         .get_decl_index()
+                //         .get_decl_tree(&analyzer.file_id)?;
+                //     let decl = tree.find_local_decl(&name, name_expr.get_position())?;
+
+                //     Some(LuaSemanticDeclId::LuaDecl(decl.get_id()))
+                // }
+                LuaExpr::ClosureExpr(closure) => Some(LuaSemanticDeclId::Signature(
+                    LuaSignatureId::from_closure(analyzer.file_id, &closure),
+                )),
+                LuaExpr::TableExpr(table_expr) => Some(LuaSemanticDeclId::LuaDecl(LuaDeclId::new(
+                    analyzer.file_id,
+                    table_expr.get_position(),
+                ))),
+                _ => None,
+            }?
+        }
+        _ => get_owner_id_or_report(analyzer, &visibility)?,
+    };
+
     let visibility_kind = visibility.get_visibility_token()?.get_visibility()?;
-    let owner_id = get_owner_id_or_report(analyzer, &visibility)?;
 
     analyzer.db.get_property_index_mut().add_visibility(
         analyzer.file_id,
@@ -114,60 +144,6 @@ pub fn analyze_async(analyzer: &mut DocAnalyzer, tag: LuaDocTagAsync) -> Option<
     Some(())
 }
 
-pub fn analyze_export(analyzer: &mut DocAnalyzer, tag: LuaDocTagExport) -> Option<()> {
-    let Some(owner) = analyzer.comment.get_owner() else {
-        report_orphan_tag(analyzer, &tag);
-        return None;
-    };
-    let owner_id = match owner {
-        LuaAst::LuaReturnStat(return_stat) => {
-            let expr = return_stat.child::<LuaExpr>()?;
-            match expr {
-                LuaExpr::NameExpr(name_expr) => {
-                    let name = name_expr.get_name_text()?;
-                    let tree = analyzer
-                        .db
-                        .get_decl_index()
-                        .get_decl_tree(&analyzer.file_id)?;
-                    let decl = tree.find_local_decl(&name, name_expr.get_position())?;
-
-                    Some(LuaSemanticDeclId::LuaDecl(decl.get_id()))
-                }
-                LuaExpr::ClosureExpr(closure) => Some(LuaSemanticDeclId::Signature(
-                    LuaSignatureId::from_closure(analyzer.file_id, &closure),
-                )),
-                LuaExpr::TableExpr(table_expr) => Some(LuaSemanticDeclId::LuaDecl(LuaDeclId::new(
-                    analyzer.file_id,
-                    table_expr.get_position(),
-                ))),
-                _ => None,
-            }?
-        }
-        _ => get_owner_id_or_report(analyzer, &tag)?,
-    };
-
-    let export_scope = if let Some(scope_text) = tag.get_export_scope() {
-        match scope_text.as_str() {
-            "namespace" => LuaExportScope::Namespace,
-            "global" => LuaExportScope::Global,
-            _ => LuaExportScope::Default,
-        }
-    } else {
-        LuaExportScope::Default
-    };
-
-    let export = LuaExport {
-        scope: export_scope,
-    };
-
-    analyzer
-        .db
-        .get_property_index_mut()
-        .add_export(analyzer.file_id, owner_id, export);
-
-    Some(())
-}
-
 pub fn analyze_readonly(analyzer: &mut DocAnalyzer, readonly: LuaDocTagReadonly) -> Option<()> {
     let owner_id = get_owner_id_or_report(analyzer, &readonly)?;
 

crates/emmylua_code_analysis/src/compilation/analyzer/doc/tags.rs

@@ -16,8 +16,8 @@ use super::{
     diagnostic_tags::analyze_diagnostic,
     field_or_operator_def_tags::{analyze_field, analyze_operator},
     property_tags::{
-        analyze_async, analyze_deprecated, analyze_export, analyze_nodiscard, analyze_source,
-        analyze_version, analyze_visibility,
+        analyze_async, analyze_deprecated, analyze_nodiscard, analyze_source, analyze_version,
+        analyze_visibility,
     },
     type_def_tags::{analyze_alias, analyze_class, analyze_enum, analyze_func_generic},
     type_ref_tags::{
@@ -114,9 +114,6 @@ pub fn analyze_tag(analyzer: &mut DocAnalyzer, tag: LuaDocTag) -> Option<()> {
         LuaDocTag::Other(other) => {
             analyze_other(analyzer, other)?;
         }
-        LuaDocTag::Export(export) => {
-            analyze_export(analyzer, export)?;
-        }
         LuaDocTag::Readonly(readonly) => {
             analyze_readonly(analyzer, readonly)?;
         }

crates/emmylua_code_analysis/src/compilation/analyzer/lua/module.rs

@@ -27,12 +27,23 @@ pub fn analyze_chunk_return(analyzer: &mut LuaAnalyzer, chunk: LuaChunk) -> Opti
 
             let semantic_id = get_semantic_id(analyzer, expr.clone());
 
+            let visibility = semantic_id.as_ref().and_then(|id| {
+                analyzer
+                    .db
+                    .get_property_index()
+                    .get_property(id)
+                    .map(|p| p.visibility.clone())
+            });
+
             let module_info = analyzer
                 .db
                 .get_module_index_mut()
                 .get_module_mut(analyzer.file_id)?;
             module_info.export_type = Some(expr_type.get_result_slot_type(0).unwrap_or(expr_type));
             module_info.semantic_id = semantic_id;
+            if let Some(visibility) = visibility {
+                module_info.merge_visibility(visibility);
+            }
             break;
         }
     }

crates/emmylua_code_analysis/src/compilation/analyzer/mod.rs

@@ -7,7 +7,9 @@ mod lua;
 mod unresolve;
 
 use crate::{
-    Emmyrc, FileId, InFiled, InferFailReason, WorkspaceId, db_index::DbIndex, profile::Profile,
+    Emmyrc, FileId, InFiled, InferFailReason,
+    db_index::{DbIndex, WorkspaceId},
+    profile::Profile,
 };
 use emmylua_parser::LuaChunk;
 use hashbrown::{HashMap, HashSet};

crates/emmylua_code_analysis/src/compilation/test/export_test.rs

@@ -8,7 +8,6 @@ mod closure_param_infer_test;
 mod closure_return_test;
 mod decl_test;
 mod diagnostic_disable_test;
-mod export_test;
 mod flow;
 mod for_range_var_infer_test;
 mod generic_infer_test;
@@ -18,7 +17,7 @@ mod inherit_type;
 mod mathlib_test;
 mod member_infer_test;
 mod metatable_test;
-mod module_annotation;
+mod module_test;
 mod multi_return;
 mod out_of_order;
 mod overload_field;