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

@@ Строка 74: / Строка 74: @@
 end
-function p.prefixFile(call)
+function p.prefixFile(id, path)
-    local id
+	if isFrameLike(id) then
+		local args = getArgs(id)
+		path = args.path or args[2]
+		id = args[1] or args.id
+	elseif type(id) == "table" then
+		path = id.path or id[2]
+		id = id[1] or id.id
+	end
-    if isFrameLike(call) then
+	id = trim(id)
-        local args = getArgs(call)
+	path = resolvePath(path)
-        id = trim(args[1] or args.id)
-    elseif type(call) == "table" then
-        id = trim(call[1] or call.id)
-    else
-        id = trim(call)
-    end
-    if id == "" then
+	if id == "" then
-        return ""
+		return ""
-    end
+	end
-    local path = getPathFromCall(call)
+	if path ~= "" and p.has(id, path) then
+		return path .. "-" .. id
+	end
-    if path ~= "" and p.has(id, path) then
+	return id
-        return path .. "-" .. id
-    end
-    return id
 end