klenod-runtime 0.0.6 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c27ef979d9823153396b640d84a1d4e892f4e66c5c88f8afad0f6fc02a8ae17e
-  data.tar.gz: 6b4be228b1052f59104eff4ac30750661c689422978b5e0484ec95c95da9febc
+  metadata.gz: b7d30cadc8f70335c697f2974ee29843b6cf5baea08820c41779df984f3da013
+  data.tar.gz: 5d3d22a5164b695fc990df065b9ba7eacd56e2dfc555514b9882d4d3eeb2012e
 SHA512:
-  metadata.gz: daab02d1ecd9845a8e6faba1bddca6db086226ba200e4420349a9fd35ca65283b0c7408ec32b8b66ef016901dd45679a14c4f9aece51dff406b573d0275113ca
-  data.tar.gz: 92f1cf562e098530ec0a7689b32e86ab70f4c0d58af380a97d6fa2a1e965b3ac7851e23b0fdebe29de6a25224b586d711d7cccd0cbbbe8d70e857ce15c5900d8
+  metadata.gz: 42933525078e0f9e8b574050bf42fa97bde62f61fff6c41cd7c6e8eb639465edecc3fd801c2dc5d7d25dea6289779e13a2856cded9e5c18bd5a6aa73de3f3f38
+  data.tar.gz: 4d96112ca70266198b4eb991acff14449ae3744d32a9e448a8f202f732fe2fbf05f085d34f13385edd41381f1ba4ccb7ec674c20d4ccc78760cf774bc9abe0a7

data/lib/klenod/runtime/asset_url.rb

@@ -45,6 +45,11 @@ module Klenod
         normalized = normalize(base)
         normalized if normalized.start_with?("/")
       end
+
+      def origin(base)
+        uri = URI.parse(normalize(base))
+        uri.origin if uri.is_a?(URI::HTTP)
+      end
     end
   end
 end

data/lib/klenod/runtime/backtrace_rewriter.rb

@@ -125,7 +125,9 @@ module Klenod
           next unless mod.respond_to?(:constant_name)
 
           display_path = mod.respond_to?(:path) ? mod.path : key
-          index["Klenod::Runtime::Generated::#{mod.constant_name}"] = "Mod[#{display_path.inspect}]"
+          display_name = "Mod[#{display_path.inspect}]"
+          index["Klenod::Runtime::Generated::#{mod.constant_name}"] = display_name
+          index[mod.constant_name] = display_name
         end
       end
 

data/lib/klenod/runtime/bundle.rb

@@ -26,7 +26,7 @@ module Klenod
     AssetReference = Data.define(:index, :asset)
 
     class Bundle
-      attr_reader :entrypoints, :modules, :assets, :source_root, :base
+      attr_reader :entrypoints, :modules, :assets, :source_root, :base, :asset_origin, :namespace
 
       def self.load(source, source_root: nil)
         BundleFormat.load(source, source_root: source_root)
@@ -36,12 +36,14 @@ module Klenod
         load(path, source_root: source_root)
       end
 
-      def initialize(entrypoints, modules, assets, source_root: nil, base: AssetUrl::DEFAULT_BASE)
+      def initialize(entrypoints, modules, assets, source_root: nil, base: AssetUrl::DEFAULT_BASE, namespace: Module.new)
         @entrypoints = entrypoints
         @modules = modules
         @source_root = source_root
         @base = AssetUrl.normalize(base)
+        @asset_origin = AssetUrl.origin(@base)
         @assets = bind_asset_urls(assets)
+        @namespace = namespace
         @mods = {}
       end
 
@@ -152,7 +154,9 @@ module Klenod
       def marshal_load(data)
         @entrypoints, @modules, assets, @source_root, base = data
         @base = AssetUrl.normalize(base)
+        @asset_origin = AssetUrl.origin(@base)
         @assets = bind_asset_urls(assets)
+        @namespace = Module.new
         @mods = {}
       end
 
@@ -313,7 +317,8 @@ module Klenod
             source_map: spec.source_map,
             version: spec.version,
             constant_name: spec.constant_name,
-            eval_path: eval_path_for(spec)
+            eval_path: eval_path_for(spec),
+            namespace: namespace
           )
       end
 

data/lib/klenod/runtime/mod.rb

@@ -55,7 +55,7 @@ module Klenod
         end
       end
 
-      attr_reader :path, :source, :source_map, :version, :constant_name, :eval_path
+      attr_reader :path, :source, :source_map, :version, :constant_name, :eval_path, :namespace
 
       def self.constant_name_for(path)
         "Mod_#{Digest::SHA256.hexdigest(path)[0, 24]}"
@@ -65,7 +65,7 @@ module Klenod
         "Mod(#{path.inspect})"
       end
 
-      def initialize(path, source, imports: {}, source_map: nil, version: 0, constant_name: nil, eval_path: nil)
+      def initialize(path, source, imports: {}, source_map: nil, version: 0, constant_name: nil, eval_path: nil, namespace: Generated)
         @path = path
         @source = source
         @imports = imports
@@ -73,6 +73,7 @@ module Klenod
         @version = version
         @constant_name = constant_name || self.class.constant_name_for(path)
         @eval_path = eval_path || path
+        @namespace = namespace
         register_constant
         create_exports
       end
@@ -84,6 +85,7 @@ module Klenod
       def marshal_load(data)
         @path, @source, @source_map, @version, @constant_name, @eval_path = data
         @eval_path ||= @path
+        @namespace = Generated
         @imports = {}
         register_constant
         create_exports
@@ -96,8 +98,8 @@ module Klenod
       private
 
       def register_constant
-        Generated.__send__(:remove_const, @constant_name) if Generated.const_defined?(@constant_name, false)
-        Generated.const_set(@constant_name, self)
+        @namespace.__send__(:remove_const, @constant_name) if @namespace.const_defined?(@constant_name, false)
+        @namespace.const_set(@constant_name, self)
       end
 
       def create_exports

data/lib/klenod/runtime/version.rb

@@ -2,6 +2,6 @@
 
 module Klenod
   module Runtime
-    VERSION = "0.0.6"
+    VERSION = "0.0.8"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: klenod-runtime
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.8
 platform: ruby
 authors:
 - Andrés Alin