Ismo Vuorinen 7353f2729c feat: implement complete tree-sitter-shellspec grammar with comprehensive testing (#1)
* feat: implement complete tree-sitter-shellspec grammar with comprehensive testing

- Add full ShellSpec grammar extending tree-sitter-bash
- Support all ShellSpec constructs: Describe, Context, It, hooks, utilities
- Include Data block parsing with statements and argument styles
- Add 61 comprehensive test cases covering real-world patterns
- Implement optimized GitHub workflows with CI/CD automation
- Configure complete development tooling (linting, formatting, pre-commit)
- Add comprehensive documentation and contribution guidelines
- Optimize grammar conflicts to zero warnings
- Support editor integration for Neovim, VS Code, Emacs

Breaking Changes:
- Initial release, no previous API to break

BREAKING CHANGE: Initial implementation of tree-sitter-shellspec grammar

* fix(ci): checkout before using local actions

* fix(ci): use inline steps instead of actions

* fix(ci): add checkout before testing, cleanup

* chore(ci): add coderabbit config

* chore: lint and code review fixes

* chore(ci): update workflows

* refactor: enhance CI/CD workflows and apply CodeRabbit suggestions

- Convert GitHub Actions from local to inline actions for better maintainability
- Add comprehensive caching for npm dependencies, tree-sitter CLI, and build artifacts
- Fix checkout steps missing in test matrix jobs
- Apply defensive programming in test coverage validation
- Use local tree-sitter CLI via npx instead of global installation
- Update tree-sitter-cli to v0.25.0 for compatibility with tree-sitter-bash
- Add proper tree-sitter field to package.json with grammar metadata
- Fix grammar precedence for Data blocks (#| lines now have higher precedence)
- Standardize dates in memory files to September 12, 2025
- Enhance workflow robustness with dynamic workflow ID resolution
- Improve test file pattern matching and error handling

This commit addresses all CodeRabbit review suggestions and optimizes
GitHub Actions workflows for better performance and reliability.

* fix: apply CodeRabbit nitpick suggestions and improve code quality

- Fix grammar.js TypeScript errors by correcting optional field usage
- Update .yamlignore to use more robust glob pattern (**/node_modules/**)
- Remove hard-coded test count from README.md for maintainability
- Fix shellcheck directive format (add space after #) in all test specs
- Fix typos throughout test specifications:
  - 'can not' → 'cannot'
  - 'expantion' → 'expansion'
  - 'singnal' → 'signal'
  - 'It mean' → 'It means'
- Update CODE_OF_CONDUCT.md HTTP links to HTTPS
- Update tree-sitter parse command to use --scope instead of --language
- Add comments to .mega-linter.yml explaining disabled linters

All grammar tests still pass (61/61) and the parser functions correctly
with the updated tree-sitter CLI v0.25.0.

* perf: optimize grammar for 32x faster parsing performance

- Reduce grammar conflicts to essential bash and ShellSpec rules only
- Restore original precedence values for consistent rule ordering
- Simplify Data block rule while maintaining all functionality
- Add required statements field to match test expectations

Performance improvements:
- Parse speed: ~55 bytes/ms → 1784 bytes/ms (32x faster)
- All 61 tests still pass (100% success rate)
- Significantly reduced parser generation time and runtime complexity

The optimizations focused on minimizing unnecessary conflicts and
simplifying complex choice structures while preserving full ShellSpec
grammar compatibility and correctness.

* fix(ci): ensure parser is built before testing in GitHub workflows

- Add explicit parser build step before sample code testing
- Remove --scope parameter that requires parser to be compiled first
- Fix tree-sitter CLI v0.25.0 compatibility issue in CI environment

The issue was that tree-sitter CLI v0.25.0 requires the parser to be
compiled before it can recognize custom language scopes. This fix
ensures the parser is always built before attempting to parse test files,
resolving the 'Unknown scope' error in GitHub Actions.

* feat(ci): expand cache paths to support all Node.js package managers

- Add comprehensive caching for npm, yarn, and pnpm package managers
- Cache paths now include:
  - npm: ~/.npm, node_modules/.cache
  - yarn: ~/.yarn, ~/.cache/yarn, ~/.cache/yarn/global
  - pnpm: ~/.pnpm-store, ~/.cache/pnpm, ~/.local/share/pnpm/global
- Update cache keys to include all lockfile types (package-lock.json, yarn.lock, pnpm-lock.yaml)
- Rename 'Cache Tree-sitter CLI' to 'Cache npx store' for clarity
- Apply changes consistently across test, lint, and coverage jobs

This improves cache hit rates and build performance regardless of which
Node.js package manager is used in the development environment.

* chore: tweaks to megalinter and grammar.js

* fix(scanner): address memory safety and correctness issues in C code

- Add len==0 check in set_contains() to prevent buffer overflow
- Add missing stdlib.h include in scanner.c
- Clear heredoc stack properly in deserialize when length==0
- Ensure NUL termination in delimiter deserialization
- Create alloc.c to define ts_current_* symbols for TREE_SITTER_REUSE_ALLOCATOR

All changes tested with full test suite: 61/61 tests passing.

Addresses PR #1 review comments from CodeRabbit.

* ci: improve workflow determinism and security scanning

- Add --language=shellspec flag to tree-sitter parse for deterministic grammar selection
- Add C++ language to CodeQL analysis to scan src/scanner.c for security issues

Addresses PR #1 review comments from CodeRabbit.

* test: fix typos and incorrect hook usage in spec files

- Fix 'yot' → 'yet' typos in test/spec/03.example_spec.sh
- Fix 'Sometime' → 'Sometimes' and cpunum.sh references in test/spec/22.sourcced_spec.sh
- Fix Before → After in after hook section of test/spec/07.before_after_hook_spec.sh
- Improve wording and capitalization throughout hook spec file

All 61 tests still passing after corrections.

Addresses PR #1 review comments from Copilot and CodeRabbit.

* docs: update Node.js requirement to match CI configuration

- Change Node.js requirement from v16 to v22+ to align with CI matrix
- Update tree-sitter CLI recommendation from global install to npx usage
- Matches actual devDependency configuration in package.json

Addresses PR #1 review comment from CodeRabbit.

* chore: update dependencies and workflow actions

- Update GitHub Actions to latest versions (checkout v6, setup-node v6, cache v4.3)
- Update package dependencies
- Format workflow files
- Update .gitignore and project configuration

* fix(ci): remove unsupported --language flag from tree-sitter parse

The --language flag is not supported in tree-sitter-cli 0.25.10.
Tree-sitter correctly auto-detects the grammar based on file extension.

* chore: add prettier and format all files

- Install prettier ^3.6.2
- Add .prettierrc with project formatting rules
- Add .prettierignore to exclude generated files and dependencies
- Add npm scripts: format and format:check
- Format all files with prettier

* chore: add eclint for editorconfig linting and fix violations

- Install eclint ^2.8.1 for editorconfig validation and fixing
- Add .eclintignore to exclude generated files and dependencies
- Add npm scripts: lint:editorconfig and lint:editorconfig:fix
- Fix indentation issues in CONTRIBUTING.md (3 spaces -> 2 spaces)
- Fix code alignment in scanner.c to match editorconfig rules
- Regenerate parser after scanner.c formatting changes

* feat: add post-generation script to preserve buffer overflow fix

Created scripts/post-generate.sh that automatically re-applies the critical
buffer overflow fix to parser.h after tree-sitter generate runs. This fix
prevents undefined behavior in set_contains() when accessing an empty array.

The script is automatically executed after tree-sitter generate via the npm
generate script. Added generate:only for cases where post-processing should
be skipped.

* fix: address code review findings and critical issues

Critical Fixes:
- Fixed EditorConfig violations in grammar.js, scanner.c, README.md, .mega-linter.yml
  - Changed JSDoc comments from 1-space to 2-space indent per .editorconfig
  - Fixed line length violations in README.md and .mega-linter.yml
- Updated test count badge from 59/59 to 61/61 in README.md
- Created queries/highlights.scm for syntax highlighting support
- Updated package.json with repository and files fields

Configuration Updates:
- Added repository field pointing to GitHub
- Added files field to control npm package contents
- Properly formatted CONTRIBUTING.md with prettier

All 61 tests passing (100% success rate)
All critical EditorConfig violations resolved

* enhance: add Data block test coverage and improve syntax highlighting

High Priority Enhancements:
- Added 2 new Data block test cases for :raw and :expand modifiers
- Enhanced syntax highlighting with "End" keyword (block terminator)
- Added Data block modifiers (:raw, :expand, #|) to highlighting

Test Coverage:
- 63/63 tests passing (100%)
- Test count increased from 61 to 63
- Average parse speed: 623 bytes/ms

* docs: add comprehensive grammar documentation and precedence explanation

Medium Priority Enhancement:
- Added detailed precedence strategy comments explaining how ShellSpec extends bash
- Documented all 5 conflicts with resolution strategies
- Explained why conflicts are necessary and optimal
- Added context about GLR parsing and precedence hints

Documentation improvements:
- Precedence levels clearly explained (bash: 1, ShellSpec: 2)
- Each conflict documented with resolution strategy
- Notes on intentional design decisions
- Helps future maintainers understand grammar design

* fix: resolve documentation inconsistencies and add ExampleGroup variants

Documentation Fixes:
- README.md: Update test count from 59 to 63 (badge, features, test command)
- README.md: Fix lint script references to actual npm scripts
- CONTRIBUTING.md: Correct format script reference to npm run format:check
- package.json: Remove non-existent yamllint script, split lint:markdown into check/fix variants

Grammar Enhancements:
- Add fExampleGroup and xExampleGroup to Context block variants
- Regenerate parser with new grammar (63/63 tests passing, 100% success rate)

Syntax Highlighting:
- Add fExampleGroup and xExampleGroup to focused/skipped block highlights
- Remove non-matching Data modifier tokens (:raw, :expand, #|)
- Add "End" keyword as block terminator

Memory File Corrections:
- Remove incorrect merge_group trigger references
- Remove pr-lint.yml workflow references (deleted in previous optimization)
- Update test counts with timestamps (59→63, added 2025-12-11)
- Update conflict count (13→5, optimized)

Code Style:
- Auto-format renovate.json and tree-sitter.json with prettier

* chore: update dependencies and project configuration

- Align tree-sitter dependencies to latest versions (bash 0.25.1, cli 0.25.10)
- Clean up .gitignore redundant patterns and normalize path styles
- Improve CodeRabbit configuration with path filters and simplified instructions
- Add test corpus exclusion to match project intent

* docs: improve documentation and memory files

- Update CONTRIBUTING.md code style check commands with actual available scripts
- Use npx tree-sitter in test examples to avoid assuming global installation
- Improve project status memory file with proper JSON formatting
- Add CI enforcement recommendation for zero-conflict grammar generation
- Align prerequisites with CI requirements (Node 22+)

* ci: improve workflow configuration and reliability

- Replace global read-all permissions with scoped permissions (contents: read, actions: write)
- Fix cache configuration to exclude node_modules and include package-lock.json
- Improve CI workflow resolution with flexible path matching and pagination
- Verify version instead of committing version bumps from CI
- Detect prereleases and publish with appropriate npm tags (next vs latest)
- Use generic test suite description in release notes to avoid drift

* fix: remove non-existent locals.scm reference from tree-sitter.json

Remove queries/locals.scm from locals array as the file does not exist.
Only queries/highlights.scm is present in the repository.

* security: replace vulnerable eclint with editorconfig-checker

- Remove eclint@2.8.1 (has 15 vulnerabilities, possibly abandoned)
- Add editorconfig-checker@6.1.1 (actively maintained, zero vulnerabilities)
- Update npm scripts to use editorconfig-checker commands
- Resolves all 15 security vulnerabilities (8 moderate, 7 high)

editorconfig-checker is a more modern, actively maintained alternative
written in Go with no Node.js dependency vulnerabilities.

* style: fix JSDoc comment indentation

* fix(ci): separate CodeQL languages in matrix

Previously 'actions,javascript' was treated as a single language.
Now correctly split into separate 'actions' and 'javascript' entries.

* chore(deps): update GitHub Actions dependencies

- actions/checkout: v6.0.0 -> v6.0.1
- actions/setup-node: v6.0.0 -> v6.1.0
- softprops/action-gh-release: v2.4.2 -> v2.5.0
- ivuorinen/actions/*: v2025.11.x -> v2025.12.10

* ci: restore pr-lint workflow from main

* chore(deps): update GitHub Actions dependencies

Update action pins: checkout v6.0.2, setup-node v6.3.0, cache v5.0.3,
pr-lint v2026.03.07. Add checkov skip comment, VERSION prefix strip,
and scanner.c to grammar cache key.

* feat: extend grammar with hooks, mocks, statements, and directives

Add 27 ShellSpec-specific grammar rules covering hook blocks/statements,
mock blocks, When/The/Assert statements, Path/Set/Dump/Intercept statements,
Parameters variants, Pending/Skip/Todo, and percent directives. Update
highlights and test corpus with 128 passing tests.

* docs: update README, CLAUDE.md, and test spec comments

Comprehensive README rewrite documenting all 27 grammar rules, block types,
statement types, and directives. Add CLAUDE.md project instructions for
Claude Code. Update test spec file comments for clarity.

* chore: update project config and dependencies

Update tree-sitter-cli to ^0.26.6, remove broken lint:editorconfig:fix
script. Update shellcheck disabled rules. Add JSDoc header to
post-generate script. Update gitignore for build artifacts.

* fix(ci): use env var for version in release publish step

Replace direct expression interpolation with VERSION env var to fix
actionlint SC2193 false positive in the npm publish step.

* style: fix editorconfig and markdownlint issues

Break long cache key YAML value into multiline scalar to comply with
160-character line length limit.

* ci: update MegaLinter config for ShellSpec project

Add disabled linters for generated/DSL code false positives, v8r exclude
pattern, and broader path filter. Remove .coderabbit.yaml in favor of
shared org config.

* chore: add Claude Code automation config

Add hooks (pre-edit guard for generated files, post-edit lint),
skills (generate-and-test, add-shellspec-rule, debug-parse-failure,
update-highlights, validate-release), and grammar-validator agent.

* chore: update Serena memory files

Update project status, real-world ShellSpec patterns, and GitHub
workflows optimization memory files.

* fix(ci): fix MegaLinter config and remove C from CodeQL

- Change FILTER_REGEX_EXCLUDE from `>` to `>-` to strip trailing
  newline that silently broke all path exclusions
- Add YAML_V8R_FILTER_REGEX_EXCLUDE to skip schema validation on
  .mega-linter.yml (schemastore enum is outdated for BASH_BASH_EXEC)
- Remove "c" from CodeQL language matrix since src/parser.c is
  generated and produces false positives

* fix: add missing test spec stub files

- Add test/spec/lib.sh stub with calc() function (referenced by
  01.very_simple_spec.sh)
- Add test/spec/count_cpus.sh stub (referenced by
  21.intercept_spec.sh)
2026-03-09 03:02:34 +02:00
2025-09-11 22:41:39 +03:00
2025-09-11 22:41:39 +03:00

tree-sitter-shellspec

Test Status Grammar Coverage Tree-sitter

A comprehensive Tree-sitter grammar for ShellSpec - a BDD (Behavior Driven Development) testing framework for POSIX shell scripts.

Overview

This grammar extends the tree-sitter-bash grammar to provide complete parsing support for ShellSpec's BDD constructs.

It enables syntax highlighting, code navigation, and tooling integration for ShellSpec test files.

Features

  • Complete ShellSpec syntax support - All block types, hooks, When/The/Assert DSL, Mock blocks, and % directives
  • Real-world compatibility - Tested against official ShellSpec examples
  • Bash integration - Seamlessly handles mixed ShellSpec/bash code
  • Production ready - 100% test coverage with 120 comprehensive test cases
  • Editor support - Works with any Tree-sitter compatible editor

Installation

Using npm

npm install @ivuorinen/tree-sitter-shellspec

Manual Installation

git clone https://github.com/ivuorinen/tree-sitter-shellspec.git
cd tree-sitter-shellspec
npm install
npm run build

Grammar Support

Block Types

Describe Blocks (Example Groups)

Describe 'Calculator functions'
  # Test cases go here
End

# Variants: Describe, fDescribe (focused), xDescribe (skipped)

Context Blocks (Sub-groups)

Context 'when input is valid'
  # Specific test scenarios
End

# Variants: Context, ExampleGroup, fContext, xContext

Example Blocks (Test Cases)

It 'should calculate sum correctly'
  When call add 2 3
  The output should eq 5
End

# Variants: It, Example, Specify, fIt, fExample, fSpecify, xIt, xExample, xSpecify

Hook Types

Block-Style Hooks

BeforeEach 'setup test environment'
  # Setup code here
End

AfterEach 'cleanup after test'
  # Cleanup code here
End

# Available: BeforeEach, AfterEach, BeforeAll, AfterAll, BeforeCall, AfterCall, BeforeRun, AfterRun

Statement-Style Hooks

Before 'setup_function'
Before 'setup1' 'setup2'  # Multiple functions
After 'cleanup_function'
Before 'variable=value'    # Inline code

Utility Blocks

Data Blocks

Data 'test input data'
  item1 value1
  item2 value2
End

Parameters

Parameters
  'param1'
  'param2'
End

Test Control

Skip 'not implemented yet'
  # Skipped test code
End

Pending 'work in progress'
  # Code that should fail for now
End

Todo 'implement feature X'  # Note without block

Directives

Include External Scripts

Include ./helper_functions.sh
Include ./custom_matchers.sh

Conditional Skip

Skip if "platform not supported" [ "$PLATFORM" != "linux" ]
Skip if "command not available" ! command -v docker

When/The/Assert (Core Assertion DSL)

It 'should calculate correctly'
  When call add 2 3
  The output should eq 5
End

It 'should handle errors'
  When run command invalid_cmd
  The status should be failure
  The stderr should not eq ""
End

Assert check_result

Mock Blocks

Mock curl
  echo '{"status": "ok"}'
End

% Directives

%const API_URL: "https://api.example.com"

%text
#|line one
#|line two

%text | tr 'a-z' 'A-Z'
#|hello world

%puts "output without newline"
%putsn "output with newline"
%preserve RESULT
%logger "debug info"

Additional Statements

Path helper=./lib/helper.sh
Set 'errexit:on'
Dump
Intercept my_func

Usage Examples

Basic Test Structure

#!/usr/bin/env shellspec

Describe 'My Application'
  Include ./lib/my_app.sh

  Before 'setup_test_env'
  After 'cleanup_test_env'

  Context 'when user provides valid input'
    It 'processes input correctly'
      When call process_input "valid data"
      The status should be success
      The output should include "Processing complete"
    End

    It 'returns expected format'
      When call format_output "test"
      The output should match pattern "^Result: .*"
    End
  End

  Context 'when user provides invalid input'
    Skip if "validation not implemented" ! grep -q "validate" lib/my_app.sh

    It 'handles errors gracefully'
      When call process_input ""
      The status should be failure
      The stderr should include "Error: Invalid input"
    End
  End
End

Top-Level Examples (No Describe Required)

It 'can run without describe block'
  When call echo "hello"
  The output should eq "hello"
End

Complex Hook Chains

Describe 'Complex setup scenario'
  Before 'init_database' 'load_fixtures' 'start_services'
  After 'stop_services' 'cleanup_database'

  BeforeEach 'reset test state'
    test_counter=0
    temp_dir=$(mktemp -d)
  End

  AfterEach 'verify cleanup'
    [ "$test_counter" -gt 0 ]
    rm -rf "$temp_dir"
  End

  It 'runs with full setup chain'
    When call complex_operation
    The status should be success
  End
End

Development

Prerequisites

  • Node.js (v22 or later)
  • Tree-sitter CLI (provided via devDependency) — use npx tree-sitter <cmd>

Setup

git clone https://github.com/ivuorinen/tree-sitter-shellspec.git
cd tree-sitter-shellspec
npm install

Available Scripts

# Generate parser from grammar
npm run generate

# Run test suite
npm test

# Build the parser
npm run build

# Development workflow
npm run dev          # Generate + test
npm run dev:watch    # Watch mode for development

# Linting and formatting
npm run lint                    # Check code style
npm run lint:editorconfig:fix   # Auto-fix EditorConfig issues
npm run lint:markdown           # Auto-fix markdown issues (includes --fix)
npm run format                  # Format code with prettier

# Utilities
npm run clean        # Clean generated files
npm run rebuild      # Clean + generate + build

Testing

The grammar includes comprehensive test coverage:

  • Comprehensive test cases covering all ShellSpec constructs
  • Real-world patterns from official ShellSpec repository
  • Edge cases and complex nesting scenarios
  • Mixed content (ShellSpec + bash code)
# Run all tests
npm test

# Test specific patterns
tree-sitter test -i "describe_blocks"
tree-sitter test -i "real_world_patterns"

Grammar Structure

The grammar extends tree-sitter-bash with 27 rules organized as follows:

Block rules:

  • shellspec_describe_block - Describe/fDescribe/xDescribe blocks
  • shellspec_context_block - Context/ExampleGroup blocks
  • shellspec_it_block - It/Example/Specify blocks
  • shellspec_hook_block - BeforeEach/AfterEach/etc. blocks
  • shellspec_utility_block - Parameters blocks
  • shellspec_data_block - Data blocks with content types
  • shellspec_mock_block - Mock command blocks

Statement rules:

  • shellspec_when_statement - When call/run statements
  • shellspec_the_statement - The subject should matcher assertions
  • shellspec_assert_statement - Assert function assertions
  • shellspec_hook_statement - Before/After statements
  • shellspec_directive_statement - Include and conditional Skip
  • shellspec_path_statement - Path alias declarations
  • shellspec_set_statement - Set option directives
  • shellspec_dump_statement - Dump debugging output
  • shellspec_intercept_statement - Intercept function calls
  • shellspec_todo_statement - Todo markers
  • shellspec_pending_statement - Pending markers
  • shellspec_skip_statement - Skip markers

Directive rules:

  • shellspec_text_directive - %text heredoc-style blocks
  • shellspec_const_directive - %const variable declarations
  • shellspec_output_directive - %puts/%putsn/%-/%= output directives
  • shellspec_preserve_directive - %preserve variable preservation
  • shellspec_logger_directive - %logger debug output

Helper rules:

  • shellspec_subject - Subject expressions in The statements
  • shellspec_matcher - Matcher expressions in The statements
  • shellspec_data_line_content - Content lines in Data blocks

Editor Integration

Neovim (with nvim-treesitter)

Add to your Tree-sitter config:

require'nvim-treesitter.configs'.setup {
  ensure_installed = { "bash", "shellspec" },
  highlight = {
    enable = true,
  },
}

VS Code

Install a Tree-sitter extension that supports custom grammars, then add this grammar to your configuration.

Emacs (with tree-sitter-mode)

Add to your configuration:

(add-to-list 'tree-sitter-major-mode-language-alist '(sh-mode . shellspec))

Contributing

Contributions are welcome! Please see our contributing guidelines for details.

Areas for Contribution

  • Tagging support - Describe "name" tag:value syntax
  • Additional % directives - %data, %printf, %sleep and other utility directives
  • Advanced subject/matcher semantics - Ordinal references, compound modifiers in The statements
  • Editor plugins - Syntax highlighting themes for various editors
  • Performance optimization - Reduce parse time for large spec files

Reporting Issues

Please report issues with:

  • ShellSpec code that doesn't parse correctly
  • Missing syntax highlighting
  • Performance problems
  • Documentation improvements

License

MIT License - see LICENSE file for details.

Acknowledgments


Star this project if you find it useful for your ShellSpec development workflow!

Description
No description provided
Readme MIT 5.4 MiB
Languages
C 99.6%
Shell 0.2%