From 225238c3e61c3fc2759ec8473535c5cc04fe33da Mon Sep 17 00:00:00 2001
From: Corey Williamson <euclidianAce@protonmail.com>
Date: Tue, 9 Jul 2024 14:22:35 -0500
Subject: [PATCH] Move decoration out of experimental directory

---
 build/cyan/cli.lua                           |  1 -
 build/cyan/commands/build.lua                |  3 +--
 build/cyan/commands/check-gen.lua            |  2 +-
 build/cyan/commands/initialize.lua           |  2 +-
 build/cyan/commands/warnings.lua             |  2 +-
 build/cyan/{experimental => }/decoration.lua |  0
 build/cyan/interaction.lua                   |  2 +-
 build/cyan/log.lua                           |  2 +-
 build/cyan/script.lua                        |  2 +-
 build/cyan/tlcommon.lua                      |  2 +-
 cyan-dev-1.rockspec                          |  4 ++--
 docs/index.html                              | 12 ++++++------
 scripts/gen_documentation.tl                 |  2 +-
 scripts/gen_rockspec.tl                      |  2 +-
 scripts/lint.tl                              |  2 +-
 scripts/todos.tl                             |  2 +-
 spec/api/decoration_spec.lua                 |  2 +-
 src/cyan/cli.tl                              |  1 -
 src/cyan/commands/build.tl                   |  3 +--
 src/cyan/commands/check-gen.tl               |  2 +-
 src/cyan/commands/initialize.tl              |  2 +-
 src/cyan/commands/warnings.tl                |  2 +-
 src/cyan/{experimental => }/decoration.tl    |  0
 src/cyan/interaction.tl                      |  2 +-
 src/cyan/log.tl                              |  2 +-
 src/cyan/script.tl                           |  2 +-
 src/cyan/tlcommon.tl                         |  2 +-
 27 files changed, 29 insertions(+), 33 deletions(-)
 rename build/cyan/{experimental => }/decoration.lua (100%)
 rename src/cyan/{experimental => }/decoration.tl (100%)

diff --git a/build/cyan/cli.lua b/build/cyan/cli.lua
index a0b9958..f65d0c3 100644
--- a/build/cyan/cli.lua
+++ b/build/cyan/cli.lua
@@ -5,7 +5,6 @@ local _tl_compat; if (tonumber((_VERSION or ''):match('[%d.]*$')) or 0) < 5.3 th
 local argparse = require("argparse")
 local tl = require("tl")
 
-
 local command = require("cyan.command")
 local common = require("cyan.tlcommon")
 local config = require("cyan.config")
diff --git a/build/cyan/commands/build.lua b/build/cyan/commands/build.lua
index 204a4e5..a69217d 100644
--- a/build/cyan/commands/build.lua
+++ b/build/cyan/commands/build.lua
@@ -6,8 +6,7 @@ local tl = require("tl")
 local command = require("cyan.command")
 local common = require("cyan.tlcommon")
 local config = require("cyan.config")
-
-local decoration = require("cyan.experimental.decoration")
+local decoration = require("cyan.decoration")
 local fs = require("cyan.fs")
 local graph = require("cyan.graph")
 local log = require("cyan.log")
diff --git a/build/cyan/commands/check-gen.lua b/build/cyan/commands/check-gen.lua
index 32748ab..cc827b8 100644
--- a/build/cyan/commands/check-gen.lua
+++ b/build/cyan/commands/check-gen.lua
@@ -8,7 +8,7 @@ local argparse = require("argparse")
 local config = require("cyan.config")
 local common = require("cyan.tlcommon")
 local command = require("cyan.command")
-local decoration = require("cyan.experimental.decoration")
+local decoration = require("cyan.decoration")
 local log = require("cyan.log")
 local fs = require("cyan.fs")
 local util = require("cyan.util")
diff --git a/build/cyan/commands/initialize.lua b/build/cyan/commands/initialize.lua
index 8b46955..12e999a 100644
--- a/build/cyan/commands/initialize.lua
+++ b/build/cyan/commands/initialize.lua
@@ -6,7 +6,7 @@ local argparse = require("argparse")
 
 local command = require("cyan.command")
 local config = require("cyan.config")
