fontist 3.0.33 → 3.0.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9138df3c46f325e2909f1312ffbe906d3b6bd6b70b695a751af1576f68cd8903
-  data.tar.gz: a496ef4bac70d7b1c414f17d07514bece411a7fc9e8dd1e4901e8fcc8e9d55b5
+  metadata.gz: 1ade396e3811d8a2df5ae15cce0af89df56bf723bc9c915f42f72b487073de39
+  data.tar.gz: ab738ce85235d7cdf811c0cf51ec23b28488637d09f7c9bc77ca9b91c8afb2e6
 SHA512:
-  metadata.gz: 6a179916eb34c002c5635b8e7e6ee9ec6602e8aa1a7a6ab02174fdd6f25a5f183ed307f4db04911f62901a5f44d034850a4225827062503bf606587593918ec0
-  data.tar.gz: 23e184310fc3ab3da8b99fa9dc5c3f506f29962d837c36a46f09211873014eadc46379bea2f5788cfdbec7e5cdc80d610458266c9a33985c8fba217875d38d16
+  metadata.gz: 69e7e9ef3fd5200939a9c2820cd58e19af2cef6890ee4f91b317c227c5e33b46d5ae71046663e565c4883a89bda147a39f9c723a51383ab03203c8e59ac73fcf
+  data.tar.gz: 3e08dc9b127f6e313ddf2f6fcae9fa174832d57c0ae0bc4bb7730094f2fbc05a0171966ce1d793f1af87ef08808b88b0771630acf374347210dcb6ac8bc10f41

data/.github/workflows/rake-metanorma.yaml

@@ -43,9 +43,19 @@ jobs:
         with:
           path: "fontist"
 
-      # Append rather than overwrite: metanorma's own Gemfile.devel carries
-      # the taste-stack gems its compile specs need (metanorma/issues/630)
-      - run: 'echo ''gem "fontist", path: "./fontist"'' >> Gemfile.devel'
+      # Point any existing fontist line at this checkout, appending only
+      # when the host Gemfile declares none (metanorma/issues/630 keeps
+      # the taste-stack gems it carries; since metanorma#652 its
+      # Gemfile.devel also pins fontist, which a blind append would
+      # duplicate into a version-conflict error).
+      - run: |
+          if grep -q '^gem "fontist"' Gemfile.devel Gemfile 2>/dev/null; then
+            sed -i.bak 's/^gem "fontist".*/gem "fontist", path: ".\/fontist"/' Gemfile.devel Gemfile 2>/dev/null || true
+            rm -f Gemfile.devel.bak Gemfile.bak
+          else
+            echo 'gem "fontist", path: "./fontist"' >> Gemfile.devel
+          fi
+        shell: bash
 
       - uses: ruby/setup-ruby@v1
         with:

data/fontist.gemspec

@@ -36,7 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "fontisan", "~> 0.4", ">= 0.4.47"
   spec.add_dependency "fuzzy_match", "~> 2.1"
   spec.add_dependency "git", "~> 6.0"
-  spec.add_dependency "lutaml-model", "~> 0.8.162"
+  spec.add_dependency "lutaml-model", "~> 0.8.164"
   spec.add_dependency "marcel", "~> 1.0"
   spec.add_dependency "moxml", "~> 0.6"
   spec.add_dependency "octokit", "~> 10.0"

data/lib/fontist/system_index.rb

@@ -148,10 +148,12 @@ module Fontist
   class SystemIndexMetadata < Lutaml::Model::Serializable
     attribute :last_scan_time, :integer, default: -> { 0 }
     attribute :directory_mtimes, :string, collection: true, default: -> { [] }
+    attribute :format_version, :integer, default: -> { 0 }
 
     key_value do
       map "last_scan_time", to: :last_scan_time
       map "directory_mtimes", to: :directory_mtimes
+      map "format_version", to: :format_version
     end
 
     def self.load(path)
@@ -173,9 +175,12 @@ module Fontist
     instances :fonts, SystemIndexFont
     attr_accessor :path, :paths_loader
 
-    # Metadata for smart change detection
+    # Metadata for smart change detection. The format generation lives
+    # only in the companion metadata file (see restore_metadata); it is
+    # never serialized into the entry list itself.
     attribute :last_scan_time, :integer, default: -> { 0 }
     attribute :directory_mtimes, :string, collection: true, default: -> { [] }
+    attribute :format_version, :integer, default: -> { 0 }
 
     key_value do
       # A bare entry list: the scan metadata lives in a companion
@@ -188,6 +193,13 @@ module Fontist
     # Don't rebuild index more frequently than this (in seconds)
     INDEX_REBUILD_THRESHOLD = 30 * 60 # 30 minutes
 
+    # Index entry shape generation. v1 stored one entry per font file;
+    # v2 stores one entry per named instance of variable fonts (the
+    # FiraCode[wght].ttf class of files). Bump when the entry shape
+    # changes again: persisted indexes carrying an older generation
+    # cannot answer the current lookups and force a rebuild.
+    INDEX_FORMAT_VERSION = 2
+
     def metadata_path
       "#{@path}.metadata.yml"
     end
@@ -197,19 +209,32 @@ module Fontist
 
       SystemIndexMetadata
         .new(last_scan_time: last_scan_time,
-             directory_mtimes: directory_mtimes)
+             directory_mtimes: directory_mtimes,
+             format_version: INDEX_FORMAT_VERSION)
         .save(metadata_path)
     end
 
     def restore_metadata
       return unless @path
-      return unless last_scan_time.to_i.zero?
 
       meta = SystemIndexMetadata.load(metadata_path)
-      return unless meta.last_scan_time.to_i.positive?
-
       self.last_scan_time = meta.last_scan_time
       self.directory_mtimes = meta.directory_mtimes
+      self.format_version = meta.format_version
+    end
+
+    # Whether the persisted index predates the current entry shape. A
+    # v1 index answers every lookup of a variable font's non-default
+    # families with "missing" (the file registered only under its
+    # default instance), and the directory-mtime fast paths would keep
+    # trusting it forever, so the generation mismatch itself is the
+    # staleness signal. A collection with no companion metadata file is
+    # fresh or in-process memory, not a persisted v1 volume: treating
+    # it as stale would discard every cached entry on the next rebuild.
+    def stale_format?
+      return false unless @path && File.exist?(metadata_path.to_s)
+
+      format_version.to_i != INDEX_FORMAT_VERSION
     end
 
     def set_path(path)
@@ -263,6 +288,7 @@ module Fontist
     end
 
     def find(font, style, format_spec: nil)
+      rebuild_if_stale_format!
       current_fonts = index
 
       return nil if current_fonts.nil? || current_fonts.empty?
@@ -285,6 +311,35 @@ module Fontist
       found_fonts.empty? ? nil : found_fonts
     end
 
+    # Rebuild once per process when the persisted index predates
+    # INDEX_FORMAT_VERSION. Runs even under read_only_mode: a stale
+    # generation answers every lookup of a variable font's non-default
+    # families with "missing", which is worse than a one-off rebuild.
+    # Only a VALID, non-empty persisted index heals: a fresh environment
+    # (no file yet) and a corrupt file (the corruption path explains the
+    # removal fix) take their normal routes.
+    def rebuild_if_stale_format!
+      return if @format_check_done
+
+      @format_check_done = true
+      return unless @path && File.exist?(@path.to_s)
+      return if fonts.nil? || fonts.empty?
+
+      # A corrupt index keeps its documented contract: the corruption
+      # error with the removal hint, not a silent heal.
+      check_index
+
+      restore_metadata
+      return unless stale_format?
+
+      Fontist.ui.warn(
+        "Font index format changed (v#{format_version.to_i} -> " \
+        "v#{INDEX_FORMAT_VERSION}); rebuilding once.",
+      )
+      build(forced: true)
+      mark_verified!
+    end
+
     # Drops the cached family lookup; called when fonts are removed in
     # place (a rebuild replaces the fonts array, which re-keys the
     # lookup by itself)
@@ -573,7 +628,12 @@ module Fontist
     end
 
     def detect_paths(paths, verbose: false, stats: nil)
-      existing_fonts_by_path = fonts&.group_by(&:path) || {}
+      # A generation change invalidates every cached parse in one sweep:
+      # v1 entries (one per file) cannot be reused to build v2 lookups
+      # (one per named instance), and the per-file cache fast path would
+      # otherwise keep serving the stale entry for every unchanged file.
+      existing_fonts_by_path =
+        stale_format? ? {} : (fonts&.group_by(&:path) || {})
 
       # Initialize stats if not provided
       stats ||= IndexStats.new if verbose

data/lib/fontist/version.rb

@@ -1,3 +1,3 @@
 module Fontist
-  VERSION = "3.0.33".freeze
+  VERSION = "3.0.35".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fontist
 version: !ruby/object:Gem::Version
-  version: 3.0.33
+  version: 3.0.35
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-11-04 00:00:00.000000000 Z
+date: 2026-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: down
@@ -98,14 +98,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.162
+        version: 0.8.164
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.162
+        version: 0.8.164
 - !ruby/object:Gem::Dependency
   name: marcel
   requirement: !ruby/object:Gem::Requirement