Reduce boilerplate and embrace default config

.gitignore

@@ -1,3 +1,5 @@
+/build/**/*.map
+
 # Logs
 logs
 *.log

advanced-multi-block.php

@@ -13,25 +13,29 @@
  * @package CreateBlock
  */
 
-if (! defined('ABSPATH') ) {
-  exit;
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
 }
 
-// Include Composer's autoload file.
-if ( file_exists( plugin_dir_path( __FILE__ ) . 'vendor/autoload.php' ) ) {
-  require_once plugin_dir_path( __FILE__ ) . 'vendor/autoload.php';
-} else {
-  wp_trigger_error( 'Advanced Multi Block Plugin: Composer autoload file not found. Please run `composer install`.', E_USER_ERROR );
-  return;
+// Include our bundled autoload if not loaded globally.
+if ( ! class_exists( Advanced_Multi_Block\Plugin_Paths::class ) && file_exists( __DIR__ . '/vendor/autoload.php' ) ) {
+	require_once __DIR__ . '/vendor/autoload.php';
 }
 
-// Instantiate the classes.
-$advanced_multi_block_classes = array(
-  \Advanced_Multi_Block\Plugin_Paths::class,
-  \Advanced_Multi_Block\Register_Blocks::class,
-  \Advanced_Multi_Block\Enqueues::class,
+if ( ! class_exists( Advanced_Multi_Block\Plugin_Paths::class ) ) {
+	wp_trigger_error( 'Advanced Multi Block Plugin: Composer autoload file not found. Please run `composer install`.', E_USER_ERROR );
+	return;
+}
+
+// Instantiate our modules.
+$advanced_multi_block_modules = array(
+	new Advanced_Multi_Block\Register_Blocks( __DIR__ . '/build' ),
+	new Advanced_Multi_Block\Enqueues( __DIR__ . '/build' ),
 );
 
-foreach ( $advanced_multi_block_classes as $advanced_multi_block_class ) {
-  new $advanced_multi_block_class();
-}
+
+foreach ( $advanced_multi_block_modules as $advanced_multi_block_module ) {
+	if ( is_a( $advanced_multi_block_module, Advanced_Multi_Block\Plugin_Module::class ) ) {
+		$advanced_multi_block_module->init();
+	}
+}

build/blocks/toggle/render.php

@@ -20,7 +20,7 @@
 		'isDark'    => false,
 		'darkText'  => esc_html__( 'Switch to Light', 'advanced-multi-block' ),
 		'lightText' => esc_html__( 'Switch to Dark', 'advanced-multi-block' ),
-		'themeText'	=> esc_html__( 'Switch to Dark', 'advanced-multi-block' ),
+		'themeText' => esc_html__( 'Switch to Dark', 'advanced-multi-block' ),
 	)
 );
 ?>

classes/class-enqueues.php

@@ -0,0 +1,71 @@
+<?php
+/**
+ * Enqueue assets.
+ *
+ * @package Advanced_Multi_Block
+ */
+
+namespace Advanced_Multi_Block;
+
+/**
+ * Enqueues class.
+ */
+class Enqueues extends Plugin_Module {
+	/**
+	 * Path resolver for build directory.
+	 *
+	 * @var Plugin_Paths
+	 */
+	private Plugin_Paths $build_dir;
+
+	/**
+	 * Setup the class.
+	 *
+	 * @param string $build_path Absolute path to the build directory for all assets.
+	 */
+	public function __construct( string $build_path ) {
+		$this->build_dir = new Plugin_Paths( $build_path );
+	}
+
+	/**
+	 * Initialize the module.
+	 */
+	public function init() {
+		add_action( 'enqueue_block_editor_assets', array( $this, 'enqueue_block_assets' ) );
+		add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_frontend_assets' ) );
+	}
+
+	/**
+	 * Enqueues the block assets for the editor.
+	 */
+	public function enqueue_block_assets() {
+		$asset_meta = $this->build_dir->get_asset_meta( 'editor-script.js' );
+
+		if ( $asset_meta ) {
+			wp_enqueue_script(
+				'editor-script-js',
+				$this->build_dir->get_url( 'editor-script.js' ),
+				$asset_meta['dependencies'],
+				$asset_meta['version'],
+				false
+			);
+		}
+	}
+
+	/**
+	 * Enqueues the block assets for the frontend.
+	 */
+	public function enqueue_frontend_assets() {
+		$asset_meta = $this->build_dir->get_asset_meta( 'frontend-script.js' );
+
+		if ( $asset_meta ) {
+			wp_enqueue_script(
+				'frontend-script-js',
+				$this->build_dir->get_url( 'frontend-script.js' ),
+				$asset_meta['dependencies'],
+				$asset_meta['version'],
+				true
+			);
+		}
+	}
+}

