wardite 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0d5832e8cec120cdc72a68daf9acafb4d571fa2be166a6b912536774278c634
-  data.tar.gz: 6527a2be1289f3d3e9223cd93497b95c1956593fea6b3430f8cd8293e4ab8e5f
+  metadata.gz: 9b2773f96babcc390d09312304046e661a1226b14413c307a3f9c082655cedb9
+  data.tar.gz: 011022bf110c979bb68bf18bb513588e6fe152177d92d8b3e3d69a296a7d73f2
 SHA512:
-  metadata.gz: 95c24b6c6461b449270eb9a343e613095b2ee7ee587c1ebb88933c6c3c6e65bcba044b48ab51928ff2398b9b11a1d84a4830b78aeb1e67c37448900c2ffa2ddb
-  data.tar.gz: 4ff3a32bd496162b06df804717a3017e2bcfbdccf25a2727c2c0096cbd6aa12abd119e05b2fdea4db29aaff0f668f42ef856e8b120a685abb0b7c4765c1eb18b
+  metadata.gz: d10a3156096c3610a2ac49d6b20d5814e81c106f01c01194b9ca1eda6ad746b9ee74d7755b141b617926e32142a0a62b3c959275ae4d53abc68bf4f527c9fada
+  data.tar.gz: d5a1cad2ea0b9270e4b8adb0070495cefe2d8347bcaa1e85def5b4befe60a82800a73d9c02f8cfcb73f1546888a2a96c9caa853d5e3b0bd9fa608de770211bbd

data/Steepfile

@@ -5,6 +5,7 @@ target :lib do
 
   library "pp"
   library "securerandom"
+  library "optparse"
   # configure_code_diagnostics(Steep::Diagnostic::Ruby.strict)
 end
 

data/exe/wardite

@@ -1,29 +1,7 @@
 #!/usr/bin/env ruby
 
 require "wardite"
-path = ARGV[0]
+require "wardite/cli/cli"
 
-f = File.open(path)
-instance = Wardite::BinaryLoader::load_from_buffer(f);
-if instance.runtime.respond_to?(:_start) # assumed WASI
-  argv = ARGV[1..-1] || []
-  instance.wasi.argv = ["wardite"] + argv
-  Bundler.with_original_env do
-    # instance.store.memories[0].grow(128)
-    instance.runtime._start
-  end
-else
-  path = ARGV[0]
-  method = ARGV[1]
-  args = ARGV[2..-1] || []
-  
-  args = args.map do|a|
-    if a.include? "."
-      a.to_f
-    else
-      a.to_i
-    end
-  end
-  ret = instance.runtime.call(method, args)
-  $stderr.puts "return value: #{ret.inspect}"
-end
+cli = Wardite::Cli::Cli.new(ARGV)
+cli.run

data/lib/wardite/cli/cli.rb

@@ -0,0 +1,121 @@
+# rbs_inline: enabled
+require "optparse"
+
+module Wardite
+  module Cli
+    class Cli
+      # @rbs @args: Array[String]
+
+      attr_reader :invoke  #: String?
+      attr_reader :mapdir  #: String?
+      attr_reader :file    #: String
+      attr_reader :memsize #: Integer
+      attr_reader :wasi    #: bool
+
+      # @rbs args: Array[String]
+      # @rbs return: void
+      def initialize(args)
+        @invoke = @mapdir = nil
+        @wasi = true # default to true
+        @memsize = 1
+        options = OptionParser.new do |opts|
+          opts.on("--invoke [fnname]", "Invoke the function") { |v|
+            @invoke = v
+          }
+          opts.on("--mapdir [dest[:src]]", "Map the directory") { |v|
+            @mapdir = v
+          }
+          opts.on("--memsize [size_in_bytes]", "Initial memory size") { |v|
+            @memsize = (v.to_i / (64 * 1024).to_f).ceil.to_i
+          }
+          opts.on("--no-wasi", "Disable WASI feature") {|_v|
+            @wasi = false
+          }
+          opts.on("FILE.wasm") { }
+        end
+        options.parse!(args)
+        @file = args[0] || raise("require file argument")
+        @args = (args[1..-1] || [])
+        @args.unshift if @args[0] == '--'
+      end
+
+      # @rbs return: Array[Integer | Float]
+      # @rbs %a{pure}
+      def args
+        @args.map do |a|
+          if a.include? "."
+            a.to_f
+          else
+            a.to_i
+          end
+        end
+      end
+
+      # @rbs return: ::Wardite::Instance
+      def new_instance
+        f = File.open(file)
+        ins = Wardite::BinaryLoader::load_from_buffer(f, enable_wasi: wasi);
+        if memsize > 1
+          ins.store.memories[0].grow(memsize)
+        end
+        ins
+      end
+
+      # @rbs return: void
+      def run
+        if invoke
+          invoke_function
+        else
+          invoke_wasi if wasi
+          raise("requires function name to invoke")
+        end
+      end
+
+      # @rbs return: void
+      def invoke_function
+        unless invoke
+          raise "--invoke not set"
+        end
+        instance = new_instance
+        ret = instance.runtime.call(invoke, args)
+        $stderr.puts "return value: #{ret.inspect}"
+      end
+
+      # @rbs return: void
+      def invoke_wasi
+        instance = new_instance #: ::Wardite::Instance
+        unless instance.wasi
+          raise "WASI not activated"
+        end
+        instance.wasi.argv = ["wardite"] + @args
+        if mapdir && mount_dst && mount_src
+          # TODO: support multiple mapdir
+          instance.wasi.mapdir[mount_dst] = mount_src
+        end
+
+        if defined? Bundler
+          Bundler.with_original_env do
+            instance.runtime._start
+          end
+        else
+          instance.runtime._start
+        end              
+      end
+
+      # @rbs return: String?
+      # @rbs %a{pure}
+      def mount_src
+        mapdir&.split(":")&.first
+      end
+
+      # @rbs return: String?
+      # @rbs %a{pure}
+      def mount_dst
+        m = mapdir&.split(":")
+        if m
+          m.size == 2 ? m[1] : m[0]
+        end
+      end
+    end
+  end
+end

