The scripts folder can have subfolders.

Author: ReFreezed

src/app.lua2p

@@ -927,9 +927,11 @@ local function setup()
 			v = scriptFunctions[k]
 			if v then  return v  end
 
-			local path = F("%s/%s.lua", DIR_SCRIPTS, k)
+			local basePath = F("%s/%s", DIR_SCRIPTS, k)
+			local path     = basePath..".lua"
 
 			if isFile(path) then
+				-- :ScriptFunctionInit
 				local main_chunk, err = loadfile(path)
 				if not main_chunk then
 					error(err, 2)
@@ -943,6 +945,11 @@ local function setup()
 
 				scriptFunctions[k] = v
 				return v
+
+			elseif isDirectory(basePath) then
+				v                  = newScriptFolderReader(basePath)
+				scriptFunctions[k] = v
+				return v
 			end
 
 			errorf(2, "Tried to get non-existent global or script '%s'.", tostring(k))

src/functions.lua2p

@@ -43,6 +43,7 @@
 	markdownToHtml
 	newDataFolderReader, isDataFolderReader, preloadData
 	newPage
+	newScriptFolderReader, isScriptFolderReader, preloadScripts
 	newStringBuilder
 	pack
 	pairsSorted
@@ -1562,6 +1563,76 @@ end
 
 
 
+-- scriptFolderReader = newScriptFolderReader( directory )
+function _G.newScriptFolderReader(dir)
+	local scriptFolderReader = {}
+
+	setmetatable(scriptFolderReader, {
+		__index = function(scriptFolderReader, k)
+			local scriptObj
+
+			if type(k) ~= "string" then
+				return nil
+
+			elseif k == "." or k == ".." then
+				errorf(2, "Bad script key '%s'.", k)
+
+			elseif isFile(F("%s/%s.lua", dir, k)) then
+				local path = F("%s/%s.lua", dir, k)
+
+				-- :ScriptFunctionInit
+				local main_chunk, err = loadfile(path)
+				if not main_chunk then
+					error(err, 2)
+				end
+
+				setfenv(main_chunk, scriptEnvironment)
+				scriptObj = main_chunk()
+				if type(scriptObj) ~= "function" then
+					errorNoPos("%s did not return a function.", path)
+				end
+
+			elseif isDirectory(F("%s/%s", dir, k)) then
+				scriptObj = newScriptFolderReader(F("%s/%s", dir, k))
+
+			else
+				errorf(2, "Bad script path '%s/%s'.", dir, k)
+			end
+
+			assert(scriptObj ~= nil)
+			rawset(scriptFolderReader, k, scriptObj)
+			return scriptObj
+		end,
+	})
+
+	scriptReaderPaths[scriptFolderReader] = dir
+	return scriptFolderReader
+end
+
+function _G.isScriptFolderReader(t)
+	return scriptReaderPaths[t] ~= nil
+end
+
+function _G.preloadScripts(scriptFolderReader)
+	if scriptIsPreloaded[scriptFolderReader] then  return scriptFolderReader  end
+
+	for filename in lfs.dir(scriptReaderPaths[scriptFolderReader]) do
+		if filename:find"%.lua$" then
+			local path     = scriptReaderPaths[scriptFolderReader] .. "/" .. filename
+			local basename = getBasename(filename)
+
+			if not rawget(scriptFolderReader, basename) and isFile(path) then
+				local _ = scriptFolderReader[basename]
+			end
+		end
+	end
+
+	scriptIsPreloaded[scriptFolderReader] = true
+	return scriptFolderReader
+end
+
+
+
 function _G.getProtectionWrapper(obj, objName)
 	!ARGS "obj:table objName:string"
 

src/globals.lua2p

@@ -69,6 +69,8 @@ _G.scriptEnvironmentGlobals = nil
 
 _G.dataReaderPaths     = setmetatable({--[[ [dataFolderReader1]=path1, ... ]]}, {__mode="k"})
 _G.dataIsPreloaded     = setmetatable({--[[ [dataFolderReader1]=true,  ... ]]}, {__mode="k"})
+_G.scriptReaderPaths   = setmetatable({--[[ [scriptFolderReader1]=path1, ... ]]}, {__mode="k"})
+_G.scriptIsPreloaded   = setmetatable({--[[ [scriptFolderReader1]=true,  ... ]]}, {__mode="k"})
 _G.protectionWrappers  = setmetatable({--[[ [object1]=wrapper1, ... ]]}, {__mode="kv"})
 _G.protectionedObjects = setmetatable({--[[ [wrapper1]=object1, ... ]]}, {__mode="kv"})
 
@@ -128,8 +130,8 @@ function _G.resetSiteVariables()
 	_G.redirectionLayout          = ""
 
 	-- Other values.
-	_G.layoutTemplates            = {--[[ [path1]=template1,           ... ]]}
-	_G.scriptFunctions            = {--[[ [scriptName1]=function(...), ... ]]}
+	_G.layoutTemplates            = {--[[ [path1]=template1,                         ... ]]}
+	_G.scriptFunctions            = {--[[ [scriptName1]=function|scriptFolderReader, ... ]]} -- @Cleanup: Replace this table with a script folder reader.
 
 	_G.pages                      = {--[[ page1, ... ]]}
 	_G.pagesGenerating            = {--[[ [pathRelOut1]=true, ... ]]}

testsite/config.lua

@@ -70,6 +70,6 @@ end
 
 
 
-runTests()
+tests.runTests()
 
 return config

testsite/scripts/runTests.lua testsite/scripts/tests/runTests.luatestsite/scripts/runTests.lua renamed to testsite/scripts/tests/runTests.lua

@@ -28,8 +28,8 @@ return function()
 
 	--[[ XML module tests.
 	-- require"pl.xml"
-	timerStart("our") ; xmlTests(xml)             ; timerEnd()
-	-- timerStart("pl")  ; xmlTests(require"pl.xml") ; timerEnd()
+	timerStart("our") ; tests.xmlTests(xml)             ; timerEnd()
+	-- timerStart("pl")  ; tests.xmlTests(require"pl.xml") ; timerEnd()
 	--]]
 
 	--[==[ XML parsing.
@@ -73,8 +73,11 @@ return function()
 				<head>
 					<SCRIPT>function bitAnd(a, b) { return a && b; }</SCRIPT>
 				</head>
+
 				<BODY id="foo & bar">
-					<h1 super duper=yes>Hello, world &amp; all bananas!</h1>
+					<h1>Hello, world &&amp; all bananas!</h1>
+					<input type=text disabled>
+
 					<svg width="391" height="391" viewBox="-70.5 -70.5 391 391" foo="">
 						<rect fill="#fff" stroke="#000" x="-70" y="-70" width="390" height="390"/>
 						<g opacity="0.8">
@@ -84,6 +87,7 @@ return function()
 							<line x1="50" y1="50" x2="200" y2="200" stroke="blue" stroke-width="4" />
 						</g>
 					</svg>
+
 					<math>
 						<mi>&pi;</mi>
 						<mo>&InvisibleTimes;</mo>