pubid 2.0.23 → 2.0.25

data/lib/pubid/jis/builder.rb

@@ -8,6 +8,7 @@ module Pubid
       end
 
       def build(data)
+        data = flatten_supplement(data)
         # Handle supplement case first; the SYMBOL clause (if any) attaches to
         # the outermost identifier, be it the base or the supplement. The
         # bindings bind the supplement's fields flat (amd_type/amd_number/…),
@@ -29,6 +30,19 @@ module Pubid
 
       private
 
+      SUPPLEMENT_KEYS = %i[amendment explanation corrigendum].freeze
+
+      # The typed bindings carry a supplement's fields flat (amd_type, …).
+      # The raw parse tree nests them under :amendment, :explanation or
+      # :corrigendum. Read both shapes, or the tree path drops the
+      # supplement.
+      def flatten_supplement(data)
+        key = SUPPLEMENT_KEYS.find { |k| data[k].is_a?(Hash) }
+        return data unless key
+
+        data.except(key).merge(data[key].compact)
+      end
+
       # nil => no SYMBOL clause; "" => bare "SYMBOL" keyword; otherwise value.
       def attach_symbol(identifier, data)
         identifier.symbol = data[:symbol_value].to_s if data[:symbol_present]
@@ -44,13 +58,30 @@ module Pubid
           reaffirmed: (true if data[:reaffirmed]),
         }
         # A WES id carries no series letter, so its series stays nil.
-        wes = Identifiers::WeldingEngineeringStandard
-        return wes.new(**attrs) if data[:wes]
+        return build_wes(data, attrs) if data[:wes]
 
         jis_class_for_type(data[:type]&.to_s)
           .new(series: data[:series].to_s, **attrs)
       end
 
+      # `wes_type` ("TR"/"TS") picks the WES class. `wes_language` is a
+      # language printed before the year ("WES 1112(E):2022").
+      def build_wes(data, attrs)
+        attrs = attrs.merge(wes_language_attrs(data)) if data[:wes_language]
+        Identifiers::WeldingEngineeringStandard
+          .class_for_type(data[:wes_type]&.to_s).new(**attrs)
+      end
+
+      def wes_language_attrs(data)
+        if data[:language]
+          raise Pubid::Errors::ParseError.new(
+            "a WES id carries one language, not two", nil
+          )
+        end
+
+        { language: data[:wes_language].to_s, language_before_year: true }
+      end
+
       def jis_class_for_type(type)
         case type
         when "TR" then Identifiers::TechnicalReport

data/lib/pubid/jis/identifier.rb

@@ -21,6 +21,11 @@ module Pubid
       attribute :parts, :string, collection: true # Optional multi-level parts
       attribute :year, :integer
       attribute :language, :string # "E" or "J"
+      # A WES id can print its language before the year ("WES 1112(E):2022")
+      # or after it ("WES 1112:2022(E)"). This records the source position.
+      # It is spelling only, so `==` does not read it.
+      attribute :language_before_year, :boolean
+      equality_ignored :language_before_year
       # Reaffirmation (再確認): a trailing "R" on the year marks an edition
       # that was reaffirmed without revision (e.g. ":2019R").
       attribute :reaffirmed, :boolean
@@ -45,6 +50,10 @@ module Pubid
         "pubid:jis:explanation" => "Pubid::Jis::Identifiers::Explanation",
         "pubid:jis:welding-engineering-standard" =>
           "Pubid::Jis::Identifiers::WeldingEngineeringStandard",
+        "pubid:jis:welding-engineering-technical-report" =>
+          "Pubid::Jis::Identifiers::WeldingEngineeringTechnicalReport",
+        "pubid:jis:welding-engineering-technical-specification" =>
+          "Pubid::Jis::Identifiers::WeldingEngineeringTechnicalSpecification",
       }.freeze
 
       key_value do
@@ -54,6 +63,7 @@ module Pubid
         map "parts", to: :parts
         map "year", to: :year
         map "language", to: :language
+        map "language_before_year", to: :language_before_year
         map "reaffirmed", to: :reaffirmed
         # render_empty keeps a bare "SYMBOL" (empty-string value) in the hash so
         # it round-trips distinctly from "no symbol" (nil).
@@ -75,6 +85,17 @@ module Pubid
         reaffirmed == true
       end
 
