From 1ea33bafa65492da2de36b8e1c93a430c4c484c3 Mon Sep 17 00:00:00 2001
From: Meghan Denny <hello@nektro.net>
Date: Sat, 20 Feb 2021 19:07:00 -0800
Subject: [PATCH] modfile- grab id from deps

---
 src/common.zig       | 2 +-
 src/util/modfile.zig | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/common.zig b/src/common.zig
index dcba4a6c45282fe316259d8cc9e4fcf0456a4c46..b986f65a2d2ecaefa1f8331ef8400553c09b8a46 100644
--- a/src/common.zig
+++ b/src/common.zig
@@ -118,7 +118,7 @@ pub fn collect_deps(dir: []const u8, mpath: []const u8, comptime options: Collec
                     error.FileNotFound => {
                         if (d.main.len > 0 or d.c_include_dirs.len > 0 or d.c_source_files.len > 0) {
                             var mod_from = try u.Module.from(d);
-                            mod_from.id = try u.random_string(48);
+                            if (mod_from.id.len == 0) mod_from.id = try u.random_string(48);
                             mod_from.clean_path = u.trim_prefix(moddir, dir)[1..];
                             if (mod_from.is_for_this()) try moduledeps.append(mod_from);
                         }
diff --git a/src/util/modfile.zig b/src/util/modfile.zig
index 050f54f07a4afa4fbd5adb03a9cfc99c5b4eb13b..01c00fea4c9e546e9c86367f61ca6ca17be98f74 100644
--- a/src/util/modfile.zig
+++ b/src/util/modfile.zig
@@ -54,7 +54,7 @@ pub const ModFile = struct {
                     try dep_list.append(u.Dep{
                         .type = dep_type,
                         .path = path,
-                        .id = "",
+                        .id = item.mapping.get_string("id"),
                         .name = item.mapping.get_string("name"),
                         .main = item.mapping.get_string("main"),
                         .version = item.mapping.get_string("version"),
-- 
2.54.0