remove relative import system

13 files changed, 18 insertions, 85 deletions

diff --git a/mmm/init.client.moon b/mmm/init.client.moon
index 25c7da0..c7b010e 100644
--- a/mmm/init.client.moon
+++ b/mmm/init.client.moon
@@ -30,24 +30,6 @@ warn = (...) ->
 -- package.path = '/?.client.moon.lua;/?.moon.lua;/?/init.moon.lua;/?.lua;/?/init.lua'
 package.path = '/?.lua;/?/init.lua'
 
--- relative imports
-relative = do
-  _require = require
-
-  (base, sub) ->
-    sub = 0 unless 'number' == type sub
-
-    for i=1, sub
-      base = base\match '^(.*)%.%w+$'
-
-    (name, x) ->
-      if name == '.'
-        name = base
-      else if '.' == name\sub 1, 1
-        name = base .. name
-
-      _require name
-
 if on_load
   for f in *on_load do f!
 
diff --git a/mmm/init.server.moon b/mmm/init.server.moon
index 0e3534b..021816c 100644
--- a/mmm/init.server.moon
+++ b/mmm/init.server.moon
@@ -24,21 +24,3 @@ warn = (...) ->
   contents = [deep_tostring v for v in *{ ... } ]
   io.stderr\write table.concat contents, '\t'
   io.stderr\write '\n'
-
--- relative imports
-relative = do
-  _require = require
-
-  (base, sub) ->
-    sub = sub or 0
-
-    for i=1, sub
-      base = base\match '^(.*)%.%w+$'
-
-    (name, x) ->
-      if name == '.'
-        name = base
-      else if '.' == name\sub 1, 1
-        name = base .. name
-
-      _require name
diff --git a/mmm/mmmfs/browser.moon b/mmm/mmmfs/browser.moon
index 2abe512..e20aae0 100644
--- a/mmm/mmmfs/browser.moon
+++ b/mmm/mmmfs/browser.moon
@@ -1,9 +1,8 @@
-require = relative ..., 1
-import Key from require '.fileder'
-import get_conversions, apply_conversions from require '.conversion'
+import Key from require 'mmm.mmmfs.fileder'
+import get_conversions, apply_conversions from require 'mmm.mmmfs.conversion'
 import ReactiveVar, get_or_create, text, elements, tohtml from require 'mmm.component'
 import pre, div, nav, span, button, a, code, select, option from elements
-import link_to from (require '.util') elements
+import link_to from (require 'mmm.mmmfs.util') elements
 import languages from require 'mmm.highlighting'
 
 keep = (var) ->
@@ -270,13 +269,13 @@ class Browser
         \append @inspect_err
       \append with pre class: 'content'
         \append keep @inspect_prop\map (prop, old) ->
-          @get_content prop, @inspect_err, (fileder, prop) ->
-            value, key = fileder\get prop
-            assert key, "couldn't @get #{prop}"
+          @get_content facet, @inspect_err, (fileder, facet) ->
+            value, key = fileder\get facet
+            assert key, "couldn't @get #{facet}"
 
             conversions = get_conversions fileder, 'mmm/dom', key.type, get_casts!
             assert conversions, "cannot cast '#{key.type}'"
-            with res = apply_conversions conversions, value, fileder, prop
+            with res = apply_conversions fileder, conversions, value, facet
               @editor\set if res.EDITOR then res
 
       -- children
diff --git a/mmm/mmmfs/conversion.moon b/mmm/mmmfs/conversion.moon
index 80a4537..a99c5ba 100644
--- a/mmm/mmmfs/conversion.moon
+++ b/mmm/mmmfs/conversion.moon
@@ -1,7 +1,6 @@
-require = relative ..., 1
 refs = require 'mmm.refs'
-import Queue from require '.queue'
-import get_plugins from require '.meta'
+import Queue from require 'mmm.mmmfs.queue'
+import get_plugins from require 'mmm.mmmfs.meta'
 
 count = (base, pattern='->') -> select 2, base\gsub pattern, ''
 escape_pattern = (inp) ->
diff --git a/mmm/mmmfs/fileder.moon b/mmm/mmmfs/fileder.moon
index 27d5610..2f4f391 100644
--- a/mmm/mmmfs/fileder.moon
+++ b/mmm/mmmfs/fileder.moon
@@ -1,5 +1,4 @@
-require = relative ..., 1
-import get_conversions, apply_conversions from require '.conversion'
+import get_conversions, apply_conversions from require 'mmm.mmmfs.conversion'
 
 -- split filename into dirname + basename
 dir_base = (path) ->
diff --git a/mmm/mmmfs/init.moon b/mmm/mmmfs/init.moon
index fc89d7f..fdfe1f1 100644
--- a/mmm/mmmfs/init.moon
+++ b/mmm/mmmfs/init.moon
@@ -1,4 +1,2 @@
-require = relative ..., 0
-
 export ^