data/lib/wardite/version.rb

@@ -2,5 +2,5 @@
 # rbs_inline: enabled
 
 module Wardite
-  VERSION = "0.6.1" #: String
+  VERSION = "0.7.0" #: String
 end

data/lib/wardite/wasi.rb

@@ -12,16 +12,19 @@ module Wardite
 
     attr_accessor :fd_table #: Array[(IO|File)]
     attr_accessor :argv #: Array[String]
+    attr_accessor :mapdir #: Hash[String, String]
 
     # @rbs argv: Array[String]
+    # @rbs mapdir: Hash[String, String]
     # @rbs return: void
-    def initialize(argv: [])
+    def initialize(argv: [], mapdir: {})
       @fd_table = [
         STDIN,
         STDOUT,
         STDERR,
       ]
       @argv = argv
+      @mapdir = mapdir
     end
 
     # @rbs store: Store

data/lib/wardite.rb

@@ -38,7 +38,7 @@ module Wardite
 
     attr_reader :import_object #: Hash[Symbol, wasmModule]
 
-    attr_accessor :wasi #: WasiSnapshotPreview1?
+    attr_accessor :wasi #: ::Wardite::WasiSnapshotPreview1?
 
     # @rbs import_object: Hash[Symbol, wasmModuleSrc]
     # @rbs &blk: (Instance) -> void
@@ -803,6 +803,12 @@ module Wardite
     def respond_to? name
       callable?(name) || super
     end
+
+    # @rbs args: Array[Object]
+    # @rbs return: Object?
+    def _start(*args)
+      call(:_start, args)
+    end
   end
 
   class Type

data/rbs_collection.lock.yaml

