sqlui 0.1.16 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7c438724dd4d58432da2908650a10bb82c3452a2faf4f0560c5dd23a8fd6d66
-  data.tar.gz: 949a64296520f3e7fcfec48ae1a4cc8b4a4056184d88a88ca52b5813b1ad8064
+  metadata.gz: db5b12190e0cde95f8a0063703cf3e0398bd8cfa862f1122b90c4f95b721c1ce
+  data.tar.gz: 0b9a4db845a28a5a40923e8107bf961472cf57928b197b2b610b4e957fd365aa
 SHA512:
-  metadata.gz: ab6348bdcbeb1b2dfd7e38c206b7d72bf388f28ae992e15c40823b00db1bc3bdfb705cc3764373ca0f1de053b32ea546f84bdacf99328b5b6def0f9aea40954e
-  data.tar.gz: a55564765cd9c90fe47ef06d521aefde3bc78f903527cd4a49b6817267364ff6cd609d47b645a9508c382fcc1798b355b414b12ea861782038b538dbaa90a861
+  metadata.gz: 4e74d51eccdec8b53c8e9455f555a55ab2cde80ae3e800b11efbbc57eb8f86bdcb8528faa2b70bc3589c2205baa3f3a7a08d866548257d045de89a437199c75b
+  data.tar.gz: 87b4226337f573e294e2f181dc9c0485bc1ab407f0585d6c3c7232c5d965f6d7315cd138656a40337169ce39a01c2f18ad16f2855f5e506db8ac0eb4222a70f0

data/.version

@@ -1 +1 @@
-0.1.16
+0.1.17

data/app/environment.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+
+# Parses and provides access to environment variables.
 class Environment
   SERVER_ENV = ENV.fetch('SERVER_ENV', 'development').to_sym
   SERVER_PORT = ENV.fetch('SERVER_PORT', 8080)
@@ -17,4 +20,4 @@ class Environment
   def self.server_port
     SERVER_PORT
   end
-end
+end

data/app/server.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'erb'
 require 'json'
 require 'mysql2'
@@ -12,14 +14,16 @@ if ARGV.include?('-v') || ARGV.include?('--version')
 end
 
 raise 'you must specify a configuration file' unless ARGV.size == 1
-raise "configuration file does not exist" unless File.exist?(ARGV[0])
+raise 'configuration file does not exist' unless File.exist?(ARGV[0])
 
+# SQLUI Sinatra server.
 class Server < Sinatra::Base
   set :logging, true
   set :bind,    '0.0.0.0'
   set :port,    Environment.server_port
   set :env,     Environment.server_env
 
+  # A MySQL client. This needs to go away.
   class Client
     def initialize(params)
       @params = params
@@ -35,30 +39,30 @@ class Server < Sinatra::Base
     end
   end
 
-  config = YAML.load(ERB.new(File.read(ARGV[0])).result)
+  config = YAML.safe_load(ERB.new(File.read(ARGV[0])).result)
   saved_path_root = config['saved_path']
-  client_map = config['databases'].values.map do |database_config|
+  client_map = config['databases'].values.to_h do |database_config|
     client_params = {
-      host:            database_config['db_host'],
-      port:            database_config['db_port'] || 3306,
-      username:        database_config['db_username'],
-      password:        database_config['db_password'],
-      database:        database_config['db_database'],
-      read_timeout:    10, # seconds
-      write_timeout:   0,  # seconds
+      host: database_config['db_host'],
+      port: database_config['db_port'] || 3306,
+      username: database_config['db_username'],
+      password: database_config['db_password'],
+      database: database_config['db_database'],
+      read_timeout: 10, # seconds
+      write_timeout: 0, # seconds
       connect_timeout: 5   # seconds
     }
     client = Client.new(client_params)
     [
-      database_config['url_path'], 
+      database_config['url_path'],
       ::SQLUI.new(
-        client:       client,
+        client: client,
         table_schema: database_config['db_database'],
-        name:         database_config['name'],
-        saved_path:   File.join(saved_path_root, database_config['saved_path'])
+        name: database_config['name'],
+        saved_path: File.join(saved_path_root, database_config['saved_path'])
       )
     ]
-  end.to_h
+  end
 
   get '/-/health' do
     status 200
@@ -66,7 +70,7 @@ class Server < Sinatra::Base
   end
 
   get '/db/?' do
-    erb :databases, :locals => {:databases => config['databases']}
+    erb :databases, locals: { databases: config['databases'] }
   end
 
   get '/db/:database' do