+      def language_before_year?
+        language_before_year == true
+      end
+
+      # The ":year[R]" and "(lang)" tail, in the order the source used.
+      def year_and_language
+        year_part = year ? ":#{year_with_reaffirmation}" : ""
+        lang_part = language ? "(#{language})" : ""
+        language_before_year? ? lang_part + year_part : year_part + lang_part
+      end
+
       # Render a year with its reaffirmation marker, e.g. "2019R".
       def year_with_reaffirmation
         "#{year}#{'R' if reaffirmed?}"
@@ -184,10 +205,9 @@ module Pubid
           raise Pubid::Errors::InvalidInputError, Pubid::INPUT_TOO_LONG_MESSAGE
         end
 
-        identifier = ::Pubid.utf8_input(identifier)
-
-        parsed = Pubid::Parg::Model.bound(:jis, identifier)
-        Builder.build(parsed)
+        face, bindings = Parser.ingest(::Pubid.utf8_input(identifier))
+        parsed = Pubid::Parg::Model.bound(:jis, face)
+        Builder.build(parsed.merge(bindings))
       end
     end
   end

data/lib/pubid/jis/identifiers/welding_engineering_standard.rb

@@ -6,9 +6,20 @@ module Pubid
       # Japan Welding Engineering Society standard. JSA sells WES next to JIS,
       # so it parses through the JIS flavor, but the id carries no series
       # letter and no JIS prefix.
-      # Examples: WES 7700-1:2019, WES 7301:2020R
+      # Examples: WES 7700-1:2019, WES 7301:2020R, WES 1112(E):2022
       class WeldingEngineeringStandard < SingleIdentifier
         PUBLISHER = "WES"
+        # The type token after the WES root: "TR", "TS", or nil.
+        WES_TYPE = nil
+
+        # The WES class for a type token ("TR", "TS" or nil).
+        def self.class_for_type(type)
+          case type
+          when "TR" then WeldingEngineeringTechnicalReport
+          when "TS" then WeldingEngineeringTechnicalSpecification
+          else WeldingEngineeringStandard
+          end
+        end
 
         def type_prefix
           nil
@@ -20,8 +31,12 @@ module Pubid
           nil
         end
 
+        def wes_type
+          self.class::WES_TYPE
+        end
+
         def code
-          result = "#{PUBLISHER} #{number}"
+          result = [PUBLISHER, wes_type, number].compact.join(" ")
           result += parts.map { |p| "-#{p}" }.join if parts&.any?
           result
         end
@@ -29,6 +44,10 @@ module Pubid
         def mr_publisher
           PUBLISHER.downcase
         end
+
+        def mr_type
+          wes_type&.downcase
+        end
       end
     end
   end

data/lib/pubid/jis/identifiers/welding_engineering_technical_report.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Pubid
+  module Jis
+    module Identifiers
+      # WES technical report. The type token follows the WES root.
+      # Example: WES TR 2032:2024
+      class WeldingEngineeringTechnicalReport < WeldingEngineeringStandard
+        WES_TYPE = "TR"
+      end
+    end
+  end
+end

data/lib/pubid/jis/identifiers/welding_engineering_technical_specification.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Pubid
+  module Jis
+    module Identifiers
+      # WES technical specification. The type token follows the WES root.
+      # Examples: WES TS 2816:2015, WES TS 2816(E):2015
+      class WeldingEngineeringTechnicalSpecification <
+            WeldingEngineeringStandard
+        WES_TYPE = "TS"
+      end
+    end
+  end
+end

data/lib/pubid/jis/identifiers.rb

@@ -15,6 +15,11 @@ module Pubid
                "#{__dir__}/identifiers/technical_specification"
       autoload :WeldingEngineeringStandard,
                "#{__dir__}/identifiers/welding_engineering_standard"
+      autoload :WeldingEngineeringTechnicalReport,
+               "#{__dir__}/identifiers/welding_engineering_technical_report"
+      autoload :WeldingEngineeringTechnicalSpecification,
+               "#{__dir__}/identifiers/" \
+               "welding_engineering_technical_specification"
     end
   end
 end

data/lib/pubid/jis/parser.rb

@@ -2,7 +2,37 @@
 
 module Pubid
   module Jis
+    # The JIS grammar is the vendored artifact data/parg/jis.json. This class
+    # holds only the Ruby ingestion in front of it.
     class Parser
