darkroom 0.0.6 → 0.0.7

data/lib/darkroom/delegates/html.rb

@@ -1,53 +1,55 @@
 # frozen_string_literal: true
 
 require_relative('../asset')
+require_relative('../delegate')
 
 class Darkroom
-  class Asset
-    HTMLDelegate = Delegate.new(
-      content_type: 'text/html',
-      reference_regex: %r{
-        <(?<tag>a|area|audio|base|embed|iframe|img|input|link|script|source|track|video)\s+[^>]*
-        (?<attr>href|src)=#{REFERENCE_PATH.source}[^>]*>
-      }x.freeze,
-
-      validate_reference: ->(asset, match, format) do
-        return unless format == 'displace'
-
-        if match[:tag] == 'link'
-          'Asset type must be text/css' unless asset.content_type == 'text/css'
-        elsif match[:tag] == 'script'
-          'Asset type must be text/javascript' unless asset.content_type == 'text/javascript'
-        elsif match[:tag] == 'img'
-          'Asset type must be image/svg+xml' unless asset.content_type == 'image/svg+xml'
-        else
-          "Cannot displace <#{match[:tag]}> tags"
-        end
-      end,
-
-      reference_content: ->(asset, match, format) do
-        case format
-        when 'displace'
-          if match[:tag] == 'link' && asset.content_type == 'text/css'
+  class HTMLDelegate < Delegate
+    REFERENCE_REGEX = /
+      <(?<tag>a|area|audio|base|embed|iframe|img|input|link|script|source|track|video)\s+[^>]*
+      (?<attr>href|src)=#{Asset::REFERENCE_REGEX.source}[^>]*>
+    /x.freeze
+
+    content_type('text/html')
+
+    reference(REFERENCE_REGEX) do |parse_data:, match:, asset:, format:|
+      case format
+      when 'displace'
+        case match[:tag]
+        when 'link'
+          if asset.content_type == 'text/css'
             "<style>#{asset.content}</style>"
-          elsif match[:tag] == 'script' && asset.content_type == 'text/javascript'
+          else
+            error('Asset content type must be text/css')
+          end
+        when 'script'
+          if asset.content_type == 'text/javascript'
             offset = match.begin(0)
 
             "#{match[0][0..(match.begin(:attr) - 2 - offset)]}"\
             "#{match[0][(match.end(:quoted) + match[:quote].size - offset)..(match.end(0) - offset)]}"\
             "#{asset.content}"
-          elsif match[:tag] == 'img' && asset.content_type == 'image/svg+xml'
-            asset.content
+          else
+            error('Asset content type must be text/javascript')
+          end
+        when 'img'
+          if asset.content_type == 'image/svg+xml'
+            asset.content(minified: false)
+          else
+            error('Asset content type must be image/svg+xml')
           end
-        when 'utf8'
-          quote = match[:quote] == '' ? Asset::DEFAULT_QUOTE : match[:quote]
+        else
+          error("Cannot displace <#{match[:tag]}> tags")
+        end
+      when 'utf8'
+        quote = match[:quote] == '' ? Asset::DEFAULT_QUOTE : match[:quote]
 
-          content = asset.content.gsub('#', '%23')
-          content.gsub!(quote, quote == "'" ? '"' : "'")
+        content = asset.content.dup
+        content.gsub!('#', '%23')
+        content.gsub!(quote, quote == '"' ? "&#34;" : '&#39;')
 
-          content
-        end
-      end,
-    )
+        content
+      end
+    end
   end
 end

data/lib/darkroom/delegates/htx.rb

@@ -1,21 +1,23 @@
 # frozen_string_literal: true
 
-require_relative('../asset')
 require_relative('html')
 require_relative('javascript')
 
 class Darkroom
-  class Asset
-    HTXDelegate = Delegate.new(
-      content_type: JavaScriptDelegate.content_type,
-      import_regex: HTMLDelegate.import_regex,
-      reference_regex: HTMLDelegate.reference_regex,
-      validate_reference: HTMLDelegate.validate_reference,
-      reference_content: HTMLDelegate.reference_content,
-      compile_lib: 'htx',
-      compile: ->(path, content) { HTX.compile(path, content) },
-      minify_lib: JavaScriptDelegate.minify_lib,
-      minify: JavaScriptDelegate.minify,
-    )
+  class HTXDelegate < HTMLDelegate
+    compile(lib: 'htx', delegate: JavaScriptDelegate) do |parse_data:, path:, own_content:|
+      module_supported = false
+
+      if defined?(HTX::VERSION)
+        major, minor, patch = HTX::VERSION.split('.').map(&:to_i)
+        module_supported = major > 0 || minor > 1 || (minor == 1 && patch >= 1)
+      end
+
+      if module_supported
+        HTX.compile(path, own_content, as_module: Darkroom.javascript_iife)
+      else
+        HTX.compile(path, own_content)
+      end
+    end
   end
 end

