platformos-check 0.4.12 → 0.4.14

data/lib/platformos_check/app.rb

@@ -6,20 +6,20 @@ require "pathname"
 
 module PlatformosCheck
   class App
-    API_CALLS_REGEX = %r{\A(?-mix:^/?((marketplace_builder|app)/|modules/(.+)(private|public|marketplace_builder|app)/)?)(notifications/api_call_notifications|api_calls)/(.+)\.liquid\z}
-    ASSETS_REGEX = %r{\A(?-mix:^/?((marketplace_builder|app)/|modules/(.+)(private|public|marketplace_builder|app)/)?)assets/}
-    EMAILS_REGEX = %r{\A(?-mix:^/?((marketplace_builder|app)/|modules/(.+)(private|public|marketplace_builder|app)/)?)(notifications/email_notifications|emails)/(.+)\.liquid\z}
-    GRAPHQL_REGEX = %r{\A(?-mix:^/?((marketplace_builder|app)/|modules/(.+)(private|public|marketplace_builder|app)/)?)(graph_queries|graphql)s?/(.+)\.graphql\z}
-
-    MIGRATIONS_REGEX = %r{\A(?-mix:^/?((marketplace_builder|app)/|modules/(.+)(private|public|marketplace_builder|app)/)?)migrations/(.+)\.liquid\z}
-    PAGES_REGEX = %r{\A(?-mix:^/?((marketplace_builder|app)/|modules/(.+)(private|public|marketplace_builder|app)/)?)(pages|views/pages)/(.+).liquid\z}
-    PARTIALS_REGEX = %r{\A(?-mix:^/?((marketplace_builder|app)/|modules/(.+)(private|public|marketplace_builder|app)/)?)(views/partials|lib)/(.+)\.liquid\z}
-    FORMS_REGEX = %r{\A(?-mix:^/?((marketplace_builder|app)/|modules/(.+)(private|public|marketplace_builder|app)/)?)(form_configurations|forms)/(.+)\.liquid\z}
-    LAYOUTS_REGEX = %r{\A(?-mix:^/?((marketplace_builder|app)/|modules/(.+)(private|public|marketplace_builder|app)/)?)(views/layouts)/(.+).liquid\z}
-    SCHEMA_REGEX = %r{\A(?-mix:^/?((marketplace_builder|app)/|modules/(.+)(private|public|marketplace_builder|app)/)?)(custom_model_types|model_schemas|schema)/(.+)\.yml\z}
-    SMSES_REGEX =  %r{\A(?-mix:^/?((marketplace_builder|app)/|modules/(.+)(private|public|marketplace_builder|app)/)?)(notifications/sms_notifications|smses)/(.+)\.liquid\z}
+    API_CALLS_REGEX = %r{\A(?-mix:^/?((marketplace_builder|app)/|(app/)?modules/(.+)(private|public|marketplace_builder|app)/)?)(notifications/api_call_notifications|api_calls)/(.+)\.liquid\z}
+    ASSETS_REGEX = %r{\A(?-mix:^/?((marketplace_builder|app)/|(app/)?modules/(.+)(private|public|marketplace_builder|app)/)?)assets/}
+    EMAILS_REGEX = %r{\A(?-mix:^/?((marketplace_builder|app)/|(app/)?modules/(.+)(private|public|marketplace_builder|app)/)?)(notifications/email_notifications|emails)/(.+)\.liquid\z}
+    GRAPHQL_REGEX = %r{\A(?-mix:^/?((marketplace_builder|app)/|(app/)?modules/(.+)(private|public|marketplace_builder|app)/)?)(graph_queries|graphql)s?/(.+)\.graphql\z}
+
+    MIGRATIONS_REGEX = %r{\A(?-mix:^/?((marketplace_builder|app)/|(app/)?modules/(.+)(private|public|marketplace_builder|app)/)?)migrations/(.+)\.liquid\z}
+    PAGES_REGEX = %r{\A(?-mix:^/?((marketplace_builder|app)/|(app/)?modules/(.+)(private|public|marketplace_builder|app)/)?)(pages|views/pages)/(.+).liquid\z}
+    PARTIALS_REGEX = %r{\A(?-mix:^/?((marketplace_builder|app)/|(app/)?modules/(.+)(private|public|marketplace_builder|app)/)?)(views/partials|lib)/(.+)\.liquid\z}
+    FORMS_REGEX = %r{\A(?-mix:^/?((marketplace_builder|app)/|(app/)?modules/(.+)(private|public|marketplace_builder|app)/)?)(form_configurations|forms)/(.+)\.liquid\z}
+    LAYOUTS_REGEX = %r{\A(?-mix:^/?((marketplace_builder|app)/|(app/)?modules/(.+)(private|public|marketplace_builder|app)/)?)(views/layouts)/(.+).liquid\z}
+    SCHEMA_REGEX = %r{\A(?-mix:^/?((marketplace_builder|app)/|(app/)?modules/(.+)(private|public|marketplace_builder|app)/)?)(custom_model_types|model_schemas|schema)/(.+)\.yml\z}
+    SMSES_REGEX =  %r{\A(?-mix:^/?((marketplace_builder|app)/|(app/)?modules/(.+)(private|public|marketplace_builder|app)/)?)(notifications/sms_notifications|smses)/(.+)\.liquid\z}
     USER_SCHEMA_REGEX = %r{\A(?-mix:^/?((marketplace_builder|app)/)?)user.yml}