+      # A WES type token or a language before the year. Full-width forms
+      # are accepted, as in the grammar.
+      WES_SHIM = /
+        \A(?<root>WES[ 　])
+        (?:(?<type>TR|TS)[ 　])?
+        (?<number>\d+(?:[-ｰ]\d+)*)
+        (?:[(（](?<lang>[EJ])[)）](?=[:：]))?
+      /x
+
+      # The vendored grammar (pubid-grammar artifacts/jis.json) reads neither
+      # "WES TR 2032" nor "WES 1112(E):2022". Until it does, cut those tokens
+      # from the input and bind them as `wes_type` and `wes_language`, the
+      # captures the grammar is to bind (hand-off
+      # pubid__pubid-grammar__jis-wes-language-tr-ts). Other input passes
+      # unchanged.
+      # @param input [String]
+      # @return [Array(String, Hash)] the input for the grammar, the bindings
+      #   to merge into what the grammar binds
+      def self.ingest(input)
+        match = WES_SHIM.match(input)
+        return [input, {}] unless match && (match[:type] || match[:lang])
+
+        bindings = {}
+        bindings[:wes_type] = match[:type] if match[:type]
+        bindings[:wes_language] = match[:lang] if match[:lang]
+        rest = input[match.end(0)..]
+        ["#{match[:root]}#{match[:number]}#{rest}", bindings]
+      end
     end
   end
 end

data/lib/pubid/jis/pubid_urn_schema.rb

@@ -13,17 +13,28 @@ module Pubid
       atom "parts", "part", kind: :list
       atom "year", "year", kind: :int
       atom "reaffirmed", "reaffirmed", kind: :bool
+      atom "language", "lang"
+      # Where a WES id prints its language: "WES 1112(E):2022" against
+      # "WES 1112:2022(E)". Spelling only.
+      facet "language_before_year", "langfirst", kind: :bool
 
       type "pubid:jis:all-parts", "all"
-      type "pubid:jis:amendment", "amd"
-      type "pubid:jis:corrigendum", "cor"
-      type "pubid:jis:explanation", "e"
+      # A supplement's number is its Integer ordinal. The document it
+      # supplements comes first, along +base+. An explanation can have no
+      # number ("…/EXPL"), so its number is an atom.
+      supplement = [["number", :int]]
+      type "pubid:jis:amendment", "amd", core: supplement
+      type "pubid:jis:corrigendum", "cor", core: supplement
+      type "pubid:jis:explanation", "e", core: [],
+                                         atoms: [["number", "n", :int]]
       type "pubid:jis:identifier", "id"
       type "pubid:jis:japanese-industrial-standard", "jis"
       type "pubid:jis:standard", "std"
       type "pubid:jis:technical-report", "tr"
       type "pubid:jis:technical-specification", "ts"
       type "pubid:jis:welding-engineering-standard", "wes"
+      type "pubid:jis:welding-engineering-technical-report", "westr"
+      type "pubid:jis:welding-engineering-technical-specification", "wests"
     end
   end
 end

data/lib/pubid/jis/renderer.rb

@@ -49,8 +49,7 @@ module Pubid
         result = parts.join(" ")
         result += " " if result.length.positive?
         result += id.code.to_s
-        result += ":#{id.year_with_reaffirmation}" if id.year
-        result += "(#{id.language})" if id.language
+        result += id.year_and_language
         result += id.symbol_suffix
         result
       end

data/lib/pubid/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Pubid
-  VERSION = "2.0.23"
+  VERSION = "2.0.25"
 end

data/lib/pubid.rb

@@ -233,12 +233,25 @@ module Pubid
   autoload :Bipm, "pubid/bipm"
   autoload :Bsi, "pubid/bsi"
   autoload :Calconnect, "pubid/calconnect"
+  # The PFS-compiled dev alias of calconnect (pubid/pubid#706 §8): the
+  # acceptance port, registered beside the coded flavor, never routed by
+  # Pubid.parse (registry keys sort the coded key first).
+  autoload :CalconnectPfs, "pubid/calconnect_pfs"
+  # The PFS-compiled module-composition surface of cen_cenelec
+  # (pubid/pubid#706 §4): the EN face composed from the module library —
+  # the measured boundary of what the modules absorb
+  # (spec/pubid/cen_pfs/parity_spec.rb's ledger).
+  autoload :CenPfs, "pubid/cen_pfs"
   autoload :Ccsds, "pubid/ccsds"
   autoload :CenCenelec, "pubid/cen_cenelec"
   autoload :Cie, "pubid/cie"
   autoload :Csa, "pubid/csa"
   autoload :Ecma, "pubid/ecma"
   autoload :Etsi, "pubid/etsi"
