klenod-plugin-css 0.0.13 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4acbda1ed646f829fcf4a2e65294664650fb5c6f9d30dfff21e5d948668028ab
-  data.tar.gz: e1e18292969640397bb7bbdbb0447e9d7cfbca2fb213ee4236d7c1d554c2e7d3
+  metadata.gz: ed46edbabbf73e9d8f5d30187c19a946ea8593d22c055cc42d299389579c9a64
+  data.tar.gz: 4d42b67e82c23c8acba8e54a9762f9e54dc942fde38bc8d69cd8c01038dec9f3
 SHA512:
-  metadata.gz: 5aa1eba5bfbb0df0a991dc17cd8f99b01e92618326f516c13213daea361fa24db803024897ae785f60f5aa86229a078f69cc9c7fde19196fbb10004e4e0d319e
-  data.tar.gz: 5899a0fa6dc1c555c3c44b2c86a8a58799be7f7ab016ca8ce771579e10e4a72ccf21a62b4cb0759cf1c852477a10cd67852a207c39d40ff02259b1929e219d6f
+  metadata.gz: '08d2e6445114ff8a75831216aff6a3bde58c34deb1a62ae9051bd8a47c864238f63a138b4a77a2a31369ea55d8287d7907812abde044c1840d52da49c7405fad'
+  data.tar.gz: 80c88fcaf3402f8a0a7522103a4b418dfa1d866dacb31ed5f82dd5fdcf6bf7313d88b4610249f058336a209076781be995507c053c0c3496b2b86c7bf482841d

data/ext/native/Cargo.lock

@@ -236,13 +236,26 @@ dependencies = [
  "smallvec",
 ]
 
+[[package]]
+name = "cssparser"
+version = "0.38.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "11119743ad110e8c1bdccd930d7f5c30c99e5fc76a7b63ec9807e84eef0c5f59"
+dependencies = [
+ "cssparser-macros",
+ "dtoa-short",
+ "itoa",
+ "phf 0.14.0",
+ "smallvec",
+]
+
 [[package]]
 name = "cssparser-color"
 version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbaa233e1dcd9c13a5d3e3a8a2c0f5a727bac380398345dbcb31db4597edc86b"
 dependencies = [
- "cssparser",
+ "cssparser 0.37.0",
 ]
 
 [[package]]