-local decoration = require("cyan.experimental.decoration")
+local decoration = require("cyan.decoration")
 local fs = require("cyan.fs")
 local log = require("cyan.log")
 local util = require("cyan.util")
diff --git a/build/cyan/commands/warnings.lua b/build/cyan/commands/warnings.lua
index 808aa3a..9730a47 100644
--- a/build/cyan/commands/warnings.lua
+++ b/build/cyan/commands/warnings.lua
@@ -5,7 +5,7 @@ local _tl_compat; if (tonumber((_VERSION or ''):match('[%d.]*$')) or 0) < 5.3 th
 
 local command = require("cyan.command")
 local config = require("cyan.config")
-local decoration = require("cyan.experimental.decoration")
+local decoration = require("cyan.decoration")
 local log = require("cyan.log")
 local tl = require("tl")
 local util = require("cyan.util")
diff --git a/build/cyan/experimental/decoration.lua b/build/cyan/decoration.lua
similarity index 100%
rename from build/cyan/experimental/decoration.lua
rename to build/cyan/decoration.lua
diff --git a/build/cyan/interaction.lua b/build/cyan/interaction.lua
index 0cbda86..fcb77dd 100644
--- a/build/cyan/interaction.lua
+++ b/build/cyan/interaction.lua
@@ -3,7 +3,7 @@ local _tl_compat; if (tonumber((_VERSION or ''):match('[%d.]*$')) or 0) < 5.3 th
 
 local log = require("cyan.log")
 local util = require("cyan.util")
-local decoration = require("cyan.experimental.decoration")
+local decoration = require("cyan.decoration")
 
 local ivalues = util.tab.ivalues
 
diff --git a/build/cyan/log.lua b/build/cyan/log.lua
index 0bb7d5a..04c4d37 100644
--- a/build/cyan/log.lua
+++ b/build/cyan/log.lua
@@ -38,7 +38,7 @@ local _tl_compat; if (tonumber((_VERSION or ''):match('[%d.]*$')) or 0) < 5.3 th
 
 local system = require("system")
 local util = require("cyan.util")
-local decoration = require("cyan.experimental.decoration")
+local decoration = require("cyan.decoration")
 local str = util.str
 
 local no_color_env = os.getenv("NO_COLOR") ~= nil
diff --git a/build/cyan/script.lua b/build/cyan/script.lua
index 8eaad0f..bb456f1 100644
--- a/build/cyan/script.lua
+++ b/build/cyan/script.lua
@@ -5,7 +5,7 @@ local _tl_compat; if (tonumber((_VERSION or ''):match('[%d.]*$')) or 0) < 5.3 th
 local tl = require("tl")
 
 local command = require("cyan.command")
-local decoration = require("cyan.experimental.decoration")
+local decoration = require("cyan.decoration")
 local fs = require("cyan.fs")
 local log = require("cyan.log")
 local sandbox = require("cyan.sandbox")
diff --git a/build/cyan/tlcommon.lua b/build/cyan/tlcommon.lua
index 1eaff27..899df61 100644
--- a/build/cyan/tlcommon.lua
+++ b/build/cyan/tlcommon.lua
@@ -4,7 +4,7 @@ local _tl_compat; if (tonumber((_VERSION or ''):match('[%d.]*$')) or 0) < 5.3 th
 
 
 local config = require("cyan.config")
-local decoration = require("cyan.experimental.decoration")
+local decoration = require("cyan.decoration")
 local fs = require("cyan.fs")
 local log = require("cyan.log")
 local util = require("cyan.util")
