expressir 0.2.12-x86-linux → 0.2.13-x86-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 432faff204670f985cc301c087b0c9da0c689b08f0a848a95fc3e3f95fc6b7b4
-  data.tar.gz: 59403e704f248d53d94663a8ece3d6a7650f895e8edd416983701e0b91f42f4b
+  metadata.gz: e6e386d0da58e4380e96a8e7f5c7830fe7cb8ab24bf2ab6e7d0c7e2e50101a71
+  data.tar.gz: 96103115ba3e78375c208fc61ce77ddd765def0de6aba68a2f0767fe0c63a96b
 SHA512:
-  metadata.gz: f3291946e2a534e087d8f288bdcba3e43854280a2d4ffda087cfbbad25ca1f4517dc14dda9a6f2ae57b9804aeff86b25a158bc686c4d2f8777648fbd1913ccfa
-  data.tar.gz: 7a2c7cc654c8ac2518f659006ffd006830f7f58c93eaf908af7714d58f7a25ba63964f2e13ea09cf036fc527ab4d46133dee7bdc3dec20248c1767bd33e2504f
+  metadata.gz: 314ed535af084a77e131086df422c77299d87feecc3604d9312287f7c422d7930209f3093caf8dd886b3c7b792a178e381058b38c8f46181f38a04b04066ffbe
+  data.tar.gz: 3f7b0e37b739910d7e355ae78fa2f63fe159bbf7e12ca29a3884ecbc166986a628a787593a6b857e7b1aaa26a0649118072cc349a643435253bf14783e75889f

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-linux
 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