@@ -0,0 +1,204 @@
+---
+path: ".gem_rbs_collection"
+gems:
+- name: activesupport
+  version: '7.0'
+  source:
+    type: git
+    name: ruby/gem_rbs_collection
+    revision: 1288acc1cdecc0a273740212da0df35b108dbfb6
+    remote: https://github.com/ruby/gem_rbs_collection.git
+    repo_dir: gems
+- name: ast
+  version: '2.4'
+  source:
+    type: git
+    name: ruby/gem_rbs_collection
+    revision: 1288acc1cdecc0a273740212da0df35b108dbfb6
+    remote: https://github.com/ruby/gem_rbs_collection.git
+    repo_dir: gems
+- name: base64
+  version: '0.1'
+  source:
+    type: git
+    name: ruby/gem_rbs_collection
+    revision: 1288acc1cdecc0a273740212da0df35b108dbfb6
+    remote: https://github.com/ruby/gem_rbs_collection.git
+    repo_dir: gems
+- name: bigdecimal
+  version: '3.1'
+  source:
+    type: git
+    name: ruby/gem_rbs_collection
+    revision: 1288acc1cdecc0a273740212da0df35b108dbfb6
+    remote: https://github.com/ruby/gem_rbs_collection.git
+    repo_dir: gems
+- name: concurrent-ruby
+  version: '1.1'
+  source:
+    type: git
+    name: ruby/gem_rbs_collection
+    revision: 1288acc1cdecc0a273740212da0df35b108dbfb6
+    remote: https://github.com/ruby/gem_rbs_collection.git
+    repo_dir: gems
+- name: connection_pool
+  version: '2.4'
+  source:
+    type: git
+    name: ruby/gem_rbs_collection
+    revision: 1288acc1cdecc0a273740212da0df35b108dbfb6
+    remote: https://github.com/ruby/gem_rbs_collection.git
+    repo_dir: gems
+- name: csv
+  version: '3.3'
+  source:
+    type: git
+    name: ruby/gem_rbs_collection
+    revision: 1288acc1cdecc0a273740212da0df35b108dbfb6
+    remote: https://github.com/ruby/gem_rbs_collection.git
+    repo_dir: gems
+- name: date
+  version: '0'
+  source:
+    type: stdlib
+- name: digest
+  version: '0'
+  source:
+    type: stdlib
+- name: erb
+  version: '0'
+  source:
+    type: stdlib
+- name: ffi
+  version: 1.17.1
+  source:
+    type: rubygems
+- name: fileutils
+  version: '0'
+  source:
+    type: stdlib
+- name: forwardable
+  version: '0'
+  source:
+    type: stdlib
+- name: i18n
+  version: '1.10'
+  source:
+    type: git
+    name: ruby/gem_rbs_collection
+    revision: 1288acc1cdecc0a273740212da0df35b108dbfb6
+    remote: https://github.com/ruby/gem_rbs_collection.git
+    repo_dir: gems
+- name: json
+  version: '0'
+  source:
+    type: stdlib
+- name: listen
+  version: '3.9'
+  source:
+    type: git
+    name: ruby/gem_rbs_collection
+    revision: 1288acc1cdecc0a273740212da0df35b108dbfb6
+    remote: https://github.com/ruby/gem_rbs_collection.git
+    repo_dir: gems
+- name: logger
+  version: '0'
+  source:
+    type: stdlib
+- name: minitest
+  version: '0'
+  source:
+    type: stdlib
+- name: monitor
+  version: '0'
+  source:
+    type: stdlib
+- name: mutex_m
+  version: '0'
+  source:
+    type: stdlib
+- name: openssl
+  version: '0'
+  source:
+    type: stdlib
+- name: optparse
+  version: '0'
+  source:
+    type: stdlib
+- name: parser
+  version: '3.2'
+  source:
+    type: git
+    name: ruby/gem_rbs_collection
+    revision: 1288acc1cdecc0a273740212da0df35b108dbfb6
+    remote: https://github.com/ruby/gem_rbs_collection.git
+    repo_dir: gems
+- name: pathname
+  version: '0'
+  source:
+    type: stdlib
+- name: rainbow
+  version: '3.0'
+  source:
+    type: git
+    name: ruby/gem_rbs_collection
+    revision: 1288acc1cdecc0a273740212da0df35b108dbfb6
+    remote: https://github.com/ruby/gem_rbs_collection.git
+    repo_dir: gems
+- name: rake
+  version: '13.0'
+  source:
+    type: git
+    name: ruby/gem_rbs_collection
+    revision: 1288acc1cdecc0a273740212da0df35b108dbfb6
+    remote: https://github.com/ruby/gem_rbs_collection.git
+    repo_dir: gems
+- name: rbs
+  version: 3.7.0
+  source:
+    type: rubygems
+- name: rdoc
+  version: '0'
+  source:
+    type: stdlib
+- name: securerandom
+  version: '0'
+  source:
+    type: stdlib
+- name: singleton
+  version: '0'
+  source:
+    type: stdlib
+- name: socket
+  version: '0'
+  source:
+    type: stdlib
+- name: stringio
+  version: '0'
+  source:
+    type: stdlib
+- name: strscan
+  version: '0'
+  source:
+    type: stdlib
+- name: time
+  version: '0'
+  source:
+    type: stdlib
+- name: timeout
+  version: '0'
+  source:
+    type: stdlib
+- name: tsort
+  version: '0'
+  source:
+    type: stdlib
+- name: tzinfo
+  version: '2.0'
+  source:
+    type: git
+    name: ruby/gem_rbs_collection
+    revision: 1288acc1cdecc0a273740212da0df35b108dbfb6
+    remote: https://github.com/ruby/gem_rbs_collection.git
+    repo_dir: gems
+gemfile_lock_path: Gemfile.lock

data/rbs_collection.yaml

@@ -0,0 +1,18 @@
+# Download sources
+sources:
+  - type: git
+    name: ruby/gem_rbs_collection
+    remote: https://github.com/ruby/gem_rbs_collection.git
+    revision: main
+    repo_dir: gems
+
+# You can specify local directories as sources also.
+# - type: local
+#   path: path/to/your/local/repository
+
+# A directory to install the downloaded RBSs
+path: .gem_rbs_collection
+
+gems:
+  # If you want to avoid installing rbs files for gems, you can specify them here.
+  - name: optparse

