opencdd 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b88da823f5a7adb8f4d88f16a2f1e97d4f3136579bea025ef28c178753ab7f0e
-  data.tar.gz: 6171d27282b147b1c80fb137d8523d9644bb58fcaf364d13e89fee8713b7b814
+  metadata.gz: c582aa6a0bf79bedf583a586f97c1c308852b53d4efc9972b3bb883a2be425fc
+  data.tar.gz: 1195b6615ee045c3c1ac63f237ccdb930d80838db9dbe33677216e271748accc
 SHA512:
-  metadata.gz: b373faf0cd5ac6d5e2d6f62af3e0a3a57abe2300589fd9d4c19135ccaf7ac28b385bf9946a4d090d178b293b15dfcce4a77c60a1b452d2e31cbf0ceab2f3ab89
-  data.tar.gz: b7ceac12c85b84943405c25fd04b112e5e282332b30c24ccc3367779a2a4bb3688c945efb81ee3e9641108e6b99e57d3c889f32e5dbad1249e50c9e2728cd344
+  metadata.gz: 1cbdf2e8832ccd86b95fcfc6789d8d9dfe4be656a27f7b4cac4cb854ea6f224153f5aa8cca521362f364954e123e0c50d3424da3daf031cd73f1974823794cb9
+  data.tar.gz: 072c326fba5a5807249b7ea79eda95c31fc42384c80de750dba20c741de0601c8c67afe61e9b58a27e594797c68b12cbb38b4166c0f56ce547130e610625c80c

data/bin/lint-no-raw-mdc

@@ -1,3 +1,4 @@
+#!/usr/bin/env bash
 # lint-no-raw-mdc — fail if any raw MDC_P### / MDC_C### / EXT_P### /
 # EXT_C### / CIM_P### string literal appears in lib/opencdd/ outside
 # the designated SSOT files.

data/lib/opencdd/condition.rb

@@ -13,6 +13,12 @@ module Opencdd
       (?<right>.+)
     \z/x.freeze
 
+    # A single bare token (IRDI or short code) without internal whitespace.
+    # Used to detect class-reference conditions of the form
+    # `0112/2///62683#ACE132` and distinguish them from malformed input
+    # like "no operator here" (which has internal whitespace).
+    SINGLE_TOKEN_PATTERN = /\A\S+\z/.freeze
+
     attr_reader :left, :operator, :right
 
     def initialize(left, operator, right)
@@ -24,6 +30,10 @@ module Opencdd
       @right = right
     end
 
+    def class_reference?
+      false
+    end
+
     def set?
       @right.is_a?(Set)
     end
@@ -76,6 +86,12 @@ module Opencdd
           op   = Regexp.last_match(:op)
           raw_right = Regexp.last_match(:right).strip
           new(left, op, parse_rhs(raw_right))
+        elsif s =~ SET_PATTERN
+          body = Regexp.last_match(:body)
+          elements = body.split(/[,\s]+/).map(&:strip).reject(&:empty?)
+          ClassReference.new(irdis: elements)
+        elsif SINGLE_TOKEN_PATTERN.match?(s)
+          ClassReference.new(irdis: [s])
         else
           raise ArgumentError, "invalid condition expression: #{s.inspect}"
         end
@@ -116,5 +132,54 @@ module Opencdd
     def normalize_for_eq(value)
       value.is_a?(Set) ? value.to_a.sort : value
     end
+
+    # A condition of the form `{0112/2///62683#ACE132}` or a bare
+    # `0112/2///62683#ACE132` — meaning "this property applies when the
+    # host class is one of the listed IRDIs". IEC 62683 stores property
+    # conditions this way; the regular boolean-expression grammar in
+    # +Condition+ cannot represent it.
+    class ClassReference < Condition
+      attr_reader :irdis
+
+      # The binding key (string or symbol) consulted by +#satisfied_by?+
+      # to discover the host class IRDI. Callers that resolve the host
+      # class via a different key should override +satisfied_by?+.
+      HOST_CLASS_KEYS = [:class, :host_class, "class", "host_class"].freeze
+
+      def initialize(irdis:)
+        @irdis = Array(irdis).map(&:to_s)
+        @left = nil
+        @operator = nil
+        @right = nil
+      end
+
+      def class_reference?
+        true
+      end
+
+      def set?
+        @irdis.size > 1
+      end
+
+      def satisfied_by?(bindings)
+        hash = bindings.is_a?(Hash) ? bindings : bindings.to_h
+        actual = HOST_CLASS_KEYS.map { |k| hash[k] }.compact.first
+        return true if actual.nil?
+        @irdis.any? { |irdi| actual.to_s == irdi }
+      end
+
+      def to_s
+        @irdis.size == 1 ? @irdis.first : "{#{@irdis.join(', ')}}"
+      end
+
+      def ==(other)
+        other.is_a?(ClassReference) && Set.new(@irdis) == Set.new(other.irdis)
+      end
+      alias_method :eql?, :==
+
+      def hash
+        Set.new(@irdis).hash
+      end
+    end
   end
 end

