expressir 0.2.12-x86-mingw32 → 0.2.13-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35e3c7faaac7a7f64b78530c4a448706b470fbff143a8104f66dc6757f780dd3
-  data.tar.gz: fa8c9e142c4adb8d0efb93bf7cab21cf63251fbfdfd45b5f85d4a25ce6e6da9d
+  metadata.gz: 8ed3288bba0296e8a2e5a14cfa0131adc2ff64bd0534b6be2f63606996bc3882
+  data.tar.gz: 857a8ae992b9d2f0693b70a7ef1b69c0b7d067d0479b56bf6db45d4fcb00c6f4
 SHA512:
-  metadata.gz: 9569cfc2e2f85bed17876cc788761013d90cbbe1428f425f65a44d12e77e92da87c5df1eedc4f3cd6e3cad60b0ef6a87c3c0e761b8254fa7c14f88a12fd54bb4
-  data.tar.gz: 2451f2534893dcc171bacf5ebf5f5347e7de9329dcac28cde2245e50901500c62d3be90feb84e1c00f2a83c0db375e73f6ea6c1929075b63ec2555c73e27f8eb
+  metadata.gz: 64f6581db4d0b0463c2d61198040227050f31461a6dc5f946e0a76f4ede7e74d12d5c41b6883a3e233af79df9142de3ea7a35e5d56cb5ce0804ed018bb20f5c4
+  data.tar.gz: 980b58d6f69ee4edbda7227d329ba50f8926b11eea4ec2b80f2bf28a2d606e508e5a43580edfaa490c7c29043b3e0f1ef5ad260f582f8d6c836ea7058bf435b6

data/exe/format

@@ -6,11 +6,15 @@ require "expressir/express_exp/hyperlink_formatter"
 input_files = [
   '../iso-10303-stepmod/data/resources/action_schema/action_schema_annotated.exp',
   '../iso-10303-stepmod/data/resources/basic_attribute_schema/basic_attribute_schema_annotated.exp',
-  '../iso-10303-stepmod/data/resources/support_resource_schema/support_resource_schema_annotated.exp'
+  '../iso-10303-stepmod/data/resources/support_resource_schema/support_resource_schema_annotated.exp',
+  # cyclic reference
+  # '../iso-10303-stepmod/data/resources/product_property_definition_schema/product_property_definition_schema_annotated.exp',
+  # '../iso-10303-stepmod/data/resources/product_property_representation_schema/product_property_representation_schema_annotated.exp'
 ]
 
 repo = Expressir::ExpressExp::Parser.from_files(input_files)
 schema = repo.schemas.find{|x| x.id == 'action_schema'}
+# schema = repo.schemas.find{|x| x.id == 'product_property_definition_schema'}
 result = Expressir::ExpressExp::HyperlinkFormatter.format(schema)
 
 puts result

data/lib/expressir/model/schema.rb

@@ -34,10 +34,19 @@ module Expressir
         super
       end
 
-      def children
+      def children(item_ids = nil)
         items = []
-        # TODO: select interface items
-        items.push(*@interfaces.flat_map{|x| parent.schemas.find{|y| x.schema.id == y.id}&.children || []})
+        unless item_ids and item_ids.length > 0
+          items.push(*@interfaces.flat_map do |interface|
+            schema = parent.schemas.find{|y| interface.schema.id == y.id}
+            interface_item_ids = if interface.items
+              # TODO: support renamed references
+              interface.items.select{|x| x.is_a? Model::Expressions::SimpleReference}.map{|x| x.id}
+            end
+            schema_items = schema&.children(interface_item_ids) || []
+            schema_items
+          end)
+        end
         items.push(*@constants)
         items.push(*@types)
         items.push(*@types.flat_map{|x| x.type.is_a?(Expressir::Model::Types::Enumeration) ? x.type.items : []})
@@ -46,6 +55,9 @@ module Expressir
         items.push(*@functions)
         items.push(*@procedures)
         items.push(*@rules)
+        if item_ids and item_ids.length > 0
+          items = items.select{|x| item_ids.include?(x.id)}
+        end
         items
       end
     end

data/lib/expressir/version.rb

@@ -1,3 +1,3 @@
 module Expressir
-  VERSION = "0.2.12".freeze
+  VERSION = "0.2.13".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: expressir
 version: !ruby/object:Gem::Version
-  version: 0.2.12
+  version: 0.2.13
 platform: x86-mingw32
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-24 00:00:00.000000000 Z
+date: 2021-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri