pubid 2.0.0.pre.alpha.11 → 2.0.0.pre.alpha.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18402e85b2e19640920f3e216f62f704c6770a840f654d92f96d799b03fbda71
-  data.tar.gz: e9b1735e843fe5eb20574749d2581c19192799f86fe3f31a8e72b3d0a00ab047
+  metadata.gz: b4e0a5a8d4b5c1410b934712637a882a703f34ded60d92ed1d8f0a6465974396
+  data.tar.gz: 35bf6a1a075f68f35c682a3cfdde6bd5166523535491a74f1cb3473abcfaacec
 SHA512:
-  metadata.gz: 1cbcaa48b3fb036aca2a62aabe9cdfc4733ad030dc833aa31b5be2dbba433ef6459f87dc22c0b811e707687ce18ee966a2882f928a44d2d0df89e159df5ea837
-  data.tar.gz: 0ea8984849aa9f56a400948fb5ab7b29f5de122f70ab036d35fe344655abe70fbe9e34d9cdc04b80673593190b1479d8ac47b31bd21e056ad9b64fa6743e18e6
+  metadata.gz: 7dcd7c3d8f91d1ef5fa1ab296e4f922b435b04b70a06d184e6d2449d32a270bf31b14f352523686921072aac37bd0f91e0b6f62a6d44c28349b04ca7079092ed
+  data.tar.gz: ff8bc5531169fa3dace613d7369e656fdc2418f559adf3b527722e80144fd5a7aaa2db28da23979b2e3b8bc5af31132dca631e955a454d6262ad6a3ddf459b77

data/lib/pubid/bsi/components/date.rb

@@ -1,11 +1,17 @@
-# frozen_string_literal: true
+# frozen_string: true
 
 module Pubid
   module Bsi
     module Components
-      # Date component for BSI flavor
-      class Date < Pubid::Components::Date
-      end
+      # BSI has no date semantics of its own, so this is the shared
+      # component, not a subclass: an empty `class Date <
+      # Pubid::Components::Date` rejected the shared instances a nested
+      # cross-flavor adopted identifier carries (pubid#379 — the adoption
+      # wrappers delegate `date` to the foreign object), and made `==`
+      # compare the parsed instance against the deserialized one by class.
+      # Aliased so the builder's `Components::Date.new` call sites construct
+      # the shared class.
+      Date = ::Pubid::Components::Date
     end
   end
 end

data/lib/pubid/bsi/identifiers/british_industrial_practice.rb

@@ -6,7 +6,7 @@ module Pubid
       # British Industrial Practice (BIP)
       # Examples: "BIP 2225:2022", "BIP 0142:2014", "BIP 0009:2020"
       class BritishIndustrialPractice < SingleIdentifier
