chore: refactor core functionality to swifttidy package (#108)

- Move core functionality to `swifttidy` package.
- Leave deprecated functionality in `swiftformat`.

Related to #97.

BUILD.bazel

@@ -75,9 +75,11 @@ filegroup(
         "MODULE.bazel",
         "WORKSPACE",
         "//swiftformat:all_files",
-        "//swiftformat/bzlmod:all_files",
         "//swiftformat/internal:all_files",
-        "//swiftformat/toolchains:all_files",
+        "//swifttidy:all_files",
+        "//swifttidy/bzlmod:all_files",
+        "//swifttidy/internal:all_files",
+        "//swifttidy/toolchains:all_files",
     ],
     visibility = ["//:__subpackages__"],
 )

MODULE.bazel

@@ -13,7 +13,7 @@ bazel_dep(
 )
 
 swift_tidy_tools = use_extension(
-    "//swiftformat:extensions.bzl",
+    "//swifttidy:extensions.bzl",
     "swift_tidy_tools",
 )
 use_repo(

examples/legacy/WORKSPACE

@@ -6,11 +6,11 @@ local_repository(
 )
 
 load(
-    "@rules_swift_tidy//swiftformat:deps.bzl",
-    "swiftformat_rules_dependencies",
+    "@rules_swift_tidy//swifttidy:deps.bzl",
+    "swifttidy_rules_dependencies",
 )
 
-swiftformat_rules_dependencies()
+swifttidy_rules_dependencies()
 
 load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")
 

examples/simple/BUILD.bazel

@@ -4,7 +4,7 @@ load(
     "updatesrc_update_all",
 )
 load(
-    "@rules_swift_tidy//swiftformat:defs.bzl",
+    "@rules_swift_tidy//swifttidy:defs.bzl",
     "swiftformat_pkg",
 )
 

examples/simple/Foo/BUILD.bazel

@@ -1,5 +1,5 @@
 load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
-load("@rules_swift_tidy//swiftformat:defs.bzl", "swiftformat_pkg")
+load("@rules_swift_tidy//swifttidy:defs.bzl", "swiftformat_pkg")
 
 swift_library(
     name = "Foo",

swiftformat/BUILD.bazel

@@ -1,55 +1,28 @@
 load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
-load("@cgrindel_bazel_starlib//bzlformat:defs.bzl", "bzlformat_pkg")
-
-package(default_visibility = ["//visibility:public"])
-
-bzlformat_pkg(
-    name = "bzlformat",
-    format_visibility = ["//visibility:private"],
-    update_visibility = ["//:__subpackages__"],
-)
 
 bzl_library(
     name = "defs",
     srcs = ["defs.bzl"],
-    deps = [
-        "//swiftformat/internal:src_utils",
-        "//swiftformat/internal:swiftformat_binary",
-        "//swiftformat/internal:swiftformat_format",
-        "//swiftformat/internal:swiftformat_library",
-        "//swiftformat/internal:swiftformat_pkg",
-        "//swiftformat/internal:swiftformat_test",
-        "//swiftformat/toolchains:toolchain",
-    ],
+    visibility = ["//visibility:public"],
+    deps = ["//swifttidy:defs"],
+)
+
+bzl_library(
+    name = "deps",
+    srcs = ["deps.bzl"],
+    visibility = ["//visibility:public"],
+    deps = ["//swifttidy:deps"],
 )
 
 bzl_library(
     name = "swiftformat",
     srcs = ["swiftformat.bzl"],
-    deps = [
-        ":defs",
-    ],
+    visibility = ["//visibility:public"],
+    deps = ["//swifttidy:defs"],
 )
 
 filegroup(
     name = "all_files",
     srcs = glob(["*"]),
     visibility = ["//:__subpackages__"],
 )
-
-toolchain_type(name = "toolchain")
-
-bzl_library(
-    name = "deps",
-    srcs = ["deps.bzl"],
-    deps = [
-        "@bazel_tools//tools/build_defs/repo:http.bzl",
-        "@bazel_tools//tools/build_defs/repo:utils.bzl",
-    ],
-)
-
-bzl_library(
-    name = "extensions",
-    srcs = ["extensions.bzl"],
-    deps = ["//swiftformat/bzlmod:swift_tidy_tools"],
-)

swiftformat/defs.bzl

@@ -1,31 +1,25 @@
-"""Public API for rules_swiftformat."""
+"""Deprecated. Public API for rules_swiftformat."""
+
+# NOTE: This file is deprecated and will be removed in a future release. Please use
+# //swifttidy:defs.bzl intead.
 
-load(
-    "//swiftformat/internal:src_utils.bzl",
-    _src_utils = "src_utils",
-)
 load(
     "//swiftformat/internal:swiftformat_binary.bzl",
     _swiftformat_binary = "swiftformat_binary",
 )
-load(
-    "//swiftformat/internal:swiftformat_format.bzl",
-    _swiftformat_format = "swiftformat_format",
-)
 load(
     "//swiftformat/internal:swiftformat_library.bzl",
     _swiftformat_library = "swiftformat_library",
 )
-load(
-    "//swiftformat/internal:swiftformat_pkg.bzl",
-    _swiftformat_pkg = "swiftformat_pkg",
-)
 load(
     "//swiftformat/internal:swiftformat_test.bzl",
     _swiftformat_test = "swiftformat_test",
 )
 load(
-    "//swiftformat/toolchains:toolchain.bzl",
+    "//swifttidy:defs.bzl",
+    _src_utils = "src_utils",
+    _swiftformat_format = "swiftformat_format",
+    _swiftformat_pkg = "swiftformat_pkg",
     _swiftformat_register_prebuilt_toolchains = "swiftformat_register_prebuilt_toolchains",
 )
 

swiftformat/deps.bzl

@@ -1,32 +1,8 @@
-"""Dependencies for rules_swiftformat."""
+"""Deprecated. Legacy external dependencies for rules_swiftformat."""
 
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
-load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
+# NOTE: This file is deprecated and will be removed in a future release. Please use
+# //swifttidy:deps.bzl intead.
 
-def swiftformat_rules_dependencies():
-    """Loads the dependencies for `rules_swiftformat`."""
-    maybe(
-        http_archive,
-        name = "bazel_skylib",
-        urls = [
-            "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.4.2/bazel-skylib-1.4.2.tar.gz",
-            "https://github.com/bazelbuild/bazel-skylib/releases/download/1.4.2/bazel-skylib-1.4.2.tar.gz",
-        ],
-        sha256 = "66ffd9315665bfaafc96b52278f57c7e2dd09f5ede279ea6d39b2be471e7e3aa",
-    )
+load("//swifttidy:deps.bzl", "swifttidy_rules_dependencies")
 
-    maybe(
-        http_archive,
-        name = "cgrindel_bazel_starlib",
-        sha256 = "ee0033d029b5eaddc21836b2944cf37c95eb5f214eb39834136a316dbc252a73",
-        urls = [
-            "https://github.com/cgrindel/bazel-starlib/releases/download/v0.16.0/bazel-starlib.v0.16.0.tar.gz",
-        ],
-    )
-
-    maybe(
-        http_archive,
-        name = "build_bazel_rules_swift",
-        sha256 = "7929b4fd6d9f7c44ed5734a15004bfc2046146ba5ea269f0568d9efe2f405ef3",
-        url = "https://github.com/bazelbuild/rules_swift/releases/download/1.9.0/rules_swift.1.9.0.tar.gz",
-    )
+swiftformat_rules_dependencies = swifttidy_rules_dependencies

swiftformat/internal/BUILD.bazel

@@ -1,48 +1,21 @@
 load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
-load("@cgrindel_bazel_starlib//bzlformat:defs.bzl", "bzlformat_pkg")
-
-package(default_visibility = ["//swiftformat:__subpackages__"])
-
-bzlformat_pkg(
-    name = "bzlformat",
-    format_visibility = ["//visibility:private"],
-    update_visibility = ["//:__subpackages__"],
-)
 
 bzl_library(
-    name = "swiftformat_format",
-    srcs = ["swiftformat_format.bzl"],
-    deps = [
-        "@bazel_skylib//lib:paths",
-        "@cgrindel_bazel_starlib//updatesrc:defs",
-    ],
-)
-
-bzl_library(
-    name = "swiftformat_pkg",
-    srcs = ["swiftformat_pkg.bzl"],
+    name = "swiftformat_binary",
+    srcs = ["swiftformat_binary.bzl"],
+    visibility = ["//swiftformat:__subpackages__"],
     deps = [
-        ":src_utils",
-        ":swiftformat_format",
-        "@bazel_skylib//rules:diff_test",
-        "@cgrindel_bazel_starlib//updatesrc:defs",
+        "//swifttidy:defs",
+        "@build_bazel_rules_swift//swift",
     ],
 )
 
 bzl_library(
     name = "swiftformat_library",
     srcs = ["swiftformat_library.bzl"],
+    visibility = ["//swiftformat:__subpackages__"],
     deps = [
-        ":swiftformat_pkg",
-        "@build_bazel_rules_swift//swift",
-    ],
-)
-
-bzl_library(
-    name = "swiftformat_binary",
-    srcs = ["swiftformat_binary.bzl"],
-    deps = [
-        ":swiftformat_pkg",
+        "//swifttidy:defs",
         "@build_bazel_rules_swift//swift",
     ],
 )
@@ -51,7 +24,7 @@ bzl_library(
     name = "swiftformat_test",
     srcs = ["swiftformat_test.bzl"],  # keep
     deps = [
-        ":swiftformat_pkg",
+        "//swifttidy:defs",
         "@build_bazel_rules_swift//swift",
     ],
 )
@@ -61,8 +34,3 @@ filegroup(
     srcs = glob(["*"]),
     visibility = ["//:__subpackages__"],
 )
-
-bzl_library(
-    name = "src_utils",
-    srcs = ["src_utils.bzl"],
-)

swiftformat/internal/swiftformat_binary.bzl

@@ -1,7 +1,7 @@
 """Definition for swiftformat_binary macro."""
 
 load("@build_bazel_rules_swift//swift:swift.bzl", "swift_binary")
-load(":swiftformat_pkg.bzl", "swiftformat_pkg")
+load("//swifttidy:defs.bzl", "swiftformat_pkg")
 
 def swiftformat_binary(
         name,

swiftformat/internal/swiftformat_library.bzl

@@ -1,7 +1,7 @@
 """Definition for swiftformat_library macro."""
 
 load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
-load(":swiftformat_pkg.bzl", "swiftformat_pkg")
+load("//swifttidy:defs.bzl", "swiftformat_pkg")
 
 def swiftformat_library(
         name,

swiftformat/internal/swiftformat_test.bzl

@@ -1,7 +1,7 @@
 """Definition for swiftformat_test macro."""
 
 load("@build_bazel_rules_swift//swift:swift.bzl", "swift_test")
-load(":swiftformat_pkg.bzl", "swiftformat_pkg")
+load("//swifttidy:defs.bzl", "swiftformat_pkg")
 
 def swiftformat_test(
         name,

swiftformat/swiftformat.bzl

@@ -1,10 +1,10 @@
 """Deprecated. Public API for rules_swiftformat."""
 
 # NOTE: This file is deprecated and will be removed in a future release. Please use
-# //swiftformat:defs.bzl intead.
+# //swifttidy:defs.bzl intead.
 
 load(
-    "//swiftformat:defs.bzl",
+    "//swifttidy:defs.bzl",
     _src_utils = "src_utils",
     _swiftformat_binary = "swiftformat_binary",
     _swiftformat_format = "swiftformat_format",

swifttidy/BUILD.bazel

@@ -0,0 +1,51 @@
+load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
+load("@cgrindel_bazel_starlib//bzlformat:defs.bzl", "bzlformat_pkg")
+
+package(default_visibility = ["//visibility:public"])
+
+bzlformat_pkg(
+    name = "bzlformat",
+    format_visibility = ["//visibility:private"],
+    update_visibility = ["//:__subpackages__"],
+)
+
+bzl_library(
+    name = "defs",
+    srcs = ["defs.bzl"],
+    deps = [
+        "//swifttidy/internal:src_utils",
+        "//swifttidy/internal:swiftformat_format",
+        "//swifttidy/internal:swiftformat_pkg",
+        "//swifttidy/toolchains:toolchain",
+    ],
+)
+
+bzl_library(
+    name = "swiftformat",
+    deps = [
+        ":defs",
+    ],
+)
+
+filegroup(
+    name = "all_files",
+    srcs = glob(["*"]),
+    visibility = ["//:__subpackages__"],
+)
+
+toolchain_type(name = "toolchain")
+
+bzl_library(
+    name = "deps",
+    srcs = ["deps.bzl"],
+    deps = [
+        "@bazel_tools//tools/build_defs/repo:http.bzl",
+        "@bazel_tools//tools/build_defs/repo:utils.bzl",
+    ],
+)
+
+bzl_library(
+    name = "extensions",
+    srcs = ["extensions.bzl"],
+    deps = ["//swifttidy/bzlmod:swift_tidy_tools"],
+)

swiftformat/bzlmod/BUILD.bazel → swifttidy/bzlmod/BUILD.bazel

@@ -14,7 +14,7 @@ bzl_library(
     srcs = ["swift_tidy_tools.bzl"],
     visibility = ["//visibility:public"],
     deps = [
-        "//swiftformat/toolchains:prebuilt_assets",
-        "//swiftformat/toolchains:toolchain",
+        "//swifttidy/toolchains:prebuilt_assets",
+        "//swifttidy/toolchains:toolchain",
     ],
 )

swiftformat/bzlmod/swift_tidy_tools.bzl → swifttidy/bzlmod/swift_tidy_tools.bzl

@@ -1,8 +1,8 @@
 """Extension for downloading the tools used by `rules_swift_tidy`."""
 
-load("//swiftformat/toolchains:prebuilt_assets.bzl", "prebuilt_assets")
+load("//swifttidy/toolchains:prebuilt_assets.bzl", "prebuilt_assets")
 load(
-    "//swiftformat/toolchains:toolchain.bzl",
+    "//swifttidy/toolchains:toolchain.bzl",
     "swiftformat_register_prebuilt_toolchains",
 )