sassc-embedded 1.5.4 → 1.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e5e1e76c99f6d9c1e0735114d4c1fee858fbf466878fa45fb607142d605886b
-  data.tar.gz: 2c428bbc53b229b9ecbd6ac26a3f559a2eb47b458d02855e64b444d6238dc0e9
+  metadata.gz: 0bfb6d5d03f82fe0caed0330d377a072a9943695119839dedd7927b9353ae234
+  data.tar.gz: a3ab1f40872818454a6dc4df354c053022efc44fe0f8e9f8138eab21645e212c
 SHA512:
-  metadata.gz: 55b738463c259f446fb89f4373a5b6929f3c9abf07cd403217c860036780cb4a2737a6c2deceb3ef470baf9e523eb76794579a9fa75fe4b2d807439fa0c8ee9e
-  data.tar.gz: 222ddb543a2aea77fa84cc625c6a920c5350598c263defcedddf8db638dd704a6061a7b7d15ac61ad0299e8ec02520af76a58242e6774a86c6d591f1c4dd13f5
+  metadata.gz: e85eb1e5be70cdbca5d2561945c9ff8cc291f8721ebc3d1c53e7e58d7dec47953b131ec70c8d8c2d497f1f9a25c16ee84e3e23e465cf18fa62412fd1b99c4974
+  data.tar.gz: af772e37b302bfc34f3db138f79ed86a2628185a6f95699687e0f4d19ff5588c68a01ac50b66e9ddd63a8fa9e518ceaae8d74ff12637056d24c7c1474129ceeb

data/lib/sassc/embedded/version.rb

@@ -2,6 +2,6 @@
 
 module SassC
   module Embedded
-    VERSION = '1.5.4'
+    VERSION = '1.5.7'
   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,70 +283,59 @@ 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)
-
-        if url.start_with?(Protocol::LOAD)
-          url = 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))
+          return canonical_url if canonical_url.start_with?(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
-
-        return unless url.start_with?(Protocol::FILE)
+          parent_path = URL.file_url_to_path(@parent_urls.last)
 
-        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))
+          id = next_id
+          canonical_url = "#{Protocol::IMPORT}#{id}"
+          @canonical_urls[id] = canonical_url
+          @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
@@ -360,10 +349,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
@@ -382,30 +373,38 @@ module SassC
       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
@@ -537,6 +536,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.4
+  version: 1.5.7
 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.4
-  source_code_uri: https://github.com/ntkme/sassc-embedded-polyfill-ruby/tree/v1.5.4
+  documentation_uri: https://rubydoc.info/gems/sassc-embedded/1.5.7
+  source_code_uri: https://github.com/ntkme/sassc-embedded-polyfill-ruby/tree/v1.5.7
   funding_uri: https://github.com/sponsors/ntkme
 post_install_message: 
 rdoc_options: []