expressir 0.2.25-arm64-darwin → 0.2.26-arm64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 05621c7782b2f221c393ae9f37450448d6c9d3bdaf6c44a4cfc3a07a531ddd83
-  data.tar.gz: bac61b760408cc12bea0abb2ca362767be28a5975dd2638a372ce631eb5fc2ec
+  metadata.gz: c97108da470f2f536888b5aa383db896e330a6452580a918d0a8071a5a694d72
+  data.tar.gz: fcf0cc508f86bc62c6c17f52b8ea309154f2184628ca7dbcd613b79ae2e9828c
 SHA512:
-  metadata.gz: b0f85201f8c638e40e97bfaaa836523c884f7ed35f56da3e2f812a571d008fbeb52959c4971c0b354ea42efe31fd21578f6a9f3da5b89992d496a23f34f4e8c7
-  data.tar.gz: 4d3c9cd28a2ded77e45413f8bfb61dd6abe85db648fda5df01231698e2f4854df4126a857c4504863caee71c84339625bd4f300c35f85be8f8aa1ad0832dd765
+  metadata.gz: e74050647e050606233264c7843eca50d1f63dd8ea90758d83bb5f5480a83be5c10396390314845e703dd1fcbc2e72826d7bfd3afbddc74dcf604c4e7066da64
+  data.tar.gz: 4e156a923124e6493b41c74cf811c24ced5e981102ce2295f3a79353305beab2257db5457311314b351d930a284420467b3dd53572b5c89db7e4d0c9ad88f14d

data/.github/workflows/rake.yml

@@ -40,11 +40,12 @@ jobs:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
 
-      - run: bundle exec rake compile
+      - uses: actions/cache@v2
+        with:
+          path: lib/expressir/express_exp/express_parser.*
+          key: v3-${{ runner.os }}-${{ matrix.ruby }}-${{ hashFiles('ext/express-parser/extconf.rb', 'ext/express-parser/antlrgen/**', 'ext/express-parser/express_parser.cpp', '.git/modules/ext/express-parser/antlr4-upstream/HEAD') }}
 
-      - run: bundle exec rake
+      - if: hashFiles('lib/expressir/express_exp/express_parser.*') == ''
+        run: bundle exec rake compile
 
-      - uses: actions/upload-artifact@v2
-        with:
-          name: express_parser-${{ matrix.os }}-${{ matrix.ruby }}
-          path: lib/expressir/express_exp/express_parser.so
+      - run: bundle exec rake

data/exe/format

@@ -1,81 +1,18 @@
 #!/usr/bin/env ruby
 
 require "yaml"
-require "tempfile"
 require "expressir/express_exp/parser"
 require "expressir/express_exp/formatter"
 require "expressir/express_exp/schema_head_formatter"
 require "expressir/express_exp/hyperlink_formatter"
-require "expressir/express_exp/cache"
 
