nanoc-dart-sass 1.0.4 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00b8a5410aedb44c77a639f2607d9769df7d5fac58f331d576980b3958f362c5
-  data.tar.gz: 85e761f9c95f6c3f5cea82e438a7f7b1b3b7b92b4def0ad0beca8f5c96bade4d
+  metadata.gz: a840ef7c17c7990a2284598a2c33f76f7ab9e8dc36a2b80b5f92fed04d372e76
+  data.tar.gz: c3af25569e9f23519cf53bad2cdd5f01bfbb328d3e6f732447f6f5fa68eee76b
 SHA512:
-  metadata.gz: 634b5c0a938d24fee988c2dd17de69ae97d0333da032ee48c3b99c4fb165693b4047353665838edd28976bb1cdd33012eb7df4a3b10a3650574a98e597ab6b7e
-  data.tar.gz: 6cf0ceccc71587928aecaa1322a23a40baaf15e4511f5085b40a00384805f2d7e00f093f878b1023804652f11916be82556fb07d258dedd313127ffce5761421
+  metadata.gz: 794c4037f669e64e01c4bcae49c3a83b790d13d8598d39f99e5e128127735adea09cb9d384f8973aec4ab58e70af7990d7369f7f048772b97b3d0b46bcb8f310
+  data.tar.gz: 94a5d55959ba24ea46254632bfa1ed2c1e3b7424f69084ae628f0be68afe66cab37e0e92e59f0abced939710bd34af8bec880cf2ce09b514bde6f86f483c74d3

data/NEWS.md

@@ -1,5 +1,15 @@
 # nanoc-dart-sass news
 