@@ -494,7 +507,7 @@ dependencies = [
  "ahash 0.8.12",
  "bitflags",
  "const-str",
- "cssparser",
+ "cssparser 0.37.0",
  "cssparser-color",
  "dashmap",
  "data-encoding",
@@ -587,7 +600,7 @@ name = "native"
 version = "0.0.1"
 dependencies = [
  "base64",
- "cssparser",
+ "cssparser 0.38.0",
  "lightningcss",
  "magnus",
  "parcel_sourcemap",
@@ -624,7 +637,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d05f71e01edca03d245ab0a9f7ce13a974ceb79baaae8faf2ba0b11de6b90913"
 dependencies = [
  "bitflags",
- "cssparser",
+ "cssparser 0.37.0",
  "log",
  "phf 0.11.3",
  "phf_codegen",
@@ -689,11 +702,22 @@ version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c1562dc717473dbaa4c1f85a36410e03c047b2e7df7f45ee938fbef64ae7fadf"
 dependencies = [
- "phf_macros",
+ "phf_macros 0.13.1",
  "phf_shared 0.13.1",
  "serde",
 ]
 
+[[package]]
+name = "phf"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "010378780309880b08997fae13be7834dba947d36393bd372f2b1556deb2a2f6"
+dependencies = [
+ "phf_macros 0.14.0",
+ "phf_shared 0.14.0",
+ "serde",
+]
+
 [[package]]
 name = "phf_codegen"
 version = "0.11.3"
@@ -724,6 +748,16 @@ dependencies = [
  "phf_shared 0.13.1",
 ]
 
+[[package]]
+name = "phf_generator"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aeb62e0959d5a1bebc965f4d15d9e2b7cea002b6b0f5ba8cde6cc26738467100"
+dependencies = [
+ "fastrand",
+ "phf_shared 0.14.0",
+]
+
 [[package]]
 name = "phf_macros"
 version = "0.13.1"
@@ -737,6 +771,19 @@ dependencies = [
  "syn 2.0.119",
 ]
 
+[[package]]
+name = "phf_macros"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5fa8d0ca26d424d27630da600c6624696e7dec8bf7b3b492b383c5dc49e5e085"
+dependencies = [
+ "phf_generator 0.14.0",
+ "phf_shared 0.14.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.119",
+]
+
 [[package]]
 name = "phf_shared"
 version = "0.11.3"
@@ -755,6 +802,15 @@ dependencies = [
  "siphasher",
 ]
 
+[[package]]
+name = "phf_shared"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c6fd9027e2d9319be6349febd1db4e8d02aa544921200c9b777720ac34a3aa89"
+dependencies = [
+ "siphasher",
+]
+
 [[package]]
 name = "pin-project-lite"
 version = "0.2.17"

data/ext/native/Cargo.toml

@@ -9,7 +9,7 @@ crate-type = ["cdylib"]
 
 [dependencies]
 base64 = "0.23.1"
-cssparser = "0.37.0"
+cssparser = "0.38.0"
 lightningcss = { version = "1.0.0-alpha.70", features = ["serde", "visitor", "sourcemap"] }
 magnus = "0.8.2"
 parcel_sourcemap = { version = "2.1.1", features = ["json"] }

data/lib/klenod/build/plugins/css_plugin.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "klenod/plugin/css/errors"
 require "klenod/plugin/css/transformer"
 require "uri"
 
@@ -107,6 +108,7 @@ module Klenod
             css_result = result.metadata[:css_result]
             javascript_only = result.metadata[:css_javascript_only]
             return result unless css_result || javascript_only
+            return analysis_finalize(module_id, result, resolved_dependencies, dependency_records, context) if context.analysis?
 
             if javascript_only
               javascript_css_edit = finalized_css_edit(
@@ -202,6 +204,8 @@ module Klenod
           end
 
           def transform_css(module_id, code, transform_names:, context:)
+            # The filename also names the source in the emitted source map, so
+            # it stays the plain path. The error report uses module_id instead.
             Transformer.transform(
               module_id.path,
               code,
@@ -212,6 +216,10 @@ module Klenod
               local_css_variables: @local_css_variables && transform_names,
               variable_pattern: @variable_pattern
             )
+          rescue ParseError => error
+            # The native extension raises with only a message. Re-raise with the
+            # source so the report carries an excerpt like every other format.
+            raise ParseError.new(error, source: code, module_id: module_id)
           end
 
           def minify_enabled?(context)
@@ -404,6 +412,38 @@ module Klenod
             CssEdit.new(edited.code, edited.source_map)
           end
 
+          # Analysis keeps the resolved class map and an asset reference for
+          # importers, but skips import rewriting and source maps.
+          def analysis_finalize(module_id, result, resolved_dependencies, dependency_records, context)
+            if result.metadata[:css_javascript_only]
+              asset = analysis_css_asset(module_id, result.metadata.fetch(:css_javascript_result).code, :css_javascript_stylesheet, {})
+              asset.url = context.asset_url(asset.output_path)
+
+              return result.with(
+                code: "Default = #{asset.url.inspect}\n",
+                assets: [asset, *result.assets],
+                metadata: result.metadata.merge(css_javascript_stylesheet_path: asset.url)
+              )
+            end
+
+            css_result = result.metadata.fetch(:css_result)
+            classes = finalized_css_selectors(css_result, resolved_dependencies, dependency_records)
+            asset = analysis_css_asset(module_id, css_result.code, :css, {classes: classes, variables: css_result.variables})
+            asset.url = context.asset_url(asset.output_path)
+
+            result.with(
+              code: ruby_module_source(classes, asset.url, styles_dependency: result.dependencies.fetch(0)),
+              assets: [asset, *result.assets],
+              metadata: result.metadata.merge(css_asset_path: asset.url, css_classes: classes)
+            )
+          end
+
+          def analysis_css_asset(module_id, css, type, metadata)
+            hash = Hashing.short(css)
+            suffix = (type == :css) ? "" : ".javascript"
+            Asset.new(module_id.path, hash, "/#{asset_name(module_id)}#{suffix}.#{hash}.css", nil, css, "text/css", metadata.merge(type: type))
+          end
+
           def css_asset_pair(module_id, css_edit, type, metadata, context)
             source_map_asset = nil
             css = css_edit.code

data/lib/klenod/plugin/css/errors.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require "klenod/build/source_error"
+
+module Klenod
+  module Build
+    module Plugins
+      module CSSPlugin
+        # The native extension looks this class up by name and raises it with
+        # only a message, so it has to tolerate being constructed that way. The
+        # plugin catches that bare error and re-raises it with the source and
+        # module attached, which is what fills in the excerpt.
+        class ParseError < Klenod::Build::SourceError
+          # "Unexpected token Colon at app:/styles.css:11:5"
+          LOCATION = /\A(?<message>.*)\s+at\s+(?<file>.+):(?<line>\d+):(?<column>\d+)\s*\z/m
+
+          def initialize(error, source: nil, module_id: nil)
+            super
+          end
+
+          def kind
+            "CSS parse error"
+          end
+
+          private
+
+          def location(error)
+            found = LOCATION.match(message_for(error))
+            return nil unless found
+
+            Location.new(
+              # lightningcss reports a zero-based line and a one-based column.
+              line: found[:line].to_i + 1,
+              column: found[:column].to_i,
+              detail: found[:message]
+            )
+          end
+        end
+      end
+    end
+  end
+end

data/lib/klenod/plugin/css/transformer.rb

@@ -2,6 +2,8 @@
 
 require "json"
 
+require "klenod/plugin/css/errors"
+
 begin
   require "klenod/plugin/css/native"
 rescue LoadError
@@ -13,7 +15,6 @@ module Klenod
     module Plugins
       module CSSPlugin
         class Error < StandardError; end
-        class ParseError < Error; end
 
         ImportDependency = Data.define(:url, :placeholder, :supports, :media, :loc)
         UrlDependency = Data.define(:url, :placeholder, :loc)

data/lib/klenod/plugin/css/version.rb

@@ -4,7 +4,7 @@ module Klenod
   module Build
     module Plugins
       module CSSPlugin
-        VERSION = "0.0.13"
+        VERSION = "0.0.15"
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: klenod-plugin-css
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.15
 platform: ruby
 authors:
 - Andrés Alin
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.13
+        version: 0.0.15
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.13
+        version: 0.0.15
 - !ruby/object:Gem::Dependency
   name: rb_sys
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +66,7 @@ files:
 - ext/native/src/lib.rs
 - lib/klenod/build/plugins/css_plugin.rb
 - lib/klenod/plugin/css.rb
+- lib/klenod/plugin/css/errors.rb
 - lib/klenod/plugin/css/transformer.rb
 - lib/klenod/plugin/css/version.rb
 homepage: https://github.com/aalin/klenod