-exp_files = [
-  # basic test
-  # '../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',
-  # cyclic reference test
-  # '../iso-10303-stepmod/data/modules/analysis/mim_annotated.exp',
-  # '../iso-10303-stepmod/data/modules/analysis_product_relationships/mim_annotated.exp',
-  # cyclic reference test 2
-  # '../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',
-  # renamed reference test (36s)
-  # '../iso-10303-stepmod/ballots/ballots/ap210_wg12/express/resources/mathematical_functions_schema.exp',
-  # '../iso-10303-stepmod/data/resources/iso13584_expressions_schema/iso13584_expressions_schema.exp',
-  # annotated-express test (12s)
-  # see https://github.com/metanorma/annotated-express/blob/master/data/documents/resources/fundamentals_of_product_description_and_support/sections/04-schemas.adoc
-  '../iso-10303-stepmod/data/resources/action_schema/action_schema_annotated.exp',
-  '../iso-10303-stepmod/data/resources/application_context_schema/application_context_schema_annotated.exp',
-  '../iso-10303-stepmod/data/resources/approval_schema/approval_schema_annotated.exp',
-  '../iso-10303-stepmod/data/resources/basic_attribute_schema/basic_attribute_schema_annotated.exp',
-  '../iso-10303-stepmod/data/resources/certification_schema/certification_schema_annotated.exp',
-  '../iso-10303-stepmod/data/resources/contract_schema/contract_schema_annotated.exp',
-  '../iso-10303-stepmod/data/resources/date_time_schema/date_time_schema_annotated.exp',
-  '../iso-10303-stepmod/data/resources/document_schema/document_schema.exp',
-  '../iso-10303-stepmod/data/resources/effectivity_schema/effectivity_schema_annotated.exp',
-  '../iso-10303-stepmod/data/resources/experience_schema/experience_schema_annotated.exp',
-  '../iso-10303-stepmod/data/resources/external_reference_schema/external_reference_schema_annotated.exp',
-  '../iso-10303-stepmod/data/resources/group_schema/group_schema_annotated.exp',
-  '../iso-10303-stepmod/data/resources/language_schema/language_schema_annotated.exp',
-  '../iso-10303-stepmod/data/resources/location_schema/location_schema_annotated.exp',
-  '../iso-10303-stepmod/data/resources/management_resources_schema/management_resources_schema_annotated.exp',
-  '../iso-10303-stepmod/data/resources/measure_schema/measure_schema_annotated.exp',
-  '../iso-10303-stepmod/data/resources/person_organization_schema/person_organization_schema_annotated.exp',
-  '../iso-10303-stepmod/data/resources/process_property_schema/process_property_schema_annotated.exp',
-  '../iso-10303-stepmod/data/resources/product_definition_schema/product_definition_schema_annotated.exp',
-  '../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',
-  '../iso-10303-stepmod/data/resources/qualifications_schema/qualifications_schema_annotated.exp',
-  '../iso-10303-stepmod/data/resources/security_classification_schema/security_classification_schema_annotated.exp',
-  '../iso-10303-stepmod/data/resources/support_resource_schema/support_resource_schema_annotated.exp',
-  # full test (6m18s + 8s = 6m26s)
-  # *`bundle exec ../stepmod-utils/exe/stepmod-find-express-files ../iso-10303-stepmod`.strip.split("\n").map{|file| File.exists?(file.sub(/\.exp$/, '_annotated.exp')) ? file.sub(/\.exp$/, '_annotated.exp') : file}
-]
+exp_files = ARGV
 
-start = Time.now
 repository = Expressir::ExpressExp::Parser.from_files(exp_files)
-puts "Parser.from_files time:  #{(Time.now - start).round(2)}s"
-
-temp_file = Tempfile.new
-begin
-  start = Time.now
-  Expressir::ExpressExp::Cache.to_file(temp_file, repository)
-  puts "Cache.to_file time:      #{(Time.now - start).round(2)}s"
-
-  start = Time.now
-  repository = Expressir::ExpressExp::Cache.from_file(temp_file)
-  puts "Cache.from_file time:    #{(Time.now - start).round(2)}s"
-ensure
-  temp_file.close
-  temp_file.unlink
-end
-
-start = Time.now
 formatter = Class.new(Expressir::ExpressExp::Formatter) do
   include Expressir::ExpressExp::SchemaHeadFormatter
   include Expressir::ExpressExp::HyperlinkFormatter
 end
 result = repository.to_hash(formatter: formatter, skip_empty: true)
-puts "Repository.to_hash time: #{(Time.now - start).round(2)}s"
 
-# puts YAML.dump(result)
+puts YAML.dump(result)

data/exe/format-test