@@ -76,7 +80,7 @@ class Server < Sinatra::Base
   get '/db/:database/:route' do
     response = client_map[params[:database]].get(params)
     status response[:status]
-    headers "Content-Type": response[:content_type]
+    headers 'Content-Type': response[:content_type]
     body response[:body]
   end
 
@@ -84,7 +88,7 @@ class Server < Sinatra::Base
     post_body = JSON.parse(request.body.read)
     response = client_map[params[:database]].post(params.merge(post_body))
     status response[:status]
-    headers "Content-Type": response[:content_type]
+    headers 'Content-Type': response[:content_type]
     body response[:body]
   end
 

data/app/sqlui.rb

@@ -1,11 +1,14 @@
+# frozen_string_literal: true
+
 require 'json'
 require 'uri'
 require 'set'
 
+# Main SQLUI class responsible for producing web content. This class needs to die.
 class SQLUI
   MAX_ROWS = 1_000
 
-  def initialize(client:, table_schema: nil, name:, saved_path:, max_rows: MAX_ROWS)
+  def initialize(client:, name:, saved_path:, table_schema: nil, max_rows: MAX_ROWS)
     @client = client
     @table_schema = table_schema
     @name = name
@@ -65,12 +68,10 @@ class SQLUI
   end
 
   def query_file(params)
-    if params['file']
-      sql = File.read("#{@saved_path}/#{params['file']}")
-      execute_query(sql).tap { |r| r[:file] = params[:file] }
-    else
-      raise 'missing file param'
-    end
+    raise 'missing file param' unless params['file']
+
+    sql = File.read("#{@saved_path}/#{params['file']}")
+    execute_query(sql).tap { |r| r[:file] = params[:file] }
   end
 
   def metadata
@@ -79,21 +80,21 @@ class SQLUI
 
   def load_metadata
     result = {
-      server:  @name,
+      server: @name,
       schemas: {},
-      saved:   Dir.glob("#{@saved_path}/*.sql").sort.map do |path|
+      saved: Dir.glob("#{@saved_path}/*.sql").map do |path|
         {
-          filename:    File.basename(path),
+          filename: File.basename(path),
           description: File.readlines(path).take_while { |l| l.start_with?('--') }.map { |l| l.sub(/^-- */, '') }.join
         }
       end
     }
 
