cfengine 0.16.3__tar.gz → 0.16.5__tar.gz

{cfengine-0.16.3 → cfengine-0.16.5}/.github/workflows/lint-policy-in-other-repos.yml

@@ -44,12 +44,15 @@ jobs:
           python -m pip install --upgrade pip
           python -m pip install uv
           make install
-      - name: Run cfengine lint
+      - name: Check other repos with cfengine format and cfengine lint
         working-directory: cfengine-cli
         run: |
-          uv run cfengine lint --strict no ../masterfiles
-          uv run cfengine lint --strict no ../modules
-          uv run cfengine lint --strict no ../documentation
+          # Linting should work with no errors on all the other repos:
+          uv run cfengine lint --strict no ../masterfiles ../documentation ../modules
+          # Formatting should work with no errors on all the other repos:
+          uv run cfengine format ../masterfiles ../documentation ../modules
+          # Linting should still work after formatting:
+          uv run cfengine lint --strict no ../masterfiles ../documentation ../modules
           # TODO: Add core when ready
           # TODO: Do all of them together, with strict, when ready;
           #       uv run cfengine lint ../core ../masterfiles ../documentation ../modules

{cfengine-0.16.3 → cfengine-0.16.5}/.github/workflows/update-syntax-description.yml

@@ -35,7 +35,7 @@ jobs:
       - name: Install cfengine
         run: |
           cf-remote --version master download --edition community ubuntu24 amd64 hub
