Separate load importmap from generate

Author: davegaeddert

importmap/core.py

@@ -44,9 +44,7 @@ def __init__(
     ):
         self.config_filename = config_filename
         self.lock_filename = lock_filename
-        self.config = {}
-        self.map = {}
-        self.map_dev = {}
+        self.load()
 
     def load(self):
         # TODO django check to compare lock and config hash
@@ -60,10 +58,18 @@ def load(self):
             self.delete_lockfile()
             return
 
-        config_hash = hash_for_data(self.config)
         lockfile = self.load_lockfile()
+        if lockfile:
+            self.map = lockfile["importmap"]
+            self.map_dev = lockfile["importmap_dev"]
+        else:
+            self.map = {}
+            self.map_dev = {}
 
-        if not lockfile or lockfile["config_hash"] != config_hash:
+    def generate(self, force=False):
+        config_hash = hash_for_data(self.config)
+        lockfile = self.load_lockfile()
+        if force or not lockfile or lockfile["config_hash"] != config_hash:
             # Generate both maps now, tag will choose which to use at runtime
             self.map = self.generate_map()
             self.map_dev = self.generate_map(development=True)
@@ -73,11 +79,6 @@ def load(self):
             lockfile["importmap_dev"] = self.map_dev
             self.save_lockfile(lockfile)
 
-        elif lockfile:
-            # Use map from up-to-date lockfile
-            self.map = lockfile["importmap"]
-            self.map_dev = lockfile["importmap_dev"]
-
     def load_config(self):
         # TODO raise custom exceptions
 

importmap/management/commands/importmap_generate.py

@@ -6,7 +6,9 @@
 class Command(BaseCommand):
     help = "Generate importmap.lock"
 
+    def add_arguments(self, parser):
+        parser.add_argument("--force", action="store_true")
+
     def handle(self, *args, **options):
         importmap = Importmap()
-        importmap.load()
-        # force option to make sure a new lock is updated? or trust the logic?
+        importmap.generate(force=options["force"])

importmap/templatetags/importmap.py

@@ -11,7 +11,6 @@
 @register.inclusion_tag("importmap/scripts.html")
 def importmap_scripts():
     importmap = Importmap()
-    importmap.load()
 
     if settings.DEBUG:
         return {"importmap": json.dumps(importmap.map_dev, indent=2, sort_keys=True)}