-PLUGINS = require '.plugins'
+PLUGINS = require 'mmm.mmmfs.plugins'
diff --git a/mmm/mmmfs/plugins/init.moon b/mmm/mmmfs/plugins/init.moon
index c16cdfa..57acbfe 100644
--- a/mmm/mmmfs/plugins/init.moon
+++ b/mmm/mmmfs/plugins/init.moon
@@ -1,7 +1,6 @@
-require = relative ..., 1
 import div, pre, code, img, video, span, source  from require 'mmm.dom'
 import find_fileder, link_to, embed from (require 'mmm.mmmfs.util') require 'mmm.dom'
-import render from require '.layout'
+import render from require 'mmm.mmmfs.layout'
 import tohtml from require 'mmm.component'
 
 -- fix JS null values
@@ -271,7 +270,7 @@ if MODE == 'CLIENT' or UNSAFE
   }
 
 add_plugin = (module) ->
-  ok, plugin = pcall require, ".plugins.#{module}"
+  ok, plugin = pcall require, "mmm.mmmfs.plugins.#{module}"
 
   if not ok
     print "[Plugins] couldn't load plugins.#{module}: #{plugin}"
diff --git a/mmm/mmmfs/stores/fs.moon b/mmm/mmmfs/stores/fs.moon
index c1d613f..b558a9b 100644
--- a/mmm/mmmfs/stores/fs.moon
+++ b/mmm/mmmfs/stores/fs.moon
@@ -1,6 +1,5 @@
-require = relative ..., 1
 lfs = require 'lfs'
-import Store from require '.'
+import Store from require 'mmm.mmmfs.stores'
 
 -- split filename into dirname + basename
 dir_base = (path) ->
diff --git a/mmm/mmmfs/stores/init.moon b/mmm/mmmfs/stores/init.moon
index fa8699e..a2cdc43 100644
--- a/mmm/mmmfs/stores/init.moon
+++ b/mmm/mmmfs/stores/init.moon
@@ -1,5 +1,3 @@
-require = relative ..., 0
-
 class Store
   new: (opts) =>
     opts.verbose or= false
@@ -55,7 +53,7 @@ get_store = (args='fs', opts={}) ->
 
   switch type\lower!
     when 'sql'
-      import SQLStore from require '.sql'
+      import SQLStore from require 'mmm.mmmfs.stores.sql'
 
       if arg == 'MEMORY'
         opts.memory = true
@@ -65,7 +63,7 @@ get_store = (args='fs', opts={}) ->
       SQLStore opts
 
     when 'fs'
-      import FSStore from require '.fs'
+      import FSStore from require 'mmm.mmmfs.stores.fs'
 
       opts.root = arg
 
diff --git a/mmm/mmmfs/stores/sql.moon b/mmm/mmmfs/stores/sql.moon
index 1d50877..b5f2495 100644
--- a/mmm/mmmfs/stores/sql.moon
+++ b/mmm/mmmfs/stores/sql.moon
@@ -1,6 +1,5 @@
-require = relative ..., 1
 sqlite = require 'sqlite3'
-import Store from require '.'
+import Store from require 'mmm.mmmfs.stores'
 
 class SQLStore extends Store
   new: (opts = {}) =>
diff --git a/mmm/mmmfs/stores/web.moon b/mmm/mmmfs/stores/web.moon
index ddbd74d..40848ab 100644
--- a/mmm/mmmfs/stores/web.moon
+++ b/mmm/mmmfs/stores/web.moon
@@ -1,5 +1,4 @@
-require = relative ..., 1
-import Store from require '.'
+import Store from require 'mmm.mmmfs.stores'
 { :location, :XMLHttpRequest, :JSON, :Object, :Array } = js.global
 
 -- split filename into dirname + basename
diff --git a/spec/stores_spec.moon b/spec/stores_spec.moon
index 7fa2793..4ba838e 100644
--- a/spec/stores_spec.moon
+++ b/spec/stores_spec.moon
@@ -90,8 +90,6 @@ test_store = (ts) ->
 
       assert.are.same root_index, ts\get_index '', -1
 
-  it "can get indexes recursively", ->
-
   it "can load facets", ->
     assert.are.equal 'hello', ts\load_facet '/hello', 'name', 'alpha'
     assert.are.equal 'world', ts\load_facet '/hello/world', 'name', 'alpha'
diff --git a/spec/test_util.moon b/spec/test_util.moon
index b2ac026..e816286 100644
--- a/spec/test_util.moon
+++ b/spec/test_util.moon
@@ -1,21 +1,3 @@
--- relative imports
-_G.relative = do
-  _require = require
-
-  (base, sub) ->
-    sub = sub or 0
-
-    for i=1, sub
-      base = base\match '^(.*)%.%w+$'
-
-    (name, x) ->
-      if name == '.'
-        name = base
-      else if '.' == name\sub 1, 1
-        name = base .. name
-
-      _require name
-
 sort2 = (a, b) ->
   {ax, ay}, {bx, by} = a, b
   "#{ax}//#{ay}" < "#{bx}//#{by}"