suma 0.5.30 → 0.5.31

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 6c4133e715420dbc264798602c9bb0dbebf8a537f5b2f8bdaccb84258fcc37d7
4
- data.tar.gz: e994b0e3f502603fcd1b7f7eb45a93cf724bb1b844dce598775e0e6f7fc200b2
3
+ metadata.gz: 988b5f4b9f5dd2979ce2b2b38d58b81a26c28deea570d1ef81521c38b213f289
4
+ data.tar.gz: b311e9bfbec6e5744d9c1b903d67da6152f4c0e09037158280db52d0ee225a67
5
5
  SHA512:
6
- metadata.gz: 6316644ee7b6ed8d3bd6cf3b5520a132ee81f457b7ad797a50a4fdecb0a44570e1e28835c542e2a11ab582303da3e7670b955e372ffcc98e3a7f9c5178b77a61
7
- data.tar.gz: ab7268c9cb367028d620cca8de69719f3e44e606f8ee60d7925d45b57d836b86b1b3562d4cb186d9688b30a30b7d7c9a394bb7cdb75b0dee080e013b12033658
6
+ metadata.gz: 112f94d3a4af0a568e46bf17511f635902c4b6397686b723ba1dabf0d1f5e3472c2f84164d281eac1154d3b606600dc3eaf41d8044966b07c3cc7b232b8d77cb
7
+ data.tar.gz: 8dfaa618a8ae1ad12761fb47c43d669bab381d002839e9129e2785fb6e407df765110924df99f23cac929855e49669d4c5c8ab2e8890f05b991aca458424a81d
@@ -288,7 +288,8 @@ module Suma
288
288
  "#{entity_name_to_text(entity.id)} #{entity_ref}"
289
289
  else
290
290
  entity_subtypes = subtypes.map do |e|
291
- urn_mention(express_entity_urn("#{schema.id}.#{e.id}"), e.id)
291
+ owner = declaring_schema_id(schema, e.id) || schema.id
292
+ urn_mention(express_entity_urn("#{owner}.#{e.id}"), e.id)
292
293
  end
293
294
 
294
295
  "#{entity_type} that is a type of " \
@@ -297,5 +298,42 @@ module Suma
297
298
  "#{entity_name_to_text(entity.id)} #{entity_ref}"
298
299
  end
299
300
  end
301
+
302
+ # The schema an imported declaration is declared in, resolved through
303
+ # +schema+'s interfaces — the same resolution the source remark xrefs
304
+ # carry: a local declaration wins; then a USE FROM item naming the
305
+ # declaration; then a single bare USE FROM. nil leaves the citation
306
+ # unqualified-with-owner, since inventing an owner would be wrong
307
+ # (iso-10303#835: the citing schema is not the declaring schema).
308
+ def declaring_schema_id(schema, entity_id)
309
+ return schema.id if schema.entities.any? { |e| e.id == entity_id }
310
+
311
+ item_matches = []
312
+ bare_sources = []
313
+ schema.interfaces.each do |interface|
314
+ source = interface.schema&.id
315
+ next unless source && interface.kind == "USE"
316
+
317
+ items = Array(interface.items)
318
+ if items.empty?
319
+ bare_sources << source
320
+ elsif items.any? { |item| import_item_id(item) == entity_id }
321
+ item_matches << source
322
+ end
323
+ end
324
+
325
+ if item_matches.uniq.one?
326
+ item_matches.first
327
+ elsif item_matches.empty? && bare_sources.uniq.one?
328
+ bare_sources.first
329
+ end
330
+ end
331
+
332
+ # The imported declaration's name as written in the USE FROM list:
333
+ # InterfaceItem carries it on #ref (the reference node), with #id
334
+ # holding the local rename when present.
335
+ def import_item_id(item)
336
+ item.ref&.id || item.id
337
+ end
300
338
  end
301
339
  end
data/lib/suma/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module Suma
4
- VERSION = "0.5.30"
4
+ VERSION = "0.5.31"
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: suma
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.5.30
4
+ version: 0.5.31
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2026-11-10 00:00:00.000000000 Z
11
+ date: 2026-11-11 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: base64