Module:MwJson: Difference between revisions

Module:MwJson (view source)

Revision as of 05:36, 6 April 2023

362 bytes added , 6 April 2023

Update package: OSW Core

Maintenance script

472

edits

@@ Line 298: / Line 298: @@
 	--mw.log("JSONDATA RENDER")
 	--mw.logObject(jsondata)
+	local max_index = p.tableLength(schema_res.visited)
 	for i, category in ipairs(schema_res.visited) do
+		if (mode == p.mode.footer) then category = schema_res.visited[max_index - i +1] end --reverse order for footer templates
 		local jsonschema = schema_res.jsonschemas[category]
 		local template = schema_res.templates[category]
@@ Line 319: / Line 320: @@
 	--local display_label = ""
 	--if (jsondata[p.keys.label] ~= nil) then display_label = p.splitString(jsondata[p.keys.label], '@')[1] end
-	if (title.nsText ~= "Category") then wikitext = wikitext .. "\n" .. p.setCategories({categories=jsondata[p.keys.category], sortkey=display_label}).wikitext end--items
+	if (title.nsText ~= "Category") then wikitext = wikitext .. "\n" .. p.setCategories({categories=json_res_store.res[p.keys.category], sortkey=display_label}).wikitext end--items
-	wikitext = wikitext .. p.setCategories({categories=jsondata[p.keys.subcategory], sortkey=display_label}).wikitext --classes/categories
+	wikitext = wikitext .. p.setCategories({categories=json_res_store.res[p.keys.subcategory], sortkey=display_label}).wikitext --classes/categories
 	if (smw_res ~= nil) then
@@ Line 349: / Line 350: @@
 	local schema = p.defaultArg(args.jsonschema, nil)
 	local context = p.buildContext({jsonschema=schema}).context
+	local ignore_properties = {[p.keys.category]=true} -- don't render type/category on every subclass
 	local res = ""
 	if schema == nil then return res end
@@ Line 364: / Line 366: @@
 				:wikitext( schema_label )
 	for k,v in pairs(jsondata) do
-		if (schema['properties'] ~= nil and schema['properties'][k] ~= nil and (type(v) ~= 'table' or v[1] ~= nil)) then --literal or literal array
+		if (not ignore_properties[k]) then
-			local def = schema['properties'][k]
+			if (schema['properties'] ~= nil and schema['properties'][k] ~= nil and (type(v) ~= 'table' or v[1] ~= nil)) then --literal or literal array
-			--mw.logObject(def)
+				local def = schema['properties'][k]
-			local label = k
+				--mw.logObject(def)
-			if def['title'] ~= nil then label = def['title'] end
+				local label = k
-			--res = res .. title ": " .. v
+				if def['title'] ~= nil then label = def['title'] end
-			local cell = tbl:tag( 'tr' )
+				--res = res .. title ": " .. v
-								:tag( 'th' )
+				local cell = tbl:tag( 'tr' )
-									:wikitext( label )
+									:tag( 'th' )
-									:done()
+										:wikitext( label )
-								:tag( 'td' )
+										:done()
-			if (type(v) == 'table') then
+									:tag( 'td' )
-				for i,e in pairs(v) do
+				if (type(v) == 'table') then
-					if (type(e) ~= 'table') then
+					for i,e in pairs(v) do
-						local p_type = p.defaultArgPath(context, {k, '@type'}, '@value')
+						if (type(e) ~= 'table') then
-						if (p_type == '@id') then e = "[[" .. string.gsub(e, "Category:", ":Category:") .. "]]" end
+							local p_type = p.defaultArgPath(context, {k, '@type'}, '@value')
-						cell:wikitext("\n* " .. e .. "")
+							if (p_type == '@id') then e = "[[" .. string.gsub(e, "Category:", ":Category:") .. "]]" end
+							cell:wikitext("\n* " .. e .. "")
+						end
 					end
+				else
+					local p_type = p.defaultArgPath(context, {k, '@type'}, '@value')
+					if (p_type == '@id') then v = "[[" .. string.gsub(v, "Category:", ":Category:") .. "]]" end
+					cell:wikitext( v )
 				end
-			else
-				local p_type = p.defaultArgPath(context, {k, '@type'}, '@value')
-				if (p_type == '@id') then v = "[[" .. string.gsub(v, "Category:", ":Category:") .. "]]" end
-				cell:wikitext( v )
 			end
 		end