diff --git a/cyan-dev-1.rockspec b/cyan-dev-1.rockspec
index b1dacea..afa80b3 100644
--- a/cyan-dev-1.rockspec
+++ b/cyan-dev-1.rockspec
@@ -28,7 +28,7 @@ build = {
       ["cyan.commands.run"] = "build/cyan/commands/run.lua",
       ["cyan.commands.warnings"] = "build/cyan/commands/warnings.lua",
       ["cyan.config"] = "build/cyan/config.lua",
-      ["cyan.experimental.decoration"] = "build/cyan/experimental/decoration.lua",
+      ["cyan.decoration"] = "build/cyan/decoration.lua",
       ["cyan.fs.init"] = "build/cyan/fs/init.lua",
       ["cyan.fs.path"] = "build/cyan/fs/path.lua",
       ["cyan.graph"] = "build/cyan/graph.lua",
@@ -50,7 +50,7 @@ build = {
          ["cyan.commands.run"] = "src/cyan/commands/run.tl",
          ["cyan.commands.warnings"] = "src/cyan/commands/warnings.tl",
          ["cyan.config"] = "src/cyan/config.tl",
-         ["cyan.experimental.decoration"] = "src/cyan/experimental/decoration.tl",
+         ["cyan.decoration"] = "src/cyan/decoration.tl",
          ["cyan.fs.init"] = "src/cyan/fs/init.tl",
          ["cyan.fs.path"] = "src/cyan/fs/path.tl",
          ["cyan.graph"] = "src/cyan/graph.tl",
diff --git a/docs/index.html b/docs/index.html
index 14d9da3..6d2f97c 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -114,7 +114,7 @@ <h1>Table of Contents</h1>
 <br><a href=#config.is_config>config.is_config</a>
 <br><a href=#config.load>config.load</a>
 </p>
-<p><a class=module-name href=#cyan.experimental.decoration>cyan.experimental.decoration</a>
+<p><a class=module-name href=#cyan.decoration>cyan.decoration</a>
 <br><a href=#Color>Color</a>
 <br><a href=#Decorated:copy>Decorated:copy</a>
 <br><a href=#Decorated>Decorated</a>
@@ -168,7 +168,7 @@ <h1>Table of Contents</h1>
 <br><a href=#fs.scan_dir>fs.scan_dir</a>
 <br><a href=#fs.search_parent_dirs>fs.search_parent_dirs</a>
 </p>
-</td><td valign=top><p><a class=module-name href=#cyan.graph>cyan.graph</a>
+<p><a class=module-name href=#cyan.graph>cyan.graph</a>
 <br><a href=#Dag:find>Dag:find</a>
 <br><a href=#Dag:insert_file>Dag:insert_file</a>
 <br><a href=#Dag:mark_each>Dag:mark_each</a>
@@ -179,7 +179,7 @@ <h1>Table of Contents</h1>
 <br><a href=#graph.empty>graph.empty</a>
 <br><a href=#graph.scan_dir>graph.scan_dir</a>
 </p>
-<p><a class=module-name href=#cyan.interaction>cyan.interaction</a>
+</td><td valign=top><p><a class=module-name href=#cyan.interaction>cyan.interaction</a>
 <br><a href=#interaction.yes_no_prompt>interaction.yes_no_prompt</a>
 </p>
 <p><a class=module-name href=#cyan.log>cyan.log</a>
@@ -196,9 +196,9 @@ <h1>Table of Contents</h1>
 <br><a href=#log.set_prefix_padding>log.set_prefix_padding</a>
 <br><a href=#log.set_verbosity>log.set_verbosity</a>
 </p>
-</td><td valign=top><p><a class=module-name href=#cyan.meta>cyan.meta</a>
+<p><a class=module-name href=#cyan.meta>cyan.meta</a>
 <br></p>
-<p><a class=module-name href=#cyan.sandbox>cyan.sandbox</a>
+</td><td valign=top><p><a class=module-name href=#cyan.sandbox>cyan.sandbox</a>
 <br></p>
 <p><a class=module-name href=#cyan.script>cyan.script</a>
 <br><a href=#script.disable>script.disable</a>
@@ -316,7 +316,7 @@ <h3><a name=Config><code class=bulleted>type Config</code></a>
 </div><h3><a name=config.load><code class=bulleted>function config.load</code></a>
 </h3>
 <div class=description><pre class=signature><code><code class=keyword>function</code> config.load(): <code class=parameter-type>Config</code>, <code class=parameter-type>{string}</code>, <code class=parameter-type>{string}</code></code></pre><p><p>Try to load <code>tlconfig.lua</code> in the current directory</p></p>
-</div><h2><a name=cyan.experimental.decoration>cyan.experimental.decoration</a>
+</div><h2><a name=cyan.decoration>cyan.decoration</a>
 </h2>
 <p><p>A replacement for colorstring that doesn't specifically rely on ANSI terminal escapes</p></p>
 <h3><a name=Color><code class=bulleted>type Color</code></a>
diff --git a/scripts/gen_documentation.tl b/scripts/gen_documentation.tl
index 15d7c52..2f30e22 100644
--- a/scripts/gen_documentation.tl
+++ b/scripts/gen_documentation.tl
@@ -1,4 +1,4 @@
-local decoration <const> = require("cyan.experimental.decoration")
+local decoration <const> = require("cyan.decoration")
 local fs <const> = require("cyan.fs")
 local log <const> = require("cyan.log")
 local util <const> = require("cyan.util")
diff --git a/scripts/gen_rockspec.tl b/scripts/gen_rockspec.tl
index 76b2314..ce91291 100644
--- a/scripts/gen_rockspec.tl
+++ b/scripts/gen_rockspec.tl
@@ -36,7 +36,7 @@ build = {
 }
 ]]
 
