sassc-embedded 1.5.5 → 1.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 695381cf5ae96903ffaf015c6e406eab12c38312008ee5dce88e2f1658d6da35
-  data.tar.gz: c5c981214af6123d9c17ff3dc4b6099bc78864419df9c29848ce146ebbfeca2d
+  metadata.gz: 47ccda859c1fd8acaffccd1945f5dc15907e5ca96086244a01fc3091003cf4d4
+  data.tar.gz: 7ee3c7121bf0c299771c4a9d3a6c1f5699a85565acea5392ddf3c3c9a6b3856f
 SHA512:
-  metadata.gz: 9a346cd91ea29ae9618460eee15592b1316948637bae1054a343521f9a0194b290c972d37481fd91b068d47bf83d38a033efb2f9e20f3713fcbc7ad339110cbb
-  data.tar.gz: 36d53934e2f475d3c62a42a5f7530c32668d42d4ba3a09a84eed6177bb9256d4dc7383adf64d80b6863590bffbfc676c6cec6b792b24523cbce7b516d887ff5d
+  metadata.gz: 6f548fbe156fa13744ced7282b9a1959f35851bd24b1c3d329542e426715a7a0dbf400e7dddff9cee76b3d73af978087a0e383f0b37e7c2c61f7c64c7c096589
+  data.tar.gz: 8aa5ff0798d5ffbc0699543884c2c13e953d5847b59c0ea47d4573ce68e35329ff380f16fda6b3560cc012f86a35509ab272d0f5e907b8765805a5f8c0adcd55

data/lib/sassc/embedded/version.rb

@@ -2,6 +2,6 @@
 
 module SassC
   module Embedded
-    VERSION = '1.5.5'
+    VERSION = '1.5.8'
   end
 end

data/lib/sassc/embedded.rb

@@ -36,7 +36,7 @@ module SassC
       )
 
       @dependencies = result.loaded_urls
-                            .filter { |url| url.start_with?('file:') && url != file_url }
+                            .filter { |url| url.start_with?(Protocol::FILE) && url != file_url }
                             .map { |url| URL.file_url_to_path(url) }
       @source_map = post_process_source_map(result.source_map)
 
@@ -45,10 +45,10 @@ module SassC
       line = e.span&.start&.line
       line += 1 unless line.nil?
       url = e.span&.url
-      path = if url&.start_with?('file:')
+      path = if url&.start_with?(Protocol::FILE)
                URL.parse(url).route_from(URL.path_to_file_url("#{File.absolute_path('')}/"))
              end
-      raise SyntaxError.new(e.message, filename: path, line: line)
+      raise SyntaxError.new(e.full_message, filename: path, line: line)
     end
 
     private
@@ -109,7 +109,7 @@ module SassC
       data = JSON.parse(source_map)
       data['file'] = URL.parse(output_url).route_from(url).to_s if output_url
       data['sources'].map! do |source|
-        if source.start_with?('file:')
+        if source.start_with?(Protocol::FILE)
           URL.parse(source).route_from(url).to_s
         else
           source
@@ -283,72 +283,55 @@ module SassC
     private_constant :FileImporter
 
     class Importer
-      module Protocol
-        FILE = 'file:'
-        IMPORT = 'sassc-embedded-import:'
-        LOAD = 'sassc-embedded-load:'
-        LOADED = 'sassc-embedded-loaded:'
-      end
-
-      private_constant :Protocol
-
       def initialize(importer)
         @importer = importer
+
+        @canonical_urls = {}
+        @id = 0
         @importer_results = {}
-        @load_id = 0
-        @load_urls = {}
         @parent_urls = [URL.path_to_file_url(File.absolute_path(@importer.options[:filename] || 'stdin'))]
       end
 
       def canonicalize(url, from_import:)
-        return url if url.start_with?(Protocol::IMPORT, Protocol::LOADED)
-
-        if url.start_with?(Protocol::LOAD)
-          url = @load_urls.delete(url.delete_prefix(Protocol::LOAD))
-          return url if @importer_results.key?(url)
-
+        if url.start_with?(Protocol::IMPORT)
+          canonical_url = @canonical_urls.delete(url.delete_prefix(Protocol::IMPORT))
+          unless @importer_results.key?(canonical_url)
+            canonical_url = resolve_file_url(canonical_url, @parent_urls.last, from_import)
+          end
+          @parent_urls.push(canonical_url)
+          canonical_url
+        elsif url.start_with?(Protocol::FILE)
           path = URL.parse(url).route_from(@parent_urls.last).to_s
-          resolved = resolve_path(path, URL.file_url_to_path(@parent_urls.last), from_import)
-          return URL.path_to_file_url(resolved) unless resolved.nil?
-
-          return
-        end
+          parent_path = URL.file_url_to_path(@parent_urls.last)
 
-        return unless url.start_with?(Protocol::FILE)
-
-        path = URL.parse(url).route_from(@parent_urls.last).to_s
-        parent_path = URL.file_url_to_path(@parent_urls.last)
+          imports = @importer.imports(path, parent_path)
+          imports = [SassC::Importer::Import.new(path)] if imports.nil?
+          imports = [imports] unless imports.is_a?(Array)
+          imports.each do |import|
+            import.path = File.absolute_path(import.path, File.dirname(parent_path))
+          end
 
