expressir 0.2.12-arm64-darwin → 0.2.13-arm64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 752baf32f6dd6ee50c00a7816890e657cca06bf2d6caeb7fb59f2c9b26a76de4
-  data.tar.gz: 6956c5eb8889afabb1ba99cc81111e1f175425f2ae77d35e3d7964b662d7d77d
+  metadata.gz: ad9bdb019911b86897a5a40fd6e4fb4d76bc687426b78584f8f32ba30839682c
+  data.tar.gz: 2ffedeba944df494f9388788ea44bc1ccbe7393cd273fe526847b911f24d4a32
 SHA512:
-  metadata.gz: a611a4cc0b0f00e98ccd2ee99d2fa3331fb8fbb2541555314c9afc1ac892a05a514a8f9902d99c896bd0a752ad2ade1986e7d3569e17852d2236792546a4e61a
-  data.tar.gz: 02e514f4037f7bb3e543aef11db5c9a7dd60fec258753e4dccebaf561ccf6b2b72b782b50b2ece15df41186c366457c1f023f7e29ec67f0b1907eb6443920a55
+  metadata.gz: 0532c0148e0a0b88b91919ad1993e0d8dd3c3aca0816bcc60cf817270b5d8a05564cd2e182b39ed8b1e13f00489bb39a85624c428c8ba7279e7531ab7056ebaa
+  data.tar.gz: 52c300c3f01a1c0ea3b3e80a11596495db0447a0a7238ad43d857e5ef5daa9a038f59cd70ead54ea3b9887e6e3b51b5ce84b401d8313bc8a1ed4663e2e1482a5

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: arm64-darwin
 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