-local decoration <const> = require("cyan.experimental.decoration")
+local decoration <const> = require("cyan.decoration")
 local fs <const> = require("cyan.fs")
 local log <const> = require("cyan.log")
 
diff --git a/scripts/lint.tl b/scripts/lint.tl
index 59d57b1..a85e48b 100644
--- a/scripts/lint.tl
+++ b/scripts/lint.tl
@@ -1,5 +1,5 @@
 local common <const> = require("cyan.tlcommon")
-local decoration <const> = require("cyan.experimental.decoration")
+local decoration <const> = require("cyan.decoration")
 local fs <const> = require("cyan.fs")
 local log <const> = require("cyan.log")
 local util <const> = require("cyan.util")
diff --git a/scripts/todos.tl b/scripts/todos.tl
index 6f8a45c..c185c82 100644
--- a/scripts/todos.tl
+++ b/scripts/todos.tl
@@ -1,7 +1,7 @@
 local argparse <const> = require("argparse")
 local log <const> = require("cyan.log")
 local fs <const> = require("cyan.fs")
-local decoration <const> = require("cyan.experimental.decoration")
+local decoration <const> = require("cyan.decoration")
 local util <const> = require("cyan.util")
 local pad_left <const>, ivalues <const> = util.str.pad_left, util.tab.ivalues
 
