Simplify some fields and getters in Package (dart-lang#3104)

Author: srawlins

lib/src/dartdoc_options.dart

@@ -1266,8 +1266,8 @@ class DartdocOptionContext extends DartdocOptionContextBase
   late final Set<String> exclude =
       Set.of(optionSet['exclude'].valueAt(context));
 
-  List<String> get excludePackages =>
-      optionSet['excludePackages'].valueAt(context);
+  Set<String> get _excludePackages =>
+      {...optionSet['excludePackages'].valueAt(context)};
 
   String? get flutterRoot => optionSet['flutterRoot'].valueAt(context);
 
@@ -1331,8 +1331,7 @@ class DartdocOptionContext extends DartdocOptionContextBase
   bool isLibraryExcluded(String name) =>
       exclude.any((pattern) => name == pattern);
 
-  bool isPackageExcluded(String name) =>
-      excludePackages.any((pattern) => name == pattern);
+  bool isPackageExcluded(String name) => _excludePackages.contains(name);
 
   bool get showStats => optionSet['showStats'].valueAt(context);
 

lib/src/generator/templates.runtime_renderers.dart

@@ -15810,7 +15810,6 @@ const _invisibleGetters = {
     'examplePathPrefix',
     'exclude',
     'excludeFooterVersion',
-    'excludePackages',
     'flutterRoot',
     'format',
     'hashCode',

lib/src/model/package.dart

@@ -37,20 +37,29 @@ class Package extends LibraryContainer
         CommentReferable,
         ModelBuilder
     implements Privacy, Documentable {
-  String _name;
-  PackageGraph _packageGraph;
+  @override
+  final String name;
+
+  @override
+  final PackageGraph packageGraph;
 
   // Creates a package, if necessary, and adds it to the [packageGraph].
   factory Package.fromPackageMeta(
       PackageMeta packageMeta, PackageGraph packageGraph) {
     var packageName = packageMeta.name;
-
-    var expectNonLocal = false;
-
-    if (!packageGraph.packageMap.containsKey(packageName) &&
-        packageGraph.allLibrariesAdded) expectNonLocal = true;
-    var package = packageGraph.packageMap.putIfAbsent(packageMeta.name,
-        () => Package._(packageMeta.name, packageGraph, packageMeta));
+    var expectNonLocal = (!packageGraph.packageMap.containsKey(packageName) &&
+        packageGraph.allLibrariesAdded);
+    var packagePath = packageGraph.resourceProvider.pathContext
+        .canonicalize(packageMeta.dir.path);
+    var package = packageGraph.packageMap.putIfAbsent(
+      packageMeta.name,
+      () => Package._(
+        packageMeta.name,
+        packageGraph,
+        packageMeta,
+        packagePath,
+      ),
+    );
     // Verify that we don't somehow decide to document locally a package picked
     // up after all documented libraries are added, because that breaks the
     // assumption that we've picked up all documented libraries and packages
@@ -62,7 +71,12 @@ class Package extends LibraryContainer
     return package;
   }
 
-  Package._(this._name, this._packageGraph, this._packageMeta);
+  Package._(this.name, this.packageGraph, this.packageMeta, this.packagePath)
+      : config = DartdocOptionContext.fromContext(
+          packageGraph.config,
+          packageGraph.resourceProvider.getFolder(packagePath),
+          packageGraph.resourceProvider,
+        );
 
   @override
   bool get isCanonical => true;
@@ -91,7 +105,7 @@ class Package extends LibraryContainer
   String get homepage => packageMeta.homepage;
 
   @override
-  String get kind => (isSdk) ? 'SDK' : 'package';
+  String get kind => isSdk ? 'SDK' : 'package';
 
   @override
   List<Locatable> get documentationFrom => [this];
@@ -126,11 +140,10 @@ class Package extends LibraryContainer
   @override
   ModelElement? get enclosingElement => null;
 
-  @override
-
   /// If we have public libraries, this is the default package, or we are
   /// auto-including dependencies, this package is public.
-  late final bool isPublic =
+  @override
+  bool get isPublic =>
       _isLocalPublicByDefault || libraries.any((l) => l.isPublic);
 
   /// Return true if this is the default package, this is part of an embedder
@@ -153,13 +166,13 @@ class Package extends LibraryContainer
   }();
 
   /// True if the global config excludes this package by name.
-  late final bool _isExcluded = packageGraph.config.isPackageExcluded(name);
+  bool get _isExcluded => packageGraph.config.isPackageExcluded(name);
 
   /// True if this is the package being documented by default, or the
   /// global config indicates we are auto-including dependencies.
-  late final bool _isLocalPublicByDefault =
-      (packageMeta == packageGraph.packageMeta ||
-          packageGraph.config.autoIncludeDependencies);
+  bool get _isLocalPublicByDefault =>
+      packageMeta == packageGraph.packageMeta ||
+      packageGraph.config.autoIncludeDependencies;
 
   /// Returns the location of documentation for this package, for linkToRemote
   /// and canonicalization decision making.
@@ -186,10 +199,9 @@ class Package extends LibraryContainer
   // In theory, a remote package could be documented in any supported format.
   // In practice, devs depend on Dart, Flutter, and/or packages fetched
   // from pub.dev, and we know that all of those use html docs.
-  late final String fileType =
-      (package.documentedWhere == DocumentLocation.remote)
-          ? 'html'
-          : config.format;
+  String get fileType => package.documentedWhere == DocumentLocation.remote
+      ? 'html'
+      : config.format;
 
   @override
   String get fullyQualifiedName => 'package:$name';
@@ -240,20 +252,14 @@ class Package extends LibraryContainer
   @override
   String get location => _pathContext.toUri(packageMeta.resolvedDir).toString();
 
-  @override
-  String get name => _name;
-
   @override
   Package get package => this;
 
-  @override
-  PackageGraph get packageGraph => _packageGraph;
-
   // Workaround for mustache4dart issue where templates do not recognize
   // inherited properties as being in-context.
   @override
   Iterable<Library> get publicLibraries {
-    assert(libraries.every((l) => l.packageMeta == _packageMeta));
+    assert(libraries.every((l) => l.packageMeta == packageMeta));
     return super.publicLibraries;
   }
 
@@ -371,10 +377,7 @@ class Package extends LibraryContainer
   bool get hasDocumentedCategories => documentedCategories.isNotEmpty;
 
   @override
-  late final DartdocOptionContext config = DartdocOptionContext.fromContext(
-      packageGraph.config,
-      packageGraph.resourceProvider.getFolder(packagePath),
-      packageGraph.resourceProvider);
+  final DartdocOptionContext config;
 
   /// Is this the package at the top of the list?  We display the first
   /// package specially (with "Libraries" rather than the package name).
@@ -385,14 +388,11 @@ class Package extends LibraryContainer
   @override
   bool get isSdk => packageMeta.isSdk;
 
-  late final String packagePath =
-      _pathContext.canonicalize(packageMeta.dir.path);
+  final String packagePath;
 
   String get version => packageMeta.version;
 
-  final PackageMeta _packageMeta;
-
-  PackageMeta get packageMeta => _packageMeta;
+  final PackageMeta packageMeta;
 
   @override
   Element? get element => null;
@@ -415,7 +415,7 @@ class Package extends LibraryContainer
   @override
   Iterable<CommentReferable> get referenceParents => [packageGraph];
 
-  p.Context get _pathContext => _packageGraph.resourceProvider.pathContext;
+  p.Context get _pathContext => packageGraph.resourceProvider.pathContext;
 
   @override
   String get referenceName => 'package:$name';