data/sig/bundler.rbs

@@ -0,0 +1,3 @@
+module Bundler
+  def self.with_original_env: () {() -> void} -> untyped
+end

data/sig/generated/wardite/cli/cli.rbs

@@ -0,0 +1,50 @@
+# Generated from lib/wardite/cli/cli.rb with RBS::Inline
+
+module Wardite
+  module Cli
+    class Cli
+      @args: Array[String]
+
+      attr_reader invoke: String?
+
+      attr_reader mapdir: String?
+
+      attr_reader file: String
+
+      attr_reader memsize: Integer
+
+      attr_reader wasi: bool
+
+      # @rbs args: Array[String]
+      # @rbs return: void
+      def initialize: (Array[String] args) -> void
+
+      # @rbs return: Array[Integer | Float]
+      # @rbs %a{pure}
+      %a{pure}
+      def args: () -> Array[Integer | Float]
+
+      # @rbs return: ::Wardite::Instance
+      def new_instance: () -> ::Wardite::Instance
+
+      # @rbs return: void
+      def run: () -> void
+
+      # @rbs return: void
+      def invoke_function: () -> void
+
+      # @rbs return: void
+      def invoke_wasi: () -> void
+
+      # @rbs return: String?
+      # @rbs %a{pure}
+      %a{pure}
+      def mount_src: () -> String?
+
+      # @rbs return: String?
+      # @rbs %a{pure}
+      %a{pure}
+      def mount_dst: () -> String?
+    end
+  end
+end

data/sig/generated/wardite/wasi.rbs

@@ -10,9 +10,12 @@ module Wardite
 
     attr_accessor argv: Array[String]
 
+    attr_accessor mapdir: Hash[String, String]
+
     # @rbs argv: Array[String]
+    # @rbs mapdir: Hash[String, String]
     # @rbs return: void
-    def initialize: (?argv: Array[String]) -> void
+    def initialize: (?argv: Array[String], ?mapdir: Hash[String, String]) -> void
 
     # @rbs store: Store
     # @rbs args: Array[wasmValue]

data/sig/generated/wardite.rbs

@@ -22,7 +22,7 @@ module Wardite
 
     attr_reader import_object: Hash[Symbol, wasmModule]
 
-    attr_accessor wasi: WasiSnapshotPreview1?
+    attr_accessor wasi: ::Wardite::WasiSnapshotPreview1?
 
     # @rbs import_object: Hash[Symbol, wasmModuleSrc]
     # @rbs &blk: (Instance) -> void
@@ -141,6 +141,10 @@ module Wardite
     # @rbs name: String|Symbol
     # @rbs return: bool
     def respond_to?: (String | Symbol name) -> bool
+
+    # @rbs args: Array[Object]
+    # @rbs return: Object?
+    def _start: (*untyped args) -> Object?
   end
 
   class Type

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: wardite
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Uchio Kondo
 bindir: exe
 cert_chain: []
-date: 2025-01-13 00:00:00.000000000 Z
+date: 2025-03-10 00:00:00.000000000 Z
 dependencies: []
 description: A pure-ruby webassembly runtime
 email:
@@ -46,6 +46,7 @@ files:
 - lib/wardite/alu_f64.generated.rb
 - lib/wardite/alu_i32.generated.rb
 - lib/wardite/alu_i64.generated.rb
+- lib/wardite/cli/cli.rb
 - lib/wardite/const.rb
 - lib/wardite/convert.generated.rb
 - lib/wardite/errors.rb
@@ -66,16 +67,20 @@ files:
 - misc/slides/image.png
 - misc/slides/tokyo12.html
 - misc/slides/tokyo12.md
+- rbs_collection.lock.yaml
+- rbs_collection.yaml
 - scripts/gen_alu.rb
 - scripts/gen_conv.rb
 - scripts/templates/alu_module.rb.tmpl
 - scripts/templates/conv_module.rb.tmpl
+- sig/bundler.rbs
 - sig/fcntl.rbs
 - sig/generated/wardite.rbs
 - sig/generated/wardite/alu_f32.generated.rbs
 - sig/generated/wardite/alu_f64.generated.rbs
 - sig/generated/wardite/alu_i32.generated.rbs
 - sig/generated/wardite/alu_i64.generated.rbs
+- sig/generated/wardite/cli/cli.rbs
 - sig/generated/wardite/const.rbs
 - sig/generated/wardite/convert.generated.rbs
 - sig/generated/wardite/errors.rbs