@@ -0,0 +1,81 @@
+#!/usr/bin/env ruby
+
+require "yaml"
+require "tempfile"
+require "expressir/express_exp/parser"
+require "expressir/express_exp/formatter"
+require "expressir/express_exp/schema_head_formatter"
+require "expressir/express_exp/hyperlink_formatter"
+require "expressir/express_exp/cache"
+
+exp_files = [
+  # basic test
+  # '../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',
+  # cyclic reference test
+  # '../iso-10303-stepmod/data/modules/analysis/mim_annotated.exp',
+  # '../iso-10303-stepmod/data/modules/analysis_product_relationships/mim_annotated.exp',
+  # cyclic reference test 2
+  # '../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',
+  # renamed reference test (36s)
+  # '../iso-10303-stepmod/ballots/ballots/ap210_wg12/express/resources/mathematical_functions_schema.exp',
+  # '../iso-10303-stepmod/data/resources/iso13584_expressions_schema/iso13584_expressions_schema.exp',
+  # annotated-express test (12s)
+  # see https://github.com/metanorma/annotated-express/blob/master/data/documents/resources/fundamentals_of_product_description_and_support/sections/04-schemas.adoc
+  '../iso-10303-stepmod/data/resources/action_schema/action_schema_annotated.exp',
+  '../iso-10303-stepmod/data/resources/application_context_schema/application_context_schema_annotated.exp',
+  '../iso-10303-stepmod/data/resources/approval_schema/approval_schema_annotated.exp',
+  '../iso-10303-stepmod/data/resources/basic_attribute_schema/basic_attribute_schema_annotated.exp',
+  '../iso-10303-stepmod/data/resources/certification_schema/certification_schema_annotated.exp',
+  '../iso-10303-stepmod/data/resources/contract_schema/contract_schema_annotated.exp',
+  '../iso-10303-stepmod/data/resources/date_time_schema/date_time_schema_annotated.exp',
+  '../iso-10303-stepmod/data/resources/document_schema/document_schema.exp',
+  '../iso-10303-stepmod/data/resources/effectivity_schema/effectivity_schema_annotated.exp',
+  '../iso-10303-stepmod/data/resources/experience_schema/experience_schema_annotated.exp',
+  '../iso-10303-stepmod/data/resources/external_reference_schema/external_reference_schema_annotated.exp',
+  '../iso-10303-stepmod/data/resources/group_schema/group_schema_annotated.exp',
+  '../iso-10303-stepmod/data/resources/language_schema/language_schema_annotated.exp',
+  '../iso-10303-stepmod/data/resources/location_schema/location_schema_annotated.exp',
+  '../iso-10303-stepmod/data/resources/management_resources_schema/management_resources_schema_annotated.exp',
+  '../iso-10303-stepmod/data/resources/measure_schema/measure_schema_annotated.exp',
+  '../iso-10303-stepmod/data/resources/person_organization_schema/person_organization_schema_annotated.exp',
+  '../iso-10303-stepmod/data/resources/process_property_schema/process_property_schema_annotated.exp',
+  '../iso-10303-stepmod/data/resources/product_definition_schema/product_definition_schema_annotated.exp',
+  '../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',
+  '../iso-10303-stepmod/data/resources/qualifications_schema/qualifications_schema_annotated.exp',
+  '../iso-10303-stepmod/data/resources/security_classification_schema/security_classification_schema_annotated.exp',
+  '../iso-10303-stepmod/data/resources/support_resource_schema/support_resource_schema_annotated.exp',
+  # full test (6m18s + 8s = 6m26s)
+  # *`bundle exec ../stepmod-utils/exe/stepmod-find-express-files ../iso-10303-stepmod`.strip.split("\n").map{|file| File.exists?(file.sub(/\.exp$/, '_annotated.exp')) ? file.sub(/\.exp$/, '_annotated.exp') : file}
+]
+
+start = Time.now
+repository = Expressir::ExpressExp::Parser.from_files(exp_files)
+puts "Parser.from_files time:  #{(Time.now - start).round(2)}s"
+
+temp_file = Tempfile.new
+begin
+  start = Time.now
+  Expressir::ExpressExp::Cache.to_file(temp_file, repository)
+  puts "Cache.to_file time:      #{(Time.now - start).round(2)}s"
+
+  start = Time.now
+  repository = Expressir::ExpressExp::Cache.from_file(temp_file)
+  puts "Cache.from_file time:    #{(Time.now - start).round(2)}s"
+ensure
+  temp_file.close
+  temp_file.unlink
+end
+
+start = Time.now
+formatter = Class.new(Expressir::ExpressExp::Formatter) do
+  include Expressir::ExpressExp::SchemaHeadFormatter
+  include Expressir::ExpressExp::HyperlinkFormatter
+end
+result = repository.to_hash(formatter: formatter, skip_empty: true)
+puts "Repository.to_hash time: #{(Time.now - start).round(2)}s"
+
+# puts YAML.dump(result)

data/lib/expressir/express_exp/resolve_references_model_visitor.rb

@@ -22,10 +22,6 @@ module Expressir
         end
         return unless base_item
 
-        if base_item.is_a? Model::InterfacedItem
-          base_item = base_item.base_item
-        end
-
         node.base_path = base_item.path
       end
     end

data/lib/expressir/model/model_element.rb

@@ -74,6 +74,10 @@ module Expressir
           break unless current_scope
         end
 
+        if target_node.is_a? Model::InterfacedItem
+          target_node = target_node.base_item
+        end
+
         target_node
       end
 

data/lib/expressir/model/schema.rb

@@ -46,6 +46,8 @@ module Expressir
       end
 
       def interfaced_items
+        return [] unless parent
+
         interfaces.flat_map do |interface|
           schema = parent.children_by_id[interface.schema.id.downcase]
           if schema

data/lib/expressir/version.rb

@@ -1,3 +1,3 @@
 module Expressir
-  VERSION = "0.2.25".freeze
+  VERSION = "0.2.26".freeze
 end

data/original/examples/syntax/multiple.exp

