sassc-embedded 1.5.2 → 1.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34c4811b38299f8c49a35d9b8b87d23d610406fd94ce7f8075ac03313db70a23
-  data.tar.gz: 390d007373427c76c86c3bf4a9c7e8610dc99da6524bfc3546138b6f63b4fc83
+  metadata.gz: 695381cf5ae96903ffaf015c6e406eab12c38312008ee5dce88e2f1658d6da35
+  data.tar.gz: c5c981214af6123d9c17ff3dc4b6099bc78864419df9c29848ce146ebbfeca2d
 SHA512:
-  metadata.gz: cc3c3f6ee78f82364b1ea56e44ae8e0006b9def7cf27492b7eb4a8e40fc47d7df99b2e10c125a285d19627964d7bb6f0f195049772351885df187725ed1fd14b
-  data.tar.gz: bbf300fce0ae4ea93219a10e321038fa22126f337303b02e2837dc808d2fc06a0ead8c733f2ee2591ee51c198037a9ef4d476772d1c723d58188f04e20b26f15
+  metadata.gz: 9a346cd91ea29ae9618460eee15592b1316948637bae1054a343521f9a0194b290c972d37481fd91b068d47bf83d38a033efb2f9e20f3713fcbc7ad339110cbb
+  data.tar.gz: 36d53934e2f475d3c62a42a5f7530c32668d42d4ba3a09a84eed6177bb9256d4dc7383adf64d80b6863590bffbfc676c6cec6b792b24523cbce7b516d887ff5d

data/lib/sassc/embedded/version.rb

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

data/lib/sassc/embedded.rb

@@ -204,7 +204,7 @@ module SassC
       class << self
         def resolve_path(path, from_import)
           ext = File.extname(path)
-          unless ext.empty?
+          if ['.sass', '.scss', '.css'].include?(ext)
             if from_import
               result = exactly_one(try_path("#{without_ext(path)}.import#{ext}"))
               return result unless result.nil?
@@ -212,6 +212,15 @@ module SassC
             return exactly_one(try_path(path))
           end
 
+          unless ext.empty?
+            if from_import
+              result = exactly_one(try_path("#{without_ext(path)}.import#{ext}"))
+              return result unless result.nil?
+            end
+            result = exactly_one(try_path(path))
+            return result unless result.nil?
+          end
+
           if from_import
             result = exactly_one(try_path_with_ext("#{path}.import"))
             return result unless result.nil?
@@ -286,6 +295,8 @@ module SassC
       def initialize(importer)
         @importer = importer
         @importer_results = {}
+        @load_id = 0
+        @load_urls = {}
         @parent_urls = [URL.path_to_file_url(File.absolute_path(@importer.options[:filename] || 'stdin'))]
       end
 
@@ -293,12 +304,14 @@ module SassC
         return url if url.start_with?(Protocol::IMPORT, Protocol::LOADED)
 
         if url.start_with?(Protocol::LOAD)
-          url = url.delete_prefix(Protocol::LOAD)
+          url = @load_urls.delete(url.delete_prefix(Protocol::LOAD))
           return url if @importer_results.key?(url)
 
           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 resolved.nil? ? nil : URL.path_to_file_url(resolved)
+          return URL.path_to_file_url(resolved) unless resolved.nil?
+
+          return
         end
 
         return unless url.start_with?(Protocol::FILE)
@@ -371,25 +384,28 @@ module SassC
       def imports_to_native(imports)
         {
           contents: imports.flat_map do |import|
-            file_url = URL.path_to_file_url(import.path)
+            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
             if import.source
-              @importer_results[file_url] = if import.source.is_a?(Hash)
+              @importer_results[load_url] = if import.source.is_a?(Hash)
                                               {
                                                 contents: import.source[:contents],
                                                 syntax: import.source[:syntax],
-                                                source_map_url: file_url
+                                                source_map_url: load_url
                                               }
                                             else
                                               {
                                                 contents: import.source,
                                                 syntax: syntax(import.path),
-                                                source_map_url: file_url
+                                                source_map_url: load_url
                                               }
                                             end
             end
             [
-              "@import #{"#{Protocol::LOAD}#{file_url}".inspect};",
-              "@import #{"#{Protocol::LOADED}#{file_url}".inspect};"
+              "@import \"#{Protocol::LOAD}#{load_id}\";",
+              "@import \"#{Protocol::LOADED}#{load_id}\";"
             ]
           end.join("\n"),
           syntax: :scss

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sassc-embedded
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.5
 platform: ruby
 authors:
 - なつき
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-04 00:00:00.000000000 Z
+date: 2022-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sassc
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.0
+        version: 0.19.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.0
+        version: 0.19.0
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
@@ -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.2
-  source_code_uri: https://github.com/ntkme/sassc-embedded-polyfill-ruby/tree/v1.5.2
+  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
   funding_uri: https://github.com/sponsors/ntkme
 post_install_message: 
 rdoc_options: []