data/lib/opencdd/entity/name_synthesizer.rb

@@ -12,56 +12,12 @@ module Opencdd
     # Extracted from SheetSchema so SheetSchema focuses on header
     # parsing + Column construction. Name synthesis is a separate
     # concern with its own test surface.
+    #
+    # The name→ID table itself lives in Opencdd::PropertyIds::IEC_COLUMN_NAMES
+    # (the lint-exempt SSOT). NAME_TO_PROPERTY_ID is kept here as a
+    # back-compat alias so existing callers see no public-API change.
     module NameSynthesizer
-      # IEC 62656-1 defined column names mapped to canonical
-      # property IDs. These names appear in the #PROPERTY_NAME
-      # directive row when #PROPERTY_ID is absent.
-      NAME_TO_PROPERTY_ID = {
-        "Code"                   => "MDC_P001_5",
-        "Version"                => "MDC_P002_1",
-        "Revision"               => "MDC_P002_2",
-        "VersionInitiationDate"  => "MDC_P003_1",
-        "VersionReleaseDate"     => "MDC_P003_2",
-        "RevisionReleaseDate"    => "MDC_P003_3",
-        "PreferredName"          => "MDC_P004",
-        "SynonymousName"         => "MDC_P007",
-        "ShortName"              => "MDC_P005",
-        "Definition"             => "MDC_P006",
-        "DefinitionSource"       => "MDC_P006_1",
-        "Note"                   => "MDC_P008",
-        "Remark"                 => "MDC_P009",
-        "Drawing"                => "MDC_P008_1",
-        "GUID"                   => "MDC_P066",
-        "TimeStamp"              => "MDC_P067",
-        "ClassType"              => "MDC_P011",
-        "Superclass"             => "MDC_P010",
-        "IsCaseOf"               => "MDC_P013",
-        "ApplicableProperties"   => "MDC_P014",
-        "ImportedProperties"     => "MDC_P090",
-        "SubClassSelection"      => "MDC_P016",
-        "DataType"               => "MDC_P022",
-        "ValueFormat"            => "MDC_P024",
-        "DefinitionClass"        => "MDC_P021",
-        "Unit"                   => "MDC_P041",
-        "Condition"              => "MDC_P028",
-        "ListType"               => "MDC_P046",
-        "CodeList"               => "MDC_P044",
-        "TermList"               => "MDC_P043",
-        "EnumerationCode"        => "MDC_P044",
-        "RelationType"           => "MDC_P200",
-        "RelationDomain"         => "MDC_P201",
-        "FunctionDomain"         => "MDC_P202",
-        "FunctionCodomain"       => "MDC_P203",
-        "Formula"                => "MDC_P204",
-        "FormulaLanguage"        => "MDC_P205",
-        "FormulaExternalSolver"  => "MDC_P206",
-        "TriggerEvent"           => "MDC_P207",
-        "DomainElementType"      => "MDC_P208",
-        "CodomainElementType"    => "MDC_P209",
-        "Role"                   => "MDC_P210",
-        "Segment"                => "MDC_P211",
-        "SuperRelation"          => "MDC_P212",
-      }.freeze
+      NAME_TO_PROPERTY_ID = Opencdd::PropertyIds::IEC_COLUMN_NAMES
 
       # Given a PROPERTY_NAME directive row (Array of name strings),
       # returns a parallel Array of property IDs (or nil where the

data/lib/opencdd/property.rb

@@ -69,13 +69,6 @@ module Opencdd
     end
     field :condition,              synthetic: true do
       @condition ||= Opencdd::Condition.parse(properties[Opencdd::PropertyIds::MDC_P028])