diff --git a/spec/api/decoration_spec.lua b/spec/api/decoration_spec.lua
index 8e70237..51026b9 100644
--- a/spec/api/decoration_spec.lua
+++ b/spec/api/decoration_spec.lua
@@ -1,4 +1,4 @@
-local decoration = require("cyan.experimental.decoration")
+local decoration = require("cyan.decoration")
 
 describe("decoration api", function()
    describe("ansi rendering", function()
diff --git a/src/cyan/cli.tl b/src/cyan/cli.tl
index 3f744e0..a40d6f4 100644
--- a/src/cyan/cli.tl
+++ b/src/cyan/cli.tl
@@ -5,7 +5,6 @@
 local argparse <const> = require("argparse")
 local tl <const> = require("tl")
 
--- local decoration <const> = require("cyan.experimental.decoration")
 local command <const> = require("cyan.command")
 local common <const> = require("cyan.tlcommon")
 local config <const> = require("cyan.config")
diff --git a/src/cyan/commands/build.tl b/src/cyan/commands/build.tl
index ffbf7d4..58315ff 100644
--- a/src/cyan/commands/build.tl
+++ b/src/cyan/commands/build.tl
@@ -6,8 +6,7 @@ local tl <const> = require("tl")
 local command <const> = require("cyan.command")
 local common <const> = require("cyan.tlcommon")
 local config <const> = require("cyan.config")
--- local cs <const> = require("cyan.colorstring")
-local decoration <const> = require("cyan.experimental.decoration")
+local decoration <const> = require("cyan.decoration")
 local fs <const> = require("cyan.fs")
 local graph <const> = require("cyan.graph")
 local log <const> = require("cyan.log")
diff --git a/src/cyan/commands/check-gen.tl b/src/cyan/commands/check-gen.tl
index 0757221..0347ce4 100644
--- a/src/cyan/commands/check-gen.tl
+++ b/src/cyan/commands/check-gen.tl
@@ -8,7 +8,7 @@ local argparse <const> = require("argparse")
 local config <const> = require("cyan.config")
 local common <const> = require("cyan.tlcommon")
 local command <const> = require("cyan.command")
-local decoration <const> = require("cyan.experimental.decoration")
+local decoration <const> = require("cyan.decoration")
 local log <const> = require("cyan.log")
 local fs <const> = require("cyan.fs")
 local util <const> = require("cyan.util")
diff --git a/src/cyan/commands/initialize.tl b/src/cyan/commands/initialize.tl
index 95da500..5389f4a 100644
--- a/src/cyan/commands/initialize.tl
+++ b/src/cyan/commands/initialize.tl
@@ -6,7 +6,7 @@ local argparse <const> = require("argparse")
 
 local command <const> = require("cyan.command")
 local config <const> = require("cyan.config")
-local decoration <const> = require("cyan.experimental.decoration")
+local decoration <const> = require("cyan.decoration")
 local fs <const> = require("cyan.fs")
 local log <const> = require("cyan.log")
 local util <const> = require("cyan.util")
diff --git a/src/cyan/commands/warnings.tl b/src/cyan/commands/warnings.tl
index a59279e..b22c634 100644
--- a/src/cyan/commands/warnings.tl
+++ b/src/cyan/commands/warnings.tl
@@ -5,7 +5,7 @@
 
 local command <const> = require("cyan.command")
 local config <const> = require("cyan.config")
-local decoration <const> = require("cyan.experimental.decoration")
+local decoration <const> = require("cyan.decoration")
 local log <const> = require("cyan.log")
 local tl <const> = require("tl")
 local util <const> = require("cyan.util")
diff --git a/src/cyan/experimental/decoration.tl b/src/cyan/decoration.tl
similarity index 100%
rename from src/cyan/experimental/decoration.tl
rename to src/cyan/decoration.tl
diff --git a/src/cyan/interaction.tl b/src/cyan/interaction.tl
index 5c61a6b..6df9724 100644
--- a/src/cyan/interaction.tl
+++ b/src/cyan/interaction.tl
@@ -3,7 +3,7 @@
 
 local log <const> = require("cyan.log")
 local util <const> = require("cyan.util")
-local decoration <const> = require("cyan.experimental.decoration")
+local decoration <const> = require("cyan.decoration")
 
 local ivalues <const> = util.tab.ivalues
 
diff --git a/src/cyan/log.tl b/src/cyan/log.tl
index 06b3306..c761866 100644
--- a/src/cyan/log.tl
+++ b/src/cyan/log.tl
@@ -38,7 +38,7 @@
 
 local system <const> = require("system")
 local util <const> = require("cyan.util")
-local decoration <const> = require("cyan.experimental.decoration")
+local decoration <const> = require("cyan.decoration")
 local str <const> = util.str
 
 local no_color_env <const> = os.getenv("NO_COLOR") ~= nil
diff --git a/src/cyan/script.tl b/src/cyan/script.tl
index ff52af1..80d0c5d 100644
--- a/src/cyan/script.tl
+++ b/src/cyan/script.tl
@@ -5,7 +5,7 @@
 local tl <const> = require("tl")
 
 local command <const> = require("cyan.command")
-local decoration <const> = require("cyan.experimental.decoration")
+local decoration <const> = require("cyan.decoration")
 local fs <const> = require("cyan.fs")
 local log <const> = require("cyan.log")
 local sandbox <const> = require("cyan.sandbox")
diff --git a/src/cyan/tlcommon.tl b/src/cyan/tlcommon.tl
index 5bd66dd..2cd42be 100644
--- a/src/cyan/tlcommon.tl
+++ b/src/cyan/tlcommon.tl
@@ -4,7 +4,7 @@
 --- wrappers around the tl api, since it isn't super stable
 
 local config <const> = require("cyan.config")
-local decoration <const> = require("cyan.experimental.decoration")
+local decoration <const> = require("cyan.decoration")
 local fs <const> = require("cyan.fs")
 local log <const> = require("cyan.log")
 local util <const> = require("cyan.util")