@@ -1,4 +1,4 @@
-SCHEMA multiple_schema1;
+SCHEMA multiple_schema;
 REFERENCE FROM multiple_schema2;
 REFERENCE FROM multiple_schema3 (attribute_entity3);
 REFERENCE FROM multiple_schema4 (attribute_entity AS attribute_entity4);

data/original/examples/syntax/multiple.yaml

@@ -3,7 +3,7 @@ _class: Expressir::Model::Repository
 schemas:
 - _class: Expressir::Model::Schema
   file: original/examples/syntax/multiple.exp
-  id: multiple_schema1
+  id: multiple_schema
   interfaces:
   - _class: Expressir::Model::Interface
     kind: :REFERENCE
@@ -54,13 +54,13 @@ schemas:
     subtype_of:
     - _class: Expressir::Model::Expressions::SimpleReference
       id: empty_entity
-      base_path: multiple_schema1.empty_entity
+      base_path: multiple_schema.empty_entity
   - _class: Expressir::Model::Entity
     id: subtype_attribute_entity
     subtype_of:
     - _class: Expressir::Model::Expressions::SimpleReference
       id: attribute_entity
-      base_path: multiple_schema1.attribute_entity
+      base_path: multiple_schema.attribute_entity
     attributes:
     - _class: Expressir::Model::Attribute
       kind: :EXPLICIT
@@ -74,7 +74,7 @@ schemas:
           entity:
             _class: Expressir::Model::Expressions::SimpleReference
             id: attribute_entity
-            base_path: multiple_schema1.attribute_entity
+            base_path: multiple_schema.attribute_entity
         attribute:
           _class: Expressir::Model::Expressions::SimpleReference
           id: test

data/original/examples/syntax/multiple_formatted.exp

@@ -1,4 +1,4 @@
-SCHEMA multiple_schema1;
+SCHEMA multiple_schema;
 
 REFERENCE FROM multiple_schema2;
 REFERENCE FROM multiple_schema3

data/original/examples/syntax/multiple_hyperlink_formatted.exp

@@ -1,4 +1,4 @@
-SCHEMA multiple_schema1;
+SCHEMA multiple_schema;
 
 REFERENCE FROM {{{<<express:multiple_schema2,multiple_schema2>>}}};
 REFERENCE FROM {{{<<express:multiple_schema3,multiple_schema3>>}}}
@@ -17,12 +17,12 @@ ENTITY attribute_entity;
 END_ENTITY;
 
 ENTITY subtype_empty_entity
-  SUBTYPE OF ({{{<<express:multiple_schema1.empty_entity,empty_entity>>}}});
+  SUBTYPE OF ({{{<<express:multiple_schema.empty_entity,empty_entity>>}}});
 END_ENTITY;
 
 ENTITY subtype_attribute_entity
-  SUBTYPE OF ({{{<<express:multiple_schema1.attribute_entity,attribute_entity>>}}});
-  SELF\{{{<<express:multiple_schema1.attribute_entity,attribute_entity>>}}}.test : BOOLEAN;
+  SUBTYPE OF ({{{<<express:multiple_schema.attribute_entity,attribute_entity>>}}});
+  SELF\{{{<<express:multiple_schema.attribute_entity,attribute_entity>>}}}.test : BOOLEAN;
 END_ENTITY;
 
 ENTITY subtype_attribute_entity2

data/original/examples/syntax/multiple_schema_head_hyperlink_formatted.exp

@@ -1,4 +1,4 @@
-SCHEMA multiple_schema1;
+SCHEMA multiple_schema;
 
 REFERENCE FROM {{{<<express:multiple_schema2,multiple_schema2>>}}};
 REFERENCE FROM {{{<<express:multiple_schema3,multiple_schema3>>}}}

data/spec/expressir/express_exp/parser_spec.rb

@@ -86,7 +86,7 @@ RSpec.describe Expressir::ExpressExp::Parser do
       expect(schemas[0].file).to eq(exp_files[0].to_s)
       expect(schemas[0].id).to eq("single_schema")
       expect(schemas[1].file).to eq(exp_files[1].to_s)
-      expect(schemas[1].id).to eq("multiple_schema1")
+      expect(schemas[1].id).to eq("multiple_schema")
       expect(schemas[2].file).to eq(exp_files[1].to_s)
       expect(schemas[2].id).to eq("multiple_schema2")
       expect(schemas[3].file).to eq(exp_files[1].to_s)

data/spec/expressir/model/model_element_spec.rb

@@ -71,7 +71,57 @@ RSpec.describe Expressir::Model::ModelElement do
   end
 
   describe ".find" do