-        imports = @importer.imports(path, parent_path)
-        imports = [SassC::Importer::Import.new(path)] if imports.nil?
-        imports = [imports] unless imports.is_a?(Array)
-        imports.each do |import|
-          import.path = File.absolute_path(import.path, File.dirname(parent_path))
+          canonical_url = "#{Protocol::IMPORT}#{next_id}"
+          @importer_results[canonical_url] = imports_to_native(imports)
+          canonical_url
+        elsif url.start_with?(Protocol::LOADED)
+          canonical_url = Protocol::LOADED
+          @parent_urls.pop
+          canonical_url
         end
-
-        import_url = URL.path_to_file_url(File.absolute_path(path, File.dirname(parent_path)))
-        canonical_url = "#{Protocol::IMPORT}#{import_url}"
-        @importer_results[canonical_url] = imports_to_native(imports)
-        canonical_url
       end
 
       def load(canonical_url)
-        if canonical_url.start_with?(Protocol::IMPORT)
+        if @importer_results.key?(canonical_url)
           @importer_results.delete(canonical_url)
         elsif canonical_url.start_with?(Protocol::FILE)
-          @parent_urls.push(canonical_url)
-          if @importer_results.key?(canonical_url)
-            @importer_results.delete(canonical_url)
-          else
-            path = URL.file_url_to_path(canonical_url)
-            {
-              contents: File.read(path),
-              syntax: syntax(path),
-              source_map_url: canonical_url
-            }
-          end
+          path = URL.file_url_to_path(canonical_url)
+          {
+            contents: File.read(path),
+            syntax: syntax(path),
+            source_map_url: canonical_url
+          }
         elsif canonical_url.start_with?(Protocol::LOADED)
-          @parent_urls.pop
           {
             contents: '',
             syntax: :scss
@@ -362,10 +345,12 @@ module SassC
         @load_paths ||= (@importer.options[:load_paths] || []) + SassC.load_paths
       end
 
-      def resolve_path(path, parent_path, from_import)
+      def resolve_file_url(url, parent_url, from_import)
+        path = URL.parse(url).route_from(parent_url).to_s
+        parent_path = URL.file_url_to_path(parent_url)
         [File.dirname(parent_path)].concat(load_paths).each do |load_path|
           resolved = FileImporter.resolve_path(File.absolute_path(path, load_path), from_import)
-          return resolved unless resolved.nil?
+          return URL.path_to_file_url(resolved) unless resolved.nil?
         end
         nil
       end
@@ -384,33 +369,38 @@ module SassC
       def imports_to_native(imports)
         {
           contents: imports.flat_map do |import|
-            load_id = @load_id
-            @load_id = load_id.next
-            load_url = URL.path_to_file_url(import.path)
-            @load_urls[load_id.to_s] = load_url
+            id = next_id
+            canonical_url = URL.path_to_file_url(import.path)
+            @canonical_urls[id] = canonical_url
             if import.source
-              @importer_results[load_url] = if import.source.is_a?(Hash)
-                                              {
-                                                contents: import.source[:contents],
-                                                syntax: import.source[:syntax],
-                                                source_map_url: load_url
-                                              }
-                                            else
-                                              {
-                                                contents: import.source,
-                                                syntax: syntax(import.path),
-                                                source_map_url: load_url
-                                              }
-                                            end
+              @importer_results[canonical_url] = if import.source.is_a?(Hash)
+                                                   {
+                                                     contents: import.source[:contents],
+                                                     syntax: import.source[:syntax],
+                                                     source_map_url: canonical_url
+                                                   }
+                                                 else
+                                                   {
+                                                     contents: import.source,
+                                                     syntax: syntax(import.path),
+                                                     source_map_url: canonical_url
+                                                   }
+                                                 end
             end
             [
-              "@import \"#{Protocol::LOAD}#{load_id}\";",
-              "@import \"#{Protocol::LOADED}#{load_id}\";"
+              "@import \"#{Protocol::IMPORT}#{id}\";",
+              "@import \"#{Protocol::LOADED}#{id}\";"
             ]
           end.join("\n"),
           syntax: :scss
         }
       end
+
+      def next_id
+        id = @id
+        @id = id.next
+        id.to_s
+      end
     end
 
     private_constant :Importer
@@ -542,6 +532,14 @@ module SassC
     end
   end
 
+  module Protocol
+    FILE = 'file:'
+    IMPORT = 'sassc-embedded-import:'
+    LOADED = 'sassc-embedded-loaded:'
+  end
+
+  private_constant :Protocol
+
   module URL
     PARSER = URI::Parser.new({ RESERVED: ';/?:@&=+$,' })
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sassc-embedded
 version: !ruby/object:Gem::Version
-  version: 1.5.5
+  version: 1.5.8
 platform: ruby
 authors:
 - なつき
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-06 00:00:00.000000000 Z
+date: 2022-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sassc
@@ -138,8 +138,8 @@ homepage: https://github.com/ntkme/sassc-embedded-polyfill-ruby
 licenses:
 - MIT
 metadata:
-  documentation_uri: https://rubydoc.info/gems/sassc-embedded/1.5.5
-  source_code_uri: https://github.com/ntkme/sassc-embedded-polyfill-ruby/tree/v1.5.5
+  documentation_uri: https://rubydoc.info/gems/sassc-embedded/1.5.8
+  source_code_uri: https://github.com/ntkme/sassc-embedded-polyfill-ruby/tree/v1.5.8
   funding_uri: https://github.com/sponsors/ntkme
 post_install_message: 
 rdoc_options: []