From 5a5394b6c164d9a40fc3d5dce44ee58cb76f2397 Mon Sep 17 00:00:00 2001
From: Meghan Denny <hello@nektro.net>
Date: Sat, 10 Jul 2021 18:11:41 -0700
Subject: [PATCH] deps.zig- expose `Package.directory`, closes #9

---
 deps.zig          | 13 +++++++++++++
 docs/deps.zig.md  |  5 +----
 src/cmd/fetch.zig |  3 +++
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/deps.zig b/deps.zig
index 5fd43b88e96bbe4473c4df0dc9f7009649c6ee07..1619edbd7af1de7c6531a1f1b864cd3dc055c314 100644
--- a/deps.zig
+++ b/deps.zig
@@ -31,6 +31,7 @@ pub fn addAllTo(exe: *std.build.LibExeObjStep) void {
 }
 
 pub const Package = struct {
+    directory: string,
     pkg: ?Pkg = null,
     c_include_dirs: []const string = &.{},
     c_source_files: []const string = &.{},
@@ -55,52 +56,64 @@ pub const dirs = struct {
 
 pub const package_data = struct {
     pub const _8mdbh0zuneb0 = Package{
+        .directory = dirs._8mdbh0zuneb0,
         .c_include_dirs = &.{ "include" },
         .c_source_files = &.{ "src/api.c", "src/dumper.c", "src/emitter.c", "src/loader.c", "src/parser.c", "src/reader.c", "src/scanner.c", "src/writer.c" },
         .c_source_flags = &.{ "-DYAML_VERSION_MAJOR=0", "-DYAML_VERSION_MINOR=2", "-DYAML_VERSION_PATCH=5", "-DYAML_VERSION_STRING=\"0.2.5\"", "-DYAML_DECLARE_STATIC=1" },
     };
 
     pub const _s84v9o48ucb0 = Package{
+        .directory = dirs._s84v9o48ucb0,
         .pkg = Pkg{ .name = "ansi", .path = .{ .path = dirs._s84v9o48ucb0 ++ "/src/lib.zig" }, .dependencies = null },
     };
 
     pub const _2ta738wrqbaq = Package{
+        .directory = dirs._2ta738wrqbaq,
         .pkg = Pkg{ .name = "known-folders", .path = .{ .path = dirs._2ta738wrqbaq ++ "/known-folders.zig" }, .dependencies = null },
     };
 
     pub const _0npcrzfdlrvk = Package{
+        .directory = dirs._0npcrzfdlrvk,
         .pkg = Pkg{ .name = "licenses", .path = .{ .path = dirs._0npcrzfdlrvk ++ "/src/lib.zig" }, .dependencies = null },
     };
 
     pub const _9k24gimke1an = Package{
+        .directory = dirs._9k24gimke1an,
         .pkg = Pkg{ .name = "hzzp", .path = .{ .path = dirs._9k24gimke1an ++ "/src/main.zig" }, .dependencies = null },
     };
 
     pub const _csbnipaad8n7 = Package{
+        .directory = dirs._csbnipaad8n7,
         .pkg = Pkg{ .name = "iguanaTLS", .path = .{ .path = dirs._csbnipaad8n7 ++ "/src/main.zig" }, .dependencies = null },
     };
 
     pub const _yyhw90zkzgmu = Package{
+        .directory = dirs._yyhw90zkzgmu,
         .pkg = Pkg{ .name = "network", .path = .{ .path = dirs._yyhw90zkzgmu ++ "/network.zig" }, .dependencies = null },
     };
 
     pub const _u9w9dpp6p804 = Package{
+        .directory = dirs._u9w9dpp6p804,
         .pkg = Pkg{ .name = "uri", .path = .{ .path = dirs._u9w9dpp6p804 ++ "/uri.zig" }, .dependencies = null },
     };
 
     pub const _ejw82j2ipa0e = Package{
+        .directory = dirs._ejw82j2ipa0e,
         .pkg = Pkg{ .name = "zfetch", .path = .{ .path = dirs._ejw82j2ipa0e ++ "/src/main.zig" }, .dependencies = &.{ _9k24gimke1an.pkg.?, _csbnipaad8n7.pkg.?, _yyhw90zkzgmu.pkg.?, _u9w9dpp6p804.pkg.? } },
     };
 
     pub const _ocmr9rtohgcc = Package{
+        .directory = dirs._ocmr9rtohgcc,
         .pkg = Pkg{ .name = "json", .path = .{ .path = dirs._ocmr9rtohgcc ++ "/src/lib.zig" }, .dependencies = null },
     };
 
     pub const _tnj3qf44tpeq = Package{
+        .directory = dirs._tnj3qf44tpeq,
         .pkg = Pkg{ .name = "range", .path = .{ .path = dirs._tnj3qf44tpeq ++ "/src/lib.zig" }, .dependencies = null },
     };
 
     pub const _89ujp8gq842x = Package{
+        .directory = dirs._89ujp8gq842x,
         .pkg = Pkg{ .name = "zigmod", .path = .{ .path = dirs._89ujp8gq842x ++ "/src/lib.zig" }, .dependencies = &.{ _s84v9o48ucb0.pkg.?, _2ta738wrqbaq.pkg.?, _0npcrzfdlrvk.pkg.?, _ejw82j2ipa0e.pkg.?, _ocmr9rtohgcc.pkg.?, _tnj3qf44tpeq.pkg.? } },
     };
 
diff --git a/docs/deps.zig.md b/docs/deps.zig.md
index 1fe2fcee000172e5ebf45a8f48a0562844313815..2c11c30c7b3d440a690fec057612b20efacac039 100644
--- a/docs/deps.zig.md
+++ b/docs/deps.zig.md
@@ -12,6 +12,7 @@ A helper function to add all of the packages, C files, and system libraries to t
 ### `Package`
 ```zig
 pub const Package = struct {
+    directory: string,
     pkg: ?Pkg = null,
     c_include_dirs: []const string = &.{},
     c_source_files: []const string = &.{},
@@ -20,10 +21,6 @@ pub const Package = struct {
 };
 ```
 
-### `dirs`
-- Type: `struct<ID, []const u8>`
-A comptime-known string array of the package directories for each dependency relative to the project root.
-
 ### `package_data`
 - Type: `struct<ID, Package>`
 This is a meta struct that associates ID's to their relavant `Package` definition.
diff --git a/src/cmd/fetch.zig b/src/cmd/fetch.zig
index 58cca45d631846a08d38b430f6e41938c704e640..65808a73db526bdb1e1029a3784b8aeb318a39ca 100644
--- a/src/cmd/fetch.zig
+++ b/src/cmd/fetch.zig
@@ -67,6 +67,7 @@ pub fn create_depszig(dir: []const u8, top_module: u.Module, list: *std.ArrayLis
         \\}
         \\
         \\pub const Package = struct {
+        \\    directory: string,
         \\    pkg: ?Pkg = null,
         \\    c_include_dirs: []const string = &.{},
         \\    c_source_files: []const string = &.{},
@@ -152,9 +153,11 @@ fn print_pkg_data_to(w: std.fs.File.Writer, notdone: *std.ArrayList(u.Module), d
             if (contains_all(mod.deps, done.items)) {
                 try w.print(
                     \\    pub const _{s} = Package{{
+                    \\        .directory = dirs._{s},
                     \\
                 , .{
                     mod.short_id(),
+                    mod.short_id(),
                 });
                 if (mod.main.len > 0 and !std.mem.eql(u8, mod.id, "root")) {
                     try w.print(
-- 
2.54.0