Use standard module loader

index.php

@@ -9,29 +9,12 @@ function tangible_fields( $arg = false ) {
   }
 endif;
 
-new class extends stdClass {
+(include __DIR__ . '/module-loader.php')(new class extends StdClass {
 
   public $name = 'tangible_fields';
-
   // Remember to update the version - Expected format: YYYYMMDD
   public $version = '20240614';
 
-  function __construct() {
-
-    $name     = $this->name;
-    $priority = 99999999 - absint( $this->version );
-
-    remove_all_filters( $name, $priority );
-    add_action( $name, [ $this, 'load' ], $priority );
-
-    $ensure_action = function() use ( $name ) {
-      if ( ! did_action( $name ) ) do_action( $name );
-    };
-
-    add_action('plugins_loaded', $ensure_action, 0);
-    add_action('after_setup_theme', $ensure_action, 0);
-  }
-
   // Dynamic methods
   function __call( $method = '', $args = [] ) {
     if ( isset( $this->$method ) ) {
@@ -43,8 +26,6 @@ function __call( $method = '', $args = [] ) {
 
   function load() {
 
-    remove_all_filters( $this->name ); // First one to load wins
-
     if (!class_exists('tangible\\framework')) {
       $module_path = defined('TANGIBLE_FIELDS_IS_PLUGIN')
         ? __DIR__ . '/vendor/tangible/'
@@ -65,4 +46,4 @@ function load() {
     do_action('tangible_fields_loaded', $fields);
   }
 
-};
+});

module-loader.php

@@ -0,0 +1,32 @@
+<?php
+/**
+ * Module loader: Ensure newest version is loaded when multiple plugins bundle
+ * the same module. Module must define: name, version (YYYYMMDD), and load().
+ * The function `load()` is called on `plugins_loaded` action at priority 0.
+ */
+return function($module) {
+
+  $name     = $module->name;
+  $priority = 99999999 - absint( $module->version );
+
+  remove_all_filters( $name, $priority ); // Same version
+
+  add_action( $name, function() use ($module) {
+    remove_all_filters( $module->name );  // This instance wins
+    $module->load();
+  }, $priority );
+
+  $ensure_action = function() use ( $name ) {
+    if ( ! did_action( $name ) ) do_action( $name );
+  };
+
+  if (doing_action('plugins_loaded') || did_action('plugins_loaded')) {
+    $ensure_action();
+    return;
+  }
+
+  add_action('plugins_loaded', $ensure_action, 0);
+  add_action('after_setup_theme', $ensure_action, 0);
+
+  if (method_exists($module, 'init')) $module->init();
+};