version 1

Author: huangGood-star

.gitignore

@@ -13,3 +13,5 @@ doc/api/
 .idea/
 
 **/*.iml
+.devcontainer/*
+.vscode/*

bin/multipack.dart

@@ -1,15 +1,14 @@
 import "dart:io";
 
 import "package:args/command_runner.dart";
+import "package:directed_graph/directed_graph.dart";
 import "package:multipack/commands.dart";
 import "package:multipack/package.dart";
 
 void main(List<String> arguments) async {
-  final dependencyGraph = await getPackageGraph(Directory.current);
-
-  final orderedPackages = dependencyGraph.sortedTopologicalOrdering.reversed
-      .map((vertex) => vertex.data)
-      .toList();
+  final DirectedGraph<Package> dependencyGraph =
+      await getPackageGraph(Directory.current);
+  final List<Package> orderedPackages = getOrderdPackages(dependencyGraph);
 
   final packageNames = orderedPackages
       .map(
@@ -55,3 +54,15 @@ void main(List<String> arguments) async {
 
   await runner.run(arguments);
 }
+
+List<Package> getOrderdPackages(DirectedGraph<Package> dependencyGraph) {
+  final List<Package> packages =
+      dependencyGraph.edgeMap.keys.map((vertex) => vertex.data).toList();
+  final topologicalOrdering = dependencyGraph.sortedTopologicalOrdering.reversed
+      .map((vertex) => vertex.data)
+      .toList();
+  final freeDependentPackages =
+      packages.toSet().difference(topologicalOrdering.toSet());
+  final orderedPackages = [...topologicalOrdering, ...freeDependentPackages];
+  return orderedPackages;
+}

lib/package.dart

@@ -156,29 +156,37 @@ class Package {
   String toString() => name;
 }
 
-Stream<Package> findPackages(Directory root) =>
-    findPackageDirectories(root).asyncMap(
-      (dir) async {
-        final pubspec = await PubSpec.load(dir);
-
-        final dirPath = dir.path;
-        final rootPath = root.path;
-
-        final rootIndex = rootPath.length;
-        final dirIndex = dirPath.lastIndexOf(Platform.pathSeparator);
-
-        return Package(
-          directory: dir,
-          namespace: dirPath.substring(
-            rootIndex == dirIndex ? rootIndex : rootIndex + 1,
-            dirIndex,
-          ),
-          name: pubspec.name,
-          isFlutter: pubspec.allDependencies.containsKey("flutter"),
-          pubspec: pubspec,
-        );
-      },
-    );
+Stream<Package> findPackages(Directory root) {
+  final rootPath = root.path;
+  final rootIndex = rootPath.length;
+  return findPackageDirectories(root).asyncMap(
+    (dir) async {
+      final pubspec = await PubSpec.load(dir);
+
+      final dirPath = dir.path;
+      final dirIndex = dirPath.lastIndexOf(Platform.pathSeparator);
+
+      return Package(
+        directory: dir,
+        namespace: getNamespace(dirPath, rootIndex, dirIndex),
+        name: pubspec.name,
+        isFlutter: pubspec.allDependencies.containsKey("flutter"),
+        pubspec: pubspec,
+      );
+    },
+  );
+}
+
+/// The test case(`get_namespace.test.dart`) shows possible DIRPATH situations
+String getNamespace(String dirPath, int rootIndex, int dirIndex) {
+  int namespaceStartIndex = rootIndex == dirIndex ? rootIndex : rootIndex + 1;
+  if (namespaceStartIndex > dirIndex) namespaceStartIndex = dirIndex;
+
+  return dirPath.substring(
+    namespaceStartIndex,
+    dirIndex,
+  );
+}
 
 Stream<Directory> findPackageDirectories(Directory root) => root
     .list(recursive: true)
@@ -192,28 +200,39 @@ Stream<Directory> findPackageDirectories(Directory root) => root
       (pubspec) => pubspec.parent.absolute,
     );
 
+/// step1: Get all packages as `heads` through `findPackages`.
+///   It can be converted to a dependency graph,
+///   whose head is in `heads` and tail is in `heads.data.pubspec.dependencies`
+/// step2: Find a subgraph from dependency graph.
+///   The tail of that subgraph is in `heads`
 Future<DirectedGraph<Package>> getPackageGraph(Directory root) async {
-  final vertices = await findPackages(root)
+  final heads = await findPackages(root)
       .map((package) => Vertex<Package>(package))
       .toList();
 
+  final edges = getEdges(heads);
+
   return DirectedGraph<Package>(
-    {
-      for (var vertex in vertices)
-        vertex: vertex.data.pubspec.allDependencies.keys
-            .map(
-              (dep) => vertices.firstWhere(
-                (v) => v.data.name == dep,
-                orElse: () => null,
-              ),
-            )
-            .where((v) => v != null)
-            .toList(),
-    },
+    edges,
     comparator: (
       Vertex<Package> vertex1,
       Vertex<Package> vertex2,
     ) =>
         vertex1.data.name.compareTo(vertex2.data.name),
   );
 }
+
+Map<Vertex<Package>, List<Vertex<Package>>> getEdges(
+    List<Vertex<Package>> heads) {
+  final headsMap = Map.fromIterables(heads.map((e) => e.data.name), heads);
+  return {
+    for (Vertex<Package> head in heads)
+      // head: tail
+      head: head.data.pubspec.dependencies.keys
+          .map(
+            (dep) => headsMap.containsKey(dep) ? headsMap[dep] : null,
+          )
+          .where((v) => v != null)
+          .toList(),
+  };
+}

pubspec.yaml

@@ -9,10 +9,12 @@ dependencies:
   args: ^1.6.0
   directed_graph: ^0.2.3
   meta: ^1.0.0
-  pubspec: ^0.1.2
-  pub_semver: ^1.4.4
   path: ^1.6.4
+  pub_semver: ^1.4.4
+  pubspec: ^0.1.2
 dev_dependencies: 
   gql_pedantic: ^1.0.1
+  test: ^1.9.4
+  
 executables:
   multipack: null

test/get_namespace.test.dart

@@ -0,0 +1,36 @@
+import "dart:io";
+import "package:test/test.dart";
+import "package:multipack/package.dart";
+
+void main() {
+  // group("get namespace", () {
+  test("pubspec just in root", () {
+    const String rootPath = "/root";
+    const String dirPath = "/root";
+
+    const rootIndex = rootPath.length;
+    final int dirIndex = dirPath.lastIndexOf(Platform.pathSeparator);
+    expect(getNamespace(dirPath, rootIndex, dirIndex), "");
+  });
+
+  // To keep it As before
+  test("pubspec in subdir of root", () {
+    const String rootPath = "/root";
+    const String dirPath = "/root/dir1";
+
+    const int rootIndex = rootPath.length;
+    final int dirIndex = dirPath.lastIndexOf(Platform.pathSeparator);
+    expect(getNamespace(dirPath, rootIndex, dirIndex), "");
+  });
+
+  // To keep it As before
+  test("pubspec in Sun of fold", () {
+    const String rootPath = "/root";
+    const String dirPath = "/root/dir1/dir2";
+
+    const int rootIndex = rootPath.length;
+    final int dirIndex = dirPath.lastIndexOf(Platform.pathSeparator);
+    expect(getNamespace(dirPath, rootIndex, dirIndex), "dir1");
+  });
+  // });
+}