+  # The PFS-compiled dev alias of etsi (pubid/pubid#706): registered
+  # beside the coded flavor, never routed by Pubid.parse (registry keys
+  # sort "etsi" first).
+  autoload :EtsiPfs, "pubid/etsi_pfs"
   autoload :Evs, "pubid/evs"
   autoload :Gost, "pubid/gost"
   autoload :Gb, "pubid/gb"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pubid
 version: !ruby/object:Gem::Version
-  version: 2.0.23
+  version: 2.0.25
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-11-12 00:00:00.000000000 Z
+date: 2026-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lutaml-model
@@ -91,9 +91,11 @@ files:
 - data/parg/bipm.parg
 - data/parg/bsi.json
 - data/parg/calconnect.json
+- data/parg/calconnect_pfs.json
 - data/parg/ccsds.json
 - data/parg/cen_cenelec.json
 - data/parg/cen_cenelec.parg
+- data/parg/cen_pfs.json
 - data/parg/cie.json
 - data/parg/csa.json
 - data/parg/doi.json
@@ -101,6 +103,7 @@ files:
 - data/parg/easc.json
 - data/parg/ecma.json
 - data/parg/etsi.json
+- data/parg/etsi_pfs.json
 - data/parg/evs.json
 - data/parg/gb.json
 - data/parg/gost.json
@@ -352,6 +355,15 @@ files:
 - lib/pubid/calconnect/renderer.rb
 - lib/pubid/calconnect/urn_generator.rb
 - lib/pubid/calconnect/urn_parser.rb
+- lib/pubid/calconnect_pfs.rb
+- lib/pubid/calconnect_pfs/builder.rb
+- lib/pubid/calconnect_pfs/identifier.rb
+- lib/pubid/calconnect_pfs/identifiers.rb
+- lib/pubid/calconnect_pfs/identifiers/standard.rb
+- lib/pubid/calconnect_pfs/parser.rb
+- lib/pubid/calconnect_pfs/pubid_urn_schema.rb
+- lib/pubid/calconnect_pfs/renderer.rb
+- lib/pubid/calconnect_pfs/urn_generator.rb
 - lib/pubid/ccsds.rb
 - lib/pubid/ccsds/builder.rb
 - lib/pubid/ccsds/identifier.rb
@@ -391,6 +403,15 @@ files:
 - lib/pubid/cen_cenelec/single_identifier.rb
 - lib/pubid/cen_cenelec/urn_generator.rb
 - lib/pubid/cen_cenelec/urn_parser.rb
+- lib/pubid/cen_pfs.rb
+- lib/pubid/cen_pfs/builder.rb
+- lib/pubid/cen_pfs/identifier.rb
+- lib/pubid/cen_pfs/identifiers.rb
+- lib/pubid/cen_pfs/identifiers/european_norm.rb
+- lib/pubid/cen_pfs/parser.rb
+- lib/pubid/cen_pfs/pubid_urn_schema.rb
+- lib/pubid/cen_pfs/renderer.rb
+- lib/pubid/cen_pfs/urn_generator.rb
 - lib/pubid/cie.rb
 - lib/pubid/cie/CLAUDE.md
 - lib/pubid/cie/builder.rb
@@ -525,6 +546,16 @@ files:
 - lib/pubid/etsi/renderer.rb
 - lib/pubid/etsi/urn_generator.rb
 - lib/pubid/etsi/urn_parser.rb
+- lib/pubid/etsi_pfs.rb
+- lib/pubid/etsi_pfs/CLAUDE.md
+- lib/pubid/etsi_pfs/builder.rb
+- lib/pubid/etsi_pfs/identifier.rb
+- lib/pubid/etsi_pfs/identifiers.rb
+- lib/pubid/etsi_pfs/identifiers/standard.rb
+- lib/pubid/etsi_pfs/parser.rb
+- lib/pubid/etsi_pfs/pubid_urn_schema.rb
+- lib/pubid/etsi_pfs/renderer.rb
+- lib/pubid/etsi_pfs/urn_generator.rb
 - lib/pubid/evs.rb
 - lib/pubid/evs/CLAUDE.md
 - lib/pubid/evs/builder.rb
@@ -866,6 +897,8 @@ files:
 - lib/pubid/jis/identifiers/technical_report.rb
 - lib/pubid/jis/identifiers/technical_specification.rb
 - lib/pubid/jis/identifiers/welding_engineering_standard.rb
+- lib/pubid/jis/identifiers/welding_engineering_technical_report.rb
+- lib/pubid/jis/identifiers/welding_engineering_technical_specification.rb
 - lib/pubid/jis/parser.rb
 - lib/pubid/jis/pubid_urn_schema.rb
 - lib/pubid/jis/renderer.rb