sassc-embedded 1.5.3 → 1.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b84338d9d4ffba85e3b720f4a2683710800e9f44b15d03f0763de93882963a7a
-  data.tar.gz: 8e0945ad581b851d3dae2415f9f7f9c3699c270b6e617444025a58612940ae08
+  metadata.gz: 464d4f9326ea315b791701d5ff9ca9a06201b9bbdccc920aba591ea5764f9cba
+  data.tar.gz: c149398af2d50cad3659f680d1f10a053e7290457340e02758fa4235a2f7ba34
 SHA512:
-  metadata.gz: 1c0f74d8531765a1d0e615227b5135fe80a1c44632241dd6eed7ca004ad2ffb64b92c1617ca298c9d31883fbb78dabc5144601399efb0ece8b1ee9862d2017c7
-  data.tar.gz: e51bb48f861c668d5f31a1b9bc101c2d112baf4145d80a483f38c8a779114ba2f9454b6a278e706fc2726c555058eed7a5dca338ee4dc4e3c4552846c80e2db1
+  metadata.gz: 7b9e55b5db011df6ee7befabb77a6e74934ed7addf4bedcc8ebcf831ca38a7cdeff2b2d2f34ce7326f83cd97f52d8f19f79f1229882f8a436dd533243ad207db
+  data.tar.gz: 506cf7f45c08fc2e7f82e1d6675fb2d9cf9b36a66d098ae5fc43e6ea0c997b2fe4f442caa4cbdb1b442132768c32c35e83e2457da40ff2a8baff29cb9e05a60c

data/lib/sassc/embedded/version.rb

@@ -2,6 +2,6 @@
 
 module SassC
   module Embedded
-    VERSION = '1.5.3'
+    VERSION = '1.5.6'
   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,26 +283,20 @@ 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 = {}
         @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)
+        return url if url.start_with?(Protocol::LOADED)
 
-        if url.start_with?(Protocol::LOAD)
-          url = url.delete_prefix(Protocol::LOAD)
+        if url.start_with?(Protocol::IMPORT)
+          url = @canonical_urls.delete(url.delete_prefix(Protocol::IMPORT))
           return url if @importer_results.key?(url)
 
           path = URL.parse(url).route_from(@parent_urls.last).to_s
@@ -324,8 +318,9 @@ module SassC
           import.path = File.absolute_path(import.path, File.dirname(parent_path))
         end
 
-        import_url = URL.path_to_file_url(File.absolute_path(path, File.dirname(parent_path)))
-        canonical_url = "#{Protocol::IMPORT}#{import_url}"
+        id = next_id
+        canonical_url = "#{Protocol::IMPORT}#{id}"
+        @canonical_urls[id] = canonical_url
         @importer_results[canonical_url] = imports_to_native(imports)
         canonical_url
       end
@@ -369,36 +364,51 @@ module SassC
       end
 
       def syntax(path)
-        File.extname(path) == '.sass' ? :indented : :scss
+        case File.extname(path)
+        when '.sass'
+          :indented
+        when '.css'
+          :css
+        else
+          :scss
+        end
       end
 
       def imports_to_native(imports)
         {
           contents: imports.flat_map do |import|
-            file_url = URL.path_to_file_url(import.path)
+            id = next_id
+            canonical_url = URL.path_to_file_url(import.path)
+            @canonical_urls[id] = canonical_url
             if import.source
-              @importer_results[file_url] = if import.source.is_a?(Hash)
-                                              {
-                                                contents: import.source[:contents],
-                                                syntax: import.source[:syntax],
-                                                source_map_url: file_url
-                                              }
-                                            else
-                                              {
-                                                contents: import.source,
-                                                syntax: syntax(import.path),
-                                                source_map_url: file_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}#{file_url}".inspect};",
-              "@import #{"#{Protocol::LOADED}#{file_url}".inspect};"
+              "@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
@@ -530,6 +540,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.3
+  version: 1.5.6
 platform: ruby
 authors:
 - なつき
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-05 00:00:00.000000000 Z
+date: 2022-04-06 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.3
-  source_code_uri: https://github.com/ntkme/sassc-embedded-polyfill-ruby/tree/v1.5.3
+  documentation_uri: https://rubydoc.info/gems/sassc-embedded/1.5.6
+  source_code_uri: https://github.com/ntkme/sassc-embedded-polyfill-ruby/tree/v1.5.6
   funding_uri: https://github.com/sponsors/ntkme
 post_install_message: 
 rdoc_options: []