klenod-plugin-javascript 0.0.13 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f6d99ba8d67935d9db3c5fdd451ced0508f9c2d9de7ae8daefc4de42cb6cf67
-  data.tar.gz: '09df9d3181ec7af2caa74a7e9132abbfc9de4167ac41fb86743e5153c5ca96bc'
+  metadata.gz: 3c8464e3833b7ea07785ee149f36573ef7eecaa594cbaa0e80db676b23f7b24e
+  data.tar.gz: 04a644220d927ccb75dce5da97368b2f6fda74a40b2fc442899da229bce261fa
 SHA512:
-  metadata.gz: 23c83b068ecbd2d4c630c4623f04853a68548ce205f4b0a84b37e30544c2c1f744280b5cd5e1346d295d134ce8154d4cbc3921a279e6d6517f52f024550d107e
-  data.tar.gz: f7e0a04b3fddff8cf9cc6d62927321ed933b1c16889ec190ca922c548df2fb5d20068a2a95d018acb7fa2d59acbdbfe093790e5a37f795fe4b510767ccaaea60
+  metadata.gz: f5e7232182b2f214b46a9f6416700d8db21f1bada0c8b2c9abbd22a9d5b8d6abc6776d3c0e789add63ffcfbf41525bfad38214d2bb8d1a299001675843628c1f
+  data.tar.gz: 5f1d84b30baefca55d175f3350008850af922c6b9113230c4fc558154908f423684008f0d07071d8ce0c725fe4ae53453cdc042cc24d2e03fa6fe961c71d6764

data/ext/native/Cargo.lock

