djlint 1.29.0 → 1.30.0

package/.coveragerc

@@ -0,0 +1,9 @@
+[run]
+source = src/djlint
+branch = True
+
+[report]
+show_missing = True
+skip_covered = True
+omit =
+    */test*

package/.editorconfig

@@ -0,0 +1,21 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+charset = utf-8
+
+[*.njk]
+indent_size = 2
+
+[*.js]
+indent_size = 2
+
+[*.yml]
+indent_size = 2
+
+[*.yaml]
+indent_size = 2

package/.github/FUNDING.yml

@@ -0,0 +1,2 @@
+github: christopherpickering
+custom: https://venmo.com/code?user_id=3118520086822912596&created=1655827155

package/.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,6 @@
+blank_issues_enabled: false
+contact_links:
+- name: 💬 Discord Server
+  url: https://discord.gg/taghAqebzU
+  about: |
+    Chat with the community, ask questions and learn about best practices.

package/.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,19 @@
+---
+name: "\U0001F682 Feature Request"
+about: Do you have an idea for a new feature or improvement?
+title: '[FEATURE]'
+labels: enhancement
+---
+
+<!--
+    Thanks for wanting to make djLint better.
+
+    Have you...
+-->
+
+- [ ] I've searched the [issues](https://github.com/Riverside-Healthcare/djLint/issues)
+- [ ] I've read the [docs](https://djlint.com)
+
+## Feature Request
+
+<!-- Thanks! 🤠 -->

package/.github/ISSUE_TEMPLATE/formatter_but_report.md

@@ -0,0 +1,30 @@
+---
+name: "\U0001F9A0 Formatter Bug Report"
+about: You've found a bug?
+title: "[BUG] [Formatter]"
+labels: [":microbe: bug", ":sponge: formatter"]
+---
+
+<!--
+    Thanks for finding and submitting an issue.
+
+    Have you...
+-->
+
+- [ ] I'm on the [latest version](https://pypi.org/project/djlint/) of djLint
+- [ ] I've searched the [issues](https://github.com/Riverside-Healthcare/djLint/issues)
+- [ ] I've read the [docs](https://djlint.com)
+
+## System Info
+ - OS: e.g. ubuntu 20.04
+ - Python Version (``python --version``)
+ - djLint Version (``djlint --version``)
+ - template language: e.g. mustache
+
+## Issue
+<!-- A clear and concise description of what the bug is. -->
+
+## How To Reproduce
+<!-- Steps to reproduce the behavior -->
+
+<!-- Thanks! 🤠 -->

package/.github/ISSUE_TEMPLATE/linter_bug_report.md

@@ -0,0 +1,34 @@
+---
+name: "\U0001F9A0 Linter Bug Report"
+about: You've found a bug?
+title: "[BUG] [Linter]"
+labels: [":microbe: bug", ":mag: linter"]
+---
+
+<!--
+    Thanks for finding and submitting an issue.
+
+    Have you...
+-->
+
+- [ ] I'm on the [latest version](https://pypi.org/project/djlint/) of djLint
+- [ ] I've searched the [issues](https://github.com/Riverside-Healthcare/djLint/issues)
+- [ ] I've read the [docs](https://djlint.com)
+
+## System Info
+ - OS: e.g. ubuntu 20.04
+ - Python Version (``python --version``)
+ - djLint Version (``djlint --version``)
+ - template language: e.g. mustache
+
+
+## Issue
+<!-- A clear and concise description of what the bug is. -->
+
+## How To Reproduce
+<!-- Steps to reproduce the behavior -->
+
+## Contents of .djlintrc/pyproject.toml [tool.djlint]
+<!-- please include your config -->
+
+<!-- Thanks! 🤠 -->

package/.github/ISSUE_TEMPLATE/translation.md

@@ -0,0 +1,14 @@
+---
+name: "\U0001F310 Translation Issue"
+about: You've found a translation issue?
+title: "[Translation]"
+labels: ":globe_with_meridians: translation"
+---
+
+<!--
+    Thanks for finding and submitting an issue.
+
+    Use this to request a translation or fix an existing translation.
+
+    If you are familiar with the language, please submit a PR 🙏
+-->

