expressir 0.2.12-x64-mingw32 → 0.2.13-x64-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0582a52e1a4528719ce1ce40997d0446cf6da005ad32d305301a96f47d7a9f60'
-  data.tar.gz: 5c37ae0f9255bc51004350a083d296fb431e7842e67640357030b346f365a4a3
+  metadata.gz: 893b08150342d7e5e7d8ec1f0edd111c916355ef2b619e5b99d6faac4e5cd967
+  data.tar.gz: 20fec0d8ca1b42dce5dd650c50514bc8d6b1e3985278fd3a37613d51534fc0ae
 SHA512:
-  metadata.gz: f5900b59674fa8973aebf26e8400b41633680d24551654a94f9f24704336ef0bbede9b8f340c4200c5c6287d0134d174a769defb973ad79601239feea0dc5b4d
-  data.tar.gz: 70500e7c84bb33bac352e93a64ab25c2d331b2fb5fb79887f53998ada089c615465711695896f3326ee2dc0879719d0c3712d668b6b792f54fc9692a482b8538
+  metadata.gz: 51dbf159b960e3d973b27239be90a2321598b0557c1c50bff4b74e305564fd8a06fc34efc534382524085102ede330e5961b5ec4a198fea721bf1ec4f9fbec36
+  data.tar.gz: 40ae0df6545e9fd98271507696074d5d43339c62feefead2a21590ce7a60eb950037f0efb25deb8cad74f73f29b268fc44a73482fab597a076055a77ad264f8e

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: x64-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