refactor(utilities): Move utility libraries to directory for easier p…

…artial overrides
sile-typesetter · Dec 12, 2023 · 06d9ea4 · 06d9ea4
1 parent fc7e7fb
commit 06d9ea4
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/core/utilities-ast.lua → core/utilities/ast.lua b/core/utilities-ast.lua → core/utilities/ast.lua
diff --git a/core/utilities.lua → core/utilities/init.lua b/core/utilities.lua → core/utilities/init.lua
@@ -556,28 +556,33 @@ utilities.breadcrumbs = function ()
   return breadcrumbs
 end
 
-utilities.formatNumber = require("core.utilities-numbers")
+utilities.formatNumber = require("core.utilities.numbers")
 
-utilities.collatedSort = require("core.utilities-sorting")
+utilities.collatedSort = require("core.utilities.sorting")
+
+utilities.ast = require("core.utilities.ast")
 
-utilities.ast = require("core.utilities-ast")
 utilities.subContent = function (content)
   SU.deprecated("SU.subContent", "SU.ast.subContent", "0.15.0", "0.17.0", [[
     Note that the new implementation no longer introduces an id="stuff" key.]])
   return utilities.ast.subContent(content)
 end
+
 utilities.hasContent = function(content)
   SU.deprecated("SU.hasContent", "SU.ast.hasContent", "0.15.0", "0.17.0")
   return SU.ast.hasContent(content)
 end
+
 utilities.contentToString = function (content)
   SU.deprecated("SU.contentToString", "SU.ast.contentToString", "0.15.0", "0.17.0")
   return SU.ast.contentToString(content)
 end
+
 utilities.walkContent = function (content, action)
   SU.deprecated("SU.walkContent", "SU.ast.walkContent", "0.15.0", "0.17.0")
   SU.ast.walkContent(content, action)
 end
+
 utilities.stripContentPos = function (content)
   SU.deprecated("SU.stripContentPos", "SU.ast.stripContentPos", "0.15.0", "0.17.0")
   return SU.ast.stripContentPos(content)

diff --git a/core/utilities-numbers.lua → core/utilities/numbers.lua b/core/utilities-numbers.lua → core/utilities/numbers.lua
diff --git a/core/utilities-sorting.lua → core/utilities/sorting.lua b/core/utilities-sorting.lua → core/utilities/sorting.lua