-    it "finds an object" do
+    it "finds an object (single.exp)" do
+      exp_file = Expressir.root_path.join("original", "examples", "syntax", "single.exp")
+
+      repo = Expressir::ExpressExp::Parser.from_file(exp_file)
+
+      # universal scope
+      expect(repo.find('single_schema')).to be_instance_of(Expressir::Model::Schema)
+      expect(repo.find('single_schema.empty_entity')).to be_instance_of(Expressir::Model::Entity)
+
+      # schema scope
+      schema = repo.schemas.first
+      expect(schema.find('empty_entity')).to be_instance_of(Expressir::Model::Entity)
+    end
+
+    it "finds an object (multiple.exp)" do
+      exp_file = Expressir.root_path.join("original", "examples", "syntax", "multiple.exp")
+
+      repo = Expressir::ExpressExp::Parser.from_file(exp_file)
+
+      # universal scope
+      expect(repo.find('multiple_schema')).to be_instance_of(Expressir::Model::Schema)
+      expect(repo.find('multiple_schema.empty_entity')).to be_instance_of(Expressir::Model::Entity)
+      expect(repo.find('multiple_schema.attribute_entity')).to be_instance_of(Expressir::Model::Entity)
+      expect(repo.find('multiple_schema.attribute_entity2')).to be_instance_of(Expressir::Model::Entity)
+      expect(repo.find('multiple_schema.attribute_entity3')).to be_instance_of(Expressir::Model::Entity)
+      expect(repo.find('multiple_schema.attribute_entity4')).to be_instance_of(Expressir::Model::Entity)
+
+      # schema scope
+      schema = repo.schemas.first
+      expect(schema.find('empty_entity')).to be_instance_of(Expressir::Model::Entity)
+      expect(schema.find('attribute_entity')).to be_instance_of(Expressir::Model::Entity)
+      expect(schema.find('attribute_entity2')).to be_instance_of(Expressir::Model::Entity)
+      expect(schema.find('attribute_entity3')).to be_instance_of(Expressir::Model::Entity)
+      expect(schema.find('attribute_entity4')).to be_instance_of(Expressir::Model::Entity)
+    end
+
+    it "finds an object (syntax.exp)" do
+      exp_file = Expressir.root_path.join("original", "examples", "syntax", "syntax.exp")
+
+      repo = Expressir::ExpressExp::Parser.from_file(exp_file)
+
+      # universal scope
+      expect(repo.find('syntax_schema')).to be_instance_of(Expressir::Model::Schema)
+      expect(repo.find('syntax_schema.empty_entity')).to be_instance_of(Expressir::Model::Entity)
+
+      # schema scope
+      schema = repo.schemas.first
+      expect(schema.find('empty_entity')).to be_instance_of(Expressir::Model::Entity)
+    end
+
+    it "finds an object (remark.exp)" do
       exp_file = Expressir.root_path.join("original", "examples", "syntax", "remark.exp")
 
       repo = Expressir::ExpressExp::Parser.from_file(exp_file)
@@ -116,6 +166,7 @@ RSpec.describe Expressir::Model::ModelElement do
       expect(repo.find('remark_schema.remark_rule.wr:WR1')).to be_instance_of(Expressir::Model::Where)
       expect(repo.find('remark_schema.remark_rule.IP1')).to be_instance_of(Expressir::Model::RemarkItem)
       expect(repo.find('remark_schema.remark_rule.ip:IP1')).to be_instance_of(Expressir::Model::RemarkItem)
+      expect(repo.find('remark_schema.remark_item')).to be_instance_of(Expressir::Model::RemarkItem)
 
       # schema scope
       schema = repo.schemas.first
@@ -157,6 +208,7 @@ RSpec.describe Expressir::Model::ModelElement do
       expect(schema.find('remark_rule.wr:WR1')).to be_instance_of(Expressir::Model::Where)
       expect(schema.find('remark_rule.IP1')).to be_instance_of(Expressir::Model::RemarkItem)
       expect(schema.find('remark_rule.ip:IP1')).to be_instance_of(Expressir::Model::RemarkItem)
+      expect(schema.find('remark_item')).to be_instance_of(Expressir::Model::RemarkItem)
 
       # type scope
       type = schema.types.first

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: expressir
 version: !ruby/object:Gem::Version
-  version: 0.2.25
+  version: 0.2.26
 platform: arm64-darwin
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-22 00:00:00.000000000 Z
+date: 2021-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -175,6 +175,7 @@ files:
 - docs/development.md
 - exe/expressir
 - exe/format
+- exe/format-test
 - exe/generate-parser
 - expressir.gemspec
 - lib/expressir.rb