Font face resolver: print font faces from font families defined in all theme.json origins

lib/compat/wordpress-6.4/fonts/font-face/class-wp-font-face-resolver.php

@@ -71,12 +71,7 @@ private static function parse_settings( array $settings ) {
 						continue;
 					}
 
-					// Prepare the fonts array structure for this font-family.
-					if ( ! array_key_exists( $font_family_name, $fonts ) ) {
-						$fonts[ $font_family_name ] = array();
-					}
-
-					$fonts[ $font_family_name ] = static::convert_font_face_properties( $definition['fontFace'], $font_family_name );
+					$fonts[] = static::convert_font_face_properties( $definition['fontFace'], $font_family_name );
 				}
 			}
 

lib/compat/wordpress-6.4/fonts/fonts.php

@@ -21,16 +21,16 @@
 	 * @since 6.4.0
 	 *
 	 * @param array[][] $fonts {
-	 *     Optional. The font-families and their font variations. Default empty array.
+	 *     Optional. The font-families and their font faces. Default empty array.
 	 *
-	 *     @type string $font-family => array[] $variations {
-	 *         Optional. An associated array of font variations for this font-family.
-	 *         Each variation has the following structure.
+	 *     @type array {
+	 *         An indexed or associative (keyed by font-family) array of font variations for this font-family.
+	 *         Each font face has the following structure.
 	 *
-	 *         @type array $font_variation {
+	 *         @type array {
 	 *             @type string          $font-family             The font-family property.
 	 *             @type string|string[] $src                     The URL(s) to each resource containing the font data.
-	 *             @type string          $font_style              Optional. The font-style property. Default 'normal'.
+	 *             @type string          $font-style              Optional. The font-style property. Default 'normal'.
 	 *             @type string          $font-weight             Optional. The font-weight property. Default '400'.
 	 *             @type string          $font-display            Optional. The font-display property. Default 'fallback'.
 	 *             @type string          $ascent-override         Optional. The ascent-override property.

lib/compat/wordpress-6.5/fonts/font-face/class-wp-font-face-resolver.php

@@ -0,0 +1,178 @@
+<?php
+/**
+ * WP_Font_Face_Resolver class.
+ *
+ * @package    WordPress
+ * @subpackage Fonts
+ * @since      6.4.0
+ *
+ * @core-merge: this file is located in `wp-includes/fonts/`.
+ */
+
+if ( ! class_exists( 'WP_Font_Face_Resolver' ) ) {
+
+	/**
+	 * The Font Face Resolver abstracts the processing of different data sources
+	 * (such as theme.json) for processing within the Font Face.
+	 *
+	 * This class is for internal core usage and is not supposed to be used by
+	 * extenders (plugins and/or themes).
+	 *
+	 * @access private
+	 */
+	class WP_Font_Face_Resolver {
+
+		/**
+		 * Gets fonts defined in theme.json.
+		 *
+		 * @since 6.4.0
+		 *
+		 * @return array Returns the font-families, each with their font-face variations.
+		 */
+		public static function get_fonts_from_theme_json() {
+			$settings = gutenberg_get_global_settings();
+
+			// Bail out early if there are no font settings.
+			if ( empty( $settings['typography']['fontFamilies'] ) ) {
+				return array();
+			}
+
+			return static::parse_settings( $settings );
+		}
+
+		/**
+		 * Parse theme.json settings to extract font definitions with variations grouped by font-family.
+		 *
+		 * @since 6.4.0
+		 *
+		 * @param array $settings Font settings to parse.
+		 * @return array Returns an array of fonts, grouped by font-family.
+		 */
+		private static function parse_settings( array $settings ) {
+			$fonts = array();
+
+			foreach ( $settings['typography']['fontFamilies'] as $font_families ) {
+				foreach ( $font_families as $definition ) {
+
+					// Skip if "fontFace" is not defined, meaning there are no variations.
+					if ( empty( $definition['fontFace'] ) ) {
+						continue;
+					}
+
+					// Skip if "fontFamily" is not defined.
+					if ( empty( $definition['fontFamily'] ) ) {
+						continue;
+					}
+
+					$font_family_name = static::maybe_parse_name_from_comma_separated_list( $definition['fontFamily'] );
+
+					// Skip if no font family is defined.
+					if ( empty( $font_family_name ) ) {
+						continue;
+					}
+
+					$fonts[] = static::convert_font_face_properties( $definition['fontFace'], $font_family_name );
+				}
+			}
+
+			return $fonts;
+		}
+
+		/**
+		 * Parse font-family name from comma-separated lists.
+		 *
+		 * If the given `fontFamily` is a comma-separated lists (example: "Inter, sans-serif" ),
+		 * parse and return the fist font from the list.
+		 *
+		 * @since 6.4.0
+		 *
+		 * @param string $font_family Font family `fontFamily' to parse.
+		 * @return string Font-family name.
+		 */
+		private static function maybe_parse_name_from_comma_separated_list( $font_family ) {
+			if ( str_contains( $font_family, ',' ) ) {
+				$font_family = explode( ',', $font_family )[0];
+			}
+
+			return trim( $font_family, "\"'" );
+		}
+
+		/**
+		 * Converts font-face properties from theme.json format.
+		 *
+		 * @since 6.4.0
+		 *
+		 * @param array  $font_face_definition The font-face definitions to convert.
+		 * @param string $font_family_property The value to store in the font-face font-family property.
+		 * @return array Converted font-face properties.
+		 */
+		private static function convert_font_face_properties( array $font_face_definition, $font_family_property ) {
+			$converted_font_faces = array();
+
+			foreach ( $font_face_definition as $font_face ) {
+				// Add the font-family property to the font-face.
+				$font_face['font-family'] = $font_family_property;
+
+				// Converts the "file:./" src placeholder into a theme font file URI.
+				if ( ! empty( $font_face['src'] ) ) {
+					$font_face['src'] = static::to_theme_file_uri( (array) $font_face['src'] );
+				}
+
+				// Convert camelCase properties into kebab-case.
+				$font_face = static::to_kebab_case( $font_face );
+
+				$converted_font_faces[] = $font_face;
+			}
+
+			return $converted_font_faces;
+		}
+
+		/**
+		 * Converts each 'file:./' placeholder into a URI to the font file in the theme.
+		 *
+		 * The 'file:./' is specified in the theme's `theme.json` as a placeholder to be
+		 * replaced with the URI to the font file's location in the theme. When a "src"
+		 * beings with this placeholder, it is replaced, converting the src into a URI.
+		 *
+		 * @since 6.4.0
+		 *
+		 * @param array $src An array of font file sources to process.
+		 * @return array An array of font file src URI(s).
+		 */
+		private static function to_theme_file_uri( array $src ) {
+			$placeholder = 'file:./';
+
+			foreach ( $src as $src_key => $src_url ) {
+				// Skip if the src doesn't start with the placeholder, as there's nothing to replace.
+				if ( ! str_starts_with( $src_url, $placeholder ) ) {
+					continue;
+				}
+
+				$src_file        = str_replace( $placeholder, '', $src_url );
+				$src[ $src_key ] = get_theme_file_uri( $src_file );
+			}
+
+			return $src;
+		}
+
+		/**
+		 * Converts all first dimension keys into kebab-case.
+		 *
+		 * @since 6.4.0
+		 *
+		 * @param array $data The array to process.
+		 * @return array Data with first dimension keys converted into kebab-case.
+		 */
+		private static function to_kebab_case( array $data ) {
+			foreach ( $data as $key => $value ) {
+				$kebab_case          = _wp_to_kebab_case( $key );
+				$data[ $kebab_case ] = $value;
+				if ( $kebab_case !== $key ) {
+					unset( $data[ $key ] );
+				}
+			}
+
+			return $data;
+		}
+	}
+}

lib/load.php

@@ -152,8 +152,8 @@ function gutenberg_is_experiment_enabled( $name ) {
 
 // Load the Font Face and Font Face Resolver, if not already loaded by WordPress Core.
 if ( ! class_exists( 'WP_Font_Face' ) ) {
-	require __DIR__ . '/compat/wordpress-6.4/fonts/font-face/class-wp-font-face.php';
-	require __DIR__ . '/compat/wordpress-6.4/fonts/font-face/class-wp-font-face-resolver.php';
+	require __DIR__ . '/compat/wordpress-6.5/fonts/font-face/class-wp-font-face.php';
+	require __DIR__ . '/compat/wordpress-6.5/fonts/font-face/class-wp-font-face-resolver.php';
 }
 
 /*