unify how default app module is selected and loaded, use config.default_app_module instead of undocumented config.app_class

Author: leafo

lapis/cmd/actions.lua

@@ -349,7 +349,7 @@ local COMMANDS = {
       do
         local _with_0 = command
         _with_0:argument("path", "Path to request, may include query parameters (eg. /)")
-        _with_0:option("--app-class", "Override default app class module name")
+        _with_0:option("--app-module --app-class", "Override default app module name")
         _with_0:option("--helper", "Module name to require before loading app")
         _with_0:group("Request control", _with_0:option("--method", "HTTP method"):choices({
           "GET",
@@ -371,9 +371,7 @@ local COMMANDS = {
       if args.helper then
         require(args.helper)
       end
-      local config = require("lapis.config").get()
-      local app_module = args.app_class or config.app_class or "app"
-      local app_cls = require(app_module or config.app_class)
+      local app_cls = require(require("lapis.config").get_app_module(args.app_module))
       local simulate_request
       simulate_request = require("lapis.spec.request").simulate_request
       local input_headers, input_cookies

lapis/cmd/actions.moon

@@ -300,7 +300,7 @@ COMMANDS = {
     argparse: (command) ->
       with command
         \argument "path", "Path to request, may include query parameters (eg. /)"
-        \option("--app-class", "Override default app class module name")
+        \option("--app-module --app-class", "Override default app module name")
         \option("--helper", "Module name to require before loading app")
 
         \group("Request control"
@@ -326,9 +326,7 @@ COMMANDS = {
       if args.helper
         require args.helper
 
-      config = require("lapis.config").get!
-      app_module = args.app_class or config.app_class or "app"
-      app_cls = require app_module or config.app_class
+      app_cls = require require("lapis.config").get_app_module args.app_module
 
       import simulate_request from require "lapis.spec.request"
 

lapis/cmd/cqueues.lua

@@ -125,19 +125,10 @@ create_server = function(app_module, environment)
     dispatch, protected_call = _obj_0.dispatch, _obj_0.protected_call
   end
   local load_app
-  load_app = function()
-    local app_cls
-    if type(app_module) == "string" then
-      app_cls = require(app_module)
-    else
-      app_cls = app_module
-    end
-    if app_cls.__base then
-      return app_cls()
-    else
-      app_cls:build_router()
-      return app_cls
-    end
+  load_app = require("lapis").load_app
+  local load_current_app
+  load_current_app = function()
+    return load_app(app_module)
   end
   local onstream
   local _exp_0 = config.code_cache
@@ -147,7 +138,7 @@ create_server = function(app_module, environment)
       reset()
       local app
       if protected_call(stream, function()
-        app = load_app()
+        app = load_current_app()
       end) then
         return dispatch(app, self, stream)
       end
@@ -157,14 +148,14 @@ create_server = function(app_module, environment)
       stream:get_headers()
       local app
       if protected_call(stream, function()
-        app = load_app()
+        app = load_current_app()
       end) then
-        app = load_app()
+        app = load_current_app()
       end
       return dispatch(app, self, stream)
     end
   else
-    local app = load_app()
+    local app = load_current_app()
     onstream = function(self, stream)
       return dispatch(app, self, stream)
     end

lapis/cmd/cqueues.moon

@@ -69,18 +69,9 @@ create_server = (app_module, environment) ->
   config = require("lapis.config").get!
 
   import dispatch, protected_call from require "lapis.cqueues"
+  import load_app from require "lapis"
 
-  load_app = ->
-    app_cls = if type(app_module) == "string"
-      require(app_module)
-    else
-      app_module
-
-    if app_cls.__base -- is a class
-      app_cls!
-    else
-      app_cls\build_router!
-      app_cls
+  load_current_app = -> load_app app_module
 
   -- WARNING: https://github.com/daurnimator/lua-http/issues/204
   -- There is a bug in lua-http where if an error is thrown before the stream
@@ -94,17 +85,17 @@ create_server = (app_module, environment) ->
       (stream) =>
         reset!
         local app
-        if protected_call stream, -> app = load_app!
+        if protected_call stream, -> app = load_current_app!
           dispatch app, @, stream
     when "app_only"
       (stream) =>
         stream\get_headers!
         local app
-        if protected_call stream, -> app = load_app!
-          app = load_app!
+        if protected_call stream, -> app = load_current_app!
+          app = load_current_app!
         dispatch app, @, stream
     else
-      app = load_app!
+      app = load_current_app!
       (stream) => dispatch app, @, stream
 
   -- If this is called then we let an error escape, likely a bug in Lapis. This

lapis/cmd/cqueues/actions.lua

@@ -26,9 +26,7 @@ return {
     local start_server
     start_server = require("lapis.cmd.cqueues").start_server
     push(environment)
-    local config = require("lapis.config").get()
-    local app_module = config.app_class or "app"
-    start_server(app_module)
+    start_server(require("lapis.config").get_app_module())
     return pop()
   end
 }

lapis/cmd/cqueues/actions.moon

@@ -19,9 +19,7 @@ unpack = unpack or table.unpack
 
     push environment
 
-    config = require("lapis.config").get!
-    app_module = config.app_class or "app"
-    start_server app_module
+    start_server require("lapis.config").get_app_module!
 
     pop!
 }

lapis/cmd/cqueues/attached_server.lua

@@ -25,9 +25,7 @@ do
           overrides = nil
         end
         push(env, overrides)
-        local config = require("lapis.config").get()
-        local app_module = config.app_class or "app"
-        return start_server(app_module)
+        return start_server(require("lapis.config").get_app_module())
       end, env, to_json(overrides or { })))
       return self:wait_until_ready()
     end,

lapis/cmd/cqueues/attached_server.moon

@@ -21,9 +21,7 @@ class CqueuesAttachedServer extends AttachedServer
 
         push env, overrides
 
-        config = require("lapis.config").get!
-        app_module = config.app_class or "app"
-        start_server app_module
+        start_server require("lapis.config").get_app_module!
 
       env, to_json overrides or {}
 

lapis/config.lua

@@ -1,7 +1,7 @@
 local insert
 insert = table.insert
 local CONFIG_MODULE = package.loaded["lapis.config_module_name"] or "config"
-local config_cache, configs, default_config, merge_set, set, scope_meta, config, reset, run_with_scope, get_env, get
+local config_cache, configs, default_config, merge_set, set, scope_meta, config, reset, run_with_scope, get_env, get, get_app_module
 config_cache = { }
 configs = { }
 default_config = {
@@ -172,8 +172,12 @@ do
     return conf
   end
 end
+get_app_module = function(override)
+  return override or get().default_app_module or "app"
+end
 return setmetatable({
   get = get,
+  get_app_module = get_app_module,
   config = config,
   merge_set = merge_set,
   default_config = default_config,

lapis/config.moon

@@ -152,8 +152,14 @@ get = do
     config_cache[name] = conf
     conf
 
+---Resolve the application module name. Falls back to `config.default_app_module`, then "app".
+---@param override? string Explicit module name to use, bypassing config
+---@return string
+get_app_module = (override) ->
+  override or get!.default_app_module or "app"
+
 setmetatable {
-  :get, :config, :merge_set, :default_config, :reset
+  :get, :get_app_module, :config, :merge_set, :default_config, :reset
 }, {
   __call: (...) => config ...
 }