@@ -964,9 +964,9 @@ dependencies = [
 
 [[package]]
 name = "swc_core"
-version = "77.1.2"
+version = "78.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "400701fb0bc3d13d1d0a1de6f58d91489fa9007eb3c584057bb2adb637fa9a5d"
+checksum = "2b3e1cf21711152ac57d0ade1fea33bf8f1cc974f7bc1f668ac0252252876803"
 dependencies = [
  "swc_allocator",
  "swc_atoms",

data/ext/native/Cargo.toml

@@ -9,4 +9,4 @@ crate-type = ["cdylib"]
 
 [dependencies]
 magnus = "0.8.2"
-swc_core = { version = "77.1.2", features = ["common", "ecma_ast", "ecma_codegen", "ecma_parser", "ecma_parser_typescript", "ecma_transforms_react", "ecma_transforms_typescript", "ecma_visit"] }
+swc_core = { version = "78.0.0", features = ["common", "ecma_ast", "ecma_codegen", "ecma_parser", "ecma_parser_typescript", "ecma_transforms_react", "ecma_transforms_typescript", "ecma_visit"] }

data/ext/native/src/lib.rs

@@ -1,7 +1,8 @@
 use magnus::{function, prelude::*, Error, RArray, RHash, Ruby, TryConvert};
 use swc_core::{
     common::{
-        comments::NoopComments, sync::Lrc, FileName, Globals, Mark, SourceMap, Span, GLOBALS,
+        comments::NoopComments, sync::Lrc, FileName, Globals, Mark, SourceMap, Span, Spanned,
+        GLOBALS,
     },
     ecma::{
         ast::{
@@ -222,9 +223,16 @@ fn parse_module(
     );
     let mut parser = Parser::new_from(lexer);
     let module = parser.parse_module().map_err(|error| {
+        let loc = source_map.lookup_char_pos(error.span().lo);
         Error::new(
             ruby.exception_syntax_error(),
-            format!("{}: {}", filename, error.kind().msg()),
+            format!(
+                "{}:{}:{}: {}",
+                filename,
+                loc.line,
+                loc.col.0 + 1,
+                error.kind().msg()
+            ),
         )
     })?;
     Ok(ParsedProgram {

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

@@ -12,6 +12,7 @@ require "klenod/build/source_map"
 require "klenod/build/transform_result"
 require "klenod/runtime"
 
+require_relative "../../plugin/javascript/errors"
 require_relative "../../plugin/javascript/parser"
 
 module Klenod
@@ -72,14 +73,21 @@ module Klenod
             return super unless EXTENSIONS.include?(module_id.extname)
 
             custom_element = custom_element_module?(module_id)
+            return analysis_transform(module_id, code, custom_element) if context.analysis?
+
             jsx_runtime_namespace = custom_element ? jsx_runtime_namespace(module_id) : nil
-            transform = Parser.transform(
-              code,
-              filename: module_id.to_s,
-              source_kind: source_kind(module_id),
-              minify: minify_enabled?(context),
-              jsx_runtime_namespace: jsx_runtime_namespace
-            )
+            transform =
+              begin
+                Parser.transform(
+                  code,
+                  filename: module_id.to_s,
+                  source_kind: source_kind(module_id),
+                  minify: minify_enabled?(context),
+                  jsx_runtime_namespace: jsx_runtime_namespace
+                )
+              rescue ScriptError => e
+                raise ParseError.new(e, source: code, module_id: module_id)
+              end
             javascript_source, imports =
               if custom_element
                 inject_jsx_runtime(transform.code, transform.imports, module_id, jsx_runtime_namespace)
@@ -103,6 +111,22 @@ module Klenod
             )
           end
 
+          # Analysis only needs the module graph: imports are scanned without
+          # compiling, and the missing javascript_source makes finalize skip
+          # import rewriting and asset emission.
+          def analysis_transform(module_id, code, custom_element)
+            imports = Parser::FallbackScanner.new(code, module_id.to_s).imports
+
+            Klenod::Build::TransformResult.new(
+              module_source(nil),
+              build_dependencies(module_id, imports),
+              nil,
+              [],
+              [],
+              {javascript_imports: imports, javascript_custom_element: custom_element}
+            )
+          end
+
           def finalize(module_id, result, resolved_dependencies, dependency_records, context)
             source = result.metadata[:javascript_source]
             original_source = result.metadata[:javascript_original_source]

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

@@ -90,7 +90,7 @@ module Klenod
             return nil unless module_id.scheme == SCHEME
 
             path = absolute_path(module_id, context)
-            LoadResult.new(path.read(encoding: "UTF-8"), Hashing.file_hexdigest(path), nil)
+            LoadResult.new(path.read(encoding: "UTF-8"), context.analysis? ? Hashing.file_key(path) : Hashing.file_hexdigest(path), nil)
           end
 
           private

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

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require "klenod/build/source_error"
+
+module Klenod
+  module Build
+    module Plugins
+      module JavaScriptPlugin
+        # The native parser raises a bare SyntaxError, which is a ScriptError
+        # rather than a StandardError, so it escapes every `rescue => e` in the
+        # build and takes the watcher thread down with it. Wrapping it in a
+        # SourceError that carries the source lets it be collected like a Haml
+        # parse error and rendered in the browser error dialog.
+        class ParseError < Klenod::Build::SourceError
+          # "app:/pages/thing.tsx:33:9: Expected '</', got ':'"
+          LOCATION = /\A(?<file>.+?):(?<line>\d+):(?<column>\d+):\s*(?<message>.*)\z/m
+
+          def kind
+            "JavaScript parse error"
+          end
+
+          private
+
+          def location(error)
+            found = LOCATION.match(error.message)
+            return nil unless found
+
+            # One-based, matching HamlPlugin::ParseError#line and the column the
+            # native parser reports.
+            Location.new(
+              line: found[:line].to_i,
+              column: found[:column].to_i,
+              detail: found[:message]
+            )
+          end
+        end
+      end
+    end
+  end
+end

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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: klenod-plugin-javascript
 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
@@ -68,6 +68,7 @@ files:
 - lib/klenod/build/plugins/node_modules_plugin.rb
 - lib/klenod/build/plugins/node_modules_plugin/package_exports.rb
 - lib/klenod/plugin/javascript.rb
+- lib/klenod/plugin/javascript/errors.rb
 - lib/klenod/plugin/javascript/parser.rb
 - lib/klenod/plugin/javascript/version.rb
 homepage: https://github.com/aalin/klenod