+## 2.0.0 (2025-12-31)
+
+Features:
+
+- Added support for `source_map` option [ntkme] (#1749, #1775)
+
+Changes:
+
+- Changed the importer to be in line with the spec [ntkme] (#1755)
+
 ## 1.0.4 (2024-11-04)
 
 Fixes:

data/lib/nanoc/dart_sass/filter.rb

@@ -18,30 +18,37 @@ module Nanoc
 
         result = Sass.compile_string(
           content,
-          importer: NanocImporter.new(@items, item),
+          source_map_include_sources: true,
           **params,
+          importers: [NanocImporter.new(@items)].concat(params.fetch(:importers, [])),
           syntax:,
+          url: Addressable::URI.new({ scheme: 'nanoc', path: item.identifier.to_s }).to_s,
         )
-        result.css
+
+        if result.source_map
+          "#{result.css}\n/*# sourceMappingURL=data:application/json;base64,#{[result.source_map].pack('m0')} */"
+        else
+          result.css
+        end
       end
 
       class NanocImporter
-        def initialize(items, source_item)
+        def initialize(items)
           @items = items
-          @source_item = source_item
         end
 
-        def canonicalize(url, *, **)
-          # Construct proper URL with `nanoc:` prefix if needed
-          if url.start_with?('nanoc:')
-            url
-          else
-            "nanoc:#{url}"
-          end
+        def canonicalize(url, context)
+          uri = Addressable::URI.parse(url)
+          uri = Addressable::URI.parse(context.containing_url).join(uri) unless context.containing_url.nil?
+          return unless uri.scheme == 'nanoc'
+
+          resolved = resolve_path(uri.path, context.from_import)
+          Addressable::URI.new({ scheme: 'nanoc', path: resolved }).to_s unless resolved.nil?
         end
 
         def load(url)
-          item = find_item_for_url(url)
+          uri = Addressable::URI.parse(url)
+          item = @items[uri.path]
 
           {
             contents: item.raw_content,
@@ -51,62 +58,72 @@ module Nanoc
 
         private
 
-        def find_item_for_url(url)
-          pat = url.sub(/\Ananoc:/, '')
+        # https://github.com/sass-contrib/sassc-embedded-shim-ruby/blob/594632bb896fb765462253b16ea0451f5f93316d/lib/sassc/embedded.rb#L228
+        def resolve_path(path, from_import)
+          ext = File.extname(path)
+          if ext == '.*'
+            if from_import
+              result = exactly_one(try_path_with_ext("#{without_ext(path)}.import") + try_path_with_ext("#{path}.import"))
+              return result unless result.nil?
+            end
 
-          is_extension_given = !pat.match?(%r{(/|^)[^.]+$})
+            result = exactly_one(try_path_with_ext(without_ext(path)) + try_path_with_ext(path))
+            return result unless result.nil?
 
-          # Convert to absolute pattern
-          pat =
-            if pat.start_with?('/')
-              pat
-            else
-              dirname = File.dirname(@source_item.identifier.to_s)
-              Nanoc::Core::Utils.expand_path_without_drive_identifier(pat, dirname)
-            end
+            return try_path_as_dir(path, from_import)
+          end
 
-          items = collect_items(pat, is_extension_given)
+          if ['.sass', '.scss', '.css'].include?(ext)
+            if from_import
+              result = exactly_one(try_path("#{without_ext(path)}.import#{ext}"))
+              return result unless result.nil?
+            end
+            return exactly_one(try_path(path))
+          end
 
-          # Get the single matching item, or error if there isn’t exactly one
-          items = items.compact
-          case items.size
-          when 0
-            raise "Could not find an item matching pattern `#{pat}`"
-          when 1
-            items.first
-          else
-            raise "It is not clear which item to import. Multiple items match `#{pat}`: #{items.map { _1.identifier.to_s }.sort.join(', ')}"
+          if from_import
+            result = exactly_one(try_path_with_ext("#{path}.import"))
+            return result unless result.nil?
           end
-        end
 
-        # Given a pattern, return a collection of items that match this pattern.
-        # This goes beyond what Nanoc patterns typically support by e.g.
-        # supporting partials and index imports.
-        def collect_items(pat, is_extension_given)
-          items = []
+          result = exactly_one(try_path_with_ext(path))
+          return result unless result.nil?
 
-          # Try as a regular path
-          items.concat(try_pat(pat, is_extension_given))
+          try_path_as_dir(path, from_import)
+        end
 
-          # Try as a partial
-          partial_pat = File.join(File.dirname(pat), "_#{File.basename(pat)}")
-          items.concat(try_pat(partial_pat, is_extension_given))
+        def try_path_with_ext(path)
+          result = try_path("#{path}.sass") + try_path("#{path}.scss")
+          result.empty? ? try_path("#{path}.css") : result
+        end
+
+        def try_path(path)
+          partial = File.join(File.dirname(path), "_#{File.basename(path)}")
+          result = []
+          result.concat(@items.find_all(partial).map(&:identifier).map(&:to_s))
+          result.concat(@items.find_all(path).map(&:identifier).map(&:to_s))
+          result
+        end
 
-          # Try as index
-          unless is_extension_given
-            items.concat(@items.find_all(File.join(pat, '/index.*')))
-            items.concat(@items.find_all(File.join(pat, '/_index.*')))
+        def try_path_as_dir(path, from_import)
+          if from_import
+            result = exactly_one(try_path_with_ext(File.join(path, 'index.import')))
+            return result unless result.nil?
           end
 
-          items
+          exactly_one(try_path_with_ext(File.join(path, 'index')))
         end
 
-        def try_pat(pat, is_extension_given)
-          if is_extension_given
-            @items.find_all(pat)
-          else
-            @items.find_all("#{pat}.*")
-          end
+        def exactly_one(paths)
+          return if paths.empty?
+          return paths.first if paths.one?
+
+          raise "It's not clear which file to import. Found:\n#{paths.map { |path| "  #{path}" }.join("\n")}"
+        end
+
+        def without_ext(path)
+          ext = File.extname(path)
+          path.delete_suffix(ext)
         end
       end
 

data/lib/nanoc/dart_sass/version.rb

@@ -2,6 +2,6 @@
 
 module Nanoc
   module DartSass
-    VERSION = '1.0.4'
+    VERSION = '2.0.0'
   end
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: nanoc-dart-sass
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 2.0.0
 platform: ruby
 authors:
 - Denis Defreyne
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-04 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nanoc-core
@@ -16,34 +15,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.13'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.13.1
+        version: '4.14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.13'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.13.1
+        version: '4.14'
 - !ruby/object:Gem::Dependency
   name: sass-embedded
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.56'
+        version: '1.80'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.56'
+        version: '1.80'
 description: Provides a :dart_sass filter for Nanoc
 email: denis+rubygems@denis.ws
 executables: []
@@ -62,8 +55,7 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-  source_code_uri: https://github.com/nanoc/nanoc/tree/nanoc-dart-sass-v1.0.4/nanoc-dart-sass
-post_install_message:
+  source_code_uri: https://github.com/nanoc/nanoc/tree/nanoc-dart-sass-v2.0.0/nanoc-dart-sass
 rdoc_options: []
 require_paths:
 - lib
@@ -71,15 +63,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.1'
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.21
-signing_key:
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Dart Sass filter for Nanoc
 test_files: []