Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ nginx.conf.compiled
secret/
cache/
lint_config.lua
.DS_Store
1 change: 1 addition & 0 deletions lapis/console/assets/main_js.lua
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ return [==[
}
opts = $.param({
lang: "moonscript"
// lang: "lua"
});
this.set_status("loading", "Loading...");
return $.post("?" + opts, {
Expand Down
25 changes: 25 additions & 0 deletions lapis/console/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,31 @@ make = function(opts)
}
end
end
elseif self.params.lang == "lua" then
local fn, err = loadstring(self.params.code)
if err then
return {
json = {
error = err
}
}
else
local lines, queries = run(self, fn)
if lines then
return {
json = {
lines = lines,
queries = queries
}
}
else
return {
json = {
error = queries
}
}
end
end
end
end)
})
Expand Down
10 changes: 10 additions & 0 deletions lapis/console/init.moon
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,16 @@ make = (opts={}) ->
{ json: { :lines, :queries } }
else
{ json: { error: queries } }
elseif @params.lang == "lua"
fn, err = loadstring @params.code
if err
{ json: { error: err } }
else
lines, queries = run @, fn
if lines
{ json: { :lines, :queries } }
else
{ json: { error: queries } }
}


Expand Down
10 changes: 7 additions & 3 deletions lapis/console/views/console.lua
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ Widget = require("lapis.html").Widget
local embed_assets = true
local Console
do
local _class_0
local _parent_0 = Widget
local _base_0 = {
body_content = function(self)
Expand Down Expand Up @@ -111,9 +112,9 @@ do
}
_base_0.__index = _base_0
setmetatable(_base_0, _parent_0.__base)
local _class_0 = setmetatable({
_class_0 = setmetatable({
__init = function(self, ...)
return _parent_0.__init(self, ...)
return _class_0.__parent.__init(self, ...)
end,
__base = _base_0,
__name = "Console",
Expand All @@ -122,7 +123,10 @@ do
__index = function(cls, name)
local val = rawget(_base_0, name)
if val == nil then
return _parent_0[name]
local parent = rawget(cls, "__parent")
if parent then
return parent[name]
end
else
return val
end
Expand Down