7141747182

Committed 08 Dec 2023 01:08PM UTC coverage: 72.188% (-2.4%) from 74.636%

Build # 7141747182

Build Type

push

github

Committed by

web-flow

Commit Message

Merge pull request #1924 from alerque/lint-fixes

Run Details

4 of 10 new or added lines in 8 files covered. (40.0%)

376 existing lines in 13 files now uncovered.

11384 of 15770 relevant lines covered (72.19%)

6898.07 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

82.69

/packages/base.lua

local package = pl.class()
package.type = "package"
package._name = "base"

package._initialized = false
package.class = nil

-- For shimming packages that used to have legacy exports
package.exports = {}

local function script_path ()
  local src = debug.getinfo(3, "S").source:sub(2)
  local base = src:match("(.*[/\\])")
  return base
end

function package:_init (_)
  self.class = SILE.scratch.half_initialized_class or SILE.documentState.documentClass
  if not self.class then
    SU.error("Attempted to initialize package before class, should have been queued in the preamble", true)
  end
  self.basedir = script_path()
  self:declareSettings()
  self:registerRawHandlers()
  self:registerCommands()
end

function package:_post_init ()
  self._initialized = true
end

function package.declareSettings (_) end

function package.registerRawHandlers (_) end

function package:loadPackage (packname)
  return self.class:loadPackage(packname)
end

function package.registerCommands (_) end

-- This gives us a hook to match commands with the packages that registered
-- them as opposed to core commands or class-provided commands
function package:registerCommand (name, func, help, pack)
  self.class:registerCommand(name, func, help, pack)
end
function package:registerRawHandler (format, callback)
  self.class:registerRawHandler(format, callback)
end

-- Using this rather than doing the work directly will give us a way to
-- un-export them if we ever need to unload modules and revert functions
function package:export (name, func)
  self.class[name] = func
end

-- Shims for two possible kinds of legacy exports: blind direct stuffing into
-- the class but not expecting to be called as a method AND the exports table
-- to package modules...

local _deprecate_class_funcs = [[
  Please explicitly use functions provided by packages by referencing
  them in the document class's list of loaded packages rather than the
  legacy solution that added non-method functions to the class.]]

local _deprecate_exports_table = [[
  Please explicitly use functions provided by packages by referencing
  them in the document class's list of loaded packages rather than the
  legacy solution of calling them from an exports table.]]

function package:deprecatedExport (name, func, noclass, notable)

  if not noclass then
    self.class[name] = function (...)
      -- http://lua-users.org/wiki/VarargTheSecondClassCitizen
      local inputs = {...}
      -- local inputs = table.unpack({...}, 1, select("#", ...))
      if type(inputs[1]) ~= "table" or inputs[1].type ~= "class" then
        table.insert(inputs, 1, self.class)
      end
      SU.deprecated(("class.%s"):format(name),
                    ("class.packages.%s:%s"):format(self._name, name),
                    "0.14.0", "0.16.0", _deprecate_class_funcs)
      return func(pl.utils.unpack(inputs, 1, select("#", ...) + 1))
    end
  end

  if not notable then
    self.exports[name] = function (...)
      local inputs = {...}
      if type(inputs[1]) ~= "table" or inputs[1].type ~= "package" then
        table.insert(inputs, 1, self)
      end
      SU.deprecated(("require('packages.%s').exports.%s"):format(self._name, name),
                    ("class.packages.%s:%s"):format(self._name, name),
                    "0.14.0", "0.16.0", _deprecate_exports_table)
      return func(pl.utils.unpack(inputs, 1, select("#", ...) + 1))
    end
  end

end

return package

1	local package = pl.class()	131✔
2	package.type = "package"	131✔
3	package._name = "base"	131✔
4
5	package._initialized = false	131✔
6	package.class = nil	131✔
7
8	-- For shimming packages that used to have legacy exports
9	package.exports = {}	131✔
10
11	local function script_path ()
12	local src = debug.getinfo(3, "S").source:sub(2)	886✔
13	local base = src:match("(.*[/\\])")	886✔
14	return base	886✔
15	end
16
17	function package:_init (_)	131✔
18	self.class = SILE.scratch.half_initialized_class or SILE.documentState.documentClass	886✔
19	if not self.class then	886✔
20	SU.error("Attempted to initialize package before class, should have been queued in the preamble", true)	×
21	end
22	self.basedir = script_path()	1,772✔
23	self:declareSettings()	886✔
24	self:registerRawHandlers()	886✔
25	self:registerCommands()	886✔
26	end
27
28	function package:_post_init ()	131✔
29	self._initialized = true	887✔
30	end
31
32	function package.declareSettings (_) end	959✔
33
34	function package.registerRawHandlers (_) end	1,014✔
35
36	function package:loadPackage (packname)	131✔
37	return self.class:loadPackage(packname)	348✔
38	end
39
40	function package.registerCommands (_) end	168✔
41
42	-- This gives us a hook to match commands with the packages that registered
43	-- them as opposed to core commands or class-provided commands
44	function package:registerCommand (name, func, help, pack)	131✔
45	self.class:registerCommand(name, func, help, pack)	4,022✔
46	end
47	function package:registerRawHandler (format, callback)	131✔
48	self.class:registerRawHandler(format, callback)	3✔
49	end
50
51	-- Using this rather than doing the work directly will give us a way to
52	-- un-export them if we ever need to unload modules and revert functions
53	function package:export (name, func)	131✔
54	self.class[name] = func	938✔
55	end
56
57	-- Shims for two possible kinds of legacy exports: blind direct stuffing into
58	-- the class but not expecting to be called as a method AND the exports table
59	-- to package modules...
60
61	local _deprecate_class_funcs = [[
62	Please explicitly use functions provided by packages by referencing
63	them in the document class's list of loaded packages rather than the
64	legacy solution that added non-method functions to the class.]]	131✔
65
66	local _deprecate_exports_table = [[
67	Please explicitly use functions provided by packages by referencing
68	them in the document class's list of loaded packages rather than the
69	legacy solution of calling them from an exports table.]]	131✔
70
71	function package:deprecatedExport (name, func, noclass, notable)	131✔
72
73	if not noclass then	910✔
74	self.class[name] = function (...)	910✔
75	-- http://lua-users.org/wiki/VarargTheSecondClassCitizen
76	local inputs = {...}	12✔
77	-- local inputs = table.unpack({...}, 1, select("#", ...))
78	if type(inputs[1]) ~= "table" or inputs[1].type ~= "class" then	12✔
79	table.insert(inputs, 1, self.class)	×
80	end
81	SU.deprecated(("class.%s"):format(name),	24✔
82	("class.packages.%s:%s"):format(self._name, name),	12✔
83	"0.14.0", "0.16.0", _deprecate_class_funcs)	12✔
84	return func(pl.utils.unpack(inputs, 1, select("#", ...) + 1))	24✔
85	end
86	end
87
88	if not notable then	910✔
89	self.exports[name] = function (...)	910✔
90	local inputs = {...}	×
91	if type(inputs[1]) ~= "table" or inputs[1].type ~= "package" then	×
92	table.insert(inputs, 1, self)	×
93	end
94	SU.deprecated(("require('packages.%s').exports.%s"):format(self._name, name),	×
95	("class.packages.%s:%s"):format(self._name, name),	×
96	"0.14.0", "0.16.0", _deprecate_exports_table)	×
NEW 97	return func(pl.utils.unpack(inputs, 1, select("#", ...) + 1))	×
98	end
99	end
100
101	end
102
103	return package	131✔

sile-typesetter / sile / 7141747182

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous