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

@@ Строка 74: / Строка 74: @@
 end
-function p.prefixFile(call)
+function p.prefixFile(id, path)
-    local path = getPathFromCall(call)
+	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 path ~= "" then
+	id = trim(id)
-        return path .. "-"
+	path = resolvePath(path)
-    end
-    return ""
+	if id == "" then
+		return ""
+	end
+	if path ~= "" and p.has(id, path) then
+		return path .. "-" .. id
+	end
+	return id
 end