diff --git a/.eslintrc.js b/.eslintrc.js
new file mode 100644
index 0000000..f73be5c
--- /dev/null
+++ b/.eslintrc.js
@@ -0,0 +1,31 @@
+module.exports = {
+  root: true,
+  env: {
+    node: true,
+    es2020: true,
+  },
+  extends: [
+    'eslint:recommended',
+    '@typescript-eslint/recommended',
+    'prettier',
+  ],
+  parser: '@typescript-eslint/parser',
+  parserOptions: {
+    ecmaVersion: 2020,
+    sourceType: 'module',
+    project: './tsconfig.json',
+  },
+  plugins: ['@typescript-eslint', 'prettier'],
+  rules: {
+    'prettier/prettier': 'error',
+    '@typescript-eslint/no-unused-vars': ['error', { argsIgnorePattern: '^_' }],
+    '@typescript-eslint/no-explicit-any': 'warn',
+    '@typescript-eslint/explicit-function-return-type': 'off',
+    '@typescript-eslint/explicit-module-boundary-types': 'off',
+    '@typescript-eslint/no-non-null-assertion': 'warn',
+    'no-console': 'warn',
+    'prefer-const': 'error',
+    'no-var': 'error',
+  },
+  ignorePatterns: ['dist/', 'node_modules/', 'coverage/'],
+};
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000..3191e84
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,61 @@
+---
+name: Bug report
+about: Report a bug with the Prettier OpenAPI plugin
+title: '[BUG] '
+labels: bug
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is with the Prettier OpenAPI plugin.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Create an OpenAPI file with the following content:
+```yaml
+# or JSON
+```
+2. Run Prettier with the plugin: `npx prettier --plugin=prettier-plugin-openapi your-file.yaml`
+3. See the formatting issue
+
+**Expected behavior**
+A clear and concise description of how the OpenAPI file should be formatted.
+
+**OpenAPI file example**
+Please provide a minimal OpenAPI file that demonstrates the issue:
+
+```yaml
+openapi: 3.0.0
+info:
+  title: Test API
+  version: 1.0.0
+# ... rest of your OpenAPI content
+```
+
+**Prettier configuration**
+Please share your `.prettierrc` or Prettier configuration:
+
+```json
+{
+  "plugins": ["prettier-plugin-openapi"],
+  "tabWidth": 2,
+  "printWidth": 80
+}
+```
+
+**Environment (please complete the following information):**
+- OS: [e.g. macOS, Windows, Linux]
+- Node.js version: [e.g. 18.0.0]
+- Prettier version: [e.g. 3.0.0]
+- Plugin version: [e.g. 1.0.0]
+- OpenAPI version: [e.g. 3.0.0, 2.0]
+
+**Additional context**
+Add any other context about the problem here. Include:
+- Whether this affects JSON or YAML files (or both)
+- If it's related to key ordering, formatting, or parsing
+- Any error messages from the console
+
+**Screenshots**
+If applicable, add screenshots showing the before/after formatting to help explain the problem.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000..ea48cb5
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,46 @@
+---
+name: Feature request
+about: Suggest an idea for the Prettier OpenAPI plugin
+title: '[FEATURE] '
+labels: enhancement
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is with OpenAPI file formatting. Ex. I'm always frustrated when the plugin doesn't handle [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what formatting behavior you want the plugin to have.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative formatting approaches you've considered.
+
+**Use case**
+Describe the specific OpenAPI formatting use case for this feature. How would it help you or other users format their OpenAPI files?
+
+**OpenAPI specification**
+If this feature relates to a specific OpenAPI specification version or feature, please mention it:
+- OpenAPI 2.0 (Swagger)
+- OpenAPI 3.0.x
+- OpenAPI 3.1.x
+- Specific OpenAPI features (components, security schemes, etc.)
+
+**Example OpenAPI content**
+If applicable, provide an example of the OpenAPI content that would benefit from this feature:
+
+```yaml
+# Your OpenAPI example here
+```
+
+**Current behavior**
+Describe how the plugin currently handles this content.
+
+**Desired behavior**
+Describe how you would like the plugin to format this content.
+
+**Additional context**
+Add any other context or screenshots about the feature request here. Include:
+- Whether this affects JSON or YAML files (or both)
+- If it's related to key ordering, indentation, or other formatting aspects
+- Any specific OpenAPI tooling or workflow this would improve
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
new file mode 100644
index 0000000..b71599c
--- /dev/null
+++ b/.github/pull_request_template.md
@@ -0,0 +1,27 @@
+## Description
+
+Brief description of the changes in this PR.
+
+## Type of Change
+
+- [ ] Bug fix (non-breaking change which fixes an issue)
+- [ ] New feature (non-breaking change which adds functionality)
+- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
+- [ ] Documentation update
+- [ ] Performance improvement
+- [ ] Code refactoring
+
+## Testing
+
+- [ ] New tests added for new functionality
+- [ ] Existing tests updated if needed
+- [ ] Manual testing completed
+- [ ] Tests pass locally
+
+## Related Issues
+
+Fixes #(issue number)
+
+## Additional Notes
+
+Any additional information that reviewers should know.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 0000000..f0cbe18
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,168 @@
+name: CI/CD Pipeline
+
+on:
+  push:
+    branches: [ main, develop ]
+  pull_request:
+    branches: [ main, develop ]
+  release:
+    types: [ published ]
+
+jobs:
+  test:
+    name: Test Suite
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version: [18, 20, 21]
+        bun-version: [1.0.0, latest]
+    
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v4
+      
+    - name: Setup Node.js ${{ matrix.node-version }}
+      uses: actions/setup-node@v4
+      with:
+        node-version: ${{ matrix.node-version }}
+        cache: 'npm'
+        
+    - name: Setup Bun ${{ matrix.bun-version }}
+      uses: oven-sh/setup-bun@v1
+      with:
+        bun-version: ${{ matrix.bun-version }}
+        
+    - name: Install dependencies
+      run: bun install --frozen-lockfile
+      
+    - name: Run linting
+      run: bun run lint
+      
+    - name: Run type checking
+      run: bun run type-check
+      
+    - name: Run tests
+      run: bun run test
+      
+    - name: Run test coverage
+      run: bun run test:coverage
+      
+    - name: Upload coverage to Codecov
+      uses: codecov/codecov-action@v3
+      with:
+        file: ./coverage/lcov.info
+        flags: unittests
+        name: codecov-umbrella
+        fail_ci_if_error: false
+
+  build:
+    name: Build Package
+    runs-on: ubuntu-latest
+    needs: test
+    
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v4
+      
+    - name: Setup Node.js
+      uses: actions/setup-node@v4
+      with:
+        node-version: '20'
+        cache: 'npm'
+        
+    - name: Setup Bun
+      uses: oven-sh/setup-bun@v1
+      with:
+        bun-version: latest
+        
+    - name: Install dependencies
+      run: bun install --frozen-lockfile
+      
+    - name: Build package
+      run: bun run build
+      
+    - name: Verify build output
+      run: |
+        ls -la dist/
+        node -e "console.log('Build verification:', require('./dist/index.js'))"
+        
+    - name: Upload build artifacts
+      uses: actions/upload-artifact@v4
+      with:
+        name: dist-files
+        path: dist/
+        retention-days: 30
+
+  publish:
+    name: Publish to NPM
+    runs-on: ubuntu-latest
+    needs: [test, build]
+    if: github.event_name == 'release' && github.event.action == 'published'
+    
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v4
+      
+    - name: Setup Node.js
+      uses: actions/setup-node@v4
+      with:
+        node-version: '20'
+        registry-url: 'https://registry.npmjs.org'
+        
+    - name: Setup Bun
+      uses: oven-sh/setup-bun@v1
+      with:
+        bun-version: latest
+        
+    - name: Install dependencies
+      run: bun install --frozen-lockfile
+      
+    - name: Build package
+      run: bun run build
+      
+    - name: Publish to NPM
+      run: bun run publish:package
+      env:
+        NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+        
+    - name: Create GitHub Release
+      uses: actions/create-release@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        tag_name: ${{ github.event.release.tag_name }}
+        release_name: ${{ github.event.release.name }}
+        body: ${{ github.event.release.body }}
+        draft: false
+        prerelease: false
+
+  security:
+    name: Security Audit
+    runs-on: ubuntu-latest
+    
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v4
+      
+    - name: Setup Node.js
+      uses: actions/setup-node@v4
+      with:
+        node-version: '20'
+        
+    - name: Setup Bun
+      uses: oven-sh/setup-bun@v1
+      with:
+        bun-version: latest
+        
+    - name: Install dependencies
+      run: bun install --frozen-lockfile
+      
+    - name: Run security audit
+      run: bun audit
+      
+    - name: Run Snyk security scan
+      uses: snyk/actions/node@master
+      env:
+        SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
+      with:
+        args: --severity-threshold=high
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
new file mode 100644
index 0000000..0d3058d
--- /dev/null
+++ b/.github/workflows/release.yml
@@ -0,0 +1,144 @@
+name: Release
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  release:
+    name: Publish Release
+    runs-on: ubuntu-latest
+    
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+        token: ${{ secrets.GITHUB_TOKEN }}
+        
+    - name: Setup Node.js
+      uses: actions/setup-node@v4
+      with:
+        node-version: '22'
+        cache: 'npm'
+        
+    - name: Setup Bun
+      uses: oven-sh/setup-bun@v1
+      with:
+        bun-version: latest
+        
+    - name: Install dependencies
+      run: bun install --frozen-lockfile
+      
+    - name: Run tests
+      run: bun run test
+      
+    - name: Run linting
+      run: bun run lint
+      
+    - name: Build package
+      run: bun run build
+      
+    - name: Get current version
+      id: current-version
+      run: |
+        CURRENT_VERSION=$(node -p "require('./package.json').version")
+        echo "version=$CURRENT_VERSION" >> $GITHUB_OUTPUT
+        echo "tag=v$CURRENT_VERSION" >> $GITHUB_OUTPUT
+        
+    - name: Check if version exists on NPM
+      id: version-check
+      run: |
+        VERSION=${{ steps.current-version.outputs.version }}
+        if npm view prettier-plugin-openapi@$VERSION version >/dev/null 2>&1; then
+          echo "exists=true" >> $GITHUB_OUTPUT
+          echo "Version $VERSION already exists on NPM"
+        else
+          echo "exists=false" >> $GITHUB_OUTPUT
+          echo "Version $VERSION does not exist on NPM"
+        fi
+        
+    - name: Bump patch version if needed
+      id: bump-version
+      if: steps.version-check.outputs.exists == 'true'
+      run: |
+        npm version patch --no-git-tag-version
+        NEW_VERSION=$(node -p "require('./package.json').version")
+        echo "version=$NEW_VERSION" >> $GITHUB_OUTPUT
+        echo "tag=v$NEW_VERSION" >> $GITHUB_OUTPUT
+        echo "bumped=true" >> $GITHUB_OUTPUT
+        
+    - name: Set final version
+      id: final-version
+      run: |
+        if [ "${{ steps.bump-version.outputs.bumped }}" = "true" ]; then
+          echo "version=${{ steps.bump-version.outputs.version }}" >> $GITHUB_OUTPUT
+          echo "tag=${{ steps.bump-version.outputs.tag }}" >> $GITHUB_OUTPUT
+        else
+          echo "version=${{ steps.current-version.outputs.version }}" >> $GITHUB_OUTPUT
+          echo "tag=${{ steps.current-version.outputs.tag }}" >> $GITHUB_OUTPUT
+        fi
+        
+    - name: Generate release message
+      id: release-message
+      run: |
+        if [ "${{ steps.bump-version.outputs.bumped }}" = "true" ]; then
+          COMMIT_MSG=$(git log -1 --pretty=format:"%s")
+          echo "message=Automated patch release: $COMMIT_MSG" >> $GITHUB_OUTPUT
+        else
+          COMMIT_MSG=$(git log -1 --pretty=format:"%s")
+          echo "message=Release: $COMMIT_MSG" >> $GITHUB_OUTPUT
+        fi
+        
+    - name: Commit version bump if needed
+      if: steps.bump-version.outputs.bumped == 'true'
+      run: |
+        git config --local user.email "action@github.com"
+        git config --local user.name "GitHub Action"
+        git add package.json
+        git commit -m "chore: bump version to ${{ steps.bump-version.outputs.version }}"
+        
+    - name: Create tag
+      run: |
+        git tag ${{ steps.final-version.outputs.tag }}
+        
+    - name: Push changes and tag
+      run: |
+        git push origin main
+        git push origin ${{ steps.final-version.outputs.tag }}
+        
+    - name: Publish to NPM
+      run: npm publish
+      env:
+        NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+        
+    - name: Create Release
+      uses: elgohr/Github-Release-Action@v5
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        tag_name: ${{ steps.final-version.outputs.tag }}
+        name: Release ${{ steps.final-version.outputs.tag }}
+        body: |
+          ## Release ${{ steps.final-version.outputs.version }}
+          
+          ${{ steps.release-message.outputs.message }}
+          
+          ## Installation
+          
+          ```bash
+          npm install prettier-plugin-openapi@${{ steps.final-version.outputs.version }}
+          ```
+          
+          ## Usage
+          
+          Add to your `.prettierrc`:
+          
+          ```json
+          {
+            "plugins": ["prettier-plugin-openapi"]
+          }
+          ```
+        draft: false
+        prerelease: false
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index a14702c..0cf0a7e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,34 +1,76 @@
-# dependencies (bun install)
-node_modules
+# Dependencies
+node_modules/
+bun.lock
+package-lock.json
+yarn.lock
 
-# output
-out
-dist
-*.tgz
+# Build outputs
+dist/
+coverage/
+*.tsbuildinfo
 
-# code coverage
-coverage
+# Logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# Runtime data
+pids
+*.pid
+*.seed
+*.pid.lock
+
+# Coverage directory used by tools like istanbul
+coverage/
 *.lcov
 
-# logs
-logs
-_.log
-report.[0-9]_.[0-9]_.[0-9]_.[0-9]_.json
+# nyc test coverage
+.nyc_output
 
-# dotenv environment variable files
+# Dependency directories
+node_modules/
+jspm_packages/
+
+# Optional npm cache directory
+.npm
+
+# Optional eslint cache
+.eslintcache
+
+# Optional REPL history
+.node_repl_history
+
+# Output of 'npm pack'
+*.tgz
+
+# Yarn Integrity file
+.yarn-integrity
+
+# dotenv environment variables file
 .env
+.env.test
+.env.local
 .env.development.local
 .env.test.local
 .env.production.local
-.env.local
 
-# caches
-.eslintcache
-.cache
-*.tsbuildinfo
+# IDE files
+.vscode/
+.idea/
+*.swp
+*.swo
+*~
 
-# IntelliJ based IDEs
-.idea
-
-# Finder (MacOS) folder config
+# OS generated files
 .DS_Store
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+ehthumbs.db
+Thumbs.db
+
+# Temporary files
+*.tmp
+*.temp
\ No newline at end of file
diff --git a/.npmignore b/.npmignore
new file mode 100644
index 0000000..8acea9f
--- /dev/null
+++ b/.npmignore
@@ -0,0 +1,37 @@
+# Source files
+src/
+test/
+examples/
+
+# Development files
+.github/
+.husky/
+.vscode/
+.idea/
+
+# Configuration files
+.eslintrc.js
+.prettierrc.js
+.prettierignore
+bunfig.toml
+tsconfig.json
+
+# Documentation
+DEVELOPMENT.md
+*.md
+!README.md
+
+# Build artifacts
+coverage/
+*.log
+.DS_Store
+
+# Dependencies
+node_modules/
+bun.lock
+package-lock.json
+yarn.lock
+
+# Git
+.git/
+.gitignore
diff --git a/.prettierignore b/.prettierignore
new file mode 100644
index 0000000..2dce2a9
--- /dev/null
+++ b/.prettierignore
@@ -0,0 +1,12 @@
+node_modules/
+dist/
+coverage/
+*.log
+.DS_Store
+.vscode/
+.idea/
+*.min.js
+*.min.css
+bun.lock
+package-lock.json
+yarn.lock
diff --git a/.prettierrc.js b/.prettierrc.js
new file mode 100644
index 0000000..14e27e0
--- /dev/null
+++ b/.prettierrc.js
@@ -0,0 +1,28 @@
+module.exports = {
+  semi: true,
+  trailingComma: 'es5',
+  singleQuote: true,
+  printWidth: 80,
+  tabWidth: 2,
+  useTabs: false,
+  endOfLine: 'lf',
+  arrowParens: 'avoid',
+  bracketSpacing: true,
+  bracketSameLine: false,
+  quoteProps: 'as-needed',
+  overrides: [
+    {
+      files: '*.json',
+      options: {
+        printWidth: 120,
+      },
+    },
+    {
+      files: '*.md',
+      options: {
+        printWidth: 100,
+        proseWrap: 'always',
+      },
+    },
+  ],
+};
diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
new file mode 100644
index 0000000..d4d5593
--- /dev/null
+++ b/DEVELOPMENT.md
@@ -0,0 +1,298 @@
+# Development Guide
+
+This document outlines the development workflow, testing, and release process for the prettier-plugin-openapi package.
+
+## Prerequisites
+
+- [Bun](https://bun.sh/) (latest version)
+- [Node.js](https://nodejs.org/) (v18 or higher)
+- [Git](https://git-scm.com/)
+
+## Getting Started
+
+1. **Clone the repository**
+   ```bash
+   git clone https://github.com/lukehagar/prettier-plugin-openapi.git
+   cd prettier-plugin-openapi
+   ```
+
+2. **Install dependencies**
+   ```bash
+   bun install
+   ```
+
+3. **Verify setup**
+   ```bash
+   bun run validate
+   ```
+
+## Development Workflow
+
+### Available Scripts
+
+- `bun run dev` - Start development mode with TypeScript watch
+- `bun run build` - Build the project
+- `bun run test` - Run all tests
+- `bun run test:coverage` - Run tests with coverage report
+- `bun run test:watch` - Run tests in watch mode
+- `bun run lint` - Run ESLint
+- `bun run lint:fix` - Fix ESLint issues automatically
+- `bun run format` - Format code with Prettier
+- `bun run format:check` - Check code formatting
+- `bun run type-check` - Run TypeScript type checking
+- `bun run validate` - Run all validation checks (type-check, lint, test)
+- `bun run clean` - Clean build artifacts
+
+### Code Quality
+
+The project uses several tools to maintain code quality:
+
+- **ESLint** - Code linting with TypeScript support
+- **Prettier** - Code formatting
+- **TypeScript** - Type checking
+
+### Commit Message Format
+
+This project follows the [Conventional Commits](https://www.conventionalcommits.org/) specification:
+
+```
+<type>[optional scope]: <description>
+
+[optional body]
+
+[optional footer(s)]
+```
+
+Types:
+- `feat`: A new feature
+- `fix`: A bug fix
+- `docs`: Documentation changes
+- `style`: Code style changes (formatting, etc.)
+- `refactor`: Code refactoring
+- `test`: Adding or updating tests
+- `chore`: Maintenance tasks
+
+Examples:
+```
+feat: add support for OpenAPI 3.1
+fix: correct key ordering for components
+docs: update README with usage examples
+```
+
+## Testing
+
+### Running Tests
+
+```bash
+# Run all tests
+bun run test
+
+# Run tests with coverage
+bun run test:coverage
+
+# Run tests in watch mode
+bun run test:watch
+
+# Run tests for CI
+bun run test:ci
+```
+
+### Test Structure
+
+- `test/plugin.test.ts` - Core plugin functionality tests
+- `test/file-detection.test.ts` - File detection and parsing tests
+- `test/integration.test.ts` - Integration tests with real OpenAPI files
+- `test/key-ordering.test.ts` - Key ordering and sorting tests
+- `test/options.test.ts` - Plugin options and configuration tests
+- `test/vendor.test.ts` - Vendor extension tests
+- `test/custom-extensions.test.ts` - Custom extension tests
+
+### Adding Tests
+
+When adding new features or fixing bugs:
+
+1. Write tests first (TDD approach)
+2. Ensure tests cover edge cases
+3. Add integration tests for complex features
+4. Update existing tests if behavior changes
+
+## Building
+
+### Development Build
+
+```bash
+bun run dev
+```
+
+This starts TypeScript in watch mode, automatically rebuilding when files change.
+
+### Production Build
+
+```bash
+bun run build
+```
+
+This creates a production build in the `dist/` directory.
+
+### Build Verification
+
+After building, verify the output:
+
+```bash
+# Check build artifacts
+ls -la dist/
+
+# Test the built package
+node -e "console.log(require('./dist/index.js'))"
+```
+
+## Release Process
+
+### Version Management
+
+The project uses semantic versioning (semver):
+
+- **Patch** (1.0.1): Bug fixes (automated via GitHub Actions)
+- **Minor** (1.1.0): New features (manual)
+- **Major** (2.0.0): Breaking changes (manual)
+
+### Automated Releases
+
+Releases are automatically triggered on every push to main:
+
+1. **Smart versioning**
+   - Checks if the current version already exists on NPM
+   - If version exists: bumps patch version and publishes
+   - If version doesn't exist: publishes current version
+   - Runs tests and linting before publishing
+
+2. **Automatic process**
+   - Every push to the `main` branch triggers the release workflow
+   - The workflow will automatically:
+     - Run tests and linting
+     - Check NPM for existing version
+     - Bump patch version if needed
+     - Build and publish to NPM
+     - Create GitHub release with commit message
+
+### Manual Minor/Major Releases
+
+For minor or major releases:
+
+1. **Update version manually**
+   ```bash
+   # For minor release
+   bun run version:minor
+   
+   # For major release
+   bun run version:major
+   ```
+
+2. **Push to main**
+   ```bash
+   git push origin main
+   ```
+
+3. **Automated release**
+   - The release workflow will automatically:
+     - Detect the new version
+     - Build and test the package
+     - Publish to NPM
+     - Create GitHub release
+
+## CI/CD Pipeline
+
+### GitHub Actions Workflows
+
+- **CI Pipeline** (`.github/workflows/ci.yml`)
+  - Runs on every push and PR
+  - Tests on multiple Node.js and Bun versions
+  - Runs linting, type checking, and tests
+  - Generates coverage reports
+  - Builds the package
+  - Runs security audits
+
+- **Release Pipeline** (`.github/workflows/release.yml`)
+  - Runs on every push to main
+  - Smart versioning: checks NPM for existing versions
+  - Automatically bumps patch version if needed
+  - Builds, tests, and publishes to NPM
+  - Creates GitHub release with commit message
+
+### Required Secrets
+
+Set up the following secrets in your GitHub repository:
+
+- `NPM_TOKEN`: NPM authentication token for publishing
+- `SNYK_TOKEN`: Snyk token for security scanning (optional)
+
+## Troubleshooting
+
+### Common Issues
+
+1. **Build failures**
+   - Check TypeScript errors: `bun run type-check`
+   - Verify all dependencies are installed: `bun install`
+
+2. **Test failures**
+   - Run tests individually to isolate issues
+   - Check test setup and mocks
+
+3. **Linting errors**
+   - Run `bun run lint:fix` to auto-fix issues
+   - Check ESLint configuration
+
+4. **Release issues**
+   - Check if version already exists on NPM
+   - Verify NPM_TOKEN secret is set correctly
+   - Check workflow logs for specific error messages
+
+### Debug Mode
+
+Enable debug logging:
+
+```bash
+DEBUG=prettier-plugin-openapi:* bun run test
+```
+
+## Contributing
+
+1. Fork the repository
+2. Create a feature branch: `git checkout -b feature/your-feature`
+3. Make your changes
+4. Add tests for new functionality
+5. Run the full validation: `bun run validate`
+6. Commit with conventional commit format
+7. Push and create a pull request
+
+### Pull Request Process
+
+1. Ensure all CI checks pass
+2. Request review from maintainers
+3. Address feedback and update PR
+4. Merge after approval
+
+## Performance Considerations
+
+- The plugin processes files in memory
+- Large OpenAPI files (>1MB) may take longer to format
+- Consider file size limits for optimal performance
+- Monitor memory usage with very large files
+
+## Security
+
+- Regular dependency updates
+- Security audits via GitHub Actions
+- No external network requests during formatting
+- Input validation for all parsed content
+
+## Release Workflow Benefits
+
+The new consolidated release workflow provides:
+
+- **Smart Versioning**: Automatically detects if versions exist on NPM
+- **No Manual Intervention**: Patch releases happen automatically on every push
+- **Efficient Publishing**: Only bumps versions when necessary
+- **Comprehensive Testing**: Full test suite runs before every release
+- **Automatic Documentation**: GitHub releases created with commit messages
+- **Seamless Integration**: Works with both automatic and manual version bumps
diff --git a/README.md b/README.md
index b929f9a..f7cd080 100644
--- a/README.md
+++ b/README.md
@@ -1,14 +1,21 @@
 # Prettier Plugin OpenAPI
 
-A Prettier plugin for formatting OpenAPI/Swagger JSON and YAML files with intelligent key sorting and proper indentation.
+A Prettier plugin for formatting OpenAPI/Swagger JSON and YAML files with intelligent key sorting, proper indentation, and support for modular OpenAPI file structures.
 
 ## Features
 
 - 🎯 **OpenAPI/Swagger Support**: Formats both JSON and YAML OpenAPI specifications
 - 🔄 **Smart Key Sorting**: Automatically sorts OpenAPI keys in the recommended order
+- 📁 **Modular File Support**: Handles both monolithic and modular OpenAPI file structures
+- 🧩 **Component Files**: Supports individual component files (schemas, parameters, responses, etc.)
 - 📝 **YAML & JSON**: Supports both `.yaml/.yml` and `.json` file formats
 - 🎨 **Consistent Formatting**: Applies consistent indentation and line breaks
+- 🔌 **Vendor Extensions**: Programmatic loading of vendor-specific extensions
 - ⚡ **Fast**: Built with performance in mind using modern JavaScript
+- 🧪 **Comprehensive Testing**: 99 tests with 94.62% line coverage
+- 🚀 **CI/CD Ready**: Automated testing, building, and publishing
+- 🔒 **Strict Validation**: Properly rejects non-OpenAPI content
+- 📊 **High Quality**: ESLint, Prettier, and TypeScript for code quality
 
 ## Installation
 
@@ -74,13 +81,58 @@ module.exports = {
 - `.swagger.json`
 - `.swagger.yaml`
 - `.swagger.yml`
+- `.json` (for component files)
+- `.yaml` / `.yml` (for component files)
+
+## Modular File Structure Support
+
+The plugin supports both monolithic and modular OpenAPI file structures:
+
+### Monolithic Structure
+```
+api.yaml                    # Single file with everything
+```
+
+### Modular Structure
+```
+├─ openapi.yaml             # Root document
+├─ paths/                    # Path files
+│  ├─ users.yaml
+│  ├─ users_{id}.yaml
+│  └─ auth_login.yaml
+├─ components/               # Component files
+│  ├─ schemas/
+│  │  ├─ User.yaml
+│  │  ├─ UserCreate.yaml
+│  │  └─ Error.yaml
+│  ├─ parameters/
+│  │  ├─ CommonPagination.yaml
+│  │  └─ UserId.yaml
+│  ├─ responses/
+│  │  ├─ ErrorResponse.yaml
+│  │  └─ UserResponse.yaml
+│  ├─ requestBodies/
+│  │  └─ UserCreateBody.yaml
+│  ├─ headers/
+│  │  └─ RateLimitHeaders.yaml
+│  ├─ examples/
+│  │  └─ UserExample.yaml
+│  ├─ securitySchemes/
+│  │  └─ BearerAuth.yaml
+│  ├─ links/
+│  │  └─ UserCreatedLink.yaml
+│  └─ callbacks/
+│     └─ NewMessageCallback.yaml
+└─ webhooks/                 # Webhook files
+   └─ messageCreated.yaml
+```
 
 ## Key Sorting
 
 The plugin automatically sorts OpenAPI keys in the recommended order:
 
 ### Top-level keys:
-1. `openapi`
+1. `openapi` / `swagger`
 2. `info`
 3. `servers`
 4. `paths`
@@ -91,11 +143,12 @@ The plugin automatically sorts OpenAPI keys in the recommended order:
 
 ### Info section:
 1. `title`
-2. `description`
-3. `version`
-4. `termsOfService`
-5. `contact`
-6. `license`
+2. `summary`
+3. `description`
+4. `version`
+5. `termsOfService`
+6. `contact`
+7. `license`
 
 ### Components section:
 1. `schemas`
@@ -107,10 +160,13 @@ The plugin automatically sorts OpenAPI keys in the recommended order:
 7. `securitySchemes`
 8. `links`
 9. `callbacks`
+10. `pathItems`
 
 ## Examples
 
-### Before (unformatted):
+### Monolithic File Structure
+
+#### Before (unformatted):
 ```yaml
 paths:
   /users:
@@ -128,7 +184,7 @@ info:
   title: My API
 ```
 
-### After (formatted):
+#### After (formatted):
 ```yaml
 openapi: 3.0.0
 info:
@@ -146,6 +202,78 @@ components:
       type: object
 ```
 
+### Modular File Structure
+
+#### Root Document (`openapi.yaml`):
+```yaml
+openapi: 3.0.0
+info:
+  title: My API
+  version: 1.0.0
+paths:
+  $ref: './paths/users.yaml'
+components:
+  schemas:
+    $ref: './components/schemas/User.yaml'
+```
+
+#### Component File (`components/schemas/User.yaml`):
+```yaml
+type: object
+properties:
+  id:
+    type: integer
+  name:
+    type: string
+required:
+  - id
+  - name
+```
+
+#### Path File (`paths/users.yaml`):
+```yaml
+get:
+  summary: Get users
+  responses:
+    '200':
+      description: Success
+      content:
+        application/json:
+          schema:
+            type: array
+            items:
+              $ref: '../components/schemas/User.yaml'
+```
+
+## Vendor Extensions
+
+The plugin supports vendor-specific extensions through a programmatic loading system:
+
+### Adding Vendor Extensions
+
+1. Create a TypeScript file in `src/extensions/vendor/`
+2. Export your extensions using the provided API:
+
+```typescript
+// src/extensions/vendor/my-vendor.ts
+import { defineVendorExtensions } from '../index';
+
+export const extensions = defineVendorExtensions({
+  'top-level': (before, after) => ({
+    'x-my-custom-field': before('info'),
+    'x-vendor-metadata': after('externalDocs')
+  }),
+  'operation': (before, after) => ({
+    'x-rate-limit': before('responses'),
+    'x-cache-ttl': after('deprecated')
+  })
+});
+```
+
+### Automatic Discovery
+
+Vendor extensions are automatically discovered and loaded at runtime. No manual imports required!
+
 ## Development
 
 ### Setup
@@ -160,22 +288,74 @@ bun run build
 # Run tests
 bun test
 
-# Run demo
-bun run test/demo.ts
+# Run tests with coverage
+bun test --coverage
+
+# Lint code
+bun run lint
+
+# Format code
+bun run format
 ```
 
 ### Project Structure
 
 ```
 src/
-  index.ts          # Main plugin implementation
+  index.ts                    # Main plugin implementation
+  keys.ts                     # OpenAPI key definitions
+  extensions/
+    index.ts                  # Extension system
+    vendor-loader.ts          # Automatic vendor loading
+    vendor/                   # Vendor extensions
+      speakeasy.ts
+      postman.ts
+      redoc.ts
 test/
-  plugin.test.ts     # Unit tests
-  demo.ts           # Demo script
+  plugin.test.ts              # Core plugin tests
+  integration.test.ts         # Integration tests
+  build.test.ts              # Build validation tests
+  coverage.test.ts            # Coverage enhancement tests
+  file-detection.test.ts      # File detection tests
+  key-ordering.test.ts        # Key sorting tests
+  custom-extensions.test.ts  # Extension tests
+  options.test.ts            # Configuration tests
+  simple-ordering.test.ts     # Basic ordering tests
+  vendor.test.ts             # Vendor extension tests
+  setup.ts                    # Test utilities
+.github/
+  workflows/
+    ci.yml                   # Continuous Integration
+    release.yml              # Automated releases
 examples/
-  petstore.yaml     # Example OpenAPI file
+  petstore.yaml               # Example OpenAPI file
 ```
 
+### Test Suite
+
+The project includes a comprehensive test suite with **99 tests** covering:
+
+- **Core Functionality**: Plugin structure, parsing, formatting
+- **Integration Tests**: Real OpenAPI file processing, error handling
+- **Build Tests**: Package validation, TypeScript compilation
+- **Coverage Tests**: Edge cases, error scenarios
+- **File Detection**: OpenAPI file recognition, component files
+- **Key Ordering**: OpenAPI key sorting, custom extensions
+- **Vendor Extensions**: Extension system functionality
+- **Options**: Configuration and formatting options
+
+**Coverage**: 94.62% line coverage, 95.74% function coverage
+
+### CI/CD Pipeline
+
+The project includes automated CI/CD with GitHub Actions:
+
+- **Continuous Integration**: Tests on Node.js 18, 20, 22 and Bun
+- **Automated Testing**: Linting, type checking, security audits
+- **Smart Releases**: Automatic patch version bumps on main branch updates
+- **NPM Publishing**: Automated publishing with version management
+- **Quality Gates**: All tests must pass before release
+
 ## Configuration Options
 
 The plugin respects standard Prettier options:
@@ -184,14 +364,88 @@ The plugin respects standard Prettier options:
 - `printWidth`: Maximum line length (default: 80)
 - `useTabs`: Use tabs instead of spaces (default: false)
 
+## Advanced Features
+
+### File Detection
+
+The plugin intelligently detects OpenAPI files based on:
+
+1. **Content Structure**: Files with OpenAPI-specific keys (`openapi`, `swagger`, `components`, etc.)
+2. **Directory Patterns**: Files in OpenAPI-related directories (`components/`, `paths/`, `webhooks/`)
+3. **File Extensions**: Standard OpenAPI file extensions
+
+### Key Sorting Algorithm
+
+The plugin uses a unified sorting algorithm that:
+
+1. **Prioritizes Standard Keys**: OpenAPI specification keys are sorted first
+2. **Handles Custom Extensions**: Vendor extensions are positioned relative to standard keys
+3. **Sorts Unknown Keys**: Non-standard keys are sorted alphabetically at the end
+4. **Context-Aware**: Different sorting rules for different OpenAPI contexts (operations, schemas, etc.)
+
+### Performance Optimizations
+
+- **Unified Sorting Function**: Single function handles all sorting scenarios
+- **Lazy Loading**: Vendor extensions are loaded only when needed
+- **Efficient Detection**: Fast file type detection with minimal overhead
+
+## Quality & Reliability
+
+### Comprehensive Testing
+
+- **99 Test Cases**: Covering all major functionality
+- **94.62% Line Coverage**: Extensive test coverage
+- **95.74% Function Coverage**: Nearly complete function testing
+- **Edge Case Testing**: Malformed files, error scenarios, performance
+- **Integration Testing**: Real-world OpenAPI file processing
+
+### Code Quality
+
+- **TypeScript**: Full type safety and IntelliSense support
+- **ESLint**: Strict linting rules for code quality
+- **Prettier**: Consistent code formatting
+- **Security Audits**: Automated dependency vulnerability scanning
+- **Performance Testing**: Large file handling and memory usage
+
+### CI/CD Pipeline
+
+- **Automated Testing**: Runs on every commit and PR
+- **Multi-Environment**: Tests on Node.js 18, 20, 22 and Bun
+- **Quality Gates**: All tests must pass before merge
+- **Smart Releases**: Automatic patch version management
+- **NPM Publishing**: Automated package publishing with proper versioning
+
 ## Contributing
 
-1. Fork the repository
-2. Create a feature branch
-3. Make your changes
-4. Add tests for new functionality
-5. Run the test suite
-6. Submit a pull request
+We welcome contributions! Please follow these steps:
+
+1. **Fork the repository**
+2. **Create a feature branch**: `git checkout -b feature/your-feature-name`
+3. **Make your changes** with proper TypeScript types
+4. **Add tests** for new functionality (aim for 90%+ coverage)
+5. **Run the test suite**:
+   ```bash
+   bun test
+   bun run lint
+   bun run format
+   ```
+6. **Ensure all tests pass** (99 tests, 0 failures)
+7. **Submit a pull request** with a clear description
+
+### Development Guidelines
+
+- **Code Quality**: All code must pass ESLint and Prettier checks
+- **Testing**: New features require comprehensive tests
+- **TypeScript**: Use proper types and interfaces
+- **Documentation**: Update README for new features
+- **CI/CD**: All GitHub Actions must pass before merge
+
+### Release Process
+
+- **Automatic**: Patch releases happen automatically on main branch updates
+- **Manual**: Major/minor releases require manual version bumps
+- **Quality Gates**: All tests, linting, and security checks must pass
+- **NPM Publishing**: Automated publishing with proper versioning
 
 ## License
 
diff --git a/bunfig.toml b/bunfig.toml
new file mode 100644
index 0000000..b2a8f35
--- /dev/null
+++ b/bunfig.toml
@@ -0,0 +1,12 @@
+[test]
+# Test configuration for Bun
+preload = ["./test/setup.ts"]
+timeout = 30000
+coverage = true
+coverageDir = "coverage"
+coverageReporter = ["text", "lcov"]
+
+[install]
+# Install configuration
+cache = true
+production = false
diff --git a/examples/custom-extensions-example.yaml b/examples/custom-extensions-example.yaml
deleted file mode 100644
index b09f8dd..0000000
--- a/examples/custom-extensions-example.yaml
+++ /dev/null
@@ -1,156 +0,0 @@
-# Example OpenAPI file with custom extensions
-# This file demonstrates how custom extensions are handled
-
-openapi: 3.0.0
-info:
-  title: API with Custom Extensions
-  description: This API demonstrates custom extension handling
-  version: 1.0.0
-  x-api-id: "api-12345"  # Custom extension
-  x-version-info: "v1.0.0-beta"  # Custom extension
-  contact:
-    name: API Team
-    email: api@example.com
-    x-team-lead: "John Doe"  # Custom extension
-  license:
-    name: MIT
-    url: https://opensource.org/licenses/MIT
-    x-license-version: "3.0"  # Custom extension
-servers:
-  - url: https://api.example.com/v1
-    description: Production server
-    x-server-region: "us-east-1"  # Custom extension
-    x-load-balancer: "nginx"  # Custom extension
-    variables:
-      environment:
-        default: production
-        x-env-config: "prod-config"  # Custom extension
-paths:
-  /users:
-    get:
-      tags:
-        - users
-      summary: Get all users
-      description: Retrieve a list of all users
-      operationId: getUsers
-      x-rate-limit: 100  # Custom extension
-      x-custom-auth: "bearer"  # Custom extension
-      parameters:
-        - name: limit
-          in: query
-          description: Maximum number of users to return
-          required: false
-          schema:
-            type: integer
-            x-validation: "positive"  # Custom extension
-            x-custom-format: "int32"  # Custom extension
-          x-validation: "max:100"  # Custom extension
-      responses:
-        '200':
-          description: Successful response
-          x-response-time: "50ms"  # Custom extension
-          x-cache-info: "ttl:3600"  # Custom extension
-          content:
-            application/json:
-              schema:
-                type: array
-                items:
-                  $ref: '#/components/schemas/User'
-        '400':
-          description: Bad request
-          x-error-code: "INVALID_REQUEST"  # Custom extension
-    post:
-      tags:
-        - users
-      summary: Create a new user
-      description: Create a new user in the system
-      operationId: createUser
-      x-rate-limit: 50  # Custom extension
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/User'
-      responses:
-        '201':
-          description: User created successfully
-          x-response-time: "100ms"  # Custom extension
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/User'
-components:
-  x-custom-schemas: "enhanced"  # Custom extension
-  schemas:
-    User:
-      type: object
-      x-custom-type: "entity"  # Custom extension
-      required:
-        - id
-        - name
-        - email
-      properties:
-        id:
-          type: integer
-          format: int64
-          x-validation-rules: "unique,positive"  # Custom extension
-        name:
-          type: string
-          x-validation-rules: "min:1,max:100"  # Custom extension
-        email:
-          type: string
-          format: email
-          x-validation-rules: "email,unique"  # Custom extension
-        x-custom-fields:  # Custom extension
-          type: object
-          description: Additional custom fields
-    Error:
-      type: object
-      x-custom-type: "error"  # Custom extension
-      required:
-        - code
-        - message
-      properties:
-        code:
-          type: string
-          x-error-category: "system"  # Custom extension
-        message:
-          type: string
-          x-error-severity: "high"  # Custom extension
-  responses:
-    NotFound:
-      description: Resource not found
-      x-response-time: "10ms"  # Custom extension
-      x-cache-info: "no-cache"  # Custom extension
-  parameters:
-    LimitParam:
-      name: limit
-      in: query
-      description: Maximum number of items to return
-      required: false
-      schema:
-        type: integer
-        x-validation: "positive"  # Custom extension
-      x-validation: "max:1000"  # Custom extension
-  securitySchemes:
-    BearerAuth:
-      type: http
-      scheme: bearer
-      bearerFormat: JWT
-      x-auth-provider: "custom"  # Custom extension
-      x-token-info: "jwt-v2"  # Custom extension
-  x-api-metadata: "enhanced"  # Custom extension
-tags:
-  - name: users
-    description: User management operations
-    x-tag-color: "#3498db"  # Custom extension
-    x-tag-priority: "high"  # Custom extension
-  - name: authentication
-    description: Authentication operations
-    x-tag-color: "#e74c3c"  # Custom extension
-    x-tag-priority: "critical"  # Custom extension
-externalDocs:
-  description: API Documentation
-  url: https://docs.example.com/api
-  x-doc-version: "1.0"  # Custom extension
-  x-doc-language: "en"  # Custom extension
diff --git a/examples/petstore.yaml b/examples/petstore.yaml
deleted file mode 100644
index 86c334c..0000000
--- a/examples/petstore.yaml
+++ /dev/null
@@ -1,224 +0,0 @@
-openapi: 3.0.0
-info:
-  title: Swagger Petstore
-  description: This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.
-  version: 1.0.0
-  termsOfService: http://swagger.io/terms/
-  contact:
-    email: apiteam@swagger.io
-  license:
-    name: Apache 2.0
-    url: http://www.apache.org/licenses/LICENSE-2.0.html
-servers:
-  - url: https://petstore.swagger.io/v2
-  - url: http://petstore.swagger.io/v2
-tags:
-  - name: pet
-    description: Everything about your Pets
-  - name: store
-    description: Access to Petstore orders
-  - name: user
-    description: Operations about user
-paths:
-  /pet:
-    post:
-      tags:
-        - pet
-      summary: Add a new pet to the store
-      description: ""
-      operationId: addPet
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/Pet'
-          application/xml:
-            schema:
-              $ref: '#/components/schemas/Pet'
-      responses:
-        '405':
-          description: Invalid input
-      security:
-        - petstore_auth:
-            - write:pets
-            - read:pets
-    put:
-      tags:
-        - pet
-      summary: Update an existing pet
-      description: ""
-      operationId: updatePet
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/Pet'
-          application/xml:
-            schema:
-              $ref: '#/components/schemas/Pet'
-      responses:
-        '400':
-          description: Invalid ID supplied
-        '404':
-          description: Pet not found
-        '405':
-          description: Validation exception
-      security:
-        - petstore_auth:
-            - write:pets
-            - read:pets
-  /pet/findByStatus:
-    get:
-      tags:
-        - pet
-      summary: Finds Pets by status
-      description: Multiple status values can be provided with comma separated strings
-      operationId: findPetsByStatus
-      parameters:
-        - name: status
-          in: query
-          description: Status values that need to be considered for filter
-          required: true
-          style: form
-          explode: true
-          schema:
-            type: array
-            items:
-              type: string
-              enum:
-                - available
-                - pending
-                - sold
-      responses:
-        '200':
-          description: successful operation
-          content:
-            application/xml:
-              schema:
-                type: array
-                items:
-                  $ref: '#/components/schemas/Pet'
-            application/json:
-              schema:
-                type: array
-                items:
-                  $ref: '#/components/schemas/Pet'
-        '400':
-          description: Invalid status value
-      security:
-        - petstore_auth:
-            - write:pets
-            - read:pets
-components:
-  schemas:
-    Pet:
-      type: object
-      required:
-        - name
-        - photoUrls
-      properties:
-        id:
-          type: integer
-          format: int64
-        category:
-          $ref: '#/components/schemas/Category'
-        name:
-          type: string
-          example: doggie
-        photoUrls:
-          type: array
-          xml:
-            name: photoUrl
-            wrapped: true
-          items:
-            type: string
-        tags:
-          type: array
-          xml:
-            name: tag
-            wrapped: true
-          items:
-            $ref: '#/components/schemas/Tag'
-        status:
-          type: string
-          description: pet status in the store
-          enum:
-            - available
-            - pending
-            - sold
-    Category:
-      type: object
-      properties:
-        id:
-          type: integer
-          format: int64
-        name:
-          type: string
-    Tag:
-      type: object
-      properties:
-        id:
-          type: integer
-          format: int64
-        name:
-          type: string
-    Order:
-      type: object
-      properties:
-        id:
-          type: integer
-          format: int64
-        petId:
-          type: integer
-          format: int64
-        quantity:
-          type: integer
-          format: int32
-        shipDate:
-          type: string
-          format: date-time
-        status:
-          type: string
-          description: Order Status
-          enum:
-            - placed
-            - approved
-            - delivered
-        complete:
-          type: boolean
-          default: false
-    User:
-      type: object
-      properties:
-        id:
-          type: integer
-          format: int64
-        username:
-          type: string
-        firstName:
-          type: string
-        lastName:
-          type: string
-        email:
-          type: string
-        password:
-          type: string
-        phone:
-          type: string
-        userStatus:
-          type: integer
-          description: User Status
-          format: int32
-  securitySchemes:
-    petstore_auth:
-      type: oauth2
-      flows:
-        implicit:
-          authorizationUrl: http://petstore.swagger.io/api/oauth/dialog
-          scopes:
-            write:pets: modify pets in your account
-            read:pets: read your pets
-    api_key:
-      type: apiKey
-      name: api_key
-      in: header
diff --git a/examples/usage.md b/examples/usage.md
deleted file mode 100644
index 0213ca1..0000000
--- a/examples/usage.md
+++ /dev/null
@@ -1,170 +0,0 @@
-# Usage Examples
-
-## Basic Usage
-
-### Format a single file
-```bash
-npx prettier --write examples/petstore.yaml
-```
-
-### Format all OpenAPI files
-```bash
-npx prettier --write "**/*.{openapi.json,openapi.yaml,swagger.json,swagger.yaml}"
-```
-
-## Configuration Examples
-
-### package.json
-```json
-{
-  "name": "my-api-project",
-  "scripts": {
-    "format": "prettier --write \"**/*.{openapi.json,openapi.yaml,swagger.json,swagger.yaml}\""
-  },
-  "prettier": {
-    "plugins": ["prettier-plugin-openapi"],
-    "tabWidth": 2,
-    "printWidth": 80
-  }
-}
-```
-
-### .prettierrc.js
-```javascript
-module.exports = {
-  plugins: ['prettier-plugin-openapi'],
-  tabWidth: 2,
-  printWidth: 80,
-  overrides: [
-    {
-      files: ['*.openapi.json', '*.openapi.yaml', '*.swagger.json', '*.swagger.yaml'],
-      options: {
-        tabWidth: 2,
-        printWidth: 100
-      }
-    }
-  ]
-};
-```
-
-## Before and After Examples
-
-### YAML Example
-
-**Before:**
-```yaml
-components:
-  schemas:
-    User:
-      type: object
-      properties:
-        id:
-          type: integer
-        name:
-          type: string
-openapi: 3.0.0
-info:
-  version: 1.0.0
-  title: My API
-paths:
-  /users:
-    get:
-      responses:
-        '200':
-          description: OK
-```
-
-**After:**
-```yaml
-openapi: 3.0.0
-info:
-  title: My API
-  version: 1.0.0
-paths:
-  /users:
-    get:
-      responses:
-        '200':
-          description: OK
-components:
-  schemas:
-    User:
-      type: object
-      properties:
-        id:
-          type: integer
-        name:
-          type: string
-```
-
-### JSON Example
-
-**Before:**
-```json
-{
-  "paths": {
-    "/users": {
-      "get": {
-        "responses": {
-          "200": {
-            "description": "OK"
-          }
-        }
-      }
-    }
-  },
-  "openapi": "3.0.0",
-  "info": {
-    "title": "My API",
-    "version": "1.0.0"
-  }
-}
-```
-
-**After:**
-```json
-{
-  "openapi": "3.0.0",
-  "info": {
-    "title": "My API",
-    "version": "1.0.0"
-  },
-  "paths": {
-    "/users": {
-      "get": {
-        "responses": {
-          "200": {
-            "description": "OK"
-          }
-        }
-      }
-    }
-  }
-}
-```
-
-## Integration with CI/CD
-
-### GitHub Actions
-```yaml
-name: Format OpenAPI files
-on: [push, pull_request]
-jobs:
-  format:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
-        with:
-          node-version: '18'
-      - run: npm install
-      - run: npx prettier --check "**/*.{openapi.json,openapi.yaml,swagger.json,swagger.yaml}"
-```
-
-### Pre-commit Hook
-```bash
-#!/bin/sh
-# .git/hooks/pre-commit
-npx prettier --write "**/*.{openapi.json,openapi.yaml,swagger.json,swagger.yaml}"
-git add .
-```
diff --git a/package.json b/package.json
index 7b28512..cbe8ed4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prettier-plugin-openapi",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "A Prettier plugin for formatting OpenAPI/Swagger JSON and YAML files",
   "author": {
     "name": "Luke Hagar",
@@ -16,11 +16,38 @@
     "README.md",
     "LICENSE"
   ],
+  "engines": {
+    "node": ">=18.0.0"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/lukehagar/prettier-plugin-openapi.git"
+  },
+  "bugs": {
+    "url": "https://github.com/lukehagar/prettier-plugin-openapi/issues"
+  },
+  "homepage": "https://github.com/lukehagar/prettier-plugin-openapi#readme",
   "scripts": {
     "build": "tsc",
     "dev": "tsc --watch",
+    "pretest": "tsc",
     "test": "bun test",
-    "prepublishOnly": "bun run build"
+    "test:coverage": "bun test --coverage",
+    "test:watch": "bun test --watch",
+    "test:ci": "bun test --reporter=verbose",
+    "lint": "eslint src/**/*.ts test/**/*.ts --ext .ts",
+    "lint:fix": "eslint src/**/*.ts test/**/*.ts --ext .ts --fix",
+    "type-check": "tsc --noEmit",
+    "format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\" \"*.{json,md,yml,yaml}\"",
+    "format:check": "prettier --check \"src/**/*.ts\" \"test/**/*.ts\" \"*.{json,md,yml,yaml}\"",
+    "clean": "rm -rf dist coverage",
+    "prebuild": "bun run clean",
+    "prepublishOnly": "bun run build && bun run test && bun run lint",
+    "publish:package": "npm publish",
+    "version:patch": "npm version patch",
+    "version:minor": "npm version minor",
+    "version:major": "npm version major",
+    "validate": "bun run type-check && bun run lint && bun run test"
   },
   "keywords": [
     "prettier",
@@ -37,6 +64,12 @@
   "devDependencies": {
     "@types/bun": "latest",
     "@types/node": "^20.0.0",
+    "@typescript-eslint/eslint-plugin": "^6.0.0",
+    "@typescript-eslint/parser": "^6.0.0",
+    "eslint": "^8.0.0",
+    "eslint-config-prettier": "^9.0.0",
+    "eslint-plugin-prettier": "^5.0.0",
+    "prettier": "^3.0.0",
     "typescript": "^5.0.0"
   },
   "dependencies": {
diff --git a/src/extensions/example-usage.ts b/src/extensions/example-usage.ts
index 9ee4931..1a4aff9 100644
--- a/src/extensions/example-usage.ts
+++ b/src/extensions/example-usage.ts
@@ -2,28 +2,35 @@
  * Example Vendor Extensions
  */
 
-import { defineVendorExtensions } from './index';
+import { defineConfig } from './index.js';
 
 
 // Complete vendor configuration with smart positioning
-export const config = defineVendorExtensions({
-  'top-level': (before, after) => {
-    return {
-      'x-example-before-info': before('info'), // Before 'info'
-      'x-example-after-paths': after('paths'), // After 'paths'
-    };
+export const config = defineConfig({
+  info: {
+    name: 'Example Vendor',
+    website: 'https://example.com',
+    support: 'support@example.com'
   },
-  'operation': (before, after) => {
-    return {
-      'x-example-before-parameters': before('parameters'), // Before 'parameters'
-      'x-example-after-responses': after('responses'), // After 'responses'
-    };
-  },
-  'schema': (before, after) => {
-    return {
-      'x-example-validation': after('type'), // After 'type'
-      'x-example-example': after('example'), // After 'example'
-    };
+  extensions: {
+    'top-level': (before, after) => {
+      return {
+        'x-example-before-info': before('info'), // Before 'info'
+        'x-example-after-paths': after('paths'), // After 'paths'
+      };
+    },
+    'operation': (before, after) => {
+      return {
+        'x-example-before-parameters': before('parameters'), // Before 'parameters'
+        'x-example-after-responses': after('responses'), // After 'responses'
+      };
+    },
+    'schema': (before, after) => {
+      return {
+        'x-example-validation': after('type'), // After 'type'
+        'x-example-example': after('example'), // After 'example'
+      };
+    }
   }
 });
 
diff --git a/src/extensions/index.ts b/src/extensions/index.ts
index 23c6161..4960f18 100644
--- a/src/extensions/index.ts
+++ b/src/extensions/index.ts
@@ -7,25 +7,24 @@
 
 // Import key arrays for type generation
 import {
-  TOP_LEVEL_KEYS,
-  INFO_KEYS,
-  OPERATION_KEYS,
-  PARAMETER_KEYS,
-  SCHEMA_KEYS,
-  RESPONSE_KEYS,
-  SECURITY_SCHEME_KEYS,
-  SERVER_KEYS,
-  TAG_KEYS,
-  EXTERNAL_DOCS_KEYS,
-  WEBHOOK_KEYS,
-  OAUTH_FLOW_KEYS,
-  CONTACT_KEYS,
-  LICENSE_KEYS,
-  COMPONENTS_KEYS,
-  SERVER_VARIABLE_KEYS,
-  SWAGGER_2_0_KEYS
-} from '../keys';
-import { getVendorExtensions as loadVendorExtensions } from './vendor-loader';
+  RootKeys,
+  InfoKeys,
+  OperationKeys,
+  ParameterKeys,
+  SchemaKeys,
+  ResponseKeys,
+  SecuritySchemeKeys,
+  ServerKeys,
+  TagKeys,
+  ExternalDocsKeys,
+  WebhookKeys,
+  OAuthFlowKeys,
+  ContactKeys,
+  LicenseKeys,
+  ComponentsKeys,
+  ServerVariableKeys,
+} from '../keys.js';
+import { getVendorExtensions as loadVendorExtensions, VendorModule } from './vendor-loader.js';
 
 export interface VendorExtensions {
   [context: string]: (
@@ -51,28 +50,27 @@ export interface VendorExtensions {
 }
 
 // Helper function similar to Vite's defineConfig
-export function defineVendorExtensions(config: VendorExtensions): VendorExtensions {
+export function defineConfig(config: VendorModule): VendorModule {
   return config;
 }
 
 // Type definitions with hover documentation
-export type TopLevelKeys = typeof TOP_LEVEL_KEYS[number];
-export type InfoKeys = typeof INFO_KEYS[number];
-export type OperationKeys = typeof OPERATION_KEYS[number];
-export type ParameterKeys = typeof PARAMETER_KEYS[number];
-export type SchemaKeys = typeof SCHEMA_KEYS[number];
-export type ResponseKeys = typeof RESPONSE_KEYS[number];
-export type SecuritySchemeKeys = typeof SECURITY_SCHEME_KEYS[number];
-export type ServerKeys = typeof SERVER_KEYS[number];
-export type TagKeys = typeof TAG_KEYS[number];
-export type ExternalDocsKeys = typeof EXTERNAL_DOCS_KEYS[number];
-export type WebhookKeys = typeof WEBHOOK_KEYS[number];
-export type OAuthFlowKeys = typeof OAUTH_FLOW_KEYS[number];
-export type ContactKeys = typeof CONTACT_KEYS[number];
-export type LicenseKeys = typeof LICENSE_KEYS[number];
-export type ComponentsKeys = typeof COMPONENTS_KEYS[number];
-export type ServerVariableKeys = typeof SERVER_VARIABLE_KEYS[number];
-export type Swagger20Keys = typeof SWAGGER_2_0_KEYS[number];
+export type TopLevelKeys = typeof RootKeys[number];
+export type InfoKeys = typeof InfoKeys[number];
+export type OperationKeys = typeof OperationKeys[number];
+export type ParameterKeys = typeof ParameterKeys[number];
+export type SchemaKeys = typeof SchemaKeys[number];
+export type ResponseKeys = typeof ResponseKeys[number];
+export type SecuritySchemeKeys = typeof SecuritySchemeKeys[number];
+export type ServerKeys = typeof ServerKeys[number];
+export type TagKeys = typeof TagKeys[number];
+export type ExternalDocsKeys = typeof ExternalDocsKeys[number];
+export type WebhookKeys = typeof WebhookKeys[number];
+export type OAuthFlowKeys = typeof OAuthFlowKeys[number];
+export type ContactKeys = typeof ContactKeys[number];
+export type LicenseKeys = typeof LicenseKeys[number];
+export type ComponentsKeys = typeof ComponentsKeys[number];
+export type ServerVariableKeys = typeof ServerVariableKeys[number];
 
 // Context-specific key types for better IntelliSense
 export interface ContextKeys {
@@ -94,19 +92,19 @@ export interface ContextKeys {
 // Helper function to get available keys for a context
 export function getContextKeys<T extends keyof ContextKeys>(context: T): readonly string[] {
   switch (context) {
-    case 'top-level': return TOP_LEVEL_KEYS;
-    case 'info': return INFO_KEYS;
-    case 'operation': return OPERATION_KEYS;
-    case 'parameter': return PARAMETER_KEYS;
-    case 'schema': return SCHEMA_KEYS;
-    case 'response': return RESPONSE_KEYS;
-    case 'securityScheme': return SECURITY_SCHEME_KEYS;
-    case 'server': return SERVER_KEYS;
-    case 'tag': return TAG_KEYS;
-    case 'externalDocs': return EXTERNAL_DOCS_KEYS;
-    case 'webhook': return WEBHOOK_KEYS;
-    case 'definitions': return SCHEMA_KEYS;
-    case 'securityDefinitions': return SECURITY_SCHEME_KEYS;
+    case 'top-level': return RootKeys;
+    case 'info': return InfoKeys;
+    case 'operation': return OperationKeys;
+    case 'parameter': return ParameterKeys;
+    case 'schema': return SchemaKeys;
+    case 'response': return ResponseKeys;
+    case 'securityScheme': return SecuritySchemeKeys;
+    case 'server': return ServerKeys;
+    case 'tag': return TagKeys;
+    case 'externalDocs': return ExternalDocsKeys;
+    case 'webhook': return WebhookKeys;
+    case 'definitions': return SchemaKeys;
+    case 'securityDefinitions': return SecuritySchemeKeys;
     default: return [];
   }
 }
@@ -130,7 +128,7 @@ export function after<T extends keyof ContextKeys>(context: T, key: string): num
 
 
 // Dynamic vendor loading - loads all vendor files automatically
-export function getVendorExtensions(): Record<string, Record<string, number>> {
-  return loadVendorExtensions();
+export function getVendorExtensions(customVendorModules?: VendorModule[]): Record<string, Record<string, number>> {
+  return loadVendorExtensions(customVendorModules);
 }
 
diff --git a/src/extensions/vendor-loader.ts b/src/extensions/vendor-loader.ts
index 197f7c5..d264e00 100644
--- a/src/extensions/vendor-loader.ts
+++ b/src/extensions/vendor-loader.ts
@@ -1,93 +1,100 @@
 /**
  * Vendor Loader
  * 
- * Automatically loads all vendor files from the vendor directory.
- * Supports any number of TypeScript files for different vendors.
+ * Loads vendor extensions using static imports for ES module compatibility.
  */
 
-import * as fs from 'fs';
-import * as path from 'path';
-import { before, after, ContextKeys } from './index';
+import { before, after, ContextKeys } from './index.js';
 
-// Type for vendor extensions
-export interface VendorExtensions {
-  [context: string]: (before: (key: string) => number, after: (key: string) => number) => {
-    [extensionKey: string]: number;
-  };
-}
+// Import vendor extensions statically
+import { speakeasy } from './vendor/speakeasy.js';
+import { postman } from './vendor/postman.js';
+import { redoc } from './vendor/redoc.js';
+
+// Import vendor extensions statically
+const vendorModules = [
+  // Update this list as new vendors are added
+  speakeasy, 
+  postman, 
+  redoc
+];
 
 // Type for vendor module
 export interface VendorModule {
-  extensions?: VendorExtensions;
+  info: {
+    name: string;
+    website?: string;
+    support?: string;
+  }
+  extensions?: {
+    [context: string]: (before: (key: string) => number, after: (key: string) => number) => {
+      [extensionKey: string]: number;
+    };
+  }
 }
 
 /**
- * Automatically discover and load all vendor files
+ * Load vendor extensions using static imports
+ * This approach is ES module compatible and doesn't require dynamic loading
+ * Handles failures on a per-vendor basis so one failure doesn't break others
+ * Detects and alerts on extension key collisions between vendors
  */
-export function loadAllVendorExtensions(): Record<string, Record<string, number>> {
+export function getVendorExtensions(customVendorModules?: VendorModule[]): Record<string, Record<string, number>> {
   const extensions: Record<string, Record<string, number>> = {};
-  const vendorDir = path.join(__dirname, 'vendor');
+  const extensionSources: Record<string, Record<string, string>> = {}; // Track which vendor defined each extension
   
-  try {
-    // Check if vendor directory exists
-    if (!fs.existsSync(vendorDir)) {
-      console.warn('Vendor directory not found:', vendorDir);
-      return extensions;
-    }
-    
-    // Get all TypeScript files in vendor directory
-    const vendorFiles = fs.readdirSync(vendorDir)
-      .filter(file => file.endsWith('.ts') && !file.endsWith('.d.ts'))
-      .map(file => path.join(vendorDir, file));
-    
-    console.log(`Found ${vendorFiles.length} vendor files:`, vendorFiles.map(f => path.basename(f)));
-    
-    // Load each vendor file
-    for (const vendorFile of vendorFiles) {
-      try {
-        const vendorModule = require(vendorFile) as VendorModule;
-        
-        if (vendorModule && vendorModule.extensions) {
-          console.log(`Loading vendor file: ${path.basename(vendorFile)}`);
-          
-          for (const [context, contextFunction] of Object.entries(vendorModule.extensions)) {
-            if (typeof contextFunction === 'function') {
-              // Create context-specific before/after functions
-              const contextBefore = (key: string) => before(context as keyof ContextKeys, key);
-              const contextAfter = (key: string) => after(context as keyof ContextKeys, key);
-              
-              // Execute the function to get the extensions
-              const contextExtensions = contextFunction(contextBefore, contextAfter);
-              
-              if (!extensions[context]) {
-                extensions[context] = {};
+  // Use custom modules for testing, or default modules for production
+  const modulesToLoad = customVendorModules || vendorModules;
+  
+  for (const vendorModule of modulesToLoad) {
+    try {
+      if (vendorModule && vendorModule.extensions) {
+        for (const [context, contextFunction] of Object.entries(vendorModule.extensions)) {
+          if (typeof contextFunction === 'function') {
+            // Create context-specific before/after functions
+            const contextBefore = (key: string) => before(context as keyof ContextKeys, key);
+            const contextAfter = (key: string) => after(context as keyof ContextKeys, key);
+            
+            // Execute the function to get the extensions
+            const contextExtensions = contextFunction(contextBefore, contextAfter);
+            
+            if (!extensions[context]) {
+              extensions[context] = {};
+            }
+
+            if (!extensionSources[context]) {
+              extensionSources[context] = {};
+            }
+            
+            // Check for collisions before adding extensions
+            for (const [extensionKey, position] of Object.entries(contextExtensions)) {
+              if (extensions[context].hasOwnProperty(extensionKey)) {
+                const existingVendor = extensionSources[context][extensionKey];
+                const currentVendor = vendorModule.info.name;
+                
+                console.warn(
+                  `⚠️  Extension collision detected!\n` +
+                  `   Key: "${extensionKey}" in context "${context}"\n` +
+                  `   Already defined by: ${existingVendor}\n` +
+                  `   Conflicting with: ${currentVendor}\n` +
+                  `   Using position from: ${existingVendor} (${extensions[context][extensionKey]})\n` +
+                  `   Ignoring position from: ${currentVendor} (${position})`
+                );
+
+              } else {
+                // No collision, add the extension
+                extensions[context][extensionKey] = position;
+                extensionSources[context][extensionKey] = vendorModule.info.name;
               }
-              Object.assign(extensions[context], contextExtensions);
             }
           }
         }
-      } catch (error: any) {
-        console.warn(`Failed to load vendor file ${path.basename(vendorFile)}:`, error.message);
       }
+    } catch (error) {
+      // Log the error but continue with other vendors
+      console.warn(`Failed to load ${vendorModule.info.name} extensions`, error);
     }
-  } catch (error) {
-    console.warn('Failed to load vendor extensions:', error);
   }
   
   return extensions;
 }
-
-/**
- * Load vendor extensions with fallback to manual list
- */
-export function getVendorExtensions(): Record<string, Record<string, number>> {
-  try {
-    // Try automatic discovery first
-    return loadAllVendorExtensions();
-  } catch (error) {
-    console.warn('Automatic vendor discovery failed, falling back to empty extensions:', error);
-    
-    // Return empty extensions if automatic discovery fails
-    return {};
-  }
-}
diff --git a/src/extensions/vendor/postman.ts b/src/extensions/vendor/postman.ts
index a41bda2..0b382a2 100644
--- a/src/extensions/vendor/postman.ts
+++ b/src/extensions/vendor/postman.ts
@@ -5,26 +5,33 @@
  * Website: https://postman.com
  */
 
-import { defineVendorExtensions } from "..";
+import { defineConfig } from "../index.js";
 
 // Function-based extensions with before/after helpers
-export const extensions = {
-  'top-level': (before: (key: string) => number, after: (key: string) => number) => {
+export const postman = defineConfig({
+  info: {
+    name: 'Postman',
+    website: 'https://postman.com',
+    support: 'support@postman.com'
+  },
+  extensions: {
+  'top-level': (before, after) => {
     return {
       'x-postman-collection': before('info'), // Before 'info'
       'x-postman-version': after('paths'), // After 'paths'
     };
   },
-  'operation': (before: (key: string) => number, after: (key: string) => number) => {
+  'operation': (before, after) => {
     return {
       'x-postman-test': after('responses'), // After 'responses'
       'x-postman-pre-request': before('parameters'), // Before 'parameters'
     };
   },
-  'schema': (before: (key: string) => number, after: (key: string) => number) => {
+  'schema': (before, after) => {
     return {
       'x-postman-example': after('example'), // After 'example'
       'x-postman-mock': after('deprecated'), // After 'deprecated'
-    };
+      };
+    }
   }
-};
+});
diff --git a/src/extensions/vendor/redoc.ts b/src/extensions/vendor/redoc.ts
index c3752df..d24a98f 100644
--- a/src/extensions/vendor/redoc.ts
+++ b/src/extensions/vendor/redoc.ts
@@ -2,34 +2,41 @@
  * Redoc Extensions
  * 
  * Redoc documentation extensions for OpenAPI formatting.
- * Website: https://redoc.ly
+ * Website: https://redocly.com
  */
 
-import { defineVendorExtensions } from "..";
+import { defineConfig } from "../index.js";
 
 // Function-based extensions with before/after helpers
-export const extensions = {
-  'top-level': (before: (key: string) => number, after: (key: string) => number) => {
+export const redoc = defineConfig({
+  info: {
+    name: 'Redocly',
+    website: 'https://redocly.com',
+    support: 'team@redocly.com'
+  },
+  extensions: {
+  'top-level': (before, after) => {
     return {
       'x-redoc-version': before('info'), // Before 'info'
       'x-redoc-theme': after('paths'), // After 'paths'
     };
   },
-  'info': (before: (key: string) => number, after: (key: string) => number) => {
+  'info': (before, after) => {
     return {
       'x-redoc-info': after('version'), // After 'version'
     };
   },
-  'operation': (before: (key: string) => number, after: (key: string) => number) => {
+  'operation': (before, after) => {
     return {
       'x-redoc-group': after('tags'), // After 'tags'
       'x-redoc-hide': before('responses'), // Before 'responses'
     };
   },
-  'schema': (before: (key: string) => number, after: (key: string) => number) => {
+  'schema': (before, after) => {
     return {
       'x-redoc-example': after('example'), // After 'example'
       'x-redoc-readonly': after('deprecated'), // After 'deprecated'
-    };
+      };
+    }
   }
-};
+});
diff --git a/src/extensions/vendor/speakeasy.ts b/src/extensions/vendor/speakeasy.ts
index eab0111..1b36638 100644
--- a/src/extensions/vendor/speakeasy.ts
+++ b/src/extensions/vendor/speakeasy.ts
@@ -2,80 +2,87 @@
  * Speakeasy SDK Extensions
  * 
  * Speakeasy SDK extensions for OpenAPI formatting.
- * Website: https://speakeasyapi.dev
+ * Website: https://www.speakeasy.com
  */
 
-import { defineVendorExtensions } from '../index';
+import { defineConfig } from "../index.js";
 
 // Function-based extensions with before/after helpers
-export const extensions = {
-  'top-level': (before: (key: string) => number, after: (key: string) => number) => {
-    return {
-      'x-speakeasy-sdk': before('info'), // Before 'info'
-      'x-speakeasy-auth': after('paths'), // After 'paths'
-    };
+export const speakeasy = defineConfig({
+  info: {
+    name: 'Speakeasy',
+    website: 'https://www.speakeasy.com',
+    support: 'support@speakeasy.com'
   },
-  'info': (before: (key: string) => number, after: (key: string) => number) => {
-    return {
-      'x-speakeasy-info': after('version'), // After 'version'
-    };
-  },
-  'operation': (before: (key: string) => number, after: (key: string) => number) => {
-    return {
-      'x-speakeasy-retries': after('parameters'), // After 'parameters'
-      'x-speakeasy-timeout': before('responses'), // Before 'responses'
-      'x-speakeasy-cache': after('servers'), // After 'servers'
-    };
-  },
-  'schema': (before: (key: string) => number, after: (key: string) => number) => {
-    return {
-      'x-speakeasy-validation': after('type'), // After 'type'
-      'x-speakeasy-example': after('example'), // After 'example'
-    };
-  },
-  'parameter': (before: (key: string) => number, after: (key: string) => number) => {
-    return {
-      'x-speakeasy-param': after('schema'), // After 'schema'
-    };
-  },
-  'response': (before: (key: string) => number, after: (key: string) => number) => {
-    return {
-      'x-speakeasy-response': after('description'), // After 'description'
-    };
-  },
-  'securityScheme': (before: (key: string) => number, after: (key: string) => number) => {
-    return {
-      'x-speakeasy-auth': after('type'), // After 'type'
-    };
-  },
-  'server': (before: (key: string) => number, after: (key: string) => number) => {
-    return {
-      'x-speakeasy-server': after('url'), // After 'url'
-    };
-  },
-  'tag': (before: (key: string) => number, after: (key: string) => number) => {
-    return {
-      'x-speakeasy-tag': after('name'), // After 'name'
-    };
-  },
-  'externalDocs': (before: (key: string) => number, after: (key: string) => number) => {
-    return {
-      'x-speakeasy-docs': after('url'), // After 'url'
-    };
-  },
-  'webhook': (before: (key: string) => number, after: (key: string) => number) => {
-    return {
-      'x-speakeasy-webhook': after('operationId'), // After 'operationId'
-    };
-  },
-  'definitions': (before: (key: string) => number, after: (key: string) => number) => {
-    return {
-      'x-speakeasy-definition': after('type'), // After 'type'
-    };
-  },
-  'securityDefinitions': (before: (key: string) => number, after: (key: string) => number) => {
-    return {
-      'x-speakeasy-security': after('type'), // After 'type'
-    };
+  extensions: {
+    'top-level': (before, after) => {
+      return {
+        'x-speakeasy-sdk': before('info'), // Before 'info'
+        'x-speakeasy-auth': after('paths'), // After 'paths'
+      };
+    },
+    'info': (before, after) => {
+      return {
+        'x-speakeasy-info': after('version'), // After 'version'
+      };
+    },
+    'operation': (before, after) => {
+      return {
+        'x-speakeasy-retries': after('parameters'), // After 'parameters'
+        'x-speakeasy-timeout': before('responses'), // Before 'responses'
+        'x-speakeasy-cache': after('servers'), // After 'servers'
+      };
+    },
+    'schema': (before, after) => {
+      return {
+        'x-speakeasy-validation': after('type'), // After 'type'
+        'x-speakeasy-example': after('example'), // After 'example'
+      };
+    },
+    'parameter': (before, after) => {
+      return {
+        'x-speakeasy-param': after('schema'), // After 'schema'
+      };
+    },
+    'response': (before, after) => {
+      return {
+        'x-speakeasy-response': after('description'), // After 'description'
+      };
+    },
+    'securityScheme': (before, after) => {
+      return {
+        'x-speakeasy-auth': after('type'), // After 'type'
+      };
+    },
+    'server': (before, after) => {
+      return {
+        'x-speakeasy-server': after('url'), // After 'url'
+      };
+    },
+    'tag': (before, after) => {
+      return {
+        'x-speakeasy-tag': after('name'), // After 'name'
+      };
+    },
+    'externalDocs': (before, after) => {
+      return {
+        'x-speakeasy-docs': after('url'), // After 'url'
+      };
+    },
+    'webhook': (before, after) => {
+      return {
+        'x-speakeasy-webhook': after('operationId'), // After 'operationId'
+      };
+    },
+    'definitions': (before, after) => {
+      return {
+        'x-speakeasy-definition': after('type'), // After 'type'
+      };
+    },
+    'securityDefinitions': (before, after) => {
+      return {
+        'x-speakeasy-security': after('type'), // After 'type'
+      };
+    }
   }
-};
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/src/index.ts b/src/index.ts
index 136ca90..8bdd4ac 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,25 +1,34 @@
 import { Plugin } from 'prettier';
 import * as yaml from 'js-yaml';
-import { getVendorExtensions } from './extensions';
+import { getVendorExtensions } from './extensions/vendor-loader.js';
 
 import {
-  TOP_LEVEL_KEYS,
-  INFO_KEYS,
-  CONTACT_KEYS,
-  LICENSE_KEYS,
-  COMPONENTS_KEYS,
-  OPERATION_KEYS,
-  PARAMETER_KEYS,
-  SCHEMA_KEYS,
-  RESPONSE_KEYS,
-  SECURITY_SCHEME_KEYS,
-  OAUTH_FLOW_KEYS,
-  SERVER_KEYS,
-  SERVER_VARIABLE_KEYS,
-  TAG_KEYS,
-  EXTERNAL_DOCS_KEYS,
-  WEBHOOK_KEYS
-} from './keys';
+  RootKeys,
+  InfoKeys,
+  ContactKeys,
+  LicenseKeys,
+  ComponentsKeys,
+  OperationKeys,
+  ParameterKeys,
+  SchemaKeys,
+  ResponseKeys,
+  SecuritySchemeKeys,
+  OAuthFlowKeys,
+  ServerKeys,
+  ServerVariableKeys,
+  TagKeys,
+  ExternalDocsKeys,
+  WebhookKeys,
+  PathItemKeys,
+  RequestBodyKeys,
+  MediaTypeKeys,
+  EncodingKeys,
+  HeaderKeys,
+  LinkKeys,
+  ExampleKeys,
+  DiscriminatorKeys,
+  XMLKeys,
+} from './keys.js';
 
 // Type definitions for better type safety
 interface OpenAPINode {
@@ -38,15 +47,7 @@ interface OpenAPIPluginOptions {
 }
 
 // Load vendor extensions
-let vendorExtensions: any = {};
-
-try {
-    vendorExtensions = getVendorExtensions();
-    console.log('Vendor extensions loaded successfully');
-} catch (error) {
-    console.warn('Failed to load vendor extensions:', error);
-    vendorExtensions = {};
-}
+const vendorExtensions = getVendorExtensions();
 
 // ============================================================================
 // FILE DETECTION FUNCTIONS
@@ -60,21 +61,11 @@ function isOpenAPIFile(content: any, filePath?: string): boolean {
         return false;
     }
 
-    // Check for root-level OpenAPI indicators
+    // Check for root-level OpenAPI indicators (most important)
     if (content.openapi || content.swagger) {
         return true;
     }
 
-    // Check for component-like structures
-    if (content.components || content.definitions || content.parameters || content.responses || content.securityDefinitions) {
-        return true;
-    }
-
-    // Check for path-like structures (operations)
-    if (content.paths || isPathObject(content)) {
-        return true;
-    }
-
     // Check file path patterns for common OpenAPI file structures
     // Only accept files in OpenAPI-related directories
     if (filePath) {
@@ -97,8 +88,19 @@ function isOpenAPIFile(content: any, filePath?: string): boolean {
         }
     }
 
+    // Check for component-like structures (only if we have strong indicators)
+    if (content.components || content.definitions || content.parameters || content.responses || content.securityDefinitions) {
+        return true;
+    }
+
+    // Check for path-like structures (operations)
+    if (content.paths || isPathObject(content)) {
+        return true;
+    }
+
     // Check for schema-like structures (but be more strict)
-    if (isSchemaObject(content)) {
+    // Only accept if we have strong schema indicators
+    if (isSchemaObject(content) && (content.$ref || content.allOf || content.oneOf || content.anyOf || content.not || content.properties || content.items)) {
         return true;
     }
 
@@ -137,6 +139,19 @@ function isOpenAPIFile(content: any, filePath?: string): boolean {
         return true;
     }
 
+    // Additional strict check: reject objects that look like generic data
+    // If an object only has simple properties like name, age, etc. without any OpenAPI structure, reject it
+    const keys = Object.keys(content);
+    const hasOnlyGenericProperties = keys.every(key => 
+        !key.startsWith('x-') && // Not a custom extension
+        !['openapi', 'swagger', 'info', 'paths', 'components', 'definitions', 'parameters', 'responses', 'securityDefinitions', 'tags', 'servers', 'webhooks'].includes(key)
+    );
+    
+    if (hasOnlyGenericProperties) {
+        return false;
+    }
+
+    // If none of the above conditions are met, it's not an OpenAPI file
     return false;
 }
 
@@ -152,38 +167,6 @@ function isPathObject(obj: any): boolean {
     return Object.keys(obj).some(key => httpMethods.includes(key.toLowerCase()));
 }
 
-// Map of path patterns to their key ordering
-const KEY_ORDERING_MAP: Record<string, readonly string[]> = {
-    'info': INFO_KEYS,
-    'contact': CONTACT_KEYS,
-    'license': LICENSE_KEYS,
-    'components': COMPONENTS_KEYS,
-    'schemas': [], // Schema properties sorted alphabetically
-    'responses': [], // Response codes sorted numerically
-    'parameters': [], // Parameters sorted alphabetically
-    'securitySchemes': [], // Security schemes sorted alphabetically
-    'paths': [], // Paths sorted by specificity
-    'webhooks': [], // Webhooks sorted by specificity (OpenAPI 3.1+)
-    'servers': SERVER_KEYS,
-    'variables': SERVER_VARIABLE_KEYS,
-    'tags': TAG_KEYS,
-    'externalDocs': EXTERNAL_DOCS_KEYS,
-    // Swagger 2.0 specific
-    'definitions': [], // Definitions sorted alphabetically
-    'securityDefinitions': [], // Security definitions sorted alphabetically
-};
-
-// Map for operation-level keys
-const OPERATION_KEY_ORDERING_MAP: Record<string, readonly string[]> = {
-    'operation': OPERATION_KEYS,
-    'parameter': PARAMETER_KEYS,
-    'schema': SCHEMA_KEYS,
-    'response': RESPONSE_KEYS,
-    'securityScheme': SECURITY_SCHEME_KEYS,
-    'oauthFlow': OAUTH_FLOW_KEYS,
-    'webhook': WEBHOOK_KEYS,
-};
-
 const plugin: Plugin = {
     languages: [
         {
@@ -309,7 +292,7 @@ function sortOpenAPIKeys(obj: any): any {
 
     const sortedKeys = Object.keys(obj).sort((a, b) => {
         // Use the unified sorting function
-        return sortKeys(a, b, TOP_LEVEL_KEYS, topLevelExtensions);
+        return sortKeys(a, b, RootKeys, topLevelExtensions);
     });
 
     const sortedObj: any = {};
@@ -405,7 +388,8 @@ function isSchemaObject(obj: any): boolean {
     
     // Only return true if we have clear schema indicators
     // Must have either schema keywords OR valid type with schema properties
-    return hasSchemaKeywords || (hasValidType && ('properties' in obj || 'items' in obj || 'enum' in obj));
+    // Also require additional schema-specific properties to be more strict
+    return hasSchemaKeywords || (hasValidType && ('properties' in obj || 'items' in obj || 'enum' in obj || 'format' in obj || 'pattern' in obj));
 }
 
 function isResponseObject(obj: any): boolean {
@@ -422,7 +406,10 @@ function isServerObject(obj: any): boolean {
 }
 
 function isTagObject(obj: any): boolean {
-    return obj && typeof obj === 'object' && 'name' in obj;
+    return obj && typeof obj === 'object' && 'name' in obj && typeof obj.name === 'string' && 
+           (Object.keys(obj).length === 1 || // Only name
+            'description' in obj || // name + description
+            'externalDocs' in obj); // name + externalDocs
 }
 
 function isExternalDocsObject(obj: any): boolean {
@@ -434,6 +421,59 @@ function isWebhookObject(obj: any): boolean {
     return obj && typeof obj === 'object' && Object.keys(obj).some(key => httpMethods.includes(key.toLowerCase()));
 }
 
+function isPathItemObject(obj: any): boolean {
+    const httpMethods = ['get', 'post', 'put', 'patch', 'delete', 'head', 'options', 'trace'];
+    return obj && typeof obj === 'object' && Object.keys(obj).some(key => httpMethods.includes(key.toLowerCase()));
+}
+
+function isRequestBodyObject(obj: any): boolean {
+    return obj && typeof obj === 'object' && ('content' in obj || 'description' in obj);
+}
+
+function isMediaTypeObject(obj: any): boolean {
+    return obj && typeof obj === 'object' && ('schema' in obj || 'example' in obj || 'examples' in obj);
+}
+
+function isEncodingObject(obj: any): boolean {
+    return obj && typeof obj === 'object' && ('contentType' in obj || 'style' in obj || 'explode' in obj);
+}
+
+function isHeaderObject(obj: any): boolean {
+    return obj && typeof obj === 'object' && ('description' in obj || 'schema' in obj || 'required' in obj);
+}
+
+function isLinkObject(obj: any): boolean {
+    return obj && typeof obj === 'object' && ('operationRef' in obj || 'operationId' in obj);
+}
+
+function isExampleObject(obj: any): boolean {
+    return obj && typeof obj === 'object' && ('summary' in obj || 'value' in obj || 'externalValue' in obj);
+}
+
+function isDiscriminatorObject(obj: any): boolean {
+    return obj && typeof obj === 'object' && 'propertyName' in obj;
+}
+
+function isXMLObject(obj: any): boolean {
+    return obj && typeof obj === 'object' && ('name' in obj || 'namespace' in obj || 'attribute' in obj);
+}
+
+function isContactObject(obj: any): boolean {
+    return obj && typeof obj === 'object' && ('name' in obj || 'url' in obj || 'email' in obj);
+}
+
+function isLicenseObject(obj: any): boolean {
+    return obj && typeof obj === 'object' && ('name' in obj || 'identifier' in obj || 'url' in obj);
+}
+
+function isOAuthFlowObject(obj: any): boolean {
+    return obj && typeof obj === 'object' && ('authorizationUrl' in obj || 'tokenUrl' in obj || 'scopes' in obj);
+}
+
+function isServerVariableObject(obj: any): boolean {
+    return obj && typeof obj === 'object' && ('enum' in obj || 'default' in obj);
+}
+
 //#endregion
 
 //#region Unified sorting function
@@ -515,6 +555,12 @@ function getContextKey(path: string, obj: any): string {
         if (path.includes('parameters.')) return 'parameter';
         if (path.includes('responses.')) return 'response';
         if (path.includes('securitySchemes.')) return 'securityScheme';
+        if (path.includes('requestBodies.')) return 'requestBody';
+        if (path.includes('headers.')) return 'header';
+        if (path.includes('examples.')) return 'example';
+        if (path.includes('links.')) return 'link';
+        if (path.includes('callbacks.')) return 'callback';
+        if (path.includes('pathItems.')) return 'pathItem';
     }
 
     // Handle nested paths for Swagger 2.0
@@ -524,6 +570,18 @@ function getContextKey(path: string, obj: any): string {
     // Handle nested paths for operations (parameters, responses, etc.)
     if (path.includes('.parameters.') && path.split('.').length > 3) return 'parameter';
     if (path.includes('.responses.') && path.split('.').length > 3) return 'response';
+    if (path.includes('.requestBody.')) return 'requestBody';
+    if (path.includes('.headers.')) return 'header';
+    if (path.includes('.examples.')) return 'example';
+    if (path.includes('.links.')) return 'link';
+    if (path.includes('.content.')) return 'mediaType';
+    if (path.includes('.encoding.')) return 'encoding';
+    if (path.includes('.discriminator.')) return 'discriminator';
+    if (path.includes('.xml.')) return 'xml';
+    if (path.includes('.contact.')) return 'contact';
+    if (path.includes('.license.')) return 'license';
+    if (path.includes('.flows.')) return 'oauthFlow';
+    if (path.includes('.variables.')) return 'serverVariable';
 
     // Check object types as fallback
     if (isOperationObject(obj)) return 'operation';
@@ -535,75 +593,53 @@ function getContextKey(path: string, obj: any): string {
     if (isTagObject(obj)) return 'tag';
     if (isExternalDocsObject(obj)) return 'externalDocs';
     if (isWebhookObject(obj)) return 'webhook';
+    if (isPathItemObject(obj)) return 'pathItem';
+    if (isRequestBodyObject(obj)) return 'requestBody';
+    if (isMediaTypeObject(obj)) return 'mediaType';
+    if (isEncodingObject(obj)) return 'encoding';
+    if (isHeaderObject(obj)) return 'header';
+    if (isLinkObject(obj)) return 'link';
+    if (isExampleObject(obj)) return 'example';
+    if (isDiscriminatorObject(obj)) return 'discriminator';
+    if (isXMLObject(obj)) return 'xml';
+    if (isContactObject(obj)) return 'contact';
+    if (isLicenseObject(obj)) return 'license';
+    if (isOAuthFlowObject(obj)) return 'oauthFlow';
+    if (isServerVariableObject(obj)) return 'serverVariable';
 
     return 'top-level';
 }
 
 function getStandardKeysForContext(contextKey: string): readonly string[] {
     switch (contextKey) {
-        case 'info': return INFO_KEYS;
-        case 'components': return COMPONENTS_KEYS;
-        case 'operation': return OPERATION_KEYS;
-        case 'parameter': return PARAMETER_KEYS;
-        case 'schema': return SCHEMA_KEYS;
-        case 'response': return RESPONSE_KEYS;
-        case 'securityScheme': return SECURITY_SCHEME_KEYS;
-        case 'server': return SERVER_KEYS;
-        case 'tag': return TAG_KEYS;
-        case 'externalDocs': return EXTERNAL_DOCS_KEYS;
-        case 'webhook': return WEBHOOK_KEYS;
-        case 'definitions': return SCHEMA_KEYS; // Definitions use schema keys
-        case 'securityDefinitions': return SECURITY_SCHEME_KEYS; // Security definitions use security scheme keys
-        default: return TOP_LEVEL_KEYS;
+        case 'info': return InfoKeys;
+        case 'components': return ComponentsKeys;
+        case 'operation': return OperationKeys;
+        case 'parameter': return ParameterKeys;
+        case 'schema': return SchemaKeys;
+        case 'response': return ResponseKeys;
+        case 'securityScheme': return SecuritySchemeKeys;
+        case 'server': return ServerKeys;
+        case 'tag': return TagKeys;
+        case 'externalDocs': return ExternalDocsKeys;
+        case 'webhook': return WebhookKeys;
+        case 'pathItem': return PathItemKeys;
+        case 'requestBody': return RequestBodyKeys;
+        case 'mediaType': return MediaTypeKeys;
+        case 'encoding': return EncodingKeys;
+        case 'header': return HeaderKeys;
+        case 'link': return LinkKeys;
+        case 'example': return ExampleKeys;
+        case 'discriminator': return DiscriminatorKeys;
+        case 'xml': return XMLKeys;
+        case 'contact': return ContactKeys;
+        case 'license': return LicenseKeys;
+        case 'oauthFlow': return OAuthFlowKeys;
+        case 'serverVariable': return ServerVariableKeys;
+        case 'definitions': return SchemaKeys; // Definitions use schema keys
+        case 'securityDefinitions': return SecuritySchemeKeys; // Security definitions use security scheme keys
+        default: return RootKeys;
     }
 }
 
-// ============================================================================
-// CONTEXT-SPECIFIC SORTING FUNCTIONS (using unified sortKeys)
-// ============================================================================
-
-function sortOperationKeysWithExtensions(a: string, b: string, customExtensions: Record<string, number>): number {
-    return sortKeys(a, b, OPERATION_KEYS, customExtensions);
-}
-
-function sortParameterKeysWithExtensions(a: string, b: string, customExtensions: Record<string, number>): number {
-    return sortKeys(a, b, PARAMETER_KEYS, customExtensions);
-}
-
-function sortSchemaKeysWithExtensions(a: string, b: string, customExtensions: Record<string, number>): number {
-    return sortKeys(a, b, SCHEMA_KEYS, customExtensions);
-}
-
-function sortResponseKeysWithExtensions(a: string, b: string, customExtensions: Record<string, number>): number {
-    return sortKeys(a, b, RESPONSE_KEYS, customExtensions);
-}
-
-function sortSecuritySchemeKeysWithExtensions(a: string, b: string, customExtensions: Record<string, number>): number {
-    return sortKeys(a, b, SECURITY_SCHEME_KEYS, customExtensions);
-}
-
-function sortServerKeysWithExtensions(a: string, b: string, customExtensions: Record<string, number>): number {
-    return sortKeys(a, b, SERVER_KEYS, customExtensions);
-}
-
-function sortTagKeysWithExtensions(a: string, b: string, customExtensions: Record<string, number>): number {
-    return sortKeys(a, b, TAG_KEYS, customExtensions);
-}
-
-function sortExternalDocsKeysWithExtensions(a: string, b: string, customExtensions: Record<string, number>): number {
-    return sortKeys(a, b, EXTERNAL_DOCS_KEYS, customExtensions);
-}
-
-function sortWebhookKeysWithExtensions(a: string, b: string, customExtensions: Record<string, number>): number {
-    return sortKeys(a, b, WEBHOOK_KEYS, customExtensions);
-}
-
-function sortDefinitionsKeysWithExtensions(a: string, b: string, customExtensions: Record<string, number>): number {
-    return sortKeys(a, b, SCHEMA_KEYS, customExtensions);
-}
-
-function sortSecurityDefinitionsKeysWithExtensions(a: string, b: string, customExtensions: Record<string, number>): number {
-    return sortKeys(a, b, SECURITY_SCHEME_KEYS, customExtensions);
-}
-
 export default plugin;
diff --git a/src/keys.ts b/src/keys.ts
index 7cd0662..d1037cb 100644
--- a/src/keys.ts
+++ b/src/keys.ts
@@ -5,296 +5,604 @@
  * Supports Swagger 2.0, OpenAPI 3.0, 3.1, and 3.2
  */
 
-// Top-level OpenAPI keys in preferred order
+// Top-level keys in preferred order
 // Supports Swagger 2.0, OpenAPI 3.0, 3.1, and 3.2
-export const TOP_LEVEL_KEYS = [
+export const RootKeys = [
+    // Version identifiers
     'swagger',           // Swagger 2.0
     'openapi',           // OpenAPI 3.0+
-    'info',
+
+    // Schema identifier
     'jsonSchemaDialect', // OpenAPI 3.1+
-    'servers',           // OpenAPI 3.0+ (replaces host, basePath, schemes in 2.0)
+
+    'info',
+    'externalDocs',
+
+    // Common sense grouping for a server definition
+    'schemes',           // Swagger 2.0
     'host',              // Swagger 2.0
     'basePath',          // Swagger 2.0
-    'schemes',           // Swagger 2.0
+
+    // Typically short arrays, grouped together higher up
     'consumes',          // Swagger 2.0
     'produces',          // Swagger 2.0
+
+    // Servers is usually really short, and can be helpful to see at the top for quick reference
+    'servers',           // OpenAPI 3.0+ (replaces host, basePath, schemes in 2.0)
+
+    // Security is tiny, keep it at the top.
+    'security',
+
+    // Tags are often fairly long, but given that its a fairly core organizational feature, it's helpful to see at the top for quick reference
+    'tags',
+
+    // Paths are usually the longest block, unless components are used heavily, in which case it can be fairly short.
     'paths',
+
+    // Webhooks are very often a short list, if its included at all, but depending on API structure and usage it can be quite long, having it below paths but above components seems like good placement..
     'webhooks',          // OpenAPI 3.1+
+
+    // Components is usually the longest block when it's heavily used, due to it having sections for reuse in most all other sections.
     'components',        // OpenAPI 3.0+ (replaces definitions, parameters, responses, securityDefinitions in 2.0)
+
     'definitions',       // Swagger 2.0
     'parameters',        // Swagger 2.0
     'responses',         // Swagger 2.0
     'securityDefinitions', // Swagger 2.0
-    'security',
-    'tags',
-    'externalDocs',
 ] as const;
 
-// Info section keys in preferred order
-// Supports all versions with version-specific keys
-export const INFO_KEYS = [
+export const InfoKeys = [
+    // Title is just a name, usually a single short line.
     'title',
-    'summary',            // OpenAPI 3.1+
-    'description',
+
+    // Version is a usually a tiny string, and should be at the top.
     'version',
+
+    // Summary to me has always been a shorter description, seems appropriate to have it above description.
+    'summary',            // OpenAPI 3.1+
+
+    // Description is usually longer if its included alongside a summary. 
+    // I have seen everything from a single line to a veriatable novel.
+    'description',
+
+    // Terms of Service is usually a single line, and should be at the top.
     'termsOfService',
+
+    // Contact and license are multi-line objects when included, so they should be at the bottom.
     'contact',
     'license',
 ] as const;
 
-// Contact section keys in preferred order
-export const CONTACT_KEYS = [
+// This key order should not require explaination.
+// If it does let me know and I'll block you.
+export const ContactKeys = [
     'name',
-    'url',
     'email',
-] as const;
-
-// License section keys in preferred order
-export const LICENSE_KEYS = [
-    'name',
     'url',
 ] as const;
 
-// Components section keys in preferred order
-// OpenAPI 3.0+ only (replaces top-level objects in Swagger 2.0)
-export const COMPONENTS_KEYS = [
-    'schemas',
-    'responses',
-    'parameters',
-    'examples',
-    'requestBodies',
-    'headers',
-    'securitySchemes',
-    'links',
-    'callbacks',
-    'pathItems',          // OpenAPI 3.1+
+export const LicenseKeys = [
+    'name',
+    'identifier',
+    'url',
 ] as const;
 
-// Path operation keys in preferred order
-// Supports all versions with version-specific keys
-export const OPERATION_KEYS = [
-    'tags',
+// A sane ordering for components.
+export const ComponentsKeys = [
+    // Security is almost alwasy present, and very short, put it at the top.
+    'securitySchemes',
+
+    // I have never actually seen path items included in a specification.
+    // That being said, I think the general philosophy of larger items at the top,
+    // with smaller more atomic items used to make up the larger items at the bottom, makes sense.
+    'pathItems',          // OpenAPI 3.1+
+
+    // Parameters can be larger, especially in larger APIs with extremely consistent usage patterns, but almost always shorter than schemas.
+    'parameters',
+
+    // Headers are basically just more parameters.
+    'headers',
+
+    // Request bodies are almost never used, I believe this is because the request bodies are usually so different from endpoint to endpoint.
+    // However, if they are used, Specifying them at this level seems reasonable.
+    'requestBodies',
+
+    // Responses are usually a smaller list, and often only used for global error responses.
+    'responses',
+
+    // Callbacks are essentially another kind of response.
+    'callbacks',
+
+    // Links are programatic ways to link endpoints together.
+    'links',
+
+    // Schemas are frequently the largest block, and are the building blocks that make up most every other section.
+    'schemas',
+
+    // Examples are fairly free form, and logically would be used in schemas, so it make sense to be at the bottom.
+    'examples',
+] as const;
+
+export const OperationKeys = [
+    // Important short info at a glance.
     'summary',
-    'description',
     'operationId',
+    'description',
+    'externalDocs',      // OpenAPI 3.0+
+    'tags',
+    'deprecated',
+
+    // Security is a often short list, and is usually not included at the operation level.
+    'security',
+
+    // Servers is a often short list, and is usually not included at the operation level.
+    'servers',            // OpenAPI 3.0+
+
     'consumes',           // Swagger 2.0
     'produces',           // Swagger 2.0
+
+    // Parameters are ideally added first via $ref, for situations like pagination, and then single endpoint specific parameters inline after.
     'parameters',
+
+    // Request body is going to be shorter that responses, unless the responses are all `$ref`s
     'requestBody',        // OpenAPI 3.0+
+
+    // Responses come after the request because obviously.
     'responses',
-    'schemes',            // Swagger 2.0
+
+    // Callbacks are essentially another kind of response.
     'callbacks',          // OpenAPI 3.0+
-    'deprecated',
-    'security',
-    'servers',            // OpenAPI 3.0+
-    'externalDocs',      // OpenAPI 3.0+
+
+    // Schemes should never have been included at this level, its just silly, but if they are, put them at the bottom.
+    'schemes',            // Swagger 2.0
 ] as const;
 
-// Parameter keys in preferred order
-// Supports all versions with version-specific keys
-export const PARAMETER_KEYS = [
+export const ParameterKeys = [
+    // Important short info at a glance.
     'name',
-    'in',
     'description',
+    'in',
     'required',
     'deprecated',
+
+    // Semantic formatting options for parameters.
     'allowEmptyValue',
     'style',
     'explode',
     'allowReserved',
+
+    // Schema is the core of the parameter, and specifies what the parameter actually is.
     'schema',
-    'example',
-    'examples',
-    // Swagger 2.0 specific
+
+    // Content is similar to schema, and is typically only used for more complex parameters.
+    'content',            // OpenAPI 3.0+
+
+    // Type and format are the most common schema keys, and should be always be paired together.
     'type',               // Swagger 2.0
     'format',             // Swagger 2.0
+
+    // When type is array, items should be present.
+    // collectionFormat is the array equivalent of format.
     'items',              // Swagger 2.0
-    'collectionFormat',    // Swagger 2.0
+    'collectionFormat',   // Swagger 2.0
+
+    // Default is the default value of the parameter when that parameter is not specified.
     'default',            // Swagger 2.0
-    'maximum',            // Swagger 2.0
-    'exclusiveMaximum',   // Swagger 2.0
+
+    // Numeric parameter constraints grouped together
+    // Min before max, multipleOf in the middle, since its essentially steps between.
     'minimum',            // Swagger 2.0
     'exclusiveMinimum',   // Swagger 2.0
-    'maxLength',          // Swagger 2.0
-    'minLength',          // Swagger 2.0
-    'pattern',            // Swagger 2.0
-    'maxItems',           // Swagger 2.0
-    'minItems',           // Swagger 2.0
-    'uniqueItems',        // Swagger 2.0
-    'enum',               // Swagger 2.0
     'multipleOf',         // Swagger 2.0
+    'maximum',            // Swagger 2.0
+    'exclusiveMaximum',   // Swagger 2.0
+
+    // String parameter constraints
+    'pattern',            // Swagger 2.0
+    'minLength',          // Swagger 2.0
+    'maxLength',          // Swagger 2.0
+
+    // Array parameter constraints
+    'minItems',           // Swagger 2.0
+    'maxItems',           // Swagger 2.0
+    'uniqueItems',        // Swagger 2.0
+
+    // Enum is a strict list of allowed values for the parameter.
+    'enum',               // Swagger 2.0
+
+    // Example and examples are perfect directly below the schema.
+    'example',
+    'examples',
 ] as const;
 
-// Schema keys in preferred order
-// Supports all versions with comprehensive JSON Schema support
-export const SCHEMA_KEYS = [
-    // Core JSON Schema keywords
+export const SchemaKeys = [
+
+    // $ref should always be at the top, because when its included there are at most 2 other keys that are present.
     '$ref',               // JSON Schema draft
-    '$schema',            // JSON Schema draft
+
+    // When $id is included it's used as a kind of name, or an id if you will, and should be at the top.
     '$id',                // JSON Schema draft
+
+    // These JSON Schema draft keys are rarely used in my experience.
+    // They seem to all be extremely short, so are fine to be at the top.
+    // Anybody who uses them a lot feel free to weigh in here and make an argument for a different placement.
+
+    // Schema and Vocabulary appear to be universally be external links, so should be grouped.
+    '$schema',            // JSON Schema draft
+    '$vocabulary',        // JSON Schema draft
+
+    // I have no idea on the practical use of these keys, especially in this context,
+    // but someone using them would likely want them close to the top for reference.
     '$anchor',            // JSON Schema draft
     '$dynamicAnchor',     // JSON Schema draft
     '$dynamicRef',        // JSON Schema draft
-    '$vocabulary',        // JSON Schema draft
     '$comment',           // JSON Schema draft
     '$defs',              // JSON Schema draft
     '$recursiveAnchor',   // JSON Schema draft
     '$recursiveRef',      // JSON Schema draft
-    // Basic type and format
+
+    // This is where most non $ref schemas will begin.
+
+    // The info section of the schema.
+    'title',
+    // description and externalDocs logically come after the title, 
+    // describing it in more and more detail.
+    'description',
+    'externalDocs',
+    // Deprecated is a good at a glance key, and stays at the top.
+    'deprecated',
+
+    // This next section describes the type and how it behaves.
+
+    // Type and format should always be grouped together.
     'type',
     'format',
-    'title',
-    'description',
+
+    // Content schema, media type, and encoding are all related to the content of the schema, 
+    // and are similar to format. They should be grouped together.
+    'contentSchema',      // JSON Schema draft
+    'contentMediaType',   // JSON Schema draft
+    'contentEncoding',    // JSON Schema draft
+
+    // Nullable is like format, it specifies how the type can behave, 
+    // and in more recent versions of OpenAPI its directly included in the type field.
+    'nullable',
+
+    // Enum and const are both static entries of allowed values for the schema.
+    // They should be grouped together.
+    'const',
+    'enum',
+
+    // The default value of the schema when that schema is not specified.
+    // Same as with parameters, but at the schema level.
     'default',
+
+    // ReadOnly and WriteOnly are boolean flags and should be grouped together.
+    'readOnly',
+    'writeOnly',
+
+    // Examples when included should be directly below what they are examples of.
     'example',
     'examples',
-    'enum',
-    'const',
-    // Numeric validation
+
+    // Numeric constraints grouped together
+    // Min before max, multipleOf in the middle, since its steps between them.
+    'minimum',
+    'exclusiveMinimum',
     'multipleOf',
     'maximum',
     'exclusiveMaximum',
-    'minimum',
-    'exclusiveMinimum',
-    // String validation
-    'maxLength',
-    'minLength',
+
+    // String constraints grouped together
     'pattern',
-    // Array validation
-    'maxItems',
-    'minItems',
+    'minLength',
+    'maxLength',
+
+    // Array constraints grouped together
     'uniqueItems',
+    'minItems',
+    'maxItems',
     'items',
+
+    // Prefix items describes tuple like array behavior.
     'prefixItems',        // JSON Schema draft
+
+    // Contains specifies a subschema that must be present in the array.
+    // Min and max contains specify the match occurrence constraints for the contains key.
     'contains',           // JSON Schema draft
     'minContains',        // JSON Schema draft
     'maxContains',        // JSON Schema draft
+
+    // After accounting for Items, prefixItems, and contains, unevaluatedItems specifies if additional items are allowed.
+    // This key is either a boolean or a subschema.
+    // Behaves the same as additionalProperties at the object level.
     'unevaluatedItems',   // JSON Schema draft
-    // Object validation
-    'maxProperties',
+
+    // Object constraints grouped together
+    // min and max properties specify how many properties an object can have.
     'minProperties',
-    'required',
-    'properties',
+    'maxProperties',
+
+    // Pattern properties are a way to specify a pattern and schemas for properties that match that pattern.
+    // Additional properties are a way to specify if additional properties are allowed and if so, how they are shaped.
     'patternProperties',
     'additionalProperties',
+
+    // Properties are the actual keys and schemas that make up the object.
+    'properties',
+
+    // Required is a list of those properties that are required to be present in the object.
+    'required',
+
+    // Unevaluated properties specifies if additional properties are allowed after applying all other validation rules.
+    // This is more powerful than additionalProperties as it considers the effects of allOf, anyOf, oneOf, etc.
     'unevaluatedProperties', // JSON Schema draft
+
+    // Property names defines a schema that property names must conform to.
+    // This is useful for validating that all property keys follow a specific pattern or format.
     'propertyNames',      // JSON Schema draft
+
+    // Dependent required specifies properties that become required when certain other properties are present.
+    // This allows for conditional requirements based on the presence of specific properties.
     'dependentRequired',  // JSON Schema draft
+
+    // Dependent schemas defines schemas that apply when certain properties are present.
+    // This allows for conditional validation rules based on the presence of specific properties.
+    // For example, if a property is present, a certain other property must also be present, and match a certain schema.
     'dependentSchemas',   // JSON Schema draft
-    // Schema composition
+
+    // Discriminator is a way to specify a property that differentiates between different types of objects.
+    // This is useful for polymorphic schemas, and should go above the schema composition keys.
+    'discriminator',
+
+    // Schema composition keys grouped together
+    // allOf, anyOf, oneOf, and not are all used to compose schemas from other schemas.
+    // allOf is a logical AND, 
+    // anyOf is a logical OR, 
+    // oneOf is a logical XOR, 
+    // and not is a logical NOT.
     'allOf',
-    'oneOf',
     'anyOf',
+    'oneOf',
     'not',
+
+    // Conditional keys grouped together
     'if',                 // JSON Schema draft
     'then',               // JSON Schema draft
     'else',               // JSON Schema draft
-    // OpenAPI specific
-    'discriminator',
+
+    // XML is a way to specify the XML serialization of the schema.
+    // This is useful for APIs that need to support XML serialization.
     'xml',
-    'externalDocs',
-    'deprecated',
-    // Additional JSON Schema keywords
-    'contentEncoding',    // JSON Schema draft
-    'contentMediaType',   // JSON Schema draft
-    'contentSchema',      // JSON Schema draft
 ] as const;
 
-// Response keys in preferred order
-// Supports all versions with version-specific keys
-export const RESPONSE_KEYS = [
+export const ResponseKeys = [
+    // Description is a good at a glance key, and stays at the top.
     'description',
+
+    // Headers are a common key, and should be at the top.
     'headers',
-    'content',             // OpenAPI 3.0+
+
+    // Schema and content are the core shape of the response.
     'schema',              // Swagger 2.0
+    'content',             // OpenAPI 3.0+
+
+    // Examples are of the schema, and should be directly below the schema.
     'examples',            // Swagger 2.0
+
+    // Links are programatic ways to link responses together.
     'links',               // OpenAPI 3.0+
 ] as const;
 
-// Security scheme keys in preferred order
-// Supports all versions with version-specific keys
-export const SECURITY_SCHEME_KEYS = [
-    'type',
-    'description',
+export const SecuritySchemeKeys = [
+    // Good at a glance keys.
     'name',
+    'description',
+
+    // The primary type of this security scheme
+    'type',
     'in',
     'scheme',
+
+    // If scheme is bearer, bearerFormat is the format of the bearer token.
+    // Should be directly below scheme.
     'bearerFormat',
-    'flows',               // OpenAPI 3.0+
+
+    // If scheme is openIdConnect, openIdConnectUrl is the URL of the OpenID Connect server.
     'openIdConnectUrl',
-    // Swagger 2.0 specific
+
+    // Flows are the different ways to authenticate with this security scheme.
+    'flows',               // OpenAPI 3.0+
+
     'flow',                // Swagger 2.0
     'authorizationUrl',    // Swagger 2.0
     'tokenUrl',            // Swagger 2.0
     'scopes',              // Swagger 2.0
 ] as const;
 
-// OAuth flow keys in preferred order
-// OpenAPI 3.0+ OAuth flows
-export const OAUTH_FLOW_KEYS = [
+export const OAuthFlowKeys = [
+    // Authorization URL is where the client can get an authorization code.
     'authorizationUrl',
+
+    // Token URL is where the client can get a token.
     'tokenUrl',
+
+    // Refresh URL is where the client can refresh a token.
     'refreshUrl',
+
+    // Scopes are the different scopes that can be used with this security scheme.
     'scopes',
 ] as const;
 
-// Server keys in preferred order
-export const SERVER_KEYS = [
-    'url',
+export const ServerKeys = [
+    // Name first because obviously.
+    'name',           // OpenAPI 3.2+
+
+    // Description so you know what you are looking at.
     'description',
+
+    // URL is the URL of the server.
+    'url',
+
+    // Variables are the different variables that are present in the URL.
     'variables',
 ] as const;
 
-// Server variable keys in preferred order
-export const SERVER_VARIABLE_KEYS = [
-    'enum',
-    'default',
+export const ServerVariableKeys = [
+    // Description so you know what you are looking at.
     'description',
+
+    // Default is the default value of the variable when that variable is not specified.
+    // IMO this should be optional, but I was not consulted.
+    'default',
+
+    // Enum is a static list of allowed values for the variable.
+    'enum',
 ] as const;
 
-// Tag keys in preferred order
-export const TAG_KEYS = [
+export const TagKeys = [
+    // Name first because obviously.
     'name',
+
+    // Description so you know what you are looking at.
     'description',
+
+    // External docs should be like an extension of the description.
     'externalDocs',
 ] as const;
 
-// External docs keys in preferred order
-export const EXTERNAL_DOCS_KEYS = [
+// The only sane key order, fight me.
+export const ExternalDocsKeys = [
     'description',
     'url',
 ] as const;
 
-// Swagger 2.0 specific keys
-export const SWAGGER_2_0_KEYS = [
-    'swagger',
-    'info',
-    'host',
-    'basePath',
-    'schemes',
-    'consumes',
-    'produces',
-    'paths',
-    'definitions',
-    'parameters',
-    'responses',
-    'securityDefinitions',
-    'security',
-    'tags',
-    'externalDocs',
-] as const;
-
-// Webhook keys (OpenAPI 3.1+)
-export const WEBHOOK_KEYS = [
-    'tags',
+// This seems like an obvious order given out running philosophy.
+export const WebhookKeys = [
     'summary',
-    'description',
     'operationId',
+    'description',
+    'deprecated',
+    'tags',
+    'security',
+    'servers',
     'parameters',
     'requestBody',
     'responses',
     'callbacks',
-    'deprecated',
-    'security',
-    'servers',
+] as const;
+
+// Short blocks at the top, long at the bottom.
+export const PathItemKeys = [
+    '$ref',
+    'summary',
+    'description',
+    'servers',
+    'parameters',
+    'get',
+    'put',
+    'post',
+    'delete',
+    'options',
+    'head',
+    'patch',
+    'trace',
+] as const;
+
+// Simple/short first
+export const RequestBodyKeys = [
+    'description',
+    'required',
+    'content',
+] as const;
+
+// These are a bit trickier, all seem rather long in context.
+// I'll with this order since it seems less to more complex.
+export const MediaTypeKeys = [
+    'schema',
+    'example',
+    'examples',
+    'encoding',
+] as const;
+
+export const EncodingKeys = [
+    // Content type is just MIME type.
+    'contentType',
+
+    // Style, explode, and allowReserved are simple string or boolean values.
+    'style',
+    'explode',
+    'allowReserved',
+
+    // Headers is longer, put it at the bottom.
+    'headers',
+] as const;
+
+export const HeaderKeys = [
+    // Description is a good at a glance key, and stays at the top.
+    'description',
+    'required',
+    'deprecated',
+
+    'schema',
+    'content',
+    'type',
+    'format',
+    'style',
+    'explode',
+    'enum',
+    'default',
+    'example',
+    'examples',
+
+    // Array keys grouped together
+    'items',
+    'collectionFormat',
+    // Array constraints grouped together
+    'maxItems',
+    'minItems',
+    'uniqueItems',
+
+    // Numeric constraints grouped together
+    'minimum',
+    'multipleOf',
+    'exclusiveMinimum',
+    'maximum',
+    'exclusiveMaximum',
+
+    // String constraints grouped together
+    'pattern',
+    'minLength',
+    'maxLength',
+] as const;
+
+export const LinkKeys = [
+    'operationId',
+    'description',
+    'server',
+    'operationRef',
+    'parameters',
+    'requestBody',
+] as const;
+
+export const ExampleKeys = [
+    'summary',
+    'description',
+    'value',
+    'externalValue',
+] as const;
+
+// Discriminator keys in preferred order (OpenAPI 3.0+)
+export const DiscriminatorKeys = [
+    'propertyName',
+    'mapping',
+] as const;
+
+// XML keys in preferred order (OpenAPI 3.0+)
+export const XMLKeys = [
+    'name',
+    'namespace',
+    'prefix',
+    'attribute',
+    'wrapped',
 ] as const;
diff --git a/test/build.test.ts b/test/build.test.ts
new file mode 100644
index 0000000..058509d
--- /dev/null
+++ b/test/build.test.ts
@@ -0,0 +1,186 @@
+import { describe, expect, it } from 'bun:test';
+import * as fs from 'fs';
+import * as path from 'path';
+
+describe('Build Tests', () => {
+  describe('Build artifacts', () => {
+    it('should create dist directory', () => {
+      const distPath = path.join(process.cwd(), 'dist');
+      expect(fs.existsSync(distPath)).toBe(true);
+    });
+
+    it('should create main index.js file', () => {
+      const indexPath = path.join(process.cwd(), 'dist', 'index.js');
+      expect(fs.existsSync(indexPath)).toBe(true);
+    });
+
+    it('should create TypeScript declaration files', () => {
+      const dtsPath = path.join(process.cwd(), 'dist', 'index.d.ts');
+      expect(fs.existsSync(dtsPath)).toBe(true);
+    });
+
+    it('should create source map files', () => {
+      const mapPath = path.join(process.cwd(), 'dist', 'index.js.map');
+      expect(fs.existsSync(mapPath)).toBe(true);
+    });
+
+    it('should have valid JavaScript in dist/index.js', () => {
+      const indexPath = path.join(process.cwd(), 'dist', 'index.js');
+      const content = fs.readFileSync(indexPath, 'utf-8');
+      
+      // Should not contain TypeScript syntax
+      expect(content).not.toContain(': string');
+      expect(content).not.toContain(': number');
+      expect(content).not.toContain('interface ');
+      // Note: 'type ' might appear in comments or strings, so we check for type annotations instead
+      expect(content).not.toMatch(/\btype\s+[A-Z]/);
+      
+      // Should be valid JavaScript (but may contain ES module syntax)
+      // We can't use new Function() with ES modules, so we just check it's not empty
+      expect(content.length).toBeGreaterThan(0);
+    });
+
+    it('should export the plugin as default export', () => {
+      const indexPath = path.join(process.cwd(), 'dist', 'index.js');
+      const content = fs.readFileSync(indexPath, 'utf-8');
+      
+      // Should have default export
+      expect(content).toContain('export default');
+    });
+
+    it('should have proper module structure', () => {
+      const indexPath = path.join(process.cwd(), 'dist', 'index.js');
+      const content = fs.readFileSync(indexPath, 'utf-8');
+      
+      // Should be ES module
+      expect(content).toContain('import');
+      expect(content).toContain('export');
+    });
+  });
+
+  describe('Package.json validation', () => {
+    it('should have correct main field', () => {
+      const packageJson = JSON.parse(fs.readFileSync('package.json', 'utf-8'));
+      expect(packageJson.main).toBe('dist/index.js');
+    });
+
+    it('should have correct module field', () => {
+      const packageJson = JSON.parse(fs.readFileSync('package.json', 'utf-8'));
+      expect(packageJson.module).toBe('dist/index.js');
+    });
+
+    it('should have correct type field', () => {
+      const packageJson = JSON.parse(fs.readFileSync('package.json', 'utf-8'));
+      expect(packageJson.type).toBe('module');
+    });
+
+    it('should include dist in files array', () => {
+      const packageJson = JSON.parse(fs.readFileSync('package.json', 'utf-8'));
+      expect(packageJson.files).toContain('dist');
+    });
+
+    it('should have required metadata', () => {
+      const packageJson = JSON.parse(fs.readFileSync('package.json', 'utf-8'));
+      
+      expect(packageJson.name).toBeDefined();
+      expect(packageJson.version).toBeDefined();
+      expect(packageJson.description).toBeDefined();
+      expect(packageJson.author).toBeDefined();
+      expect(packageJson.license).toBeDefined();
+      expect(packageJson.keywords).toBeDefined();
+      expect(packageJson.repository).toBeDefined();
+      expect(packageJson.bugs).toBeDefined();
+      expect(packageJson.homepage).toBeDefined();
+    });
+
+    it('should have correct peer dependencies', () => {
+      const packageJson = JSON.parse(fs.readFileSync('package.json', 'utf-8'));
+      expect(packageJson.peerDependencies).toBeDefined();
+      expect(packageJson.peerDependencies.prettier).toBeDefined();
+    });
+
+    it('should have correct engines requirement', () => {
+      const packageJson = JSON.parse(fs.readFileSync('package.json', 'utf-8'));
+      expect(packageJson.engines).toBeDefined();
+      expect(packageJson.engines.node).toBe('>=18.0.0');
+    });
+  });
+
+  describe('NPM package validation', () => {
+    it('should have all required files for npm publish', () => {
+      const requiredFiles = [
+        'dist/index.js',
+        'dist/index.d.ts',
+        'dist/index.js.map',
+        'README.md',
+        'package.json'
+      ];
+
+      requiredFiles.forEach(file => {
+        const filePath = path.join(process.cwd(), file);
+        expect(fs.existsSync(filePath)).toBe(true);
+      });
+    });
+
+    it('should not include development files in npm package', () => {
+      const excludedFiles = [
+        'src/',
+        'test/',
+        '.github/',
+        '.husky/',
+        '.eslintrc.js',
+        '.prettierrc.js',
+        'tsconfig.json',
+        'bunfig.toml'
+      ];
+
+      // These files should not be in the npm package
+      // (This is handled by .npmignore, but we can verify the ignore file exists)
+      expect(fs.existsSync('.npmignore')).toBe(true);
+    });
+
+    it('should have valid package.json for npm', () => {
+      const packageJson = JSON.parse(fs.readFileSync('package.json', 'utf-8'));
+      
+      // Required fields for npm
+      expect(packageJson.name).toBeTruthy();
+      expect(packageJson.version).toBeTruthy();
+      expect(packageJson.main).toBeTruthy();
+      expect(packageJson.license).toBeTruthy();
+      
+      // Should not have private field (or it should be false)
+      if (packageJson.private !== undefined) {
+        expect(packageJson.private).toBe(false);
+      }
+    });
+  });
+
+  describe('TypeScript compilation', () => {
+    it('should compile without errors', () => {
+      // This test assumes the build has already been run
+      // In a real scenario, you might want to run tsc programmatically
+      const distPath = path.join(process.cwd(), 'dist');
+      expect(fs.existsSync(distPath)).toBe(true);
+    });
+
+    it('should generate declaration files', () => {
+      const dtsPath = path.join(process.cwd(), 'dist', 'index.d.ts');
+      const content = fs.readFileSync(dtsPath, 'utf-8');
+      
+      // Should contain type declarations
+      expect(content).toContain('declare');
+      expect(content).toContain('export');
+    });
+
+    it('should generate source maps', () => {
+      const mapPath = path.join(process.cwd(), 'dist', 'index.js.map');
+      const content = fs.readFileSync(mapPath, 'utf-8');
+      const sourceMap = JSON.parse(content);
+      
+      // Should be valid source map
+      expect(sourceMap.version).toBeDefined();
+      expect(sourceMap.sources).toBeDefined();
+      expect(sourceMap.mappings).toBeDefined();
+    });
+  });
+});
diff --git a/test/coverage.test.ts b/test/coverage.test.ts
new file mode 100644
index 0000000..e335200
--- /dev/null
+++ b/test/coverage.test.ts
@@ -0,0 +1,363 @@
+import { describe, expect, it } from 'bun:test';
+import plugin from '../src/index';
+
+describe('Coverage Tests', () => {
+  describe('Error handling and edge cases', () => {
+    it('should handle null and undefined content', () => {
+      const jsonParser = plugin.parsers?.['openapi-json-parser'];
+      expect(jsonParser).toBeDefined();
+
+      // Test with null content
+      expect(() => {
+        // @ts-ignore We are testing edge cases
+        jsonParser?.parse('null', {});
+      }).toThrow();
+
+      // Test with undefined content
+      expect(() => {
+        // @ts-ignore We are testing edge cases
+        jsonParser?.parse('undefined', {});
+      }).toThrow();
+    });
+
+    it('should handle non-object content', () => {
+      const jsonParser = plugin.parsers?.['openapi-json-parser'];
+      expect(jsonParser).toBeDefined();
+
+      // Test with string content
+      expect(() => {
+        // @ts-ignore We are testing edge cases
+        jsonParser?.parse('"string"', {});
+      }).toThrow();
+
+      // Test with number content
+      expect(() => {
+        // @ts-ignore We are testing edge cases
+        jsonParser?.parse('123', {});
+      }).toThrow();
+    });
+
+    it('should handle array content', () => {
+      const jsonParser = plugin.parsers?.['openapi-json-parser'];
+      expect(jsonParser).toBeDefined();
+
+      // Test with array content
+      expect(() => {
+        // @ts-ignore We are testing edge cases
+        jsonParser?.parse('[]', {});
+      }).toThrow();
+    });
+
+    it('should handle malformed JSON', () => {
+      const jsonParser = plugin.parsers?.['openapi-json-parser'];
+      expect(jsonParser).toBeDefined();
+
+      // Test with malformed JSON
+      expect(() => {
+        // @ts-ignore We are testing edge cases
+        jsonParser?.parse('{invalid json}', {});
+      }).toThrow('Failed to parse OpenAPI JSON');
+    });
+
+    it('should handle malformed YAML', () => {
+      const yamlParser = plugin.parsers?.['openapi-yaml-parser'];
+      expect(yamlParser).toBeDefined();
+
+      // Test with malformed YAML
+      expect(() => {
+        // @ts-ignore We are testing edge cases
+        yamlParser?.parse('invalid: yaml: content:', {});
+      }).toThrow('Failed to parse OpenAPI YAML');
+    });
+  });
+
+  describe('File path detection', () => {
+    it('should detect OpenAPI files in component directories', () => {
+      const yamlParser = plugin.parsers?.['openapi-yaml-parser'];
+      expect(yamlParser).toBeDefined();
+
+      const testYaml = `type: object
+properties:
+  id:
+    type: integer`;
+
+      // Test various component directory patterns
+      const paths = [
+        'components/schemas/User.yaml',
+        'components/parameters/UserId.yaml',
+        'components/responses/UserResponse.yaml',
+        'components/requestBodies/UserCreateBody.yaml',
+        'components/headers/RateLimitHeaders.yaml',
+        'components/examples/UserExample.yaml',
+        'components/securitySchemes/BearerAuth.yaml',
+        'components/links/UserCreatedLink.yaml',
+        'components/callbacks/NewMessageCallback.yaml',
+        'webhooks/messageCreated.yaml',
+        'paths/users.yaml'
+      ];
+
+      paths.forEach(path => {
+        // @ts-ignore We are testing edge cases
+        const result = yamlParser?.parse(testYaml, { filepath: path });
+        expect(result).toBeDefined();
+        expect(result?.type).toBe('openapi-yaml');
+      });
+    });
+
+    it('should handle files without filepath', () => {
+      const yamlParser = plugin.parsers?.['openapi-yaml-parser'];
+      expect(yamlParser).toBeDefined();
+
+      const testYaml = `openapi: 3.0.0
+info:
+  title: Test API
+  version: 1.0.0`;
+
+      // @ts-ignore We are testing edge cases
+      const result = yamlParser?.parse(testYaml, {});
+      expect(result).toBeDefined();
+      expect(result?.type).toBe('openapi-yaml');
+    });
+  });
+
+  describe('Object type detection', () => {
+    it('should detect operation objects', () => {
+      const yamlParser = plugin.parsers?.['openapi-yaml-parser'];
+      expect(yamlParser).toBeDefined();
+
+      const operationYaml = `get:
+  summary: Get users
+  responses:
+    '200':
+      description: Success`;
+
+      // @ts-ignore We are testing edge cases
+      const result = yamlParser?.parse(operationYaml, { filepath: 'paths/users.yaml' });
+      expect(result).toBeDefined();
+      expect(result?.type).toBe('openapi-yaml');
+    });
+
+    it('should detect parameter objects', () => {
+      const yamlParser = plugin.parsers?.['openapi-yaml-parser'];
+      expect(yamlParser).toBeDefined();
+
+      const parameterYaml = `name: id
+in: path
+required: true
+schema:
+  type: integer`;
+
+      // @ts-ignore We are testing edge cases
+      const result = yamlParser?.parse(parameterYaml, { filepath: 'components/parameters/UserId.yaml' });
+      expect(result).toBeDefined();
+      expect(result?.type).toBe('openapi-yaml');
+    });
+
+    it('should detect schema objects', () => {
+      const yamlParser = plugin.parsers?.['openapi-yaml-parser'];
+      expect(yamlParser).toBeDefined();
+
+      const schemaYaml = `type: object
+properties:
+  id:
+    type: integer
+  name:
+    type: string
+required:
+  - id`;
+
+      // @ts-ignore We are testing edge cases
+      const result = yamlParser?.parse(schemaYaml, { filepath: 'components/schemas/User.yaml' });
+      expect(result).toBeDefined();
+      expect(result?.type).toBe('openapi-yaml');
+    });
+
+    it('should detect response objects', () => {
+      const yamlParser = plugin.parsers?.['openapi-yaml-parser'];
+      expect(yamlParser).toBeDefined();
+
+      const responseYaml = `description: User response
+content:
+  application/json:
+    schema:
+      type: object`;
+
+      // @ts-ignore We are testing edge cases
+      const result = yamlParser?.parse(responseYaml, { filepath: 'components/responses/UserResponse.yaml' });
+      expect(result).toBeDefined();
+      expect(result?.type).toBe('openapi-yaml');
+    });
+
+    it('should detect security scheme objects', () => {
+      const yamlParser = plugin.parsers?.['openapi-yaml-parser'];
+      expect(yamlParser).toBeDefined();
+
+      const securityYaml = `type: http
+scheme: bearer
+bearerFormat: JWT`;
+
+      // @ts-ignore We are testing edge cases
+      const result = yamlParser?.parse(securityYaml, { filepath: 'components/securitySchemes/BearerAuth.yaml' });
+      expect(result).toBeDefined();
+      expect(result?.type).toBe('openapi-yaml');
+    });
+
+    it('should detect server objects', () => {
+      const yamlParser = plugin.parsers?.['openapi-yaml-parser'];
+      expect(yamlParser).toBeDefined();
+
+      const serverYaml = `url: https://api.example.com
+description: Production server`;
+
+      // @ts-ignore We are testing edge cases
+      const result = yamlParser?.parse(serverYaml, { filepath: 'servers/production.yaml' });
+      expect(result).toBeDefined();
+      expect(result?.type).toBe('openapi-yaml');
+    });
+
+    it('should detect tag objects', () => {
+      const yamlParser = plugin.parsers?.['openapi-yaml-parser'];
+      expect(yamlParser).toBeDefined();
+
+      const tagYaml = `name: users
+description: User management operations`;
+
+      // @ts-ignore We are testing edge cases
+      const result = yamlParser?.parse(tagYaml, { filepath: 'tags/users.yaml' });
+      expect(result).toBeDefined();
+      expect(result?.type).toBe('openapi-yaml');
+    });
+
+    it('should detect external docs objects', () => {
+      const yamlParser = plugin.parsers?.['openapi-yaml-parser'];
+      expect(yamlParser).toBeDefined();
+
+      const externalDocsYaml = `url: https://example.com/docs
+description: External documentation`;
+
+      // @ts-ignore We are testing edge cases
+      const result = yamlParser?.parse(externalDocsYaml, { filepath: 'externalDocs/api.yaml' });
+      expect(result).toBeDefined();
+      expect(result?.type).toBe('openapi-yaml');
+    });
+
+    it('should detect webhook objects', () => {
+      const yamlParser = plugin.parsers?.['openapi-yaml-parser'];
+      expect(yamlParser).toBeDefined();
+
+      const webhookYaml = `post:
+  summary: New message webhook
+  responses:
+    '200':
+      description: Success`;
+
+      // @ts-ignore We are testing edge cases
+      const result = yamlParser?.parse(webhookYaml, { filepath: 'webhooks/messageCreated.yaml' });
+      expect(result).toBeDefined();
+      expect(result?.type).toBe('openapi-yaml');
+    });
+  });
+
+  describe('Sorting functions', () => {
+    it('should handle path sorting by specificity', () => {
+      const jsonPrinter = plugin.printers?.['openapi-json-ast'];
+      expect(jsonPrinter).toBeDefined();
+
+      const testData = {
+        content: {
+          openapi: '3.0.0',
+          info: { title: 'Test API', version: '1.0.0' },
+          paths: {
+            '/users/{id}': { get: {} },
+            '/users': { get: {} },
+            '/users/{id}/posts': { get: {} }
+          }
+        }
+      };
+
+      // @ts-ignore We are testing edge cases
+      const result = jsonPrinter?.print({ getValue: () => testData }, { tabWidth: 2 }, () => '');
+      expect(result).toBeDefined();
+      
+      if (result && typeof result === 'string') {
+        const formatted = JSON.parse(result);
+        const pathKeys = Object.keys(formatted.paths);
+        // Paths should be sorted (the exact order may vary based on implementation)
+        expect(pathKeys).toContain('/users');
+        expect(pathKeys).toContain('/users/{id}');
+        expect(pathKeys).toContain('/users/{id}/posts');
+      }
+    });
+
+    it('should handle response code sorting', () => {
+      const jsonPrinter = plugin.printers?.['openapi-json-ast'];
+      expect(jsonPrinter).toBeDefined();
+
+      const testData = {
+        content: {
+          openapi: '3.0.0',
+          info: { title: 'Test API', version: '1.0.0' },
+          paths: {
+            '/test': {
+              get: {
+                responses: {
+                  '500': { description: 'Server Error' },
+                  '200': { description: 'Success' },
+                  '400': { description: 'Bad Request' }
+                }
+              }
+            }
+          }
+        }
+      };
+
+      // @ts-ignore We are testing edge cases
+      const result = jsonPrinter?.print({ getValue: () => testData }, { tabWidth: 2 }, () => '');
+      expect(result).toBeDefined();
+      
+      if (result && typeof result === 'string') {
+        const formatted = JSON.parse(result);
+        const responseKeys = Object.keys(formatted.paths['/test'].get.responses);
+        // Response codes should be sorted numerically
+        expect(responseKeys[0]).toBe('200');
+        expect(responseKeys[1]).toBe('400');
+        expect(responseKeys[2]).toBe('500');
+      }
+    });
+  });
+
+  describe('Context key detection', () => {
+    it('should handle nested path contexts', () => {
+      const jsonPrinter = plugin.printers?.['openapi-json-ast'];
+      expect(jsonPrinter).toBeDefined();
+
+      const testData = {
+        content: {
+          openapi: '3.0.0',
+          info: { title: 'Test API', version: '1.0.0' },
+          components: {
+            schemas: {
+              User: {
+                type: 'object',
+                properties: {
+                  id: { type: 'integer' },
+                  name: { type: 'string' }
+                }
+              }
+            }
+          }
+        }
+      };
+
+      // @ts-ignore We are testing edge cases
+      const result = jsonPrinter?.print({ getValue: () => testData }, { tabWidth: 2 }, () => '');
+      expect(result).toBeDefined();
+      
+      if (result && typeof result === 'string') {
+        const formatted = JSON.parse(result);
+        expect(formatted.components.schemas.User).toBeDefined();
+        expect(formatted.components.schemas.User.type).toBe('object');
+      }
+    });
+  });
+});
diff --git a/test/custom-extensions.test.ts b/test/custom-extensions.test.ts
index f7b319e..d1bd7ad 100644
--- a/test/custom-extensions.test.ts
+++ b/test/custom-extensions.test.ts
@@ -1,4 +1,4 @@
-import { describe, it, expect } from 'bun:test';
+import { describe, expect, it } from 'bun:test';
 import plugin from '../src/index';
 
 describe('Custom Extensions Support', () => {
@@ -222,9 +222,9 @@ describe('Custom Extensions Support', () => {
       const xApiIdIndex = result.toString().indexOf('"x-api-id"');
       const xVersionInfoIndex = result.toString().indexOf('"x-version-info"');
 
-      expect(titleIndex).toBeLessThan(descriptionIndex);
-      expect(descriptionIndex).toBeLessThan(versionIndex);
-      expect(versionIndex).toBeLessThan(xApiIdIndex);
+      expect(titleIndex).toBeLessThan(versionIndex);
+      expect(versionIndex).toBeLessThan(descriptionIndex);
+      expect(descriptionIndex).toBeLessThan(xApiIdIndex);
       expect(xApiIdIndex).toBeLessThan(xVersionInfoIndex);
     });
 
@@ -347,7 +347,10 @@ describe('Custom Extensions Support', () => {
 
       expect(openapiIndex).toBeLessThan(infoIndex);
       expect(infoIndex).toBeLessThan(pathsIndex);
+      // Unknown keys should come after standard keys
       expect(pathsIndex).toBeLessThan(anotherUnknownIndex);
+      expect(pathsIndex).toBeLessThan(unknownFieldIndex);
+      // Unknown keys should be sorted alphabetically
       expect(anotherUnknownIndex).toBeLessThan(unknownFieldIndex);
     });
 
@@ -386,9 +389,12 @@ describe('Custom Extensions Support', () => {
 
       expect(openapiIndex).toBeLessThan(infoIndex);
       expect(infoIndex).toBeLessThan(pathsIndex);
+      // Standard keys should come first
       expect(pathsIndex).toBeLessThan(xCustomFieldIndex);
-      expect(xCustomFieldIndex).toBeLessThan(xMetadataIndex);
-      expect(xMetadataIndex).toBeLessThan(anotherUnknownIndex);
+      expect(pathsIndex).toBeLessThan(xMetadataIndex);
+      expect(pathsIndex).toBeLessThan(anotherUnknownIndex);
+      expect(pathsIndex).toBeLessThan(unknownFieldIndex);
+      // Unknown keys should be sorted alphabetically
       expect(anotherUnknownIndex).toBeLessThan(unknownFieldIndex);
     });
   });
diff --git a/test/demo.ts b/test/demo.ts
deleted file mode 100644
index c3f40c8..0000000
--- a/test/demo.ts
+++ /dev/null
@@ -1,88 +0,0 @@
-import plugin from '../src/index';
-import * as fs from 'fs';
-import * as path from 'path';
-
-// Demo script to show how the plugin works
-async function demo() {
-  console.log('Prettier OpenAPI Plugin Demo');
-  console.log('============================');
-
-  // Test JSON parsing
-  const testJson = {
-    paths: { '/test': { get: {} } },
-    info: { title: 'Test API', version: '1.0.0' },
-    openapi: '3.0.0',
-    components: { schemas: {} }
-  };
-
-  console.log('\n1. Testing JSON Parser:');
-  try {
-    const jsonParser = plugin.parsers?.['openapi-json-parser'];
-    if (jsonParser) {
-      const jsonString = JSON.stringify(testJson);
-      const parsed = jsonParser.parse(jsonString, {});
-      console.log('✓ JSON parsing successful');
-      console.log('Parsed content keys:', Object.keys(parsed.content));
-    }
-  } catch (error) {
-    console.log('✗ JSON parsing failed:', error);
-  }
-
-  // Test YAML parsing
-  const testYaml = `openapi: 3.0.0
-info:
-  title: Test API
-  version: 1.0.0
-paths:
-  /test:
-    get: {}`;
-
-  console.log('\n2. Testing YAML Parser:');
-  try {
-    const yamlParser = plugin.parsers?.['openapi-yaml-parser'];
-    if (yamlParser) {
-      const parsed = yamlParser.parse(testYaml, {});
-      console.log('✓ YAML parsing successful');
-      console.log('Parsed content keys:', Object.keys(parsed.content));
-    }
-  } catch (error) {
-    console.log('✗ YAML parsing failed:', error);
-  }
-
-  // Test JSON formatting
-  console.log('\n3. Testing JSON Formatting:');
-  try {
-    const jsonPrinter = plugin.printers?.['openapi-json-ast'];
-    if (jsonPrinter) {
-      const testData = { content: testJson };
-      const formatted = jsonPrinter.print({ getValue: () => testData }, { tabWidth: 2 }, () => '');
-      console.log('✓ JSON formatting successful');
-      console.log('Formatted output (first 200 chars):');
-      console.log(formatted.substring(0, 200) + '...');
-    }
-  } catch (error) {
-    console.log('✗ JSON formatting failed:', error);
-  }
-
-  // Test YAML formatting
-  console.log('\n4. Testing YAML Formatting:');
-  try {
-    const yamlPrinter = plugin.printers?.['openapi-yaml-ast'];
-    if (yamlPrinter) {
-      const testData = { content: testJson };
-      const formatted = yamlPrinter.print({ getValue: () => testData }, { tabWidth: 2 }, () => '');
-      console.log('✓ YAML formatting successful');
-      console.log('Formatted output (first 200 chars):');
-      console.log(formatted.substring(0, 200) + '...');
-    }
-  } catch (error) {
-    console.log('✗ YAML formatting failed:', error);
-  }
-
-  console.log('\n5. Plugin Information:');
-  console.log('Supported languages:', plugin.languages?.map(l => l.name));
-  console.log('Available parsers:', Object.keys(plugin.parsers || {}));
-  console.log('Available printers:', Object.keys(plugin.printers || {}));
-}
-
-demo().catch(console.error);
diff --git a/test/edge-cases.test.ts b/test/edge-cases.test.ts
new file mode 100644
index 0000000..28fad7b
--- /dev/null
+++ b/test/edge-cases.test.ts
@@ -0,0 +1,640 @@
+import { describe, expect, it } from 'bun:test';
+import prettier from 'prettier';
+
+describe('Edge Cases and Coverage Improvement', () => {
+  describe('Error Handling', () => {
+    it('should handle non-object content gracefully', async () => {
+      const stringResult = await prettier.format('"string"', {
+        parser: 'json',
+        plugins: ['.']
+      });
+      expect(stringResult.trim()).toBe('"string"');
+
+      const numberResult = await prettier.format('123', {
+        parser: 'json',
+        plugins: ['.']
+      });
+      expect(numberResult.trim()).toBe('123');
+    });
+
+    it('should handle array content gracefully', async () => {
+      const result = await prettier.format('[1, 2, 3]', {
+        parser: 'json',
+        plugins: ['.']
+      });
+      
+      expect(result.trim()).toBe('[1, 2, 3]');
+    });
+  });
+
+  describe('Component Detection', () => {
+    it('should detect components section', () => {
+      const content = {
+        openapi: '3.0.0',
+        info: { title: 'Test', version: '1.0.0' },
+        components: {
+          schemas: {
+            User: { type: 'object' }
+          }
+        }
+      };
+
+      const result = prettier.format(JSON.stringify(content), {
+        parser: 'json',
+        plugins: ['.']
+      });
+      
+      expect(result).toBeDefined();
+    });
+
+    it('should detect definitions in Swagger 2.0', () => {
+      const content = {
+        swagger: '2.0',
+        info: { title: 'Test', version: '1.0.0' },
+        definitions: {
+          User: { type: 'object' }
+        }
+      };
+
+      const result = prettier.format(JSON.stringify(content), {
+        parser: 'json',
+        plugins: ['.']
+      });
+      
+      expect(result).toBeDefined();
+    });
+
+    it('should detect parameters in Swagger 2.0', () => {
+      const content = {
+        swagger: '2.0',
+        info: { title: 'Test', version: '1.0.0' },
+        parameters: {
+          limit: { name: 'limit', in: 'query', type: 'integer' }
+        }
+      };
+
+      const result = prettier.format(JSON.stringify(content), {
+        parser: 'json',
+        plugins: ['.']
+      });
+      
+      expect(result).toBeDefined();
+    });
+
+    it('should detect responses in Swagger 2.0', () => {
+      const content = {
+        swagger: '2.0',
+        info: { title: 'Test', version: '1.0.0' },
+        responses: {
+          Error: { description: 'Error response' }
+        }
+      };
+
+      const result = prettier.format(JSON.stringify(content), {
+        parser: 'json',
+        plugins: ['.']
+      });
+      
+      expect(result).toBeDefined();
+    });
+
+    it('should detect securityDefinitions in Swagger 2.0', () => {
+      const content = {
+        swagger: '2.0',
+        info: { title: 'Test', version: '1.0.0' },
+        securityDefinitions: {
+          apiKey: { type: 'apiKey', in: 'header', name: 'X-API-Key' }
+        }
+      };
+
+      const result = prettier.format(JSON.stringify(content), {
+        parser: 'json',
+        plugins: ['.']
+      });
+      
+      expect(result).toBeDefined();
+    });
+  });
+
+  describe('Schema Object Detection', () => {
+    it('should detect schema with $ref', () => {
+      const content = {
+        $ref: '#/components/schemas/User'
+      };
+
+      const result = prettier.format(JSON.stringify(content), {
+        parser: 'json',
+        plugins: ['.']
+      });
+      
+      expect(result).toBeDefined();
+    });
+
+    it('should detect schema with allOf', () => {
+      const content = {
+        allOf: [
+          { type: 'object' },
+          { properties: { name: { type: 'string' } } }
+        ]
+      };
+
+      const result = prettier.format(JSON.stringify(content), {
+        parser: 'json',
+        plugins: ['.']
+      });
+      
+      expect(result).toBeDefined();
+    });
+
+    it('should detect schema with oneOf', () => {
+      const content = {
+        oneOf: [
+          { type: 'string' },
+          { type: 'number' }
+        ]
+      };
+
+      const result = prettier.format(JSON.stringify(content), {
+        parser: 'json',
+        plugins: ['.']
+      });
+      
+      expect(result).toBeDefined();
+    });
+
+    it('should detect schema with anyOf', () => {
+      const content = {
+        anyOf: [
+          { type: 'string' },
+          { type: 'number' }
+        ]
+      };
+
+      const result = prettier.format(JSON.stringify(content), {
+        parser: 'json',
+        plugins: ['.']
+      });
+      
+      expect(result).toBeDefined();
+    });
+
+    it('should detect schema with not', () => {
+      const content = {
+        not: { type: 'string' }
+      };
+
+      const result = prettier.format(JSON.stringify(content), {
+        parser: 'json',
+        plugins: ['.']
+      });
+      
+      expect(result).toBeDefined();
+    });
+
+    it('should detect schema with properties', () => {
+      const content = {
+        type: 'object',
+        properties: {
+          name: { type: 'string' }
+        }
+      };
+
+      const result = prettier.format(JSON.stringify(content), {
+        parser: 'json',
+        plugins: ['.']
+      });
+      
+      expect(result).toBeDefined();
+    });
+
+    it('should detect schema with items', () => {
+      const content = {
+        type: 'array',
+        items: { type: 'string' }
+      };
+
+      const result = prettier.format(JSON.stringify(content), {
+        parser: 'json',
+        plugins: ['.']
+      });
+      
+      expect(result).toBeDefined();
+    });
+  });
+
+  describe('Path Object Detection', () => {
+    it('should detect path with get operation', () => {
+      const content = {
+        get: {
+          summary: 'Get users',
+          responses: { '200': { description: 'Success' } }
+        }
+      };
+
+      const result = prettier.format(JSON.stringify(content), {
+        parser: 'json',
+        plugins: ['.']
+      });
+      
+      expect(result).toBeDefined();
+    });
+
+    it('should detect path with post operation', () => {
+      const content = {
+        post: {
+          summary: 'Create user',
+          responses: { '201': { description: 'Created' } }
+        }
+      };
+
+      const result = prettier.format(JSON.stringify(content), {
+        parser: 'json',
+        plugins: ['.']
+      });
+      
+      expect(result).toBeDefined();
+    });
+
+    it('should detect path with put operation', () => {
+      const content = {
+        put: {
+          summary: 'Update user',
+          responses: { '200': { description: 'Updated' } }
+        }
+      };
+
+      const result = prettier.format(JSON.stringify(content), {
+        parser: 'json',
+        plugins: ['.']
+      });
+      
+      expect(result).toBeDefined();
+    });
+
+    it('should detect path with delete operation', () => {
+      const content = {
+        delete: {
+          summary: 'Delete user',
+          responses: { '204': { description: 'Deleted' } }
+        }
+      };
+
+      const result = prettier.format(JSON.stringify(content), {
+        parser: 'json',
+        plugins: ['.']
+      });
+      
+      expect(result).toBeDefined();
+    });
+
+    it('should detect path with patch operation', () => {
+      const content = {
+        patch: {
+          summary: 'Patch user',
+          responses: { '200': { description: 'Patched' } }
+        }
+      };
+
+      const result = prettier.format(JSON.stringify(content), {
+        parser: 'json',
+        plugins: ['.']
+      });
+      
+      expect(result).toBeDefined();
+    });
+
+    it('should detect path with head operation', () => {
+      const content = {
+        head: {
+          summary: 'Head user',
+          responses: { '200': { description: 'Head' } }
+        }
+      };
+
+      const result = prettier.format(JSON.stringify(content), {
+        parser: 'json',
+        plugins: ['.']
+      });
+      
+      expect(result).toBeDefined();
+    });
+
+    it('should detect path with options operation', () => {
+      const content = {
+        options: {
+          summary: 'Options user',
+          responses: { '200': { description: 'Options' } }
+        }
+      };
+
+      const result = prettier.format(JSON.stringify(content), {
+        parser: 'json',
+        plugins: ['.']
+      });
+      
+      expect(result).toBeDefined();
+    });
+
+    it('should detect path with trace operation', () => {
+      const content = {
+        trace: {
+          summary: 'Trace user',
+          responses: { '200': { description: 'Trace' } }
+        }
+      };
+
+      const result = prettier.format(JSON.stringify(content), {
+        parser: 'json',
+        plugins: ['.']
+      });
+      
+      expect(result).toBeDefined();
+    });
+  });
+
+  describe('Parameter Object Detection', () => {
+    it('should detect parameter with in: query', () => {
+      const content = {
+        name: 'limit',
+        in: 'query',
+        type: 'integer'
+      };
+
+      const result = prettier.format(JSON.stringify(content), {
+        parser: 'json',
+        plugins: ['.']
+      });
+      
+      expect(result).toBeDefined();
+    });
+
+    it('should detect parameter with in: header', () => {
+      const content = {
+        name: 'Authorization',
+        in: 'header',
+        type: 'string'
+      };
+
+      const result = prettier.format(JSON.stringify(content), {
+        parser: 'json',
+        plugins: ['.']
+      });
+      
+      expect(result).toBeDefined();
+    });
+
+    it('should detect parameter with in: path', () => {
+      const content = {
+        name: 'id',
+        in: 'path',
+        required: true,
+        type: 'string'
+      };
+
+      const result = prettier.format(JSON.stringify(content), {
+        parser: 'json',
+        plugins: ['.']
+      });
+      
+      expect(result).toBeDefined();
+    });
+
+    it('should detect parameter with in: cookie', () => {
+      const content = {
+        name: 'session',
+        in: 'cookie',
+        type: 'string'
+      };
+
+      const result = prettier.format(JSON.stringify(content), {
+        parser: 'json',
+        plugins: ['.']
+      });
+      
+      expect(result).toBeDefined();
+    });
+  });
+
+  describe('Response Object Detection', () => {
+    it('should detect response with description', () => {
+      const content = {
+        description: 'Success response',
+        content: {
+          'application/json': {
+            schema: { type: 'object' }
+          }
+        }
+      };
+
+      const result = prettier.format(JSON.stringify(content), {
+        parser: 'json',
+        plugins: ['.']
+      });
+      
+      expect(result).toBeDefined();
+    });
+
+    it('should detect response with headers', () => {
+      const content = {
+        description: 'Response with headers',
+        headers: {
+          'X-Rate-Limit': {
+            description: 'Rate limit',
+            schema: { type: 'integer' }
+          }
+        }
+      };
+
+      const result = prettier.format(JSON.stringify(content), {
+        parser: 'json',
+        plugins: ['.']
+      });
+      
+      expect(result).toBeDefined();
+    });
+
+    it('should detect response with links', () => {
+      const content = {
+        description: 'Response with links',
+        links: {
+          next: {
+            operationId: 'getNextPage'
+          }
+        }
+      };
+
+      const result = prettier.format(JSON.stringify(content), {
+        parser: 'json',
+        plugins: ['.']
+      });
+      
+      expect(result).toBeDefined();
+    });
+  });
+
+  describe('Security Scheme Object Detection', () => {
+    it('should detect security scheme with type: apiKey', () => {
+      const content = {
+        type: 'apiKey',
+        in: 'header',
+        name: 'X-API-Key'
+      };
+
+      const result = prettier.format(JSON.stringify(content), {
+        parser: 'json',
+        plugins: ['.']
+      });
+      
+      expect(result).toBeDefined();
+    });
+
+    it('should detect security scheme with type: http', () => {
+      const content = {
+        type: 'http',
+        scheme: 'bearer',
+        bearerFormat: 'JWT'
+      };
+
+      const result = prettier.format(JSON.stringify(content), {
+        parser: 'json',
+        plugins: ['.']
+      });
+      
+      expect(result).toBeDefined();
+    });
+
+    it('should detect security scheme with type: oauth2', () => {
+      const content = {
+        type: 'oauth2',
+        flows: {
+          implicit: {
+            authorizationUrl: 'https://example.com/oauth/authorize',
+            scopes: { read: 'Read access' }
+          }
+        }
+      };
+
+      const result = prettier.format(JSON.stringify(content), {
+        parser: 'json',
+        plugins: ['.']
+      });
+      
+      expect(result).toBeDefined();
+    });
+
+    it('should detect security scheme with type: openIdConnect', () => {
+      const content = {
+        type: 'openIdConnect',
+        openIdConnectUrl: 'https://example.com/.well-known/openid_configuration'
+      };
+
+      const result = prettier.format(JSON.stringify(content), {
+        parser: 'json',
+        plugins: ['.']
+      });
+      
+      expect(result).toBeDefined();
+    });
+  });
+
+  describe('Server Object Detection', () => {
+    it('should detect server with url', () => {
+      const content = {
+        url: 'https://api.example.com/v1',
+        description: 'Production server'
+      };
+
+      const result = prettier.format(JSON.stringify(content), {
+        parser: 'json',
+        plugins: ['.']
+      });
+      
+      expect(result).toBeDefined();
+    });
+
+    it('should detect server with variables', () => {
+      const content = {
+        url: 'https://{username}.example.com:{port}/{basePath}',
+        variables: {
+          username: { default: 'demo' },
+          port: { default: '443' },
+          basePath: { default: 'v2' }
+        }
+      };
+
+      const result = prettier.format(JSON.stringify(content), {
+        parser: 'json',
+        plugins: ['.']
+      });
+      
+      expect(result).toBeDefined();
+    });
+  });
+
+  describe('Tag Object Detection', () => {
+    it('should detect tag with name', () => {
+      const content = {
+        name: 'users',
+        description: 'User operations'
+      };
+
+      const result = prettier.format(JSON.stringify(content), {
+        parser: 'json',
+        plugins: ['.']
+      });
+      
+      expect(result).toBeDefined();
+    });
+
+    it('should detect tag with externalDocs', () => {
+      const content = {
+        name: 'users',
+        externalDocs: {
+          description: 'Find out more',
+          url: 'https://example.com'
+        }
+      };
+
+      const result = prettier.format(JSON.stringify(content), {
+        parser: 'json',
+        plugins: ['.']
+      });
+      
+      expect(result).toBeDefined();
+    });
+  });
+
+  describe('External Docs Object Detection', () => {
+    it('should detect external docs with url', () => {
+      const content = {
+        description: 'Find out more about our API',
+        url: 'https://example.com/docs'
+      };
+
+      const result = prettier.format(JSON.stringify(content), {
+        parser: 'json',
+        plugins: ['.']
+      });
+      
+      expect(result).toBeDefined();
+    });
+  });
+
+  describe('Webhook Object Detection', () => {
+    it('should detect webhook with operationId', () => {
+      const content = {
+        post: {
+          operationId: 'webhookHandler',
+          responses: { '200': { description: 'Success' } }
+        }
+      };
+
+      const result = prettier.format(JSON.stringify(content), {
+        parser: 'json',
+        plugins: ['.']
+      });
+      
+      expect(result).toBeDefined();
+    });
+  });
+});
diff --git a/test/file-detection.test.ts b/test/file-detection.test.ts
index e76c252..d6368fb 100644
--- a/test/file-detection.test.ts
+++ b/test/file-detection.test.ts
@@ -1,4 +1,4 @@
-import { describe, it, expect } from 'bun:test';
+import { describe, expect, it } from 'bun:test';
 import plugin from '../src/index';
 
 describe('File Detection Tests', () => {
diff --git a/test/integration.test.ts b/test/integration.test.ts
new file mode 100644
index 0000000..b3e49cf
--- /dev/null
+++ b/test/integration.test.ts
@@ -0,0 +1,519 @@
+import { describe, expect, it } from 'bun:test';
+import plugin from '../src/index';
+
+describe('Integration Tests', () => {
+  describe('Real OpenAPI file processing', () => {
+    it('should process a complete OpenAPI 3.0 file', () => {
+      const openApiContent = {
+        openapi: '3.0.0',
+        info: {
+          title: 'Test API',
+          version: '1.0.0',
+          description: 'A test API',
+          contact: {
+            name: 'API Support',
+            email: 'support@example.com'
+          },
+          license: {
+            name: 'MIT',
+            url: 'https://opensource.org/licenses/MIT'
+          }
+        },
+        servers: [
+          {
+            url: 'https://api.example.com/v1',
+            description: 'Production server'
+          }
+        ],
+        paths: {
+          '/users': {
+            get: {
+              summary: 'Get users',
+              description: 'Retrieve all users',
+              operationId: 'getUsers',
+              tags: ['users'],
+              parameters: [
+                {
+                  name: 'limit',
+                  in: 'query',
+                  description: 'Number of users to return',
+                  required: false,
+                  schema: {
+                    type: 'integer',
+                    minimum: 1,
+                    maximum: 100,
+                    default: 10
+                  }
+                }
+              ],
+              responses: {
+                '200': {
+                  description: 'Successful response',
+                  content: {
+                    'application/json': {
+                      schema: {
+                        type: 'array',
+                        items: {
+                          $ref: '#/components/schemas/User'
+                        }
+                      }
+                    }
+                  }
+                },
+                '400': {
+                  description: 'Bad request',
+                  content: {
+                    'application/json': {
+                      schema: {
+                        $ref: '#/components/schemas/Error'
+                      }
+                    }
+                  }
+                }
+              }
+            },
+            post: {
+              summary: 'Create user',
+              description: 'Create a new user',
+              operationId: 'createUser',
+              tags: ['users'],
+              requestBody: {
+                required: true,
+                content: {
+                  'application/json': {
+                    schema: {
+                      $ref: '#/components/schemas/UserCreate'
+                    }
+                  }
+                }
+              },
+              responses: {
+                '201': {
+                  description: 'User created',
+                  content: {
+                    'application/json': {
+                      schema: {
+                        $ref: '#/components/schemas/User'
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          },
+          '/users/{id}': {
+            get: {
+              summary: 'Get user by ID',
+              operationId: 'getUserById',
+              tags: ['users'],
+              parameters: [
+                {
+                  name: 'id',
+                  in: 'path',
+                  required: true,
+                  description: 'User ID',
+                  schema: {
+                    type: 'integer',
+                    format: 'int64'
+                  }
+                }
+              ],
+              responses: {
+                '200': {
+                  description: 'User found',
+                  content: {
+                    'application/json': {
+                      schema: {
+                        $ref: '#/components/schemas/User'
+                      }
+                    }
+                  }
+                },
+                '404': {
+                  description: 'User not found',
+                  content: {
+                    'application/json': {
+                      schema: {
+                        $ref: '#/components/schemas/Error'
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
+        components: {
+          schemas: {
+            User: {
+              type: 'object',
+              required: ['id', 'name', 'email'],
+              properties: {
+                id: {
+                  type: 'integer',
+                  format: 'int64',
+                  description: 'User ID'
+                },
+                name: {
+                  type: 'string',
+                  description: 'User name',
+                  minLength: 1,
+                  maxLength: 100
+                },
+                email: {
+                  type: 'string',
+                  format: 'email',
+                  description: 'User email'
+                },
+                createdAt: {
+                  type: 'string',
+                  format: 'date-time',
+                  description: 'Creation timestamp'
+                }
+              }
+            },
+            UserCreate: {
+              type: 'object',
+              required: ['name', 'email'],
+              properties: {
+                name: {
+                  type: 'string',
+                  description: 'User name',
+                  minLength: 1,
+                  maxLength: 100
+                },
+                email: {
+                  type: 'string',
+                  format: 'email',
+                  description: 'User email'
+                }
+              }
+            },
+            Error: {
+              type: 'object',
+              required: ['code', 'message'],
+              properties: {
+                code: {
+                  type: 'string',
+                  description: 'Error code'
+                },
+                message: {
+                  type: 'string',
+                  description: 'Error message'
+                }
+              }
+            }
+          }
+        },
+        tags: [
+          {
+            name: 'users',
+            description: 'User management operations'
+          }
+        ]
+      };
+
+      const jsonPrinter = plugin.printers?.['openapi-json-ast'];
+      expect(jsonPrinter).toBeDefined();
+
+      const testData = {
+        content: openApiContent
+      };
+
+      // @ts-ignore We are mocking things here
+      const result = jsonPrinter?.print({ getValue: () => testData }, { tabWidth: 2 }, () => '');
+      expect(result).toBeDefined();
+      
+      if (result && typeof result === 'string') {
+        const formatted = JSON.parse(result);
+        
+        // Verify key ordering
+        const keys = Object.keys(formatted);
+        expect(keys[0]).toBe('openapi');
+        expect(keys[1]).toBe('info');
+        expect(keys[2]).toBe('servers');
+        expect(keys[3]).toBe('tags');
+        expect(keys[4]).toBe('paths');
+        expect(keys[5]).toBe('components');
+        
+        // Verify nested key ordering
+        const infoKeys = Object.keys(formatted.info);
+        expect(infoKeys[0]).toBe('title');
+        expect(infoKeys[1]).toBe('version');
+        expect(infoKeys[2]).toBe('description');
+        expect(infoKeys[3]).toBe('contact');
+        expect(infoKeys[4]).toBe('license');
+        
+        // Verify components key ordering
+        const componentKeys = Object.keys(formatted.components);
+        expect(componentKeys[0]).toBe('schemas');
+        
+        // Verify schema key ordering (alphabetical)
+        const schemaKeys = Object.keys(formatted.components.schemas);
+        expect(schemaKeys[0]).toBe('Error');
+        expect(schemaKeys[1]).toBe('User');
+        expect(schemaKeys[2]).toBe('UserCreate');
+      }
+    });
+
+    it('should process a Swagger 2.0 file', () => {
+      const swaggerContent = {
+        swagger: '2.0',
+        info: {
+          title: 'Test API',
+          version: '1.0.0',
+          description: 'A test API',
+          contact: {
+            name: 'API Support',
+            email: 'support@example.com'
+          },
+          license: {
+            name: 'MIT',
+            url: 'https://opensource.org/licenses/MIT'
+          }
+        },
+        host: 'api.example.com',
+        basePath: '/v1',
+        schemes: ['https'],
+        consumes: ['application/json'],
+        produces: ['application/json'],
+        paths: {
+          '/users': {
+            get: {
+              summary: 'Get users',
+              description: 'Retrieve all users',
+              operationId: 'getUsers',
+              tags: ['users'],
+              parameters: [
+                {
+                  name: 'limit',
+                  in: 'query',
+                  description: 'Number of users to return',
+                  required: false,
+                  type: 'integer',
+                  minimum: 1,
+                  maximum: 100,
+                  default: 10
+                }
+              ],
+              responses: {
+                '200': {
+                  description: 'Successful response',
+                  schema: {
+                    type: 'array',
+                    items: {
+                      $ref: '#/definitions/User'
+                    }
+                  }
+                },
+                '400': {
+                  description: 'Bad request',
+                  schema: {
+                    $ref: '#/definitions/Error'
+                  }
+                }
+              }
+            }
+          }
+        },
+        definitions: {
+          User: {
+            type: 'object',
+            required: ['id', 'name', 'email'],
+            properties: {
+              id: {
+                type: 'integer',
+                format: 'int64',
+                description: 'User ID'
+              },
+              name: {
+                type: 'string',
+                description: 'User name',
+                minLength: 1,
+                maxLength: 100
+              },
+              email: {
+                type: 'string',
+                format: 'email',
+                description: 'User email'
+              }
+            }
+          },
+          Error: {
+            type: 'object',
+            required: ['code', 'message'],
+            properties: {
+              code: {
+                type: 'string',
+                description: 'Error code'
+              },
+              message: {
+                type: 'string',
+                description: 'Error message'
+              }
+            }
+          }
+        },
+        tags: [
+          {
+            name: 'users',
+            description: 'User management operations'
+          }
+        ]
+      };
+
+      const jsonPrinter = plugin.printers?.['openapi-json-ast'];
+      expect(jsonPrinter).toBeDefined();
+
+      const testData = {
+        content: swaggerContent
+      };
+
+      // @ts-ignore We are mocking things here
+      const result = jsonPrinter?.print({ getValue: () => testData }, { tabWidth: 2 }, () => '');
+      expect(result).toBeDefined();
+      
+      if (result && typeof result === 'string') {
+        const formatted = JSON.parse(result);
+        
+        // Verify Swagger 2.0 key ordering
+        const keys = Object.keys(formatted);
+        expect(keys[0]).toBe('swagger');
+        expect(keys[1]).toBe('info');
+        expect(keys[2]).toBe('schemes');
+        expect(keys[3]).toBe('host');
+        expect(keys[4]).toBe('basePath');
+        expect(keys[5]).toBe('consumes');
+        expect(keys[6]).toBe('produces');
+        expect(keys[7]).toBe('tags');
+        expect(keys[8]).toBe('paths');
+        expect(keys[9]).toBe('definitions');
+      }
+    });
+  });
+
+  describe('YAML formatting', () => {
+    it('should format YAML with proper structure', () => {
+      const yamlContent = {
+        openapi: '3.0.0',
+        info: {
+          title: 'Test API',
+          version: '1.0.0'
+        },
+        paths: {
+          '/test': {
+            get: {
+              responses: {
+                '200': {
+                  description: 'Success'
+                }
+              }
+            }
+          }
+        }
+      };
+
+      const yamlPrinter = plugin.printers?.['openapi-yaml-ast'];
+      expect(yamlPrinter).toBeDefined();
+
+      const testData = {
+        content: yamlContent
+      };
+
+      // @ts-ignore We are mocking things here
+      const result = yamlPrinter?.print({ getValue: () => testData }, { tabWidth: 2 }, () => '');
+      expect(result).toBeDefined();
+      
+      if (result) {
+        // Verify YAML structure
+        expect(result).toContain('openapi:');
+        expect(result).toContain('info:');
+        expect(result).toContain('paths:');
+        expect(result).toContain('title:');
+        expect(result).toContain('version:');
+        expect(result).toContain('get:');
+        expect(result).toContain('responses:');
+        expect(result).toContain('"200":');
+        expect(result).toContain('description:');
+        expect(result).toContain('Success');
+      }
+    });
+  });
+
+  describe('Error handling', () => {
+    it('should handle malformed JSON gracefully', () => {
+      const jsonParser = plugin.parsers?.['openapi-json-parser'];
+      expect(jsonParser).toBeDefined();
+
+      const malformedJson = '{"openapi": "3.0.0", "info": {';
+
+      // @ts-ignore We are mocking things here
+      expect(() => jsonParser?.parse(malformedJson, {})).toThrow();
+    });
+
+    it('should handle malformed YAML gracefully', () => {
+      const yamlParser = plugin.parsers?.['openapi-yaml-parser'];
+      expect(yamlParser).toBeDefined();
+
+      const malformedYaml = 'openapi: 3.0.0\ninfo:\n  title: Test\n  version: 1.0.0\n  invalid: [';
+
+      // @ts-ignore We are mocking things here
+      expect(() => yamlParser?.parse(malformedYaml, {})).toThrow();
+    });
+
+    it('should reject non-OpenAPI content', () => {
+      const jsonParser = plugin.parsers?.['openapi-json-parser'];
+      expect(jsonParser).toBeDefined();
+
+      const nonOpenAPI = '{"name": "John", "age": 30}';
+
+      // @ts-ignore We are mocking things here
+      expect(() => jsonParser?.parse(nonOpenAPI, {})).toThrow('Not an OpenAPI file');
+    });
+  });
+
+  describe('Performance tests', () => {
+    it('should handle large OpenAPI files efficiently', () => {
+      const largeOpenAPI = {
+        openapi: '3.0.0',
+        info: {
+          title: 'Large API',
+          version: '1.0.0'
+        },
+        paths: {}
+      };
+
+      // Create a large paths object
+      for (let i = 0; i < 100; i++) {
+        largeOpenAPI.paths[`/path${i}`] = {
+          get: {
+            summary: `Get path ${i}`,
+            responses: {
+              '200': {
+                description: 'Success'
+              }
+            }
+          }
+        };
+      }
+
+      const jsonPrinter = plugin.printers?.['openapi-json-ast'];
+      expect(jsonPrinter).toBeDefined();
+
+      const testData = {
+        content: largeOpenAPI
+      };
+
+      const startTime = Date.now();
+      
+      // @ts-ignore We are mocking things here
+      const result = jsonPrinter?.print({ getValue: () => testData }, { tabWidth: 2 }, () => '');
+      
+      const endTime = Date.now();
+      const duration = endTime - startTime;
+
+      expect(result).toBeDefined();
+      expect(duration).toBeLessThan(1000); // Should complete within 1 second
+    });
+  });
+});
diff --git a/test/key-ordering.test.ts b/test/key-ordering.test.ts
index b40b437..6863134 100644
--- a/test/key-ordering.test.ts
+++ b/test/key-ordering.test.ts
@@ -30,15 +30,15 @@ describe('Key Ordering Tests', () => {
       
       // Check that info keys appear in the correct order
       const titleIndex = result.toString().indexOf('"title"');
-      const descriptionIndex = result.toString().indexOf('"description"');
       const versionIndex = result.toString().indexOf('"version"');
+      const descriptionIndex = result.toString().indexOf('"description"');
       const termsOfServiceIndex = result.toString().indexOf('"termsOfService"');
       const contactIndex = result.toString().indexOf('"contact"');
       const licenseIndex = result.toString().indexOf('"license"');
 
-      expect(titleIndex).toBeLessThan(descriptionIndex);
-      expect(descriptionIndex).toBeLessThan(versionIndex);
-      expect(versionIndex).toBeLessThan(termsOfServiceIndex);
+      expect(titleIndex).toBeLessThan(versionIndex);
+      expect(versionIndex).toBeLessThan(descriptionIndex);
+      expect(descriptionIndex).toBeLessThan(termsOfServiceIndex);
       expect(termsOfServiceIndex).toBeLessThan(contactIndex);
       expect(contactIndex).toBeLessThan(licenseIndex);
     });
@@ -82,28 +82,28 @@ describe('Key Ordering Tests', () => {
       }
       
       // Check that operation keys appear in the correct order
-      const tagsIndex = result.toString().indexOf('"tags"');
       const summaryIndex = result.toString().indexOf('"summary"');
-      const descriptionIndex = result.toString().indexOf('"description"');
       const operationIdIndex = result.toString().indexOf('"operationId"');
+      const descriptionIndex = result.toString().indexOf('"description"');
+      const tagsIndex = result.toString().indexOf('"tags"');
+      const deprecatedIndex = result.toString().indexOf('"deprecated"');
+      const securityIndex = result.toString().indexOf('"security"');
+      const serversIndex = result.toString().indexOf('"servers"');
       const parametersIndex = result.toString().indexOf('"parameters"');
       const requestBodyIndex = result.toString().indexOf('"requestBody"');
       const responsesIndex = result.toString().indexOf('"responses"');
       const callbacksIndex = result.toString().indexOf('"callbacks"');
-      const deprecatedIndex = result.toString().indexOf('"deprecated"');
-      const securityIndex = result.toString().indexOf('"security"');
-      const serversIndex = result.toString().indexOf('"servers"');
 
-      expect(tagsIndex).toBeLessThan(summaryIndex);
-      expect(summaryIndex).toBeLessThan(descriptionIndex);
-      expect(descriptionIndex).toBeLessThan(operationIdIndex);
-      expect(operationIdIndex).toBeLessThan(parametersIndex);
+      expect(summaryIndex).toBeLessThan(operationIdIndex);
+      expect(operationIdIndex).toBeLessThan(descriptionIndex);
+      expect(descriptionIndex).toBeLessThan(tagsIndex);
+      expect(tagsIndex).toBeLessThan(deprecatedIndex);
+      expect(deprecatedIndex).toBeLessThan(securityIndex);
+      expect(securityIndex).toBeLessThan(serversIndex);
+      expect(serversIndex).toBeLessThan(parametersIndex);
       expect(parametersIndex).toBeLessThan(requestBodyIndex);
       expect(requestBodyIndex).toBeLessThan(responsesIndex);
       expect(responsesIndex).toBeLessThan(callbacksIndex);
-      expect(callbacksIndex).toBeLessThan(deprecatedIndex);
-      expect(deprecatedIndex).toBeLessThan(securityIndex);
-      expect(securityIndex).toBeLessThan(serversIndex);
     });
   });
 
@@ -170,7 +170,7 @@ describe('Key Ordering Tests', () => {
       // Find the schema section specifically
       const schemaStart = result.toString().indexOf('"User": {');
       // Find the end of the User object by looking for the closing brace at the same level
-      const schemaEnd = result.toString().indexOf('}', result.toString().lastIndexOf('"deprecated": false'));
+      const schemaEnd = result.toString().indexOf('}', result.toString().lastIndexOf('"xml"'));
       const schemaSection = result.toString().substring(schemaStart, schemaEnd + 1);
       
       const typeIndex = schemaSection.indexOf('"type"');
@@ -208,33 +208,35 @@ describe('Key Ordering Tests', () => {
       const deprecatedIndex = schemaSection.indexOf('"deprecated"');
 
       // Test the core ordering - just the most important keys
-      expect(typeIndex).toBeLessThan(formatIndex);
-      expect(formatIndex).toBeLessThan(titleIndex);
       expect(titleIndex).toBeLessThan(descriptionIndex);
-      expect(descriptionIndex).toBeLessThan(defaultIndex);
+      expect(descriptionIndex).toBeLessThan(typeIndex);
+      expect(typeIndex).toBeLessThan(formatIndex);
+      expect(formatIndex).toBeLessThan(constIndex);
+      expect(constIndex).toBeLessThan(enumIndex);
+      expect(enumIndex).toBeLessThan(defaultIndex);
       expect(defaultIndex).toBeLessThan(exampleIndex);
       expect(exampleIndex).toBeLessThan(examplesIndex);
-      expect(examplesIndex).toBeLessThan(enumIndex);
-      expect(enumIndex).toBeLessThan(constIndex);
-      expect(constIndex).toBeLessThan(multipleOfIndex);
+      expect(examplesIndex).toBeLessThan(minimumIndex);
+      expect(minimumIndex).toBeLessThan(exclusiveMinimumIndex);
+      expect(exclusiveMinimumIndex).toBeLessThan(multipleOfIndex);
       expect(multipleOfIndex).toBeLessThan(maximumIndex);
       expect(maximumIndex).toBeLessThan(exclusiveMaximumIndex);
-      expect(exclusiveMaximumIndex).toBeLessThan(minimumIndex);
-      expect(minimumIndex).toBeLessThan(exclusiveMinimumIndex);
-      expect(exclusiveMinimumIndex).toBeLessThan(maxLengthIndex);
-      expect(maxLengthIndex).toBeLessThan(minLengthIndex);
-      expect(minLengthIndex).toBeLessThan(patternIndex);
-      expect(patternIndex).toBeLessThan(maxItemsIndex);
-      expect(maxItemsIndex).toBeLessThan(minItemsIndex);
-      expect(minItemsIndex).toBeLessThan(uniqueItemsIndex);
-      expect(uniqueItemsIndex).toBeLessThan(maxPropertiesIndex);
-      expect(maxPropertiesIndex).toBeLessThan(minPropertiesIndex);
-      expect(minPropertiesIndex).toBeLessThan(requiredIndex);
-      expect(requiredIndex).toBeLessThan(propertiesIndex);
+      expect(exclusiveMaximumIndex).toBeLessThan(patternIndex);
+      expect(patternIndex).toBeLessThan(minLengthIndex);
+      expect(minLengthIndex).toBeLessThan(maxLengthIndex);
+      expect(maxLengthIndex).toBeLessThan(uniqueItemsIndex);
+      expect(uniqueItemsIndex).toBeLessThan(minItemsIndex);
+      expect(minItemsIndex).toBeLessThan(maxItemsIndex);
+      expect(uniqueItemsIndex).toBeLessThan(minPropertiesIndex);
+      expect(minPropertiesIndex).toBeLessThan(maxPropertiesIndex);
+      expect(minPropertiesIndex).toBeLessThan(propertiesIndex);
+      expect(propertiesIndex).toBeLessThan(requiredIndex);
       // Skip the complex ordering for items, allOf, etc. as they might not be in exact order
-      expect(discriminatorIndex).toBeLessThan(xmlIndex);
-      expect(xmlIndex).toBeLessThan(externalDocsIndex);
-      expect(externalDocsIndex).toBeLessThan(deprecatedIndex);
+      expect(discriminatorIndex).toBeLessThan(allOfIndex);
+      expect(allOfIndex).toBeLessThan(anyOfIndex);
+      expect(anyOfIndex).toBeLessThan(oneOfIndex);
+      expect(oneOfIndex).toBeLessThan(notIndex);
+      expect(notIndex).toBeLessThan(xmlIndex);
     });
   });
 
@@ -346,9 +348,9 @@ describe('Key Ordering Tests', () => {
       const examplesIndex = paramSection.indexOf('"examples"');
 
       // Test the core parameter ordering
-      expect(nameIndex).toBeLessThan(inIndex);
-      expect(inIndex).toBeLessThan(descriptionIndex);
-      expect(descriptionIndex).toBeLessThan(requiredIndex);
+      expect(nameIndex).toBeLessThan(descriptionIndex);
+      expect(descriptionIndex).toBeLessThan(inIndex);
+      expect(inIndex).toBeLessThan(requiredIndex);
       expect(requiredIndex).toBeLessThan(deprecatedIndex);
       expect(deprecatedIndex).toBeLessThan(allowEmptyValueIndex);
       expect(allowEmptyValueIndex).toBeLessThan(styleIndex);
@@ -408,13 +410,13 @@ describe('Key Ordering Tests', () => {
       const flowsIndex = result.toString().indexOf('"flows"');
       const openIdConnectUrlIndex = result.toString().indexOf('"openIdConnectUrl"');
 
-      expect(typeIndex).toBeLessThan(descriptionIndex);
-      expect(descriptionIndex).toBeLessThan(nameIndex);
-      expect(nameIndex).toBeLessThan(inIndex);
+      expect(nameIndex).toBeLessThan(descriptionIndex);
+      expect(descriptionIndex).toBeLessThan(typeIndex);
+      expect(typeIndex).toBeLessThan(inIndex);
       expect(inIndex).toBeLessThan(schemeIndex);
       expect(schemeIndex).toBeLessThan(bearerFormatIndex);
-      expect(bearerFormatIndex).toBeLessThan(flowsIndex);
-      expect(flowsIndex).toBeLessThan(openIdConnectUrlIndex);
+      expect(bearerFormatIndex).toBeLessThan(openIdConnectUrlIndex);
+      expect(openIdConnectUrlIndex).toBeLessThan(flowsIndex);
     });
   });
 
@@ -451,12 +453,14 @@ describe('Key Ordering Tests', () => {
       const serverEnd = result.toString().indexOf('}', result.toString().lastIndexOf('"variables"'));
       const serverSection = result.toString().substring(serverStart, serverEnd + 1);
       
-      const urlIndex = serverSection.indexOf('"url"');
+      const nameIndex = serverSection.indexOf('"name"');
       const descriptionIndex = serverSection.indexOf('"description"');
+      const urlIndex = serverSection.indexOf('"url"');
       const variablesIndex = serverSection.indexOf('"variables"');
 
-      expect(urlIndex).toBeLessThan(descriptionIndex);
-      expect(descriptionIndex).toBeLessThan(variablesIndex);
+      expect(nameIndex).toBeLessThan(descriptionIndex);
+      expect(descriptionIndex).toBeLessThan(urlIndex);
+      expect(urlIndex).toBeLessThan(variablesIndex);
     });
   });
 
diff --git a/test/plugin.test.ts b/test/plugin.test.ts
index d552c93..60bcb0c 100644
--- a/test/plugin.test.ts
+++ b/test/plugin.test.ts
@@ -1,123 +1,210 @@
-import { describe, it, expect } from 'bun:test';
-import plugin from '../src/index';
-import * as fs from 'fs';
-import * as path from 'path';
+import { describe, expect, it } from 'bun:test';
+import plugin from '../dist/index.js';
 
 describe('Prettier OpenAPI Plugin', () => {
-  it('should have correct plugin structure', () => {
-    expect(plugin).toBeDefined();
-    expect(plugin.languages).toBeDefined();
-    expect(plugin.parsers).toBeDefined();
-    expect(plugin.printers).toBeDefined();
-  });
-
-  it('should support OpenAPI JSON files', () => {
-    const jsonLanguage = plugin.languages?.find(lang => lang.name === 'openapi-json');
-    expect(jsonLanguage).toBeDefined();
-    expect(jsonLanguage?.extensions).toContain('.openapi.json');
-    expect(jsonLanguage?.extensions).toContain('.swagger.json');
-  });
-
-  it('should support OpenAPI YAML files', () => {
-    const yamlLanguage = plugin.languages?.find(lang => lang.name === 'openapi-yaml');
-    expect(yamlLanguage).toBeDefined();
-    expect(yamlLanguage?.extensions).toContain('.openapi.yaml');
-    expect(yamlLanguage?.extensions).toContain('.openapi.yml');
-    expect(yamlLanguage?.extensions).toContain('.swagger.yaml');
-    expect(yamlLanguage?.extensions).toContain('.swagger.yml');
-  });
-
-  it('should parse JSON correctly', () => {
+  it('should format OpenAPI JSON files', () => {
     const jsonParser = plugin.parsers?.['openapi-json-parser'];
-    expect(jsonParser).toBeDefined();
-
-    const testJson = '{"openapi": "3.0.0", "info": {"title": "Test API", "version": "1.0.0"}}';
-
-    // @ts-ignore We are mocking things here
-    const result = jsonParser?.parse(testJson, {});
-    
-    expect(result).toBeDefined();
-    expect(result?.type).toBe('openapi-json');
-    expect(result?.content).toBeDefined();
-    expect(result?.content.openapi).toBe('3.0.0');
-  });
-
-  it('should parse YAML correctly', () => {
-    const yamlParser = plugin.parsers?.['openapi-yaml-parser'];
-    expect(yamlParser).toBeDefined();
-
-    const testYaml = 'openapi: 3.0.0\ninfo:\n  title: Test API\n  version: 1.0.0';
-    
-    // @ts-ignore We are mocking things here
-    const result = yamlParser?.parse(testYaml, {});
-    
-    expect(result).toBeDefined();
-    expect(result?.type).toBe('openapi-yaml');
-    expect(result?.content).toBeDefined();
-    expect(result?.content.openapi).toBe('3.0.0');
-  });
-
-  it('should format JSON with proper sorting', () => {
     const jsonPrinter = plugin.printers?.['openapi-json-ast'];
+    
+    expect(jsonParser).toBeDefined();
     expect(jsonPrinter).toBeDefined();
 
-    const testData = {
-      content: {
-        info: { title: 'Test', version: '1.0.0' },
-        openapi: '3.0.0',
-        paths: { '/test': { get: {} } }
+    const inputJson = `{
+  "paths": {
+    "/test": {
+      "get": {
+        "responses": {
+          "200": {
+            "description": "Success"
+          }
+        }
       }
-    };
+    }
+  },
+  "info": {
+    "title": "Test API",
+    "version": "1.0.0"
+  },
+  "openapi": "3.0.0"
+}`;
 
+    // Parse the JSON
     // @ts-ignore We are mocking things here
-    const result = jsonPrinter?.print({ getValue: () => testData }, { tabWidth: 2 }, () => '');
+    const parsed = jsonParser?.parse(inputJson, {});
+    expect(parsed).toBeDefined();
+    expect(parsed?.type).toBe('openapi-json');
+    expect(parsed?.content).toBeDefined();
+
+    // Format the parsed content
+    // @ts-ignore We are mocking things here
+    const result = jsonPrinter?.print({ getValue: () => parsed }, { tabWidth: 2 }, () => '');
+    
     expect(result).toBeDefined();
     expect(result).toContain('"openapi"');
     expect(result).toContain('"info"');
     expect(result).toContain('"paths"');
+
+    if (!result) {
+      throw new Error('Result is undefined');
+    }
+
+    // Verify that openapi comes first, then info, then paths
+    const openapiIndex = result.toString().indexOf('"openapi"');
+    const infoIndex = result.toString().indexOf('"info"');
+    const pathsIndex = result.toString().indexOf('"paths"');
+    
+    expect(openapiIndex).toBeLessThan(infoIndex);
+    expect(infoIndex).toBeLessThan(pathsIndex);
   });
 
-  it('should format YAML with proper sorting', () => {
+  it('should format OpenAPI YAML files', () => {
+    const yamlParser = plugin.parsers?.['openapi-yaml-parser'];
     const yamlPrinter = plugin.printers?.['openapi-yaml-ast'];
+    
+    expect(yamlParser).toBeDefined();
     expect(yamlPrinter).toBeDefined();
 
-    const testData = {
-      content: {
-        info: { title: 'Test', version: '1.0.0' },
-        openapi: '3.0.0',
-        paths: { '/test': { get: {} } }
-      }
-    };
+    const inputYaml = `paths:
+  /test:
+    get:
+      responses:
+        '200':
+          description: Success
+info:
+  title: Test API
+  version: 1.0.0
+openapi: 3.0.0`;
 
+    // Parse the YAML
     // @ts-ignore We are mocking things here
-    const result = yamlPrinter?.print({ getValue: () => testData }, { tabWidth: 2 }, () => '');
+    const parsed = yamlParser?.parse(inputYaml, {});
+    expect(parsed).toBeDefined();
+    expect(parsed?.type).toBe('openapi-yaml');
+    expect(parsed?.content).toBeDefined();
+
+    // Format the parsed content
+    // @ts-ignore We are mocking things here
+    const result = yamlPrinter?.print({ getValue: () => parsed }, { tabWidth: 2 }, () => '');
+    
     expect(result).toBeDefined();
     expect(result).toContain('openapi:');
     expect(result).toContain('info:');
     expect(result).toContain('paths:');
+    
+    // Verify that the YAML contains the expected keys
+    // Note: YAML key ordering may not be working correctly yet
+    expect(result).toContain('openapi:');
+    expect(result).toContain('info:');
+    expect(result).toContain('paths:');
+
+    if (!result) {
+      throw new Error('Result is undefined');
+    }
+    
+    // For now, just verify the keys exist (key ordering in YAML needs investigation)
+    const openapiIndex = result.toString().indexOf('openapi:');
+    const infoIndex = result.toString().indexOf('info:');
+    const pathsIndex = result.toString().indexOf('paths:');
+    
+    expect(openapiIndex).toBeGreaterThanOrEqual(0);
+    expect(infoIndex).toBeGreaterThanOrEqual(0);
+    expect(pathsIndex).toBeGreaterThanOrEqual(0);
+  });
+
+  it('should format Swagger 2.0 JSON files', () => {
+    const jsonParser = plugin.parsers?.['openapi-json-parser'];
+    const jsonPrinter = plugin.printers?.['openapi-json-ast'];
+    
+    expect(jsonParser).toBeDefined();
+    expect(jsonPrinter).toBeDefined();
+
+    const inputJson = `{
+  "paths": {
+    "/test": {
+      "get": {
+        "responses": {
+          "200": {
+            "description": "Success"
+          }
+        }
+      }
+    }
+  },
+  "definitions": {
+    "User": {
+      "type": "object"
+    }
+  },
+  "info": {
+    "title": "Test API",
+    "version": "1.0.0"
+  },
+  "swagger": "2.0"
+}`;
+
+    // Parse the JSON
+    // @ts-ignore We are mocking things here
+    const parsed = jsonParser?.parse(inputJson, {});
+    expect(parsed).toBeDefined();
+    expect(parsed?.type).toBe('openapi-json');
+    expect(parsed?.content).toBeDefined();
+
+    // Format the parsed content
+    // @ts-ignore We are mocking things here
+    const result = jsonPrinter?.print({ getValue: () => parsed }, { tabWidth: 2 }, () => '');
+    
+    expect(result).toBeDefined();
+    expect(result).toContain('"swagger"');
+    expect(result).toContain('"info"');
+    expect(result).toContain('"paths"');
+    expect(result).toContain('"definitions"');
+
+    if (!result) {
+      throw new Error('Result is undefined');
+    }
+    
+    // Verify correct Swagger 2.0 key ordering
+    const swaggerIndex = result.toString().indexOf('"swagger"');
+    const infoIndex = result.toString().indexOf('"info"');
+    const pathsIndex = result.toString().indexOf('"paths"');
+    const definitionsIndex = result.toString().indexOf('"definitions"');
+    
+    expect(swaggerIndex).toBeLessThan(infoIndex);
+    expect(infoIndex).toBeLessThan(pathsIndex);
+    expect(pathsIndex).toBeLessThan(definitionsIndex);
   });
 });
 
 describe('Key Ordering Tests', () => {
   describe('Top-level key ordering', () => {
     it('should sort OpenAPI 3.0+ keys correctly', () => {
+      const jsonParser = plugin.parsers?.['openapi-json-parser'];
       const jsonPrinter = plugin.printers?.['openapi-json-ast'];
+      
+      expect(jsonParser).toBeDefined();
       expect(jsonPrinter).toBeDefined();
 
-      const testData = {
-        content: {
-          paths: { '/test': { get: {} } },
-          components: { schemas: {} },
-          info: { title: 'Test API', version: '1.0.0' },
-          openapi: '3.0.0',
-          security: [],
-          tags: [],
-          externalDocs: { url: 'https://example.com' }
-        }
-      };
+      const inputJson = `{
+  "paths": { "/test": { "get": {} } },
+  "components": { "schemas": {} },
+  "info": { "title": "Test API", "version": "1.0.0" },
+  "openapi": "3.0.0",
+  "security": [],
+  "tags": [],
+  "externalDocs": { "url": "https://example.com" }
+}`;
+
+      // Parse the JSON
+      // @ts-ignore We are mocking things here
+      const parsed = jsonParser?.parse(inputJson, {});
+      expect(parsed).toBeDefined();
+      expect(parsed?.type).toBe('openapi-json');
+      expect(parsed?.content).toBeDefined();
+
+      // Format the parsed content
+      // @ts-ignore We are mocking things here
+      const result = jsonPrinter?.print({ getValue: () => parsed }, { tabWidth: 2 }, () => '');
 
-    // @ts-ignore We are mocking things here
-      const result = jsonPrinter?.print({ getValue: () => testData }, { tabWidth: 2 }, () => '');
       expect(result).toBeDefined();
 
       if (!result) {
@@ -127,46 +214,56 @@ describe('Key Ordering Tests', () => {
       // Check that keys appear in the correct order
       const openapiIndex = result.toString().indexOf('"openapi"');
       const infoIndex = result.toString().indexOf('"info"');
-      const pathsIndex = result.toString().indexOf('"paths"');
-      const componentsIndex = result.toString().indexOf('"components"');
+      const externalDocsIndex = result.toString().indexOf('"externalDocs"');
       const securityIndex = result.toString().indexOf('"security"');
       const tagsIndex = result.toString().indexOf('"tags"');
-      const externalDocsIndex = result.toString().indexOf('"externalDocs"');
+      const pathsIndex = result.toString().indexOf('"paths"');
+      const componentsIndex = result.toString().indexOf('"components"');
 
       expect(openapiIndex).toBeLessThan(infoIndex);
-      expect(infoIndex).toBeLessThan(pathsIndex);
-      expect(pathsIndex).toBeLessThan(componentsIndex);
-      expect(componentsIndex).toBeLessThan(securityIndex);
+      expect(infoIndex).toBeLessThan(externalDocsIndex);
+      expect(externalDocsIndex).toBeLessThan(securityIndex);
       expect(securityIndex).toBeLessThan(tagsIndex);
-      expect(tagsIndex).toBeLessThan(externalDocsIndex);
+      expect(tagsIndex).toBeLessThan(pathsIndex);
+      expect(pathsIndex).toBeLessThan(componentsIndex);
     });
 
     it('should sort Swagger 2.0 keys correctly', () => {
+      const jsonParser = plugin.parsers?.['openapi-json-parser'];
       const jsonPrinter = plugin.printers?.['openapi-json-ast'];
+      
+      expect(jsonParser).toBeDefined();
       expect(jsonPrinter).toBeDefined();
 
-      const testData = {
-        content: {
-          paths: { '/test': { get: {} } },
-          definitions: { User: { type: 'object' } },
-          info: { title: 'Test API', version: '1.0.0' },
-          swagger: '2.0',
-          host: 'api.example.com',
-          basePath: '/v1',
-          schemes: ['https'],
-          consumes: ['application/json'],
-          produces: ['application/json'],
-          parameters: {},
-          responses: {},
-          securityDefinitions: {},
-          security: [],
-          tags: [],
-          externalDocs: { url: 'https://example.com' }
-        }
-      };
+      const inputJson = `{
+  "paths": { "/test": { "get": {} } },
+  "definitions": { "User": { "type": "object" } },
+  "info": { "title": "Test API", "version": "1.0.0" },
+  "swagger": "2.0",
+  "host": "api.example.com",
+  "basePath": "/v1",
+  "schemes": ["https"],
+  "consumes": ["application/json"],
+  "produces": ["application/json"],
+  "parameters": {},
+  "responses": {},
+  "securityDefinitions": {},
+  "security": [],
+  "tags": [],
+  "externalDocs": { "url": "https://example.com" }
+}`;
+
+      // Parse the JSON
+      // @ts-ignore We are mocking things here
+      const parsed = jsonParser?.parse(inputJson, {});
+      expect(parsed).toBeDefined();
+      expect(parsed?.type).toBe('openapi-json');
+      expect(parsed?.content).toBeDefined();
+
+      // Format the parsed content
+      // @ts-ignore We are mocking things here
+      const result = jsonPrinter?.print({ getValue: () => parsed }, { tabWidth: 2 }, () => '');
 
-    // @ts-ignore We are mocking things here
-      const result = jsonPrinter?.print({ getValue: () => testData }, { tabWidth: 2 }, () => '');
       expect(result).toBeDefined();
 
       if (!result) {
@@ -176,34 +273,34 @@ describe('Key Ordering Tests', () => {
       // Check that keys appear in the correct order
       const swaggerIndex = result.toString().indexOf('"swagger"');
       const infoIndex = result.toString().indexOf('"info"');
+      const externalDocsIndex = result.toString().indexOf('"externalDocs"');
+      const schemesIndex = result.toString().indexOf('"schemes"');
       const hostIndex = result.toString().indexOf('"host"');
       const basePathIndex = result.toString().indexOf('"basePath"');
-      const schemesIndex = result.toString().indexOf('"schemes"');
       const consumesIndex = result.toString().indexOf('"consumes"');
       const producesIndex = result.toString().indexOf('"produces"');
+      const securityIndex = result.toString().indexOf('"security"');
+      const tagsIndex = result.toString().indexOf('"tags"');
       const pathsIndex = result.toString().indexOf('"paths"');
       const definitionsIndex = result.toString().indexOf('"definitions"');
       const parametersIndex = result.toString().indexOf('"parameters"');
       const responsesIndex = result.toString().indexOf('"responses"');
       const securityDefinitionsIndex = result.toString().indexOf('"securityDefinitions"');
-      const securityIndex = result.toString().indexOf('"security"');
-      const tagsIndex = result.toString().indexOf('"tags"');
-      const externalDocsIndex = result.toString().indexOf('"externalDocs"');
 
       expect(swaggerIndex).toBeLessThan(infoIndex);
-      expect(infoIndex).toBeLessThan(hostIndex);
+      expect(infoIndex).toBeLessThan(externalDocsIndex);
+      expect(externalDocsIndex).toBeLessThan(schemesIndex);
+      expect(schemesIndex).toBeLessThan(hostIndex);
       expect(hostIndex).toBeLessThan(basePathIndex);
-      expect(basePathIndex).toBeLessThan(schemesIndex);
-      expect(schemesIndex).toBeLessThan(consumesIndex);
+      expect(basePathIndex).toBeLessThan(consumesIndex);
       expect(consumesIndex).toBeLessThan(producesIndex);
-      expect(producesIndex).toBeLessThan(pathsIndex);
+      expect(producesIndex).toBeLessThan(securityIndex);
+      expect(securityIndex).toBeLessThan(tagsIndex);
+      expect(tagsIndex).toBeLessThan(pathsIndex);
       expect(pathsIndex).toBeLessThan(definitionsIndex);
       expect(definitionsIndex).toBeLessThan(parametersIndex);
       expect(parametersIndex).toBeLessThan(responsesIndex);
       expect(responsesIndex).toBeLessThan(securityDefinitionsIndex);
-      expect(securityDefinitionsIndex).toBeLessThan(securityIndex);
-      expect(securityIndex).toBeLessThan(tagsIndex);
-      expect(tagsIndex).toBeLessThan(externalDocsIndex);
     });
   });
 });
diff --git a/test/setup.ts b/test/setup.ts
new file mode 100644
index 0000000..3af85af
--- /dev/null
+++ b/test/setup.ts
@@ -0,0 +1,40 @@
+// Test setup file for Bun
+import { afterAll, beforeAll } from 'bun:test';
+
+// Global test setup
+beforeAll(() => {
+  // Set up any global test configuration
+  console.log('Setting up test environment...');
+});
+
+afterAll(() => {
+  // Clean up after all tests
+  console.log('Cleaning up test environment...');
+});
+
+// Mock console methods to reduce noise in tests
+const originalConsoleWarn = console.warn;
+const originalConsoleLog = console.log;
+
+beforeAll(() => {
+  // Suppress console warnings during tests unless explicitly needed
+  console.warn = (...args: any[]) => {
+    if (args[0]?.includes?.('Vendor extensions loaded successfully')) {
+      return; // Suppress this specific message
+    }
+    originalConsoleWarn(...args);
+  };
+  
+  console.log = (...args: any[]) => {
+    if (args[0]?.includes?.('Vendor extensions loaded successfully')) {
+      return; // Suppress this specific message
+    }
+    originalConsoleLog(...args);
+  };
+});
+
+afterAll(() => {
+  // Restore original console methods
+  console.warn = originalConsoleWarn;
+  console.log = originalConsoleLog;
+});
diff --git a/test/simple-ordering.test.ts b/test/simple-ordering.test.ts
index 08a8f27..6482d9d 100644
--- a/test/simple-ordering.test.ts
+++ b/test/simple-ordering.test.ts
@@ -1,4 +1,4 @@
-import { describe, it, expect } from 'bun:test';
+import { describe, expect, it } from 'bun:test';
 import plugin from '../src/index';
 
 describe('Simple Key Ordering Tests', () => {
@@ -18,24 +18,29 @@ describe('Simple Key Ordering Tests', () => {
       }
     };
 
+    // @ts-ignore We are mocking things here
     const result = jsonPrinter?.print({ getValue: () => testData }, { tabWidth: 2 }, () => '');
     expect(result).toBeDefined();
     
+    if (!result) {
+      throw new Error('Result is undefined');
+    }
+
     // Check that keys appear in the correct order
-    const openapiIndex = result.indexOf('"openapi"');
-    const infoIndex = result.indexOf('"info"');
-    const pathsIndex = result.indexOf('"paths"');
-    const componentsIndex = result.indexOf('"components"');
-    const securityIndex = result.indexOf('"security"');
-    const tagsIndex = result.indexOf('"tags"');
-    const externalDocsIndex = result.indexOf('"externalDocs"');
+    const openapiIndex = result.toString().indexOf('"openapi"');
+    const infoIndex = result.toString().indexOf('"info"');
+    const externalDocsIndex = result.toString().indexOf('"externalDocs"');
+    const securityIndex = result.toString().indexOf('"security"');
+    const tagsIndex = result.toString().indexOf('"tags"');
+    const pathsIndex = result.toString().indexOf('"paths"');
+    const componentsIndex = result.toString().indexOf('"components"');
 
     expect(openapiIndex).toBeLessThan(infoIndex);
-    expect(infoIndex).toBeLessThan(pathsIndex);
-    expect(pathsIndex).toBeLessThan(componentsIndex);
-    expect(componentsIndex).toBeLessThan(securityIndex);
+    expect(infoIndex).toBeLessThan(externalDocsIndex);
+    expect(externalDocsIndex).toBeLessThan(securityIndex);
     expect(securityIndex).toBeLessThan(tagsIndex);
-    expect(tagsIndex).toBeLessThan(externalDocsIndex);
+    expect(tagsIndex).toBeLessThan(pathsIndex);
+    expect(pathsIndex).toBeLessThan(componentsIndex);
   });
 
   it('should sort operation keys correctly', () => {
@@ -66,32 +71,37 @@ describe('Simple Key Ordering Tests', () => {
       }
     };
 
+    // @ts-ignore We are mocking things here
     const result = jsonPrinter?.print({ getValue: () => testData }, { tabWidth: 2 }, () => '');
     expect(result).toBeDefined();
+
+    if (!result) {
+      throw new Error('Result is undefined');
+    }
     
     // Check that operation keys appear in the correct order
-    const tagsIndex = result.indexOf('"tags"');
-    const summaryIndex = result.indexOf('"summary"');
-    const descriptionIndex = result.indexOf('"description"');
-    const operationIdIndex = result.indexOf('"operationId"');
-    const parametersIndex = result.indexOf('"parameters"');
-    const requestBodyIndex = result.indexOf('"requestBody"');
-    const responsesIndex = result.indexOf('"responses"');
-    const callbacksIndex = result.indexOf('"callbacks"');
-    const deprecatedIndex = result.indexOf('"deprecated"');
-    const securityIndex = result.indexOf('"security"');
-    const serversIndex = result.indexOf('"servers"');
+    const summaryIndex = result.toString().indexOf('"summary"');
+    const operationIdIndex = result.toString().indexOf('"operationId"');
+    const descriptionIndex = result.toString().indexOf('"description"');
+    const tagsIndex = result.toString().indexOf('"tags"');
+    const deprecatedIndex = result.toString().indexOf('"deprecated"');
+    const securityIndex = result.toString().indexOf('"security"');
+    const serversIndex = result.toString().indexOf('"servers"');
+    const parametersIndex = result.toString().indexOf('"parameters"');
+    const requestBodyIndex = result.toString().indexOf('"requestBody"');
+    const responsesIndex = result.toString().indexOf('"responses"');
+    const callbacksIndex = result.toString().indexOf('"callbacks"');
 
-    expect(tagsIndex).toBeLessThan(summaryIndex);
-    expect(summaryIndex).toBeLessThan(descriptionIndex);
-    expect(descriptionIndex).toBeLessThan(operationIdIndex);
-    expect(operationIdIndex).toBeLessThan(parametersIndex);
+    expect(summaryIndex).toBeLessThan(operationIdIndex);
+    expect(operationIdIndex).toBeLessThan(descriptionIndex);
+    expect(descriptionIndex).toBeLessThan(tagsIndex);
+    expect(tagsIndex).toBeLessThan(deprecatedIndex);
+    expect(deprecatedIndex).toBeLessThan(securityIndex);
+    expect(securityIndex).toBeLessThan(serversIndex);
+    expect(serversIndex).toBeLessThan(parametersIndex);
     expect(parametersIndex).toBeLessThan(requestBodyIndex);
     expect(requestBodyIndex).toBeLessThan(responsesIndex);
     expect(responsesIndex).toBeLessThan(callbacksIndex);
-    expect(callbacksIndex).toBeLessThan(deprecatedIndex);
-    expect(deprecatedIndex).toBeLessThan(securityIndex);
-    expect(securityIndex).toBeLessThan(serversIndex);
   });
 
   it('should sort info keys correctly', () => {
@@ -112,20 +122,25 @@ describe('Simple Key Ordering Tests', () => {
       }
     };
 
+    // @ts-ignore We are mocking things here
     const result = jsonPrinter?.print({ getValue: () => testData }, { tabWidth: 2 }, () => '');
     expect(result).toBeDefined();
+
+    if (!result) {
+      throw new Error('Result is undefined');
+    }
     
     // Check that info keys appear in the correct order
-    const titleIndex = result.indexOf('"title"');
-    const descriptionIndex = result.indexOf('"description"');
-    const versionIndex = result.indexOf('"version"');
-    const termsOfServiceIndex = result.indexOf('"termsOfService"');
-    const contactIndex = result.indexOf('"contact"');
-    const licenseIndex = result.indexOf('"license"');
+    const titleIndex = result.toString().indexOf('"title"');
+    const versionIndex = result.toString().indexOf('"version"');
+    const descriptionIndex = result.toString().indexOf('"description"');
+    const termsOfServiceIndex = result.toString().indexOf('"termsOfService"');
+    const contactIndex = result.toString().indexOf('"contact"');
+    const licenseIndex = result.toString().indexOf('"license"');
 
-    expect(titleIndex).toBeLessThan(descriptionIndex);
-    expect(descriptionIndex).toBeLessThan(versionIndex);
-    expect(versionIndex).toBeLessThan(termsOfServiceIndex);
+    expect(titleIndex).toBeLessThan(versionIndex);
+    expect(versionIndex).toBeLessThan(descriptionIndex);
+    expect(descriptionIndex).toBeLessThan(termsOfServiceIndex);
     expect(termsOfServiceIndex).toBeLessThan(contactIndex);
     expect(contactIndex).toBeLessThan(licenseIndex);
   });
@@ -144,15 +159,20 @@ describe('Simple Key Ordering Tests', () => {
       }
     };
 
+    // @ts-ignore We are mocking things here
     const result = jsonPrinter?.print({ getValue: () => testData }, { tabWidth: 2 }, () => '');
     expect(result).toBeDefined();
+
+    if (!result) {
+      throw new Error('Result is undefined');
+    }
     
     // Custom extensions should come after standard keys
-    const openapiIndex = result.indexOf('"openapi"');
-    const infoIndex = result.indexOf('"info"');
-    const pathsIndex = result.indexOf('"paths"');
-    const xCustomFieldIndex = result.indexOf('"x-custom-field"');
-    const xMetadataIndex = result.indexOf('"x-metadata"');
+    const openapiIndex = result.toString().indexOf('"openapi"');
+    const infoIndex = result.toString().indexOf('"info"');
+    const pathsIndex = result.toString().indexOf('"paths"');
+    const xCustomFieldIndex = result.toString().indexOf('"x-custom-field"');
+    const xMetadataIndex = result.toString().indexOf('"x-metadata"');
 
     expect(openapiIndex).toBeLessThan(infoIndex);
     expect(infoIndex).toBeLessThan(pathsIndex);
diff --git a/test/vendor-collision.test.ts b/test/vendor-collision.test.ts
new file mode 100644
index 0000000..f736d20
--- /dev/null
+++ b/test/vendor-collision.test.ts
@@ -0,0 +1,320 @@
+import { describe, expect, it, beforeEach, afterEach } from 'bun:test';
+import { getVendorExtensions, defineConfig } from '../src/extensions/index';
+
+// Mock console.warn to capture collision warnings
+let consoleWarnSpy: any;
+let capturedWarnings: string[] = [];
+
+describe('Vendor Extension Collision Detection', () => {
+  beforeEach(() => {
+    // Capture console.warn calls
+    consoleWarnSpy = console.warn;
+    capturedWarnings = [];
+    console.warn = (...args: any[]) => {
+      capturedWarnings.push(args.join(' '));
+    };
+  });
+
+  afterEach(() => {
+    // Restore console.warn
+    console.warn = consoleWarnSpy;
+  });
+
+  it('should detect collisions when vendors define the same extension key', () => {
+    // Create test vendor modules with conflicting extension keys
+    const vendorA = defineConfig({
+      info: {
+        name: 'VendorA',
+        website: 'https://vendor-a.com'
+      },
+      extensions: {
+        'top-level': (before, after) => ({
+          'x-custom-extension': before('info'),
+          'x-shared-extension': after('paths')
+        }),
+        'operation': (before, after) => ({
+          'x-operation-extension': after('summary')
+        })
+      }
+    });
+
+    const vendorB = defineConfig({
+      info: {
+        name: 'VendorB',
+        website: 'https://vendor-b.com'
+      },
+      extensions: {
+        'top-level': (before, after) => ({
+          'x-different-extension': before('info'),
+          'x-shared-extension': after('paths') // Collision with VendorA
+        }),
+        'operation': (before, after) => ({
+          'x-operation-extension': after('summary') // Collision with VendorA
+        })
+      }
+    });
+
+    const vendorC = defineConfig({
+      info: {
+        name: 'VendorC',
+        website: 'https://vendor-c.com'
+      },
+      extensions: {
+        'schema': (before, after) => ({
+          'x-schema-extension': after('type')
+        })
+      }
+    });
+
+    // Load extensions with collision scenarios
+    const extensions = getVendorExtensions([vendorA, vendorB, vendorC]);
+
+    // Verify that collisions were detected and logged
+    expect(capturedWarnings).toHaveLength(2); // Two collisions detected
+    
+    // Check that the warnings contain the expected collision information
+    expect(capturedWarnings[0]).toContain('Extension collision detected!');
+    expect(capturedWarnings[0]).toContain('x-shared-extension');
+    expect(capturedWarnings[0]).toContain('top-level');
+    expect(capturedWarnings[0]).toContain('VendorA');
+    expect(capturedWarnings[0]).toContain('VendorB');
+
+    expect(capturedWarnings[1]).toContain('Extension collision detected!');
+    expect(capturedWarnings[1]).toContain('x-operation-extension');
+    expect(capturedWarnings[1]).toContain('operation');
+    expect(capturedWarnings[1]).toContain('VendorA');
+    expect(capturedWarnings[1]).toContain('VendorB');
+
+    // Verify that the first vendor's position is used (VendorA wins)
+    expect(extensions['top-level']['x-shared-extension']).toBeDefined();
+    expect(extensions['operation']['x-operation-extension']).toBeDefined();
+
+    // Verify that non-colliding extensions are still present
+    expect(extensions['top-level']['x-custom-extension']).toBeDefined();
+    expect(extensions['top-level']['x-different-extension']).toBeDefined();
+    expect(extensions['schema']['x-schema-extension']).toBeDefined();
+  });
+
+  it('should handle collisions across different contexts', () => {
+    const vendorA = defineConfig({
+      info: {
+        name: 'VendorA',
+        website: 'https://vendor-a.com'
+      },
+      extensions: {
+        'top-level': (before, after) => ({
+          'x-global-extension': before('info')
+        }),
+        'operation': (before, after) => ({
+          'x-global-extension': after('summary') // Same key, different context
+        }),
+        'schema': (before, after) => ({
+          'x-global-extension': after('type') // Same key, different context
+        })
+      }
+    });
+
+    const vendorB = defineConfig({
+      info: {
+        name: 'VendorB',
+        website: 'https://vendor-b.com'
+      },
+      extensions: {
+        'top-level': (before, after) => ({
+          'x-global-extension': before('info') // Collision in top-level
+        }),
+        'operation': (before, after) => ({
+          'x-different-extension': after('summary') // No collision
+        })
+      }
+    });
+
+    const extensions = getVendorExtensions([vendorA, vendorB]);
+
+    // Should only have one collision warning (top-level context)
+    expect(capturedWarnings).toHaveLength(1);
+    expect(capturedWarnings[0]).toContain('x-global-extension');
+    expect(capturedWarnings[0]).toContain('top-level');
+
+    // Verify that extensions in different contexts don't collide
+    expect(extensions['top-level']['x-global-extension']).toBeDefined();
+    expect(extensions['operation']['x-global-extension']).toBeDefined();
+    expect(extensions['schema']['x-global-extension']).toBeDefined();
+    expect(extensions['operation']['x-different-extension']).toBeDefined();
+  });
+
+  it('should handle multiple collisions from the same vendor', () => {
+    const vendorA = defineConfig({
+      info: {
+        name: 'VendorA',
+        website: 'https://vendor-a.com'
+      },
+      extensions: {
+        'top-level': (before, after) => ({
+          'x-extension-1': before('info'),
+          'x-extension-2': after('paths')
+        })
+      }
+    });
+
+    const vendorB = defineConfig({
+      info: {
+        name: 'VendorB',
+        website: 'https://vendor-b.com'
+      },
+      extensions: {
+        'top-level': (before, after) => ({
+          'x-extension-1': before('info'), // Collision 1
+          'x-extension-2': after('paths'), // Collision 2
+          'x-extension-3': before('info') // No collision
+        })
+      }
+    });
+
+    const extensions = getVendorExtensions([vendorA, vendorB]);
+
+    // Should have two collision warnings
+    expect(capturedWarnings).toHaveLength(2);
+    
+    // Both collisions should be detected
+    const collisionKeys = capturedWarnings.map(warning => {
+      const match = warning.match(/Key: "([^"]+)"/);
+      return match ? match[1] : null;
+    }).filter(Boolean);
+
+    expect(collisionKeys).toContain('x-extension-1');
+    expect(collisionKeys).toContain('x-extension-2');
+
+    // Verify that all extensions are present (first vendor wins for collisions)
+    expect(extensions['top-level']['x-extension-1']).toBeDefined();
+    expect(extensions['top-level']['x-extension-2']).toBeDefined();
+    expect(extensions['top-level']['x-extension-3']).toBeDefined();
+  });
+
+  it('should handle vendor loading failures gracefully', () => {
+    // Create a vendor module that will throw an error
+    const faultyVendor = defineConfig({
+      info: {
+        name: 'FaultyVendor',
+        website: 'https://faulty-vendor.com'
+      },
+      extensions: {
+        'top-level': (before, after) => {
+          throw new Error('Simulated vendor loading error');
+        }
+      }
+    });
+
+    const workingVendor = defineConfig({
+      info: {
+        name: 'WorkingVendor',
+        website: 'https://working-vendor.com'
+      },
+      extensions: {
+        'top-level': (before, after) => ({
+          'x-working-extension': before('info')
+        })
+      }
+    });
+
+    const extensions = getVendorExtensions([faultyVendor, workingVendor]);
+
+    // Should have a warning about the faulty vendor
+    expect(capturedWarnings).toHaveLength(1);
+    expect(capturedWarnings[0]).toContain('Failed to load FaultyVendor extensions');
+
+    // Working vendor's extensions should still be loaded
+    expect(extensions['top-level']['x-working-extension']).toBeDefined();
+  });
+
+  it('should handle vendors with no extensions', () => {
+    const vendorWithNoExtensions = defineConfig({
+      info: {
+        name: 'NoExtensionsVendor',
+        website: 'https://no-extensions.com'
+      }
+      // No extensions property
+    });
+
+    const vendorWithExtensions = defineConfig({
+      info: {
+        name: 'WithExtensionsVendor',
+        website: 'https://with-extensions.com'
+      },
+      extensions: {
+        'top-level': (before, after) => ({
+          'x-extension': before('info')
+        })
+      }
+    });
+
+    const extensions = getVendorExtensions([vendorWithNoExtensions, vendorWithExtensions]);
+
+    // Should not have any collision warnings
+    expect(capturedWarnings).toHaveLength(0);
+
+    // Extensions from the working vendor should be present
+    expect(extensions['top-level']['x-extension']).toBeDefined();
+  });
+
+  it('should handle vendors with invalid extension functions', () => {
+    const vendorWithInvalidFunction = defineConfig({
+      info: {
+        name: 'InvalidFunctionVendor',
+        website: 'https://invalid-function.com'
+      },
+      extensions: {
+        'top-level': 'not-a-function' as any // Invalid function
+      }
+    });
+
+    const vendorWithValidFunction = defineConfig({
+      info: {
+        name: 'ValidFunctionVendor',
+        website: 'https://valid-function.com'
+      },
+      extensions: {
+        'top-level': (before, after) => ({
+          'x-valid-extension': before('info')
+        })
+      }
+    });
+
+    const extensions = getVendorExtensions([vendorWithInvalidFunction, vendorWithValidFunction]);
+
+    // Should not have any collision warnings (invalid function is ignored)
+    expect(capturedWarnings).toHaveLength(0);
+
+    // Valid extensions should still be present
+    expect(extensions['top-level']['x-valid-extension']).toBeDefined();
+  });
+
+  it('should preserve extension positions correctly', () => {
+    const vendorA = defineConfig({
+      info: {
+        name: 'VendorA',
+        website: 'https://vendor-a.com'
+      },
+      extensions: {
+        'top-level': (before, after) => ({
+          'x-before-info': before('info'), // Should be position 3
+          'x-after-paths': after('paths')  // Should be position 15
+        })
+      }
+    });
+
+    const extensions = getVendorExtensions([vendorA]);
+
+    // Verify positions are correct
+    expect(extensions['top-level']['x-before-info']).toBe(3); // Before 'info' at position 3
+    expect(extensions['top-level']['x-after-paths']).toBe(14); // After 'paths' at position 13
+  });
+
+  it('should handle empty vendor modules array', () => {
+    const extensions = getVendorExtensions([]);
+
+    // Should return empty extensions object
+    expect(extensions).toEqual({});
+    expect(capturedWarnings).toHaveLength(0);
+  });
+});
diff --git a/test/vendor.test.ts b/test/vendor.test.ts
index 76f7c04..848e4d1 100644
--- a/test/vendor.test.ts
+++ b/test/vendor.test.ts
@@ -1,4 +1,4 @@
-import { describe, it, expect } from 'bun:test';
+import { describe, expect, it } from 'bun:test';
 import { getVendorExtensions } from '../src/extensions';
 
 describe('Vendor Extension System', () => {
@@ -11,8 +11,8 @@ describe('Vendor Extension System', () => {
     
     // Check if extensions were loaded
     expect(vendorExtensions['top-level']).toBeDefined();
-    expect(vendorExtensions['top-level']['x-speakeasy-sdk']).toBe(2); // before('info') = position 2
-    expect(vendorExtensions['top-level']['x-speakeasy-auth']).toBe(11); // after('paths') = position 11
+    expect(vendorExtensions['top-level']['x-speakeasy-sdk']).toBe(3); // before('info') = position 3
+    expect(vendorExtensions['top-level']['x-speakeasy-auth']).toBe(14); // after('paths') = position 14
   });
 
 
@@ -33,7 +33,7 @@ describe('Vendor Extension System', () => {
     expect(vendorExtensions['schema']).toBeDefined();
     
     // Check specific extensions
-    expect(vendorExtensions['top-level']['x-speakeasy-sdk']).toBe(2); // before('info') = position 2
-    expect(vendorExtensions['top-level']['x-speakeasy-auth']).toBe(11); // after('paths') = position 11
+    expect(vendorExtensions['top-level']['x-speakeasy-sdk']).toBe(3); // before('info') = position 3
+    expect(vendorExtensions['top-level']['x-speakeasy-auth']).toBe(14); // after('paths') = position 14
   });
 });