Consolidate globals in main stackline.lua file. Remove unnecessary custom table.insert() fn (#77)

Potential fix for #76

Author: AdamWagner

lib/utils.lua

@@ -2,15 +2,6 @@
 local log = hs.logger.new('utils', 'info')
 log.i('Loading module: utils')
 
-local function length(t) -- {{{
-    if type(t)~='table' then return 0 end
-    local count = 0
-    for _ in pairs(t) do
-        count = count + 1
-    end
-    return count
-end -- }}}
-
 -- === Extend builtins ===
 function string:split(p) -- {{{
     -- Splits the string [s] into substrings wherever pattern [p] occurs.
@@ -47,32 +38,6 @@ function string:trim() -- {{{
         :gsub('%s+$', '') -- trim trailing whitespace
 end -- }}}
 
-table.rawinsert = table.insert -- Store the OG fn just in case
-
-table.insert = function(tbl, key, val) -- luacheck: ignore 122 {{{
-    if (tbl==nil) then return {} end -- bail right away if tbl is nil
-
-    local insert      = table.rawinsert -- luacheck: ignore 143
-    local no_val      = val==nil
-    local numeric_key = type(key)=='number'
-    local is_array    = type(tbl)=='table' and tbl[1]~=nil and tbl[length(tbl)]~=nil
-
-    if no_val then
-        val = key      -- We must only have *two* args,so val is actually *key*
-        key = #tbl + 1 -- set a sequntial numeric key to append to array-like tbl
-    end
-
-    if is_array or numeric_key then
-        key = (key < 0) and (#tbl+2+key) or key -- table.insert(x,0,'val') -> insert last
-        key = math.min(key, #tbl+1)             -- handle key that's out of bounds
-        insert(tbl, key, val)                   -- insert via OG table.insert
-    else
-        tbl[key] = val
-    end
-
-    return tbl -- unlike OG table.insert, you get the table back
-end -- }}}
-
 function table.slice(t, from, to) -- {{{
     -- Returns a partial table sliced from t, equivalent to t[x:y] in certain languages.
     -- Negative indices will be used to access the table from the other end.
@@ -99,9 +64,7 @@ function table.slice(t, from, to) -- {{{
 end -- }}}
 
 -- === utils module ===
-_G.u = {} -- access utils under global 'u'
-
-u.length = length
+local u = {}
 
 -- Alias hs.fnutils methods
 u.map          = hs.fnutils.map
@@ -118,6 +81,15 @@ u.copy         = hs.fnutils.copy
 u.sortByKeys   = hs.fnutils.sortByKeys
 u.sortByValues = hs.fnutils.sortByKeyValues
 
+function u.length(t) -- {{{
+    if type(t)~='table' then return 0 end
+    local count = 0
+    for _ in next, t do
+        count = count + 1
+    end
+    return count
+end -- }}}
+
 function u.reverse(tbl) -- {{{
     -- Reverses values in a given array. The passed-in array should not be sparse.
     local res = {}

stackline/configmanager.lua

@@ -1,6 +1,6 @@
 -- https://github.com/erento/lua-schema-validation
 local log = hs.logger.new('configmgr', 'info')
-local v = require 'stackline.lib.valid' -- Validators & type lookup
+local v = require 'lib.valid' -- Validators & type lookup
 local o = v.optional
 
 local is_color = v.is_table {

stackline/query.lua

@@ -1,4 +1,3 @@
-local u = require 'stackline.lib.utils'
 local log   = hs.logger.new('query', 'info')
 log.i('Loading module: query')
 

stackline/stack.lua

@@ -1,5 +1,3 @@
-local u = require 'stackline.lib.utils'
-
 local Stack = {}
 
 function Stack:new(stackedWindows) -- {{{

stackline/stackline.lua

@@ -1,12 +1,13 @@
 -- luacheck: globals table.merge
 -- luacheck: globals u
---luacheck: ignore 112
+-- luacheck: ignore 112
 local wf    = hs.window.filter
 local timer = hs.timer.delayed
 local log   = hs.logger.new('stackline', 'info')
 local click = hs.eventtap.event.types['leftMouseDown'] -- fyi, print hs.eventtap.event.types to see all event types
 
 log.i'Loading module: stackline'
+_G.u = require 'lib.utils'
 _G.stackline = {} -- access stackline under global 'stackline'
 stackline.config = require'stackline.configmanager'
 stackline.window = require'stackline.window'

stackline/window.lua

@@ -1,4 +1,3 @@
-local u = require 'stackline.lib.utils'
 local log   = hs.logger.new('window', 'info')
 log.i('Loading module: window')