-    if @table_schema
-      where_clause = "where table_schema = '#{@table_schema}'"
-    else
-      where_clause = "where table_schema not in('mysql', 'sys', 'information_schema', 'performance_schema')"
-    end
+    where_clause = if @table_schema
+                     "where table_schema = '#{@table_schema}'"
+                   else
+                     "where table_schema not in('mysql', 'sys', 'information_schema', 'performance_schema')"
+                   end
     column_result = @client.query(
       <<~SQL
         select
@@ -129,9 +130,7 @@ class SQLUI
       end
       columns = result[:schemas][table_schema][:tables][table_name][:columns]
       column_name = row[:column_name]
-      unless columns[column_name]
-        columns[column_name] = {}
-      end
+      columns[column_name] = {} unless columns[column_name]
       column = columns[column_name]
       column[:name] = column_name
       column[:data_type] = row[:data_type]
@@ -142,11 +141,11 @@ class SQLUI
       column[:extra] = row[:extra]
     end
 
-    if @table_schema
-      where_clause = "where table_schema = '#{@table_schema}'"
-    else
-      where_clause = "where table_schema not in('mysql', 'sys', 'information_schema', 'performance_schema')"
-    end
+    where_clause = if @table_schema
+                     "where table_schema = '#{@table_schema}'"
+                   else
+                     "where table_schema not in('mysql', 'sys', 'information_schema', 'performance_schema')"
+                   end
     stats_result = @client.query(
       <<~SQL
         select
@@ -168,9 +167,7 @@ class SQLUI
       table_name = row[:table_name]
       indexes = tables[table_name][:indexes]
       index_name = row[:index_name]
-      unless indexes[index_name]
-        indexes[index_name] = {}
-      end
+      indexes[index_name] = {} unless indexes[index_name]
       index = indexes[index_name]
       column_name = row[:column_name]
       index[column_name] = {}
@@ -186,13 +183,13 @@ class SQLUI
 
   def execute_query(sql)
     result = @client.query(sql)
-    rows = result.map { |row| row.values }
+    rows = result.map(&:values)
     columns = result.first&.keys || []
     column_types = columns.map { |_| 'string' }
     unless rows.empty?
       maybe_non_null_column_value_exemplars = columns.each_with_index.map do |_, index|
-        row = rows.find do |row|
-          !row[index].nil?
+        row = rows.find do |current|
+          !current[index].nil?
         end
         row.nil? ? nil : row[index]
       end
@@ -210,22 +207,24 @@ class SQLUI
       end
     end
     {
-      query:        sql,
-      columns:      columns,
+      query: sql,
+      columns: columns,
       column_types: column_types,
-      total_rows:   rows.size,
-      rows:         rows.take(@max_rows)
+      total_rows: rows.size,
+      rows: rows.take(@max_rows)
     }
   end
 
   def find_query_at_cursor(sql, cursor)
     parts_with_ranges = []
     sql.scan(/[^;]*;[ \n]*/) { |part| parts_with_ranges << [part, 0, part.size] }
-    parts_with_ranges.inject(0) do |pos, part_with_range|
-      part_with_range[1] += pos
-      part_with_range[2] += pos
+    parts_with_ranges.inject(0) do |pos, current|
+      current[1] += pos
+      current[2] += pos
     end
-    part_with_range = parts_with_ranges.find { |part_with_range| cursor >= part_with_range[1] && cursor < part_with_range[2] } || parts_with_ranges[-1]
+    part_with_range = parts_with_ranges.find do |current|
+      cursor >= current[1] && cursor < current[2]
+    end || parts_with_ranges[-1]
     part_with_range[0]
   end
 end

data/bin/sqlui

@@ -1,3 +1,4 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require_relative '../app/server'

data/client/resources/sqlui.js

@@ -5198,57 +5198,31 @@ var sqlui = (function (exports) {
        parent.length += view.length;
    }
    function coordsInChildren(view, pos, side) {
-       if (!view.children.length)
-           return fallbackRect(view);
-       return (side <= 0 ? coordsInChildrenBefore : coordsInChildrenAfter)(view, pos);
-   }
-   function coordsInChildrenBefore(view, pos) {
-       // Find the last leaf in the tree that touches pos and doesn't have getSide() > 0
-       let found = null, foundPos = -1;
+       let before = null, beforePos = -1, after = null, afterPos = -1;
        function scan(view, pos) {
            for (let i = 0, off = 0; i < view.children.length && off <= pos; i++) {
                let child = view.children[i], end = off + child.length;
                if (end >= pos) {
                    if (child.children.length) {
-                       if (scan(child, pos - off))
-                           return true;
+                       scan(child, pos - off);
                    }
-                   else if (end >= pos) {
-                       if (end == pos && child.getSide() > 0)
-                           return true;
-                       found = child;
-                       foundPos = pos - off;
-                   }
-               }
-               off = end;
-           }
-       }
-       scan(view, pos);
-       return found ? found.coordsAt(Math.max(0, foundPos), -1) : coordsInChildrenAfter(view, pos);
-   }
-   function coordsInChildrenAfter(view, pos) {
-       // Find the first leaf in the tree that touches pos and doesn't have getSide() < 0
-       let found = null, foundPos = -1;
-       function scan(view, pos) {
-           for (let i = view.children.length - 1, off = view.length; i >= 0 && off >= pos; i--) {
-               let child = view.children[i];
-               off -= child.length;
-               if (off <= pos) {
-                   if (child.children.length) {
-                       if (scan(child, pos - off))
-                           return true;
+                   else if (!after && (end > pos || off == end && child.getSide() > 0)) {
+                       after = child;
+                       afterPos = pos - off;
                    }
-                   else if (off <= pos) {
-                       if (off == pos && child.getSide() < 0)
-                           return true;
-                       found = child;
-                       foundPos = pos - off;
+                   else if (off < pos || (off == end && child.getSide() < 0)) {
+                       before = child;
+                       beforePos = pos - off;
                    }
                }
+               off = end;
            }
        }
        scan(view, pos);
-       return found ? found.coordsAt(Math.max(0, foundPos), 1) : coordsInChildrenBefore(view, pos);
+       let target = (side < 0 ? before : after) || before || after;
+       if (target)
+           return target.coordsAt(Math.max(0, target == before ? beforePos : afterPos), side);
+       return fallbackRect(view);
    }
    function fallbackRect(view) {
        let last = view.dom.lastChild;
@@ -9713,6 +9687,15 @@ var sqlui = (function (exports) {
                newSel = EditorSelection.single(newSel.main.anchor - 1, newSel.main.head - 1);
            change = { from: sel.from, to: sel.to, insert: Text.of([" "]) };
        }
+       else if (browser.chrome && change && change.from == change.to && change.from == sel.head &&
+           change.insert.toString() == "\n " && view.lineWrapping) {
+           // In Chrome, if you insert a space at the start of a wrapped
+           // line, it will actually insert a newline and a space, causing a
+           // bogus new line to be created in CodeMirror (#968)
+           if (newSel)
+               newSel = EditorSelection.single(newSel.main.anchor - 1, newSel.main.head - 1);
+           change = { from: sel.from, to: sel.to, insert: Text.of([" "]) };
+       }
        if (change) {
            let startState = view.state;
            if (browser.ios && view.inputState.flushIOSKey(view))
@@ -10637,17 +10620,19 @@ var sqlui = (function (exports) {
                                logException(this.state, e);
                            }
                        }
-                   if (this.viewState.scrollTarget) {
-                       this.docView.scrollIntoView(this.viewState.scrollTarget);
-                       this.viewState.scrollTarget = null;
-                       scrolled = true;
-                   }
-                   else {
-                       let diff = this.viewState.lineBlockAt(refBlock.from).top - refBlock.top;
-                       if (diff > 1 || diff < -1) {
-                           this.scrollDOM.scrollTop += diff;
+                   if (this.viewState.editorHeight) {
+                       if (this.viewState.scrollTarget) {
+                           this.docView.scrollIntoView(this.viewState.scrollTarget);
+                           this.viewState.scrollTarget = null;
                            scrolled = true;
                        }
+                       else {
+                           let diff = this.viewState.lineBlockAt(refBlock.from).top - refBlock.top;
+                           if (diff > 1 || diff < -1) {
+                               this.scrollDOM.scrollTop += diff;
+                               scrolled = true;
+                           }
+                       }
                    }
                    if (redrawn)
                        this.docView.updateSelection(true);
@@ -12129,7 +12114,10 @@ var sqlui = (function (exports) {
            for (let i = startLine; i <= endLine; i++) {
                let line = state.doc.line(i);
                let start = findColumn(line.text, startCol, state.tabSize, true);
-               if (start > -1) {
+               if (start < 0) {
+                   ranges.push(EditorSelection.cursor(line.to));
+               }
+               else {
                    let end = findColumn(line.text, endCol, state.tabSize);
                    ranges.push(EditorSelection.range(line.from + start, line.from + end));
                }
@@ -12241,6 +12229,7 @@ var sqlui = (function (exports) {
            this.tooltipViews = this.tooltips.map(createTooltipView);
        }
        update(update) {
+           var _a;
            let input = update.state.facet(this.facet);
            let tooltips = input.filter(x => x);
            if (input === this.input) {
@@ -12269,8 +12258,10 @@ var sqlui = (function (exports) {
                }
            }
            for (let t of this.tooltipViews)
-               if (tooltipViews.indexOf(t) < 0)
+               if (tooltipViews.indexOf(t) < 0) {
                    t.dom.remove();
+                   (_a = t.destroy) === null || _a === void 0 ? void 0 : _a.call(t);
+               }
            this.input = input;
            this.tooltips = tooltips;
            this.tooltipViews = tooltipViews;
@@ -12383,11 +12374,13 @@ var sqlui = (function (exports) {
            return tooltipView;
        }
        destroy() {
-           var _a;
+           var _a, _b;
            this.view.win.removeEventListener("resize", this.measureSoon);
-           for (let { dom } of this.manager.tooltipViews)
-               dom.remove();
-           (_a = this.intersectionObserver) === null || _a === void 0 ? void 0 : _a.disconnect();
+           for (let tooltipView of this.manager.tooltipViews) {
+               tooltipView.dom.remove();
+               (_a = tooltipView.destroy) === null || _a === void 0 ? void 0 : _a.call(tooltipView);
+           }
+           (_b = this.intersectionObserver) === null || _b === void 0 ? void 0 : _b.disconnect();
            clearTimeout(this.measureTimeout);
        }
        readMeasure() {
@@ -14811,23 +14804,25 @@ var sqlui = (function (exports) {
            let set = [], tag = new Tag(set, base, mods);
            for (let m of mods)
                m.instances.push(tag);
-           let configs = permute(mods);
+           let configs = powerSet(mods);
            for (let parent of base.set)
-               for (let config of configs)
-                   set.push(Modifier.get(parent, config));
+               if (!parent.modified.length)
+                   for (let config of configs)
+                       set.push(Modifier.get(parent, config));
            return tag;
        }
    }
    function sameArray(a, b) {
        return a.length == b.length && a.every((x, i) => x == b[i]);
    }
-   function permute(array) {
-       let result = [array];
+   function powerSet(array) {
+       let sets = [[]];
        for (let i = 0; i < array.length; i++) {
-           for (let a of permute(array.slice(0, i).concat(array.slice(i + 1))))
-               result.push(a);
+           for (let j = 0, e = sets.length; j < e; j++) {
+               sets.push(sets[j].concat(array[i]));
+           }
        }
-       return result;
+       return sets.sort((a, b) => b.length - a.length);
    }
    /// This function is used to add a set of tags to a language syntax
    /// via [`NodeSet.extend`](#common.NodeSet.extend) or
@@ -18630,7 +18625,7 @@ var sqlui = (function (exports) {
                if (match) {
                    let from = this.curLineStart + match.index, to = from + match[0].length;
                    this.matchPos = toCharEnd(this.text, to + (from == to ? 1 : 0));
-                   if (from == this.curLine.length)
+                   if (from == this.curLineStart + this.curLine.length)
                        this.nextLine();
                    if ((from < to || from > this.value.to) && (!this.test || this.test(from, to, match))) {
                        this.value = { from, to, match };
@@ -19015,10 +19010,17 @@ var sqlui = (function (exports) {
            this.regexp = !!config.regexp;
            this.replace = config.replace || "";
            this.valid = !!this.search && (!this.regexp || validRegExp(this.search));
-           this.unquoted = this.literal ? this.search : this.search.replace(/\\([nrt\\])/g, (_, ch) => ch == "n" ? "\n" : ch == "r" ? "\r" : ch == "t" ? "\t" : "\\");
+           this.unquoted = this.unquote(this.search);
            this.wholeWord = !!config.wholeWord;
        }
        /**
+       @internal
+       */
+       unquote(text) {
+           return this.literal ? text :
+               text.replace(/\\([nrt\\])/g, (_, ch) => ch == "n" ? "\n" : ch == "r" ? "\r" : ch == "t" ? "\t" : "\\");
+       }
+       /**
        Compare this query to another query.
        */
        eq(other) {
@@ -19092,7 +19094,7 @@ var sqlui = (function (exports) {
            return this.prevMatchInRange(state, 0, curFrom) ||
                this.prevMatchInRange(state, curTo, state.doc.length);
        }
-       getReplacement(_result) { return this.spec.replace; }
+       getReplacement(_result) { return this.spec.unquote(this.spec.replace); }
        matchAll(state, limit) {
            let cursor = stringCursor(this.spec, state, 0, state.doc.length), ranges = [];
            while (!cursor.next().done) {
@@ -19151,10 +19153,10 @@ var sqlui = (function (exports) {
                this.prevMatchInRange(state, curTo, state.doc.length);
        }
        getReplacement(result) {
-           return this.spec.replace.replace(/\$([$&\d+])/g, (m, i) => i == "$" ? "$"
+           return this.spec.unquote(this.spec.replace.replace(/\$([$&\d+])/g, (m, i) => i == "$" ? "$"
                : i == "&" ? result.match[0]
                    : i != "0" && +i < result.match.length ? result.match[i]
-                       : m);
+                       : m));
        }
        matchAll(state, limit) {
            let cursor = regexpCursor(this.spec, state, 0, state.doc.length), ranges = [];
@@ -19446,6 +19448,7 @@ var sqlui = (function (exports) {
                "aria-label": phrase(view, "Find"),
                class: "cm-textfield",
                name: "search",
+               form: "",
                "main-field": "true",
                onchange: this.commit,
                onkeyup: this.commit
@@ -19456,24 +19459,28 @@ var sqlui = (function (exports) {
                "aria-label": phrase(view, "Replace"),
                class: "cm-textfield",
                name: "replace",
+               form: "",
                onchange: this.commit,
                onkeyup: this.commit
            });
            this.caseField = crelt("input", {
                type: "checkbox",
                name: "case",
+               form: "",
                checked: query.caseSensitive,
                onchange: this.commit
            });
            this.reField = crelt("input", {
                type: "checkbox",
                name: "re",
+               form: "",
                checked: query.regexp,
                onchange: this.commit
            });
            this.wordField = crelt("input", {
                type: "checkbox",
                name: "word",
+               form: "",
                checked: query.wholeWord,
                onchange: this.commit
            });
@@ -23266,10 +23273,10 @@ var sqlui = (function (exports) {
      Builtin = 24;
 
    function isAlpha(ch) {
-       return ch >= 65 /* A */ && ch <= 90 /* Z */ || ch >= 97 /* a */ && ch <= 122 /* z */ || ch >= 48 /* _0 */ && ch <= 57 /* _9 */;
+       return ch >= 65 /* Ch.A */ && ch <= 90 /* Ch.Z */ || ch >= 97 /* Ch.a */ && ch <= 122 /* Ch.z */ || ch >= 48 /* Ch._0 */ && ch <= 57 /* Ch._9 */;
    }
    function isHexDigit(ch) {
-       return ch >= 48 /* _0 */ && ch <= 57 /* _9 */ || ch >= 97 /* a */ && ch <= 102 /* f */ || ch >= 65 /* A */ && ch <= 70 /* F */;
+       return ch >= 48 /* Ch._0 */ && ch <= 57 /* Ch._9 */ || ch >= 97 /* Ch.a */ && ch <= 102 /* Ch.f */ || ch >= 65 /* Ch.A */ && ch <= 70 /* Ch.F */;
    }
    function readLiteral(input, endQuote, backslashEscapes) {
        for (let escaped = false;;) {
@@ -23279,7 +23286,7 @@ var sqlui = (function (exports) {
                input.advance();
                return;
            }
-           escaped = backslashEscapes && !escaped && input.next == 92 /* Backslash */;
+           escaped = backslashEscapes && !escaped && input.next == 92 /* Ch.Backslash */;
            input.advance();
        }
    }
@@ -23287,7 +23294,7 @@ var sqlui = (function (exports) {
        for (;;) {
            if (input.next < 0 || input.peek(1) < 0)
                return;
-           if (input.next == 36 /* Dollar */ && input.peek(1) == 36 /* Dollar */) {
+           if (input.next == 36 /* Ch.Dollar */ && input.peek(1) == 36 /* Ch.Dollar */) {
                input.advance(2);
                return;
            }
@@ -23296,7 +23303,7 @@ var sqlui = (function (exports) {
    }
    function readWord(input, result) {
        for (;;) {
-           if (input.next != 95 /* Underscore */ && !isAlpha(input.next))
+           if (input.next != 95 /* Ch.Underscore */ && !isAlpha(input.next))
                break;
            if (result != null)
                result += String.fromCharCode(input.next);
@@ -23305,7 +23312,7 @@ var sqlui = (function (exports) {
        return result;
    }
    function readWordOrQuoted(input) {
-       if (input.next == 39 /* SingleQuote */ || input.next == 34 /* DoubleQuote */ || input.next == 96 /* Backtick */) {
+       if (input.next == 39 /* Ch.SingleQuote */ || input.next == 34 /* Ch.DoubleQuote */ || input.next == 96 /* Ch.Backtick */) {
            let quote = input.next;
            input.advance();
            readLiteral(input, quote, false);
@@ -23315,33 +23322,33 @@ var sqlui = (function (exports) {
        }
    }
    function readBits(input, endQuote) {
-       while (input.next == 48 /* _0 */ || input.next == 49 /* _1 */)
+       while (input.next == 48 /* Ch._0 */ || input.next == 49 /* Ch._1 */)
            input.advance();
        if (endQuote && input.next == endQuote)
            input.advance();
    }
    function readNumber(input, sawDot) {
        for (;;) {
-           if (input.next == 46 /* Dot */) {
+           if (input.next == 46 /* Ch.Dot */) {
                if (sawDot)
                    break;
                sawDot = true;
            }
-           else if (input.next < 48 /* _0 */ || input.next > 57 /* _9 */) {
+           else if (input.next < 48 /* Ch._0 */ || input.next > 57 /* Ch._9 */) {
                break;
            }
            input.advance();
        }
-       if (input.next == 69 /* E */ || input.next == 101 /* e */) {
+       if (input.next == 69 /* Ch.E */ || input.next == 101 /* Ch.e */) {
            input.advance();
-           if (input.next == 43 /* Plus */ || input.next == 45 /* Dash */)
+           if (input.next == 43 /* Ch.Plus */ || input.next == 45 /* Ch.Dash */)
                input.advance();
-           while (input.next >= 48 /* _0 */ && input.next <= 57 /* _9 */)
+           while (input.next >= 48 /* Ch._0 */ && input.next <= 57 /* Ch._9 */)
                input.advance();
        }
    }
    function eol(input) {
-       while (!(input.next < 0 || input.next == 10 /* Newline */))
+       while (!(input.next < 0 || input.next == 10 /* Ch.Newline */))
            input.advance();
    }
    function inString(ch, str) {
@@ -23401,31 +23408,31 @@ var sqlui = (function (exports) {
                    input.advance();
                input.acceptToken(whitespace);
            }
-           else if (next == 36 /* Dollar */ && input.next == 36 /* Dollar */ && d.doubleDollarStrings) {
+           else if (next == 36 /* Ch.Dollar */ && input.next == 36 /* Ch.Dollar */ && d.doubleDollarStrings) {
                readDoubleDollarLiteral(input);
                input.acceptToken(String$1);
            }
-           else if (next == 39 /* SingleQuote */ || next == 34 /* DoubleQuote */ && d.doubleQuotedStrings) {
+           else if (next == 39 /* Ch.SingleQuote */ || next == 34 /* Ch.DoubleQuote */ && d.doubleQuotedStrings) {
                readLiteral(input, next, d.backslashEscapes);
                input.acceptToken(String$1);
            }
-           else if (next == 35 /* Hash */ && d.hashComments ||
-               next == 47 /* Slash */ && input.next == 47 /* Slash */ && d.slashComments) {
+           else if (next == 35 /* Ch.Hash */ && d.hashComments ||
+               next == 47 /* Ch.Slash */ && input.next == 47 /* Ch.Slash */ && d.slashComments) {
                eol(input);
                input.acceptToken(LineComment);
            }
-           else if (next == 45 /* Dash */ && input.next == 45 /* Dash */ &&
-               (!d.spaceAfterDashes || input.peek(2) == 32 /* Space */)) {
+           else if (next == 45 /* Ch.Dash */ && input.next == 45 /* Ch.Dash */ &&
+               (!d.spaceAfterDashes || input.peek(1) == 32 /* Ch.Space */)) {
                eol(input);
                input.acceptToken(LineComment);
            }
-           else if (next == 47 /* Slash */ && input.next == 42 /* Star */) {
+           else if (next == 47 /* Ch.Slash */ && input.next == 42 /* Ch.Star */) {
                input.advance();
                for (let prev = -1, depth = 1;;) {
                    if (input.next < 0)
                        break;
                    input.advance();
-                   if (prev == 42 /* Star */ && input.next == 47 /* Slash */) {
+                   if (prev == 42 /* Ch.Star */ && input.next == 47 /* Ch.Slash */) {
                        depth--;
                        if (!depth) {
                            input.advance();
@@ -23433,7 +23440,7 @@ var sqlui = (function (exports) {
                        }
                        prev = -1;
                    }
-                   else if (prev == 47 /* Slash */ && input.next == 42 /* Star */) {
+                   else if (prev == 47 /* Ch.Slash */ && input.next == 42 /* Ch.Star */) {
                        depth++;
                        prev = -1;
                    }
@@ -23443,21 +23450,21 @@ var sqlui = (function (exports) {
                }
                input.acceptToken(BlockComment);
            }
-           else if ((next == 101 /* e */ || next == 69 /* E */) && input.next == 39 /* SingleQuote */) {
+           else if ((next == 101 /* Ch.e */ || next == 69 /* Ch.E */) && input.next == 39 /* Ch.SingleQuote */) {
                input.advance();
-               readLiteral(input, 39 /* SingleQuote */, true);
+               readLiteral(input, 39 /* Ch.SingleQuote */, true);
            }
-           else if ((next == 110 /* n */ || next == 78 /* N */) && input.next == 39 /* SingleQuote */ &&
+           else if ((next == 110 /* Ch.n */ || next == 78 /* Ch.N */) && input.next == 39 /* Ch.SingleQuote */ &&
                d.charSetCasts) {
                input.advance();
-               readLiteral(input, 39 /* SingleQuote */, d.backslashEscapes);
+               readLiteral(input, 39 /* Ch.SingleQuote */, d.backslashEscapes);
                input.acceptToken(String$1);
            }
-           else if (next == 95 /* Underscore */ && d.charSetCasts) {
+           else if (next == 95 /* Ch.Underscore */ && d.charSetCasts) {
                for (let i = 0;; i++) {
-                   if (input.next == 39 /* SingleQuote */ && i > 1) {
+                   if (input.next == 39 /* Ch.SingleQuote */ && i > 1) {
                        input.advance();
-                       readLiteral(input, 39 /* SingleQuote */, d.backslashEscapes);
+                       readLiteral(input, 39 /* Ch.SingleQuote */, d.backslashEscapes);
                        input.acceptToken(String$1);
                        break;
                    }
@@ -23466,33 +23473,33 @@ var sqlui = (function (exports) {
                    input.advance();
                }
            }
-           else if (next == 40 /* ParenL */) {
+           else if (next == 40 /* Ch.ParenL */) {
                input.acceptToken(ParenL);
            }
-           else if (next == 41 /* ParenR */) {
+           else if (next == 41 /* Ch.ParenR */) {
                input.acceptToken(ParenR);
            }
-           else if (next == 123 /* BraceL */) {
+           else if (next == 123 /* Ch.BraceL */) {
                input.acceptToken(BraceL);
            }
-           else if (next == 125 /* BraceR */) {
+           else if (next == 125 /* Ch.BraceR */) {
                input.acceptToken(BraceR);
            }
-           else if (next == 91 /* BracketL */) {
+           else if (next == 91 /* Ch.BracketL */) {
                input.acceptToken(BracketL);
            }
-           else if (next == 93 /* BracketR */) {
+           else if (next == 93 /* Ch.BracketR */) {
                input.acceptToken(BracketR);
            }
-           else if (next == 59 /* Semi */) {
+           else if (next == 59 /* Ch.Semi */) {
                input.acceptToken(Semi);
            }
-           else if (d.unquotedBitLiterals && next == 48 /* _0 */ && input.next == 98 /* b */) {
+           else if (d.unquotedBitLiterals && next == 48 /* Ch._0 */ && input.next == 98 /* Ch.b */) {
                input.advance();
                readBits(input);
                input.acceptToken(Bits);
            }
-           else if ((next == 98 /* b */ || next == 66 /* B */) && (input.next == 39 /* SingleQuote */ || input.next == 34 /* DoubleQuote */)) {
+           else if ((next == 98 /* Ch.b */ || next == 66 /* Ch.B */) && (input.next == 39 /* Ch.SingleQuote */ || input.next == 34 /* Ch.DoubleQuote */)) {
                const quoteStyle = input.next;
                input.advance();
                if (d.treatBitsAsBytes) {
@@ -23504,24 +23511,24 @@ var sqlui = (function (exports) {
                    input.acceptToken(Bits);
                }
            }
-           else if (next == 48 /* _0 */ && (input.next == 120 /* x */ || input.next == 88 /* X */) ||
-               (next == 120 /* x */ || next == 88 /* X */) && input.next == 39 /* SingleQuote */) {
-               let quoted = input.next == 39 /* SingleQuote */;
+           else if (next == 48 /* Ch._0 */ && (input.next == 120 /* Ch.x */ || input.next == 88 /* Ch.X */) ||
+               (next == 120 /* Ch.x */ || next == 88 /* Ch.X */) && input.next == 39 /* Ch.SingleQuote */) {
+               let quoted = input.next == 39 /* Ch.SingleQuote */;
                input.advance();
                while (isHexDigit(input.next))
                    input.advance();
-               if (quoted && input.next == 39 /* SingleQuote */)
+               if (quoted && input.next == 39 /* Ch.SingleQuote */)
                    input.advance();
                input.acceptToken(Number);
            }
-           else if (next == 46 /* Dot */ && input.next >= 48 /* _0 */ && input.next <= 57 /* _9 */) {
+           else if (next == 46 /* Ch.Dot */ && input.next >= 48 /* Ch._0 */ && input.next <= 57 /* Ch._9 */) {
                readNumber(input, true);
                input.acceptToken(Number);
            }
-           else if (next == 46 /* Dot */) {
+           else if (next == 46 /* Ch.Dot */) {
                input.acceptToken(Dot);
            }
-           else if (next >= 48 /* _0 */ && next <= 57 /* _9 */) {
+           else if (next >= 48 /* Ch._0 */ && next <= 57 /* Ch._9 */) {
                readNumber(input, false);
                input.acceptToken(Number);
            }
@@ -23540,12 +23547,12 @@ var sqlui = (function (exports) {
                readLiteral(input, next, false);
                input.acceptToken(QuotedIdentifier);
            }
-           else if (next == 58 /* Colon */ || next == 44 /* Comma */) {
+           else if (next == 58 /* Ch.Colon */ || next == 44 /* Ch.Comma */) {
                input.acceptToken(Punctuation);
            }
            else if (isAlpha(next)) {
                let word = readWord(input, String.fromCharCode(next));
-               input.acceptToken(input.next == 46 /* Dot */ ? Identifier : (_a = d.words[word.toLowerCase()]) !== null && _a !== void 0 ? _a : Identifier);
+               input.acceptToken(input.next == 46 /* Ch.Dot */ ? Identifier : (_a = d.words[word.toLowerCase()]) !== null && _a !== void 0 ? _a : Identifier);
            }
        });
    }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sqlui
 version: !ruby/object:Gem::Version
-  version: 0.1.16
+  version: 0.1.17
 platform: ruby
 authors:
 - Nick Dower
@@ -108,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -155,7 +169,8 @@ files:
 homepage: https://github.com/nicholasdower/sqlui
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -164,7 +179,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="