-        attribute :date, Bsi::Components::Date
+
 
         def self.type
           {

data/lib/pubid/bsi/identifiers/handbook.rb

@@ -6,7 +6,7 @@ module Pubid
       # BSI Handbook
       # Examples: "Handbook 17:1963", "HB 10146:1998"
       class Handbook < SingleIdentifier
-        attribute :date, Bsi::Components::Date
+
         attribute :original_abbr, :string # Preserve "Handbook" or "HB"
 
         def self.type

data/lib/pubid/bsi/identifiers/practice_guide.rb

@@ -6,7 +6,7 @@ module Pubid
       # BSI Practice Guide (PP - Published Practice)
       # Examples: "PP 888:1982", "PP 7307:1986", "PP 7722:2006"
       class PracticeGuide < SingleIdentifier
-        attribute :date, Bsi::Components::Date
+
 
         def self.type
           {

data/lib/pubid/bsi/single_identifier.rb

@@ -50,9 +50,18 @@ module Pubid
       attribute :part, :string
       attribute :subpart, :string
       attribute :second_number, Bsi::Components::Code # For collections like PAS 2035/2030
-      attribute :date, Bsi::Components::Date
+      # The shared component, not Bsi::Components::Date: the adoption wrappers
+      # (AdoptedEuropeanNorm, AdoptedInternationalStandard) delegate `date` to
+      # the foreign identifier they wrap, whose date is a plain
+      # ::Pubid::Components::Date — the empty BSI subclass rejected it and
+      # to_hash/from_hash raised on every "BS EN …"/"BS ISO …" (pubid#379,
+      # the same shape as the bsi-set-cross-flavor-type fix).
+      attribute :date, ::Pubid::Components::Date
       attribute :stage, Pubid::Components::Stage
-      attribute :type, Bsi::Components::Type
+      # Shared Type too: the leaf builders reach for ::Pubid::Components::Type
+      # (e.g. a default materialized from self.type), which the empty BSI
+      # subclass rejected — "BIP 2225:2022" et al. failed to_hash on `type`.
+      attribute :type, ::Pubid::Components::Type
       attribute :typed_stage, Pubid::Components::TypedStage
       attribute :edition, :string
       attribute :month, :integer

data/lib/pubid/ccsds/identifier.rb

@@ -22,6 +22,10 @@ module Pubid
       # are likewise CCSDS-specific plain strings.
       attribute :number, :string
       attribute :part, :string
+      # CCSDS never populates `subpart`, but the inherited declaration is a
+      # Components::Code, and a parent that disagrees with its leaves is the
+      # determinism landmine. Declare it here, like every converted flavor.
+      attribute :subpart, :string
       attribute :edition, :string
       attribute :type, :string
       attribute :suffix, :string

data/lib/pubid/ccsds/single_identifier.rb

@@ -9,10 +9,14 @@ module Pubid
       attribute :publisher, Components::Publisher, default: -> {
         Components::Publisher.new(body: "CCSDS")
       }
-      attribute :series, Components::Code
-      attribute :number, Components::Code
-      attribute :part, Components::Code
-      attribute :book_color, Components::Code
+      # Plain :string, like the live Pubid::Ccsds::Identifier hierarchy, which
+      # already declared these as strings. This class is otherwise
+      # unreferenced — nothing inherits it and no builder instantiates it — but
+      # it is public API, so it is retyped rather than deleted.
+      attribute :series, :string
+      attribute :number, :string
+      attribute :part, :string
+      attribute :book_color, :string
       attribute :edition, Components::Edition
       attribute :retired, :boolean, default: -> { false }
       attribute :language, Components::Language
@@ -29,14 +33,14 @@ module Pubid
         result += " "
 
         # Series (optional single letter before number)
-        result += series.value if series
+        result += series.to_s if series
 
         # Number with part (using dot notation)
-        result += number.value
-        result += ".#{part.value}" if part
+        result += number.to_s
+        result += ".#{part}" if part
 
         # Book color (required) - no space before dash
-        result += "-#{book_color.value}" if book_color
+        result += "-#{book_color}" if book_color
 
         # Edition (optional)
         result += "-#{edition.number}" if edition
@@ -54,11 +58,11 @@ module Pubid
         return nil unless other.is_a?(SingleIdentifier)
 
         # Compare by number first
-        num_cmp = number.value.to_i <=> other.number.value.to_i
+        num_cmp = number.to_i <=> other.number.to_i
         return num_cmp unless num_cmp.zero?
 
         # Then by part
-        part_cmp = (part ? part.value.to_i : 0) <=> (other.part ? other.part.value.to_i : 0)
+        part_cmp = part.to_i <=> other.part.to_i
         return part_cmp unless part_cmp.zero?
 
         # Then by edition

data/lib/pubid/csa/builder.rb

@@ -253,7 +253,7 @@ module Pubid
 
         # Code
         if parsed_hash[:code]
-          series.number = Components::Code.new(value: parsed_hash[:code].to_s)
+          series.number = parsed_hash[:code].to_s
         end
 
         # Year format and year
@@ -520,13 +520,13 @@ module Pubid
           # Pattern: "C22.1-15" should become code="C22.1", year="2015"
           if !data[:year] && code_value =~ /^(.+)-(\d{2})$/
             # Split code and year
-            identifier.number = Components::Code.new(value: $1)
+            identifier.number = $1
             # Convert 2-digit year to 4-digit
             year_2digit = $2
             identifier.year = "20#{year_2digit}"
             identifier.year_format = "dash"
           else
-            identifier.number = Components::Code.new(value: code_value)
+            identifier.number = code_value
           end
         end
 

data/lib/pubid/csa/identifiers/bundled.rb

@@ -47,7 +47,7 @@ module Pubid
                              end
                            end
             base_str = (needs_space ? "#{prefix} " : prefix) +
-              base.number.value.to_s + # Normalized code (e.g. "C22.2-1")
+              base.number.to_s + # Normalized code (e.g. "C22.2-1")
               ":#{year_display}"
             parts = [base_str]
           else
@@ -60,7 +60,7 @@ module Pubid
             bundled_with.each do |bundled|
               # For Cec identifiers, use normalized code format
               if bundled.is_a?(Cec)
-                bundled_part = bundled.number.value.to_s # e.g. "C22.2-2"
+                bundled_part = bundled.number.to_s # e.g. "C22.2-2"
                 if bundled.year
                   # Use dash if year_format is dash, otherwise colon
                   separator = bundled.year_format == "dash" ? "-" : ":"

data/lib/pubid/csa/identifiers/cec.rb

@@ -58,7 +58,7 @@ module Pubid
         def number
           return nil unless cec_part && no_number
 
-          Components::Code.new(value: "#{cec_part.value}-#{no_number.value}")
+          "#{cec_part.value}-#{no_number.value}"
         end
       end
     end

data/lib/pubid/csa/single_identifier.rb

@@ -86,7 +86,7 @@ module Pubid
       end
 
       def number_from_kv(model, value)
-        model.number = Components::Code.new(value: value.to_s)
+        model.number = value.to_s
       end
 
       # `no_number` is a plain :string here but a Components::Code on Cec, so

data/lib/pubid/csa/urn_generator.rb

@@ -19,7 +19,7 @@ module Pubid
       def urn_number
         return nil unless identifier.number
 
-        identifier.number.render(context: URN_CONTEXT)
+        identifier.number.to_s
       end
 
       def urn_no_number

data/lib/pubid/evs/builder.rb

@@ -17,7 +17,7 @@ module Pubid
         adopted = Pubid::CenCenelec::Builder.build(data[:adopted])
 
         Identifiers::NationalAdoption.new(
-          adopted_identifier: adopted,
+          base: adopted,
           separator: data[:evs_separator] || "-",
         )
       end

data/lib/pubid/evs/identifier.rb

@@ -3,16 +3,16 @@
 module Pubid
   module Evs
     # An EVS national adoption wraps a CEN identifier the same way BSI's
-    # AdoptedEuropeanNorm does — polymorphic `adopted_identifier` so the
+    # AdoptedEuropeanNorm does — polymorphic `base` so the
     # wrapped object stays a real Pubid::CenCenelec identifier.
     #
     # Examples:
-    #   "EVS-EN 18216:2026"           (adopted_identifier: EN 18216:2026)
-    #   "EVS-EN ISO 14001:2026"       (adopted_identifier: EN ISO 14001:2026)
-    #   "EVS-EN ISO/IEC 27017:2026"   (adopted_identifier: EN ISO/IEC 27017:2026)
-    #   "EVS-EN ISO 9001:2015/A1:2024" (adopted_identifier: EN ISO 9001:2015/A1:2024)
+    #   "EVS-EN 18216:2026"           (base: EN 18216:2026)
+    #   "EVS-EN ISO 14001:2026"       (base: EN ISO 14001:2026)
+    #   "EVS-EN ISO/IEC 27017:2026"   (base: EN ISO/IEC 27017:2026)
+    #   "EVS-EN ISO 9001:2015/A1:2024" (base: EN ISO 9001:2015/A1:2024)
     class Identifier < ::Pubid::Identifier
-      attribute :adopted_identifier, ::Pubid::Identifier, polymorphic: true
+      attribute :base, ::Pubid::Identifier, polymorphic: true
       # "-" or " " — preserves the printed separator ("EVS-EN" vs "EVS EN")
       attribute :separator, :string, default: -> { "-" }
 

data/lib/pubid/evs/identifiers/national_adoption.rb

@@ -6,10 +6,15 @@ module Pubid
       # The EVS national adoption of a European Standard.
       # Example: "EVS-EN 18216:2026"
       class NationalAdoption < ::Pubid::Evs::Identifier
-        attribute :type, Components::Type, default: -> { self.class.type[:key] }
+        attribute :type, Components::Type, default: -> { self.class.default_type }
+
+        def self.default_type
+          Components::Type.new(abbr: type[:short])
+        end
 
         def self.type
-          { key: :evs_en, title: "EVS National Adoption of a European Standard" }
+          { key: :evs_en, short: "EN",
+            title: "EVS National Adoption of a European Standard" }
         end
       end
     end

data/lib/pubid/evs/renderer.rb

@@ -23,7 +23,7 @@ module Pubid
       end
 
       def adopted
-        @id.adopted_identifier.to_s
+        @id.base.to_s
       end
     end
   end

data/lib/pubid/evs/urn_generator.rb

@@ -17,7 +17,7 @@ module Pubid
       EVS_NAMESPACE = "urn:evs:"
 
       def generate
-        adopted_urn = identifier.adopted_identifier.to_urn
+        adopted_urn = identifier.base.to_urn
         unless adopted_urn.start_with?(CEN_NAMESPACE)
           raise Errors::ParseError,
                 "expected adopted CEN URN, got #{adopted_urn.inspect}"

data/lib/pubid/evs/urn_parser.rb

@@ -56,7 +56,7 @@ module Pubid
 
         adopted = Pubid::CenCenelec.parse(text)
         ::Pubid::Evs::Identifiers::NationalAdoption.new(
-          adopted_identifier: adopted,
+          base: adopted,
         )
       end
 

data/lib/pubid/gb/builder.rb

@@ -6,31 +6,36 @@ module Pubid
     #
     # The parser captures the publisher code verbatim (which may already
     # include the "/T" or "/Z" suffix). The builder normalizes: if the
-    # suffix is in the publisher_code string, it's split out into the
-    # separate +mandate+ attribute so the renderer can recompose either
-    # the inline or split form.
+    # suffix is in the code, it is split out into the separate +mandate+
+    # attribute so the renderer can recompose either the inline or split
+    # form. The code itself goes into the inherited +publisher+ component.
     class Builder
       def self.build(parsed_data)
         new.build(parsed_data)
       end
 
       def build(data)
-        publisher_code, mandate = split_mandate(data[:publisher_code].to_s)
-
-        mandate ||= data[:mandate]&.to_s
+        code, mandate = split_mandate(data[:publisher_code].to_s)
 
         Identifiers::Standard.new(
-          publisher_code: publisher_code,
-          mandate: mandate,
+          publisher: ::Pubid::Components::Publisher.new(body: code),
+          mandate: mandate || data[:mandate]&.to_s,
           number: data[:number].to_s,
           part: data[:part]&.to_s,
-          date: data[:year] ? ::Pubid::Components::Date.new(year: data[:year].to_s) : nil,
+          date: date_for(data[:year]),
           all_parts: !data[:all_parts].to_s.empty?,
         )
       end
 
       private
 
+      # The publication year, or nil for a partial reference.
+      def date_for(year)
+        return nil unless year
+
+        ::Pubid::Components::Date.new(year: year.to_s)
+      end
+
       # If the publisher code carries an inline /T or /Z suffix, split it off
       # and return the cleaned code + extracted mandate.
       def split_mandate(code)

data/lib/pubid/gb/identifier.rb

@@ -7,9 +7,11 @@ module Pubid
     # descend from this class, so a parsed GB id is always an instance of
     # Pubid::Gb::Identifier.
     class Identifier < ::Pubid::Identifier
-      # The issuing body code as printed, e.g. "GB", "JB", "T/GZAEPI".
-      # Always non-empty for a valid identifier.
-      attribute :publisher_code, :string
+      # The issuing body code as printed — "GB", "JB", "GBn", "T/GZAEPI" —
+      # lives in the `publisher` attribute inherited from ::Pubid::Identifier.
+      # The flat-scalar hooks below serialize it as a bare string, and the
+      # shared URN generator renders it lowercase, so the series is part of
+      # the URN identity (GB 20223 and GBn 20223 are two documents).
 
       # Mandate category: "T" (recommended), "Z" (guideline), or nil
       # (mandatory). Carried after the "/" in the printed form.
@@ -31,17 +33,34 @@ module Pubid
         "pubid:gb:standard" => "Pubid::Gb::Identifiers::Standard",
       }.freeze
 
+      # This block REPLACES the maps of ::Pubid::Identifier, so every
+      # attribute the flavor uses must appear here — "date" included, or the
+      # publication year is lost in to_hash. The shared flat-scalar rules
+      # (Identifier#to_hash / .from_hash) write it as a bare "year" scalar.
       key_value do
         map "_type", to: :_type, polymorphic_map: GB_TYPE_MAP
-        map "publisher_code", to: :publisher_code
+        map "publisher", to: :publisher
         map "mandate", to: :mandate
         map "number", to: :number
         map "part", to: :part
+        map "date", to: :date
         map "all_parts", to: :all_parts, render_default: false
       end
 
       PUBLISHER = "CN"
 
+      # Serialize `publisher` as a bare string instead of a nested
+      # {"body" => "GB"}, the CEN/CENELEC precedent. The entry is added for
+      # GB's own classes only: a shared entry would change the wire format of
+      # every flavor that publishes an index.
+      def self.flat_scalar_components
+        super.merge(publisher: "publisher")
+      end
+
+      def self.flat_scalar_fields
+        super.merge(publisher: :body)
+      end
+
       def to_s(**opts)
         render(format: :human, **opts)
       end

data/lib/pubid/gb/parser.rb

@@ -25,6 +25,10 @@ module Pubid
       rule(:publisher_code) do
         # Social-group form: "T/" then 2+ uppercase letters/digits.
         (str("T/") >> match("[A-Z0-9]").repeat(1)).as(:publisher_code) |
+          # Confidential national series. The lowercase "n" is part of the
+          # code, so it comes before the uppercase-only rule below: a PEG
+          # takes the first branch that matches and does not backtrack.
+          (str("GBn") >> (str("/T") | str("/Z")).maybe).as(:publisher_code) |
           # Standard form: 1-3 letters, optional slash-T-or-Z.
           (match("[A-Z]").repeat(1, 3) >>
             (str("/T") | str("/Z")).maybe).as(:publisher_code)

data/lib/pubid/gb/renderer.rb

@@ -8,7 +8,8 @@ module Pubid
     #   "GB/T 20223-2006"
     #   "GB/T 5606.1-2004"
     #   "GB/T 5606 (all parts)"
-    #   "T/GZAEPI 001—2018"     (social-group form, em-dash year)
+    #   "T/GZAEPI 001-2018"     (social-group form; an em-dash year
+    #                            separator in the input renders as a hyphen)
     class Renderer < ::Pubid::Renderers::Base
       def render(**_opts)
         parts = [publisher_portion, " #{number_portion}"]
@@ -19,8 +20,8 @@ module Pubid
       private
 
       def publisher_portion
-        code = @id.publisher_code.to_s
-        code += "/#{@id.mandate}" if @id.mandate && !@id.publisher_code.include?("/")
+        code = @id.publisher.to_s
+        code += "/#{@id.mandate}" if @id.mandate && !code.include?("/")
         code
       end
 

data/lib/pubid/gb.rb

@@ -17,6 +17,7 @@ module Pubid
     # "GB" comes first so PrefixesSupport's longest-match wins.
     PREFIXES = %w[
       GB GB/T GB/Z
+      GBn GBn/T GBn/Z
       DB DB/T DB/Z
       QB QB/T
       ZB ZB/T

data/lib/pubid/identifier.rb

@@ -498,9 +498,17 @@ module Pubid
     end
 
     attribute :_type, :string, polymorphic_class: true
-    attribute :number, Components::Code
-    attribute :part, Components::Code
-    attribute :subpart, Components::Code
+    # Plain strings, for every flavor. A Components::Code here held nothing
+    # but its `value` on the identifier path, and the disagreement between
+    # this declaration and the leaves that redeclared a scalar was the
+    # determinism landmine: a redeclaration on an inherited-from class
+    # resolves nondeterministically under multi-flavor load. With the base
+    # declaring the scalar, no flavor redeclares and the bug class is gone.
+    # A flavor that needs structure keeps its own attributes (ISO's committee
+    # codes, NIST's series/subseries, ITU's code), never a boxed `number`.
+    attribute :number, :string
+    attribute :part, :string
+    attribute :subpart, :string
     attribute :stage_iteration, Components::Iteration
     attribute :date, Components::Date
     attribute :edition, Components::Edition

data/lib/pubid/idf/identifier.rb

@@ -5,6 +5,13 @@ module Pubid
   module Idf
     # An IDF identifier has no copublisher
     class Identifier < ::Pubid::Identifier
+      # A Type INSTANCE, never the raw :key symbol - lutaml materializes
+      # defaults during from_hash; casting a Symbol into the
+      # component raises InvalidFormatError (pubid#383).
+      def self.default_type
+        Components::Type.new(abbr: type[:short])
+      end
+
       attribute :typed_stage, Components::TypedStage
 
       # `number`/`part`/`subpart` are declared here rather than inherited as a

data/lib/pubid/idf/identifiers/amendment.rb

@@ -4,7 +4,7 @@ module Pubid
   module Idf
     module Identifiers
       class Amendment < SupplementIdentifier
-        attribute :type, Components::Type, default: -> { self.class.type[:key] }
+        attribute :type, Components::Type, default: -> { self.class.default_type }
 
         TYPED_STAGES = [
           Components::TypedStage.new(

data/lib/pubid/idf/identifiers/corrigendum.rb

@@ -4,7 +4,7 @@ module Pubid
   module Idf
     module Identifiers
       class Corrigendum < SupplementIdentifier
-        attribute :type, Components::Type, default: -> { self.class.type[:key] }
+        attribute :type, Components::Type, default: -> { self.class.default_type }
 
         TYPED_STAGES = [
           Components::TypedStage.new(

data/lib/pubid/idf/identifiers/international_standard.rb

@@ -5,7 +5,7 @@ module Pubid
     module Identifiers
       # International Standard Identifier
       class InternationalStandard < SingleIdentifier
-        attribute :type, Components::Type, default: -> { self.class.type[:key] }
+        attribute :type, Components::Type, default: -> { self.class.default_type }
 
         TYPED_STAGES = [
           Components::TypedStage.new(

data/lib/pubid/idf/identifiers/reviewed_method.rb

@@ -4,7 +4,7 @@ module Pubid
   module Idf
     module Identifiers
       class ReviewedMethod < SingleIdentifier
-        attribute :type, Components::Type, default: -> { self.class.type[:key] }
+        attribute :type, Components::Type, default: -> { self.class.default_type }
         TYPED_STAGES = [
           Components::TypedStage.new(
             code: :pwirm,

data/lib/pubid/idf/single_identifier.rb

@@ -12,7 +12,7 @@ module Pubid
     #
     # Note: The type attribute is inherited from the base Identifier class.
     # Concrete classes should add their own default value like:
-    #   attribute :type, Components::Type, default: -> { self.class.type[:key] }
+    #   attribute :type, Components::Type, default: -> { self.class.default_type }
     class SingleIdentifier < Identifier
     end
   end

data/lib/pubid/ieee/builder.rb

@@ -669,7 +669,14 @@ module Pubid
         # Extract publishers from joint_publishers
         if parsed[:joint_publishers]
           joint_pub_str = extract_value(parsed[:joint_publishers])
-          attributes[:publishers] = joint_pub_str.split("/")
+          pubs = joint_pub_str.split("/")
+          attributes[:publishers] = pubs
+          # lutaml materializes attribute defaults during from_hash, so the
+          # deserialized joint carries publisher/copublisher alongside
+          # publishers; set the same shape on the parse path or the
+          # amendment-wrapped round-trip diverges on exactly those keys.
+          attributes[:publisher] = pubs.first
+          attributes[:copublisher] = pubs.drop(1)
         end
 
         # Build code with parts if present
@@ -693,6 +700,15 @@ module Pubid
         end
         attributes[:month] = extract_value(parsed[:month]) if parsed[:month]
 
+        # A text date trailing the DRAFT (pubid#216: "CD P26515/D1, March
+        # 2017") reaches the builder under :draft_month/:draft_year — the
+        # grammar captures them separately to avoid the :month/:year
+        # duplicate-subtree collision with the date clause.
+        if parsed[:draft_year]
+          attributes[:year] ||= extract_value(parsed[:draft_year])
+          attributes[:month] ||= extract_value(parsed[:draft_month])
+        end
+
         # Extract edition, from relaton's "/E-<n>" suffix (normalized to
         # "Edition <n>.0"). nil-residue hand-off item 1.
         attributes[:edition] = extract_value(parsed[:edition]) if parsed[:edition]
@@ -722,6 +738,10 @@ module Pubid
             attributes[:typed_stage] =
               Pubid::Ieee.locate_stage(stage_abbr)
           end
+        elsif parsed[:iso_published]
+          # Stage-less PUBLISHED joint form (pubid#317): ISO-led spelling,
+          # no project marker, no typed stage - renders as printed.
+          attributes[:lead_party] = "ISO"
         else
           # IEEE format - lead party is IEEE
           attributes[:lead_party] = "IEEE"
@@ -734,7 +754,19 @@ module Pubid
             Pubid::Ieee.locate_stage("P")
         end
 
-        Identifiers::JointDevelopment.new(**attributes)
+        joint = Identifiers::JointDevelopment.new(**attributes)
+
+        # Amendment tail on the joint ISO-format form (pubid#317:
+        # "8802-11:2012/Amd.1:2014(E)"): wrap the joint id, mirroring
+        # build_flat_amendment.
+        return joint unless parsed[:amd_number]
+
+        amd_year = extract_value(parsed[:amd_year]) if parsed[:amd_year]
+        Identifiers::Amendment.new(
+          base: joint,
+          number: extract_value(parsed[:amd_number]),
+          year: amd_year,
+        )
       end
 
       # Build SI/PSI identifier from parsed data
@@ -1189,6 +1221,14 @@ module Pubid
             return "P"
           elsif type_value == "Std"
             return "Std"
+          elsif type_value == "Draft Std" && parsed[:draft].nil? && parsed[:digit_draft].nil?
+            # A version-less "Draft Std" fabricates /D1 (issue #205);
+            # deriving the stage from that fabricated version renders the
+            # same P-prefixed form as an explicit "/D1" spelling, so the
+            # render reaches its fixed point in one round (pubid#318).
+            # Gated on no-draft: a dotted version ("D2.0") fails the registry
+            # lookup above and must fall through, keeping "Draft Std".
+            return "D1"
           elsif type_value.match?(/^No\.?$/)
             return type_value
           end

data/lib/pubid/ieee/identifiers/si_standard.rb

@@ -30,8 +30,11 @@ module Pubid
         # Format: "IEEE/ASTM SI 10-1997" (published)
         #     or: "IEEE/ASTM PSI 10/D2, October 2015" (draft)
 
-        # Use proper Draft component (Lutaml::Model object)
-        attr_accessor :draft_obj
+        # NOTE: no `attr_accessor :draft_obj` here — it would shadow the
+        # base's lazy `draft_obj` reader (base.rb), which rebuilds the
+        # component from the `draft` attribute after from_hash. The plain
+        # accessor made every deserialized PSI draft render (and re-emit
+        # in to_hash) without its "/D<n>".
       end
     end
   end