condenser 1.2 → 1.4

data/test/transformers/jst_test.rb

@@ -2,23 +2,23 @@ require 'test_helper'
 
 class JSTTransformerTest < ActiveSupport::TestCase
 
-  test 'jst transoformation' do
+  test 'jst transformation' do
     file 'test.jst', <<~SCSS
       import {escape} from 'ejs';
       export default function (locals) {
           var __output = [], __append = __output.push.bind(__output);
               __append("<div class=\\"uniformLoader\\n");
-               if(typeof transparent != "undefined") { 
+               if(typeof transparent != "undefined") {
               __append(" -transparent");
-               } 
+               }
               __append("\\n");
-               if(typeof cover != "undefined") { 
+               if(typeof cover != "undefined") {
               __append(" -cover");
-               } 
+               }
               __append("\\n");
-               if(typeof light != "undefined") { 
+               if(typeof light != "undefined") {
               __append(" -light");
-               } 
+               }
               __append(" ");
               __append( klass );
               __append("\\">\\n    <div class=\\"uniformLoader-container\\">\\n        <span></span>\\n        <span></span>\\n        <span></span>\\n    </div>\\n</div>");
@@ -27,41 +27,185 @@ class JSTTransformerTest < ActiveSupport::TestCase
     SCSS
 
     assert_file 'test.js', 'application/javascript', <<~JS
-    import _bindInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/bind";
     import { escape } from 'ejs';
     export default function (locals) {
-      var _context;
-
       var __output = [],
-          __append = _bindInstanceProperty(_context = __output.push).call(_context, __output);
-
+        __append = __output.push.bind(__output);
       __append("<div class=\\"uniformLoader\\n");
-
       if (typeof locals.transparent != "undefined") {
         __append(" -transparent");
       }
-
       __append("\\n");
-
       if (typeof locals.cover != "undefined") {
         __append(" -cover");
       }
-
       __append("\\n");
-
       if (typeof locals.light != "undefined") {
         __append(" -light");
       }
-
       __append(" ");
-
       __append(locals.klass);
-
       __append("\\">\\n    <div class=\\"uniformLoader-container\\">\\n        <span></span>\\n        <span></span>\\n        <span></span>\\n    </div>\\n</div>");
-
       return __output.join("");
     }
     JS
   end
 
+  test 'jst transformation with object' do
+    file 'test.jst', <<~SCSS
+      import {append as __ejx_append} from 'ejx';
+      export default function (locals) {
+          var __output = [];
+          __ejx_append(avatarTemplate({ account: account }), __output);
+          return __output;
+      }
+    SCSS
+
+    assert_file 'test.js', 'application/javascript', <<~JS
+      import { append as __ejx_append } from 'ejx';
+      export default function (locals) {
+        var __output = [];
+        __ejx_append(locals.avatarTemplate({
+          account: locals.account
+        }), __output);
+        return __output;
+      }
+    JS
+  end
+
+  test 'jst with transformation scope test of a defined function' do
+    file 'test.jst', <<~SCSS
+      import {append as __ejx_append} from 'ejx';
+      export default function (locals) {
+          var __output = [];
+          
+          function x(files) {
+            return files.test();
+          }
+          
+          class B {
+          }
+          
+          models.map(m => m.name)
+          
+          __ejx_append(avatarTemplate({ account: x(files), klass: B }), __output);
+          return __output;
+      }
+    SCSS
+
+    assert_file 'test.js', 'application/javascript', <<~JS
+      import { append as __ejx_append } from 'ejx';
+      export default function (locals) {
+        var __output = [];
+        function x(files) {
+          return files.test();
+        }
+        class B {}
+        locals.models.map(m => m.name);
+        __ejx_append(locals.avatarTemplate({
+          account: x(locals.files),
+          klass: B
+        }), __output);
+        return __output;
+      }
+    JS
+  end
+
+  test 'jst with transformation shadow variable example' do
+    file 'test.jst', <<~JS
+    import {append as __ejx_append} from 'ejx';
+    export default async function (locals) {
+        function f (items, template) {
+                return items.map((file) => {
+                    const row = template(file);
+                    const bar = row.querySelector('.progress-bar');
+                    file.onprogress = (n) => { row.style.width = "" + n + "%"; }
+            
+                    return row;
+                });
+            }
+        __ejx_append(f(items, (f) => { return __v; }));
+        return __output;
+    }
+    JS
+
+    assert_file 'test.js', 'application/javascript', <<~JS
+    import { append as __ejx_append } from 'ejx';
+    export default async function (locals) {
+      function f(items, template) {
+        return items.map(file => {
+          const row = template(file);
+          const bar = row.querySelector('.progress-bar');
+          file.onprogress = n => {
+            row.style.width = "" + n + "%";
+          };
+          return row;
+        });
+      }
+      __ejx_append(f(locals.items, f => {
+        return locals.__v;
+      }));
+      return locals.__output;
+    }
+    JS
+  end
+  
+  test 'try/catch example' do
+    file 'test.jst', <<~JS
+      import {append as __ejx_append} from 'ejx';
+      export default function (locals) {
+          var __output = [];
+          try {
+            __ejx_append(avatarTemplate({ account: account }), __output);
+          } catch (e) {
+            console.error(e);
+          }
+          
+          console.error(e);
+          
+          return __output;
+      }
+    JS
+
+    assert_file 'test.js', 'application/javascript', <<~JS
+      import { append as __ejx_append } from 'ejx';
+      export default function (locals) {
+        var __output = [];
+        try {
+          __ejx_append(locals.avatarTemplate({
+            account: locals.account
+          }), __output);
+        } catch (e) {
+          console.error(e);
+        }
+        console.error(locals.e);
+        return __output;
+      }
+    JS
+  end
+  
+  test 'splats' do
+    file 'test.jst', <<~JS
+      import {append as __ejx_append} from 'ejx';
+      export default function (locals) {
+          var __output = [];
+          
+          var x = ((...args) => { return y(...args); })(z, y);
+          
+          return __output;
+      }
+    JS
+
+    assert_file 'test.js', 'application/javascript', <<~JS
+      import { append as __ejx_append } from 'ejx';
+      export default function (locals) {
+        var __output = [];
+        var x = ((...args) => {
+          return locals.y(...args);
+        })(locals.z, locals.y);
+        return __output;
+      }
+    JS
+  end
+
 end

data/test/transformers/scss_test.rb

@@ -47,7 +47,14 @@ class CondenserSCSSTest < ActiveSupport::TestCase
   end
 
   test "url functions" do
+    file 'a.scss', <<~SCSS
+      body {
+        color: green; }
+    SCSS
+    
     file 'test.scss', <<~SCSS
+    @import 'a';
+    
     div {
        url: asset-url("foo.svg");
        url: image-url("foo.png");
@@ -70,6 +77,9 @@ class CondenserSCSSTest < ActiveSupport::TestCase
     file 'foo.css', ''
 
     assert_file 'test.css', 'text/css', <<~CSS
+    body {
+      color: green; }
+    
     div {
       url: url(/assets/foo-e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855.svg);
       url: url(/assets/foo-e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855.png);
@@ -80,6 +90,10 @@ class CondenserSCSSTest < ActiveSupport::TestCase
       url: url(/assets/foo-e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855.js);
       url: url(/assets/foo-e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855.css); }
     CSS
+    
+    asset = @env.find('test.css')
+    assert_equal ["a.scss", "foo.svg", "foo.png", "foo.mov", "foo.mp3", "foo.woff2", "foo.woff", "foo.js", "foo.css"], asset.process_dependencies.map(&:filename)
+    assert_equal ["a.scss", "foo.svg", "foo.png", "foo.mov", "foo.mp3", "foo.woff2", "foo.woff", "foo.js", "foo.css"], asset.export_dependencies.map(&:filename)
   end
   
   test "sass dependencies" do

data/test/transformers/svg_test.rb

@@ -0,0 +1,40 @@
+require 'test_helper'
+
+class SVGTransformerTest < ActiveSupport::TestCase
+
+  test 'svg transoformation' do
+    file 'test.svg', <<~SCSS
+      <?xml version="1.0" encoding="utf-8"?>
+      <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+      <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="612px" height="612px" viewBox="0 0 612 612" xml:space="preserve">
+      	<path fill="#fff" d="M5.817,606.299c7.729,7.614,20.277,7.614,28.007,0L192.448,450.2c44.267,35.333,100.622,56.586,162.067,56.586c142.211,0,257.487-113.439,257.487-253.393C612.003,113.439,496.727,0,354.516,0S97.028,113.439,97.009,253.393c0,65.424,25.424,124.879,66.802,169.834L5.8,578.714C-1.929,586.328-1.929,598.686,5.817,606.299z"/>
+      </svg>
+    SCSS
+
+    assert_file 'test.js', 'application/javascript', <<~JS
+      export default function (svgAttributes) {
+          var __a = document.createElementNS("http://www.w3.org/2000/svg", "svg");
+          __a.setAttribute("version", "1.1");
+          __a.setAttribute("xmlns", "http://www.w3.org/2000/svg");
+          __a.setAttribute("xmlns:xlink", "http://www.w3.org/1999/xlink");
+          __a.setAttribute("width", "612px");
+          __a.setAttribute("height", "612px");
+          __a.setAttribute("viewBox", "0 0 612 612");
+          __a.setAttribute("xml:space", "preserve");
+          var __b = document.createElementNS("http://www.w3.org/2000/svg", "path");
+          __b.setAttribute("fill", "#fff");
+          __b.setAttribute("d", "M5.817,606.299c7.729,7.614,20.277,7.614,28.007,0L192.448,450.2c44.267,35.333,100.622,56.586,162.067,56.586c142.211,0,257.487-113.439,257.487-253.393C612.003,113.439,496.727,0,354.516,0S97.028,113.439,97.009,253.393c0,65.424,25.424,124.879,66.802,169.834L5.8,578.714C-1.929,586.328-1.929,598.686,5.817,606.299z");
+          __a.append(__b);
+
+          if (svgAttributes) {
+              Object.keys(svgAttributes).forEach(function (key) {
+                  __a.setAttribute(key, svgAttributes[key]);
+              });
+          }
+
+          return __a;
+      }
+    JS
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: condenser
 version: !ruby/object:Gem::Version
-  version: '1.2'
+  version: '1.4'
 platform: ruby
 authors:
 - Jon Bracy
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-18 00:00:00.000000000 Z
+date: 2024-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubi
@@ -238,14 +238,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.7
+        version: 0.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.7
+        version: 0.1.0
 description: Condenser is a Rack-based asset packaging system that concatenates and
   serves JavaScript, CSS, Sass, and SCSS.
 email:
@@ -324,6 +324,7 @@ files:
 - lib/condenser/minifiers/uglify_minifier.rb
 - lib/condenser/pipeline.rb
 - lib/condenser/processors/babel_processor.rb
+- lib/condenser/processors/css_media_combiner_processor.rb
 - lib/condenser/processors/js_analyzer.rb
 - lib/condenser/processors/node_processor.rb
 - lib/condenser/processors/purgecss_processor.rb
@@ -332,9 +333,19 @@ files:
 - lib/condenser/server.rb
 - lib/condenser/templating_engine/ejs.rb
 - lib/condenser/templating_engine/erb.rb
+- lib/condenser/transformers/dart_sass_transformer.rb
 - lib/condenser/transformers/jst_transformer.rb
+- lib/condenser/transformers/sass.rb
+- lib/condenser/transformers/sass/functions.rb
+- lib/condenser/transformers/sass/importer.rb
 - lib/condenser/transformers/sass_transformer.rb
-- lib/condenser/transformers/sass_transformer/importer.rb
+- lib/condenser/transformers/svg_transformer.rb
+- lib/condenser/transformers/svg_transformer/base.rb
+- lib/condenser/transformers/svg_transformer/tag.rb
+- lib/condenser/transformers/svg_transformer/template.rb
+- lib/condenser/transformers/svg_transformer/template_error.rb
+- lib/condenser/transformers/svg_transformer/value.rb
+- lib/condenser/transformers/svg_transformer/var_generator.rb
 - lib/condenser/utils.rb
 - lib/condenser/version.rb
 - lib/condenser/writers/brotli_writer.rb
@@ -350,6 +361,7 @@ files:
 - test/minifiers/terser_minifier_test.rb
 - test/minifiers/uglify_minifier_test.rb
 - test/pipeline_test.rb
+- test/postprocessors/css_media_combiner_test.rb
 - test/postprocessors/purgecss_test.rb
 - test/preprocessor/babel_test.rb
 - test/preprocessor/js_analyzer_test.rb
@@ -359,8 +371,10 @@ files:
 - test/templates/ejs_test.rb
 - test/templates/erb_test.rb
 - test/test_helper.rb
+- test/transformers/dart_scss_test.rb
 - test/transformers/jst_test.rb
 - test/transformers/scss_test.rb
+- test/transformers/svg_test.rb
 - test/writers/brotli_writer_test.rb
 - test/writers/zlib_writer_test.rb
 homepage: https://github.com/malomalo/condenser
@@ -384,7 +398,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.5.4
 signing_key:
 specification_version: 4
 summary: A Rack-based asset packaging system
@@ -398,6 +412,7 @@ test_files:
 - test/minifiers/terser_minifier_test.rb
 - test/minifiers/uglify_minifier_test.rb
 - test/pipeline_test.rb
+- test/postprocessors/css_media_combiner_test.rb
 - test/postprocessors/purgecss_test.rb
 - test/preprocessor/babel_test.rb
 - test/preprocessor/js_analyzer_test.rb
@@ -407,7 +422,9 @@ test_files:
 - test/templates/ejs_test.rb
 - test/templates/erb_test.rb
 - test/test_helper.rb
+- test/transformers/dart_scss_test.rb
 - test/transformers/jst_test.rb
 - test/transformers/scss_test.rb
+- test/transformers/svg_test.rb
 - test/writers/brotli_writer_test.rb
 - test/writers/zlib_writer_test.rb

data/lib/condenser/transformers/sass_transformer/importer.rb

@@ -1,50 +0,0 @@
-require "sassc"
-
-class Condenser::SassTransformer
-  class Importer < SassC::Importer
-    
-    def imports(name, base)
-      name = expand_path(name, base)
-      env = options[:condenser][:environment]
-      accept = extensions.keys.map { |x| options[:condenser][:environment].extensions[x] }
-
-      options[:asset][:process_dependencies] << [name, accept.map{ |i| [i] }]
-
-      imports = []
-      env.resolve(name, accept: accept).sort_by(&:filename).each do |asset|
-        next if asset.filename == options[:filename]
-        imports << Import.new(asset.filename, source: asset.source, source_map_path: nil)
-      end
-
-      if imports.empty? && env.npm_path
-        package = File.join(env.npm_path, name, 'package.json')
-        if File.exists?(package)
-          package = JSON.parse(File.read(package))
-          if package['style']
-            imports << Import.new(name, source: File.read(File.join(env.npm_path, name, package['style'])), source_map_path: nil)
-          end
-        end
-      end
-
-      raise Condenser::FileNotFound, "couldn't find file '#{name}'" if imports.empty?
-
-      imports
-    end
-    
-    # Allow .css files to be @imported
-    def extensions
-      { '.sass' => :sass, '.scss' => :scss, '.css' => :scss }
-    end
-    
-    private
-
-      def expand_path(path, base=nil)
-        if path.start_with?('.')
-          File.expand_path(path, File.dirname(base)).delete_prefix(File.expand_path('.') + '/')
-        else
-          File.expand_path(path).delete_prefix(File.expand_path('.') + '/')
-        end
-      end
-        
-  end
-end