Модуль:JsonPaths: различия между версиями

@@ Строка 1: / Строка 1: @@
 local p = {}
+local getArgs = require('Module:Arguments').getArgs
-function p.get(rel, path)
+local function resolvePath(path)
-     if type(rel) ~= "string" or rel == "" then
+     if path and path ~= "" then
+        return path
+    end
+    local frame = mw.getCurrentFrame()
+    if not frame then
          return ""
      end
-     if (not path or path == "") and mw.getCurrentFrame then
+     local args = getArgs(frame)
-        local frame = mw.getCurrentFrame()
+    path = args.path or ""
-        path = (frame.args and frame.args.path) or ""
-    end
      if path == "Corvax" then
          path = ""
      end
+    return path
+end
+function p.get(rel, path)
+    rel = mw.text.trim(rel or "")
+    if rel == "" then
+        return ""
+    end
+    path = mw.text.trim(resolvePath(path))
      local prefix = "Module:IanComradeBot/"
-     if path and path ~= "" then
+     if path ~= "" then
          prefix = prefix .. path .. "/"
      end