classes/class-plugin-module.php

@@ -0,0 +1,18 @@
+<?php
+/**
+ * Base class for plugin modules which can be initialized.
+ *
+ * @package Advanced_Multi_Block
+ */
+
+namespace Advanced_Multi_Block;
+
+/**
+ * Plugin module extended by other classes.
+ */
+abstract class Plugin_Module {
+	/**
+	 * Initialize the module.
+	 */
+	abstract public function init();
+}

classes/class-plugin-paths.php

@@ -0,0 +1,83 @@
+<?php
+/**
+ * Help resolve paths and URLs relative to plugin directories.
+ *
+ * @package Advanced_Multi_Block
+ */
+
+namespace Advanced_Multi_Block;
+
+/**
+ * Path resolver class.
+ */
+class Plugin_Paths {
+
+	/**
+	 * Absolute path to a directory inside the plugin.
+	 *
+	 * @var string
+	 */
+	private string $plugin_dir;
+
+	/**
+	 * Setup the class.
+	 *
+	 * @param string $plugin_dir Absolute path to the plugin directory.
+	 */
+	public function __construct( string $plugin_dir ) {
+		$this->plugin_dir = rtrim( $plugin_dir, '\\/' );
+	}
+
+	/**
+	 * Get a URL for a path relative to the plugin directory.
+	 *
+	 * @param string|null $relative_path Optional. Relative path from the plugin directory.
+	 *                                   Default null for the base plugin URL.
+	 *
+	 * @return string The full URL.
+	 */
+	public function get_url( ?string $relative_path = null ): string {
+		if ( isset( $relative_path ) ) {
+			return plugins_url( ltrim( $relative_path, '/' ), $this->plugin_dir . '/fake.file' );
+		}
+
+		return plugins_url( '', $this->plugin_dir . '/fake.file' );
+	}
+
+	/**
+	 * Get the absolute path for a path relative to the plugin directory.
+	 *
+	 * @param string|null $relative_path Optional. Relative path from the plugin directory.
+	 *                                   Default null for the base plugin path.
+	 *
+	 * @return string The full path.
+	 */
+	public function get_path( ?string $relative_path = null ): string {
+		if ( isset( $relative_path ) ) {
+			return $this->plugin_dir . '/' . ltrim( $relative_path, '/' );
+		}
+
+		return $this->plugin_dir;
+	}
+
+	/**
+	 * Get the asset meta for a built asset file.
+	 *
+	 * @param string $asset_file Asset file name relative to the plugin directory.
+	 *
+	 * @return array|null Array with 'dependencies' and 'version' keys, or null if not found.
+	 */
+	public function get_asset_meta( string $asset_file ): ?array {
+		$asset_path = $this->get_path( dirname( $asset_file ) . '/' . pathinfo( $asset_file, PATHINFO_FILENAME ) . '.asset.php' );
+
+		if ( file_exists( $asset_path ) ) {
+			$meta = include $asset_path;
+
+			if ( is_array( $meta ) ) {
+				return $meta;
+			}
+		}
+
+		return null;
+	}
+}