-    TRANSLATIONS_REGEX = %r{\A(?-mix:^/?((marketplace_builder|app)/|modules/(.+)(private|public|marketplace_builder|app)/)?)translations/(.+)\.yml}
+    TRANSLATIONS_REGEX = %r{\A(?-mix:^/?((marketplace_builder|app)/|(app/)?modules/(.+)(private|public|marketplace_builder|app)/)?)translations/(.+)\.yml}
     CONFIG_REGEX = %r{\A(?-mix:^/?((marketplace_builder|app)/)?)config.yml}
 
     REGEXP_MAP = {
@@ -60,10 +60,19 @@ module PlatformosCheck
         next unless regexp
 
         f = klass.new(path, storage)
+
         if remove
           @grouped_files[klass].delete(f.name)
+          if f.module_overwrite_file? && storage.files.include?(f.module_original_file_path)
+            original_file = klass.new(f.module_original_file_path, storage)
+            @grouped_files[klass][original_file.name] = original_file
+          elsif f.module_original_file? && storage.files.include?(f.module_overwrite_file_path)
+            overwrite_file = klass.new(f.module_overwrite_file_path, storage)
+            @grouped_files[klass][overwrite_file.name] = overwrite_file
+          end
         else
-          @grouped_files[klass][f.name] = f
+          # we want to keep the reference to a module overwrite, if exists
+          @grouped_files[klass][f.name] = f unless f.module_original_file? && @grouped_files[klass][f.name] && @grouped_files[klass][f.name].module_overwrite_file?
         end
       end
       @grouped_files

data/lib/platformos_check/app_file.rb

@@ -48,10 +48,31 @@ module PlatformosCheck
     end
 
     def module_name
-      @module_name ||= begin
-        dir_names = @relative_path.split(File::SEPARATOR).reject(&:empty?)
-        dir_names.first == 'modules' ? dir_names[1] : nil
-      end
+      @module_name ||= if module_original_file?
+                         dir_names[1]
+                       elsif module_overwrite_file?
+                         return dir_names[2]
+                       end
+    end
+
+    def module_original_file?
+      dir_names[0] == 'modules'
+    end
+
+    def module_overwrite_file?
+      dir_names[0] == 'app' && dir_names[1] == 'modules'
+    end
+
+    def module_overwrite_file_path
+      @module_overwrite_file_path ||= module_original_file? ? 'app/' + relative_path.to_s : nil
+    end
+
+    def module_original_file_path
+      @module_original_file_path ||= module_overwrite_file? ? dir_names[1..].join(File::SEPARATOR) : nil
+    end
+
+    def dir_names
+      @dir_names ||= @relative_path.split(File::SEPARATOR).reject(&:empty?)
     end
 
     # For the corrector to work properly, we should have a

data/lib/platformos_check/asset_file.rb

@@ -4,7 +4,7 @@ require "zlib"
 
 module PlatformosCheck
   class AssetFile < AppFile
-    DIR_PREFIX = %r{\A/?((marketplace_builder|app)/assets/|modules/((\w|-)*)/(private|public)/assets/)}
+    DIR_PREFIX = %r{\A/?((marketplace_builder|app)/assets/|(app/)?modules/((\w|-)*)/(private|public)/assets/)}
 
     def initialize(relative_path, storage)
       super

data/lib/platformos_check/file_system_storage.rb

@@ -31,7 +31,7 @@ module PlatformosCheck
 
       file(relative_path).dirname.mkpath unless file(relative_path).dirname.directory?
       file(relative_path).write(content, mode: 'w+b', encoding: 'UTF-8')
-      @platformos_app&.update([relative_path])
+      @platformos_app&.update([relative_path], remove: !file_exists?(relative_path))
     end
 
     def remove(relative_path)

data/lib/platformos_check/form_file.rb

@@ -2,7 +2,7 @@
 
 module PlatformosCheck
   class FormFile < LiquidFile
-    DIR_PREFIX = %r{\A/?((marketplace_builder|app)/(form_configurations|forms)/|modules/((\w|-)*)/(private|public)/(form_configurations|forms)/)}
+    DIR_PREFIX = %r{\A/?((marketplace_builder|app)/(form_configurations|forms)/|(app/)?modules/((\w|-)*)/(private|public)/(form_configurations|forms)/)}
 
     def form?
       true

data/lib/platformos_check/graphql_file.rb

@@ -4,7 +4,7 @@ require 'graphql'
 
 module PlatformosCheck
   class GraphqlFile < AppFile
-    DIR_PREFIX = %r{\A/?((marketplace_builder|app)/(graph_queries|graphql)s?/|modules/((\w|-)*)/(private|public)/(graph_queries|graphql)s?/)}
+    DIR_PREFIX = %r{\A/?((marketplace_builder|app)/(graph_queries|graphql)s?/|(app/)?modules/((\w|-)*)/(private|public)/(graph_queries|graphql)s?/)}
 
     def write
       content = rewriter.to_s

data/lib/platformos_check/language_server/completion_context.rb

@@ -28,6 +28,8 @@ module PlatformosCheck
 
       def cursor
         @cursor ||= (absolute_cursor - token&.start) || 0
+      rescue StandardError
+        0
       end
 
       def content

data/lib/platformos_check/language_server/handler.rb

@@ -169,8 +169,8 @@ module PlatformosCheck
 
       def on_workspace_did_create_files(_id, params)
         paths = params[:files]
-          &.map { |file| file[:uri] }
-          &.map { |uri| file_path(uri) }
+                &.map { |file| file[:uri] }
+                &.map { |uri| file_path(uri) }
         return unless paths
 
         paths.each do |path|
@@ -184,8 +184,8 @@ module PlatformosCheck
 
       def on_workspace_did_delete_files(_id, params)
         absolute_paths = params[:files]
-          &.map { |file| file[:uri] }
-          &.map { |uri| file_path(uri) }
+                         &.map { |file| file[:uri] }
+                         &.map { |uri| file_path(uri) }
 
         return unless absolute_paths
 
@@ -202,8 +202,8 @@ module PlatformosCheck
       # (which might trigger another platformos_app analysis).
       def on_workspace_will_rename_files(id, params)
         relative_paths = params[:files]
-          &.map { |file| [file[:oldUri], file[:newUri]] }
-          &.map { |(old_uri, new_uri)| [relative_path_from_uri(old_uri), relative_path_from_uri(new_uri)] }
+                         &.map { |file| [file[:oldUri], file[:newUri]] }
+                         &.map { |(old_uri, new_uri)| [relative_path_from_uri(old_uri), relative_path_from_uri(new_uri)] }
         return @bridge.send_response(id, nil) unless relative_paths
 
         relative_paths.each do |(old_path, new_path)|

data/lib/platformos_check/language_server/variable_lookup_finder.rb

@@ -75,11 +75,10 @@ module PlatformosCheck
         is_liquid_variable = content =~ Liquid::VariableStart
         is_in_variable_segment = previous_char =~ VARIABLE_LOOKUP_CHARACTERS
         is_on_blank_variable_lookup_position = content[0..cursor - 1] =~ /[{:,-]\s+$/
-        (
-          is_liquid_variable && (
-            is_in_variable_segment ||
-            is_on_blank_variable_lookup_position
-          )
+
+        is_liquid_variable && (
+          is_in_variable_segment ||
+          is_on_blank_variable_lookup_position
         )
       end
 
@@ -162,11 +161,10 @@ module PlatformosCheck
         is_liquid_tag = content.match?(Liquid::TagStart)
         is_in_variable_segment = markup =~ ENDS_WITH_POTENTIAL_LOOKUP
         is_on_blank_variable_lookup_position = markup =~ ENDS_WITH_BLANK_POTENTIAL_LOOKUP
-        (
-          is_liquid_tag && (
-            is_in_variable_segment ||
-            is_on_blank_variable_lookup_position
-          )
+
+        is_liquid_tag && (
+          is_in_variable_segment ||
+          is_on_blank_variable_lookup_position
         )
       end
 

data/lib/platformos_check/layout_file.rb

@@ -2,7 +2,7 @@
 
 module PlatformosCheck
   class LayoutFile < LiquidFile
-    DIR_PREFIX = %r{\A/?((marketplace_builder|app)/(views/layouts)/|modules/((\w|-)*)/(private|public)/(views/layouts)/)}
+    DIR_PREFIX = %r{\A/?((marketplace_builder|app)/(views/layouts)/|(app/)?modules/((\w|-)*)/(private|public)/(views/layouts)/)}
 
     def layout?
       true

data/lib/platformos_check/partial_file.rb

@@ -2,7 +2,7 @@
 
 module PlatformosCheck
   class PartialFile < LiquidFile
-    DIR_PREFIX = %r{\A/?((marketplace_builder|app)/(views/partials|liquid_views|views|lib)/|modules/((\w|-)*)/(private|public)/(views/partials|liquid_views|views|lib)/)}
+    DIR_PREFIX = %r{\A/?((marketplace_builder|app)/(views/partials|liquid_views|views|lib)/|(app/)?modules/((\w|-)*)/(private|public)/(views/partials|liquid_views|views|lib)/)}
 
     def partial?
       true

data/lib/platformos_check/platformos_liquid/documentation.rb

@@ -22,8 +22,8 @@ module PlatformosCheck
           property_entry = SourceIndex
                            .objects
                            .find { |entry| entry.name == object_name }
-            &.properties
-            &.find { |prop| prop.name == property_name }
+                           &.properties
+                           &.find { |prop| prop.name == property_name }
 
           render_doc(property_entry)
         end

data/lib/platformos_check/translation_file.rb

@@ -2,7 +2,7 @@
 
 module PlatformosCheck
   class TranslationFile < YamlFile
-    DIR_PREFIX = %r{\A/?((marketplace_builder|app)/(translations)/|modules/((\w|-)*)/(private|public)/(translations)/)}
+    DIR_PREFIX = %r{\A/?((marketplace_builder|app)/(translations)/|(app/)?modules/((\w|-)*)/(private|public)/(translations)/)}
     TRANSLATION_FILTERS = Set.new(%w[t t_escape translate translate_escape]).freeze
     attr_reader :language
 

data/lib/platformos_check/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PlatformosCheck
-  VERSION = "0.4.12"
+  VERSION = "0.4.14"
 end

data/platformos-check.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency('graphql', '~> 2.0.0')
-  spec.add_dependency('liquid', '>= 5.4.0')
+  spec.add_dependency('liquid', '5.4.0')
   spec.add_dependency('nokogiri', '>= 1.12')
   spec.add_dependency('parser', '~> 3')
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: platformos-check
 version: !ruby/object:Gem::Version
-  version: 0.4.12
+  version: 0.4.14
 platform: ruby
 authors:
 - Piotr Bliszczyk
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-04-13 00:00:00.000000000 Z
+date: 2024-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql
@@ -30,14 +30,14 @@ dependencies:
   name: liquid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
         version: 5.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
         version: 5.4.0
 - !ruby/object:Gem::Dependency
@@ -373,7 +373,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.7
+rubygems_version: 3.5.18
 signing_key: 
 specification_version: 4
 summary: A platformOS App Linter