-    rescue ArgumentError
-      # IEC CDD occasionally stores a bare class-reference set in the
-      # condition column (e.g. "{0112/2///62683#ACE132}") instead of
-      # a `left OP right` boolean expression. Condition's grammar
-      # rejects that shape; treat it as nil rather than crashing the
-      # import. Tracked in TODO.full-cdd/17-condition-grammar-fix.md.
-      @condition = nil
     end
     field :formula,                synthetic: true do
       properties[Opencdd::PropertyIds::MDC_P027_1] ||

data/lib/opencdd/property_ids.rb

@@ -142,6 +142,58 @@ module Opencdd
     # ontology registry). Kept here as an alias for back-compat.
     PARCEL_VARIANT_TO_CANONICAL = Opencdd::Parcel::SheetSchema::VARIANT_TO_CANONICAL
 
+    # IEC 62656-1 defined PROPERTY_NAME directive column names mapped
+    # to canonical property IDs. Used by Opencdd::Entity::NameSynthesizer
+    # when a Parcel sheet omits the #PROPERTY_ID directive row and
+    # only carries #PROPERTY_NAME. Declared here so the raw IDs live
+    # in the lint-exempt SSOT instead of in the synthesis module.
+    IEC_COLUMN_NAMES = {
+      "Code"                   => "MDC_P001_5",
+      "Version"                => "MDC_P002_1",
+      "Revision"               => "MDC_P002_2",
+      "VersionInitiationDate"  => "MDC_P003_1",
+      "VersionReleaseDate"     => "MDC_P003_2",
+      "RevisionReleaseDate"    => "MDC_P003_3",
+      "PreferredName"          => "MDC_P004",
+      "SynonymousName"         => "MDC_P007",
+      "ShortName"              => "MDC_P005",
+      "Definition"             => "MDC_P006",
+      "DefinitionSource"       => "MDC_P006_1",
+      "Note"                   => "MDC_P008",
+      "Remark"                 => "MDC_P009",
+      "Drawing"                => "MDC_P008_1",
+      "GUID"                   => "MDC_P066",
+      "TimeStamp"              => "MDC_P067",
+      "ClassType"              => "MDC_P011",
+      "Superclass"             => "MDC_P010",
+      "IsCaseOf"               => "MDC_P013",
+      "ApplicableProperties"   => "MDC_P014",
+      "ImportedProperties"     => "MDC_P090",
+      "SubClassSelection"      => "MDC_P016",
+      "DataType"               => "MDC_P022",
+      "ValueFormat"            => "MDC_P024",
+      "DefinitionClass"        => "MDC_P021",
+      "Unit"                   => "MDC_P041",
+      "Condition"              => "MDC_P028",
+      "ListType"               => "MDC_P046",
+      "CodeList"               => "MDC_P044",
+      "TermList"               => "MDC_P043",
+      "EnumerationCode"        => "MDC_P044",
+      "RelationType"           => "MDC_P200",
+      "RelationDomain"         => "MDC_P201",
+      "FunctionDomain"         => "MDC_P202",
+      "FunctionCodomain"       => "MDC_P203",
+      "Formula"                => "MDC_P204",
+      "FormulaLanguage"        => "MDC_P205",
+      "FormulaExternalSolver"  => "MDC_P206",
+      "TriggerEvent"           => "MDC_P207",
+      "DomainElementType"      => "MDC_P208",
+      "CodomainElementType"    => "MDC_P209",
+      "Role"                   => "MDC_P210",
+      "Segment"                => "MDC_P211",
+      "SuperRelation"          => "MDC_P212",
+    }.freeze
+
     REGISTRY.each_key do |id|
       const_set(id, id.freeze) unless const_defined?(id, false)
     end

data/lib/opencdd/validator/condition_rule.rb

@@ -14,6 +14,9 @@ module Opencdd
 
       def call(value, _context)
         return true if value.nil? || value.to_s.strip.empty?
+        # parse returns a boolean Condition or a Condition::ClassReference
+        # for bare-IRDI / bare-set conditions (IEC 62683 shape). Both are
+        # valid; only malformed input raises ArgumentError.
         !Opencdd::Condition.parse(value.to_s).nil?
       rescue ArgumentError
         false

data/lib/opencdd/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Opencdd
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opencdd
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - OpenCDD contributors
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-07-23 00:00:00.000000000 Z
+date: 2026-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: roo