-          sudo dpkg -i ~/.cfengine/cf-remote/packages/cfengine-community*.deb
+          sudo dpkg -i ~/.cache/cfengine/cf-remote/packages/cfengine-community*.deb
       - name: Extract new syntax-description
         run: |
           (

{cfengine-0.16.3 → cfengine-0.16.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cfengine
-Version: 0.16.3
+Version: 0.16.5
 Summary: Human-oriented CLI for interacting with CFEngine policy language, projects, and other CFEngine tools
 License:                     GNU GENERAL PUBLIC LICENSE
                                Version 3, 29 June 2007
@@ -803,12 +803,28 @@ groups:
       spawn: ubuntu
 ```
 
-up will spawn the necessary VMs and install cfengine using cf-remote
+`up` will spawn the necessary VMs and install cfengine using cf-remote.
 
-```
+```bash
 cfengine up config.yaml
 ```
 
+To validate the config, one can run:
+
+```bash
+cfengine up --validate config.yaml
+```
+
+Every time `up` is run, it will do all the necessary (spawn, destroy, install, uninstall) to reconciliate the current state with the input configuration.
+After a successful run, the applied configuration is saved.
+On subsequent runs, CFEngine compares the previously applied configuration with the current configuration and applies only the necessary changes.
+
+To ignore the previously saved configuration and apply the current configuration as-is, run:
+
+```bash
+cfengine up --reset config.yaml
+```
+
 ## Supported platforms and versions
 
 This tool will only support a limited number of platforms, it is not intended to run everywhere CFEngine runs.

{cfengine-0.16.3 → cfengine-0.16.5}/README.md

@@ -99,12 +99,28 @@ groups:
       spawn: ubuntu
 ```
 
-up will spawn the necessary VMs and install cfengine using cf-remote
+`up` will spawn the necessary VMs and install cfengine using cf-remote.
 
-```
+```bash
 cfengine up config.yaml
 ```
 
+To validate the config, one can run:
+
+```bash
+cfengine up --validate config.yaml
+```
+
+Every time `up` is run, it will do all the necessary (spawn, destroy, install, uninstall) to reconciliate the current state with the input configuration.
+After a successful run, the applied configuration is saved.
+On subsequent runs, CFEngine compares the previously applied configuration with the current configuration and applies only the necessary changes.
+
+To ignore the previously saved configuration and apply the current configuration as-is, run:
+
+```bash
+cfengine up --reset config.yaml
+```
+
 ## Supported platforms and versions
 
 This tool will only support a limited number of platforms, it is not intended to run everywhere CFEngine runs.

{cfengine-0.16.3 → cfengine-0.16.5}/src/cfengine.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cfengine
-Version: 0.16.3
+Version: 0.16.5
 Summary: Human-oriented CLI for interacting with CFEngine policy language, projects, and other CFEngine tools
 License:                     GNU GENERAL PUBLIC LICENSE
                                Version 3, 29 June 2007
@@ -803,12 +803,28 @@ groups:
       spawn: ubuntu
 ```
 
-up will spawn the necessary VMs and install cfengine using cf-remote
+`up` will spawn the necessary VMs and install cfengine using cf-remote.
 
-```
+```bash
 cfengine up config.yaml
 ```
 
+To validate the config, one can run:
+
+```bash
+cfengine up --validate config.yaml
+```
+
+Every time `up` is run, it will do all the necessary (spawn, destroy, install, uninstall) to reconciliate the current state with the input configuration.
+After a successful run, the applied configuration is saved.
+On subsequent runs, CFEngine compares the previously applied configuration with the current configuration and applies only the necessary changes.
+
+To ignore the previously saved configuration and apply the current configuration as-is, run:
+
+```bash
+cfengine up --reset config.yaml
+```
+
 ## Supported platforms and versions
 
 This tool will only support a limited number of platforms, it is not intended to run everywhere CFEngine runs.

{cfengine-0.16.3 → cfengine-0.16.5}/src/cfengine.egg-info/SOURCES.txt

@@ -21,6 +21,8 @@ src/cfengine.egg-info/SOURCES.txt
 src/cfengine.egg-info/dependency_links.txt
 src/cfengine.egg-info/entry_points.txt
 src/cfengine.egg-info/requires.txt
+src/cfengine.egg-info/scm_file_list.json
+src/cfengine.egg-info/scm_version.json
 src/cfengine.egg-info/top_level.txt
 src/cfengine_cli/__init__.py
 src/cfengine_cli/__main__.py

cfengine-0.16.5/src/cfengine.egg-info/scm_file_list.json

@@ -0,0 +1,153 @@
+{
+  "files": [
+    "README.md",
+    "uv.lock",
+    "Makefile",
+    ".python-version",
+    "LICENSE",
+    "pyproject.toml",
+    "HACKING.md",
+    "CLAUDE.md",
+    ".gitignore",
+    "src/cfengine_cli/changelog.py",
+    "src/cfengine_cli/shell.py",
+    "src/cfengine_cli/__init__.py",
+    "src/cfengine_cli/version.py",
+    "src/cfengine_cli/lint_yml.py",
+    "src/cfengine_cli/profile.py",
+    "src/cfengine_cli/deptool-README.md",
+    "src/cfengine_cli/utils.py",
+    "src/cfengine_cli/format.py",
+    "src/cfengine_cli/syntax-description.json",
+    "src/cfengine_cli/docs.py",
+    "src/cfengine_cli/up.py",
+    "src/cfengine_cli/lint_csv.py",
+    "src/cfengine_cli/syntax_tree.py",
+    "src/cfengine_cli/main.py",
+    "src/cfengine_cli/deptool.py",
+    "src/cfengine_cli/lint.py",
+    "src/cfengine_cli/commands.py",
+    "src/cfengine_cli/validate.py",
+    "src/cfengine_cli/__main__.py",
+    "src/cfengine_cli/paths.py",
+    "src/cfengine_cli/dev.py",
+    "src/cfengine_cli/masterfiles/check_download_matches_git.py",
+    "src/cfengine_cli/masterfiles/generate_vcf_git_checkout.py",
+    "src/cfengine_cli/masterfiles/__init__.py",
+    "src/cfengine_cli/masterfiles/download.py",
+    "src/cfengine_cli/masterfiles/analyze.py",
+    "src/cfengine_cli/masterfiles/generate_release_information.py",
+    "src/cfengine_cli/masterfiles/generate_vcf_download.py",
+    "src/cfengine_cli/masterfiles/generate_git_tags.py",
+    "ci/01-install.sh",
+    "ci/02-safe-tests.sh",
+    "ci/03-unsafe-tests.sh",
+    "tests/README.md",
+    "tests/run-shell-tests.sh",
+    "tests/run-up-validate-tests.sh",
+    "tests/run-lint-tests.sh",
+    "tests/run-format-tests.sh",
+    "tests/lint/015_macro_multi_def_bundle.cf",
+    "tests/lint/010_mutually_exclusive_types_vars.cf",
+    "tests/lint/010_mutually_exclusive_types_vars.x.cf",
+    "tests/lint/013_num_args_body.expected.txt",
+    "tests/lint/007_namespace.x.cf",
+    "tests/lint/018_nested_calls.expected.txt",
+    "tests/lint/010_mutually_exclusive_types_vars.expected.txt",
+    "tests/lint/016_half_promises.expected.txt",
+    "tests/lint/002_deprecations.x.cf",
+    "tests/lint/009_unknown_function_inside_vars.cf",
+    "tests/lint/008_bundle_shadows_function.expected.txt",
+    "tests/lint/013_num_args_bundle.x.cf",
+    "tests/lint/017_implies_body.cf",
+    "tests/lint/017_implies_body.expected.txt",
+    "tests/lint/008_bundle_shadows_function.cf",
+    "tests/lint/003_name_lowercase.x.cf",
+    "tests/lint/009_unknown_function_inside_vars.x.cf",
+    "tests/lint/004_block_type.x.cf",
+    "tests/lint/011_invalid_attributes.expected.txt",
+    "tests/lint/005_syntax_error.cf",
+    "tests/lint/013_num_args_bundle_body.cf",
+    "tests/lint/003_name_lowercase.expected.txt",
+    "tests/lint/002_deprecations.expected.txt",
+    "tests/lint/013_num_args_bundle.expected.txt",
+    "tests/lint/012_function_call_arg_count.expected.txt",
+    "tests/lint/004_block_type.cf",
+    "tests/lint/005_syntax_error.x.cf",
+    "tests/lint/015_macro_multi_def_bundle.expected.txt",
+    "tests/lint/006_empty_file.expected.txt",
+    "tests/lint/014_variadic_func_arg_count.x.cf",
+    "tests/lint/004_block_type.expected.txt",
+    "tests/lint/016_half_promises.cf",
+    "tests/lint/018_nested_calls.x.cf",
+    "tests/lint/011_invalid_attributes.x.cf",
+    "tests/lint/018_nested_calls.cf",
+    "tests/lint/014_variadic_func_arg_count.cf",
+    "tests/lint/017_implies_body.x.cf",
+    "tests/lint/012_function_call_arg_count.x.cf",
+    "tests/lint/007_namespace.expected.txt",
+    "tests/lint/015_macro_multi_def_bundle.x.cf",
+    "tests/lint/019_bundle_name_expansion.cf",
+    "tests/lint/001_hello_world.cf",
+    "tests/lint/009_unknown_function_inside_vars.expected.txt",
+    "tests/lint/007_namespace.cf",
+    "tests/lint/014_variadic_func_arg_count.expected.txt",
+    "tests/lint/012_function_call_arg_count.cf",
+    "tests/lint/008_bundle_shadows_function.x.cf",
+    "tests/lint/013_num_args_body.x.cf",
+    "tests/lint/003_name_lowercase.cf",
+    "tests/lint/005_syntax_error.expected.txt",
+    "tests/lint/006_empty_file.x.cf",
+    "tests/lint/016_half_promises.x.cf",
+    "tests/shell/001-help.sh",
+    "tests/shell/002-version.sh",
+    "tests/shell/004-format-check.sh",
+    "tests/shell/005-lint.sh",
+    "tests/shell/003-format.sh",
+    "tests/up-validate/002_version.x.yaml",
+    "tests/up-validate/004_count.x.yaml",
+    "tests/up-validate/001_complex_config.yaml",
+    "tests/up-validate/003_box.x.yaml",
+    "tests/up-validate/mocks/vagrant",
+    "tests/up-validate/mocks/cloud_config.json",
+    "tests/format/003_wrapping.input.cf",
+    "tests/format/011_macros.expected.cf",
+    "tests/format/009_single_line.input.cf",
+    "tests/format/009_single_line.expected.cf",
+    "tests/format/010_stakeholder.input.cf",
+    "tests/format/007_class_guarded_empty_lines.expected.cf",
+    "tests/format/004_comments.expected.cf",
+    "tests/format/001_hello_world.input.cf",
+    "tests/format/011_promises.expected.cf",
+    "tests/format/006_remove_empty_comments.input.cf",
+    "tests/format/005_bundle_comments.expected.cf",
+    "tests/format/002_basics.expected.cf",
+    "tests/format/005_bundle_comments.input.cf",
+    "tests/format/006_remove_empty_comments.expected.cf",
+    "tests/format/007_class_guarded_empty_lines.input.cf",
+    "tests/format/003_wrapping.expected.cf",
+    "tests/format/010_stakeholder.expected.cf",
+    "tests/format/004_comments.input.cf",
+    "tests/format/001_hello_world.expected.cf",
+    "tests/format/011_promises.input.cf",
+    "tests/format/008_long_string.expected.cf",
+    "tests/format/008_long_string.input.cf",
+    "tests/format/002_basics.input.cf",
+    "tests/format/011_macros.input.cf",
+    "tests/unit/__init__.py",
+    "tests/unit/test_version.py",
+    "tests/unit/test_deps.py",
+    "tests/unit/test_utils.py",
+    "tests/unit/test_format.py",
+    "tests/unit/test_changelog.py",
+    "tests/unit/test_lint_csv.py",
+    "tests/unit/test_lint_yml.py",
+    "tests/unit/test_paths.py",
+    ".github/dependabot.yml",
+    ".github/workflows/lint-policy-in-other-repos.yml",
+    ".github/workflows/pypi-publish.yml",
+    ".github/workflows/make-check.yml",
+    ".github/workflows/stale.yml",
+    ".github/workflows/update-syntax-description.yml"
+  ]
+}

cfengine-0.16.5/src/cfengine.egg-info/scm_version.json

@@ -0,0 +1,8 @@
+{
+  "tag": "0.16.5",
+  "distance": 0,
+  "node": "g19fe73398e8d85aedf2c458c53db1e2b66cc607c",
+  "dirty": false,
+  "branch": "HEAD",
+  "node_date": "2026-06-23"
+}

{cfengine-0.16.3 → cfengine-0.16.5}/src/cfengine_cli/commands.py

@@ -1,19 +1,14 @@
-import sys
 import os
 import re
 import json
 import yaml
 from cfengine_cli.profile import profile_cfengine, generate_callstack
 from cfengine_cli.dev import dispatch_dev_subcommand
-from cfengine_cli.lint import lint_args, PolicySyntaxError
+from cfengine_cli.lint import lint_args
 from cfengine_cli.shell import user_command
 from cfengine_cli.paths import bin
 from cfengine_cli.version import cfengine_cli_version_string
-from cfengine_cli.format import (
-    format_policy_file,
-    format_json_file,
-    format_policy_fin_fout,
-)
+from cfengine_cli.format import format_paths
 from cfengine_cli.utils import UserError
 from cfengine_cli.up import validate_config
 from cfbs.commands import build_command
@@ -51,74 +46,8 @@ def deploy() -> int:
     return r
 
 
-def _format_filename(filename: str, line_length: int, check: bool) -> int:
-    """Format a single file.
-
-    Raises PolicySyntaxError for .cf files with syntax errors."""
-    if filename.endswith(".json"):
-        return format_json_file(filename, check)
-    if filename.endswith(".cf"):
-        return format_policy_file(filename, line_length, check)
-    raise UserError(f"Unrecognized file format: {filename}")
-
-
-def _format_dirname(directory: str, line_length: int, check: bool) -> int:
-    ret = 0
-    for root, dirs, files in os.walk(directory):
-        # Don't recurse into hidden folders
-        dirs[:] = [d for d in dirs if not d.startswith(".")]
-        for name in sorted(files):
-            if name.startswith("."):
-                continue  # Hidden files are ignored by default
-            if (
-                name.endswith(".x.cf")
-                or name.endswith(".input.cf")
-                or name.endswith(".output.cf")
-                or name.endswith(".expected.cf")
-            ):
-                continue  # Test files skipped during directory traversal
-            if name.endswith(
-                (".input.json", ".jqinput.json", ".x.json", ".expected.json")
-            ):
-                continue  # Test files skipped during directory traversal
-            filepath = os.path.join(root, name)
-            if name.endswith(".json") or name.endswith(".cf"):
-                ret |= _format_filename(filepath, line_length, check)
-    return ret
-
-
 def format(names, line_length, check) -> int:
-    try:
-        return _format_inner(names, line_length, check)
-    except PolicySyntaxError as e:
-        print(f"Error: {e}")
-        return 1
-
-
-def _format_inner(names, line_length, check) -> int:
-    if not names:
-        return _format_dirname(".", line_length, check)
-    if len(names) == 1 and names[0] == "-":
-        # Special case, format policy file from stdin to stdout
-        return format_policy_fin_fout(sys.stdin, sys.stdout, line_length, check)
-
-    ret = 0
-    for name in names:
-        if name == "-":
-            raise UserError(
-                "The - argument has a special meaning and cannot be combined with other paths"
-            )
-        if not os.path.exists(name):
-            raise UserError(f"{name} does not exist")
-        if os.path.isfile(name):
-            ret |= _format_filename(name, line_length, check)
-            continue
-        if os.path.isdir(name):
-            ret |= _format_dirname(name, line_length, check)
-            continue
-    if check:
-        return ret
-    return 0
+    return format_paths(names, line_length, check)
 
 
 def _lint(files, strict) -> int:

{cfengine-0.16.3 → cfengine-0.16.5}/src/cfengine_cli/dev.py

@@ -8,7 +8,7 @@ from cfengine_cli.deptool import (
     update_dependency_tables as _update_dependency_tables,
     print_release_dependency_tables,
 )
-from cfengine_cli.docs import update_docs, check_docs
+from cfengine_cli import docs
 from cfengine_cli.syntax_tree import syntax_tree
 
 
@@ -47,14 +47,16 @@ def print_dependency_tables(args) -> int:
     return print_release_dependency_tables(args.versions)
 
 
-def format_docs(files) -> int:
+def format_docs() -> int:
     _expect_repo("documentation")
-    return update_docs(files)
+    ret = docs.format_docs()
+    return ret
 
 
 def lint_docs() -> int:
     _expect_repo("documentation")
-    return check_docs()
+    ret = docs.lint_docs()
+    return ret
 
 
 def generate_release_information(
@@ -71,7 +73,7 @@ def dispatch_dev_subcommand(subcommand, args) -> int:
     if subcommand == "print-dependency-tables":
         return print_dependency_tables(args)
     if subcommand == "format-docs":
-        return format_docs(args.files)
+        return format_docs()
     if subcommand == "lint-docs":
         return lint_docs()
     if subcommand == "syntax-tree":

{cfengine-0.16.3 → cfengine-0.16.5}/src/cfengine_cli/docs.py

@@ -16,7 +16,7 @@ import markdown_it
 from cfbs.pretty import pretty_file
 from cfbs.utils import find
 
-from cfengine_cli.format import format_policy_file
+from cfengine_cli.format import format_policy_file, format_paths
 from cfengine_cli.lint import lint_args, lint_policy_file_snippet
 from cfengine_cli.utils import UserError
 
@@ -420,12 +420,11 @@ def _run_prettier(path) -> bool:
     return formatted
 
 
-def _update_docs_single_arg(path):
+def _format_docs_single_arg(path):
     if not os.path.exists(path):
         raise UserError(f"The specified file/folder '{path}' does not exist")
     if not os.path.isfile(path) and not os.path.isdir(path):
         raise UserError(f"Argument '{path}' is not a file or a folder")
-
     formatted = False
     if os.path.isdir(path) or path.endswith(".py"):
         if _run_black(path):
@@ -443,13 +442,16 @@ def _update_docs_single_arg(path):
             replace=True,
             cleanup=True,
         )
-
+    if os.path.isdir(path) or path.endswith(".cf"):
+        r = format_paths([path], line_length=80, check=False)
+        if r != 0:
+            formatted = True
     return formatted
 
 
-def update_docs(paths) -> int:
+def format_docs() -> int:
     """
-    Iterate through entire docs repo, or specified subfolders / files, autoformatting as much as possible:
+    Iterate through entire docs repo (CWD) autoformatting as much as possible:
     - python code with black
     - markdown files with prettier
     - code blocks inside markdown files are formatted for the formats supported by prettier
@@ -458,23 +460,27 @@ def update_docs(paths) -> int:
     Run by the command:
     cfengine dev format-docs
     """
-    if not paths:
-        _update_docs_single_arg(".")
-        return 0
-    for path in paths:
-        _update_docs_single_arg(path)
+    _format_docs_single_arg(".")
     return 0
 
 
-def check_docs() -> int:
+def lint_docs() -> int:
     """
     Run checks / tests on docs.
 
     Run by the command:
     cfengine dev lint-docs"""
+
+    # cfengine lint
     r = lint_args(["."], strict=False)
     if r != 0:
+        print(f"Failure - {r} errors while running cfengine lint .")
         return r
+
+    # cfengine format --check
+    r = format_paths(["."], line_length=80, check=True)
+
+    # Extract code blocks from markdown files and run checks on them:
     _process_markdown_code_blocks(
         path=".",
         languages=["json", "cf3"],
@@ -485,4 +491,5 @@ def check_docs() -> int:
         replace=False,
         cleanup=True,
     )
+    print("Success - all files look correct")
     return 0

{cfengine-0.16.3 → cfengine-0.16.5}/src/cfengine_cli/format.py

@@ -3,11 +3,14 @@ from __future__ import annotations
 from typing import IO
 
 import json
+import os
+import sys
 
 import tree_sitter_cfengine as tscfengine
 from tree_sitter import Language, Parser, Node
 from cfbs.pretty import pretty_file, pretty_check_file
-from cfengine_cli.lint import check_policy_syntax
+from cfengine_cli.lint import check_policy_syntax, PolicySyntaxError
+from cfengine_cli.utils import UserError
 
 # Node types that increase indentation by 2 when entered
 INDENTED_TYPES = {
@@ -233,6 +236,11 @@ def split_generic_list(
     """Split list elements into one-per-line strings, each pre-indented."""
     has_macros = _contains_macro(middle)
     elements: list[str] = []
+    # Indices of the lines that end a top-level value element. For a nested
+    # element, like a function call inside an slist, this is only the final line,
+    # outside the function call, so we do not add trailing commas into function
+    # call argument lists.
+    value_end_indices: list[int] = []
     for element in middle:
         if elements and element.type == ",":
             elements[-1] = elements[-1] + ","
@@ -240,6 +248,9 @@ def split_generic_list(
         if element.type == "macro":
             elements.append(text(element))
             continue
+        if element.type == "comment":
+            elements.append(" " * indent + text(element))
+            continue
         line = " " * indent + stringify_single_line_node(element)
         # Strict < reserves 1 char for the comma appended after this check
         if len(line) < line_length:
@@ -248,14 +259,18 @@ def split_generic_list(
             lines = split_generic_value(element, indent, line_length)
             elements.append(" " * indent + lines[0])
             elements.extend(lines[1:])
+        value_end_indices.append(len(elements) - 1)
 
-    # Adjust trailing commas: with macros, fix every non-macro element
-    # (one per branch); without, fix only the last non-comment element.
+    # Set trailing commas
     if has_macros:
-        for i, e in enumerate(elements):
-            if not e.lstrip().startswith(("@", "#")):
-                elements[i] = _set_trailing_comma(e, trailing_comma)
+        # With macros: Use the indices we counted earlier to ensure there
+        # are trailing commas at the right places (before macro, inside macro,
+        # after macros), but NOT inside the nested function calls which may
+        # be multi line
+        for i in value_end_indices:
+            elements[i] = _set_trailing_comma(elements[i], trailing_comma)
     else:
+        # No macros: Just ensure the last non-comment element has a trailing comma
         for i in reversed(range(len(elements))):
             if not elements[i].lstrip().startswith("#"):
                 elements[i] = _set_trailing_comma(elements[i], trailing_comma)
@@ -985,3 +1000,79 @@ def format_policy_fin_fout(
     new_data = fmt.buffer + "\n"
     fout.write(new_data)
     return 0
+
+
+def _format_filename(filename: str, line_length: int, check: bool) -> int:
+    """Format a single file.
+
+    Raises PolicySyntaxError for .cf files with syntax errors."""
+    if filename.endswith(".json"):
+        return format_json_file(filename, check)
+    if filename.endswith(".cf"):
+        return format_policy_file(filename, line_length, check)
+    raise UserError(f"Unrecognized file format: {filename}")
+
+
+def _format_dirname(directory: str, line_length: int, check: bool) -> int:
+    ret = 0
+    for root, dirs, files in os.walk(directory):
+        # Don't recurse into hidden folders
+        dirs[:] = [d for d in dirs if not d.startswith(".")]
+        for name in sorted(files):
+            if name.startswith("."):
+                continue  # Hidden files are ignored by default
+            if (
+                name.endswith(".x.cf")
+                or name.endswith(".input.cf")
+                or name.endswith(".output.cf")
+                or name.endswith(".expected.cf")
+            ):
+                continue  # Test files skipped during directory traversal
+            if name.endswith(
+                (".input.json", ".jqinput.json", ".x.json", ".expected.json")
+            ):
+                continue  # Test files skipped during directory traversal
+            filepath = os.path.join(root, name)
+            if name.endswith(".json") or name.endswith(".cf"):
+                ret |= _format_filename(filepath, line_length, check)
+    return ret
+
+
+def _format_paths_inner(names, line_length, check) -> int:
+    if not names:
+        return _format_dirname(".", line_length, check)
+    if len(names) == 1 and names[0] == "-":
+        # Special case, format policy file from stdin to stdout
+        return format_policy_fin_fout(sys.stdin, sys.stdout, line_length, check)
+
+    ret = 0
+    for name in names:
+        if name == "-":
+            raise UserError(
+                "The - argument has a special meaning and cannot be combined with other paths"
+            )
+        if not os.path.exists(name):
+            raise UserError(f"{name} does not exist")
+        if os.path.isfile(name):
+            ret |= _format_filename(name, line_length, check)
+            continue
+        if os.path.isdir(name):
+            ret |= _format_dirname(name, line_length, check)
+            continue
+    if check:
+        return ret
+    return 0
+
+
+def format_paths(names, line_length, check) -> int:
+    """Format the given paths (files and/or directories), or stdin.
+
+    With no names, formats the current directory. A single "-" formats
+    policy from stdin to stdout. Returns 0 on success (or no reformat
+    needed), 1 when reformatting is needed in check mode or a policy file
+    has syntax errors."""
+    try:
+        return _format_paths_inner(names, line_length, check)
+    except PolicySyntaxError as e:
+        print(f"Error: {e}")
+        return 1