package/.github/config.yml

@@ -0,0 +1,4 @@
+newIssueWelcomeComment: >
+  Thanks for opening your first issue here!
+
+  ![](https://media.tenor.com/Bv5ZxP2J8W4AAAAd/snoop-dogg-yep.gif)

package/.github/pull_request_template.md

@@ -0,0 +1,10 @@
+
+
+# Pull Request Check List
+
+Resolves: #issue-number-here
+
+- [ ] Added **tests** for changed code.
+- [ ] Updated **documentation** for changed code.
+
+<!-- If you have *any* questions to *any* of the points above, just **submit and ask**!  This checklist is here to *help* you, not to deter you from contributing! -->

package/.github/workflows/cancel.yml

@@ -0,0 +1,17 @@
+# This action finds in-progress Action jobs for the same branch, and cancels
+# them. There's little point in continuing to run superseded jobs.
+
+name: cancel
+
+on:
+  push:
+
+jobs:
+  cancel:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Cancel Previous Runs
+      uses: styfle/cancel-workflow-action@0.11.0
+      with:
+        access_token: ${{ github.token }}
+        workflow_id: test.yml

package/.github/workflows/demo.yml

@@ -0,0 +1,98 @@
+name: demo
+
+on:
+  workflow_dispatch:
+  push:
+    branches: [master]
+
+jobs:
+  demo:
+    strategy:
+      matrix:
+        tool: [django, wagtail, pallets, apostrophe, bolt, sylius]
+        include:
+        - tool: django
+          repo: https://github.com/django/django
+          profile: django
+          args: --indent 2
+        - tool: wagtail
+          repo: https://github.com/wagtail/wagtail
+          profile: django
+          args: --indent 4
+        - tool: pallets
+          repo: https://github.com/pallets/website
+          profile: jinja
+          args: --indent 2
+        - tool: apostrophe
+          repo: https://github.com/apostrophecms/apostrophe
+          profile: nunjucks
+          args: --indent 2
+        - tool: bolt
+          repo: https://github.com/bolt/core
+          profile: nunjucks
+          args: --indent 4
+        - tool: sylius
+          repo: https://github.com/Sylius/Sylius
+          profile: nunjucks
+          args: --indent 2
+    name: format
+    runs-on: ubuntu-latest
+    steps:
+    - name: checkout
+      uses: actions/checkout@v3
+
+    - name: setup python 3.11
+      uses: actions/setup-python@v4
+      with:
+        python-version: '3.11'
+
+    - name: Setup Poetry
+      uses: snok/install-poetry@v1
+
+    - name: install
+      run: |
+        poetry install
+
+    - name: get source
+      run: |
+        mkdir "${{ matrix.tool }}_raw"; mkdir "${{ matrix.tool }}_source"
+        cd "${{ matrix.tool }}_raw"; git clone --depth 1 "${{ matrix.repo }}" .; cd ..
+        find "${{ matrix.tool }}_raw" -iname '*.html*' -exec mv '{}' "${{ matrix.tool }}_source/" \;
+
+    - name: publish source
+      uses: peaceiris/actions-gh-pages@v3
+      with:
+        github_token: ${{ secrets.GITHUB_TOKEN }}
+        publish_dir: ./${{ matrix.tool }}_source
+        publish_branch: ${{ matrix.tool }}-source
+        enable_jekyll: true
+        force_orphan: true
+
+    - name: cleanup source
+      run: rm -r "${{ matrix.tool }}_source"; rm -r "${{ matrix.tool }}_raw"
+
+    - uses: actions/checkout@v3
+      with:
+        path: ${{ matrix.tool }}-source
+        ref: ${{ matrix.tool }}-source
+
+    - name: setup branch
+      run: |
+        cd "${{ matrix.tool }}-source"
+        git config user.name "$(git log -n 1 --pretty=format:%an)"
+        git config user.email "$(git log -n 1 --pretty=format:%ae)"
+        git branch --unset-upstream
+        git push --force origin "${{ matrix.tool }}-source":"${{ matrix.tool }}-djlint"
+
+    - name: format
+      run: |
+        cd src
+        poetry run python -m djlint "../${{ matrix.tool }}-source" --profile=${{ matrix.profile }} --reformat --warn --quiet ${{ matrix.args }}
+
+    - name: publish foramtted
+      run: |
+        cd "${{ matrix.tool }}-source"
+        export DJ_VERSION=$(poetry version --short)
+        git add .
+        git commit -m "formatted with djLint $DJ_VERSION"
+        git push origin "${{ matrix.tool }}-source":"${{ matrix.tool }}-djlint"

package/.github/workflows/issues.yml

@@ -0,0 +1,23 @@
+name: issue to project
+on:
+  issues:
+    types: [labeled]
+env:
+  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+jobs:
+  assign_one_project:
+    runs-on: ubuntu-latest
+    name: Assign to One Project
+    steps:
+    - name: Assign issues and with `bug` label to bugs project
+      uses: srggrs/assign-one-project-github-action@1.3.1
+      if: contains(github.event.issue.labels.*.name, 'bug')
+      with:
+        project: https://github.com/Riverside-Healthcare/djLint/projects/1
+        column_name: Needs triage
+    - name: Assign issues and with `enhancement` label to enhancement project
+      uses: srggrs/assign-one-project-github-action@1.3.1
+      if: contains(github.event.issue.labels.*.name, 'enhancement')
+      with:
+        project: https://github.com/Riverside-Healthcare/djLint/projects/2
+        column_name: Needs triage

package/.github/workflows/linkcheck.yaml

@@ -0,0 +1,21 @@
+name: Linkcheck
+on: [push]
+jobs:
+  linkcheck:
+    name: Linkcheck
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - uses: actions/setup-node@v3
+      with:
+        node-version: 18.x
+
+    - name: npm install, build
+      run: |
+        cd docs
+        npm install
+        npm run build
+
+    - uses: untitaker/hyperlink@0.1.27
+      with:
+        args: docs/_site/

package/.github/workflows/lint.yml

@@ -0,0 +1,25 @@
+name: lint
+on: [push, pull_request]
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v3
+
+    - name: setup python 3.11
+      uses: actions/setup-python@v4
+      with:
+        python-version: '3.11'
+
+    - name: Setup Poetry
+      uses: snok/install-poetry@v1
+
+    - name: Install
+      run: |
+        poetry install
+
+    - name: run lint
+      run: |
+        poetry run tox -e lint

package/.github/workflows/release.yml

@@ -0,0 +1,57 @@
+# This workflow will upload a Python Package using Twine when a release is created
+# For more information see: https://help.github.com/en/actions/language-and-framework-guides/using-python-with-github-actions#publishing-to-package-registries
+
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+name: Release
+
+on:
+  push:
+    branches: [master]
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v3
+      with:
+        fetch-depth: 0
+        persist-credentials: false
+
+    - name: Setup Poetry
+      uses: snok/install-poetry@v1
+
+    - name: ⎔ Setup node
+      uses: actions/setup-node@v3
+      with:
+        node-version: 18
+
+    - name: 📥 Download deps
+      uses: bahmutov/npm-install@v1
+      with:
+        useLockFile: false
+
+    - name: Semantic Release
+      uses: cycjimmy/semantic-release-action@v3
+
+      id: semantic
+      with:
+        semantic_version: 18
+        extra_plugins: |
+          @semantic-release/changelog@6
+          @semantic-release/exec
+          @semantic-release/git@10
+      env:
+        GITHUB_TOKEN: ${{ secrets.RELEASE_PAT }}
+        NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+
+    - name: Build and publish package
+      if: steps.semantic.outputs.new_release_published == 'true'
+      uses: JRubics/poetry-publish@v1.17
+      with:
+        pypi_token: ${{ secrets.PYPI_API_TOKEN }}

package/.github/workflows/test.yml

@@ -0,0 +1,85 @@
+name: test
+on:
+  push:
+    branches:
+    - master
+  pull_request:
+    branches:
+    - master
+    - dev
+
+jobs:
+  test:
+    name: python ${{ matrix.python-version }} on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
+        python-version: ['3.8', '3.9', '3.10', '3.11']
+      fail-fast: true
+
+    steps:
+    - name: checkout
+      uses: actions/checkout@v3
+    - name: setup python ${{ matrix.python-version }} on ${{ matrix.os }}
+      uses: actions/setup-python@v4
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: setup poetry
+      uses: abatilo/actions-poetry@v2
+      with:
+        poetry-version: 1.2.2
+    - name: install deps
+      run: poetry install
+    - name: test
+      run: poetry run tox -e test
+    - name: upload cov
+      uses: codecov/codecov-action@v3
+      continue-on-error: true
+      with:
+        files: ./coverage.xml
+        fail_ci_if_error: true
+        verbose: true
+
+  test_npm:
+    name: node ${{ matrix.node }} with python ${{ matrix.python-version }} on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      # remove macos, can't get xcode working yet for installing regex
+      # remove windows-latest, half tests seem to randomly pass
+      matrix:
+        os: [ubuntu-latest, windows-latest]
+        python-version: ['3.8', '3.9', '3.10', '3.11']
+        node: [18, 19]
+      fail-fast: true
+
+    steps:
+    - name: install xcode
+      if: ${{ matrix.os == 'macos-latest' }}
+      uses: maxim-lobanov/setup-xcode@v1
+      with:
+        xcode-version: latest-stable
+    - name: install xcode cli tools
+      if: ${{ matrix.os == 'macos-latest' }}
+      run: sudo xcode-select --reset
+    - name: checkout
+      uses: actions/checkout@v3
+    - name: setup python ${{ matrix.python-version }} on ${{ matrix.os }}
+      uses: actions/setup-python@v4
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: setup node ${{ matrix.node }} on ${{ matrix.os }}
+      uses: actions/setup-node@v3
+      with:
+        node-version: ${{ matrix.node }}
+
+    - name: install project
+      run: npm --omit=dev install
+    - name: test run help
+      run: djlint -h
+    - name: test run lint
+      run: echo "<div>a</div>" | djlint -
+    - name: test run check
+      run: echo "<div>" | djlint - --check

package/.pre-commit-config.yaml

@@ -0,0 +1,45 @@
+exclude: >
+  (?x)(
+      docs/|
+      node_modules/
+  )
+repos:
+- repo: https://github.com/pre-commit/pre-commit-hooks
+  rev: v4.4.0
+  hooks:
+  - id: trailing-whitespace
+  - id: end-of-file-fixer
+  - id: check-yaml
+- repo: https://github.com/myint/autoflake
+  rev: v2.1.1
+  hooks:
+  - id: autoflake
+    exclude: &fixtures tests/functional/|tests/input|tests/extensions/data|tests/regrtest_data/|tests/data/
+    args:
+    - --in-place
+    - --remove-all-unused-imports
+    - --expand-star-imports
+    - --remove-duplicate-keys
+    - --remove-unused-variables
+- repo: https://github.com/asottile/pyupgrade
+  rev: v3.4.0
+  hooks:
+  - id: pyupgrade
+    args: [--py36-plus]
+- repo: https://github.com/PyCQA/isort
+  rev: 5.12.0
+  hooks:
+  - id: isort
+    exclude: docs*
+    additional_dependencies: [toml]
+- repo: https://github.com/psf/black
+  rev: 23.3.0
+  hooks:
+  - id: black
+- repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks
+  rev: v2.9.0
+  hooks:
+  - id: pretty-format-ini
+    args: [--autofix]
+  - id: pretty-format-yaml
+    args: [--autofix, --indent, '2']

package/.pre-commit-hooks.yaml

@@ -0,0 +1,71 @@
+- id: djlint
+  name: djLint linting
+  entry: djlint
+  types_or: [html]
+  language: python
+
+- id: djlint-django
+  name: djLint linting for Django
+  entry: djlint --profile=django
+  types_or: [html]
+  language: python
+
+- id: djlint-jinja
+  name: djLint linting for Jinja
+  entry: djlint --profile=jinja
+  types_or: [jinja]
+  language: python
+
+- id: djlint-nunjucks
+  name: djLint linting for Nunjucks
+  entry: djlint --profile=nunjucks
+  types_or: [nunjucks]
+  language: python
+
+- id: djlint-handlebars
+  name: djLint linting for Handlebars/Mustache
+  entry: djlint --profile=handlebars
+  types_or: [handlebars]
+  language: python
+
+- id: djlint-golang
+  name: djLint linting for Golang templates
+  entry: djlint --profile=golang
+  types_or: [gotmpl]
+  language: python
+
+- id: djlint-reformat
+  name: djLint formatting
+  entry: djlint --reformat
+  types_or: [html]
+  language: python
+
+- id: djlint-reformat-django
+  name: djLint formatting for Django
+  entry: djlint --reformat --profile=django
+  types_or: [html]
+  language: python
+
+- id: djlint-reformat-jinja
+  name: djLint formatting for Jinja
+  entry: djlint --reformat --profile=jinja
+  types_or: [jinja]
+  language: python
+
+- id: djlint-reformat-nunjucks
+  name: djLint formatting for Nunjucks
+  entry: djlint --reformat --profile=nunjucks
+  types_or: [nunjucks]
+  language: python
+
+- id: djlint-reformat-handlebars
+  name: djLint formatting for Handlebars/Mustache
+  entry: djlint --reformat --profile=handlebars
+  types_or: [handlebars]
+  language: python
+
+- id: djlint-reformat-golang
+  name: djLint formatting for Golang templates
+  entry: djlint --reformat --profile=golang
+  types_or: [gotmpl]
+  language: python

package/.prettierignore

@@ -0,0 +1,7 @@
+node_modules/*
+docs/_site/*
+dist/*
+.mypy_cache/*
+.pytest_cache/*
+.tox/*
+tests/*

package/.prettierrc

@@ -0,0 +1,11 @@
+{
+    "printWidth": 80,
+    "tabWidth": 2,
+    "useTabs": false,
+    "singleQuote": true,
+    "trailingComma": "all",
+    "bracketSpacing": true,
+    "arrowParens": "always",
+    "jsxBracketSameLine": false,
+    "semi": true
+}

package/.releaserc

@@ -0,0 +1,16 @@
+{
+  "branches": ["master"],
+  "plugins": [
+    "@semantic-release/commit-analyzer",
+    "@semantic-release/release-notes-generator",
+    "@semantic-release/changelog",
+    "@semantic-release/npm",
+    ["@semantic-release/exec", {
+      "prepareCmd" : "poetry version ${nextRelease.version}; ./build_demo.sh; node scripts/updateVersion.js ${nextRelease.version}"
+    }],
+    ["@semantic-release/git", {
+      "assets": ["package.json", "pyproject.toml", "docs"]
+    }],
+    "@semantic-release/github"
+  ]
+}

package/CHANGELOG.md

@@ -0,0 +1,13 @@
+# [1.30.0](https://github.com/Riverside-Healthcare/djLint/compare/v1.29.0...v1.30.0) (2023-05-30)
+
+
+### Bug Fixes
+
+* **formatter:** fixed endset indent level ([cdebe42](https://github.com/Riverside-Healthcare/djLint/commit/cdebe421a9436d7dff9ead65584ad25c22d199f4)), closes [#670](https://github.com/Riverside-Healthcare/djLint/issues/670)
+* **formatter:** fixed issue with spaceless macro tags having spacess added before - ([5593937](https://github.com/Riverside-Healthcare/djLint/commit/5593937f1ea626580bae6de2ef4bef3b74f92a14)), closes [#667](https://github.com/Riverside-Healthcare/djLint/issues/667)
+* **npm:** install exact version of djlint ([0727279](https://github.com/Riverside-Healthcare/djLint/commit/072727997b61f3a3ffa1049dd313c36fb8186604))
+
+
+### Features
+
+* **npm:** add script to update djlint version in postinstall using semantic-release/exec ([040ffc6](https://github.com/Riverside-Healthcare/djLint/commit/040ffc69f235af350c2afc233bacdab7e5002dad))

package/MANIFEST.in

@@ -0,0 +1,2 @@
+include pyproject.toml
+include src/djlint/rules.yaml