data/lib/darkroom/delegates/javascript.rb

@@ -1,14 +1,187 @@
 # frozen_string_literal: true
 
+require('strscan')
 require_relative('../asset')
+require_relative('../delegate')
 
 class Darkroom
-  class Asset
-    JavaScriptDelegate = Delegate.new(
-      content_type: 'text/javascript',
-      import_regex: /^ *import +#{QUOTED_PATH.source} *;? *(\n|$)/.freeze,
-      minify_lib: 'terser',
-      minify: ->(content) { Terser.compile(content) },
-    )
+  class JavaScriptDelegate < Delegate
+    IDENTIFIER_REGEX = /[_$a-zA-Z][_$a-zA-Z0-9]*/.freeze
+    COMMA_REGEX = /,/.freeze
+    QUOTED_REGEX = /
+      (?<quoted>
+        (?<quote>['"])(
+          (?<=[^\\])\\(\\\\)*\k<quote> |
+          (?!\k<quote>).
+        )*\k<quote>
+      )
+    /x.freeze
+
+    content_type('text/javascript')
+
+    ########################################################################################################
+    ## Imports                                                                                            ##
+    ########################################################################################################
+
+    IMPORT_REGEX = /
+      (?<=^|;|})[^\S\n]*
+      import\s+(
+        ((?<default>#{IDENTIFIER_REGEX.source})(?:\s*,\s*|(?=\s+from\s+)))?
+        (
+          \*\s+as\s+(?<module>#{IDENTIFIER_REGEX.source}) |
+          \{(?<named>[\s\S]+?)\}
+        )?
+        \s+from\s+
+      )?#{Asset::QUOTED_PATH_REGEX.source}
+      [^\S\n]*;?[^\S\n]*(\n|\Z)
+    /x.freeze
+
+    IMPORT_ITEM_REGEX = /
+      \s*
+      (?<name>#{IDENTIFIER_REGEX.source}|#{QUOTED_REGEX.source}(?=\s+as\s+))
+      (\s+as\s+(?<alias>#{IDENTIFIER_REGEX.source}))?
+      \s*
+    /x.freeze
+
+    import(IMPORT_REGEX) do |parse_data:, match:, asset:|
+      items = []
+      items << [match[:default], '.default'] if match[:default]
+      items << [match[:module], ''] if match[:module]
+
+      if match[:named]
+        scanner = StringScanner.new(match[:named])
+
+        while scanner.scan(IMPORT_ITEM_REGEX)
+          items << [
+            scanner[:alias] || scanner[:name],
+            scanner[:quote] ? "[#{scanner[:name]}]" : ".#{scanner[:name]}"
+          ]
+
+          break unless scanner.scan(COMMA_REGEX)
+        end
+
+        error('Invalid import statement') unless scanner.eos?
+      end
+
+      ((parse_data[:imports] ||= {})[asset.path] ||= []).concat(items) unless items.empty?
+
+      ''
+    end
+
+    ########################################################################################################
+    ## Exports                                                                                            ##
+    ########################################################################################################
+
+    EXPORT_REGEX = /
+      (?<=^|;|})[^\S\n]*
+      export\s+(
+        (?<default>default\s+)?
+        (?<keep>(let|const|var|function\*?|class)\s+(?<name>#{IDENTIFIER_REGEX.source}))
+      |
+        \{(?<named>.+?)\}
+        [^\S\n]*;?[^\S\n]*(\n|\Z)
+      )
+    /x.freeze
+
+    EXPORT_ITEM_REGEX = /
+      \s*
+      (?<name>#{IDENTIFIER_REGEX.source})
+      (\s+as\s+(?<alias>#{IDENTIFIER_REGEX.source}|#{QUOTED_REGEX.source}))?
+      \s*
+    /x.freeze
+
+    parse(:export, EXPORT_REGEX) do |parse_data:, match:|
+      items = (parse_data[:exports] ||= [])
+
+      if match[:default]
+        items << ['default', match[:name]]
+      elsif match[:name]
+        items << [match[:name], match[:name]]
+      else
+        scanner = StringScanner.new(match[:named])
+
+        while scanner.scan(EXPORT_ITEM_REGEX)
+          items << [scanner[:alias] || scanner[:name], scanner[:name]]
+
+          break if scanner.eos?
+          break unless scanner.scan(COMMA_REGEX)
+        end
+
+        error('Invalid export statement') unless scanner.eos?
+      end
+
+      match[:keep]
+    end
+
+    ########################################################################################################
+    ## Compile                                                                                            ##
+    ########################################################################################################
+
+    compile do |parse_data:, path:, own_content:|
+      next unless Darkroom.javascript_iife
+
+      (parse_data[:imports] || []).each do |import_path, items|
+        mod_suffix = nil
+        prefix = '{ ' if items.size != 1
+        suffix = ' }' if items.size != 1
+
+        begin
+          mod = "m#{mod_suffix}"
+          mod_suffix = (mod_suffix || 1) + 1
+        end while items.any? { |i| i.first == mod }
+
+        own_content.prepend(
+          "let #{items.map(&:first).join(', ')}; "\
+          "$import('#{import_path}', "\
+          "#{mod} => #{prefix}#{items.map { |(i, e)| "#{i} = #{mod}#{e}" }.join(', ')}#{suffix})\n"
+        )
+      end
+
+      own_content.prepend("['#{path}', $import => {\n\n")
+      own_content << <<~EOS
+
+        return Object.seal({#{
+          if parse_data[:exports] && !parse_data[:exports].empty?
+            "\n#{parse_data[:exports].map { |k, v| "  #{k}: #{v},\n" }.join}"
+          end
+        }})
+
+        }],
+      EOS
+    end
+
+    ########################################################################################################
+    ## Finalize                                                                                           ##
+    ########################################################################################################
+
+    finalize do |parse_data:, path:, content:|
+      next unless Darkroom.javascript_iife
+
+      (content.frozen? ? content.dup : content).prepend(
+        <<~EOS
+          ((...bundle) => {
+            const modules = {}
+            const setters = []
+            const $import = (name, setter) =>
+              modules[name] ? setter(modules[name]) : setters.push([setter, name])
+
+            for (const [name, def] of bundle)
+              modules[name] = def($import)
+
+            for (const [setter, name] of setters)
+              setter(modules[name])
+          })(
+
+        EOS
+      ) << "\n)\n"
+    end
+
+    ########################################################################################################
+    ## Minify                                                                                             ##
+    ########################################################################################################
+
+    minify(lib: 'terser') do |parse_data:, path:, content:|
+      Terser.compile(content)
+    end
   end
 end

data/lib/darkroom/errors/asset_error.rb

@@ -10,10 +10,10 @@ class Darkroom
     ##
     # Creates a new instance.
     #
-    # * +message+ - Description of the error.
-    # * +detail+ - Additional detail about the error.
-    # * +source_path+ - Path of the asset that contains the error (optional).
-    # * +source_line_num+ - Line number in the asset where the error is located (optional).
+    # [message] Description of the error.
+    # [detail] Additional detail about the error.
+    # [source_path] Path of the asset that contains the error.
+    # [source_line_num] Line number in the asset where the error is located.
     #
     def initialize(message, detail, source_path = nil, source_line_num = nil)
       super(message)

data/lib/darkroom/errors/asset_not_found_error.rb

@@ -11,9 +11,9 @@ class Darkroom
     ##
     # Creates a new instance.
     #
-    # * +path+ - Path of asset that doesn't exist.
-    # * +source_path+ - Path of the asset that contains the error (optional).
-    # * +source_line_num+ - Line number in the asset where the error is located (optional).
+    # [path] Path of asset that doesn't exist.
+    # [source_path] Path of the asset that contains the error.
+    # [source_line_num] Line number in the asset where the error is located.
     #
     def initialize(path, source_path = nil, source_line_num = nil)
       super('Asset not found', path, source_path, source_line_num)

data/lib/darkroom/errors/circular_reference_error.rb

@@ -10,9 +10,9 @@ class Darkroom
     ##
     # Creates a new instance.
     #
-    # * +snippet+ - Snippet showing the reference.
-    # * +source_path+ - Path of the asset that contains the error.
-    # * +source_line_num+ - Line number in the asset where the error is located.
+    # [snippet] Snippet showing the reference.
+    # [source_path] Path of the asset that contains the error.
+    # [source_line_num] Line number in the asset where the error is located.
     #
     def initialize(snippet, source_path, source_line_num)
       super('Reference would result in a circular reference chain', snippet, source_path, source_line_num)

data/lib/darkroom/errors/duplicate_asset_error.rb

@@ -10,9 +10,9 @@ class Darkroom
     ##
     # Creates a new instance.
     #
-    # * +path+ - Path of the asset that exists under multiple load paths.
-    # * +first_load_path+ - Load path where the asset was first found.
-    # * +second_load_path+ - Load path where the asset was subsequently found.
+    # [path] Path of the asset that exists under multiple load paths.
+    # [first_load_path] Load path where the asset was first found.
+    # [second_load_path] Load path where the asset was subsequently found.
     #
     def initialize(path, first_load_path, second_load_path)
       @path = path

data/lib/darkroom/errors/invalid_path_error.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative('../asset')
+
 class Darkroom
   ##
   # Error class used when an asset's path contains one or more invalid characters.
@@ -10,8 +12,8 @@ class Darkroom
     ##
     # Creates a new instance.
     #
-    # * +path+ - Path of the asset with the invalid character(s).
-    # * +index+ - Position of the first bad character in the path.
+    # [path] Path of the asset with the invalid character(s).
+    # [index] Position of the first bad character in the path.
     #
     def initialize(path, index)
       @path = path
@@ -22,7 +24,7 @@ class Darkroom
     # Returns a string representation of the error.
     #
     def to_s
-      "Asset path contains one or more invalid characters (#{DISALLOWED_PATH_CHARS}): #{@path}"
+      "Asset path contains one or more invalid characters (#{Asset::DISALLOWED_PATH_CHARS}): #{@path}"
     end
   end
 end

data/lib/darkroom/errors/missing_library_error.rb

@@ -10,9 +10,9 @@ class Darkroom
     ##
     # Creates a new instance.
     #
-    # * +library+ - Name of the library that's missing.
-    # * +need+ - Reason the library is needed ('compile' or 'minify').
-    # * +extension+ - Extension of the type of asset that needs the library.
+    # [library] Name of the library that's missing.
+    # [need] Reason the library is needed ('pre-process', 'post-process', or 'minify').
+    # [extension] Extension of the type of asset that needs the library.
     #
     def initialize(library, need, extension)
       @library = library

data/lib/darkroom/errors/processing_error.rb

@@ -8,7 +8,7 @@ class Darkroom
     ##
     # Creates a new instance.
     #
-    # * +errors+ - Error or array of errors.
+    # [errors] Error or array of errors.
     #
     def initialize(errors)
       @errors = Array(errors)
@@ -18,7 +18,11 @@ class Darkroom
     # Returns a string representation of the error.
     #
     def to_s
-      "Errors were encountered while processing assets:\n  #{@errors.map(&:to_s).join("\n  ")}"
+      lines = @errors.map do |error|
+        error.kind_of?(AssetError) ? error.to_s : "#{error.inspect} at #{error.backtrace[0]}"
+      end
+
+      "Errors were encountered while processing assets:\n  #{lines.join("\n  ")}"
     end
 
     ##

data/lib/darkroom/errors/unrecognized_extension_error.rb

@@ -10,9 +10,9 @@ class Darkroom
     ##
     # Creates a new instance.
     #
-    # * +file+ - File with the unrecognized extension.
-    # * +source_path+ - Path of the asset that contains the error (optional).
-    # * +source_line_num+ - Line number in the asset where the error is located (optional).
+    # [file] File with the unrecognized extension.
+    # [source_path] Path of the asset that contains the error.
+    # [source_line_num] Line number in the asset where the error is located.
     #
     def initialize(file, source_path = nil, source_line_num = nil)
       super('File extension not recognized', file, source_path, source_line_num)

data/lib/darkroom/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class Darkroom
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'
 end

data/lib/darkroom.rb

@@ -2,6 +2,7 @@
 
 require('darkroom/asset')
 require('darkroom/darkroom')
+require('darkroom/delegate')
 require('darkroom/version')
 
 require('darkroom/delegates/css')
@@ -9,12 +10,12 @@ require('darkroom/delegates/html')
 require('darkroom/delegates/htx')
 require('darkroom/delegates/javascript')
 
-Darkroom.register('.css', Darkroom::Asset::CSSDelegate)
-Darkroom.register('.htm', '.html', Darkroom::Asset::HTMLDelegate)
-Darkroom.register('.htx', Darkroom::Asset::HTXDelegate)
+Darkroom.register('.css', Darkroom::CSSDelegate)
+Darkroom.register('.htm', '.html', Darkroom::HTMLDelegate)
+Darkroom.register('.htx', Darkroom::HTXDelegate)
 Darkroom.register('.ico', 'image/x-icon')
 Darkroom.register('.jpg', '.jpeg', 'image/jpeg')
-Darkroom.register('.js', Darkroom::Asset::JavaScriptDelegate)
+Darkroom.register('.js', Darkroom::JavaScriptDelegate)
 Darkroom.register('.json', 'application/json')
 Darkroom.register('.png', 'image/png')
 Darkroom.register('.svg', 'image/svg+xml')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: darkroom
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Nate Pickens
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-03 00:00:00.000000000 Z
+date: 2023-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -59,6 +59,7 @@ files:
 - lib/darkroom.rb
 - lib/darkroom/asset.rb
 - lib/darkroom/darkroom.rb
+- lib/darkroom/delegate.rb
 - lib/darkroom/delegates/css.rb
 - lib/darkroom/delegates/html.rb
 - lib/darkroom/delegates/htx.rb
@@ -94,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.4.15
 signing_key:
 specification_version: 4
 summary: A fast, lightweight, and straightforward web asset management library.