From 7bf7ab1d4c9568afe49ec285d68fe67b9d1bcfe9 Mon Sep 17 00:00:00 2001 From: arman-luthra Date: Mon, 6 Jul 2026 19:29:42 -0700 Subject: [PATCH 1/2] Set up prettier-plugin-organize-imports Adds prettier-plugin-organize-imports so pnpm format sorts imports and removes unused ones, and enables organize-imports-on-save in VS Code. Closes #540 --- .changeset/prettier-organize-imports.md | 2 ++ .prettierrc.json | 1 + .vscode/settings.json | 4 +++ package.json | 1 + pnpm-lock.yaml | 35 +++++++++++++------------ 5 files changed, 26 insertions(+), 17 deletions(-) create mode 100644 .changeset/prettier-organize-imports.md diff --git a/.changeset/prettier-organize-imports.md b/.changeset/prettier-organize-imports.md new file mode 100644 index 000000000..a845151cc --- /dev/null +++ b/.changeset/prettier-organize-imports.md @@ -0,0 +1,2 @@ +--- +--- diff --git a/.prettierrc.json b/.prettierrc.json index 9a24c3b78..e58a400ad 100644 --- a/.prettierrc.json +++ b/.prettierrc.json @@ -1,4 +1,5 @@ { + "plugins": ["prettier-plugin-organize-imports"], "endOfLine": "lf", "trailingComma": "all", "tabWidth": 2, diff --git a/.vscode/settings.json b/.vscode/settings.json index 0873375ed..d680e6d0a 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -8,6 +8,10 @@ "out": true, // set this to false to include "out" folder in search results "dist": true // set this to false to include "dist" folder in search results }, + // Organize imports (sort + remove unused) on save, matching prettier-plugin-organize-imports + "editor.codeActionsOnSave": { + "source.organizeImports": "explicit" + }, // Turn off tsc task auto detection since we have the necessary tasks as npm scripts "typescript.tsc.autoDetect": "off" } diff --git a/package.json b/package.json index c042c4db7..721be3855 100644 --- a/package.json +++ b/package.json @@ -50,6 +50,7 @@ "html-webpack-plugin": "^5.5.0", "jsdom": "^22.1.0", "prettier": "^3.0.0", + "prettier-plugin-organize-imports": "^4.3.0", "ts-loader": "^9.4.2", "ts-node": "^10.9.1", "tsconfig-paths-webpack-plugin": "^4.1.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 6e00f9a23..23c4526d7 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -31,6 +31,9 @@ importers: prettier: specifier: ^3.0.0 version: 3.8.1 + prettier-plugin-organize-imports: + specifier: ^4.3.0 + version: 4.3.0(prettier@3.8.1)(typescript@5.9.3) ts-loader: specifier: ^9.4.2 version: 9.5.0(typescript@5.9.3)(webpack@5.94.0) @@ -1086,28 +1089,24 @@ packages: engines: {node: '>= 10'} cpu: [arm64] os: [linux] - libc: [glibc] '@node-rs/crc32-linux-arm64-musl@1.10.6': resolution: {integrity: sha512-k8ra/bmg0hwRrIEE8JL1p32WfaN9gDlUUpQRWsbxd1WhjqvXea7kKO6K4DwVxyxlPhBS9Gkb5Urq7Y4mXANzaw==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] - libc: [musl] '@node-rs/crc32-linux-x64-gnu@1.10.6': resolution: {integrity: sha512-IfjtqcuFK7JrSZ9mlAFhb83xgium30PguvRjIMI45C3FJwu18bnLk1oR619IYb/zetQT82MObgmqfKOtgemEKw==} engines: {node: '>= 10'} cpu: [x64] os: [linux] - libc: [glibc] '@node-rs/crc32-linux-x64-musl@1.10.6': resolution: {integrity: sha512-LbFYsA5M9pNunOweSt6uhxenYQF94v3bHDAQRPTQ3rnjn+mK6IC7YTAYoBjvoJP8lVzcvk9hRj8wp4Jyh6Y80g==} engines: {node: '>= 10'} cpu: [x64] os: [linux] - libc: [musl] '@node-rs/crc32-wasm32-wasi@1.10.6': resolution: {integrity: sha512-KaejdLgHMPsRaxnM+OG9L9XdWL2TabNx80HLdsCOoX9BVhEkfh39OeahBo8lBmidylKbLGMQoGfIKDjq0YMStw==} @@ -1232,79 +1231,66 @@ packages: resolution: {integrity: sha512-T1dMEQhXA/jkJ/jyMIw9IovK8bSUq7A8kLIlvZTb/6YIVsp2zLavr4F3oyllHWo7eIVJRyE5n3tUjQJEbE1IuQ==} cpu: [arm] os: [linux] - libc: [glibc] '@rollup/rollup-linux-arm-musleabihf@4.62.0': resolution: {integrity: sha512-2as0LgT7qQpyceQq6VUJYnumUMUrgGQCWIiDIN9DE0/tglsk6o66uCB4f3djRawAltvfCNLyZZrsqbPA6inCsA==} cpu: [arm] os: [linux] - libc: [musl] '@rollup/rollup-linux-arm64-gnu@4.62.0': resolution: {integrity: sha512-bVURMg+6eNN9C/yc0aVjooZcwTTtYF4YW3xta5pP0//r3o1V8gXEHXWCndj47w/HhwsFroZrFhR+6uQP5T0n0g==} cpu: [arm64] os: [linux] - libc: [glibc] '@rollup/rollup-linux-arm64-musl@4.62.0': resolution: {integrity: sha512-Ful8pM/2yYI83PViWdFdpZhdI8HJ5qsXANe5atypbHDf+KIBBDsZsbyy8hbXnULVvW9NsTh5DHwbcBftyLTfiw==} cpu: [arm64] os: [linux] - libc: [musl] '@rollup/rollup-linux-loong64-gnu@4.62.0': resolution: {integrity: sha512-9Gp/DgrkzfUBmNPVTyPTvay+4xEP7M/clXpj3efXBcm6uTIVIgDg4rqUpqKXvLEuFRVuEpSAOkhgNeecvaZ4Cg==} cpu: [loong64] os: [linux] - libc: [glibc] '@rollup/rollup-linux-loong64-musl@4.62.0': resolution: {integrity: sha512-m9tsJz54LUXkSYM8+8PG81B9IKK5r+2T0clMq4QrS16xFosufU7firBDAZEsDheDs7wTlP7h3++S7lMsU955HA==} cpu: [loong64] os: [linux] - libc: [musl] '@rollup/rollup-linux-ppc64-gnu@4.62.0': resolution: {integrity: sha512-3UvJ5PNVU16aJf6M3tFI24pWzAl2/ynfbyRN3ICyQajK1lSkrnVYNnLz3v04J32qKa0FczJc22zeToc0lr2A3w==} cpu: [ppc64] os: [linux] - libc: [glibc] '@rollup/rollup-linux-ppc64-musl@4.62.0': resolution: {integrity: sha512-vRWUAbYLGHBZS6Q8Msb2sfnf1fvJf+47t8l/TwOerM2qArzy+IeNMTHrYLHXh95h8MoatPHI5hhSZNs+mGXKPg==} cpu: [ppc64] os: [linux] - libc: [musl] '@rollup/rollup-linux-riscv64-gnu@4.62.0': resolution: {integrity: sha512-c00T5SYENHAt86cfW47URaP3Us5vLC/4QO7GYud1G5VNRffCwwCuBspwqYrriuJB+5m0WFzClCn9wed0FBjKvg==} cpu: [riscv64] os: [linux] - libc: [glibc] '@rollup/rollup-linux-riscv64-musl@4.62.0': resolution: {integrity: sha512-krrCDilhXOwFkSkO3Wm9I/f9H0L92XHHwy2fwxjukxIbh0dem8gZqOW5Y8BsHrpJv5qwlRBV+Wl4ZFyRWhUpwg==} cpu: [riscv64] os: [linux] - libc: [musl] '@rollup/rollup-linux-s390x-gnu@4.62.0': resolution: {integrity: sha512-7pfYFSTc4/rUC/FtAI0Qp6QthDBCIi6/AuP1xYqFk5vanI6KnL5dWKP60OM/05LOsbwTmIcvr6eXC4CJuJ75IA==} cpu: [s390x] os: [linux] - libc: [glibc] '@rollup/rollup-linux-x64-gnu@4.62.0': resolution: {integrity: sha512-7SDIalKeIpG0Ifogbbdn58HmSotYMlf23K3dCJEmiVd9Fg36Vmni82iPQec27N3wY4Bvbxftkxz6vSx9OcouTg==} cpu: [x64] os: [linux] - libc: [glibc] '@rollup/rollup-linux-x64-musl@4.62.0': resolution: {integrity: sha512-eRZevouTH2i1HeAVLqJuLnt256krQkGY0TN6WsTmsIhuzbh457HuWDMakKwmi0Cjadux983CoSr8Lim2QhUIFw==} cpu: [x64] os: [linux] - libc: [musl] '@rollup/rollup-openbsd-x64@4.62.0': resolution: {integrity: sha512-3oVS7FLGa4U1qcvao9ylGxrjXZyUQqR8UwxEcnUEyPX53O/C/mKDZegNXTdHCP+h3e6ta/f1EN38Yif1mmZHYg==} @@ -4151,6 +4137,16 @@ packages: resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==} engines: {node: '>= 0.8.0'} + prettier-plugin-organize-imports@4.3.0: + resolution: {integrity: sha512-FxFz0qFhyBsGdIsb697f/EkvHzi5SZOhWAjxcx2dLt+Q532bAlhswcXGYB1yzjZ69kW8UoadFBw7TyNwlq96Iw==} + peerDependencies: + prettier: '>=2.0' + typescript: '>=2.9' + vue-tsc: ^2.1.0 || 3 + peerDependenciesMeta: + vue-tsc: + optional: true + prettier@2.8.8: resolution: {integrity: sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==} engines: {node: '>=10.13.0'} @@ -9557,6 +9553,11 @@ snapshots: prelude-ls@1.2.1: {} + prettier-plugin-organize-imports@4.3.0(prettier@3.8.1)(typescript@5.9.3): + dependencies: + prettier: 3.8.1 + typescript: 5.9.3 + prettier@2.8.8: {} prettier@3.8.1: {} From 5b4d3fd5bfff7f86e7d5fcf8f3f1a0d252230daf Mon Sep 17 00:00:00 2001 From: arman-luthra Date: Mon, 6 Jul 2026 19:29:51 -0700 Subject: [PATCH 2/2] Organize imports across packages Mechanical diff from running pnpm format with prettier-plugin-organize-imports enabled. No behavior change. --- .../src/LanguageClient.ts | 8 +-- .../src/extensions/client.ts | 2 +- .../src/extensions/complete.spec.ts | 10 +-- .../src/extensions/complete.ts | 18 ++--- .../src/extensions/documentHighlights.spec.ts | 4 +- .../src/extensions/hover.spec.ts | 2 +- .../src/extensions/hover.ts | 4 +- .../src/extensions/lspLinter.spec.ts | 10 +-- .../src/extensions/snippet.ts | 2 - .../src/extensions/textDocumentSync.spec.ts | 10 +-- .../src/extensions/textDocumentSync.ts | 6 +- .../codemirror-language-client/src/index.ts | 2 +- .../src/test/MockClient.ts | 9 ++- packages/lang-jsonc/src/jsonc.ts | 8 +-- .../liquid-html-parser/src/grammar.spec.ts | 2 +- packages/liquid-html-parser/src/grammar.ts | 2 +- packages/liquid-html-parser/src/index.ts | 6 +- .../src/stage-1-cst.spec.ts | 10 +-- .../liquid-html-parser/src/stage-1-cst.ts | 4 +- .../src/stage-2-ast.spec.ts | 4 +- .../liquid-html-parser/src/stage-2-ast.ts | 66 +++++++++---------- packages/prettier-plugin-liquid/src/parser.ts | 2 +- packages/prettier-plugin-liquid/src/plugin.ts | 4 +- .../src/printer/embed.ts | 4 +- .../src/printer/index.ts | 2 +- .../preprocess/augment-with-css-properties.ts | 2 +- .../preprocess/augment-with-siblings.ts | 2 +- .../augment-with-whitespace-helpers.spec.ts | 4 +- .../augment-with-whitespace-helpers.ts | 3 +- .../src/printer/preprocess/index.ts | 2 +- .../src/printer/print-preprocess.ts | 2 +- .../src/printer/print/children.ts | 6 +- .../src/printer/print/element.ts | 28 ++++---- .../src/printer/print/liquid.ts | 10 +-- .../src/printer/print/tag.ts | 20 +++--- .../src/printer/printer-liquid-html.ts | 10 +-- .../src/printer/utils/array.spec.ts | 2 +- .../src/printer/utils/index.ts | 6 +- .../src/printer/utils/node.ts | 16 ++--- .../config-bracket-same-line/index.spec.ts | 1 - .../src/test/config-use-tabs/index.spec.ts | 1 - .../test/document-paragraphs/index.spec.ts | 1 - .../embed-liquid-javascript-tag/index.spec.ts | 1 - .../test/embed-liquid-style-tag/index.spec.ts | 1 - .../embed-liquid-stylesheet-tag/index.spec.ts | 1 - .../src/test/embed-script-tag/index.spec.ts | 1 - .../src/test/embed-style-tag/index.spec.ts | 1 - .../src/test/example/index.spec.ts | 1 - .../src/test/html-attributes/index.spec.ts | 1 - .../src/test/html-comment/index.spec.ts | 1 - .../test/html-compound-names/index.spec.ts | 1 - .../test/html-custom-element/index.spec.ts | 1 - .../src/test/html-doctype/index.spec.ts | 1 - .../src/test/html-element/index.spec.ts | 1 - .../test/html-liquid-drop-name/index.spec.ts | 1 - .../src/test/html-list-tags/index.spec.ts | 1 - .../index.spec.ts | 1 - .../src/test/html-script-tag/index.spec.ts | 1 - .../html-self-closing-element/index.spec.ts | 1 - .../src/test/html-style-tag/index.spec.ts | 1 - .../index.spec.ts | 1 - .../src/test/issue-120/index.spec.ts | 1 - .../src/test/issue-123/index.spec.ts | 1 - .../src/test/issue-134/index.spec.ts | 1 - .../src/test/issue-144/index.spec.ts | 1 - .../src/test/issue-154/index.spec.ts | 1 - .../src/test/issue-156/index.spec.ts | 1 - .../src/test/issue-158/index.spec.ts | 1 - .../src/test/issue-162/index.spec.ts | 1 - .../src/test/issue-26/index.spec.ts | 1 - .../src/test/issue-99/index.spec.ts | 1 - .../src/test/layout-html/index.spec.ts | 1 - .../index.spec.ts | 1 - .../index.spec.ts | 1 - .../index.spec.ts | 1 - .../src/test/liquid-comment/index.spec.ts | 1 - .../index.spec.ts | 1 - .../test/liquid-drop-filters/index.spec.ts | 1 - .../liquid-drop-liquid-literal/index.spec.ts | 1 - .../src/test/liquid-drop-number/index.spec.ts | 1 - .../src/test/liquid-drop-range/index.spec.ts | 1 - .../src/test/liquid-drop-string/index.spec.ts | 1 - .../liquid-drop-variable-lookup/index.spec.ts | 1 - .../src/test/liquid-liquid-tag/index.spec.ts | 1 - .../test/liquid-prettier-ignore/index.spec.ts | 1 - .../src/test/liquid-raw-tag/index.spec.ts | 1 - .../src/test/liquid-schema-tag/index.spec.ts | 1 - .../src/test/liquid-style-tag/index.spec.ts | 1 - .../src/test/liquid-tag-assign/index.spec.ts | 1 - .../src/test/liquid-tag-break/index.spec.ts | 1 - .../index.spec.ts | 1 - .../src/test/liquid-tag-capture/index.spec.ts | 1 - .../src/test/liquid-tag-case/index.spec.ts | 1 - .../test/liquid-tag-continue/index.spec.ts | 1 - .../src/test/liquid-tag-cycle/index.spec.ts | 1 - .../src/test/liquid-tag-echo/index.spec.ts | 1 - .../src/test/liquid-tag-else/index.spec.ts | 1 - .../src/test/liquid-tag-elsif/index.spec.ts | 1 - .../src/test/liquid-tag-for/index.spec.ts | 1 - .../src/test/liquid-tag-form/index.spec.ts | 1 - .../src/test/liquid-tag-if/index.spec.ts | 1 - .../test/liquid-tag-increment/index.spec.ts | 1 - .../src/test/liquid-tag-layout/index.spec.ts | 1 - .../test/liquid-tag-no-argument/index.spec.ts | 1 - .../test/liquid-tag-paginate/index.spec.ts | 1 - .../src/test/liquid-tag-render/index.spec.ts | 1 - .../src/test/liquid-tag-section/index.spec.ts | 1 - .../test/liquid-tag-sections/index.spec.ts | 1 - .../liquid-tag-string-fallback/index.spec.ts | 1 - .../test/liquid-tag-tablerow/index.spec.ts | 1 - .../src/test/multiline-liquid/index.spec.ts | 1 - .../prettier-ignore-attribute/index.spec.ts | 1 - .../src/test/pure-liquid/index.spec.ts | 1 - .../src/test/svg/index.spec.ts | 1 - .../src/test/test-helpers.ts | 6 +- .../index.spec.ts | 1 - .../index.spec.ts | 1 - .../index.spec.ts | 1 - .../src/test/unit-paragraphs/index.spec.ts | 1 - .../index.spec.ts | 1 - .../index.spec.ts | 1 - .../index.spec.ts | 1 - .../index.spec.ts | 1 - .../src/test/yaml-frontmatter/index.spec.ts | 1 - packages/prettier-plugin-liquid/src/types.ts | 4 +- .../src/steps/changeset.spec.ts | 4 +- .../src/steps/changesetStatus.ts | 2 +- .../src/steps/generatePatchChangeset.spec.ts | 4 +- .../src/steps/generatePatchChangeset.ts | 2 +- .../src/steps/getPackageJsonRecord.spec.ts | 2 +- .../writeDependentPatchChangesets.spec.ts | 4 +- .../steps/writeDependentPatchChangesets.ts | 2 +- .../release-orchestrator/src/utils.spec.ts | 2 +- .../theme-check-browser/src/index.spec.ts | 2 +- packages/theme-check-browser/src/index.ts | 20 +++--- .../src/AugmentedThemeDocset.spec.ts | 2 +- .../src/AugmentedThemeDocset.ts | 2 +- .../checks/app-block-valid-tags/index.spec.ts | 4 +- .../src/checks/asset-preload/index.spec.ts | 4 +- .../asset-size-app-block-javascript/index.ts | 2 +- .../src/checks/asset-size-css/index.spec.ts | 3 +- .../src/checks/asset-size-css/index.ts | 2 +- .../asset-size-javascript/index.spec.ts | 3 +- .../src/checks/asset-size-javascript/index.ts | 2 +- .../src/checks/block-id-usage/index.spec.ts | 2 +- .../src/checks/block-id-usage/index.ts | 9 +-- .../src/checks/cdn-preconnect/index.spec.ts | 2 +- .../src/checks/cdn-preconnect/index.ts | 2 +- .../index.spec.ts | 2 +- .../checks/deprecate-bgsizes/index.spec.ts | 4 +- .../src/checks/deprecate-bgsizes/index.ts | 2 +- .../checks/deprecate-lazysizes/index.spec.ts | 2 +- .../src/checks/deprecate-lazysizes/index.ts | 4 +- .../checks/deprecated-filter/index.spec.ts | 6 +- .../src/checks/deprecated-filter/index.ts | 8 +-- .../index.spec.ts | 4 +- .../index.ts | 10 +-- .../index.spec.ts | 4 +- .../index.ts | 2 +- .../index.spec.ts | 4 +- .../index.ts | 2 +- .../src/checks/deprecated-tag/index.spec.ts | 2 +- .../src/checks/deprecated-tag/index.ts | 2 +- .../index.spec.ts | 4 +- .../duplicate-content-for-arguments/index.ts | 2 +- .../index.spec.ts | 4 +- .../index.ts | 2 +- .../checks/empty-block-content/index.spec.ts | 2 +- .../src/checks/empty-block-content/index.ts | 4 +- .../src/checks/hardcoded-routes/index.spec.ts | 4 +- .../src/checks/hardcoded-routes/index.ts | 2 +- .../checks/img-width-and-height/index.spec.ts | 2 +- .../src/checks/img-width-and-height/index.ts | 2 +- .../theme-check-common/src/checks/index.ts | 20 +++--- .../checks/json-missing-block/index.spec.ts | 4 +- .../json-missing-block/missing-block-utils.ts | 4 +- .../checks/json-syntax-error/index.spec.ts | 4 +- .../src/checks/json-syntax-error/index.ts | 2 +- .../checks/liquid-free-settings/index.spec.ts | 4 +- .../checks/InvalidBooleanExpression.spec.ts | 2 +- .../checks/InvalidBooleanExpressions.ts | 2 +- .../checks/InvalidConditionalNode.spec.ts | 4 +- .../checks/InvalidConditionalNode.ts | 2 +- .../InvalidConditionalNodeParenthesis.spec.ts | 2 +- .../InvalidConditionalNodeParenthesis.ts | 2 +- .../checks/InvalidEchoValue.spec.ts | 2 +- .../checks/InvalidFilterName.spec.ts | 4 +- .../checks/InvalidFilterName.ts | 4 +- .../checks/InvalidLoopArguments.spec.ts | 2 +- .../checks/InvalidLoopArguments.ts | 4 +- .../checks/InvalidLoopRange.spec.ts | 2 +- .../checks/InvalidLoopRange.ts | 2 +- .../checks/InvalidPipeSyntax.spec.ts | 4 +- .../checks/InvalidPipeSyntax.ts | 2 +- .../checks/MultipleAssignValues.spec.ts | 2 +- .../checks/utils.spec.ts | 2 +- .../liquid-html-syntax-error/index.spec.ts | 2 +- .../checks/liquid-html-syntax-error/index.ts | 12 ++-- .../matching-translations/index.spec.ts | 4 +- .../src/checks/matching-translations/index.ts | 9 +-- .../src/checks/missing-asset/index.spec.ts | 2 +- .../index.spec.ts | 4 +- .../missing-content-for-arguments/index.ts | 2 +- .../index.spec.ts | 4 +- .../missing-render-snippet-arguments/index.ts | 2 +- .../src/checks/missing-template/index.spec.ts | 2 +- .../src/checks/orphaned-snippet/index.spec.ts | 4 +- .../src/checks/pagination-size/index.spec.ts | 2 +- .../src/checks/pagination-size/index.ts | 2 +- .../parser-blocking-script/index.spec.ts | 2 +- .../src/checks/remote-asset/index.spec.ts | 4 +- .../src/checks/remote-asset/index.ts | 12 ++-- .../index.spec.ts | 4 +- .../reserved-doc-param-names/index.spec.ts | 4 +- .../checks/reserved-doc-param-names/index.ts | 4 +- .../schema-presets-block-order/index.spec.ts | 4 +- .../index.spec.ts | 4 +- .../index.spec.ts | 2 +- .../translation-key-exists/index.spec.ts | 2 +- .../unclosed-html-element/index.spec.ts | 4 +- .../src/checks/undefined-object/index.spec.ts | 6 +- .../src/checks/undefined-object/index.ts | 2 +- .../unique-doc-param-names/index.spec.ts | 4 +- .../checks/unique-settings-id/index.spec.ts | 4 +- .../src/checks/unique-settings-id/index.ts | 2 +- .../unique-static-block-id/index.spec.ts | 2 +- .../checks/unique-static-block-id/index.ts | 2 +- .../src/checks/unknown-filter/index.spec.ts | 4 +- .../index.spec.ts | 4 +- .../index.ts | 2 +- .../index.spec.ts | 4 +- .../index.ts | 4 +- .../checks/unsupported-doc-tag/index.spec.ts | 4 +- .../src/checks/unsupported-doc-tag/index.ts | 3 +- .../index.spec.ts | 2 +- .../src/checks/unused-assign/index.spec.ts | 4 +- .../src/checks/unused-doc-param/index.spec.ts | 6 +- .../theme-check-common/src/checks/utils.ts | 14 ++-- .../checks/valid-block-target/index.spec.ts | 4 +- .../src/checks/valid-block-target/index.ts | 4 +- .../index.spec.ts | 4 +- .../valid-content-for-argument-types/index.ts | 2 +- .../valid-content-for-arguments/index.ts | 2 +- .../valid-doc-param-types/index.spec.ts | 6 +- .../src/checks/valid-doc-param-types/index.ts | 2 +- .../valid-html-translation/index.spec.ts | 4 +- .../checks/valid-html-translation/index.ts | 2 +- .../src/checks/valid-json/index.spec.ts | 4 +- .../checks/valid-local-blocks/index.spec.ts | 4 +- .../src/checks/valid-local-blocks/index.ts | 9 ++- .../valid-local-blocks/valid-block-utils.ts | 2 +- .../index.spec.ts | 4 +- .../index.ts | 6 +- .../checks/valid-schema-name/index.spec.ts | 6 +- .../valid-schema-translations/index.spec.ts | 4 +- .../checks/valid-schema-translations/index.ts | 2 +- .../src/checks/valid-schema/index.spec.ts | 4 +- .../valid-scoped-css-class/index.spec.ts | 4 +- .../checks/valid-scoped-css-class/index.ts | 10 +-- .../checks/valid-settings-key/index.spec.ts | 2 +- .../src/checks/valid-settings-key/index.ts | 12 ++-- .../valid-static-block-type/index.spec.ts | 1 - .../src/checks/valid-visible-if/index.spec.ts | 2 +- .../src/checks/valid-visible-if/index.ts | 8 +-- .../src/checks/variable-name/index.spec.ts | 4 +- .../src/checks/variable-name/index.ts | 2 +- .../src/context-utils.spec.ts | 2 +- .../src/disabled-checks/index.spec.ts | 6 +- .../src/disabled-checks/index.ts | 2 +- .../src/disabled-checks/test-checks.ts | 2 +- .../src/fixes/apply-fix-to-string.spec.ts | 2 +- .../src/fixes/autofix.spec.ts | 2 +- .../fixes/correctors/json-corrector.spec.ts | 4 +- .../theme-check-common/src/fixes/index.ts | 6 +- .../theme-check-common/src/ignore.spec.ts | 4 +- packages/theme-check-common/src/ignore.ts | 2 +- packages/theme-check-common/src/index.spec.ts | 2 +- packages/theme-check-common/src/index.ts | 10 +-- packages/theme-check-common/src/json.spec.ts | 2 +- .../src/jsonc/parse.spec.ts | 2 +- .../theme-check-common/src/jsonc/parse.ts | 2 +- .../src/liquid-doc/arguments.spec.ts | 4 +- .../src/liquid-doc/arguments.ts | 4 +- .../src/liquid-doc/liquidDoc.spec.ts | 2 +- .../src/liquid-doc/liquidDoc.ts | 7 +- .../src/liquid-doc/utils.ts | 5 +- packages/theme-check-common/src/path.ts | 2 +- .../src/test/MockFileSystem.spec.ts | 2 +- .../src/test/MockFileSystem.ts | 4 +- .../src/test/chai-offer-fix-assertion.spec.ts | 4 +- .../src/test/chai-offer-fix-assertion.ts | 2 +- .../src/test/chai-suggest-assertion.spec.ts | 4 +- .../src/test/chai-suggest-assertion.ts | 2 +- .../src/test/contain-offense.spec.ts | 4 +- .../theme-check-common/src/test/test-setup.ts | 2 +- packages/theme-check-common/src/to-schema.ts | 8 +-- packages/theme-check-common/src/types.ts | 2 +- .../src/types/schemas/index.ts | 4 +- .../src/types/schemas/section.ts | 2 +- .../src/types/schemas/theme-block.ts | 2 +- .../theme-check-common/src/utils/block.ts | 6 +- .../src/utils/error.spec.ts | 2 +- .../src/utils/file-utils.ts | 2 +- .../theme-check-common/src/utils/index.ts | 10 +-- .../theme-check-common/src/utils/memo.spec.ts | 2 +- .../src/utils/styles.spec.ts | 12 ++-- .../theme-check-common/src/utils/styles.ts | 8 +-- .../src/utils/traversal.spec.ts | 4 +- .../theme-check-common/src/utils/traversal.ts | 2 +- .../theme-check-common/src/visitor.spec.ts | 6 +- packages/theme-check-common/src/visitor.ts | 2 +- .../theme-check-common/src/visitors/index.ts | 2 +- .../theme-check-common/src/visitors/json.ts | 2 +- .../theme-check-common/src/visitors/liquid.ts | 2 +- .../theme-check-docs-updater/src/index.ts | 2 +- .../src/themeLiquidDocsManager.spec.ts | 4 +- .../theme-check-node/src/NodeFileSystem.ts | 2 +- packages/theme-check-node/src/autofix.ts | 6 +- packages/theme-check-node/src/cli.ts | 2 +- .../src/config/find-config-path.spec.ts | 2 +- packages/theme-check-node/src/config/index.ts | 2 +- .../src/config/installation-location.ts | 2 +- .../src/config/load-config-description.ts | 2 +- .../src/config/load-config.spec.ts | 10 +-- .../src/config/load-config.ts | 2 +- .../config/load-third-party-checks.spec.ts | 10 +-- .../config/resolve/merge-fragments.spec.ts | 4 +- .../src/config/resolve/read-yaml.spec.ts | 10 +-- .../src/config/resolve/resolve-config.spec.ts | 6 +- .../src/config/resolve/resolve-config.ts | 6 +- .../src/config/validation.spec.ts | 6 +- .../theme-check-node/src/config/validation.ts | 2 +- packages/theme-check-node/src/index.spec.ts | 2 +- packages/theme-check-node/src/index.ts | 26 ++++---- .../theme-check-node/src/test/test-helpers.ts | 2 +- .../theme-graph/src/getWebComponentMap.ts | 2 +- packages/theme-graph/src/graph/augment.ts | 4 +- packages/theme-graph/src/index.ts | 2 +- packages/theme-graph/src/types.ts | 10 +-- .../src/index.spec.ts | 2 +- .../src/ClientCapabilities.ts | 2 +- .../src/TypeSystem.spec.ts | 4 +- .../src/TypeSystem.ts | 12 ++-- .../src/codeActions/CodeActionsProvider.ts | 2 +- .../src/codeActions/index.ts | 2 +- .../providers/FixAllProvider.spec.ts | 6 +- .../codeActions/providers/FixProvider.spec.ts | 6 +- .../src/codeActions/providers/index.ts | 2 +- .../src/commands/index.ts | 2 +- .../providers/ApplySuggestionProvider.spec.ts | 14 ++-- .../src/commands/providers/index.ts | 4 +- .../src/completions/CompletionsProvider.ts | 2 +- .../params/LiquidCompletionParams.spec.ts | 2 +- .../src/completions/params/fix.spec.ts | 2 +- .../src/completions/params/index.ts | 2 +- ...tentForBlockTypeCompletionProvider.spec.ts | 1 - ...tentForParameterCompletionProvider.spec.ts | 8 +-- .../ContentForParameterCompletionProvider.ts | 6 +- .../FilterCompletionProvider.spec.ts | 2 +- .../providers/FilterCompletionProvider.ts | 2 +- ...erNamedParameterCompletionProvider.spec.ts | 2 +- .../FilterNamedParameterCompletionProvider.ts | 2 +- .../HtmlAttributeCompletionProvider.spec.ts | 6 +- .../HtmlAttributeCompletionProvider.ts | 2 +- ...mlAttributeValueCompletionProvider.spec.ts | 4 +- .../HtmlTagCompletionProvider.spec.ts | 6 +- ...quidDocParamTypeCompletionProvider.spec.ts | 7 +- .../LiquidDocParamTypeCompletionProvider.ts | 8 ++- .../LiquidDocTagCompletionProvider.spec.ts | 6 +- .../LiquidDocTagCompletionProvider.ts | 4 +- .../LiquidTagsCompletionProvider.spec.ts | 6 +- .../ObjectAttributeCompletionProvider.spec.ts | 6 +- .../ObjectAttributeCompletionProvider.ts | 2 +- .../ObjectCompletionProvider.spec.ts | 4 +- .../RenderSnippetCompletionProvider.spec.ts | 4 +- ...SnippetParameterCompletionProvider.spec.ts | 6 +- ...enderSnippetParameterCompletionProvider.ts | 4 +- .../TranslationCompletionProvider.spec.ts | 4 +- .../TranslationCompletionProvider.ts | 2 +- .../src/completions/providers/index.ts | 16 ++--- .../src/css/CSSLanguageService.ts | 2 +- .../src/definitions/BaseDefinitionProvider.ts | 2 +- ...ranslationStringDefinitionProvider.spec.ts | 2 +- ...ranslationStringDefinitionProvider.spec.ts | 2 +- .../TranslationStringDefinitionProvider.ts | 6 +- .../diagnostics/DiagnosticsManager.spec.ts | 4 +- .../src/diagnostics/offenseToDiagnostic.ts | 2 +- .../src/diagnostics/runChecks.spec.ts | 1 - .../src/diagnostics/runChecks.ts | 4 +- .../src/docset/MarkdownRenderer.spec.ts | 4 +- .../src/docset/index.ts | 2 +- .../BaseDocumentHighlightsProvider.ts | 2 +- .../DocumentHighlightsProvider.ts | 3 +- ...lTagNameDocumentHighlightsProvider.spec.ts | 2 +- .../HtmlTagNameDocumentHighlightsProvider.ts | 2 +- ...BlockTagDocumentHighlightsProvider.spec.ts | 2 +- .../src/documents/DocumentManager.spec.ts | 4 +- .../src/documents/DocumentManager.ts | 12 ++-- .../src/documents/types.ts | 8 +-- ...ketsAutoclosingOnTypeFormattingProvider.ts | 4 +- ...mentAutoclosingOnTypeFormattingProvider.ts | 2 +- .../src/formatting/types.ts | 2 +- .../src/hover/BaseHoverProvider.ts | 2 +- .../src/hover/HoverProvider.ts | 10 +-- .../ContentForArgumentHoverProvider.spec.ts | 9 ++- .../ContentForArgumentHoverProvider.ts | 4 +- .../ContentForTypeHoverProvider.spec.ts | 9 ++- .../providers/ContentForTypeHoverProvider.ts | 4 +- .../HtmlAttributeHoverProvider.spec.ts | 4 +- .../providers/HtmlAttributeHoverProvider.ts | 4 +- .../HtmlAttributeValueHoverProvider.spec.ts | 4 +- .../providers/HtmlTagHoverProvider.spec.ts | 4 +- .../LiquidDocTagHoverProvider.spec.ts | 6 +- .../providers/LiquidDocTagHoverProvider.ts | 4 +- .../LiquidFilterArgumentHoverProvider.spec.ts | 4 +- .../LiquidFilterHoverProvider.spec.ts | 4 +- ...LiquidObjectAttributeHoverProvider.spec.ts | 4 +- .../LiquidObjectHoverProvider.spec.ts | 4 +- .../providers/LiquidTagHoverProvider.spec.ts | 4 +- .../RenderSnippetHoverProvider.spec.ts | 9 ++- .../providers/RenderSnippetHoverProvider.ts | 4 +- ...enderSnippetParameterHoverProvider.spec.ts | 9 ++- .../RenderSnippetParameterHoverProvider.ts | 4 +- .../TranslationHoverProvider.spec.ts | 4 +- .../src/hover/providers/index.ts | 14 ++-- .../src/index.spec.ts | 2 +- .../theme-language-server-common/src/index.ts | 26 ++++---- .../src/json/JSONContributions.ts | 8 +-- .../src/json/JSONLanguageService.ts | 8 +-- ...SettingsPropertyCompletionProvider.spec.ts | 4 +- ...BlockSettingsPropertyCompletionProvider.ts | 8 +-- .../BlockTypeCompletionProvider.spec.ts | 4 +- .../providers/BlockTypeCompletionProvider.ts | 2 +- ...erencedBlockTypeCompletionProvider.spec.ts | 4 +- .../ReferencedBlockTypeCompletionProvider.ts | 2 +- ...SettingsPropertyCompletionProvider.spec.ts | 4 +- .../SettingsPropertyCompletionProvider.ts | 4 +- .../DocumentLinksProvider.spec.ts | 6 +- .../documentLinks/DocumentLinksProvider.ts | 3 +- .../BlockSettingsHoverProvider.spec.ts | 2 +- .../providers/BlockSettingsHoverProvider.ts | 6 +- .../providers/SettingsHoverProvider.spec.ts | 2 +- .../hover/providers/SettingsHoverProvider.ts | 4 +- .../src/json/schemaSettings.spec.ts | 2 +- .../src/json/schemaSettings.ts | 2 +- .../src/json/test/test-helpers.ts | 4 +- .../LinkedEditingRangesProvider.ts | 3 +- .../EmptyHtmlTagLinkedRangesProvider.spec.ts | 6 +- .../HtmlTagNameLinkedRangesProvider.spec.ts | 8 +-- .../HtmlTagNameLinkedRangesProvider.ts | 2 +- .../src/rename/RenameProvider.ts | 9 ++- .../HtmlTagNameRenameProvider.spec.ts | 4 +- .../LiquidVariableRenameProvider.spec.ts | 4 +- .../handlers/AssetRenameHandler.spec.ts | 1 - .../renamed/handlers/AssetRenameHandler.ts | 2 +- .../renamed/handlers/BlockRenameHandler.ts | 2 +- .../renamed/handlers/SnippetRenameHandler.ts | 2 +- .../src/server/ThemeGraphManager.ts | 4 +- .../src/test/CompletionItemsAssertion.spec.ts | 4 +- .../src/test/CompletionItemsAssertion.ts | 4 +- .../src/test/HoverAssertion.ts | 2 +- .../src/test/MockConnection.ts | 6 +- .../theme-language-server-common/src/types.ts | 6 +- .../src/utils/htmlTagNames.ts | 4 +- .../src/utils/index.ts | 4 +- .../src/dependencies.ts | 2 +- .../src/index.spec.ts | 2 +- .../vscode-extension/src/browser/extension.ts | 8 +-- .../vscode-extension/src/browser/formatter.ts | 2 +- .../src/common/VsCodeFileSystem.ts | 2 +- .../vscode-extension/src/node/extension.ts | 6 +- .../src/node/formatter.spec.ts | 6 +- .../vscode-extension/src/node/formatter.ts | 4 +- 473 files changed, 880 insertions(+), 979 deletions(-) diff --git a/packages/codemirror-language-client/src/LanguageClient.ts b/packages/codemirror-language-client/src/LanguageClient.ts index 761ec33bc..c26efb581 100644 --- a/packages/codemirror-language-client/src/LanguageClient.ts +++ b/packages/codemirror-language-client/src/LanguageClient.ts @@ -2,25 +2,25 @@ import { CancellationToken, CancellationTokenSource, + ClientCapabilities, Disposable, ExitNotification, InitializeRequest, InitializedNotification, Message, + MessageSignature, NotificationHandler, NotificationMessage, ProtocolNotificationType, + ProtocolNotificationType0, ProtocolRequestType, ProtocolRequestType0, RequestHandler, RequestMessage, ResponseError, ResponseMessage, - ShutdownRequest, - MessageSignature, - ProtocolNotificationType0, ServerCapabilities, - ClientCapabilities, + ShutdownRequest, } from 'vscode-languageserver-protocol'; export interface PromiseCompletion { diff --git a/packages/codemirror-language-client/src/extensions/client.ts b/packages/codemirror-language-client/src/extensions/client.ts index 43825d40d..7369e303e 100644 --- a/packages/codemirror-language-client/src/extensions/client.ts +++ b/packages/codemirror-language-client/src/extensions/client.ts @@ -1,7 +1,7 @@ import { Facet } from '@codemirror/state'; -import { AbstractLanguageClient } from '../LanguageClient'; import { ServerCapabilities } from 'vscode-languageserver-protocol'; +import { AbstractLanguageClient } from '../LanguageClient'; export const clientFacet = Facet.define({ combine: (values) => values[0], diff --git a/packages/codemirror-language-client/src/extensions/complete.spec.ts b/packages/codemirror-language-client/src/extensions/complete.spec.ts index d1e855ab5..b7ff0dda6 100644 --- a/packages/codemirror-language-client/src/extensions/complete.spec.ts +++ b/packages/codemirror-language-client/src/extensions/complete.spec.ts @@ -1,11 +1,11 @@ -import { vi, expect, describe, it, beforeEach, assert } from 'vitest'; -import { EditorState, Extension } from '@codemirror/state'; import { CompletionContext } from '@codemirror/autocomplete'; -import { clientFacet, fileUriFacet, serverCapabilitiesFacet } from './client'; -import { MockClient } from '../test/MockClient'; +import { EditorState } from '@codemirror/state'; +import { assert, beforeEach, describe, expect, it, vi } from 'vitest'; import { CompletionItem, CompletionItemKind, CompletionList } from 'vscode-languageserver-protocol'; -import { textDocumentSync } from './textDocumentSync'; +import { MockClient } from '../test/MockClient'; +import { clientFacet, fileUriFacet, serverCapabilitiesFacet } from './client'; import { complete, infoRendererFacet, lspComplete } from './complete'; +import { textDocumentSync } from './textDocumentSync'; describe('Module: complete', () => { const fileUri = 'browser://input.liquid'; diff --git a/packages/codemirror-language-client/src/extensions/complete.ts b/packages/codemirror-language-client/src/extensions/complete.ts index b7a07af7d..a7f87019d 100644 --- a/packages/codemirror-language-client/src/extensions/complete.ts +++ b/packages/codemirror-language-client/src/extensions/complete.ts @@ -1,29 +1,29 @@ import { autocompletion, + Completion, CompletionContext, - CompletionResult, CompletionInfo, + CompletionResult, pickedCompletion, - Completion, snippet, } from '@codemirror/autocomplete'; +import { Facet } from '@codemirror/state'; +import { EditorView } from '@codemirror/view'; import { CompletionItem, CompletionItemKind, CompletionList, CompletionRequest, - InsertTextFormat, - InsertReplaceEdit, - TextEdit, CompletionTriggerKind, + InsertReplaceEdit, + InsertTextFormat, CompletionContext as LSPCompletionContext, + TextEdit, } from 'vscode-languageserver-protocol'; -import { clientFacet, fileUriFacet, serverCapabilitiesFacet } from './client'; -import { textDocumentField } from './textDocumentSync'; -import { Facet } from '@codemirror/state'; -import { EditorView } from '@codemirror/view'; import { TextDocument } from 'vscode-languageserver-textdocument'; +import { clientFacet, fileUriFacet, serverCapabilitiesFacet } from './client'; import { translateSnippet } from './snippet'; +import { textDocumentField } from './textDocumentSync'; type FirstArgType = F extends (arg: infer A) => any ? A : never; export type AutocompleteOptions = Partial>; diff --git a/packages/codemirror-language-client/src/extensions/documentHighlights.spec.ts b/packages/codemirror-language-client/src/extensions/documentHighlights.spec.ts index df562c82f..a9b6a8104 100644 --- a/packages/codemirror-language-client/src/extensions/documentHighlights.spec.ts +++ b/packages/codemirror-language-client/src/extensions/documentHighlights.spec.ts @@ -1,7 +1,7 @@ // @vitest-environment jsdom -import { EditorState, Extension, Range, RangeSet, RangeValue } from '@codemirror/state'; +import { EditorState, Extension, Range } from '@codemirror/state'; import { Decoration, DecorationSet, EditorView } from '@codemirror/view'; -import { assert, beforeEach, describe, expect, it } from 'vitest'; +import { beforeEach, describe, expect, it } from 'vitest'; import { DocumentHighlight } from 'vscode-languageserver-protocol'; import { MockClient } from '../test/MockClient'; import { clientFacet, fileUriFacet } from './client'; diff --git a/packages/codemirror-language-client/src/extensions/hover.spec.ts b/packages/codemirror-language-client/src/extensions/hover.spec.ts index b8428ab84..42ed59c97 100644 --- a/packages/codemirror-language-client/src/extensions/hover.spec.ts +++ b/packages/codemirror-language-client/src/extensions/hover.spec.ts @@ -2,11 +2,11 @@ import { EditorState, Extension } from '@codemirror/state'; import { EditorView } from '@codemirror/view'; import { beforeEach, describe, expect, it, vi } from 'vitest'; +import { Hover } from 'vscode-languageserver-protocol'; import { MockClient } from '../test/MockClient'; import { clientFacet, fileUriFacet } from './client'; import { hover, hoverRendererFacet, lspHover } from './hover'; import { textDocumentSync } from './textDocumentSync'; -import { Hover } from 'vscode-languageserver-protocol'; describe('Module: hover', () => { const fileUri = 'browser://input.liquid'; diff --git a/packages/codemirror-language-client/src/extensions/hover.ts b/packages/codemirror-language-client/src/extensions/hover.ts index c6626fc80..13bb0744c 100644 --- a/packages/codemirror-language-client/src/extensions/hover.ts +++ b/packages/codemirror-language-client/src/extensions/hover.ts @@ -1,8 +1,8 @@ +import { Facet } from '@codemirror/state'; +import { EditorView, Tooltip, TooltipView, hoverTooltip } from '@codemirror/view'; import { Hover, HoverRequest } from 'vscode-languageserver-protocol'; import { clientFacet, fileUriFacet } from './client'; import { textDocumentField } from './textDocumentSync'; -import { Facet } from '@codemirror/state'; -import { EditorView, Tooltip, TooltipView, hoverTooltip } from '@codemirror/view'; type SecondArgType = F extends (_: any, arg: infer A) => any ? A : never; export type HoverOptions = Partial>; diff --git a/packages/codemirror-language-client/src/extensions/lspLinter.spec.ts b/packages/codemirror-language-client/src/extensions/lspLinter.spec.ts index da429528f..523af6cd3 100644 --- a/packages/codemirror-language-client/src/extensions/lspLinter.spec.ts +++ b/packages/codemirror-language-client/src/extensions/lspLinter.spec.ts @@ -1,12 +1,12 @@ // @vitest-environment jsdom -import { expect, describe, it, beforeEach, afterEach } from 'vitest'; +import { Diagnostic as CodeMirrorDiagnostic } from '@codemirror/lint'; import { EditorState, Extension } from '@codemirror/state'; import { EditorView } from '@codemirror/view'; -import { Diagnostic as CodeMirrorDiagnostic } from '@codemirror/lint'; -import { diagnosticsFacet, lspLinter } from './lspLinter'; -import { clientFacet, fileUriFacet } from './client'; -import { MockClient } from '../test/MockClient'; +import { afterEach, beforeEach, describe, expect, it } from 'vitest'; import { DiagnosticSeverity, PublishDiagnosticsNotification } from 'vscode-languageserver-protocol'; +import { MockClient } from '../test/MockClient'; +import { clientFacet, fileUriFacet } from './client'; +import { diagnosticsFacet, lspLinter } from './lspLinter'; describe('Module: lspLinter', () => { const fileUri = 'browser://input.liquid'; diff --git a/packages/codemirror-language-client/src/extensions/snippet.ts b/packages/codemirror-language-client/src/extensions/snippet.ts index 18dbbb875..12962b758 100644 --- a/packages/codemirror-language-client/src/extensions/snippet.ts +++ b/packages/codemirror-language-client/src/extensions/snippet.ts @@ -1,5 +1,3 @@ -import { MapMode, RangeSet, RangeValue, StateEffect, StateField, Range } from '@codemirror/state'; - /** * Syntax is $1, ${2}, ${3:foo}, $0 * https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#snippet_syntax diff --git a/packages/codemirror-language-client/src/extensions/textDocumentSync.spec.ts b/packages/codemirror-language-client/src/extensions/textDocumentSync.spec.ts index a0f3494e3..06c2c3c37 100644 --- a/packages/codemirror-language-client/src/extensions/textDocumentSync.spec.ts +++ b/packages/codemirror-language-client/src/extensions/textDocumentSync.spec.ts @@ -1,15 +1,15 @@ // @vitest-environment jsdom -import { expect, describe, it, beforeEach, afterEach } from 'vitest'; import { EditorState, Extension, StateEffect } from '@codemirror/state'; -import { textDocumentField, textDocumentSync } from './textDocumentSync'; -import { clientFacet, fileUriFacet } from './client'; -import { MockClient } from '../test/MockClient'; +import { EditorView } from '@codemirror/view'; +import { afterEach, beforeEach, describe, expect, it } from 'vitest'; import { DidChangeTextDocumentNotification, DidCloseTextDocumentNotification, DidOpenTextDocumentNotification, } from 'vscode-languageserver-protocol'; -import { EditorView } from '@codemirror/view'; +import { MockClient } from '../test/MockClient'; +import { clientFacet, fileUriFacet } from './client'; +import { textDocumentField, textDocumentSync } from './textDocumentSync'; describe('Module: textDocumentField', () => { let state; diff --git a/packages/codemirror-language-client/src/extensions/textDocumentSync.ts b/packages/codemirror-language-client/src/extensions/textDocumentSync.ts index 5ad24e73c..9138e21e7 100644 --- a/packages/codemirror-language-client/src/extensions/textDocumentSync.ts +++ b/packages/codemirror-language-client/src/extensions/textDocumentSync.ts @@ -1,11 +1,11 @@ -import { TextDocument } from 'vscode-languageserver-textdocument'; +import { Extension, StateField } from '@codemirror/state'; +import { EditorView, PluginValue, ViewPlugin, ViewUpdate } from '@codemirror/view'; import { DidChangeTextDocumentNotification, DidCloseTextDocumentNotification, DidOpenTextDocumentNotification, } from 'vscode-languageserver-protocol'; -import { Extension, StateField } from '@codemirror/state'; -import { EditorView, PluginValue, ViewPlugin, ViewUpdate } from '@codemirror/view'; +import { TextDocument } from 'vscode-languageserver-textdocument'; import { AbstractLanguageClient } from '../LanguageClient'; diff --git a/packages/codemirror-language-client/src/index.ts b/packages/codemirror-language-client/src/index.ts index d7faa426b..a14bd44ae 100644 --- a/packages/codemirror-language-client/src/index.ts +++ b/packages/codemirror-language-client/src/index.ts @@ -1,2 +1,2 @@ -export * from './extensions'; export * from './CodeMirrorLanguageClient'; +export * from './extensions'; diff --git a/packages/codemirror-language-client/src/test/MockClient.ts b/packages/codemirror-language-client/src/test/MockClient.ts index 28fba0d16..628e1240a 100644 --- a/packages/codemirror-language-client/src/test/MockClient.ts +++ b/packages/codemirror-language-client/src/test/MockClient.ts @@ -1,12 +1,11 @@ import { vi } from 'vitest'; import { - ProtocolRequestType, - ProtocolNotificationType, - CancellationTokenSource, CancellationToken, - ServerCapabilities, + CancellationTokenSource, + ProtocolNotificationType, + ProtocolRequestType, } from 'vscode-languageserver-protocol'; -import { PromiseCompletion, AbstractLanguageClient, disposable } from '../LanguageClient'; +import { AbstractLanguageClient, disposable, PromiseCompletion } from '../LanguageClient'; export class MockClient extends EventTarget implements AbstractLanguageClient { clientCapabilities: AbstractLanguageClient['clientCapabilities']; diff --git a/packages/lang-jsonc/src/jsonc.ts b/packages/lang-jsonc/src/jsonc.ts index 19368eb35..38ae0444a 100644 --- a/packages/lang-jsonc/src/jsonc.ts +++ b/packages/lang-jsonc/src/jsonc.ts @@ -1,12 +1,12 @@ -import { parser } from './parser'; import { continuedIndent, - indentNodeProp, - foldNodeProp, foldInside, - LRLanguage, + foldNodeProp, + indentNodeProp, LanguageSupport, + LRLanguage, } from '@codemirror/language'; +import { parser } from './parser'; /// A language provider that provides JSON parsing. export const jsoncLanguage = LRLanguage.define({ diff --git a/packages/liquid-html-parser/src/grammar.spec.ts b/packages/liquid-html-parser/src/grammar.spec.ts index 01e08a8d0..3db7ef882 100644 --- a/packages/liquid-html-parser/src/grammar.spec.ts +++ b/packages/liquid-html-parser/src/grammar.spec.ts @@ -1,4 +1,4 @@ -import { expect, it, describe } from 'vitest'; +import { describe, expect, it } from 'vitest'; import { placeholderGrammars, strictGrammars, tolerantGrammars } from './grammar'; describe('Unit: liquidHtmlGrammar', () => { diff --git a/packages/liquid-html-parser/src/grammar.ts b/packages/liquid-html-parser/src/grammar.ts index 2d91f00fd..98796ea17 100644 --- a/packages/liquid-html-parser/src/grammar.ts +++ b/packages/liquid-html-parser/src/grammar.ts @@ -1,4 +1,4 @@ -import { grammars, Grammar } from 'ohm-js'; +import { Grammar, grammars } from 'ohm-js'; export const liquidHtmlGrammars = grammars(require('../grammar/liquid-html.ohm.js')); diff --git a/packages/liquid-html-parser/src/index.ts b/packages/liquid-html-parser/src/index.ts index 5c3d2ff80..e996571a5 100644 --- a/packages/liquid-html-parser/src/index.ts +++ b/packages/liquid-html-parser/src/index.ts @@ -1,5 +1,5 @@ +export { getConditionalComment } from './conditional-comment'; +export * from './errors'; +export { BLOCKS, RAW_TAGS, TAGS_WITHOUT_MARKUP, VOID_ELEMENTS } from './grammar'; export * from './stage-2-ast'; export * from './types'; -export * from './errors'; -export { TAGS_WITHOUT_MARKUP, RAW_TAGS, VOID_ELEMENTS, BLOCKS } from './grammar'; -export { getConditionalComment } from './conditional-comment'; diff --git a/packages/liquid-html-parser/src/stage-1-cst.spec.ts b/packages/liquid-html-parser/src/stage-1-cst.spec.ts index c5b20f1e8..9b592aa69 100644 --- a/packages/liquid-html-parser/src/stage-1-cst.spec.ts +++ b/packages/liquid-html-parser/src/stage-1-cst.spec.ts @@ -1,12 +1,12 @@ -import { expect, it, describe } from 'vitest'; +import { describe, expect, it } from 'vitest'; +import { VOID_ELEMENTS } from './grammar'; import { + ConcreteLiquidTagLiquid, + LiquidCST, LiquidHtmlCST, - toLiquidHtmlCST, toLiquidCST, - LiquidCST, - ConcreteLiquidTagLiquid, + toLiquidHtmlCST, } from './stage-1-cst'; -import { VOID_ELEMENTS } from './grammar'; import { deepGet } from './utils'; describe('Unit: Stage 1 (CST)', () => { diff --git a/packages/liquid-html-parser/src/stage-1-cst.ts b/packages/liquid-html-parser/src/stage-1-cst.ts index 35f3e9a9b..2803a6fe8 100644 --- a/packages/liquid-html-parser/src/stage-1-cst.ts +++ b/packages/liquid-html-parser/src/stage-1-cst.ts @@ -30,9 +30,10 @@ * */ -import { Parser } from 'prettier'; import { Grammar, Node } from 'ohm-js'; import { toAST } from 'ohm-js/extras'; +import { Parser } from 'prettier'; +import { LiquidHTMLCSTParsingError } from './errors'; import { LiquidDocGrammar, LiquidGrammars, @@ -41,7 +42,6 @@ import { strictGrammars, tolerantGrammars, } from './grammar'; -import { LiquidHTMLCSTParsingError } from './errors'; import { Comparators, NamedTags } from './types'; export enum ConcreteNodeTypes { diff --git a/packages/liquid-html-parser/src/stage-2-ast.spec.ts b/packages/liquid-html-parser/src/stage-2-ast.spec.ts index 91b2188a9..b79d507fb 100644 --- a/packages/liquid-html-parser/src/stage-2-ast.spec.ts +++ b/packages/liquid-html-parser/src/stage-2-ast.spec.ts @@ -1,5 +1,5 @@ -import { expect, it, describe } from 'vitest'; -import { toLiquidHtmlAST, toLiquidAST, LiquidHtmlNode, DocumentNode } from './stage-2-ast'; +import { describe, expect, it } from 'vitest'; +import { DocumentNode, LiquidHtmlNode, toLiquidAST, toLiquidHtmlAST } from './stage-2-ast'; import { deepGet } from './utils'; describe('Unit: Stage 2 (AST)', () => { diff --git a/packages/liquid-html-parser/src/stage-2-ast.ts b/packages/liquid-html-parser/src/stage-2-ast.ts index 0212bceca..3e82e7ee7 100644 --- a/packages/liquid-html-parser/src/stage-2-ast.ts +++ b/packages/liquid-html-parser/src/stage-2-ast.ts @@ -33,54 +33,54 @@ * */ +import { LiquidHTMLASTParsingError, UnclosedNode } from './errors'; +import { TAGS_WITHOUT_MARKUP } from './grammar'; import { + ConcreteAttrDoubleQuoted, ConcreteAttributeNode, + ConcreteAttrSingleQuoted, + ConcreteAttrUnquoted, + ConcreteComplexLiquidExpression, + ConcreteHtmlRawTag, + ConcreteHtmlSelfClosingElement, ConcreteHtmlTagClose, ConcreteHtmlTagOpen, ConcreteHtmlVoidElement, - ConcreteLiquidVariableOutput, - ConcreteLiquidNode, - ConcreteLiquidTagClose, - ConcreteNodeTypes, - ConcreteTextNode, - LiquidCST, - LiquidHtmlCST, - toLiquidHtmlCST, - ConcreteHtmlSelfClosingElement, - ConcreteAttrSingleQuoted, - ConcreteAttrDoubleQuoted, - ConcreteAttrUnquoted, - ConcreteLiquidVariable, - ConcreteLiquidLiteral, - ConcreteLiquidFilter, + ConcreteLiquidArgument, + ConcreteLiquidComparison, + ConcreteLiquidCondition, ConcreteLiquidExpression, + ConcreteLiquidFilter, + ConcreteLiquidLiteral, ConcreteLiquidNamedArgument, - ConcreteLiquidTagNamed, + ConcreteLiquidNode, + ConcreteLiquidRawTag, ConcreteLiquidTag, ConcreteLiquidTagAssignMarkup, - ConcreteLiquidTagRenderMarkup, - ConcreteRenderVariableExpression, - ConcreteRenderAliasExpression, - ConcreteLiquidTagOpenNamed, + ConcreteLiquidTagBaseCase, + ConcreteLiquidTagClose, + ConcreteLiquidTagContentForMarkup, + ConcreteLiquidTagCycleMarkup, + ConcreteLiquidTagForMarkup, + ConcreteLiquidTagNamed, ConcreteLiquidTagOpen, - ConcreteLiquidArgument, + ConcreteLiquidTagOpenNamed, + ConcreteLiquidTagRenderMarkup, + ConcreteLiquidVariable, + ConcreteLiquidVariableOutput, + ConcreteNodeTypes, ConcretePaginateMarkup, - ConcreteLiquidCondition, - ConcreteLiquidComparison, - ConcreteLiquidTagForMarkup, - ConcreteLiquidTagCycleMarkup, - ConcreteHtmlRawTag, - ConcreteLiquidRawTag, + ConcreteRenderAliasExpression, + ConcreteRenderVariableExpression, + ConcreteTextNode, + LiquidCST, LiquidHtmlConcreteNode, - ConcreteLiquidTagBaseCase, - ConcreteLiquidTagContentForMarkup, - ConcreteComplexLiquidExpression, + LiquidHtmlCST, + toLiquidCST, + toLiquidHtmlCST, } from './stage-1-cst'; import { Comparators, NamedTags, NodeTypes, nonTraversableProperties, Position } from './types'; import { assertNever, deepGet, dropLast } from './utils'; -import { LiquidHTMLASTParsingError, UnclosedNode } from './errors'; -import { TAGS_WITHOUT_MARKUP } from './grammar'; -import { toLiquidCST } from './stage-1-cst'; interface HasPosition { locStart: number; diff --git a/packages/prettier-plugin-liquid/src/parser.ts b/packages/prettier-plugin-liquid/src/parser.ts index 143889a7a..0e3174804 100644 --- a/packages/prettier-plugin-liquid/src/parser.ts +++ b/packages/prettier-plugin-liquid/src/parser.ts @@ -1,4 +1,4 @@ -import { toLiquidHtmlAST, LiquidHtmlNode } from '@shopify/liquid-html-parser'; +import { LiquidHtmlNode, toLiquidHtmlAST } from '@shopify/liquid-html-parser'; import { locEnd, locStart } from './utils'; diff --git a/packages/prettier-plugin-liquid/src/plugin.ts b/packages/prettier-plugin-liquid/src/plugin.ts index f15694bde..8fb420151 100644 --- a/packages/prettier-plugin-liquid/src/plugin.ts +++ b/packages/prettier-plugin-liquid/src/plugin.ts @@ -1,7 +1,7 @@ -import { SupportLanguage, SupportOptions, version } from 'prettier'; import type { Plugin as Plugin2 } from 'prettier'; +import { SupportLanguage, SupportOptions, version } from 'prettier'; import type { Plugin as Plugin3 } from 'prettier3'; -import { parsers, liquidHtmlLanguageName } from './parser'; +import { liquidHtmlLanguageName, parsers } from './parser'; import { printers2, printers3 } from './printer'; import { LiquidHtmlNode } from './types'; diff --git a/packages/prettier-plugin-liquid/src/printer/embed.ts b/packages/prettier-plugin-liquid/src/printer/embed.ts index b2adc823c..326b9c95a 100644 --- a/packages/prettier-plugin-liquid/src/printer/embed.ts +++ b/packages/prettier-plugin-liquid/src/printer/embed.ts @@ -1,7 +1,7 @@ -import { doc, Doc } from 'prettier'; +import { NodeTypes, RawMarkupKinds } from '@shopify/liquid-html-parser'; import type { Printer as Printer2 } from 'prettier'; +import { doc } from 'prettier'; import type { Doc as Doc3, Printer as Printer3 } from 'prettier3'; -import { NodeTypes, RawMarkupKinds } from '@shopify/liquid-html-parser'; import { LiquidHtmlNode, LiquidParserOptions, RawMarkup } from '../types'; const { diff --git a/packages/prettier-plugin-liquid/src/printer/index.ts b/packages/prettier-plugin-liquid/src/printer/index.ts index 5a210c2d7..735862f84 100644 --- a/packages/prettier-plugin-liquid/src/printer/index.ts +++ b/packages/prettier-plugin-liquid/src/printer/index.ts @@ -1,5 +1,5 @@ -import { printerLiquidHtml2, printerLiquidHtml3 } from './printer-liquid-html'; import { liquidHtmlAstFormat } from '../parser'; +import { printerLiquidHtml2, printerLiquidHtml3 } from './printer-liquid-html'; export const printers2 = { [liquidHtmlAstFormat]: printerLiquidHtml2, diff --git a/packages/prettier-plugin-liquid/src/printer/preprocess/augment-with-css-properties.ts b/packages/prettier-plugin-liquid/src/printer/preprocess/augment-with-css-properties.ts index f5d204b09..2fdaf74f3 100644 --- a/packages/prettier-plugin-liquid/src/printer/preprocess/augment-with-css-properties.ts +++ b/packages/prettier-plugin-liquid/src/printer/preprocess/augment-with-css-properties.ts @@ -9,9 +9,9 @@ import { CSS_WHITE_SPACE_TAGS, } from '../../constants.evaluate'; import { - LiquidParserOptions, Augment, AugmentedNode, + LiquidParserOptions, WithCssProperties, WithSiblings, } from '../../types'; diff --git a/packages/prettier-plugin-liquid/src/printer/preprocess/augment-with-siblings.ts b/packages/prettier-plugin-liquid/src/printer/preprocess/augment-with-siblings.ts index d97a07eb9..3a58c9782 100644 --- a/packages/prettier-plugin-liquid/src/printer/preprocess/augment-with-siblings.ts +++ b/packages/prettier-plugin-liquid/src/printer/preprocess/augment-with-siblings.ts @@ -1,6 +1,6 @@ import { - AugmentedNode, Augment, + AugmentedNode, LiquidHtmlNode, WithParent, WithSiblings, diff --git a/packages/prettier-plugin-liquid/src/printer/preprocess/augment-with-whitespace-helpers.spec.ts b/packages/prettier-plugin-liquid/src/printer/preprocess/augment-with-whitespace-helpers.spec.ts index 09f4c6fd1..aadd44104 100644 --- a/packages/prettier-plugin-liquid/src/printer/preprocess/augment-with-whitespace-helpers.spec.ts +++ b/packages/prettier-plugin-liquid/src/printer/preprocess/augment-with-whitespace-helpers.spec.ts @@ -1,8 +1,8 @@ import { NodeTypes, toLiquidHtmlAST } from '@shopify/liquid-html-parser'; -import { expect, it, describe } from 'vitest'; +import { describe, expect, it } from 'vitest'; +import { DocumentNode, LiquidHtmlNode, LiquidParserOptions } from '../../types'; import { deepGet } from '../../utils'; import { preprocess } from '../print-preprocess'; -import { DocumentNode, LiquidHtmlNode, LiquidParserOptions } from '../../types'; describe('Module: augmentWithWhitespaceHelpers', () => { let ast: DocumentNode; diff --git a/packages/prettier-plugin-liquid/src/printer/preprocess/augment-with-whitespace-helpers.ts b/packages/prettier-plugin-liquid/src/printer/preprocess/augment-with-whitespace-helpers.ts index f7b82bc6a..405e482d4 100644 --- a/packages/prettier-plugin-liquid/src/printer/preprocess/augment-with-whitespace-helpers.ts +++ b/packages/prettier-plugin-liquid/src/printer/preprocess/augment-with-whitespace-helpers.ts @@ -6,7 +6,6 @@ import { NodeTypes, isBranchedTag, } from '@shopify/liquid-html-parser'; -import { HtmlElement, WithFamily } from '../../types'; import { CSS_WHITE_SPACE_DEFAULT, CSS_WHITE_SPACE_LIQUID_TAGS, @@ -15,7 +14,9 @@ import { import { Augment, AugmentedNode, + HtmlElement, WithCssProperties, + WithFamily, WithParent, WithSiblings, WithWhitespaceHelpers, diff --git a/packages/prettier-plugin-liquid/src/printer/preprocess/index.ts b/packages/prettier-plugin-liquid/src/printer/preprocess/index.ts index 04e936205..44aac2e0b 100644 --- a/packages/prettier-plugin-liquid/src/printer/preprocess/index.ts +++ b/packages/prettier-plugin-liquid/src/printer/preprocess/index.ts @@ -1,8 +1,8 @@ import { augmentWithCSSProperties } from './augment-with-css-properties'; +import { augmentWithFamily } from './augment-with-family'; import { augmentWithParent } from './augment-with-parent'; import { augmentWithSiblings } from './augment-with-siblings'; import { augmentWithWhitespaceHelpers } from './augment-with-whitespace-helpers'; -import { augmentWithFamily } from './augment-with-family'; export const AUGMENTATION_PIPELINE = [ augmentWithParent, diff --git a/packages/prettier-plugin-liquid/src/printer/print-preprocess.ts b/packages/prettier-plugin-liquid/src/printer/print-preprocess.ts index 317cbde3c..42cda088c 100644 --- a/packages/prettier-plugin-liquid/src/printer/print-preprocess.ts +++ b/packages/prettier-plugin-liquid/src/printer/print-preprocess.ts @@ -1,5 +1,5 @@ import * as AST from '@shopify/liquid-html-parser'; -import { LiquidParserOptions, DocumentNode } from '../types'; +import { DocumentNode, LiquidParserOptions } from '../types'; import { AUGMENTATION_PIPELINE } from './preprocess'; // This is super hard to type check so I'll just magically assume diff --git a/packages/prettier-plugin-liquid/src/printer/print/children.ts b/packages/prettier-plugin-liquid/src/printer/print/children.ts index 337291eb7..c9a25e67f 100644 --- a/packages/prettier-plugin-liquid/src/printer/print/children.ts +++ b/packages/prettier-plugin-liquid/src/printer/print/children.ts @@ -1,6 +1,5 @@ import { NodeTypes } from '@shopify/liquid-html-parser'; import { doc } from 'prettier'; -import { locStart, locEnd } from '../../utils'; import { AstPath, LiquidAstPath, @@ -9,18 +8,19 @@ import { LiquidPrinter, LiquidPrinterArgs, } from '../../types'; +import { locEnd, locStart } from '../../utils'; import { FORCE_BREAK_GROUP_ID, FORCE_FLAT_GROUP_ID, forceBreakChildren, forceNextEmptyLine, + hasNoChildren, + hasNoCloseMarker, hasPrettierIgnore, isEmpty, isLiquidNode, - hasNoCloseMarker, isTextLikeNode, preferHardlineAsLeadingSpaces, - hasNoChildren, } from '../utils'; import { needsToBorrowNextOpeningTagStartMarker, diff --git a/packages/prettier-plugin-liquid/src/printer/print/element.ts b/packages/prettier-plugin-liquid/src/printer/print/element.ts index bbd601295..a5958cc27 100644 --- a/packages/prettier-plugin-liquid/src/printer/print/element.ts +++ b/packages/prettier-plugin-liquid/src/printer/print/element.ts @@ -1,26 +1,26 @@ 'use strict'; -import { doc, Doc } from 'prettier'; import { NodeTypes } from '@shopify/liquid-html-parser'; -import { shouldPreserveContent, forceBreakContent, hasNoChildren } from '../utils'; -import { - printOpeningTagPrefix, - printOpeningTag, - printClosingTagSuffix, - printClosingTag, - needsToBorrowPrevClosingTagEndMarker, - needsToBorrowLastChildClosingTagEndMarker, - getNodeContent, -} from './tag'; -import { printChildren } from './children'; +import { doc, Doc } from 'prettier'; import { AstPath, + HtmlNode, + HtmlRawNode, LiquidParserOptions, LiquidPrinter, - HtmlNode, LiquidPrinterArgs, - HtmlRawNode, } from '../../types'; +import { forceBreakContent, hasNoChildren, shouldPreserveContent } from '../utils'; +import { printChildren } from './children'; +import { + getNodeContent, + needsToBorrowLastChildClosingTagEndMarker, + needsToBorrowPrevClosingTagEndMarker, + printClosingTag, + printClosingTagSuffix, + printOpeningTag, + printOpeningTagPrefix, +} from './tag'; const { builders: { breakParent, dedentToRoot, group, indent, hardline, line, softline }, diff --git a/packages/prettier-plugin-liquid/src/printer/print/liquid.ts b/packages/prettier-plugin-liquid/src/printer/print/liquid.ts index 7e8628311..9528e6ca5 100644 --- a/packages/prettier-plugin-liquid/src/printer/print/liquid.ts +++ b/packages/prettier-plugin-liquid/src/printer/print/liquid.ts @@ -1,12 +1,12 @@ import { - NodeTypes, - NamedTags, isBranchedTag, - RawMarkup, - LiquidDocParamNode, - LiquidDocExampleNode, LiquidDocDescriptionNode, + LiquidDocExampleNode, + LiquidDocParamNode, LiquidDocPromptNode, + NamedTags, + NodeTypes, + RawMarkup, } from '@shopify/liquid-html-parser'; import { Doc, doc } from 'prettier'; diff --git a/packages/prettier-plugin-liquid/src/printer/print/tag.ts b/packages/prettier-plugin-liquid/src/printer/print/tag.ts index 3c28506ee..95a4343da 100644 --- a/packages/prettier-plugin-liquid/src/printer/print/tag.ts +++ b/packages/prettier-plugin-liquid/src/printer/print/tag.ts @@ -1,6 +1,16 @@ import { NodeTypes, Position } from '@shopify/liquid-html-parser'; import { Doc, doc } from 'prettier'; +import { + AstPath, + HtmlDanglingMarkerClose, + HtmlElement, + HtmlNode, + HtmlSelfClosingElement, + LiquidHtmlNode, + LiquidParserOptions, + LiquidPrinter, +} from '../../types'; import { first, getLastDescendant, @@ -23,16 +33,6 @@ import { last, shouldPreserveContent, } from '../utils'; -import { - AstPath, - HtmlDanglingMarkerClose, - HtmlElement, - HtmlNode, - HtmlSelfClosingElement, - LiquidHtmlNode, - LiquidParserOptions, - LiquidPrinter, -} from '../../types'; const { builders: { breakParent, indent, join, line, softline, hardline }, diff --git a/packages/prettier-plugin-liquid/src/printer/printer-liquid-html.ts b/packages/prettier-plugin-liquid/src/printer/printer-liquid-html.ts index 57f4f91bf..01ee950b2 100644 --- a/packages/prettier-plugin-liquid/src/printer/printer-liquid-html.ts +++ b/packages/prettier-plugin-liquid/src/printer/printer-liquid-html.ts @@ -8,8 +8,8 @@ import { Position, RawMarkupKinds, } from '@shopify/liquid-html-parser'; -import { doc, Doc } from 'prettier'; import type { Printer as Printer2 } from 'prettier'; +import { doc, Doc } from 'prettier'; import type { Printer as Printer3 } from 'prettier3'; import { AstPath, @@ -46,13 +46,13 @@ import { printElement } from './print/element'; import { printLiquidBranch, printLiquidDoc, + printLiquidDocDescription, + printLiquidDocExample, + printLiquidDocParam, + printLiquidDocPrompt, printLiquidRawTag, printLiquidTag, printLiquidVariableOutput, - printLiquidDocParam, - printLiquidDocExample, - printLiquidDocDescription, - printLiquidDocPrompt, } from './print/liquid'; import { printClosingTagSuffix, printOpeningTagPrefix } from './print/tag'; import { bodyLines, hasLineBreakInRange, isEmpty, isTextLikeNode, reindent } from './utils'; diff --git a/packages/prettier-plugin-liquid/src/printer/utils/array.spec.ts b/packages/prettier-plugin-liquid/src/printer/utils/array.spec.ts index d75fbf668..4a3aa6978 100644 --- a/packages/prettier-plugin-liquid/src/printer/utils/array.spec.ts +++ b/packages/prettier-plugin-liquid/src/printer/utils/array.spec.ts @@ -1,4 +1,4 @@ -import { expect, it, describe } from 'vitest'; +import { describe, expect, it } from 'vitest'; import * as array from './array'; describe('Module: array', () => { diff --git a/packages/prettier-plugin-liquid/src/printer/utils/index.ts b/packages/prettier-plugin-liquid/src/printer/utils/index.ts index babe8d3cf..0653452ad 100644 --- a/packages/prettier-plugin-liquid/src/printer/utils/index.ts +++ b/packages/prettier-plugin-liquid/src/printer/utils/index.ts @@ -1,11 +1,11 @@ -import { Doc, doc } from 'prettier'; import { isBranchedTag } from '@shopify/liquid-html-parser'; -import { LiquidAstPath, LiquidHtmlNode, LiquidBranch } from '../../types'; +import { Doc, doc } from 'prettier'; +import { LiquidAstPath, LiquidBranch, LiquidHtmlNode } from '../../types'; import { isEmpty } from './array'; export * from './array'; -export * from './string'; export * from './node'; +export * from './string'; const { builders } = doc; const { ifBreak } = builders; diff --git a/packages/prettier-plugin-liquid/src/printer/utils/node.ts b/packages/prettier-plugin-liquid/src/printer/utils/node.ts index 42c723bc1..acdd911b1 100644 --- a/packages/prettier-plugin-liquid/src/printer/utils/node.ts +++ b/packages/prettier-plugin-liquid/src/printer/utils/node.ts @@ -1,17 +1,17 @@ -import { NodeTypes, LiquidNodeTypes, HtmlNodeTypes, Position } from '@shopify/liquid-html-parser'; +import { HtmlNodeTypes, LiquidNodeTypes, NodeTypes, Position } from '@shopify/liquid-html-parser'; import { + AttributeNode, + HtmlComment, + HtmlDanglingMarkerClose, + HtmlElement, + HtmlNode, HtmlSelfClosingElement, + HtmlVoidElement, LiquidHtmlNode, - TextNode, LiquidNode, - HtmlNode, - HtmlVoidElement, - HtmlComment, - HtmlElement, LiquidTag, - AttributeNode, LiquidVariableOutput, - HtmlDanglingMarkerClose, + TextNode, } from '../../types'; import { isEmpty } from './array'; diff --git a/packages/prettier-plugin-liquid/src/test/config-bracket-same-line/index.spec.ts b/packages/prettier-plugin-liquid/src/test/config-bracket-same-line/index.spec.ts index 6b62a9f69..b2111faa0 100644 --- a/packages/prettier-plugin-liquid/src/test/config-bracket-same-line/index.spec.ts +++ b/packages/prettier-plugin-liquid/src/test/config-bracket-same-line/index.spec.ts @@ -1,6 +1,5 @@ import { test } from 'vitest'; import { assertFormattedEqualsFixed } from '../test-helpers'; -import * as path from 'path'; test('Unit: config-bracket-same-line', async () => { await assertFormattedEqualsFixed(__dirname); diff --git a/packages/prettier-plugin-liquid/src/test/config-use-tabs/index.spec.ts b/packages/prettier-plugin-liquid/src/test/config-use-tabs/index.spec.ts index 65151090e..93f2ea780 100644 --- a/packages/prettier-plugin-liquid/src/test/config-use-tabs/index.spec.ts +++ b/packages/prettier-plugin-liquid/src/test/config-use-tabs/index.spec.ts @@ -1,6 +1,5 @@ import { test } from 'vitest'; import { assertFormattedEqualsFixed } from '../test-helpers'; -import * as path from 'path'; test('Unit: config-use-tabs', async () => { await assertFormattedEqualsFixed(__dirname); diff --git a/packages/prettier-plugin-liquid/src/test/document-paragraphs/index.spec.ts b/packages/prettier-plugin-liquid/src/test/document-paragraphs/index.spec.ts index 2fe144ef0..311b82ba4 100644 --- a/packages/prettier-plugin-liquid/src/test/document-paragraphs/index.spec.ts +++ b/packages/prettier-plugin-liquid/src/test/document-paragraphs/index.spec.ts @@ -1,6 +1,5 @@ import { test } from 'vitest'; import { assertFormattedEqualsFixed } from '../test-helpers'; -import * as path from 'path'; test('Unit: document-paragraphs', async () => { await assertFormattedEqualsFixed(__dirname); diff --git a/packages/prettier-plugin-liquid/src/test/embed-liquid-javascript-tag/index.spec.ts b/packages/prettier-plugin-liquid/src/test/embed-liquid-javascript-tag/index.spec.ts index c05f1d2c1..ff1aeb948 100644 --- a/packages/prettier-plugin-liquid/src/test/embed-liquid-javascript-tag/index.spec.ts +++ b/packages/prettier-plugin-liquid/src/test/embed-liquid-javascript-tag/index.spec.ts @@ -1,6 +1,5 @@ import { test } from 'vitest'; import { assertFormattedEqualsFixed } from '../test-helpers'; -import * as path from 'path'; test('Unit: embed-liquid-javascript-tag', async () => { await assertFormattedEqualsFixed(__dirname); diff --git a/packages/prettier-plugin-liquid/src/test/embed-liquid-style-tag/index.spec.ts b/packages/prettier-plugin-liquid/src/test/embed-liquid-style-tag/index.spec.ts index b7fb18101..ffdade937 100644 --- a/packages/prettier-plugin-liquid/src/test/embed-liquid-style-tag/index.spec.ts +++ b/packages/prettier-plugin-liquid/src/test/embed-liquid-style-tag/index.spec.ts @@ -1,6 +1,5 @@ import { test } from 'vitest'; import { assertFormattedEqualsFixed } from '../test-helpers'; -import * as path from 'path'; test('Unit: embed-liquid-style-tag', async () => { await assertFormattedEqualsFixed(__dirname); diff --git a/packages/prettier-plugin-liquid/src/test/embed-liquid-stylesheet-tag/index.spec.ts b/packages/prettier-plugin-liquid/src/test/embed-liquid-stylesheet-tag/index.spec.ts index a82e7acb2..2db94604f 100644 --- a/packages/prettier-plugin-liquid/src/test/embed-liquid-stylesheet-tag/index.spec.ts +++ b/packages/prettier-plugin-liquid/src/test/embed-liquid-stylesheet-tag/index.spec.ts @@ -1,6 +1,5 @@ import { test } from 'vitest'; import { assertFormattedEqualsFixed } from '../test-helpers'; -import * as path from 'path'; test('Unit: embed-liquid-stylesheet-tag', async () => { await assertFormattedEqualsFixed(__dirname); diff --git a/packages/prettier-plugin-liquid/src/test/embed-script-tag/index.spec.ts b/packages/prettier-plugin-liquid/src/test/embed-script-tag/index.spec.ts index 16549829c..87b84e3c2 100644 --- a/packages/prettier-plugin-liquid/src/test/embed-script-tag/index.spec.ts +++ b/packages/prettier-plugin-liquid/src/test/embed-script-tag/index.spec.ts @@ -1,6 +1,5 @@ import { test } from 'vitest'; import { assertFormattedEqualsFixed } from '../test-helpers'; -import * as path from 'path'; test('Unit: embed-script-tag', async () => { await assertFormattedEqualsFixed(__dirname); diff --git a/packages/prettier-plugin-liquid/src/test/embed-style-tag/index.spec.ts b/packages/prettier-plugin-liquid/src/test/embed-style-tag/index.spec.ts index ff46c4d08..547d45d0e 100644 --- a/packages/prettier-plugin-liquid/src/test/embed-style-tag/index.spec.ts +++ b/packages/prettier-plugin-liquid/src/test/embed-style-tag/index.spec.ts @@ -1,6 +1,5 @@ import { test } from 'vitest'; import { assertFormattedEqualsFixed } from '../test-helpers'; -import * as path from 'path'; test('Unit: embed-style-tag', async () => { await assertFormattedEqualsFixed(__dirname); diff --git a/packages/prettier-plugin-liquid/src/test/example/index.spec.ts b/packages/prettier-plugin-liquid/src/test/example/index.spec.ts index 30692b4c1..b49ffc907 100644 --- a/packages/prettier-plugin-liquid/src/test/example/index.spec.ts +++ b/packages/prettier-plugin-liquid/src/test/example/index.spec.ts @@ -1,6 +1,5 @@ import { test } from 'vitest'; import { assertFormattedEqualsFixed } from '../test-helpers'; -import * as path from 'path'; test('Unit: example', async () => { await assertFormattedEqualsFixed(__dirname); diff --git a/packages/prettier-plugin-liquid/src/test/html-attributes/index.spec.ts b/packages/prettier-plugin-liquid/src/test/html-attributes/index.spec.ts index 58f280177..aeb362d73 100644 --- a/packages/prettier-plugin-liquid/src/test/html-attributes/index.spec.ts +++ b/packages/prettier-plugin-liquid/src/test/html-attributes/index.spec.ts @@ -1,6 +1,5 @@ import { test } from 'vitest'; import { assertFormattedEqualsFixed } from '../test-helpers'; -import * as path from 'path'; test('Unit: html-attributes', async () => { await assertFormattedEqualsFixed(__dirname); diff --git a/packages/prettier-plugin-liquid/src/test/html-comment/index.spec.ts b/packages/prettier-plugin-liquid/src/test/html-comment/index.spec.ts index 21ef2f0b8..cc380e320 100644 --- a/packages/prettier-plugin-liquid/src/test/html-comment/index.spec.ts +++ b/packages/prettier-plugin-liquid/src/test/html-comment/index.spec.ts @@ -1,6 +1,5 @@ import { test } from 'vitest'; import { assertFormattedEqualsFixed } from '../test-helpers'; -import * as path from 'path'; test('Unit: html-comment', async () => { await assertFormattedEqualsFixed(__dirname); diff --git a/packages/prettier-plugin-liquid/src/test/html-compound-names/index.spec.ts b/packages/prettier-plugin-liquid/src/test/html-compound-names/index.spec.ts index 2513778a7..b2d63a85a 100644 --- a/packages/prettier-plugin-liquid/src/test/html-compound-names/index.spec.ts +++ b/packages/prettier-plugin-liquid/src/test/html-compound-names/index.spec.ts @@ -1,6 +1,5 @@ import { test } from 'vitest'; import { assertFormattedEqualsFixed } from '../test-helpers'; -import * as path from 'path'; test('Unit: html-compound-names', async () => { await assertFormattedEqualsFixed(__dirname); diff --git a/packages/prettier-plugin-liquid/src/test/html-custom-element/index.spec.ts b/packages/prettier-plugin-liquid/src/test/html-custom-element/index.spec.ts index b25c1bb90..e751d3d6f 100644 --- a/packages/prettier-plugin-liquid/src/test/html-custom-element/index.spec.ts +++ b/packages/prettier-plugin-liquid/src/test/html-custom-element/index.spec.ts @@ -1,6 +1,5 @@ import { test } from 'vitest'; import { assertFormattedEqualsFixed } from '../test-helpers'; -import * as path from 'path'; test('Unit: html-custom-element', async () => { await assertFormattedEqualsFixed(__dirname); diff --git a/packages/prettier-plugin-liquid/src/test/html-doctype/index.spec.ts b/packages/prettier-plugin-liquid/src/test/html-doctype/index.spec.ts index 4987d13da..96cc173fe 100644 --- a/packages/prettier-plugin-liquid/src/test/html-doctype/index.spec.ts +++ b/packages/prettier-plugin-liquid/src/test/html-doctype/index.spec.ts @@ -1,6 +1,5 @@ import { test } from 'vitest'; import { assertFormattedEqualsFixed } from '../test-helpers'; -import * as path from 'path'; test('Unit: html-doctype', async () => { await assertFormattedEqualsFixed(__dirname); diff --git a/packages/prettier-plugin-liquid/src/test/html-element/index.spec.ts b/packages/prettier-plugin-liquid/src/test/html-element/index.spec.ts index e4c467cdf..fecbff24d 100644 --- a/packages/prettier-plugin-liquid/src/test/html-element/index.spec.ts +++ b/packages/prettier-plugin-liquid/src/test/html-element/index.spec.ts @@ -1,6 +1,5 @@ import { test } from 'vitest'; import { assertFormattedEqualsFixed } from '../test-helpers'; -import * as path from 'path'; test('Unit: html-element', async () => { await assertFormattedEqualsFixed(__dirname); diff --git a/packages/prettier-plugin-liquid/src/test/html-liquid-drop-name/index.spec.ts b/packages/prettier-plugin-liquid/src/test/html-liquid-drop-name/index.spec.ts index 583a03cf0..4b14d3806 100644 --- a/packages/prettier-plugin-liquid/src/test/html-liquid-drop-name/index.spec.ts +++ b/packages/prettier-plugin-liquid/src/test/html-liquid-drop-name/index.spec.ts @@ -1,6 +1,5 @@ import { test } from 'vitest'; import { assertFormattedEqualsFixed } from '../test-helpers'; -import * as path from 'path'; test('Unit: html-liquid-drop-name', async () => { await assertFormattedEqualsFixed(__dirname); diff --git a/packages/prettier-plugin-liquid/src/test/html-list-tags/index.spec.ts b/packages/prettier-plugin-liquid/src/test/html-list-tags/index.spec.ts index 9bb5ef58c..4ab3535b5 100644 --- a/packages/prettier-plugin-liquid/src/test/html-list-tags/index.spec.ts +++ b/packages/prettier-plugin-liquid/src/test/html-list-tags/index.spec.ts @@ -1,6 +1,5 @@ import { test } from 'vitest'; import { assertFormattedEqualsFixed } from '../test-helpers'; -import * as path from 'path'; test('Unit: html-list-tags', async () => { await assertFormattedEqualsFixed(__dirname); diff --git a/packages/prettier-plugin-liquid/src/test/html-raw-nodes-whitespace-borrowing/index.spec.ts b/packages/prettier-plugin-liquid/src/test/html-raw-nodes-whitespace-borrowing/index.spec.ts index c42a8e8a5..083f6f841 100644 --- a/packages/prettier-plugin-liquid/src/test/html-raw-nodes-whitespace-borrowing/index.spec.ts +++ b/packages/prettier-plugin-liquid/src/test/html-raw-nodes-whitespace-borrowing/index.spec.ts @@ -1,6 +1,5 @@ import { test } from 'vitest'; import { assertFormattedEqualsFixed } from '../test-helpers'; -import * as path from 'path'; test('Unit: html-raw-nodes-whitespace-borrowing', async () => { await assertFormattedEqualsFixed(__dirname); diff --git a/packages/prettier-plugin-liquid/src/test/html-script-tag/index.spec.ts b/packages/prettier-plugin-liquid/src/test/html-script-tag/index.spec.ts index 57f058db3..ac7499f6c 100644 --- a/packages/prettier-plugin-liquid/src/test/html-script-tag/index.spec.ts +++ b/packages/prettier-plugin-liquid/src/test/html-script-tag/index.spec.ts @@ -1,6 +1,5 @@ import { test } from 'vitest'; import { assertFormattedEqualsFixed } from '../test-helpers'; -import * as path from 'path'; test('Unit: html-script-tag', async () => { await assertFormattedEqualsFixed(__dirname); diff --git a/packages/prettier-plugin-liquid/src/test/html-self-closing-element/index.spec.ts b/packages/prettier-plugin-liquid/src/test/html-self-closing-element/index.spec.ts index fe541ad49..4123d8f98 100644 --- a/packages/prettier-plugin-liquid/src/test/html-self-closing-element/index.spec.ts +++ b/packages/prettier-plugin-liquid/src/test/html-self-closing-element/index.spec.ts @@ -1,6 +1,5 @@ import { test } from 'vitest'; import { assertFormattedEqualsFixed } from '../test-helpers'; -import * as path from 'path'; test('Unit: html-self-closing-element', async () => { await assertFormattedEqualsFixed(__dirname); diff --git a/packages/prettier-plugin-liquid/src/test/html-style-tag/index.spec.ts b/packages/prettier-plugin-liquid/src/test/html-style-tag/index.spec.ts index f5aaea271..3355f2ff8 100644 --- a/packages/prettier-plugin-liquid/src/test/html-style-tag/index.spec.ts +++ b/packages/prettier-plugin-liquid/src/test/html-style-tag/index.spec.ts @@ -1,6 +1,5 @@ import { test } from 'vitest'; import { assertFormattedEqualsFixed } from '../test-helpers'; -import * as path from 'path'; test('Unit: html-style-tag', async () => { await assertFormattedEqualsFixed(__dirname); diff --git a/packages/prettier-plugin-liquid/src/test/html-void-element-whitespace-borrowing/index.spec.ts b/packages/prettier-plugin-liquid/src/test/html-void-element-whitespace-borrowing/index.spec.ts index 4a7ead315..b7e8d4bd0 100644 --- a/packages/prettier-plugin-liquid/src/test/html-void-element-whitespace-borrowing/index.spec.ts +++ b/packages/prettier-plugin-liquid/src/test/html-void-element-whitespace-borrowing/index.spec.ts @@ -1,6 +1,5 @@ import { test } from 'vitest'; import { assertFormattedEqualsFixed } from '../test-helpers'; -import * as path from 'path'; test('Unit: html-void-element-whitespace-borrowing', async () => { await assertFormattedEqualsFixed(__dirname); diff --git a/packages/prettier-plugin-liquid/src/test/issue-120/index.spec.ts b/packages/prettier-plugin-liquid/src/test/issue-120/index.spec.ts index 439e515bd..09d7ff6a0 100644 --- a/packages/prettier-plugin-liquid/src/test/issue-120/index.spec.ts +++ b/packages/prettier-plugin-liquid/src/test/issue-120/index.spec.ts @@ -1,6 +1,5 @@ import { test } from 'vitest'; import { assertFormattedEqualsFixed } from '../test-helpers'; -import * as path from 'path'; test('Unit: issue-120', async () => { await assertFormattedEqualsFixed(__dirname); diff --git a/packages/prettier-plugin-liquid/src/test/issue-123/index.spec.ts b/packages/prettier-plugin-liquid/src/test/issue-123/index.spec.ts index 2586dbbad..52e7b5dee 100644 --- a/packages/prettier-plugin-liquid/src/test/issue-123/index.spec.ts +++ b/packages/prettier-plugin-liquid/src/test/issue-123/index.spec.ts @@ -1,6 +1,5 @@ import { test } from 'vitest'; import { assertFormattedEqualsFixed } from '../test-helpers'; -import * as path from 'path'; test('Unit: issue-123', async () => { await assertFormattedEqualsFixed(__dirname); diff --git a/packages/prettier-plugin-liquid/src/test/issue-134/index.spec.ts b/packages/prettier-plugin-liquid/src/test/issue-134/index.spec.ts index eda9bc8dc..bd6d3d806 100644 --- a/packages/prettier-plugin-liquid/src/test/issue-134/index.spec.ts +++ b/packages/prettier-plugin-liquid/src/test/issue-134/index.spec.ts @@ -1,6 +1,5 @@ import { test } from 'vitest'; import { assertFormattedEqualsFixed } from '../test-helpers'; -import * as path from 'path'; test('Unit: issue-134', async () => { await assertFormattedEqualsFixed(__dirname); diff --git a/packages/prettier-plugin-liquid/src/test/issue-144/index.spec.ts b/packages/prettier-plugin-liquid/src/test/issue-144/index.spec.ts index abf060be7..c6b3b69c8 100644 --- a/packages/prettier-plugin-liquid/src/test/issue-144/index.spec.ts +++ b/packages/prettier-plugin-liquid/src/test/issue-144/index.spec.ts @@ -1,6 +1,5 @@ import { test } from 'vitest'; import { assertFormattedEqualsFixed } from '../test-helpers'; -import * as path from 'path'; test('Unit: issue-144', async () => { await assertFormattedEqualsFixed(__dirname); diff --git a/packages/prettier-plugin-liquid/src/test/issue-154/index.spec.ts b/packages/prettier-plugin-liquid/src/test/issue-154/index.spec.ts index 8ad5bc136..4b01be1b7 100644 --- a/packages/prettier-plugin-liquid/src/test/issue-154/index.spec.ts +++ b/packages/prettier-plugin-liquid/src/test/issue-154/index.spec.ts @@ -1,6 +1,5 @@ import { test } from 'vitest'; import { assertFormattedEqualsFixed } from '../test-helpers'; -import * as path from 'path'; test('Unit: issue-154', async () => { await assertFormattedEqualsFixed(__dirname); diff --git a/packages/prettier-plugin-liquid/src/test/issue-156/index.spec.ts b/packages/prettier-plugin-liquid/src/test/issue-156/index.spec.ts index f14a9c383..7503dca47 100644 --- a/packages/prettier-plugin-liquid/src/test/issue-156/index.spec.ts +++ b/packages/prettier-plugin-liquid/src/test/issue-156/index.spec.ts @@ -1,6 +1,5 @@ import { test } from 'vitest'; import { assertFormattedEqualsFixed } from '../test-helpers'; -import * as path from 'path'; test('Unit: issue-156', async () => { await assertFormattedEqualsFixed(__dirname); diff --git a/packages/prettier-plugin-liquid/src/test/issue-158/index.spec.ts b/packages/prettier-plugin-liquid/src/test/issue-158/index.spec.ts index 8ba8d1afe..a95966223 100644 --- a/packages/prettier-plugin-liquid/src/test/issue-158/index.spec.ts +++ b/packages/prettier-plugin-liquid/src/test/issue-158/index.spec.ts @@ -1,6 +1,5 @@ import { test } from 'vitest'; import { assertFormattedEqualsFixed } from '../test-helpers'; -import * as path from 'path'; test('Unit: issue-158', async () => { await assertFormattedEqualsFixed(__dirname); diff --git a/packages/prettier-plugin-liquid/src/test/issue-162/index.spec.ts b/packages/prettier-plugin-liquid/src/test/issue-162/index.spec.ts index 544267b69..0bfde3cae 100644 --- a/packages/prettier-plugin-liquid/src/test/issue-162/index.spec.ts +++ b/packages/prettier-plugin-liquid/src/test/issue-162/index.spec.ts @@ -1,6 +1,5 @@ import { test } from 'vitest'; import { assertFormattedEqualsFixed } from '../test-helpers'; -import * as path from 'path'; test('Unit: issue-162', async () => { await assertFormattedEqualsFixed(__dirname); diff --git a/packages/prettier-plugin-liquid/src/test/issue-26/index.spec.ts b/packages/prettier-plugin-liquid/src/test/issue-26/index.spec.ts index 2c4af9891..ac1055135 100644 --- a/packages/prettier-plugin-liquid/src/test/issue-26/index.spec.ts +++ b/packages/prettier-plugin-liquid/src/test/issue-26/index.spec.ts @@ -1,6 +1,5 @@ import { test } from 'vitest'; import { assertFormattedEqualsFixed } from '../test-helpers'; -import * as path from 'path'; test('Unit: issue-26', async () => { await assertFormattedEqualsFixed(__dirname); diff --git a/packages/prettier-plugin-liquid/src/test/issue-99/index.spec.ts b/packages/prettier-plugin-liquid/src/test/issue-99/index.spec.ts index 8ba41f03d..bfb2e3b82 100644 --- a/packages/prettier-plugin-liquid/src/test/issue-99/index.spec.ts +++ b/packages/prettier-plugin-liquid/src/test/issue-99/index.spec.ts @@ -1,6 +1,5 @@ import { test } from 'vitest'; import { assertFormattedEqualsFixed } from '../test-helpers'; -import * as path from 'path'; test('Unit: issue-99', async () => { await assertFormattedEqualsFixed(__dirname); diff --git a/packages/prettier-plugin-liquid/src/test/layout-html/index.spec.ts b/packages/prettier-plugin-liquid/src/test/layout-html/index.spec.ts index a99fc0d7c..3c2c71220 100644 --- a/packages/prettier-plugin-liquid/src/test/layout-html/index.spec.ts +++ b/packages/prettier-plugin-liquid/src/test/layout-html/index.spec.ts @@ -1,6 +1,5 @@ import { test } from 'vitest'; import { assertFormattedEqualsFixed } from '../test-helpers'; -import * as path from 'path'; test('Unit: layout-html', async () => { await assertFormattedEqualsFixed(__dirname); diff --git a/packages/prettier-plugin-liquid/src/test/leading-whitespace-inside-block/index.spec.ts b/packages/prettier-plugin-liquid/src/test/leading-whitespace-inside-block/index.spec.ts index 9d54170a3..9629264fb 100644 --- a/packages/prettier-plugin-liquid/src/test/leading-whitespace-inside-block/index.spec.ts +++ b/packages/prettier-plugin-liquid/src/test/leading-whitespace-inside-block/index.spec.ts @@ -1,6 +1,5 @@ import { test } from 'vitest'; import { assertFormattedEqualsFixed } from '../test-helpers'; -import * as path from 'path'; test('Unit: leading-whitespace-inside-block', async () => { await assertFormattedEqualsFixed(__dirname); diff --git a/packages/prettier-plugin-liquid/src/test/leading-whitespace-inside-default-branch/index.spec.ts b/packages/prettier-plugin-liquid/src/test/leading-whitespace-inside-default-branch/index.spec.ts index e33db06b9..886c8d916 100644 --- a/packages/prettier-plugin-liquid/src/test/leading-whitespace-inside-default-branch/index.spec.ts +++ b/packages/prettier-plugin-liquid/src/test/leading-whitespace-inside-default-branch/index.spec.ts @@ -1,6 +1,5 @@ import { test } from 'vitest'; import { assertFormattedEqualsFixed } from '../test-helpers'; -import * as path from 'path'; test('Unit: leading-whitespace-inside-default-branch', async () => { await assertFormattedEqualsFixed(__dirname); diff --git a/packages/prettier-plugin-liquid/src/test/leading-whitespace-inside-named-branch/index.spec.ts b/packages/prettier-plugin-liquid/src/test/leading-whitespace-inside-named-branch/index.spec.ts index 4b56a7851..a8e73dfd6 100644 --- a/packages/prettier-plugin-liquid/src/test/leading-whitespace-inside-named-branch/index.spec.ts +++ b/packages/prettier-plugin-liquid/src/test/leading-whitespace-inside-named-branch/index.spec.ts @@ -1,6 +1,5 @@ import { test } from 'vitest'; import { assertFormattedEqualsFixed } from '../test-helpers'; -import * as path from 'path'; test('Unit: leading-whitespace-inside-named-branch', async () => { await assertFormattedEqualsFixed(__dirname); diff --git a/packages/prettier-plugin-liquid/src/test/liquid-comment/index.spec.ts b/packages/prettier-plugin-liquid/src/test/liquid-comment/index.spec.ts index 5a0c74fe2..677a8df64 100644 --- a/packages/prettier-plugin-liquid/src/test/liquid-comment/index.spec.ts +++ b/packages/prettier-plugin-liquid/src/test/liquid-comment/index.spec.ts @@ -1,6 +1,5 @@ import { test } from 'vitest'; import { assertFormattedEqualsFixed } from '../test-helpers'; -import * as path from 'path'; test('Unit: liquid-comment', async () => { await assertFormattedEqualsFixed(__dirname); diff --git a/packages/prettier-plugin-liquid/src/test/liquid-control-flow-branches/index.spec.ts b/packages/prettier-plugin-liquid/src/test/liquid-control-flow-branches/index.spec.ts index c09e19351..fcd1b1246 100644 --- a/packages/prettier-plugin-liquid/src/test/liquid-control-flow-branches/index.spec.ts +++ b/packages/prettier-plugin-liquid/src/test/liquid-control-flow-branches/index.spec.ts @@ -1,6 +1,5 @@ import { test } from 'vitest'; import { assertFormattedEqualsFixed } from '../test-helpers'; -import * as path from 'path'; test('Unit: liquid-control-flow-branches', async () => { await assertFormattedEqualsFixed(__dirname); diff --git a/packages/prettier-plugin-liquid/src/test/liquid-drop-filters/index.spec.ts b/packages/prettier-plugin-liquid/src/test/liquid-drop-filters/index.spec.ts index 7e2c28f11..9e213f58c 100644 --- a/packages/prettier-plugin-liquid/src/test/liquid-drop-filters/index.spec.ts +++ b/packages/prettier-plugin-liquid/src/test/liquid-drop-filters/index.spec.ts @@ -1,6 +1,5 @@ import { test } from 'vitest'; import { assertFormattedEqualsFixed } from '../test-helpers'; -import * as path from 'path'; test('Unit: liquid-drop-filters', async () => { await assertFormattedEqualsFixed(__dirname); diff --git a/packages/prettier-plugin-liquid/src/test/liquid-drop-liquid-literal/index.spec.ts b/packages/prettier-plugin-liquid/src/test/liquid-drop-liquid-literal/index.spec.ts index fbb6ad837..8e716826b 100644 --- a/packages/prettier-plugin-liquid/src/test/liquid-drop-liquid-literal/index.spec.ts +++ b/packages/prettier-plugin-liquid/src/test/liquid-drop-liquid-literal/index.spec.ts @@ -1,6 +1,5 @@ import { test } from 'vitest'; import { assertFormattedEqualsFixed } from '../test-helpers'; -import * as path from 'path'; test('Unit: liquid-drop-liquid-literal', async () => { await assertFormattedEqualsFixed(__dirname); diff --git a/packages/prettier-plugin-liquid/src/test/liquid-drop-number/index.spec.ts b/packages/prettier-plugin-liquid/src/test/liquid-drop-number/index.spec.ts index da28e276a..1c7896e7a 100644 --- a/packages/prettier-plugin-liquid/src/test/liquid-drop-number/index.spec.ts +++ b/packages/prettier-plugin-liquid/src/test/liquid-drop-number/index.spec.ts @@ -1,6 +1,5 @@ import { test } from 'vitest'; import { assertFormattedEqualsFixed } from '../test-helpers'; -import * as path from 'path'; test('Unit: liquid-drop-number', async () => { await assertFormattedEqualsFixed(__dirname); diff --git a/packages/prettier-plugin-liquid/src/test/liquid-drop-range/index.spec.ts b/packages/prettier-plugin-liquid/src/test/liquid-drop-range/index.spec.ts index fc7b87fa2..50af536e9 100644 --- a/packages/prettier-plugin-liquid/src/test/liquid-drop-range/index.spec.ts +++ b/packages/prettier-plugin-liquid/src/test/liquid-drop-range/index.spec.ts @@ -1,6 +1,5 @@ import { test } from 'vitest'; import { assertFormattedEqualsFixed } from '../test-helpers'; -import * as path from 'path'; test('Unit: liquid-drop-range', async () => { await assertFormattedEqualsFixed(__dirname); diff --git a/packages/prettier-plugin-liquid/src/test/liquid-drop-string/index.spec.ts b/packages/prettier-plugin-liquid/src/test/liquid-drop-string/index.spec.ts index 1dac82f85..479ffceb0 100644 --- a/packages/prettier-plugin-liquid/src/test/liquid-drop-string/index.spec.ts +++ b/packages/prettier-plugin-liquid/src/test/liquid-drop-string/index.spec.ts @@ -1,6 +1,5 @@ import { test } from 'vitest'; import { assertFormattedEqualsFixed } from '../test-helpers'; -import * as path from 'path'; test('Unit: liquid-drop-string', async () => { await assertFormattedEqualsFixed(__dirname); diff --git a/packages/prettier-plugin-liquid/src/test/liquid-drop-variable-lookup/index.spec.ts b/packages/prettier-plugin-liquid/src/test/liquid-drop-variable-lookup/index.spec.ts index 2ad603be3..49bb2f89e 100644 --- a/packages/prettier-plugin-liquid/src/test/liquid-drop-variable-lookup/index.spec.ts +++ b/packages/prettier-plugin-liquid/src/test/liquid-drop-variable-lookup/index.spec.ts @@ -1,6 +1,5 @@ import { test } from 'vitest'; import { assertFormattedEqualsFixed } from '../test-helpers'; -import * as path from 'path'; test('Unit: liquid-drop-variable-lookup', async () => { await assertFormattedEqualsFixed(__dirname); diff --git a/packages/prettier-plugin-liquid/src/test/liquid-liquid-tag/index.spec.ts b/packages/prettier-plugin-liquid/src/test/liquid-liquid-tag/index.spec.ts index 385af3923..f69307cdd 100644 --- a/packages/prettier-plugin-liquid/src/test/liquid-liquid-tag/index.spec.ts +++ b/packages/prettier-plugin-liquid/src/test/liquid-liquid-tag/index.spec.ts @@ -1,6 +1,5 @@ import { test } from 'vitest'; import { assertFormattedEqualsFixed } from '../test-helpers'; -import * as path from 'path'; test('Unit: liquid-liquid-tag', async () => { await assertFormattedEqualsFixed(__dirname); diff --git a/packages/prettier-plugin-liquid/src/test/liquid-prettier-ignore/index.spec.ts b/packages/prettier-plugin-liquid/src/test/liquid-prettier-ignore/index.spec.ts index 1aa92d2a8..7a5b5b1da 100644 --- a/packages/prettier-plugin-liquid/src/test/liquid-prettier-ignore/index.spec.ts +++ b/packages/prettier-plugin-liquid/src/test/liquid-prettier-ignore/index.spec.ts @@ -1,6 +1,5 @@ import { test } from 'vitest'; import { assertFormattedEqualsFixed } from '../test-helpers'; -import * as path from 'path'; test('Unit: liquid-prettier-ignore', async () => { await assertFormattedEqualsFixed(__dirname); diff --git a/packages/prettier-plugin-liquid/src/test/liquid-raw-tag/index.spec.ts b/packages/prettier-plugin-liquid/src/test/liquid-raw-tag/index.spec.ts index 16d1b7420..113ed1b6b 100644 --- a/packages/prettier-plugin-liquid/src/test/liquid-raw-tag/index.spec.ts +++ b/packages/prettier-plugin-liquid/src/test/liquid-raw-tag/index.spec.ts @@ -1,6 +1,5 @@ import { test } from 'vitest'; import { assertFormattedEqualsFixed } from '../test-helpers'; -import * as path from 'path'; test('Unit: liquid-raw-tag', async () => { await assertFormattedEqualsFixed(__dirname); diff --git a/packages/prettier-plugin-liquid/src/test/liquid-schema-tag/index.spec.ts b/packages/prettier-plugin-liquid/src/test/liquid-schema-tag/index.spec.ts index 8707320fd..0dda3d342 100644 --- a/packages/prettier-plugin-liquid/src/test/liquid-schema-tag/index.spec.ts +++ b/packages/prettier-plugin-liquid/src/test/liquid-schema-tag/index.spec.ts @@ -1,6 +1,5 @@ import { test } from 'vitest'; import { assertFormattedEqualsFixed } from '../test-helpers'; -import * as path from 'path'; test('Unit: liquid-schema-tag', async () => { await assertFormattedEqualsFixed(__dirname); diff --git a/packages/prettier-plugin-liquid/src/test/liquid-style-tag/index.spec.ts b/packages/prettier-plugin-liquid/src/test/liquid-style-tag/index.spec.ts index 0fee8d30f..3e475f698 100644 --- a/packages/prettier-plugin-liquid/src/test/liquid-style-tag/index.spec.ts +++ b/packages/prettier-plugin-liquid/src/test/liquid-style-tag/index.spec.ts @@ -1,6 +1,5 @@ import { test } from 'vitest'; import { assertFormattedEqualsFixed } from '../test-helpers'; -import * as path from 'path'; test('Unit: liquid-style-tag', async () => { await assertFormattedEqualsFixed(__dirname); diff --git a/packages/prettier-plugin-liquid/src/test/liquid-tag-assign/index.spec.ts b/packages/prettier-plugin-liquid/src/test/liquid-tag-assign/index.spec.ts index 2d9fb3b06..cc6dea082 100644 --- a/packages/prettier-plugin-liquid/src/test/liquid-tag-assign/index.spec.ts +++ b/packages/prettier-plugin-liquid/src/test/liquid-tag-assign/index.spec.ts @@ -1,6 +1,5 @@ import { test } from 'vitest'; import { assertFormattedEqualsFixed } from '../test-helpers'; -import * as path from 'path'; test('Unit: liquid-tag-assign', async () => { await assertFormattedEqualsFixed(__dirname); diff --git a/packages/prettier-plugin-liquid/src/test/liquid-tag-break/index.spec.ts b/packages/prettier-plugin-liquid/src/test/liquid-tag-break/index.spec.ts index 581704c1f..61fa5cbac 100644 --- a/packages/prettier-plugin-liquid/src/test/liquid-tag-break/index.spec.ts +++ b/packages/prettier-plugin-liquid/src/test/liquid-tag-break/index.spec.ts @@ -1,6 +1,5 @@ import { test } from 'vitest'; import { assertFormattedEqualsFixed } from '../test-helpers'; -import * as path from 'path'; test('Unit: liquid-tag-break', async () => { await assertFormattedEqualsFixed(__dirname); diff --git a/packages/prettier-plugin-liquid/src/test/liquid-tag-capture-whitespace/index.spec.ts b/packages/prettier-plugin-liquid/src/test/liquid-tag-capture-whitespace/index.spec.ts index 5458b5e59..9201b968e 100644 --- a/packages/prettier-plugin-liquid/src/test/liquid-tag-capture-whitespace/index.spec.ts +++ b/packages/prettier-plugin-liquid/src/test/liquid-tag-capture-whitespace/index.spec.ts @@ -1,6 +1,5 @@ import { test } from 'vitest'; import { assertFormattedEqualsFixed } from '../test-helpers'; -import * as path from 'path'; test('Unit: liquid-tag-capture-whitespace', async () => { await assertFormattedEqualsFixed(__dirname); diff --git a/packages/prettier-plugin-liquid/src/test/liquid-tag-capture/index.spec.ts b/packages/prettier-plugin-liquid/src/test/liquid-tag-capture/index.spec.ts index ec8866ec5..9066a8f8c 100644 --- a/packages/prettier-plugin-liquid/src/test/liquid-tag-capture/index.spec.ts +++ b/packages/prettier-plugin-liquid/src/test/liquid-tag-capture/index.spec.ts @@ -1,6 +1,5 @@ import { test } from 'vitest'; import { assertFormattedEqualsFixed } from '../test-helpers'; -import * as path from 'path'; test('Unit: liquid-tag-capture', async () => { await assertFormattedEqualsFixed(__dirname); diff --git a/packages/prettier-plugin-liquid/src/test/liquid-tag-case/index.spec.ts b/packages/prettier-plugin-liquid/src/test/liquid-tag-case/index.spec.ts index 7f4e2910a..1694a5d87 100644 --- a/packages/prettier-plugin-liquid/src/test/liquid-tag-case/index.spec.ts +++ b/packages/prettier-plugin-liquid/src/test/liquid-tag-case/index.spec.ts @@ -1,6 +1,5 @@ import { test } from 'vitest'; import { assertFormattedEqualsFixed } from '../test-helpers'; -import * as path from 'path'; test('Unit: liquid-tag-case', async () => { await assertFormattedEqualsFixed(__dirname); diff --git a/packages/prettier-plugin-liquid/src/test/liquid-tag-continue/index.spec.ts b/packages/prettier-plugin-liquid/src/test/liquid-tag-continue/index.spec.ts index 1d3d58b15..7a32a611b 100644 --- a/packages/prettier-plugin-liquid/src/test/liquid-tag-continue/index.spec.ts +++ b/packages/prettier-plugin-liquid/src/test/liquid-tag-continue/index.spec.ts @@ -1,6 +1,5 @@ import { test } from 'vitest'; import { assertFormattedEqualsFixed } from '../test-helpers'; -import * as path from 'path'; test('Unit: liquid-tag-continue', async () => { await assertFormattedEqualsFixed(__dirname); diff --git a/packages/prettier-plugin-liquid/src/test/liquid-tag-cycle/index.spec.ts b/packages/prettier-plugin-liquid/src/test/liquid-tag-cycle/index.spec.ts index 511bb8eef..b8e21317e 100644 --- a/packages/prettier-plugin-liquid/src/test/liquid-tag-cycle/index.spec.ts +++ b/packages/prettier-plugin-liquid/src/test/liquid-tag-cycle/index.spec.ts @@ -1,6 +1,5 @@ import { test } from 'vitest'; import { assertFormattedEqualsFixed } from '../test-helpers'; -import * as path from 'path'; test('Unit: liquid-tag-cycle', async () => { await assertFormattedEqualsFixed(__dirname); diff --git a/packages/prettier-plugin-liquid/src/test/liquid-tag-echo/index.spec.ts b/packages/prettier-plugin-liquid/src/test/liquid-tag-echo/index.spec.ts index 71ae494ea..e99e543bd 100644 --- a/packages/prettier-plugin-liquid/src/test/liquid-tag-echo/index.spec.ts +++ b/packages/prettier-plugin-liquid/src/test/liquid-tag-echo/index.spec.ts @@ -1,6 +1,5 @@ import { test } from 'vitest'; import { assertFormattedEqualsFixed } from '../test-helpers'; -import * as path from 'path'; test('Unit: liquid-tag-echo', async () => { await assertFormattedEqualsFixed(__dirname); diff --git a/packages/prettier-plugin-liquid/src/test/liquid-tag-else/index.spec.ts b/packages/prettier-plugin-liquid/src/test/liquid-tag-else/index.spec.ts index 775ca2934..e3ecf2e2d 100644 --- a/packages/prettier-plugin-liquid/src/test/liquid-tag-else/index.spec.ts +++ b/packages/prettier-plugin-liquid/src/test/liquid-tag-else/index.spec.ts @@ -1,6 +1,5 @@ import { test } from 'vitest'; import { assertFormattedEqualsFixed } from '../test-helpers'; -import * as path from 'path'; test('Unit: liquid-tag-else', async () => { await assertFormattedEqualsFixed(__dirname); diff --git a/packages/prettier-plugin-liquid/src/test/liquid-tag-elsif/index.spec.ts b/packages/prettier-plugin-liquid/src/test/liquid-tag-elsif/index.spec.ts index a4a7ed082..52c920026 100644 --- a/packages/prettier-plugin-liquid/src/test/liquid-tag-elsif/index.spec.ts +++ b/packages/prettier-plugin-liquid/src/test/liquid-tag-elsif/index.spec.ts @@ -1,6 +1,5 @@ import { test } from 'vitest'; import { assertFormattedEqualsFixed } from '../test-helpers'; -import * as path from 'path'; test('Unit: liquid-tag-elsif', async () => { await assertFormattedEqualsFixed(__dirname); diff --git a/packages/prettier-plugin-liquid/src/test/liquid-tag-for/index.spec.ts b/packages/prettier-plugin-liquid/src/test/liquid-tag-for/index.spec.ts index 7729f1043..ba97af53d 100644 --- a/packages/prettier-plugin-liquid/src/test/liquid-tag-for/index.spec.ts +++ b/packages/prettier-plugin-liquid/src/test/liquid-tag-for/index.spec.ts @@ -1,6 +1,5 @@ import { test } from 'vitest'; import { assertFormattedEqualsFixed } from '../test-helpers'; -import * as path from 'path'; test('Unit: liquid-tag-for', async () => { await assertFormattedEqualsFixed(__dirname); diff --git a/packages/prettier-plugin-liquid/src/test/liquid-tag-form/index.spec.ts b/packages/prettier-plugin-liquid/src/test/liquid-tag-form/index.spec.ts index 3eb3afa21..007f40cc5 100644 --- a/packages/prettier-plugin-liquid/src/test/liquid-tag-form/index.spec.ts +++ b/packages/prettier-plugin-liquid/src/test/liquid-tag-form/index.spec.ts @@ -1,6 +1,5 @@ import { test } from 'vitest'; import { assertFormattedEqualsFixed } from '../test-helpers'; -import * as path from 'path'; test('Unit: liquid-tag-form', async () => { await assertFormattedEqualsFixed(__dirname); diff --git a/packages/prettier-plugin-liquid/src/test/liquid-tag-if/index.spec.ts b/packages/prettier-plugin-liquid/src/test/liquid-tag-if/index.spec.ts index 5cb80e20c..7529ef782 100644 --- a/packages/prettier-plugin-liquid/src/test/liquid-tag-if/index.spec.ts +++ b/packages/prettier-plugin-liquid/src/test/liquid-tag-if/index.spec.ts @@ -1,6 +1,5 @@ import { test } from 'vitest'; import { assertFormattedEqualsFixed } from '../test-helpers'; -import * as path from 'path'; test('Unit: liquid-tag-if', async () => { await assertFormattedEqualsFixed(__dirname); diff --git a/packages/prettier-plugin-liquid/src/test/liquid-tag-increment/index.spec.ts b/packages/prettier-plugin-liquid/src/test/liquid-tag-increment/index.spec.ts index 24ceb152a..b3f7deed1 100644 --- a/packages/prettier-plugin-liquid/src/test/liquid-tag-increment/index.spec.ts +++ b/packages/prettier-plugin-liquid/src/test/liquid-tag-increment/index.spec.ts @@ -1,6 +1,5 @@ import { test } from 'vitest'; import { assertFormattedEqualsFixed } from '../test-helpers'; -import * as path from 'path'; test('Unit: liquid-tag-increment', async () => { await assertFormattedEqualsFixed(__dirname); diff --git a/packages/prettier-plugin-liquid/src/test/liquid-tag-layout/index.spec.ts b/packages/prettier-plugin-liquid/src/test/liquid-tag-layout/index.spec.ts index 2ca3ee17f..4a0ce6b89 100644 --- a/packages/prettier-plugin-liquid/src/test/liquid-tag-layout/index.spec.ts +++ b/packages/prettier-plugin-liquid/src/test/liquid-tag-layout/index.spec.ts @@ -1,6 +1,5 @@ import { test } from 'vitest'; import { assertFormattedEqualsFixed } from '../test-helpers'; -import * as path from 'path'; test('Unit: liquid-tag-layout', async () => { await assertFormattedEqualsFixed(__dirname); diff --git a/packages/prettier-plugin-liquid/src/test/liquid-tag-no-argument/index.spec.ts b/packages/prettier-plugin-liquid/src/test/liquid-tag-no-argument/index.spec.ts index 42ad1aa99..b96a86ad0 100644 --- a/packages/prettier-plugin-liquid/src/test/liquid-tag-no-argument/index.spec.ts +++ b/packages/prettier-plugin-liquid/src/test/liquid-tag-no-argument/index.spec.ts @@ -1,6 +1,5 @@ import { test } from 'vitest'; import { assertFormattedEqualsFixed } from '../test-helpers'; -import * as path from 'path'; test('Unit: liquid-tag-no-argument', async () => { await assertFormattedEqualsFixed(__dirname); diff --git a/packages/prettier-plugin-liquid/src/test/liquid-tag-paginate/index.spec.ts b/packages/prettier-plugin-liquid/src/test/liquid-tag-paginate/index.spec.ts index 07428c83a..61c995e0b 100644 --- a/packages/prettier-plugin-liquid/src/test/liquid-tag-paginate/index.spec.ts +++ b/packages/prettier-plugin-liquid/src/test/liquid-tag-paginate/index.spec.ts @@ -1,6 +1,5 @@ import { test } from 'vitest'; import { assertFormattedEqualsFixed } from '../test-helpers'; -import * as path from 'path'; test('Unit: liquid-tag-paginate', async () => { await assertFormattedEqualsFixed(__dirname); diff --git a/packages/prettier-plugin-liquid/src/test/liquid-tag-render/index.spec.ts b/packages/prettier-plugin-liquid/src/test/liquid-tag-render/index.spec.ts index 134dc70bd..300320259 100644 --- a/packages/prettier-plugin-liquid/src/test/liquid-tag-render/index.spec.ts +++ b/packages/prettier-plugin-liquid/src/test/liquid-tag-render/index.spec.ts @@ -1,6 +1,5 @@ import { test } from 'vitest'; import { assertFormattedEqualsFixed } from '../test-helpers'; -import * as path from 'path'; test('Unit: liquid-tag-render', async () => { await assertFormattedEqualsFixed(__dirname); diff --git a/packages/prettier-plugin-liquid/src/test/liquid-tag-section/index.spec.ts b/packages/prettier-plugin-liquid/src/test/liquid-tag-section/index.spec.ts index 26b264f1c..b6ea90187 100644 --- a/packages/prettier-plugin-liquid/src/test/liquid-tag-section/index.spec.ts +++ b/packages/prettier-plugin-liquid/src/test/liquid-tag-section/index.spec.ts @@ -1,6 +1,5 @@ import { test } from 'vitest'; import { assertFormattedEqualsFixed } from '../test-helpers'; -import * as path from 'path'; test('Unit: liquid-tag-section', async () => { await assertFormattedEqualsFixed(__dirname); diff --git a/packages/prettier-plugin-liquid/src/test/liquid-tag-sections/index.spec.ts b/packages/prettier-plugin-liquid/src/test/liquid-tag-sections/index.spec.ts index 6312f06cf..c00ea584f 100644 --- a/packages/prettier-plugin-liquid/src/test/liquid-tag-sections/index.spec.ts +++ b/packages/prettier-plugin-liquid/src/test/liquid-tag-sections/index.spec.ts @@ -1,6 +1,5 @@ import { test } from 'vitest'; import { assertFormattedEqualsFixed } from '../test-helpers'; -import * as path from 'path'; test('Unit: liquid-tag-sections', async () => { await assertFormattedEqualsFixed(__dirname); diff --git a/packages/prettier-plugin-liquid/src/test/liquid-tag-string-fallback/index.spec.ts b/packages/prettier-plugin-liquid/src/test/liquid-tag-string-fallback/index.spec.ts index 677f1b1b0..ee167300d 100644 --- a/packages/prettier-plugin-liquid/src/test/liquid-tag-string-fallback/index.spec.ts +++ b/packages/prettier-plugin-liquid/src/test/liquid-tag-string-fallback/index.spec.ts @@ -1,6 +1,5 @@ import { test } from 'vitest'; import { assertFormattedEqualsFixed } from '../test-helpers'; -import * as path from 'path'; test('Unit: liquid-tag-string-fallback', async () => { await assertFormattedEqualsFixed(__dirname); diff --git a/packages/prettier-plugin-liquid/src/test/liquid-tag-tablerow/index.spec.ts b/packages/prettier-plugin-liquid/src/test/liquid-tag-tablerow/index.spec.ts index 0d3500374..950f37e05 100644 --- a/packages/prettier-plugin-liquid/src/test/liquid-tag-tablerow/index.spec.ts +++ b/packages/prettier-plugin-liquid/src/test/liquid-tag-tablerow/index.spec.ts @@ -1,6 +1,5 @@ import { test } from 'vitest'; import { assertFormattedEqualsFixed } from '../test-helpers'; -import * as path from 'path'; test('Unit: liquid-tag-tablerow', async () => { await assertFormattedEqualsFixed(__dirname); diff --git a/packages/prettier-plugin-liquid/src/test/multiline-liquid/index.spec.ts b/packages/prettier-plugin-liquid/src/test/multiline-liquid/index.spec.ts index d124b3b63..5bde23a38 100644 --- a/packages/prettier-plugin-liquid/src/test/multiline-liquid/index.spec.ts +++ b/packages/prettier-plugin-liquid/src/test/multiline-liquid/index.spec.ts @@ -1,6 +1,5 @@ import { test } from 'vitest'; import { assertFormattedEqualsFixed } from '../test-helpers'; -import * as path from 'path'; test('Unit: multiline-liquid', async () => { await assertFormattedEqualsFixed(__dirname); diff --git a/packages/prettier-plugin-liquid/src/test/prettier-ignore-attribute/index.spec.ts b/packages/prettier-plugin-liquid/src/test/prettier-ignore-attribute/index.spec.ts index f327c4314..b694f88f2 100644 --- a/packages/prettier-plugin-liquid/src/test/prettier-ignore-attribute/index.spec.ts +++ b/packages/prettier-plugin-liquid/src/test/prettier-ignore-attribute/index.spec.ts @@ -1,6 +1,5 @@ import { test } from 'vitest'; import { assertFormattedEqualsFixed } from '../test-helpers'; -import * as path from 'path'; test('Unit: prettier-ignore-attribute', async () => { await assertFormattedEqualsFixed(__dirname); diff --git a/packages/prettier-plugin-liquid/src/test/pure-liquid/index.spec.ts b/packages/prettier-plugin-liquid/src/test/pure-liquid/index.spec.ts index af754c246..9bd4fd8c9 100644 --- a/packages/prettier-plugin-liquid/src/test/pure-liquid/index.spec.ts +++ b/packages/prettier-plugin-liquid/src/test/pure-liquid/index.spec.ts @@ -1,6 +1,5 @@ import { test } from 'vitest'; import { assertFormattedEqualsFixed } from '../test-helpers'; -import * as path from 'path'; test('Unit: pure-liquid', async () => { await assertFormattedEqualsFixed(__dirname); diff --git a/packages/prettier-plugin-liquid/src/test/svg/index.spec.ts b/packages/prettier-plugin-liquid/src/test/svg/index.spec.ts index c2331c6de..ea91cf825 100644 --- a/packages/prettier-plugin-liquid/src/test/svg/index.spec.ts +++ b/packages/prettier-plugin-liquid/src/test/svg/index.spec.ts @@ -1,6 +1,5 @@ import { test } from 'vitest'; import { assertFormattedEqualsFixed } from '../test-helpers'; -import * as path from 'path'; test('Unit: svg', async () => { await assertFormattedEqualsFixed(__dirname); diff --git a/packages/prettier-plugin-liquid/src/test/test-helpers.ts b/packages/prettier-plugin-liquid/src/test/test-helpers.ts index 1cb517ea5..9354d4ac4 100644 --- a/packages/prettier-plugin-liquid/src/test/test-helpers.ts +++ b/packages/prettier-plugin-liquid/src/test/test-helpers.ts @@ -1,9 +1,9 @@ -import { expect } from 'vitest'; -import * as path from 'path'; import * as fs from 'fs'; +import * as path from 'path'; import * as prettier from 'prettier'; -import plugin from '../plugin'; +import { expect } from 'vitest'; import { parse } from '../parser'; +import plugin from '../plugin'; import { preprocess } from '../printer/print-preprocess'; import { DocumentNode, LiquidParserOptions } from '../types'; diff --git a/packages/prettier-plugin-liquid/src/test/trailing-whitespace-inside-block/index.spec.ts b/packages/prettier-plugin-liquid/src/test/trailing-whitespace-inside-block/index.spec.ts index ae4224227..10e41396e 100644 --- a/packages/prettier-plugin-liquid/src/test/trailing-whitespace-inside-block/index.spec.ts +++ b/packages/prettier-plugin-liquid/src/test/trailing-whitespace-inside-block/index.spec.ts @@ -1,6 +1,5 @@ import { test } from 'vitest'; import { assertFormattedEqualsFixed } from '../test-helpers'; -import * as path from 'path'; test('Unit: trailing-whitespace-inside-block', async () => { await assertFormattedEqualsFixed(__dirname); diff --git a/packages/prettier-plugin-liquid/src/test/trailing-whitespace-inside-default-branch/index.spec.ts b/packages/prettier-plugin-liquid/src/test/trailing-whitespace-inside-default-branch/index.spec.ts index 82255c667..11dbbe7bf 100644 --- a/packages/prettier-plugin-liquid/src/test/trailing-whitespace-inside-default-branch/index.spec.ts +++ b/packages/prettier-plugin-liquid/src/test/trailing-whitespace-inside-default-branch/index.spec.ts @@ -1,6 +1,5 @@ import { test } from 'vitest'; import { assertFormattedEqualsFixed } from '../test-helpers'; -import * as path from 'path'; test('Unit: trailing-whitespace-inside-default-branch', async () => { await assertFormattedEqualsFixed(__dirname); diff --git a/packages/prettier-plugin-liquid/src/test/trailing-whitespace-inside-named-branch/index.spec.ts b/packages/prettier-plugin-liquid/src/test/trailing-whitespace-inside-named-branch/index.spec.ts index 297fafa15..f5dd43b70 100644 --- a/packages/prettier-plugin-liquid/src/test/trailing-whitespace-inside-named-branch/index.spec.ts +++ b/packages/prettier-plugin-liquid/src/test/trailing-whitespace-inside-named-branch/index.spec.ts @@ -1,6 +1,5 @@ import { test } from 'vitest'; import { assertFormattedEqualsFixed } from '../test-helpers'; -import * as path from 'path'; test('Unit: trailing-whitespace-inside-named-branch', async () => { await assertFormattedEqualsFixed(__dirname); diff --git a/packages/prettier-plugin-liquid/src/test/unit-paragraphs/index.spec.ts b/packages/prettier-plugin-liquid/src/test/unit-paragraphs/index.spec.ts index a94dfc15a..3ba382ef8 100644 --- a/packages/prettier-plugin-liquid/src/test/unit-paragraphs/index.spec.ts +++ b/packages/prettier-plugin-liquid/src/test/unit-paragraphs/index.spec.ts @@ -1,6 +1,5 @@ import { test } from 'vitest'; import { assertFormattedEqualsFixed } from '../test-helpers'; -import * as path from 'path'; test('Unit: unit-paragraphs', async () => { await assertFormattedEqualsFixed(__dirname); diff --git a/packages/prettier-plugin-liquid/src/test/whitespace-breaking-logic-between-liquid-and-text-nodes/index.spec.ts b/packages/prettier-plugin-liquid/src/test/whitespace-breaking-logic-between-liquid-and-text-nodes/index.spec.ts index 6f74e85c8..0a626213e 100644 --- a/packages/prettier-plugin-liquid/src/test/whitespace-breaking-logic-between-liquid-and-text-nodes/index.spec.ts +++ b/packages/prettier-plugin-liquid/src/test/whitespace-breaking-logic-between-liquid-and-text-nodes/index.spec.ts @@ -1,6 +1,5 @@ import { test } from 'vitest'; import { assertFormattedEqualsFixed } from '../test-helpers'; -import * as path from 'path'; test('Unit: whitespace-breaking-logic-between-liquid-and-text-nodes', async () => { await assertFormattedEqualsFixed(__dirname); diff --git a/packages/prettier-plugin-liquid/src/test/whitespace-trim-on-liquid-block-break/index.spec.ts b/packages/prettier-plugin-liquid/src/test/whitespace-trim-on-liquid-block-break/index.spec.ts index 3bc0657ae..5300b8123 100644 --- a/packages/prettier-plugin-liquid/src/test/whitespace-trim-on-liquid-block-break/index.spec.ts +++ b/packages/prettier-plugin-liquid/src/test/whitespace-trim-on-liquid-block-break/index.spec.ts @@ -1,6 +1,5 @@ import { test } from 'vitest'; import { assertFormattedEqualsFixed } from '../test-helpers'; -import * as path from 'path'; test('Unit: whitespace-trim-on-liquid-block-break', async () => { await assertFormattedEqualsFixed(__dirname); diff --git a/packages/prettier-plugin-liquid/src/test/whitespace-trim-on-liquid-drop-break/index.spec.ts b/packages/prettier-plugin-liquid/src/test/whitespace-trim-on-liquid-drop-break/index.spec.ts index 86a555b6d..577be19b4 100644 --- a/packages/prettier-plugin-liquid/src/test/whitespace-trim-on-liquid-drop-break/index.spec.ts +++ b/packages/prettier-plugin-liquid/src/test/whitespace-trim-on-liquid-drop-break/index.spec.ts @@ -1,6 +1,5 @@ import { test } from 'vitest'; import { assertFormattedEqualsFixed } from '../test-helpers'; -import * as path from 'path'; test('Unit: whitespace-trim-on-liquid-drop-break', async () => { await assertFormattedEqualsFixed(__dirname); diff --git a/packages/prettier-plugin-liquid/src/test/whitespace-trim-on-liquid-tag-break/index.spec.ts b/packages/prettier-plugin-liquid/src/test/whitespace-trim-on-liquid-tag-break/index.spec.ts index 742cf9d4a..a5a5d3813 100644 --- a/packages/prettier-plugin-liquid/src/test/whitespace-trim-on-liquid-tag-break/index.spec.ts +++ b/packages/prettier-plugin-liquid/src/test/whitespace-trim-on-liquid-tag-break/index.spec.ts @@ -1,6 +1,5 @@ import { test } from 'vitest'; import { assertFormattedEqualsFixed } from '../test-helpers'; -import * as path from 'path'; test('Unit: whitespace-trim-on-liquid-tag-break', async () => { await assertFormattedEqualsFixed(__dirname); diff --git a/packages/prettier-plugin-liquid/src/test/yaml-frontmatter/index.spec.ts b/packages/prettier-plugin-liquid/src/test/yaml-frontmatter/index.spec.ts index 2784aae45..5748acc88 100644 --- a/packages/prettier-plugin-liquid/src/test/yaml-frontmatter/index.spec.ts +++ b/packages/prettier-plugin-liquid/src/test/yaml-frontmatter/index.spec.ts @@ -1,6 +1,5 @@ import { test } from 'vitest'; import { assertFormattedEqualsFixed } from '../test-helpers'; -import * as path from 'path'; test('Unit: yaml-frontmatter', async () => { await assertFormattedEqualsFixed(__dirname); diff --git a/packages/prettier-plugin-liquid/src/types.ts b/packages/prettier-plugin-liquid/src/types.ts index f4e61a216..761cdb7a9 100644 --- a/packages/prettier-plugin-liquid/src/types.ts +++ b/packages/prettier-plugin-liquid/src/types.ts @@ -1,7 +1,7 @@ -import { Doc } from 'prettier'; +import * as AST from '@shopify/liquid-html-parser'; import type { AstPath } from 'prettier'; +import { Doc } from 'prettier'; import type { ParserOptions as ParserOptions3 } from 'prettier3'; -import * as AST from '@shopify/liquid-html-parser'; export type CommonKeys = Extract; export type { AstPath }; diff --git a/packages/release-orchestrator/src/steps/changeset.spec.ts b/packages/release-orchestrator/src/steps/changeset.spec.ts index 9e02af2d0..9eb5deaeb 100644 --- a/packages/release-orchestrator/src/steps/changeset.spec.ts +++ b/packages/release-orchestrator/src/steps/changeset.spec.ts @@ -1,9 +1,9 @@ import path from 'path'; -import { expect, it, describe, afterEach, afterAll, vi, Mock } from 'vitest'; +import { afterAll, afterEach, describe, expect, it, Mock, vi } from 'vitest'; +import { getRepoRoot, readFile, run } from '../utils'; import { changesetStatus } from './changesetStatus'; import { changesetTag } from './changesetTag'; import { changesetVersion } from './changesetVersion'; -import { getRepoRoot, readFile, run } from '../utils'; vi.mock('../utils', async () => ({ getRepoRoot: vi.fn(), diff --git a/packages/release-orchestrator/src/steps/changesetStatus.ts b/packages/release-orchestrator/src/steps/changesetStatus.ts index 2d698c5fd..7fe494c06 100644 --- a/packages/release-orchestrator/src/steps/changesetStatus.ts +++ b/packages/release-orchestrator/src/steps/changesetStatus.ts @@ -1,6 +1,6 @@ import path from 'path'; import type { ChangesetStatus } from '../types'; -import { run, getRepoRoot, readFile } from '../utils'; +import { getRepoRoot, readFile, run } from '../utils'; export const changesetStatus = async (): Promise => { const basefile = `changeset-status.json`; diff --git a/packages/release-orchestrator/src/steps/generatePatchChangeset.spec.ts b/packages/release-orchestrator/src/steps/generatePatchChangeset.spec.ts index 08f45fde8..1425db90e 100644 --- a/packages/release-orchestrator/src/steps/generatePatchChangeset.spec.ts +++ b/packages/release-orchestrator/src/steps/generatePatchChangeset.spec.ts @@ -1,8 +1,8 @@ -import { expect, it, describe, afterEach, afterAll, vi, Mock } from 'vitest'; import fs from 'fs/promises'; import path from 'path'; -import { generatePatchChangeset } from './generatePatchChangeset'; +import { afterAll, afterEach, describe, expect, it, Mock, vi } from 'vitest'; import { getRepoRoot } from '../utils'; +import { generatePatchChangeset } from './generatePatchChangeset'; // Need to do this for stupid windows paths const repoPathTokens = ['path', 'to', 'repo']; diff --git a/packages/release-orchestrator/src/steps/generatePatchChangeset.ts b/packages/release-orchestrator/src/steps/generatePatchChangeset.ts index f56b3fc07..d23cdf11e 100644 --- a/packages/release-orchestrator/src/steps/generatePatchChangeset.ts +++ b/packages/release-orchestrator/src/steps/generatePatchChangeset.ts @@ -1,7 +1,7 @@ import fs from 'fs/promises'; import path from 'path'; -import { getRepoRoot, getRandomId } from '../utils'; +import { getRandomId, getRepoRoot } from '../utils'; /** * Generate a patch changeset for a package. diff --git a/packages/release-orchestrator/src/steps/getPackageJsonRecord.spec.ts b/packages/release-orchestrator/src/steps/getPackageJsonRecord.spec.ts index 7afba9a8c..b67bcd6d3 100644 --- a/packages/release-orchestrator/src/steps/getPackageJsonRecord.spec.ts +++ b/packages/release-orchestrator/src/steps/getPackageJsonRecord.spec.ts @@ -1,5 +1,5 @@ -import { expect, it, describe, afterEach, afterAll, vi, Mock } from 'vitest'; import fs from 'fs/promises'; +import { afterAll, afterEach, describe, expect, it, Mock, vi } from 'vitest'; import { getPackageJsonRecord } from './getPackageJsonRecord'; // import { promisify } from 'node:util'; diff --git a/packages/release-orchestrator/src/steps/writeDependentPatchChangesets.spec.ts b/packages/release-orchestrator/src/steps/writeDependentPatchChangesets.spec.ts index 0fe502bd7..e0dc8da2c 100644 --- a/packages/release-orchestrator/src/steps/writeDependentPatchChangesets.spec.ts +++ b/packages/release-orchestrator/src/steps/writeDependentPatchChangesets.spec.ts @@ -1,7 +1,7 @@ -import { expect, it, describe, afterEach, afterAll, vi, Mock } from 'vitest'; -import { writeDependentPatchChangesets } from './writeDependentPatchChangesets'; +import { afterAll, afterEach, describe, expect, it, Mock, vi } from 'vitest'; import { changesetStatus } from './changesetStatus'; import { generatePatchChangeset } from './generatePatchChangeset'; +import { writeDependentPatchChangesets } from './writeDependentPatchChangesets'; vi.mock('./changesetStatus', async () => ({ changesetStatus: vi.fn(), diff --git a/packages/release-orchestrator/src/steps/writeDependentPatchChangesets.ts b/packages/release-orchestrator/src/steps/writeDependentPatchChangesets.ts index 4f973c69d..7d488aa38 100644 --- a/packages/release-orchestrator/src/steps/writeDependentPatchChangesets.ts +++ b/packages/release-orchestrator/src/steps/writeDependentPatchChangesets.ts @@ -1,6 +1,6 @@ +import type { ChangesetStatus, PackageJsonRecord } from '../types'; import { changesetStatus } from './changesetStatus'; import { generatePatchChangeset } from './generatePatchChangeset'; -import type { ChangesetStatus, PackageJsonRecord } from '../types'; /** * Creates patch changesets for all packages that depend on the updated packages diff --git a/packages/release-orchestrator/src/utils.spec.ts b/packages/release-orchestrator/src/utils.spec.ts index f89ba64c5..cbb8f5019 100644 --- a/packages/release-orchestrator/src/utils.spec.ts +++ b/packages/release-orchestrator/src/utils.spec.ts @@ -1,4 +1,4 @@ -import { expect, it, describe, afterEach, afterAll, vi } from 'vitest'; +import { afterAll, afterEach, describe, expect, it, vi } from 'vitest'; import { flow, memoize } from './utils'; vi.stubGlobal('console', { diff --git a/packages/theme-check-browser/src/index.spec.ts b/packages/theme-check-browser/src/index.spec.ts index 1f0a2a61c..9eb06c5fb 100644 --- a/packages/theme-check-browser/src/index.spec.ts +++ b/packages/theme-check-browser/src/index.spec.ts @@ -1,4 +1,4 @@ -import { expect, describe, it } from 'vitest'; +import { describe, expect, it } from 'vitest'; import { toSourceCode } from './index'; describe('Module: toSourceCode', () => { diff --git a/packages/theme-check-browser/src/index.ts b/packages/theme-check-browser/src/index.ts index a38dbd431..43efbe01b 100644 --- a/packages/theme-check-browser/src/index.ts +++ b/packages/theme-check-browser/src/index.ts @@ -1,30 +1,30 @@ import { + AbstractFileSystem, Config, + Dependencies, + FileStat, + FileTuple, + FileType, JSONSourceCode, LiquidSourceCode, Offense, Theme, allChecks, check as coreCheck, - toSourceCode, recommended, - Dependencies, - AbstractFileSystem, - FileStat, - FileTuple, - FileType, + toSourceCode, } from '@shopify/theme-check-common'; export { - toSourceCode, - allChecks, - recommended, + AbstractFileSystem, Config, Dependencies, - AbstractFileSystem, FileStat, FileTuple, FileType, + allChecks, + recommended, + toSourceCode, }; /** diff --git a/packages/theme-check-common/src/AugmentedThemeDocset.spec.ts b/packages/theme-check-common/src/AugmentedThemeDocset.spec.ts index 80b6c12d3..021142d04 100644 --- a/packages/theme-check-common/src/AugmentedThemeDocset.spec.ts +++ b/packages/theme-check-common/src/AugmentedThemeDocset.spec.ts @@ -1,4 +1,4 @@ -import { describe, beforeEach, it, expect } from 'vitest'; +import { beforeEach, describe, expect, it } from 'vitest'; import { AugmentedThemeDocset } from './AugmentedThemeDocset'; import { ThemeDocset } from './types'; diff --git a/packages/theme-check-common/src/AugmentedThemeDocset.ts b/packages/theme-check-common/src/AugmentedThemeDocset.ts index b168b8335..1ece96f65 100644 --- a/packages/theme-check-common/src/AugmentedThemeDocset.ts +++ b/packages/theme-check-common/src/AugmentedThemeDocset.ts @@ -2,10 +2,10 @@ import { Access, FilterEntry, ObjectEntry, + ReturnType, TagEntry, ThemeDocset, Translations, - ReturnType, } from './types'; import { memo } from './utils'; diff --git a/packages/theme-check-common/src/checks/app-block-valid-tags/index.spec.ts b/packages/theme-check-common/src/checks/app-block-valid-tags/index.spec.ts index 8d87f9c76..5af034dfb 100644 --- a/packages/theme-check-common/src/checks/app-block-valid-tags/index.spec.ts +++ b/packages/theme-check-common/src/checks/app-block-valid-tags/index.spec.ts @@ -1,6 +1,6 @@ -import { describe, it, expect } from 'vitest'; +import { describe, expect, it } from 'vitest'; import { runLiquidCheck } from '../../test'; -import { ForbiddenTag, AppBlockValidTags } from './index'; +import { AppBlockValidTags, ForbiddenTag } from './index'; const blocksFilePath = 'blocks/app.liquid'; diff --git a/packages/theme-check-common/src/checks/asset-preload/index.spec.ts b/packages/theme-check-common/src/checks/asset-preload/index.spec.ts index a9f8b4494..a959ee77f 100644 --- a/packages/theme-check-common/src/checks/asset-preload/index.spec.ts +++ b/packages/theme-check-common/src/checks/asset-preload/index.spec.ts @@ -1,5 +1,5 @@ -import { describe, it, expect } from 'vitest'; -import { runLiquidCheck, highlightedOffenses } from '../../test'; +import { describe, expect, it } from 'vitest'; +import { highlightedOffenses, runLiquidCheck } from '../../test'; import { AssetPreload } from './index'; describe('Module: AssetPreload', () => { diff --git a/packages/theme-check-common/src/checks/asset-size-app-block-javascript/index.ts b/packages/theme-check-common/src/checks/asset-size-app-block-javascript/index.ts index 5abed7170..2b7e74d38 100644 --- a/packages/theme-check-common/src/checks/asset-size-app-block-javascript/index.ts +++ b/packages/theme-check-common/src/checks/asset-size-app-block-javascript/index.ts @@ -7,7 +7,7 @@ import { SourceCodeType, } from '../../types'; import { isError } from '../../utils'; -import { doesFileExist, doesFileExceedThreshold } from '../../utils/file-utils'; +import { doesFileExceedThreshold, doesFileExist } from '../../utils/file-utils'; const schema = { thresholdInBytes: SchemaProp.number(10000), diff --git a/packages/theme-check-common/src/checks/asset-size-css/index.spec.ts b/packages/theme-check-common/src/checks/asset-size-css/index.spec.ts index eb4382ae0..5845b3470 100644 --- a/packages/theme-check-common/src/checks/asset-size-css/index.spec.ts +++ b/packages/theme-check-common/src/checks/asset-size-css/index.spec.ts @@ -1,7 +1,6 @@ -import { vi, expect, describe, it, afterEach } from 'vitest'; +import { afterEach, describe, expect, it, vi } from 'vitest'; import { AssetSizeCSS } from '.'; import { check, MockTheme } from '../../test'; -import { SchemaProp } from '../../types'; import { hasRemoteAssetSizeExceededThreshold } from '../../utils/file-utils'; vi.mock('../../utils/file-utils', async (importOriginal) => { diff --git a/packages/theme-check-common/src/checks/asset-size-css/index.ts b/packages/theme-check-common/src/checks/asset-size-css/index.ts index 93796effd..4b93fec52 100644 --- a/packages/theme-check-common/src/checks/asset-size-css/index.ts +++ b/packages/theme-check-common/src/checks/asset-size-css/index.ts @@ -9,8 +9,8 @@ import { import { LiquidCheckDefinition, SchemaProp, Severity, SourceCodeType } from '../../types'; import { last } from '../../utils'; import { - hasRemoteAssetSizeExceededThreshold, hasLocalAssetSizeExceededThreshold, + hasRemoteAssetSizeExceededThreshold, } from '../../utils/file-utils'; import { ValuedHtmlAttribute, diff --git a/packages/theme-check-common/src/checks/asset-size-javascript/index.spec.ts b/packages/theme-check-common/src/checks/asset-size-javascript/index.spec.ts index 36bb3f230..42269dff9 100644 --- a/packages/theme-check-common/src/checks/asset-size-javascript/index.spec.ts +++ b/packages/theme-check-common/src/checks/asset-size-javascript/index.spec.ts @@ -1,7 +1,6 @@ -import { expect, describe, it, afterEach, vi } from 'vitest'; +import { afterEach, describe, expect, it, vi } from 'vitest'; import { AssetSizeJavaScript } from '.'; import { check, MockTheme } from '../../test'; -import { SchemaProp } from '../../types'; import { hasRemoteAssetSizeExceededThreshold } from '../../utils/file-utils'; vi.mock('../../utils/file-utils', async (importOriginal) => { diff --git a/packages/theme-check-common/src/checks/asset-size-javascript/index.ts b/packages/theme-check-common/src/checks/asset-size-javascript/index.ts index f75d4e75e..3bbc70ba3 100644 --- a/packages/theme-check-common/src/checks/asset-size-javascript/index.ts +++ b/packages/theme-check-common/src/checks/asset-size-javascript/index.ts @@ -14,8 +14,8 @@ import { } from '../../types'; import { last } from '../../utils'; import { - hasRemoteAssetSizeExceededThreshold, hasLocalAssetSizeExceededThreshold, + hasRemoteAssetSizeExceededThreshold, } from '../../utils/file-utils'; import { ValuedHtmlAttribute, isAttr, isNodeOfType, isValuedHtmlAttribute } from '../utils'; diff --git a/packages/theme-check-common/src/checks/block-id-usage/index.spec.ts b/packages/theme-check-common/src/checks/block-id-usage/index.spec.ts index cb9efa08d..06903d9a5 100644 --- a/packages/theme-check-common/src/checks/block-id-usage/index.spec.ts +++ b/packages/theme-check-common/src/checks/block-id-usage/index.spec.ts @@ -1,4 +1,4 @@ -import { expect, describe, it } from 'vitest'; +import { describe, expect, it } from 'vitest'; import { highlightedOffenses, runLiquidCheck } from '../../test'; import { BlockIdUsage } from './index'; diff --git a/packages/theme-check-common/src/checks/block-id-usage/index.ts b/packages/theme-check-common/src/checks/block-id-usage/index.ts index 8c0c97d29..05a501a4a 100644 --- a/packages/theme-check-common/src/checks/block-id-usage/index.ts +++ b/packages/theme-check-common/src/checks/block-id-usage/index.ts @@ -1,10 +1,5 @@ -import { - Position, - LiquidTagNode, - NodeTypes, - LiquidVariableLookup, -} from '@shopify/liquid-html-parser'; -import { Context, LiquidCheckDefinition, Severity, SourceCodeType } from '../../types'; +import { LiquidVariableLookup, NodeTypes, Position } from '@shopify/liquid-html-parser'; +import { LiquidCheckDefinition, Severity, SourceCodeType } from '../../types'; export const BlockIdUsage: LiquidCheckDefinition = { meta: { diff --git a/packages/theme-check-common/src/checks/cdn-preconnect/index.spec.ts b/packages/theme-check-common/src/checks/cdn-preconnect/index.spec.ts index 2832b4cdb..d0f7dba95 100644 --- a/packages/theme-check-common/src/checks/cdn-preconnect/index.spec.ts +++ b/packages/theme-check-common/src/checks/cdn-preconnect/index.spec.ts @@ -1,4 +1,4 @@ -import { expect, describe, it } from 'vitest'; +import { describe, expect, it } from 'vitest'; import { runLiquidCheck } from '../../test'; import { CdnPreconnect } from './index'; diff --git a/packages/theme-check-common/src/checks/cdn-preconnect/index.ts b/packages/theme-check-common/src/checks/cdn-preconnect/index.ts index 0bb04972a..758c3bc35 100644 --- a/packages/theme-check-common/src/checks/cdn-preconnect/index.ts +++ b/packages/theme-check-common/src/checks/cdn-preconnect/index.ts @@ -1,4 +1,4 @@ -import { Severity, SourceCodeType, LiquidCheckDefinition } from '../../types'; +import { LiquidCheckDefinition, Severity, SourceCodeType } from '../../types'; import { isAttr, isValuedHtmlAttribute, valueIncludes } from '../utils'; export const CdnPreconnect: LiquidCheckDefinition = { diff --git a/packages/theme-check-common/src/checks/content-for-header-modification/index.spec.ts b/packages/theme-check-common/src/checks/content-for-header-modification/index.spec.ts index 55bf67827..c797df1df 100644 --- a/packages/theme-check-common/src/checks/content-for-header-modification/index.spec.ts +++ b/packages/theme-check-common/src/checks/content-for-header-modification/index.spec.ts @@ -1,4 +1,4 @@ -import { expect, describe, it } from 'vitest'; +import { describe, expect, it } from 'vitest'; import { highlightedOffenses, runLiquidCheck } from '../../test'; import { ContentForHeaderModification } from './index'; diff --git a/packages/theme-check-common/src/checks/deprecate-bgsizes/index.spec.ts b/packages/theme-check-common/src/checks/deprecate-bgsizes/index.spec.ts index 9668fa894..b34847a5c 100644 --- a/packages/theme-check-common/src/checks/deprecate-bgsizes/index.spec.ts +++ b/packages/theme-check-common/src/checks/deprecate-bgsizes/index.spec.ts @@ -1,6 +1,6 @@ -import { expect, describe, it } from 'vitest'; +import { describe, expect, it } from 'vitest'; +import { highlightedOffenses, runLiquidCheck } from '../../test'; import { DeprecateBgsizes } from './index'; -import { runLiquidCheck, highlightedOffenses } from '../../test'; describe('Module: DeprecateBgsizes', () => { it('should report offenses for deprecated attributes', async () => { diff --git a/packages/theme-check-common/src/checks/deprecate-bgsizes/index.ts b/packages/theme-check-common/src/checks/deprecate-bgsizes/index.ts index fa5628e0c..36979d961 100644 --- a/packages/theme-check-common/src/checks/deprecate-bgsizes/index.ts +++ b/packages/theme-check-common/src/checks/deprecate-bgsizes/index.ts @@ -1,4 +1,4 @@ -import { Severity, SourceCodeType, LiquidCheckDefinition } from '../../types'; +import { LiquidCheckDefinition, Severity, SourceCodeType } from '../../types'; import { isAttr, isValuedHtmlAttribute, ValuedHtmlAttribute, valueIncludes } from '../utils'; export const DeprecateBgsizes: LiquidCheckDefinition = { diff --git a/packages/theme-check-common/src/checks/deprecate-lazysizes/index.spec.ts b/packages/theme-check-common/src/checks/deprecate-lazysizes/index.spec.ts index 16287d801..434418ae5 100644 --- a/packages/theme-check-common/src/checks/deprecate-lazysizes/index.spec.ts +++ b/packages/theme-check-common/src/checks/deprecate-lazysizes/index.spec.ts @@ -1,4 +1,4 @@ -import { expect, describe, it } from 'vitest'; +import { describe, expect, it } from 'vitest'; import { runLiquidCheck } from '../../test'; import { DeprecateLazysizes } from './index'; diff --git a/packages/theme-check-common/src/checks/deprecate-lazysizes/index.ts b/packages/theme-check-common/src/checks/deprecate-lazysizes/index.ts index 783582d32..d2c13e1b9 100644 --- a/packages/theme-check-common/src/checks/deprecate-lazysizes/index.ts +++ b/packages/theme-check-common/src/checks/deprecate-lazysizes/index.ts @@ -1,9 +1,9 @@ -import { Severity, SourceCodeType, LiquidCheckDefinition } from '../../types'; +import { LiquidCheckDefinition, Severity, SourceCodeType } from '../../types'; import { ValuedHtmlAttribute, isAttr, - isValuedHtmlAttribute, isHtmlAttribute, + isValuedHtmlAttribute, valueIncludes, } from '../utils'; diff --git a/packages/theme-check-common/src/checks/deprecated-filter/index.spec.ts b/packages/theme-check-common/src/checks/deprecated-filter/index.spec.ts index cc970ed3e..e8f19056b 100644 --- a/packages/theme-check-common/src/checks/deprecated-filter/index.spec.ts +++ b/packages/theme-check-common/src/checks/deprecated-filter/index.spec.ts @@ -1,7 +1,7 @@ -import { expect, describe, it } from 'vitest'; -import { highlightedOffenses, applySuggestions, runLiquidCheck, applyFix } from '../../test'; -import { DeprecatedFilter } from './index'; +import { describe, expect, it } from 'vitest'; +import { applyFix, applySuggestions, highlightedOffenses, runLiquidCheck } from '../../test'; import { Offense } from '../../types'; +import { DeprecatedFilter } from './index'; describe('Module: DeprecatedFilter', () => { it('should report an offense when a deprecated filter is used', async () => { diff --git a/packages/theme-check-common/src/checks/deprecated-filter/index.ts b/packages/theme-check-common/src/checks/deprecated-filter/index.ts index ffe3622f8..051b31187 100644 --- a/packages/theme-check-common/src/checks/deprecated-filter/index.ts +++ b/packages/theme-check-common/src/checks/deprecated-filter/index.ts @@ -1,11 +1,11 @@ import { LiquidFilter } from '@shopify/liquid-html-parser'; import { - Severity, - SourceCodeType, - LiquidCheckDefinition, - LiquidHtmlSuggestion, FilterEntry, Fixer, + LiquidCheckDefinition, + LiquidHtmlSuggestion, + Severity, + SourceCodeType, } from '../../types'; import { fixHexToRgba, suggestImageUrlFix, suggestImgTagFix, suggestImgUrlFix } from './fixes'; diff --git a/packages/theme-check-common/src/checks/deprecated-fonts-on-sections-and-blocks/index.spec.ts b/packages/theme-check-common/src/checks/deprecated-fonts-on-sections-and-blocks/index.spec.ts index fa8b10f18..897d9407e 100644 --- a/packages/theme-check-common/src/checks/deprecated-fonts-on-sections-and-blocks/index.spec.ts +++ b/packages/theme-check-common/src/checks/deprecated-fonts-on-sections-and-blocks/index.spec.ts @@ -1,5 +1,5 @@ -import { expect, describe, it } from 'vitest'; -import { highlightedOffenses, runLiquidCheck, check, MockTheme } from '../../test'; +import { describe, expect, it } from 'vitest'; +import { check, highlightedOffenses, MockTheme, runLiquidCheck } from '../../test'; import { DeprecatedFontsOnSectionsAndBlocks } from './index'; const DEFAULT_FILE_NAME = 'sections/file.liquid'; diff --git a/packages/theme-check-common/src/checks/deprecated-fonts-on-sections-and-blocks/index.ts b/packages/theme-check-common/src/checks/deprecated-fonts-on-sections-and-blocks/index.ts index f695c72c1..7d39a1743 100644 --- a/packages/theme-check-common/src/checks/deprecated-fonts-on-sections-and-blocks/index.ts +++ b/packages/theme-check-common/src/checks/deprecated-fonts-on-sections-and-blocks/index.ts @@ -1,17 +1,17 @@ +import { getLocEnd, getLocStart, nodeAtPath } from '../../json'; import { getSchema } from '../../to-schema'; import { + ArrayNode, + Context, JSONNode, LiquidCheckDefinition, + Preset, Section, - Severity, Setting, - Preset, + Severity, SourceCodeType, ThemeBlock, - Context, - ArrayNode, } from '../../types'; -import { getLocEnd, getLocStart, nodeAtPath } from '../../json'; import { DEPRECATED_FONT_HANDLES } from './deprecated-fonts-data'; export const DeprecatedFontsOnSectionsAndBlocks: LiquidCheckDefinition = { diff --git a/packages/theme-check-common/src/checks/deprecated-fonts-on-settings-data/index.spec.ts b/packages/theme-check-common/src/checks/deprecated-fonts-on-settings-data/index.spec.ts index 648036631..cbd47247f 100644 --- a/packages/theme-check-common/src/checks/deprecated-fonts-on-settings-data/index.spec.ts +++ b/packages/theme-check-common/src/checks/deprecated-fonts-on-settings-data/index.spec.ts @@ -1,6 +1,6 @@ -import { describe, it, expect } from 'vitest'; -import { DeprecatedFontsOnSettingsData } from './index'; +import { describe, expect, it } from 'vitest'; import { runJSONCheck } from '../../test'; +import { DeprecatedFontsOnSettingsData } from './index'; describe('Module: DeprecatedFontsOnSettingsData', () => { it('reports a warning when settings_data.json has a deprecated font in current settings', async () => { diff --git a/packages/theme-check-common/src/checks/deprecated-fonts-on-settings-data/index.ts b/packages/theme-check-common/src/checks/deprecated-fonts-on-settings-data/index.ts index 27bf6d335..effd7615a 100644 --- a/packages/theme-check-common/src/checks/deprecated-fonts-on-settings-data/index.ts +++ b/packages/theme-check-common/src/checks/deprecated-fonts-on-settings-data/index.ts @@ -1,5 +1,5 @@ +import { getLocEnd, getLocStart } from '../../json'; import { JSONCheckDefinition, Severity, SourceCodeType } from '../../types'; -import { getLocStart, getLocEnd } from '../../json'; import { DEPRECATED_FONT_HANDLES } from '../deprecated-fonts-on-sections-and-blocks/deprecated-fonts-data'; export const DeprecatedFontsOnSettingsData: JSONCheckDefinition = { diff --git a/packages/theme-check-common/src/checks/deprecated-fonts-on-settings-schema/index.spec.ts b/packages/theme-check-common/src/checks/deprecated-fonts-on-settings-schema/index.spec.ts index 71bc4a1a4..13e41f76c 100644 --- a/packages/theme-check-common/src/checks/deprecated-fonts-on-settings-schema/index.spec.ts +++ b/packages/theme-check-common/src/checks/deprecated-fonts-on-settings-schema/index.spec.ts @@ -1,6 +1,6 @@ -import { describe, it, expect } from 'vitest'; -import { DeprecatedFontsOnSettingsSchema } from './index'; +import { describe, expect, it } from 'vitest'; import { runJSONCheck } from '../../test'; +import { DeprecatedFontsOnSettingsSchema } from './index'; describe('Module: DeprecatedFontsOnSettingsSchema', () => { it('reports a warning when settings_schema.json has a deprecated font', async () => { diff --git a/packages/theme-check-common/src/checks/deprecated-fonts-on-settings-schema/index.ts b/packages/theme-check-common/src/checks/deprecated-fonts-on-settings-schema/index.ts index d9975d2e7..81aef603b 100644 --- a/packages/theme-check-common/src/checks/deprecated-fonts-on-settings-schema/index.ts +++ b/packages/theme-check-common/src/checks/deprecated-fonts-on-settings-schema/index.ts @@ -1,3 +1,4 @@ +import { getLocEnd, getLocStart } from '../../json'; import { JSONCheckDefinition, Severity, @@ -5,7 +6,6 @@ import { isArrayNode, isObjectNode, } from '../../types'; -import { getLocStart, getLocEnd } from '../../json'; import { DEPRECATED_FONT_HANDLES } from '../deprecated-fonts-on-sections-and-blocks/deprecated-fonts-data'; export const DeprecatedFontsOnSettingsSchema: JSONCheckDefinition = { diff --git a/packages/theme-check-common/src/checks/deprecated-tag/index.spec.ts b/packages/theme-check-common/src/checks/deprecated-tag/index.spec.ts index eb944fccb..2b0c4f2a9 100644 --- a/packages/theme-check-common/src/checks/deprecated-tag/index.spec.ts +++ b/packages/theme-check-common/src/checks/deprecated-tag/index.spec.ts @@ -1,4 +1,4 @@ -import { expect, describe, it } from 'vitest'; +import { describe, expect, it } from 'vitest'; import { highlightedOffenses, runLiquidCheck } from '../../test'; import { DeprecatedTag } from './index'; diff --git a/packages/theme-check-common/src/checks/deprecated-tag/index.ts b/packages/theme-check-common/src/checks/deprecated-tag/index.ts index 3263be21a..6ecea991d 100644 --- a/packages/theme-check-common/src/checks/deprecated-tag/index.ts +++ b/packages/theme-check-common/src/checks/deprecated-tag/index.ts @@ -1,4 +1,4 @@ -import { Severity, SourceCodeType, LiquidCheckDefinition } from '../../types'; +import { LiquidCheckDefinition, Severity, SourceCodeType } from '../../types'; export const DeprecatedTag: LiquidCheckDefinition = { meta: { diff --git a/packages/theme-check-common/src/checks/duplicate-content-for-arguments/index.spec.ts b/packages/theme-check-common/src/checks/duplicate-content-for-arguments/index.spec.ts index bc05dfed1..1df69cb37 100644 --- a/packages/theme-check-common/src/checks/duplicate-content-for-arguments/index.spec.ts +++ b/packages/theme-check-common/src/checks/duplicate-content-for-arguments/index.spec.ts @@ -1,6 +1,6 @@ -import { describe, it, expect } from 'vitest'; +import { describe, expect, it } from 'vitest'; import { DuplicateContentForArguments } from '.'; -import { runLiquidCheck, applySuggestions } from '../../test'; +import { applySuggestions, runLiquidCheck } from '../../test'; describe('Module: DuplicateContentForArguments', () => { function runCheck(sourceCode: string) { diff --git a/packages/theme-check-common/src/checks/duplicate-content-for-arguments/index.ts b/packages/theme-check-common/src/checks/duplicate-content-for-arguments/index.ts index 640215454..e3881adbe 100644 --- a/packages/theme-check-common/src/checks/duplicate-content-for-arguments/index.ts +++ b/packages/theme-check-common/src/checks/duplicate-content-for-arguments/index.ts @@ -1,6 +1,6 @@ -import { LiquidCheckDefinition, Severity, SourceCodeType } from '../../types'; import { ContentForMarkup, LiquidNamedArgument } from '@shopify/liquid-html-parser'; import { getBlockName, reportDuplicateArguments } from '../../liquid-doc/arguments'; +import { LiquidCheckDefinition, Severity, SourceCodeType } from '../../types'; export const DuplicateContentForArguments: LiquidCheckDefinition = { meta: { diff --git a/packages/theme-check-common/src/checks/duplicate-render-snippet-arguments/index.spec.ts b/packages/theme-check-common/src/checks/duplicate-render-snippet-arguments/index.spec.ts index 850f8e688..27e08d6f1 100644 --- a/packages/theme-check-common/src/checks/duplicate-render-snippet-arguments/index.spec.ts +++ b/packages/theme-check-common/src/checks/duplicate-render-snippet-arguments/index.spec.ts @@ -1,6 +1,6 @@ -import { describe, it, expect } from 'vitest'; +import { describe, expect, it } from 'vitest'; import { DuplicateRenderSnippetArguments } from '.'; -import { runLiquidCheck, applySuggestions } from '../../test'; +import { applySuggestions, runLiquidCheck } from '../../test'; describe('Module: DuplicateRenderSnippetArguments', () => { function runCheck(sourceCode: string) { diff --git a/packages/theme-check-common/src/checks/duplicate-render-snippet-arguments/index.ts b/packages/theme-check-common/src/checks/duplicate-render-snippet-arguments/index.ts index c60c7191e..e45e36173 100644 --- a/packages/theme-check-common/src/checks/duplicate-render-snippet-arguments/index.ts +++ b/packages/theme-check-common/src/checks/duplicate-render-snippet-arguments/index.ts @@ -1,6 +1,6 @@ -import { LiquidCheckDefinition, Severity, SourceCodeType } from '../../types'; import { LiquidNamedArgument, RenderMarkup } from '@shopify/liquid-html-parser'; import { getSnippetName, reportDuplicateArguments } from '../../liquid-doc/arguments'; +import { LiquidCheckDefinition, Severity, SourceCodeType } from '../../types'; export const DuplicateRenderSnippetArguments: LiquidCheckDefinition = { meta: { diff --git a/packages/theme-check-common/src/checks/empty-block-content/index.spec.ts b/packages/theme-check-common/src/checks/empty-block-content/index.spec.ts index 4f0177641..74143147d 100644 --- a/packages/theme-check-common/src/checks/empty-block-content/index.spec.ts +++ b/packages/theme-check-common/src/checks/empty-block-content/index.spec.ts @@ -1,4 +1,4 @@ -import { expect, describe, it } from 'vitest'; +import { describe, expect, it } from 'vitest'; import { EmptyBlockContent } from '.'; import { check, MockTheme } from '../../test'; diff --git a/packages/theme-check-common/src/checks/empty-block-content/index.ts b/packages/theme-check-common/src/checks/empty-block-content/index.ts index 88013ea0c..4aa7cd16a 100644 --- a/packages/theme-check-common/src/checks/empty-block-content/index.ts +++ b/packages/theme-check-common/src/checks/empty-block-content/index.ts @@ -1,6 +1,6 @@ -import { LiquidCheckDefinition, Severity, SourceCodeType } from '../../types'; -import { getSchema } from '../../to-schema'; import { Position } from '@shopify/liquid-html-parser'; +import { getSchema } from '../../to-schema'; +import { LiquidCheckDefinition, Severity, SourceCodeType } from '../../types'; export const EmptyBlockContent: LiquidCheckDefinition = { meta: { diff --git a/packages/theme-check-common/src/checks/hardcoded-routes/index.spec.ts b/packages/theme-check-common/src/checks/hardcoded-routes/index.spec.ts index 37a73b35f..0de65716e 100644 --- a/packages/theme-check-common/src/checks/hardcoded-routes/index.spec.ts +++ b/packages/theme-check-common/src/checks/hardcoded-routes/index.spec.ts @@ -1,6 +1,6 @@ -import { expect, describe, it } from 'vitest'; +import { describe, expect, it } from 'vitest'; +import { highlightedOffenses, runLiquidCheck } from '../../test'; import { HardcodedRoutes } from './index'; -import { runLiquidCheck, highlightedOffenses } from '../../test'; describe('Module: HardcodedRoutes', () => { it('should report offenses for hardcoded routes', async () => { diff --git a/packages/theme-check-common/src/checks/hardcoded-routes/index.ts b/packages/theme-check-common/src/checks/hardcoded-routes/index.ts index 0276a41b1..87a99f01b 100644 --- a/packages/theme-check-common/src/checks/hardcoded-routes/index.ts +++ b/packages/theme-check-common/src/checks/hardcoded-routes/index.ts @@ -1,5 +1,5 @@ import { NodeTypes } from '@shopify/liquid-html-parser'; -import { Severity, SourceCodeType, LiquidCheckDefinition } from '../../types'; +import { LiquidCheckDefinition, Severity, SourceCodeType } from '../../types'; import { isAttr, isNodeOfType, isValuedHtmlAttribute, ValuedHtmlAttribute } from '../utils'; const ROUTES: Record = { diff --git a/packages/theme-check-common/src/checks/img-width-and-height/index.spec.ts b/packages/theme-check-common/src/checks/img-width-and-height/index.spec.ts index ef2215966..751991cd8 100644 --- a/packages/theme-check-common/src/checks/img-width-and-height/index.spec.ts +++ b/packages/theme-check-common/src/checks/img-width-and-height/index.spec.ts @@ -1,4 +1,4 @@ -import { expect, describe, it } from 'vitest'; +import { describe, expect, it } from 'vitest'; import { highlightedOffenses, runLiquidCheck } from '../../test'; import { ImgWidthAndHeight } from './index'; diff --git a/packages/theme-check-common/src/checks/img-width-and-height/index.ts b/packages/theme-check-common/src/checks/img-width-and-height/index.ts index 540a0c60c..40d0235f6 100644 --- a/packages/theme-check-common/src/checks/img-width-and-height/index.ts +++ b/packages/theme-check-common/src/checks/img-width-and-height/index.ts @@ -1,4 +1,4 @@ -import { Severity, SourceCodeType, LiquidCheckDefinition } from '../../types'; +import { LiquidCheckDefinition, Severity, SourceCodeType } from '../../types'; import { isAttr, isValuedHtmlAttribute, ValuedHtmlAttribute } from '../utils'; export const ImgWidthAndHeight: LiquidCheckDefinition = { diff --git a/packages/theme-check-common/src/checks/index.ts b/packages/theme-check-common/src/checks/index.ts index 6396762ed..e8c333fd4 100644 --- a/packages/theme-check-common/src/checks/index.ts +++ b/packages/theme-check-common/src/checks/index.ts @@ -1,5 +1,6 @@ import { ConfigTarget, JSONCheckDefinition, LiquidCheckDefinition } from '../types'; +import { AppBlockMissingSchema } from './app-block-missing-schema'; import { AppBlockValidTags } from './app-block-valid-tags'; import { AssetPreload } from './asset-preload'; import { AssetSizeAppBlockCSS } from './asset-size-app-block-css'; @@ -16,8 +17,8 @@ import { DeprecatedFontsOnSectionsAndBlocks } from './deprecated-fonts-on-sectio import { DeprecatedFontsOnSettingsData } from './deprecated-fonts-on-settings-data'; import { DeprecatedFontsOnSettingsSchema } from './deprecated-fonts-on-settings-schema'; import { DeprecatedTag } from './deprecated-tag'; -import { DuplicateRenderSnippetArguments } from './duplicate-render-snippet-arguments'; import { DuplicateContentForArguments } from './duplicate-content-for-arguments'; +import { DuplicateRenderSnippetArguments } from './duplicate-render-snippet-arguments'; import { EmptyBlockContent } from './empty-block-content'; import { HardcodedRoutes } from './hardcoded-routes'; import { ImgWidthAndHeight } from './img-width-and-height'; @@ -33,42 +34,41 @@ import { MissingTemplate } from './missing-template'; import { OrphanedSnippet } from './orphaned-snippet'; import { PaginationSize } from './pagination-size'; import { ParserBlockingScript } from './parser-blocking-script'; -import { SchemaPresetsBlockOrder } from './schema-presets-block-order'; -import { SchemaPresetsStaticBlocks } from './schema-presets-static-blocks'; import { RemoteAsset } from './remote-asset'; import { RequiredLayoutThemeObject } from './required-layout-theme-object'; import { ReservedDocParamNames } from './reserved-doc-param-names'; +import { SchemaPresetsBlockOrder } from './schema-presets-block-order'; +import { SchemaPresetsStaticBlocks } from './schema-presets-static-blocks'; import { StaticStylesheetAndJavascriptTags } from './static-stylesheet-and-javascript-tags'; import { TranslationKeyExists } from './translation-key-exists'; import { UnclosedHTMLElement } from './unclosed-html-element'; import { UndefinedObject } from './undefined-object'; import { UniqueDocParamNames } from './unique-doc-param-names'; +import { UniqueSettingIds } from './unique-settings-id'; import { UniqueStaticBlockId } from './unique-static-block-id'; import { UnknownFilter } from './unknown-filter'; import { UnrecognizedContentForArguments } from './unrecognized-content-for-arguments'; import { UnrecognizedRenderSnippetArguments } from './unrecognized-render-snippet-arguments'; -import { UnusedAssign } from './unused-assign'; import { UnsupportedDocTag } from './unsupported-doc-tag'; import { UnsupportedFilterArguments } from './unsupported-filter-arguments'; +import { UnusedAssign } from './unused-assign'; import { UnusedDocParam } from './unused-doc-param'; -import { ValidContentForArguments } from './valid-content-for-arguments'; -import { ValidContentForArgumentTypes } from './valid-content-for-argument-types'; import { ValidBlockTarget } from './valid-block-target'; -import { ValidScopedCSSClass } from './valid-scoped-css-class'; +import { ValidContentForArgumentTypes } from './valid-content-for-argument-types'; +import { ValidContentForArguments } from './valid-content-for-arguments'; +import { ValidDocParamTypes } from './valid-doc-param-types'; import { ValidHTMLTranslation } from './valid-html-translation'; import { ValidJSON } from './valid-json'; -import { ValidDocParamTypes } from './valid-doc-param-types'; import { ValidLocalBlocks } from './valid-local-blocks'; import { ValidRenderSnippetArgumentTypes } from './valid-render-snippet-argument-types'; import { ValidSchema } from './valid-schema'; import { ValidSchemaName } from './valid-schema-name'; import { ValidSchemaTranslations } from './valid-schema-translations'; +import { ValidScopedCSSClass } from './valid-scoped-css-class'; import { ValidSettingsKey } from './valid-settings-key'; import { ValidStaticBlockType } from './valid-static-block-type'; import { ValidVisibleIf, ValidVisibleIfSettingsSchema } from './valid-visible-if'; import { VariableName } from './variable-name'; -import { AppBlockMissingSchema } from './app-block-missing-schema'; -import { UniqueSettingIds } from './unique-settings-id'; export const allChecks: (LiquidCheckDefinition | JSONCheckDefinition)[] = [ AppBlockValidTags, diff --git a/packages/theme-check-common/src/checks/json-missing-block/index.spec.ts b/packages/theme-check-common/src/checks/json-missing-block/index.spec.ts index 1082f97c3..9298212de 100644 --- a/packages/theme-check-common/src/checks/json-missing-block/index.spec.ts +++ b/packages/theme-check-common/src/checks/json-missing-block/index.spec.ts @@ -1,6 +1,6 @@ -import { expect, describe, it } from 'vitest'; -import { JSONMissingBlock } from './index'; +import { describe, expect, it } from 'vitest'; import { check, MockTheme } from '../../test'; +import { JSONMissingBlock } from './index'; describe('Module: JsonMissingBlock', () => { describe('File existence validation', () => { diff --git a/packages/theme-check-common/src/checks/json-missing-block/missing-block-utils.ts b/packages/theme-check-common/src/checks/json-missing-block/missing-block-utils.ts index a45ee31a2..6aa908df7 100644 --- a/packages/theme-check-common/src/checks/json-missing-block/missing-block-utils.ts +++ b/packages/theme-check-common/src/checks/json-missing-block/missing-block-utils.ts @@ -1,6 +1,6 @@ -import { Context, SourceCodeType, JSONNode } from '../../types'; -import { PropertyNode } from '../../jsonc/types'; import { getLocEnd, getLocStart, nodeAtPath } from '../../json'; +import { PropertyNode } from '../../jsonc/types'; +import { Context, JSONNode, SourceCodeType } from '../../types'; import { doesFileExist } from '../../utils/file-utils'; export function isPropertyNode(node: unknown): node is PropertyNode { diff --git a/packages/theme-check-common/src/checks/json-syntax-error/index.spec.ts b/packages/theme-check-common/src/checks/json-syntax-error/index.spec.ts index f6365ea60..10fd77a43 100644 --- a/packages/theme-check-common/src/checks/json-syntax-error/index.spec.ts +++ b/packages/theme-check-common/src/checks/json-syntax-error/index.spec.ts @@ -1,6 +1,6 @@ -import { expect, describe, it } from 'vitest'; -import { JSONSyntaxError } from './index'; +import { describe, expect, it } from 'vitest'; import { highlightedOffenses, runJSONCheck } from '../../test'; +import { JSONSyntaxError } from './index'; describe('Module: JSONSyntaxError', () => { it('should report an error for invalid JSON (0)', async () => { diff --git a/packages/theme-check-common/src/checks/json-syntax-error/index.ts b/packages/theme-check-common/src/checks/json-syntax-error/index.ts index 9d6990a32..1f50ac27e 100644 --- a/packages/theme-check-common/src/checks/json-syntax-error/index.ts +++ b/packages/theme-check-common/src/checks/json-syntax-error/index.ts @@ -1,4 +1,4 @@ -import { ParseErrorCode, printParseErrorCode } from 'jsonc-parser'; +import { ParseErrorCode } from 'jsonc-parser'; import { JSONCParseErrors } from '../../jsonc/parse'; import { JSONCheckDefinition, Severity, SourceCodeType } from '../../types'; import { isError } from '../../utils'; diff --git a/packages/theme-check-common/src/checks/liquid-free-settings/index.spec.ts b/packages/theme-check-common/src/checks/liquid-free-settings/index.spec.ts index c4d27b11c..5e01b80b2 100644 --- a/packages/theme-check-common/src/checks/liquid-free-settings/index.spec.ts +++ b/packages/theme-check-common/src/checks/liquid-free-settings/index.spec.ts @@ -1,6 +1,6 @@ -import { expect, describe, it } from 'vitest'; -import { LiquidFreeSettings } from './index'; +import { describe, expect, it } from 'vitest'; import { check, MockTheme } from '../../test'; +import { LiquidFreeSettings } from './index'; describe('LiquidFreeSettings validation', () => { const paths = ['sections', 'blocks']; diff --git a/packages/theme-check-common/src/checks/liquid-html-syntax-error/checks/InvalidBooleanExpression.spec.ts b/packages/theme-check-common/src/checks/liquid-html-syntax-error/checks/InvalidBooleanExpression.spec.ts index 88af441fc..8c2db9268 100644 --- a/packages/theme-check-common/src/checks/liquid-html-syntax-error/checks/InvalidBooleanExpression.spec.ts +++ b/packages/theme-check-common/src/checks/liquid-html-syntax-error/checks/InvalidBooleanExpression.spec.ts @@ -1,6 +1,6 @@ import { describe, expect, it } from 'vitest'; -import { applyFix, runLiquidCheck } from '../../../test'; import { LiquidHTMLSyntaxError } from '..'; +import { applyFix, runLiquidCheck } from '../../../test'; describe('detectTrailingAssignValue', async () => { it('should not report when there are no trailing values', async () => { diff --git a/packages/theme-check-common/src/checks/liquid-html-syntax-error/checks/InvalidBooleanExpressions.ts b/packages/theme-check-common/src/checks/liquid-html-syntax-error/checks/InvalidBooleanExpressions.ts index 7254b3aa5..add9ce867 100644 --- a/packages/theme-check-common/src/checks/liquid-html-syntax-error/checks/InvalidBooleanExpressions.ts +++ b/packages/theme-check-common/src/checks/liquid-html-syntax-error/checks/InvalidBooleanExpressions.ts @@ -1,7 +1,7 @@ import { LiquidBooleanExpression, LiquidHtmlNode, NodeTypes } from '@shopify/liquid-html-parser'; import { Problem, SourceCodeType } from '../../..'; -import { INVALID_SYNTAX_MESSAGE } from './utils'; import { isWithinRawTagThatDoesNotParseItsContents } from '../../utils'; +import { INVALID_SYNTAX_MESSAGE } from './utils'; export function detectInvalidBooleanExpressions( node: LiquidBooleanExpression, diff --git a/packages/theme-check-common/src/checks/liquid-html-syntax-error/checks/InvalidConditionalNode.spec.ts b/packages/theme-check-common/src/checks/liquid-html-syntax-error/checks/InvalidConditionalNode.spec.ts index d888bd05b..1cd07304f 100644 --- a/packages/theme-check-common/src/checks/liquid-html-syntax-error/checks/InvalidConditionalNode.spec.ts +++ b/packages/theme-check-common/src/checks/liquid-html-syntax-error/checks/InvalidConditionalNode.spec.ts @@ -1,6 +1,6 @@ -import { expect, describe, it } from 'vitest'; -import { runLiquidCheck, applyFix } from '../../../test'; +import { describe, expect, it } from 'vitest'; import { LiquidHTMLSyntaxError } from '..'; +import { applyFix, runLiquidCheck } from '../../../test'; describe('Module: InvalidConditionalBooleanExpression', () => { it('should not report an offense for valid boolean expressions', async () => { diff --git a/packages/theme-check-common/src/checks/liquid-html-syntax-error/checks/InvalidConditionalNode.ts b/packages/theme-check-common/src/checks/liquid-html-syntax-error/checks/InvalidConditionalNode.ts index a1a62ac83..31e6aa46c 100644 --- a/packages/theme-check-common/src/checks/liquid-html-syntax-error/checks/InvalidConditionalNode.ts +++ b/packages/theme-check-common/src/checks/liquid-html-syntax-error/checks/InvalidConditionalNode.ts @@ -1,5 +1,5 @@ import { LiquidBranch, LiquidTag } from '@shopify/liquid-html-parser'; -import { SourceCodeType, Problem } from '../../..'; +import { Problem, SourceCodeType } from '../../..'; import { getValuesInMarkup, INVALID_SYNTAX_MESSAGE } from './utils'; type TokenType = 'variable' | keyof typeof TOKEN_PATTERNS; diff --git a/packages/theme-check-common/src/checks/liquid-html-syntax-error/checks/InvalidConditionalNodeParenthesis.spec.ts b/packages/theme-check-common/src/checks/liquid-html-syntax-error/checks/InvalidConditionalNodeParenthesis.spec.ts index 18d2a6499..daa2e5682 100644 --- a/packages/theme-check-common/src/checks/liquid-html-syntax-error/checks/InvalidConditionalNodeParenthesis.spec.ts +++ b/packages/theme-check-common/src/checks/liquid-html-syntax-error/checks/InvalidConditionalNodeParenthesis.spec.ts @@ -1,4 +1,4 @@ -import { expect, describe, it } from 'vitest'; +import { describe, expect, it } from 'vitest'; import { applyFix, runLiquidCheck } from '../../../test'; import { LiquidHTMLSyntaxError } from '../index'; diff --git a/packages/theme-check-common/src/checks/liquid-html-syntax-error/checks/InvalidConditionalNodeParenthesis.ts b/packages/theme-check-common/src/checks/liquid-html-syntax-error/checks/InvalidConditionalNodeParenthesis.ts index cabe7113c..48637647d 100644 --- a/packages/theme-check-common/src/checks/liquid-html-syntax-error/checks/InvalidConditionalNodeParenthesis.ts +++ b/packages/theme-check-common/src/checks/liquid-html-syntax-error/checks/InvalidConditionalNodeParenthesis.ts @@ -1,5 +1,5 @@ import { LiquidTag } from '@shopify/liquid-html-parser'; -import { SourceCodeType, Problem } from '../../..'; +import { Problem, SourceCodeType } from '../../..'; import { doesFragmentContainUnsupportedParentheses, getFragmentsInMarkup, diff --git a/packages/theme-check-common/src/checks/liquid-html-syntax-error/checks/InvalidEchoValue.spec.ts b/packages/theme-check-common/src/checks/liquid-html-syntax-error/checks/InvalidEchoValue.spec.ts index 03abd81b1..d77a6b0e6 100644 --- a/packages/theme-check-common/src/checks/liquid-html-syntax-error/checks/InvalidEchoValue.spec.ts +++ b/packages/theme-check-common/src/checks/liquid-html-syntax-error/checks/InvalidEchoValue.spec.ts @@ -1,4 +1,4 @@ -import { expect, describe, it, vi, beforeEach } from 'vitest'; +import { beforeEach, describe, expect, it, vi } from 'vitest'; import { applyFix, runLiquidCheck } from '../../../test'; import { LiquidHTMLSyntaxError } from '../index'; diff --git a/packages/theme-check-common/src/checks/liquid-html-syntax-error/checks/InvalidFilterName.spec.ts b/packages/theme-check-common/src/checks/liquid-html-syntax-error/checks/InvalidFilterName.spec.ts index bd4073cd0..fe18401dc 100644 --- a/packages/theme-check-common/src/checks/liquid-html-syntax-error/checks/InvalidFilterName.spec.ts +++ b/packages/theme-check-common/src/checks/liquid-html-syntax-error/checks/InvalidFilterName.spec.ts @@ -1,5 +1,5 @@ -import { describe, it, expect } from 'vitest'; -import { runLiquidCheck, applyFix } from '../../../test'; +import { describe, expect, it } from 'vitest'; +import { applyFix, runLiquidCheck } from '../../../test'; import { LiquidHTMLSyntaxError } from '../index'; describe('Module: InvalidFilterName', () => { diff --git a/packages/theme-check-common/src/checks/liquid-html-syntax-error/checks/InvalidFilterName.ts b/packages/theme-check-common/src/checks/liquid-html-syntax-error/checks/InvalidFilterName.ts index ee98a086d..e081d6ecc 100644 --- a/packages/theme-check-common/src/checks/liquid-html-syntax-error/checks/InvalidFilterName.ts +++ b/packages/theme-check-common/src/checks/liquid-html-syntax-error/checks/InvalidFilterName.ts @@ -1,5 +1,5 @@ -import { LiquidVariableOutput, LiquidTag, NodeTypes, NamedTags } from '@shopify/liquid-html-parser'; -import { Problem, SourceCodeType, Context, FilterEntry } from '../../..'; +import { LiquidTag, LiquidVariableOutput, NamedTags, NodeTypes } from '@shopify/liquid-html-parser'; +import { FilterEntry, Problem, SourceCodeType } from '../../..'; import { INVALID_SYNTAX_MESSAGE } from './utils'; export async function detectInvalidFilterName( diff --git a/packages/theme-check-common/src/checks/liquid-html-syntax-error/checks/InvalidLoopArguments.spec.ts b/packages/theme-check-common/src/checks/liquid-html-syntax-error/checks/InvalidLoopArguments.spec.ts index 29bacff93..554bfc44e 100644 --- a/packages/theme-check-common/src/checks/liquid-html-syntax-error/checks/InvalidLoopArguments.spec.ts +++ b/packages/theme-check-common/src/checks/liquid-html-syntax-error/checks/InvalidLoopArguments.spec.ts @@ -1,4 +1,4 @@ -import { expect, describe, it } from 'vitest'; +import { describe, expect, it } from 'vitest'; import { applyFix, runLiquidCheck } from '../../../test'; import { LiquidHTMLSyntaxError } from '../index'; diff --git a/packages/theme-check-common/src/checks/liquid-html-syntax-error/checks/InvalidLoopArguments.ts b/packages/theme-check-common/src/checks/liquid-html-syntax-error/checks/InvalidLoopArguments.ts index f1643be5b..e33d30cab 100644 --- a/packages/theme-check-common/src/checks/liquid-html-syntax-error/checks/InvalidLoopArguments.ts +++ b/packages/theme-check-common/src/checks/liquid-html-syntax-error/checks/InvalidLoopArguments.ts @@ -6,12 +6,12 @@ import { NodeTypes, } from '@shopify/liquid-html-parser'; import { Problem, SourceCodeType, TagEntry } from '../../..'; +import { isLoopLiquidTag } from '../../utils'; import { doesFragmentContainUnsupportedParentheses, - getFragmentsInMarkup, fragmentKeyValuePair, + getFragmentsInMarkup, } from './utils'; -import { isLoopLiquidTag } from '../../utils'; export function detectInvalidLoopArguments( node: LiquidTag, diff --git a/packages/theme-check-common/src/checks/liquid-html-syntax-error/checks/InvalidLoopRange.spec.ts b/packages/theme-check-common/src/checks/liquid-html-syntax-error/checks/InvalidLoopRange.spec.ts index 4e4101214..a5d90a1f4 100644 --- a/packages/theme-check-common/src/checks/liquid-html-syntax-error/checks/InvalidLoopRange.spec.ts +++ b/packages/theme-check-common/src/checks/liquid-html-syntax-error/checks/InvalidLoopRange.spec.ts @@ -1,4 +1,4 @@ -import { expect, describe, it, vi, beforeEach } from 'vitest'; +import { beforeEach, describe, expect, it, vi } from 'vitest'; import { applyFix, runLiquidCheck } from '../../../test'; import { LiquidHTMLSyntaxError } from '../index'; import { INVALID_LOOP_RANGE_MESSAGE } from './InvalidLoopRange'; diff --git a/packages/theme-check-common/src/checks/liquid-html-syntax-error/checks/InvalidLoopRange.ts b/packages/theme-check-common/src/checks/liquid-html-syntax-error/checks/InvalidLoopRange.ts index 8b40de057..8fee3e92e 100644 --- a/packages/theme-check-common/src/checks/liquid-html-syntax-error/checks/InvalidLoopRange.ts +++ b/packages/theme-check-common/src/checks/liquid-html-syntax-error/checks/InvalidLoopRange.ts @@ -1,7 +1,7 @@ import { LiquidTag, LiquidTagFor, LiquidTagTablerow, NodeTypes } from '@shopify/liquid-html-parser'; import { Problem, SourceCodeType } from '../../..'; -import { getRangeMatch } from './utils'; import { isLoopLiquidTag } from '../../utils'; +import { getRangeMatch } from './utils'; export const INVALID_LOOP_RANGE_MESSAGE = 'Ranges must be in the format `(..)`. The start and end of the range must be whole numbers or variables.'; diff --git a/packages/theme-check-common/src/checks/liquid-html-syntax-error/checks/InvalidPipeSyntax.spec.ts b/packages/theme-check-common/src/checks/liquid-html-syntax-error/checks/InvalidPipeSyntax.spec.ts index 15a101546..4a3747880 100644 --- a/packages/theme-check-common/src/checks/liquid-html-syntax-error/checks/InvalidPipeSyntax.spec.ts +++ b/packages/theme-check-common/src/checks/liquid-html-syntax-error/checks/InvalidPipeSyntax.spec.ts @@ -1,5 +1,5 @@ -import { describe, it, expect } from 'vitest'; -import { runLiquidCheck, applyFix } from '../../../test'; +import { describe, expect, it } from 'vitest'; +import { applyFix, runLiquidCheck } from '../../../test'; import { LiquidHTMLSyntaxError } from '../index'; describe('Module: InvalidPipeSyntax', () => { diff --git a/packages/theme-check-common/src/checks/liquid-html-syntax-error/checks/InvalidPipeSyntax.ts b/packages/theme-check-common/src/checks/liquid-html-syntax-error/checks/InvalidPipeSyntax.ts index 24b128232..d65f8e41f 100644 --- a/packages/theme-check-common/src/checks/liquid-html-syntax-error/checks/InvalidPipeSyntax.ts +++ b/packages/theme-check-common/src/checks/liquid-html-syntax-error/checks/InvalidPipeSyntax.ts @@ -1,4 +1,4 @@ -import { LiquidVariableOutput, LiquidTag, NodeTypes, NamedTags } from '@shopify/liquid-html-parser'; +import { LiquidTag, LiquidVariableOutput, NamedTags, NodeTypes } from '@shopify/liquid-html-parser'; import { Problem, SourceCodeType } from '../../..'; import { INVALID_SYNTAX_MESSAGE } from './utils'; diff --git a/packages/theme-check-common/src/checks/liquid-html-syntax-error/checks/MultipleAssignValues.spec.ts b/packages/theme-check-common/src/checks/liquid-html-syntax-error/checks/MultipleAssignValues.spec.ts index fd4a7ccfd..4aeb911ab 100644 --- a/packages/theme-check-common/src/checks/liquid-html-syntax-error/checks/MultipleAssignValues.spec.ts +++ b/packages/theme-check-common/src/checks/liquid-html-syntax-error/checks/MultipleAssignValues.spec.ts @@ -1,4 +1,4 @@ -import { expect, describe, it, vi, beforeEach } from 'vitest'; +import { beforeEach, describe, expect, it, vi } from 'vitest'; import { applyFix, runLiquidCheck } from '../../../test'; import { LiquidHTMLSyntaxError } from '../index'; diff --git a/packages/theme-check-common/src/checks/liquid-html-syntax-error/checks/utils.spec.ts b/packages/theme-check-common/src/checks/liquid-html-syntax-error/checks/utils.spec.ts index 2f6d6706c..c6cd9bddc 100644 --- a/packages/theme-check-common/src/checks/liquid-html-syntax-error/checks/utils.spec.ts +++ b/packages/theme-check-common/src/checks/liquid-html-syntax-error/checks/utils.spec.ts @@ -1,4 +1,4 @@ -import { expect, describe, it } from 'vitest'; +import { describe, expect, it } from 'vitest'; import { doesFragmentContainUnsupportedParentheses, fragmentKeyValuePair, diff --git a/packages/theme-check-common/src/checks/liquid-html-syntax-error/index.spec.ts b/packages/theme-check-common/src/checks/liquid-html-syntax-error/index.spec.ts index 566b273c8..b2be0f07d 100644 --- a/packages/theme-check-common/src/checks/liquid-html-syntax-error/index.spec.ts +++ b/packages/theme-check-common/src/checks/liquid-html-syntax-error/index.spec.ts @@ -1,4 +1,4 @@ -import { expect, describe, it, vi } from 'vitest'; +import { describe, expect, it } from 'vitest'; import { highlightedOffenses, runLiquidCheck } from '../../test'; import { Offense } from '../../types'; import { LiquidHTMLSyntaxError } from './index'; diff --git a/packages/theme-check-common/src/checks/liquid-html-syntax-error/index.ts b/packages/theme-check-common/src/checks/liquid-html-syntax-error/index.ts index 03b4a31d3..ad665847f 100644 --- a/packages/theme-check-common/src/checks/liquid-html-syntax-error/index.ts +++ b/packages/theme-check-common/src/checks/liquid-html-syntax-error/index.ts @@ -1,15 +1,15 @@ -import { Severity, SourceCodeType, LiquidCheckDefinition, Problem } from '../../types'; +import { LiquidCheckDefinition, Problem, Severity, SourceCodeType } from '../../types'; import { getOffset, isError } from '../../utils'; -import { detectMultipleAssignValues } from './checks/MultipleAssignValues'; +import { isWithinRawTagThatDoesNotParseItsContents } from '../utils'; import { detectInvalidBooleanExpressions } from './checks/InvalidBooleanExpressions'; -import { detectInvalidEchoValue } from './checks/InvalidEchoValue'; import { detectInvalidConditionalNode } from './checks/InvalidConditionalNode'; -import { detectInvalidLoopRange } from './checks/InvalidLoopRange'; -import { detectInvalidLoopArguments } from './checks/InvalidLoopArguments'; import { detectConditionalNodeUnsupportedParenthesis } from './checks/InvalidConditionalNodeParenthesis'; +import { detectInvalidEchoValue } from './checks/InvalidEchoValue'; import { detectInvalidFilterName } from './checks/InvalidFilterName'; +import { detectInvalidLoopArguments } from './checks/InvalidLoopArguments'; +import { detectInvalidLoopRange } from './checks/InvalidLoopRange'; import { detectInvalidPipeSyntax } from './checks/InvalidPipeSyntax'; -import { isWithinRawTagThatDoesNotParseItsContents } from '../utils'; +import { detectMultipleAssignValues } from './checks/MultipleAssignValues'; type LineColPosition = { line: number; diff --git a/packages/theme-check-common/src/checks/matching-translations/index.spec.ts b/packages/theme-check-common/src/checks/matching-translations/index.spec.ts index efea1e4e7..37c34faa9 100644 --- a/packages/theme-check-common/src/checks/matching-translations/index.spec.ts +++ b/packages/theme-check-common/src/checks/matching-translations/index.spec.ts @@ -1,6 +1,6 @@ -import { expect, describe, it } from 'vitest'; -import { autofix, check, highlightedOffenses } from '../../test'; +import { describe, expect, it } from 'vitest'; import { MatchingTranslations } from '../../checks/matching-translations/index'; +import { autofix, check, highlightedOffenses } from '../../test'; const prettyJSON = (json: any) => JSON.stringify(json, null, 2); diff --git a/packages/theme-check-common/src/checks/matching-translations/index.ts b/packages/theme-check-common/src/checks/matching-translations/index.ts index 8d31472eb..cf28ae824 100644 --- a/packages/theme-check-common/src/checks/matching-translations/index.ts +++ b/packages/theme-check-common/src/checks/matching-translations/index.ts @@ -1,11 +1,4 @@ -import { - JSONCheckDefinition, - JSONNode, - JSONSourceCode, - Severity, - SourceCodeType, - PropertyNode, -} from '../../types'; +import { JSONCheckDefinition, JSONNode, PropertyNode, Severity, SourceCodeType } from '../../types'; const PLURALIZATION_KEYS = new Set(['zero', 'one', 'two', 'few', 'many', 'other']); diff --git a/packages/theme-check-common/src/checks/missing-asset/index.spec.ts b/packages/theme-check-common/src/checks/missing-asset/index.spec.ts index de1bff3e5..075ee88ad 100644 --- a/packages/theme-check-common/src/checks/missing-asset/index.spec.ts +++ b/packages/theme-check-common/src/checks/missing-asset/index.spec.ts @@ -1,4 +1,4 @@ -import { expect, describe, it } from 'vitest'; +import { describe, expect, it } from 'vitest'; import { MissingAsset } from '.'; import { check } from '../../test'; diff --git a/packages/theme-check-common/src/checks/missing-content-for-arguments/index.spec.ts b/packages/theme-check-common/src/checks/missing-content-for-arguments/index.spec.ts index 7ac97a639..9cb207b58 100644 --- a/packages/theme-check-common/src/checks/missing-content-for-arguments/index.spec.ts +++ b/packages/theme-check-common/src/checks/missing-content-for-arguments/index.spec.ts @@ -1,6 +1,6 @@ -import { describe, it, expect } from 'vitest'; -import { applySuggestions, runLiquidCheck } from '../../test'; +import { describe, expect, it } from 'vitest'; import { MissingContentForArguments } from '.'; +import { applySuggestions, runLiquidCheck } from '../../test'; function check(existingCode: string, source: string) { return runLiquidCheck( diff --git a/packages/theme-check-common/src/checks/missing-content-for-arguments/index.ts b/packages/theme-check-common/src/checks/missing-content-for-arguments/index.ts index 4093e08e6..8542df393 100644 --- a/packages/theme-check-common/src/checks/missing-content-for-arguments/index.ts +++ b/packages/theme-check-common/src/checks/missing-content-for-arguments/index.ts @@ -1,10 +1,10 @@ -import { LiquidCheckDefinition, Severity, SourceCodeType } from '../../types'; import { ContentForMarkup } from '@shopify/liquid-html-parser'; import { getBlockName, getLiquidDocParams, reportMissingArguments, } from '../../liquid-doc/arguments'; +import { LiquidCheckDefinition, Severity, SourceCodeType } from '../../types'; export const MissingContentForArguments: LiquidCheckDefinition = { meta: { diff --git a/packages/theme-check-common/src/checks/missing-render-snippet-arguments/index.spec.ts b/packages/theme-check-common/src/checks/missing-render-snippet-arguments/index.spec.ts index 15d077c93..6879f83b0 100644 --- a/packages/theme-check-common/src/checks/missing-render-snippet-arguments/index.spec.ts +++ b/packages/theme-check-common/src/checks/missing-render-snippet-arguments/index.spec.ts @@ -1,6 +1,6 @@ -import { describe, it, expect } from 'vitest'; -import { applySuggestions, MockTheme, runLiquidCheck } from '../../test'; +import { describe, expect, it } from 'vitest'; import { MissingRenderSnippetArguments } from '.'; +import { applySuggestions, MockTheme, runLiquidCheck } from '../../test'; function check(snippet: string, source: string) { return runLiquidCheck( diff --git a/packages/theme-check-common/src/checks/missing-render-snippet-arguments/index.ts b/packages/theme-check-common/src/checks/missing-render-snippet-arguments/index.ts index ac5a87ab4..5938a812a 100644 --- a/packages/theme-check-common/src/checks/missing-render-snippet-arguments/index.ts +++ b/packages/theme-check-common/src/checks/missing-render-snippet-arguments/index.ts @@ -1,10 +1,10 @@ -import { LiquidCheckDefinition, Severity, SourceCodeType } from '../../types'; import { RenderMarkup } from '@shopify/liquid-html-parser'; import { getLiquidDocParams, getSnippetName, reportMissingArguments, } from '../../liquid-doc/arguments'; +import { LiquidCheckDefinition, Severity, SourceCodeType } from '../../types'; export const MissingRenderSnippetArguments: LiquidCheckDefinition = { meta: { diff --git a/packages/theme-check-common/src/checks/missing-template/index.spec.ts b/packages/theme-check-common/src/checks/missing-template/index.spec.ts index f54bec6f8..145338989 100644 --- a/packages/theme-check-common/src/checks/missing-template/index.spec.ts +++ b/packages/theme-check-common/src/checks/missing-template/index.spec.ts @@ -1,4 +1,4 @@ -import { expect, describe, it } from 'vitest'; +import { describe, expect, it } from 'vitest'; import { MissingTemplate } from '.'; import { check } from '../../test'; diff --git a/packages/theme-check-common/src/checks/orphaned-snippet/index.spec.ts b/packages/theme-check-common/src/checks/orphaned-snippet/index.spec.ts index e1f26cda8..7ad16411d 100644 --- a/packages/theme-check-common/src/checks/orphaned-snippet/index.spec.ts +++ b/packages/theme-check-common/src/checks/orphaned-snippet/index.spec.ts @@ -1,6 +1,6 @@ -import { expect, describe, it } from 'vitest'; -import { OrphanedSnippet } from './index'; +import { describe, expect, it } from 'vitest'; import { runLiquidCheck } from '../../test'; +import { OrphanedSnippet } from './index'; describe('Module: OrphanedSnippet', () => { describe('when the snippet is not referenced by any files', () => { diff --git a/packages/theme-check-common/src/checks/pagination-size/index.spec.ts b/packages/theme-check-common/src/checks/pagination-size/index.spec.ts index eadee30ee..affbd04e1 100644 --- a/packages/theme-check-common/src/checks/pagination-size/index.spec.ts +++ b/packages/theme-check-common/src/checks/pagination-size/index.spec.ts @@ -1,4 +1,4 @@ -import { expect, describe, it } from 'vitest'; +import { describe, expect, it } from 'vitest'; import { highlightedOffenses, runLiquidCheck } from '../../test'; import { PaginationSize } from './index'; diff --git a/packages/theme-check-common/src/checks/pagination-size/index.ts b/packages/theme-check-common/src/checks/pagination-size/index.ts index 454e73a84..92294b250 100644 --- a/packages/theme-check-common/src/checks/pagination-size/index.ts +++ b/packages/theme-check-common/src/checks/pagination-size/index.ts @@ -4,10 +4,10 @@ import { LiquidVariableLookup, NodeTypes, } from '@shopify/liquid-html-parser'; +import { parseJSON } from '../../json'; import { LiquidCheckDefinition, SchemaProp, Severity, SourceCodeType } from '../../types'; import { isError, last } from '../../utils'; import { isNodeOfType } from '../utils'; -import { parseJSON } from '../../json'; const schema = { minSize: SchemaProp.number(1), diff --git a/packages/theme-check-common/src/checks/parser-blocking-script/index.spec.ts b/packages/theme-check-common/src/checks/parser-blocking-script/index.spec.ts index 549a17328..af2d2c339 100644 --- a/packages/theme-check-common/src/checks/parser-blocking-script/index.spec.ts +++ b/packages/theme-check-common/src/checks/parser-blocking-script/index.spec.ts @@ -1,4 +1,4 @@ -import { expect, describe, it } from 'vitest'; +import { describe, expect, it } from 'vitest'; import { ParserBlockingScript } from '.'; import { applySuggestions, check as reportOffenses } from '../../test'; diff --git a/packages/theme-check-common/src/checks/remote-asset/index.spec.ts b/packages/theme-check-common/src/checks/remote-asset/index.spec.ts index 2ee416ace..0892bb971 100644 --- a/packages/theme-check-common/src/checks/remote-asset/index.spec.ts +++ b/packages/theme-check-common/src/checks/remote-asset/index.spec.ts @@ -1,5 +1,5 @@ -import { describe, it, expect } from 'vitest'; -import { runLiquidCheck, highlightedOffenses, check, MockTheme } from '../../test'; +import { describe, expect, it } from 'vitest'; +import { check, highlightedOffenses, MockTheme, runLiquidCheck } from '../../test'; import { RemoteAsset } from './index'; describe('Module: RemoteAsset', () => { diff --git a/packages/theme-check-common/src/checks/remote-asset/index.ts b/packages/theme-check-common/src/checks/remote-asset/index.ts index 31ff07da3..0edf6805c 100644 --- a/packages/theme-check-common/src/checks/remote-asset/index.ts +++ b/packages/theme-check-common/src/checks/remote-asset/index.ts @@ -1,21 +1,21 @@ import { HtmlRawNode, HtmlVoidElement, - TextNode, LiquidVariable, LiquidVariableOutput, + TextNode, } from '@shopify/liquid-html-parser'; import { - LiquidHtmlNodeTypes as NodeTypes, - LiquidHtmlNodeOfType as NodeOfType, - Severity, - SourceCodeType, LiquidCheckDefinition, LiquidHtmlNode, + LiquidHtmlNodeOfType as NodeOfType, + LiquidHtmlNodeTypes as NodeTypes, SchemaProp, + Severity, + SourceCodeType, } from '../../types'; -import { isAttr, isValuedHtmlAttribute, isNodeOfType, ValuedHtmlAttribute } from '../utils'; import { last } from '../../utils'; +import { isAttr, isNodeOfType, isValuedHtmlAttribute, ValuedHtmlAttribute } from '../utils'; const RESOURCE_TAGS = ['img', 'link', 'source', 'script']; const SHOPIFY_CDN_DOMAINS = ['fonts.shopifycdn.com', 'cdn.shopify.com']; diff --git a/packages/theme-check-common/src/checks/required-layout-theme-object/index.spec.ts b/packages/theme-check-common/src/checks/required-layout-theme-object/index.spec.ts index b19930a8f..495065c44 100644 --- a/packages/theme-check-common/src/checks/required-layout-theme-object/index.spec.ts +++ b/packages/theme-check-common/src/checks/required-layout-theme-object/index.spec.ts @@ -1,7 +1,7 @@ // test/checks/required-layout-theme-object.test.ts -import { expect, describe, it } from 'vitest'; +import { describe, expect, it } from 'vitest'; +import { applyFix, runLiquidCheck } from '../../test'; import { RequiredLayoutThemeObject } from './index'; -import { runLiquidCheck, applyFix } from '../../test'; describe('Module: RequiredLayoutThemeObject', () => { it('should report an error if content_for_header is missing', async () => { diff --git a/packages/theme-check-common/src/checks/reserved-doc-param-names/index.spec.ts b/packages/theme-check-common/src/checks/reserved-doc-param-names/index.spec.ts index 5f8b7d470..defffed42 100644 --- a/packages/theme-check-common/src/checks/reserved-doc-param-names/index.spec.ts +++ b/packages/theme-check-common/src/checks/reserved-doc-param-names/index.spec.ts @@ -1,6 +1,6 @@ -import { expect, describe, it } from 'vitest'; -import { ReservedDocParamNames } from './index'; +import { describe, expect, it } from 'vitest'; import { runLiquidCheck } from '../../test'; +import { ReservedDocParamNames } from './index'; describe('Module: ReservedDocParamNames', () => { describe('block file', () => { diff --git a/packages/theme-check-common/src/checks/reserved-doc-param-names/index.ts b/packages/theme-check-common/src/checks/reserved-doc-param-names/index.ts index 764371e50..bab9cd861 100644 --- a/packages/theme-check-common/src/checks/reserved-doc-param-names/index.ts +++ b/packages/theme-check-common/src/checks/reserved-doc-param-names/index.ts @@ -1,10 +1,10 @@ import { TextNode } from '@shopify/liquid-html-parser'; -import { LiquidCheckDefinition, Severity, SourceCodeType } from '../../types'; -import { isBlock } from '../../to-schema'; import { REQUIRED_CONTENT_FOR_ARGUMENTS, RESERVED_CONTENT_FOR_ARGUMENTS, } from '../../tags/content-for'; +import { isBlock } from '../../to-schema'; +import { LiquidCheckDefinition, Severity, SourceCodeType } from '../../types'; export const ReservedDocParamNames: LiquidCheckDefinition = { meta: { diff --git a/packages/theme-check-common/src/checks/schema-presets-block-order/index.spec.ts b/packages/theme-check-common/src/checks/schema-presets-block-order/index.spec.ts index bd5018f4f..c0087e301 100644 --- a/packages/theme-check-common/src/checks/schema-presets-block-order/index.spec.ts +++ b/packages/theme-check-common/src/checks/schema-presets-block-order/index.spec.ts @@ -1,5 +1,5 @@ -import { expect, describe, it } from 'vitest'; -import { highlightedOffenses, runLiquidCheck, check } from '../../test'; +import { describe, expect, it } from 'vitest'; +import { highlightedOffenses, runLiquidCheck } from '../../test'; import { SchemaPresetsBlockOrder } from './index'; const DEFAULT_FILE_NAME = 'sections/file.liquid'; diff --git a/packages/theme-check-common/src/checks/schema-presets-static-blocks/index.spec.ts b/packages/theme-check-common/src/checks/schema-presets-static-blocks/index.spec.ts index 7a5449904..a1b4d240e 100644 --- a/packages/theme-check-common/src/checks/schema-presets-static-blocks/index.spec.ts +++ b/packages/theme-check-common/src/checks/schema-presets-static-blocks/index.spec.ts @@ -1,5 +1,5 @@ -import { expect, describe, it } from 'vitest'; -import { highlightedOffenses, runLiquidCheck, check } from '../../test'; +import { describe, expect, it } from 'vitest'; +import { highlightedOffenses, runLiquidCheck } from '../../test'; import { SchemaPresetsStaticBlocks } from './index'; const DEFAULT_FILE_NAME = 'sections/file.liquid'; diff --git a/packages/theme-check-common/src/checks/static-stylesheet-and-javascript-tags/index.spec.ts b/packages/theme-check-common/src/checks/static-stylesheet-and-javascript-tags/index.spec.ts index afc5769a9..0f8e2e7d9 100644 --- a/packages/theme-check-common/src/checks/static-stylesheet-and-javascript-tags/index.spec.ts +++ b/packages/theme-check-common/src/checks/static-stylesheet-and-javascript-tags/index.spec.ts @@ -1,5 +1,5 @@ +import { describe, expect, it } from 'vitest'; import { check, highlightedOffenses } from '../../test'; -import { expect, describe, it } from 'vitest'; import { StaticStylesheetAndJavascriptTags } from './index'; describe('Module: StaticStylesheetAndJavascriptTags', () => { diff --git a/packages/theme-check-common/src/checks/translation-key-exists/index.spec.ts b/packages/theme-check-common/src/checks/translation-key-exists/index.spec.ts index b3fdfab52..22aa53c32 100644 --- a/packages/theme-check-common/src/checks/translation-key-exists/index.spec.ts +++ b/packages/theme-check-common/src/checks/translation-key-exists/index.spec.ts @@ -1,6 +1,6 @@ +import { describe, expect, it } from 'vitest'; import { TranslationKeyExists } from '.'; import { check } from '../../test'; -import { expect, describe, it } from 'vitest'; describe('Module: TranslationKeyExists', () => { it('should report all keys if default locale file does not exist', async () => { diff --git a/packages/theme-check-common/src/checks/unclosed-html-element/index.spec.ts b/packages/theme-check-common/src/checks/unclosed-html-element/index.spec.ts index 1ae137048..f0cd9a9b0 100644 --- a/packages/theme-check-common/src/checks/unclosed-html-element/index.spec.ts +++ b/packages/theme-check-common/src/checks/unclosed-html-element/index.spec.ts @@ -1,6 +1,6 @@ -import { expect, describe, it } from 'vitest'; +import { describe, expect, it } from 'vitest'; import { UnclosedHTMLElement } from '.'; -import { runLiquidCheck, highlightedOffenses } from '../../test'; +import { highlightedOffenses, runLiquidCheck } from '../../test'; describe('Module: UnclosedHTMLElement', () => { it('should not report for files without unbalanced tags', async () => { diff --git a/packages/theme-check-common/src/checks/undefined-object/index.spec.ts b/packages/theme-check-common/src/checks/undefined-object/index.spec.ts index 8c16228e4..b93600219 100644 --- a/packages/theme-check-common/src/checks/undefined-object/index.spec.ts +++ b/packages/theme-check-common/src/checks/undefined-object/index.spec.ts @@ -1,7 +1,7 @@ -import { expect, describe, it, assert } from 'vitest'; -import { UndefinedObject } from './index'; -import { runLiquidCheck, highlightedOffenses } from '../../test'; +import { assert, describe, expect, it } from 'vitest'; +import { highlightedOffenses, runLiquidCheck } from '../../test'; import { Offense } from '../../types'; +import { UndefinedObject } from './index'; describe('Module: UndefinedObject', () => { it('should report an offense when object is undefined', async () => { diff --git a/packages/theme-check-common/src/checks/undefined-object/index.ts b/packages/theme-check-common/src/checks/undefined-object/index.ts index 9057bbb94..073170c93 100644 --- a/packages/theme-check-common/src/checks/undefined-object/index.ts +++ b/packages/theme-check-common/src/checks/undefined-object/index.ts @@ -13,9 +13,9 @@ import { NodeTypes, Position, } from '@shopify/liquid-html-parser'; +import { hasLiquidDoc } from '../../liquid-doc/liquidDoc'; import { LiquidCheckDefinition, Mode, Severity, SourceCodeType, ThemeDocset } from '../../types'; import { isError, last } from '../../utils'; -import { hasLiquidDoc } from '../../liquid-doc/liquidDoc'; import { isWithinRawTagThatDoesNotParseItsContents } from '../utils'; type Scope = { start?: number; end?: number }; diff --git a/packages/theme-check-common/src/checks/unique-doc-param-names/index.spec.ts b/packages/theme-check-common/src/checks/unique-doc-param-names/index.spec.ts index 6d58307fd..1921adeb4 100644 --- a/packages/theme-check-common/src/checks/unique-doc-param-names/index.spec.ts +++ b/packages/theme-check-common/src/checks/unique-doc-param-names/index.spec.ts @@ -1,6 +1,6 @@ -import { expect, describe, it } from 'vitest'; -import { UniqueDocParamNames } from './index'; +import { describe, expect, it } from 'vitest'; import { runLiquidCheck } from '../../test'; +import { UniqueDocParamNames } from './index'; describe('Module: UniqueDocParamNames', () => { it(`should not report an error when a all doc params have unique names`, async () => { diff --git a/packages/theme-check-common/src/checks/unique-settings-id/index.spec.ts b/packages/theme-check-common/src/checks/unique-settings-id/index.spec.ts index 5235dda04..1c028b2fb 100644 --- a/packages/theme-check-common/src/checks/unique-settings-id/index.spec.ts +++ b/packages/theme-check-common/src/checks/unique-settings-id/index.spec.ts @@ -1,6 +1,6 @@ -import { expect, describe, it } from 'vitest'; -import { UniqueSettingIds } from './index'; +import { describe, expect, it } from 'vitest'; import { highlightedOffenses, runJSONCheck } from '../../test'; +import { UniqueSettingIds } from './index'; import { invalidJson, validJson } from './test-data'; describe('Module: UniqueSettingIds', () => { diff --git a/packages/theme-check-common/src/checks/unique-settings-id/index.ts b/packages/theme-check-common/src/checks/unique-settings-id/index.ts index 4f2592eb9..20cb5adca 100644 --- a/packages/theme-check-common/src/checks/unique-settings-id/index.ts +++ b/packages/theme-check-common/src/checks/unique-settings-id/index.ts @@ -7,7 +7,7 @@ import { SourceCodeType, } from '../../types'; -import type { ArrayNode, PropertyNode, JSONCheckDefinition } from '../../types'; +import type { JSONCheckDefinition, PropertyNode } from '../../types'; export const UniqueSettingIds: JSONCheckDefinition = { meta: { diff --git a/packages/theme-check-common/src/checks/unique-static-block-id/index.spec.ts b/packages/theme-check-common/src/checks/unique-static-block-id/index.spec.ts index 038c6b01f..b17f9414c 100644 --- a/packages/theme-check-common/src/checks/unique-static-block-id/index.spec.ts +++ b/packages/theme-check-common/src/checks/unique-static-block-id/index.spec.ts @@ -1,4 +1,4 @@ -import { describe, it, expect } from 'vitest'; +import { describe, expect, it } from 'vitest'; import { runLiquidCheck } from '../../test'; import { UniqueStaticBlockId } from './index'; diff --git a/packages/theme-check-common/src/checks/unique-static-block-id/index.ts b/packages/theme-check-common/src/checks/unique-static-block-id/index.ts index 0c27b41eb..714cc73c8 100644 --- a/packages/theme-check-common/src/checks/unique-static-block-id/index.ts +++ b/packages/theme-check-common/src/checks/unique-static-block-id/index.ts @@ -1,9 +1,9 @@ import { NamedTags, NodeTypes } from '@shopify/liquid-html-parser'; -import { LiquidCheckDefinition, Severity, SourceCodeType } from '../../types'; import { REQUIRED_CONTENT_FOR_ARGUMENTS, RESERVED_CONTENT_FOR_ARGUMENTS, } from '../../tags/content-for'; +import { LiquidCheckDefinition, Severity, SourceCodeType } from '../../types'; import { isContentForBlock } from '../../utils/markup'; const FRAMEWORK_ARGS = new Set([ diff --git a/packages/theme-check-common/src/checks/unknown-filter/index.spec.ts b/packages/theme-check-common/src/checks/unknown-filter/index.spec.ts index 12d44878d..86bbc5f29 100644 --- a/packages/theme-check-common/src/checks/unknown-filter/index.spec.ts +++ b/packages/theme-check-common/src/checks/unknown-filter/index.spec.ts @@ -1,5 +1,5 @@ -import { describe, it, expect } from 'vitest'; -import { runLiquidCheck, highlightedOffenses } from '../../test'; +import { describe, expect, it } from 'vitest'; +import { highlightedOffenses, runLiquidCheck } from '../../test'; import { UnknownFilter } from './index'; describe('Module: UnknownFilter', () => { diff --git a/packages/theme-check-common/src/checks/unrecognized-content-for-arguments/index.spec.ts b/packages/theme-check-common/src/checks/unrecognized-content-for-arguments/index.spec.ts index e1ae1414c..5214fc717 100644 --- a/packages/theme-check-common/src/checks/unrecognized-content-for-arguments/index.spec.ts +++ b/packages/theme-check-common/src/checks/unrecognized-content-for-arguments/index.spec.ts @@ -1,7 +1,7 @@ -import { describe, it, expect } from 'vitest'; -import { runLiquidCheck } from '../../test'; +import { describe, expect, it } from 'vitest'; import { UnrecognizedContentForArguments } from '.'; import { RESERVED_CONTENT_FOR_ARGUMENTS } from '../../tags/content-for'; +import { runLiquidCheck } from '../../test'; function check(snippet: string, source: string) { return runLiquidCheck( diff --git a/packages/theme-check-common/src/checks/unrecognized-content-for-arguments/index.ts b/packages/theme-check-common/src/checks/unrecognized-content-for-arguments/index.ts index 0c3ad30a8..d4c54fa94 100644 --- a/packages/theme-check-common/src/checks/unrecognized-content-for-arguments/index.ts +++ b/packages/theme-check-common/src/checks/unrecognized-content-for-arguments/index.ts @@ -1,4 +1,3 @@ -import { LiquidCheckDefinition, Severity, SourceCodeType } from '../../types'; import { ContentForMarkup } from '@shopify/liquid-html-parser'; import { getBlockName, @@ -10,6 +9,7 @@ import { REQUIRED_CONTENT_FOR_ARGUMENTS, RESERVED_CONTENT_FOR_ARGUMENTS, } from '../../tags/content-for'; +import { LiquidCheckDefinition, Severity, SourceCodeType } from '../../types'; export const UnrecognizedContentForArguments: LiquidCheckDefinition = { meta: { diff --git a/packages/theme-check-common/src/checks/unrecognized-render-snippet-arguments/index.spec.ts b/packages/theme-check-common/src/checks/unrecognized-render-snippet-arguments/index.spec.ts index 57aa21c26..7a9b16587 100644 --- a/packages/theme-check-common/src/checks/unrecognized-render-snippet-arguments/index.spec.ts +++ b/packages/theme-check-common/src/checks/unrecognized-render-snippet-arguments/index.spec.ts @@ -1,6 +1,6 @@ -import { describe, it, expect } from 'vitest'; -import { applySuggestions, MockTheme, runLiquidCheck } from '../../test'; +import { describe, expect, it } from 'vitest'; import { UnrecognizedRenderSnippetArguments } from '.'; +import { applySuggestions, MockTheme, runLiquidCheck } from '../../test'; function check(snippet: string, source: string) { return runLiquidCheck( diff --git a/packages/theme-check-common/src/checks/unrecognized-render-snippet-arguments/index.ts b/packages/theme-check-common/src/checks/unrecognized-render-snippet-arguments/index.ts index e7588831d..693d9b817 100644 --- a/packages/theme-check-common/src/checks/unrecognized-render-snippet-arguments/index.ts +++ b/packages/theme-check-common/src/checks/unrecognized-render-snippet-arguments/index.ts @@ -1,11 +1,11 @@ -import { LiquidCheckDefinition, Severity, SourceCodeType } from '../../types'; import { RenderMarkup } from '@shopify/liquid-html-parser'; -import { LiquidDocParameter } from '../../liquid-doc/liquidDoc'; import { getLiquidDocParams, getSnippetName, reportUnknownArguments, } from '../../liquid-doc/arguments'; +import { LiquidDocParameter } from '../../liquid-doc/liquidDoc'; +import { LiquidCheckDefinition, Severity, SourceCodeType } from '../../types'; export const UnrecognizedRenderSnippetArguments: LiquidCheckDefinition = { meta: { diff --git a/packages/theme-check-common/src/checks/unsupported-doc-tag/index.spec.ts b/packages/theme-check-common/src/checks/unsupported-doc-tag/index.spec.ts index 3a9f1b04c..938df8666 100644 --- a/packages/theme-check-common/src/checks/unsupported-doc-tag/index.spec.ts +++ b/packages/theme-check-common/src/checks/unsupported-doc-tag/index.spec.ts @@ -1,6 +1,6 @@ -import { expect, describe, it } from 'vitest'; +import { describe, expect, it } from 'vitest'; +import { applySuggestions, runLiquidCheck } from '../../test'; import { UnsupportedDocTag } from './index'; -import { runLiquidCheck, applySuggestions } from '../../test'; describe('Module: UnsupportedDocTag', () => { const sourceCode = `{% doc %} @param param1 - Example param {% enddoc %}{{ 'hello' }}`; diff --git a/packages/theme-check-common/src/checks/unsupported-doc-tag/index.ts b/packages/theme-check-common/src/checks/unsupported-doc-tag/index.ts index baaa5826b..87f7f35dd 100644 --- a/packages/theme-check-common/src/checks/unsupported-doc-tag/index.ts +++ b/packages/theme-check-common/src/checks/unsupported-doc-tag/index.ts @@ -1,6 +1,5 @@ -import { isSnippet, isBlock } from '../../to-schema'; -import { LiquidCheckDefinition, Severity, SourceCodeType } from '../../types'; import { filePathSupportsLiquidDoc } from '../../liquid-doc/utils'; +import { LiquidCheckDefinition, Severity, SourceCodeType } from '../../types'; export const UnsupportedDocTag: LiquidCheckDefinition = { meta: { diff --git a/packages/theme-check-common/src/checks/unsupported-filter-arguments/index.spec.ts b/packages/theme-check-common/src/checks/unsupported-filter-arguments/index.spec.ts index 0ac72427d..00a577eb3 100644 --- a/packages/theme-check-common/src/checks/unsupported-filter-arguments/index.spec.ts +++ b/packages/theme-check-common/src/checks/unsupported-filter-arguments/index.spec.ts @@ -1,4 +1,4 @@ -import { expect, describe, it } from 'vitest'; +import { describe, expect, it } from 'vitest'; import { highlightedOffenses, runLiquidCheck } from '../../test'; import { UnsupportedFilterArguments } from './index'; diff --git a/packages/theme-check-common/src/checks/unused-assign/index.spec.ts b/packages/theme-check-common/src/checks/unused-assign/index.spec.ts index f5575077a..6d5c3797f 100644 --- a/packages/theme-check-common/src/checks/unused-assign/index.spec.ts +++ b/packages/theme-check-common/src/checks/unused-assign/index.spec.ts @@ -1,6 +1,6 @@ -import { expect, describe, it } from 'vitest'; +import { describe, expect, it } from 'vitest'; +import { applySuggestions, runLiquidCheck } from '../../test'; import { UnusedAssign } from './index'; -import { runLiquidCheck, applySuggestions } from '../../test'; describe('Module: UnusedAssign', () => { it('should report an error when a variable is assigned but not used', async () => { diff --git a/packages/theme-check-common/src/checks/unused-doc-param/index.spec.ts b/packages/theme-check-common/src/checks/unused-doc-param/index.spec.ts index dc94f2dba..38daec37d 100644 --- a/packages/theme-check-common/src/checks/unused-doc-param/index.spec.ts +++ b/packages/theme-check-common/src/checks/unused-doc-param/index.spec.ts @@ -1,7 +1,7 @@ -import { expect, describe, it } from 'vitest'; -import { UnusedDocParam } from './index'; -import { runLiquidCheck, applySuggestions } from '../../test'; import { LoopNamedTags } from '@shopify/liquid-html-parser'; +import { describe, expect, it } from 'vitest'; +import { applySuggestions, runLiquidCheck } from '../../test'; +import { UnusedDocParam } from './index'; describe('Module: UnusedDocParam', () => { it('should not report a warning when a variable is defined and used', async () => { diff --git a/packages/theme-check-common/src/checks/utils.ts b/packages/theme-check-common/src/checks/utils.ts index 73a89500c..765f908b9 100644 --- a/packages/theme-check-common/src/checks/utils.ts +++ b/packages/theme-check-common/src/checks/utils.ts @@ -1,18 +1,18 @@ import { - Position, - NodeTypes, - HtmlElement, - TextNode, + AttrDoubleQuoted, AttrEmpty, AttrSingleQuoted, - AttrDoubleQuoted, AttrUnquoted, - LiquidHtmlNode, + HtmlElement, LiquidBranch, + LiquidHtmlNode, + LiquidTag, LiquidTagFor, LiquidTagTablerow, - LiquidTag, LoopNamedTags, + NodeTypes, + Position, + TextNode, } from '@shopify/liquid-html-parser'; import { LiquidHtmlNodeOfType as NodeOfType } from '../types'; diff --git a/packages/theme-check-common/src/checks/valid-block-target/index.spec.ts b/packages/theme-check-common/src/checks/valid-block-target/index.spec.ts index 4a848b698..16890ce98 100644 --- a/packages/theme-check-common/src/checks/valid-block-target/index.spec.ts +++ b/packages/theme-check-common/src/checks/valid-block-target/index.spec.ts @@ -1,7 +1,7 @@ -import { expect, describe, it } from 'vitest'; -import { ValidBlockTarget } from './index'; +import { describe, expect, it } from 'vitest'; import { check, MockTheme } from '../../test'; import { Preset, Setting } from '../../types/schemas'; +import { ValidBlockTarget } from './index'; describe('Module: ValidBlockTarget', () => { const paths = ['sections', 'blocks']; diff --git a/packages/theme-check-common/src/checks/valid-block-target/index.ts b/packages/theme-check-common/src/checks/valid-block-target/index.ts index f08f4c8cd..837397544 100644 --- a/packages/theme-check-common/src/checks/valid-block-target/index.ts +++ b/packages/theme-check-common/src/checks/valid-block-target/index.ts @@ -10,11 +10,11 @@ import { } from '../../types'; import { getBlocks, + isInvalidDefaultBlock, + isInvalidPresetBlock, reportWarning, validateBlockFileExistence, validateNestedBlocks, - isInvalidPresetBlock, - isInvalidDefaultBlock, } from '../../utils'; export const ValidBlockTarget: LiquidCheckDefinition = { diff --git a/packages/theme-check-common/src/checks/valid-content-for-argument-types/index.spec.ts b/packages/theme-check-common/src/checks/valid-content-for-argument-types/index.spec.ts index aeff25c3b..caa07617f 100644 --- a/packages/theme-check-common/src/checks/valid-content-for-argument-types/index.spec.ts +++ b/packages/theme-check-common/src/checks/valid-content-for-argument-types/index.spec.ts @@ -1,7 +1,7 @@ -import { describe, it, expect } from 'vitest'; -import { runLiquidCheck, applySuggestions } from '../../test'; +import { describe, expect, it } from 'vitest'; import { ValidContentForArgumentTypes } from '.'; import { BasicParamTypes } from '../../liquid-doc/utils'; +import { applySuggestions, runLiquidCheck } from '../../test'; describe('Module: ValidContentForParamTypes', () => { describe('type validation', () => { diff --git a/packages/theme-check-common/src/checks/valid-content-for-argument-types/index.ts b/packages/theme-check-common/src/checks/valid-content-for-argument-types/index.ts index 45e2b0c73..b87f38eb2 100644 --- a/packages/theme-check-common/src/checks/valid-content-for-argument-types/index.ts +++ b/packages/theme-check-common/src/checks/valid-content-for-argument-types/index.ts @@ -1,4 +1,3 @@ -import { LiquidCheckDefinition, Severity, SourceCodeType } from '../../types'; import { ContentForMarkup } from '@shopify/liquid-html-parser'; import { findTypeMismatchParams, @@ -6,6 +5,7 @@ import { getLiquidDocParams, reportTypeMismatches, } from '../../liquid-doc/arguments'; +import { LiquidCheckDefinition, Severity, SourceCodeType } from '../../types'; export const ValidContentForArgumentTypes: LiquidCheckDefinition = { meta: { diff --git a/packages/theme-check-common/src/checks/valid-content-for-arguments/index.ts b/packages/theme-check-common/src/checks/valid-content-for-arguments/index.ts index 76a3ce18b..f99220205 100644 --- a/packages/theme-check-common/src/checks/valid-content-for-arguments/index.ts +++ b/packages/theme-check-common/src/checks/valid-content-for-arguments/index.ts @@ -1,10 +1,10 @@ import { ContentForMarkup, NodeTypes } from '@shopify/liquid-html-parser'; -import { LiquidCheckDefinition, Severity, SourceCodeType } from '../../types'; import { CLOSEST_ARGUMENT, REQUIRED_CONTENT_FOR_ARGUMENTS, RESERVED_CONTENT_FOR_ARGUMENTS, } from '../../tags/content-for'; +import { LiquidCheckDefinition, Severity, SourceCodeType } from '../../types'; export const ValidContentForArguments: LiquidCheckDefinition = { meta: { diff --git a/packages/theme-check-common/src/checks/valid-doc-param-types/index.spec.ts b/packages/theme-check-common/src/checks/valid-doc-param-types/index.spec.ts index 2e66619f2..7616db1d4 100644 --- a/packages/theme-check-common/src/checks/valid-doc-param-types/index.spec.ts +++ b/packages/theme-check-common/src/checks/valid-doc-param-types/index.spec.ts @@ -1,7 +1,7 @@ -import { expect, describe, it } from 'vitest'; -import { ValidDocParamTypes } from './index'; -import { runLiquidCheck, applySuggestions } from '../../test'; +import { describe, expect, it } from 'vitest'; import { BasicParamTypes } from '../../liquid-doc/utils'; +import { applySuggestions, runLiquidCheck } from '../../test'; +import { ValidDocParamTypes } from './index'; describe('Module: ValidDocParamTypes', () => { Object.values(BasicParamTypes).forEach((paramType) => { diff --git a/packages/theme-check-common/src/checks/valid-doc-param-types/index.ts b/packages/theme-check-common/src/checks/valid-doc-param-types/index.ts index 584fe82d4..897e5fb51 100644 --- a/packages/theme-check-common/src/checks/valid-doc-param-types/index.ts +++ b/packages/theme-check-common/src/checks/valid-doc-param-types/index.ts @@ -1,5 +1,5 @@ -import { LiquidCheckDefinition, Severity, SourceCodeType } from '../../types'; import { getValidParamTypes, parseParamType } from '../../liquid-doc/utils'; +import { LiquidCheckDefinition, Severity, SourceCodeType } from '../../types'; export const ValidDocParamTypes: LiquidCheckDefinition = { meta: { diff --git a/packages/theme-check-common/src/checks/valid-html-translation/index.spec.ts b/packages/theme-check-common/src/checks/valid-html-translation/index.spec.ts index f48e108e6..d2507dbad 100644 --- a/packages/theme-check-common/src/checks/valid-html-translation/index.spec.ts +++ b/packages/theme-check-common/src/checks/valid-html-translation/index.spec.ts @@ -1,6 +1,6 @@ -import { ValidHTMLTranslation } from './index'; +import { describe, expect, it } from 'vitest'; import { highlightedOffenses, runJSONCheck } from '../../test'; -import { expect, describe, it } from 'vitest'; +import { ValidHTMLTranslation } from './index'; describe('Module: ValidHTMLTranslation', () => { it('should not report valid HTML in translations', async () => { diff --git a/packages/theme-check-common/src/checks/valid-html-translation/index.ts b/packages/theme-check-common/src/checks/valid-html-translation/index.ts index 622af32b2..e356fa7c1 100644 --- a/packages/theme-check-common/src/checks/valid-html-translation/index.ts +++ b/packages/theme-check-common/src/checks/valid-html-translation/index.ts @@ -1,5 +1,5 @@ -import { SourceCodeType, JSONCheckDefinition, Severity, Problem, LiteralNode } from '../../types'; import { toLiquidHtmlAST } from '@shopify/liquid-html-parser'; +import { JSONCheckDefinition, LiteralNode, Problem, Severity, SourceCodeType } from '../../types'; export const ValidHTMLTranslation: JSONCheckDefinition = { meta: { diff --git a/packages/theme-check-common/src/checks/valid-json/index.spec.ts b/packages/theme-check-common/src/checks/valid-json/index.spec.ts index 0af297110..0d5046b52 100644 --- a/packages/theme-check-common/src/checks/valid-json/index.spec.ts +++ b/packages/theme-check-common/src/checks/valid-json/index.spec.ts @@ -1,6 +1,6 @@ -import { expect, describe, it } from 'vitest'; -import { ValidJSON } from './index'; +import { describe, expect, it } from 'vitest'; import { highlightedOffenses, runJSONCheck } from '../../test'; +import { ValidJSON } from './index'; describe('Module: ValidJSON', () => { it('should report an error for invalid JSON (0)', async () => { diff --git a/packages/theme-check-common/src/checks/valid-local-blocks/index.spec.ts b/packages/theme-check-common/src/checks/valid-local-blocks/index.spec.ts index be49a36a5..ffce28110 100644 --- a/packages/theme-check-common/src/checks/valid-local-blocks/index.spec.ts +++ b/packages/theme-check-common/src/checks/valid-local-blocks/index.spec.ts @@ -1,6 +1,6 @@ -import { expect, describe, it } from 'vitest'; -import { ValidLocalBlocks } from './index'; +import { describe, expect, it } from 'vitest'; import { check, MockTheme } from '../../test'; +import { ValidLocalBlocks } from './index'; describe('ValidLocalBlocks with array-style blocks', () => { it('should report errors when root level local blocks are defined in a block bucket', async () => { diff --git a/packages/theme-check-common/src/checks/valid-local-blocks/index.ts b/packages/theme-check-common/src/checks/valid-local-blocks/index.ts index 446dee4c2..bf8b64f35 100644 --- a/packages/theme-check-common/src/checks/valid-local-blocks/index.ts +++ b/packages/theme-check-common/src/checks/valid-local-blocks/index.ts @@ -1,14 +1,13 @@ +import { nodeAtPath } from '../../json'; +import { getSchema, isBlock, isSection } from '../../to-schema'; import { LiquidCheckDefinition, + LiteralNode, Preset, + Section, Severity, SourceCodeType, - Section, - LiteralNode, } from '../../types'; -import { nodeAtPath } from '../../json'; -import { getSchema } from '../../to-schema'; -import { isBlock, isSection } from '../../to-schema'; import { getBlocks, reportWarning } from './valid-block-utils'; type BlockNodeWithPath = { diff --git a/packages/theme-check-common/src/checks/valid-local-blocks/valid-block-utils.ts b/packages/theme-check-common/src/checks/valid-local-blocks/valid-block-utils.ts index afa4f592a..277557651 100644 --- a/packages/theme-check-common/src/checks/valid-local-blocks/valid-block-utils.ts +++ b/packages/theme-check-common/src/checks/valid-local-blocks/valid-block-utils.ts @@ -1,5 +1,5 @@ import { getLocEnd, getLocStart } from '../../json'; -import { Preset, ThemeBlock, Section, Context, SourceCodeType, LiteralNode } from '../../types'; +import { Context, LiteralNode, Preset, Section, SourceCodeType, ThemeBlock } from '../../types'; type BlockNodeWithPath = { node: Section.Block | ThemeBlock.Block | Preset.Block; diff --git a/packages/theme-check-common/src/checks/valid-render-snippet-argument-types/index.spec.ts b/packages/theme-check-common/src/checks/valid-render-snippet-argument-types/index.spec.ts index 6df33b4e3..dc83f013d 100644 --- a/packages/theme-check-common/src/checks/valid-render-snippet-argument-types/index.spec.ts +++ b/packages/theme-check-common/src/checks/valid-render-snippet-argument-types/index.spec.ts @@ -1,7 +1,7 @@ -import { describe, it, expect } from 'vitest'; -import { runLiquidCheck, applySuggestions } from '../../test'; +import { describe, expect, it } from 'vitest'; import { ValidRenderSnippetArgumentTypes } from '.'; import { BasicParamTypes } from '../../liquid-doc/utils'; +import { applySuggestions, runLiquidCheck } from '../../test'; describe('Module: ValidRenderSnippetParamTypes', () => { describe('type validation', () => { diff --git a/packages/theme-check-common/src/checks/valid-render-snippet-argument-types/index.ts b/packages/theme-check-common/src/checks/valid-render-snippet-argument-types/index.ts index 5fae39b1d..490b512f7 100644 --- a/packages/theme-check-common/src/checks/valid-render-snippet-argument-types/index.ts +++ b/packages/theme-check-common/src/checks/valid-render-snippet-argument-types/index.ts @@ -1,7 +1,4 @@ -import { LiquidCheckDefinition, Severity, SourceCodeType } from '../../types'; import { NodeTypes, RenderMarkup } from '@shopify/liquid-html-parser'; -import { LiquidDocParameter } from '../../liquid-doc/liquidDoc'; -import { inferArgumentType, isTypeCompatible } from '../../liquid-doc/utils'; import { findTypeMismatchParams, generateTypeMismatchSuggestions, @@ -9,6 +6,9 @@ import { getSnippetName, reportTypeMismatches, } from '../../liquid-doc/arguments'; +import { LiquidDocParameter } from '../../liquid-doc/liquidDoc'; +import { inferArgumentType, isTypeCompatible } from '../../liquid-doc/utils'; +import { LiquidCheckDefinition, Severity, SourceCodeType } from '../../types'; export const ValidRenderSnippetArgumentTypes: LiquidCheckDefinition = { meta: { diff --git a/packages/theme-check-common/src/checks/valid-schema-name/index.spec.ts b/packages/theme-check-common/src/checks/valid-schema-name/index.spec.ts index bd7b9938f..a657692d3 100644 --- a/packages/theme-check-common/src/checks/valid-schema-name/index.spec.ts +++ b/packages/theme-check-common/src/checks/valid-schema-name/index.spec.ts @@ -1,7 +1,7 @@ -import { expect, describe, it } from 'vitest'; -import { highlightedOffenses, runLiquidCheck, check } from '../../test'; -import { ValidSchemaName } from './index'; +import { describe, expect, it } from 'vitest'; import { ThemeSchemaType } from '../..'; +import { check, highlightedOffenses, runLiquidCheck } from '../../test'; +import { ValidSchemaName } from './index'; const DEFAULT_FILE_NAME = 'sections/file.liquid'; diff --git a/packages/theme-check-common/src/checks/valid-schema-translations/index.spec.ts b/packages/theme-check-common/src/checks/valid-schema-translations/index.spec.ts index bef08641c..4e0d9b9fa 100644 --- a/packages/theme-check-common/src/checks/valid-schema-translations/index.spec.ts +++ b/packages/theme-check-common/src/checks/valid-schema-translations/index.spec.ts @@ -1,5 +1,5 @@ -import { expect, describe, it } from 'vitest'; -import { highlightedOffenses, check } from '../../test'; +import { describe, expect, it } from 'vitest'; +import { check, highlightedOffenses } from '../../test'; import { ValidSchemaTranslations } from './index'; describe('Module: ValidSchemaTranslations', () => { diff --git a/packages/theme-check-common/src/checks/valid-schema-translations/index.ts b/packages/theme-check-common/src/checks/valid-schema-translations/index.ts index 7dcb14126..1292cd86c 100644 --- a/packages/theme-check-common/src/checks/valid-schema-translations/index.ts +++ b/packages/theme-check-common/src/checks/valid-schema-translations/index.ts @@ -1,8 +1,8 @@ import { getLocEnd, getLocStart } from '../../json'; +import { JSONNode, LiteralNode } from '../../jsonc/types'; import { getSchema } from '../../to-schema'; import { LiquidCheckDefinition, Severity, SourceCodeType } from '../../types'; import { deepGet } from '../../utils'; -import { JSONNode, LiteralNode } from '../../jsonc/types'; export const ValidSchemaTranslations: LiquidCheckDefinition = { meta: { diff --git a/packages/theme-check-common/src/checks/valid-schema/index.spec.ts b/packages/theme-check-common/src/checks/valid-schema/index.spec.ts index 3984ceaba..f163d6fbe 100644 --- a/packages/theme-check-common/src/checks/valid-schema/index.spec.ts +++ b/packages/theme-check-common/src/checks/valid-schema/index.spec.ts @@ -1,8 +1,8 @@ import lodashSet from 'lodash/set'; import { describe, expect, it } from 'vitest'; -import { runLiquidCheck, highlightedOffenses } from '../../test'; -import { ValidSchema } from './index'; +import { highlightedOffenses, runLiquidCheck } from '../../test'; import { Dependencies } from '../../types'; +import { ValidSchema } from './index'; const DEFAULT_FILE_NAME = 'sections/file.liquid'; const VALID_SECTION_SCHEMA = { diff --git a/packages/theme-check-common/src/checks/valid-scoped-css-class/index.spec.ts b/packages/theme-check-common/src/checks/valid-scoped-css-class/index.spec.ts index 58b033feb..9397ab334 100644 --- a/packages/theme-check-common/src/checks/valid-scoped-css-class/index.spec.ts +++ b/packages/theme-check-common/src/checks/valid-scoped-css-class/index.spec.ts @@ -1,6 +1,6 @@ -import { expect, describe, it } from 'vitest'; -import { ValidScopedCSSClass } from './index'; +import { describe, expect, it } from 'vitest'; import { check, runLiquidCheck } from '../../test'; +import { ValidScopedCSSClass } from './index'; describe('Module: ValidScopedCSSClass', () => { const noDeps = { diff --git a/packages/theme-check-common/src/checks/valid-scoped-css-class/index.ts b/packages/theme-check-common/src/checks/valid-scoped-css-class/index.ts index 4f043fa1c..1c842326c 100644 --- a/packages/theme-check-common/src/checks/valid-scoped-css-class/index.ts +++ b/packages/theme-check-common/src/checks/valid-scoped-css-class/index.ts @@ -1,21 +1,21 @@ import { - LiquidRawTag, HtmlElement, HtmlRawNode, - HtmlVoidElement, HtmlSelfClosingElement, + HtmlVoidElement, + LiquidRawTag, } from '@shopify/liquid-html-parser'; -import { LiquidCheckDefinition, Severity, SourceCodeType } from '../../types'; import { AbstractFileSystem } from '../../AbstractFileSystem'; import { recursiveReadDirectory } from '../../context-utils'; +import { LiquidCheckDefinition, Severity, SourceCodeType } from '../../types'; import { - extractCSSClassNames, collectUsedClasses, collectUsedClassesFromSvg, + extractCSSClassNames, } from '../../utils/styles'; import { - getAncestorUris, getAllSnippetDescendantUris, + getAncestorUris, getRenderedSnippetUris, } from '../../utils/traversal'; diff --git a/packages/theme-check-common/src/checks/valid-settings-key/index.spec.ts b/packages/theme-check-common/src/checks/valid-settings-key/index.spec.ts index 69bccea7c..6d727b5ef 100644 --- a/packages/theme-check-common/src/checks/valid-settings-key/index.spec.ts +++ b/packages/theme-check-common/src/checks/valid-settings-key/index.spec.ts @@ -1,4 +1,4 @@ -import { expect, describe, it } from 'vitest'; +import { describe, expect, it } from 'vitest'; import { check } from '../../test'; import { ValidSettingsKey } from './index'; diff --git a/packages/theme-check-common/src/checks/valid-settings-key/index.ts b/packages/theme-check-common/src/checks/valid-settings-key/index.ts index 0fbaebb53..7236c7a98 100644 --- a/packages/theme-check-common/src/checks/valid-settings-key/index.ts +++ b/packages/theme-check-common/src/checks/valid-settings-key/index.ts @@ -1,15 +1,15 @@ +import { nodeAtPath } from '../../json'; +import { getSchema, isSectionSchema } from '../../to-schema'; import { + JSONNode, LiquidCheckDefinition, - Severity, - SourceCodeType, Preset, Section, - ThemeBlock, - JSONNode, Setting, + Severity, + SourceCodeType, + ThemeBlock, } from '../../types'; -import { nodeAtPath } from '../../json'; -import { getSchema, isSectionSchema } from '../../to-schema'; import { BlockDefNodeWithPath, getBlocks, reportWarning } from '../../utils'; export const ValidSettingsKey: LiquidCheckDefinition = { diff --git a/packages/theme-check-common/src/checks/valid-static-block-type/index.spec.ts b/packages/theme-check-common/src/checks/valid-static-block-type/index.spec.ts index b7cfd03a6..b5441c5cd 100644 --- a/packages/theme-check-common/src/checks/valid-static-block-type/index.spec.ts +++ b/packages/theme-check-common/src/checks/valid-static-block-type/index.spec.ts @@ -1,6 +1,5 @@ import { describe, expect, it } from 'vitest'; import { check, MockTheme } from '../../test'; -import { ValidStaticBlockType } from '.'; describe('Module: ValidStaticBlockType', () => { const genericThemeBlock = { diff --git a/packages/theme-check-common/src/checks/valid-visible-if/index.spec.ts b/packages/theme-check-common/src/checks/valid-visible-if/index.spec.ts index 65a23cee1..70c452e11 100644 --- a/packages/theme-check-common/src/checks/valid-visible-if/index.spec.ts +++ b/packages/theme-check-common/src/checks/valid-visible-if/index.spec.ts @@ -1,4 +1,4 @@ -import { expect, describe, it } from 'vitest'; +import { describe, expect, it } from 'vitest'; import { check } from '../../test'; import { ValidVisibleIf, ValidVisibleIfSettingsSchema } from './index'; diff --git a/packages/theme-check-common/src/checks/valid-visible-if/index.ts b/packages/theme-check-common/src/checks/valid-visible-if/index.ts index 531913934..e52d110b7 100644 --- a/packages/theme-check-common/src/checks/valid-visible-if/index.ts +++ b/packages/theme-check-common/src/checks/valid-visible-if/index.ts @@ -1,18 +1,18 @@ import { type LiquidVariableLookup } from '@shopify/liquid-html-parser'; +import { getLocStart, nodeAtPath } from '../../json'; +import { getSchema, isBlockSchema, isSectionSchema } from '../../to-schema'; import { Severity, SourceCodeType, - type LiquidCheckDefinition, type JSONCheckDefinition, + type LiquidCheckDefinition, } from '../../types'; -import { getLocStart, nodeAtPath } from '../../json'; -import { getSchema, isBlockSchema, isSectionSchema } from '../../to-schema'; import { reportWarning } from '../../utils'; import { getGlobalSettings, getVariableLookupsInExpression, - validateLookup, offsetAdjust, + validateLookup, type Vars, } from './visible-if-utils'; diff --git a/packages/theme-check-common/src/checks/variable-name/index.spec.ts b/packages/theme-check-common/src/checks/variable-name/index.spec.ts index 9d8321102..4e91124e3 100644 --- a/packages/theme-check-common/src/checks/variable-name/index.spec.ts +++ b/packages/theme-check-common/src/checks/variable-name/index.spec.ts @@ -1,6 +1,6 @@ -import { expect, describe, it } from 'vitest'; -import { VariableName } from './index'; +import { describe, expect, it } from 'vitest'; import { applySuggestions, runLiquidCheck } from '../../test'; +import { VariableName } from './index'; describe('Module: VariableName', () => { it('should report an error when a variable is using wrong naming format', async () => { diff --git a/packages/theme-check-common/src/checks/variable-name/index.ts b/packages/theme-check-common/src/checks/variable-name/index.ts index f682d908a..8ab8b5f95 100644 --- a/packages/theme-check-common/src/checks/variable-name/index.ts +++ b/packages/theme-check-common/src/checks/variable-name/index.ts @@ -5,8 +5,8 @@ import { LiquidTagCapture, NodeTypes, } from '@shopify/liquid-html-parser'; -import { LiquidCheckDefinition, SchemaProp, Severity, SourceCodeType } from '../../types'; import { camelCase, kebabCase, snakeCase } from 'lodash'; +import { LiquidCheckDefinition, SchemaProp, Severity, SourceCodeType } from '../../types'; const pascalCase = (string: string) => { const camelCased = camelCase(string); diff --git a/packages/theme-check-common/src/context-utils.spec.ts b/packages/theme-check-common/src/context-utils.spec.ts index 0f8e6a22c..5ba0f9289 100644 --- a/packages/theme-check-common/src/context-utils.spec.ts +++ b/packages/theme-check-common/src/context-utils.spec.ts @@ -1,11 +1,11 @@ import { beforeEach, describe, expect, it } from 'vitest'; +import { AbstractFileSystem } from './AbstractFileSystem'; import { makeGetDefaultLocale, makeGetDefaultTranslations, makeGetMetafieldDefinitions, } from './context-utils'; import { MockFileSystem } from './test'; -import { AbstractFileSystem } from './AbstractFileSystem'; describe('Unit: getDefaultLocale', () => { let fs: AbstractFileSystem; diff --git a/packages/theme-check-common/src/disabled-checks/index.spec.ts b/packages/theme-check-common/src/disabled-checks/index.spec.ts index 7c7233dc2..d5abc9342 100644 --- a/packages/theme-check-common/src/disabled-checks/index.spec.ts +++ b/packages/theme-check-common/src/disabled-checks/index.spec.ts @@ -1,9 +1,9 @@ -import { check } from '../test'; +import { describe, expect, it } from 'vitest'; import { Offense } from '..'; -import { describe, it, expect } from 'vitest'; -import { LiquidFilter, RenderMarkup } from './test-checks'; import { UndefinedObject } from '../checks/undefined-object'; import { UniqueDocParamNames } from '../checks/unique-doc-param-names'; +import { check } from '../test'; +import { LiquidFilter, RenderMarkup } from './test-checks'; const commentTypes = [ (text: string) => `{% # ${text} %}`, diff --git a/packages/theme-check-common/src/disabled-checks/index.ts b/packages/theme-check-common/src/disabled-checks/index.ts index dd925df39..2bcdf3153 100644 --- a/packages/theme-check-common/src/disabled-checks/index.ts +++ b/packages/theme-check-common/src/disabled-checks/index.ts @@ -7,8 +7,8 @@ import { SourceCodeType, UriString, } from '../types'; -import { findCurrentNode } from '../visitor'; import { isError } from '../utils'; +import { findCurrentNode } from '../visitor'; type CheckName = string; type DisabledChecksMap = Map>; diff --git a/packages/theme-check-common/src/disabled-checks/test-checks.ts b/packages/theme-check-common/src/disabled-checks/test-checks.ts index 07f84e8f3..4f1e48e3a 100644 --- a/packages/theme-check-common/src/disabled-checks/test-checks.ts +++ b/packages/theme-check-common/src/disabled-checks/test-checks.ts @@ -1,5 +1,5 @@ -import { LiquidCheckDefinition, Severity, SourceCodeType } from '..'; import { NodeTypes } from '@shopify/liquid-html-parser'; +import { LiquidCheckDefinition, Severity, SourceCodeType } from '..'; export const LiquidFilter: LiquidCheckDefinition = { meta: { diff --git a/packages/theme-check-common/src/fixes/apply-fix-to-string.spec.ts b/packages/theme-check-common/src/fixes/apply-fix-to-string.spec.ts index 7ba785657..74a277f80 100644 --- a/packages/theme-check-common/src/fixes/apply-fix-to-string.spec.ts +++ b/packages/theme-check-common/src/fixes/apply-fix-to-string.spec.ts @@ -1,4 +1,4 @@ -import { expect, describe, it } from 'vitest'; +import { describe, expect, it } from 'vitest'; import { applyFixToString } from './apply-fix-to-string'; // You'll be happy to note that ChatGPT kind of generated this as well. diff --git a/packages/theme-check-common/src/fixes/autofix.spec.ts b/packages/theme-check-common/src/fixes/autofix.spec.ts index ee7969466..f349f86a6 100644 --- a/packages/theme-check-common/src/fixes/autofix.spec.ts +++ b/packages/theme-check-common/src/fixes/autofix.spec.ts @@ -1,4 +1,4 @@ -import { expect, describe, it } from 'vitest'; +import { describe, expect, it } from 'vitest'; import { autofix, prettyJSON } from '../test'; import { Offense, SourceCodeType } from '../types'; diff --git a/packages/theme-check-common/src/fixes/correctors/json-corrector.spec.ts b/packages/theme-check-common/src/fixes/correctors/json-corrector.spec.ts index d19dce11a..659bfe913 100644 --- a/packages/theme-check-common/src/fixes/correctors/json-corrector.spec.ts +++ b/packages/theme-check-common/src/fixes/correctors/json-corrector.spec.ts @@ -1,6 +1,6 @@ -import { expect, describe, it } from 'vitest'; -import { JSONCorrector } from './json-corrector'; +import { describe, expect, it } from 'vitest'; import { prettyJSON } from '../../test'; +import { JSONCorrector } from './json-corrector'; describe('Module: JSONCorrector', () => { it('should collect add patches and apply them', () => { diff --git a/packages/theme-check-common/src/fixes/index.ts b/packages/theme-check-common/src/fixes/index.ts index 4d86aa744..f960c587e 100644 --- a/packages/theme-check-common/src/fixes/index.ts +++ b/packages/theme-check-common/src/fixes/index.ts @@ -1,4 +1,4 @@ -export { flattenFixes } from './utils'; -export { StringCorrector, JSONCorrector, createCorrector } from './correctors'; -export { autofix } from './autofix'; export { applyFixToString } from './apply-fix-to-string'; +export { autofix } from './autofix'; +export { JSONCorrector, StringCorrector, createCorrector } from './correctors'; +export { flattenFixes } from './utils'; diff --git a/packages/theme-check-common/src/ignore.spec.ts b/packages/theme-check-common/src/ignore.spec.ts index b746f6ded..ac5a2610a 100644 --- a/packages/theme-check-common/src/ignore.spec.ts +++ b/packages/theme-check-common/src/ignore.spec.ts @@ -1,6 +1,6 @@ -import { expect, describe, it } from 'vitest'; +import { describe, expect, it } from 'vitest'; import { isIgnored } from './ignore'; -import { UriString, CheckDefinition, Config, SourceCodeType } from './types'; +import { CheckDefinition, Config, SourceCodeType, UriString } from './types'; const checkDef: CheckDefinition = { meta: { diff --git a/packages/theme-check-common/src/ignore.ts b/packages/theme-check-common/src/ignore.ts index 21868b647..0c604f1e9 100644 --- a/packages/theme-check-common/src/ignore.ts +++ b/packages/theme-check-common/src/ignore.ts @@ -1,5 +1,5 @@ -import { UriString, CheckDefinition, Config } from './types'; import { minimatch } from 'minimatch'; +import { CheckDefinition, Config, UriString } from './types'; export function isIgnored(uri: UriString, config: Config, checkDef?: CheckDefinition): boolean { const ignorePatterns = [...checkIgnorePatterns(checkDef, config), ...asArray(config.ignore)].map( diff --git a/packages/theme-check-common/src/index.spec.ts b/packages/theme-check-common/src/index.spec.ts index 2c7cb1eb7..67d279168 100644 --- a/packages/theme-check-common/src/index.spec.ts +++ b/packages/theme-check-common/src/index.spec.ts @@ -1,4 +1,4 @@ -import { expect, describe, it } from 'vitest'; +import { describe, expect, it } from 'vitest'; import { check } from './index'; describe('Module: Hello World', () => { diff --git a/packages/theme-check-common/src/index.ts b/packages/theme-check-common/src/index.ts index ba2464ce1..4f7788b6f 100644 --- a/packages/theme-check-common/src/index.ts +++ b/packages/theme-check-common/src/index.ts @@ -40,13 +40,16 @@ import { visitJSON, visitLiquid } from './visitors'; export * from './AbstractFileSystem'; export * from './AugmentedThemeDocset'; +export * from './JSONValidator'; export * from './checks'; export * from './context-utils'; export * from './find-root'; export * from './fixes'; export * from './ignore'; export * from './json'; -export * from './JSONValidator'; +export { getBlockName } from './liquid-doc/arguments'; +export * from './liquid-doc/liquidDoc'; +export * from './liquid-doc/utils'; export * as path from './path'; export * from './to-schema'; export * from './to-source-code'; @@ -54,14 +57,11 @@ export * from './types'; export * from './utils/error'; export * from './utils/indexBy'; export * from './utils/memo'; -export * from './utils/types'; export * from './utils/object'; export * from './utils/styles'; export * from './utils/traversal'; +export * from './utils/types'; export * from './visitor'; -export * from './liquid-doc/liquidDoc'; -export { getBlockName } from './liquid-doc/arguments'; -export * from './liquid-doc/utils'; const defaultErrorHandler = (_error: Error): void => { // Silently ignores errors by default. diff --git a/packages/theme-check-common/src/json.spec.ts b/packages/theme-check-common/src/json.spec.ts index c82b62090..89548e61a 100644 --- a/packages/theme-check-common/src/json.spec.ts +++ b/packages/theme-check-common/src/json.spec.ts @@ -1,4 +1,4 @@ -import { describe, it, expect, assert } from 'vitest'; +import { assert, describe, expect, it } from 'vitest'; import { nodeAtPath, parseJSON } from './json'; import { toJSONAST } from './to-source-code'; diff --git a/packages/theme-check-common/src/jsonc/parse.spec.ts b/packages/theme-check-common/src/jsonc/parse.spec.ts index df3b62a98..2b98856ab 100644 --- a/packages/theme-check-common/src/jsonc/parse.spec.ts +++ b/packages/theme-check-common/src/jsonc/parse.spec.ts @@ -1,5 +1,5 @@ import { describe, expect, it } from 'vitest'; -import { toJSONNode, location } from './parse'; +import { location, toJSONNode } from './parse'; describe('module: toJSONNode', () => { it('should parse basic key-value pairs', () => { diff --git a/packages/theme-check-common/src/jsonc/parse.ts b/packages/theme-check-common/src/jsonc/parse.ts index 3df559905..1bfc27905 100644 --- a/packages/theme-check-common/src/jsonc/parse.ts +++ b/packages/theme-check-common/src/jsonc/parse.ts @@ -1,3 +1,4 @@ +import { Node as JSONCParserNode, ParseError, parseTree } from 'jsonc-parser'; import { assertNever } from '../utils'; import { ArrayNode, @@ -8,7 +9,6 @@ import { PropertyNode, ValueNode, } from './types'; -import { Node as JSONCParserNode, ParseError, parseTree } from 'jsonc-parser'; export class JSONCParseErrors extends Error { public errors: ParseError[]; diff --git a/packages/theme-check-common/src/liquid-doc/arguments.spec.ts b/packages/theme-check-common/src/liquid-doc/arguments.spec.ts index 84d006a5e..18351ef38 100644 --- a/packages/theme-check-common/src/liquid-doc/arguments.spec.ts +++ b/packages/theme-check-common/src/liquid-doc/arguments.spec.ts @@ -1,8 +1,8 @@ +import { ContentForMarkup, DocumentNode, LiquidTag } from '@shopify/liquid-html-parser'; import { describe, expect, it } from 'vitest'; +import { SourceCodeType, toLiquidHTMLAST } from '..'; import { applyFixToString, createCorrector } from '../fixes'; import { makeAddArgumentCorrector, makeRemoveArgumentCorrector } from './arguments'; -import { ContentForMarkup, DocumentNode, LiquidTag } from '@shopify/liquid-html-parser'; -import { SourceCodeType, toLiquidHTMLAST } from '..'; describe('Arguments', () => { describe('makeAddArgumentCorrector', () => { diff --git a/packages/theme-check-common/src/liquid-doc/arguments.ts b/packages/theme-check-common/src/liquid-doc/arguments.ts index 5aa749e40..0188299f6 100644 --- a/packages/theme-check-common/src/liquid-doc/arguments.ts +++ b/packages/theme-check-common/src/liquid-doc/arguments.ts @@ -4,18 +4,18 @@ */ import { ContentForMarkup, - RenderMarkup, LiquidNamedArgument, NodeTypes, + RenderMarkup, } from '@shopify/liquid-html-parser'; import { Context, LiquidDocParameter, SourceCodeType, StringCorrector } from '..'; +import { isLiquidString } from '../checks/utils'; import { BasicParamTypes, getDefaultValueForType, inferArgumentType, isTypeCompatible, } from './utils'; -import { isLiquidString } from '../checks/utils'; /** * Report error when unknown arguments are provided for `content_for` tag or `render` tag diff --git a/packages/theme-check-common/src/liquid-doc/liquidDoc.spec.ts b/packages/theme-check-common/src/liquid-doc/liquidDoc.spec.ts index 24a941efe..402aa55f5 100644 --- a/packages/theme-check-common/src/liquid-doc/liquidDoc.spec.ts +++ b/packages/theme-check-common/src/liquid-doc/liquidDoc.spec.ts @@ -1,4 +1,4 @@ -import { expect, it, describe } from 'vitest'; +import { describe, expect, it } from 'vitest'; import { toSourceCode } from '../to-source-code'; import { LiquidHtmlNode } from '../types'; import { extractDocDefinition } from './liquidDoc'; diff --git a/packages/theme-check-common/src/liquid-doc/liquidDoc.ts b/packages/theme-check-common/src/liquid-doc/liquidDoc.ts index 923e95982..17683e09a 100644 --- a/packages/theme-check-common/src/liquid-doc/liquidDoc.ts +++ b/packages/theme-check-common/src/liquid-doc/liquidDoc.ts @@ -1,11 +1,10 @@ -import { SourceCodeType, UriString } from '../types'; -import { visit } from '../visitor'; -import { LiquidHtmlNode } from '../types'; import { + LiquidDocDescriptionNode, LiquidDocExampleNode, LiquidDocParamNode, - LiquidDocDescriptionNode, } from '@shopify/liquid-html-parser'; +import { LiquidHtmlNode, SourceCodeType, UriString } from '../types'; +import { visit } from '../visitor'; export type GetDocDefinitionForURI = ( uri: UriString, diff --git a/packages/theme-check-common/src/liquid-doc/utils.ts b/packages/theme-check-common/src/liquid-doc/utils.ts index bd47d15ef..54a3cdd79 100644 --- a/packages/theme-check-common/src/liquid-doc/utils.ts +++ b/packages/theme-check-common/src/liquid-doc/utils.ts @@ -1,8 +1,7 @@ import { LiquidExpression, NodeTypes } from '@shopify/liquid-html-parser'; -import { assertNever } from '../utils'; -import { isSnippet } from '../to-schema'; -import { isBlock } from '../to-schema'; +import { isBlock, isSnippet } from '../to-schema'; import { ObjectEntry, UriString } from '../types'; +import { assertNever } from '../utils'; /** * The base set of supported param types for LiquidDoc. diff --git a/packages/theme-check-common/src/path.ts b/packages/theme-check-common/src/path.ts index 9a4ef76fb..f1a10d86c 100644 --- a/packages/theme-check-common/src/path.ts +++ b/packages/theme-check-common/src/path.ts @@ -1,5 +1,5 @@ -import { RelativePath, UriString } from './types'; import { URI, Utils } from 'vscode-uri'; +import { RelativePath, UriString } from './types'; export { URI, Utils }; diff --git a/packages/theme-check-common/src/test/MockFileSystem.spec.ts b/packages/theme-check-common/src/test/MockFileSystem.spec.ts index affe36314..e391c177e 100644 --- a/packages/theme-check-common/src/test/MockFileSystem.spec.ts +++ b/packages/theme-check-common/src/test/MockFileSystem.spec.ts @@ -1,6 +1,6 @@ import { beforeEach, describe, expect, it } from 'vitest'; -import { MockFileSystem } from './MockFileSystem'; import { FileType } from '../AbstractFileSystem'; +import { MockFileSystem } from './MockFileSystem'; describe('MockFileSystem', () => { let fs: MockFileSystem; diff --git a/packages/theme-check-common/src/test/MockFileSystem.ts b/packages/theme-check-common/src/test/MockFileSystem.ts index ec559d178..5af040135 100644 --- a/packages/theme-check-common/src/test/MockFileSystem.ts +++ b/packages/theme-check-common/src/test/MockFileSystem.ts @@ -1,8 +1,8 @@ import { AbstractFileSystem, FileStat, FileTuple, FileType } from '../AbstractFileSystem'; -import { deepGet } from '../utils'; +import * as path from '../path'; import { normalize, relative } from '../path'; +import { deepGet } from '../utils'; import { MockTheme } from './MockTheme'; -import * as path from '../path'; interface FileTree { [fileName: string]: string | FileTree; diff --git a/packages/theme-check-common/src/test/chai-offer-fix-assertion.spec.ts b/packages/theme-check-common/src/test/chai-offer-fix-assertion.spec.ts index 47dda0847..bd7f288ff 100644 --- a/packages/theme-check-common/src/test/chai-offer-fix-assertion.spec.ts +++ b/packages/theme-check-common/src/test/chai-offer-fix-assertion.spec.ts @@ -1,5 +1,5 @@ -import { expect, describe, it } from 'vitest'; -import { LiquidHtmlSuggestion, Offense, Fix, SourceCodeType } from '../types'; +import { describe, expect, it } from 'vitest'; +import { Fix, LiquidHtmlSuggestion, Offense, SourceCodeType } from '../types'; describe('Module: SuggestAssertion', () => { const file = 'I love tea!'; diff --git a/packages/theme-check-common/src/test/chai-offer-fix-assertion.ts b/packages/theme-check-common/src/test/chai-offer-fix-assertion.ts index bbccb242c..51cfdea37 100644 --- a/packages/theme-check-common/src/test/chai-offer-fix-assertion.ts +++ b/packages/theme-check-common/src/test/chai-offer-fix-assertion.ts @@ -1,6 +1,6 @@ import { chai } from 'vitest'; import { createCorrector } from '../fixes'; -import { Offense, Fix } from '../types'; +import { Fix, Offense } from '../types'; const { util } = chai; declare module 'vitest' { diff --git a/packages/theme-check-common/src/test/chai-suggest-assertion.spec.ts b/packages/theme-check-common/src/test/chai-suggest-assertion.spec.ts index 47dda0847..bd7f288ff 100644 --- a/packages/theme-check-common/src/test/chai-suggest-assertion.spec.ts +++ b/packages/theme-check-common/src/test/chai-suggest-assertion.spec.ts @@ -1,5 +1,5 @@ -import { expect, describe, it } from 'vitest'; -import { LiquidHtmlSuggestion, Offense, Fix, SourceCodeType } from '../types'; +import { describe, expect, it } from 'vitest'; +import { Fix, LiquidHtmlSuggestion, Offense, SourceCodeType } from '../types'; describe('Module: SuggestAssertion', () => { const file = 'I love tea!'; diff --git a/packages/theme-check-common/src/test/chai-suggest-assertion.ts b/packages/theme-check-common/src/test/chai-suggest-assertion.ts index dc46550ea..74cb6b88b 100644 --- a/packages/theme-check-common/src/test/chai-suggest-assertion.ts +++ b/packages/theme-check-common/src/test/chai-suggest-assertion.ts @@ -1,6 +1,6 @@ import { chai } from 'vitest'; import { createCorrector, flattenFixes } from '../fixes'; -import { Offense, Fix } from '../types'; +import { Fix, Offense } from '../types'; const { util } = chai; diff --git a/packages/theme-check-common/src/test/contain-offense.spec.ts b/packages/theme-check-common/src/test/contain-offense.spec.ts index cfa87e16e..3d240f899 100644 --- a/packages/theme-check-common/src/test/contain-offense.spec.ts +++ b/packages/theme-check-common/src/test/contain-offense.spec.ts @@ -1,6 +1,6 @@ -import { expect, describe, it } from 'vitest'; -import { Offense, SourceCodeType } from '../types'; +import { describe, expect, it } from 'vitest'; import { path } from '..'; +import { Offense, SourceCodeType } from '../types'; const rootUri = 'file:///'; diff --git a/packages/theme-check-common/src/test/test-setup.ts b/packages/theme-check-common/src/test/test-setup.ts index b906fcf4c..46767315c 100644 --- a/packages/theme-check-common/src/test/test-setup.ts +++ b/packages/theme-check-common/src/test/test-setup.ts @@ -1,7 +1,7 @@ import { chai, expect } from 'vitest'; -import { containOffense } from './contain-offense'; import { OfferFixAssertion } from './chai-offer-fix-assertion'; import { SuggestAssertion } from './chai-suggest-assertion'; +import { containOffense } from './contain-offense'; /** * Setup chai extensions diff --git a/packages/theme-check-common/src/to-schema.ts b/packages/theme-check-common/src/to-schema.ts index a023a325f..db7d214d7 100644 --- a/packages/theme-check-common/src/to-schema.ts +++ b/packages/theme-check-common/src/to-schema.ts @@ -4,18 +4,18 @@ import * as path from './path'; import { toJSONAST } from './to-source-code'; import { AppBlockSchema, - ThemeBlockSchema, + Context, IsValidSchema, LiquidHtmlNode, + Schema, SectionSchema, SourceCode, SourceCodeType, + StaticBlockDef, ThemeBlock, + ThemeBlockSchema, ThemeSchemaType, UriString, - Context, - Schema, - StaticBlockDef, } from './types'; import { visit } from './visitor'; diff --git a/packages/theme-check-common/src/types.ts b/packages/theme-check-common/src/types.ts index 692c92617..d69c18cf4 100644 --- a/packages/theme-check-common/src/types.ts +++ b/packages/theme-check-common/src/types.ts @@ -15,9 +15,9 @@ import { PropertyNode, ValueNode, } from './jsonc/types'; +import { DocDefinition } from './liquid-doc/liquidDoc'; import { JsonValidationSet, ThemeDocset } from './types/theme-liquid-docs'; import { AppBlockSchema, SectionSchema, ThemeBlockSchema } from './types/theme-schemas'; -import { DocDefinition } from './liquid-doc/liquidDoc'; export * from './jsonc/types'; export * from './types/schema-prop-factory'; diff --git a/packages/theme-check-common/src/types/schemas/index.ts b/packages/theme-check-common/src/types/schemas/index.ts index d861e0d3e..ce3011f22 100644 --- a/packages/theme-check-common/src/types/schemas/index.ts +++ b/packages/theme-check-common/src/types/schemas/index.ts @@ -1,5 +1,5 @@ -export { ThemeBlock } from './theme-block'; +export { Preset } from './preset'; export { Section } from './section'; export { Setting } from './setting'; -export { Preset } from './preset'; export { Template } from './template'; +export { ThemeBlock } from './theme-block'; diff --git a/packages/theme-check-common/src/types/schemas/section.ts b/packages/theme-check-common/src/types/schemas/section.ts index b1625283f..85944cf89 100644 --- a/packages/theme-check-common/src/types/schemas/section.ts +++ b/packages/theme-check-common/src/types/schemas/section.ts @@ -1,5 +1,5 @@ -import { Setting } from './setting'; import { Preset } from './preset'; +import { Setting } from './setting'; export declare namespace Section { /** {% schema %} */ diff --git a/packages/theme-check-common/src/types/schemas/theme-block.ts b/packages/theme-check-common/src/types/schemas/theme-block.ts index 9bddb70a8..b764c9a97 100644 --- a/packages/theme-check-common/src/types/schemas/theme-block.ts +++ b/packages/theme-check-common/src/types/schemas/theme-block.ts @@ -1,5 +1,5 @@ -import { Setting } from './setting'; import { Preset } from './preset'; +import { Setting } from './setting'; export declare namespace ThemeBlock { /** Typed content of {% schema %} after passing validation */ diff --git a/packages/theme-check-common/src/utils/block.ts b/packages/theme-check-common/src/utils/block.ts index d87e60970..ff7df6b00 100644 --- a/packages/theme-check-common/src/utils/block.ts +++ b/packages/theme-check-common/src/utils/block.ts @@ -1,14 +1,14 @@ +import { getLocEnd, getLocStart, nodeAtPath } from '../json'; import { + Context, JSONNode, LiteralNode, Preset, Section, SourceCodeType, - ThemeBlock, - Context, StaticBlockDef, + ThemeBlock, } from '../types'; -import { getLocEnd, getLocStart, nodeAtPath } from '../json'; import { doesFileExist } from './file-utils'; export type BlockDefNodeWithPath = { diff --git a/packages/theme-check-common/src/utils/error.spec.ts b/packages/theme-check-common/src/utils/error.spec.ts index 90b578f1a..f98a29045 100644 --- a/packages/theme-check-common/src/utils/error.spec.ts +++ b/packages/theme-check-common/src/utils/error.spec.ts @@ -1,5 +1,5 @@ -import { describe, it, expect } from 'vitest'; import { ParseErrorCode } from 'jsonc-parser'; +import { describe, expect, it } from 'vitest'; import { asError, isError } from './error'; describe('Function: asError', () => { diff --git a/packages/theme-check-common/src/utils/file-utils.ts b/packages/theme-check-common/src/utils/file-utils.ts index 6f10b12fd..1118524f9 100644 --- a/packages/theme-check-common/src/utils/file-utils.ts +++ b/packages/theme-check-common/src/utils/file-utils.ts @@ -1,5 +1,5 @@ -import { Context, SourceCodeType, Schema, RelativePath } from '../types'; import { fetch } from 'cross-fetch'; +import { Context, RelativePath, Schema, SourceCodeType } from '../types'; export async function doesFileExist( context: Context, diff --git a/packages/theme-check-common/src/utils/index.ts b/packages/theme-check-common/src/utils/index.ts index c3f506fc0..e5f9a2088 100644 --- a/packages/theme-check-common/src/utils/index.ts +++ b/packages/theme-check-common/src/utils/index.ts @@ -1,10 +1,10 @@ -export * from './object'; export * from './array'; -export * from './position'; +export * from './block'; export * from './error'; -export * from './types'; -export * from './memo'; export * from './indexBy'; -export * from './block'; +export * from './memo'; +export * from './object'; +export * from './position'; export * from './styles'; export * from './traversal'; +export * from './types'; diff --git a/packages/theme-check-common/src/utils/memo.spec.ts b/packages/theme-check-common/src/utils/memo.spec.ts index 3140b44e9..5fedd934d 100644 --- a/packages/theme-check-common/src/utils/memo.spec.ts +++ b/packages/theme-check-common/src/utils/memo.spec.ts @@ -1,4 +1,4 @@ -import { describe, it, expect, vi, beforeEach } from 'vitest'; +import { beforeEach, describe, expect, it, vi } from 'vitest'; import { memo, memoize } from './memo'; describe('memo', () => { diff --git a/packages/theme-check-common/src/utils/styles.spec.ts b/packages/theme-check-common/src/utils/styles.spec.ts index 75aa8adcf..30ab6f2ad 100644 --- a/packages/theme-check-common/src/utils/styles.spec.ts +++ b/packages/theme-check-common/src/utils/styles.spec.ts @@ -1,13 +1,13 @@ -import { expect, describe, it } from 'vitest'; -import { toLiquidHtmlAST, NodeTypes } from '@shopify/liquid-html-parser'; +import { toLiquidHtmlAST } from '@shopify/liquid-html-parser'; +import { describe, expect, it } from 'vitest'; +import { MockFileSystem } from '../test/MockFileSystem'; import { - extractCSSClassNames, - extractCSSClassesFromLiquidUri, - extractCSSClassesFromAssetUri, collectUsedClasses, collectUsedClassesFromSvg, + extractCSSClassNames, + extractCSSClassesFromAssetUri, + extractCSSClassesFromLiquidUri, } from './styles'; -import { MockFileSystem } from '../test/MockFileSystem'; describe('extractCSSClassNames', () => { it('extracts simple class selectors', () => { diff --git a/packages/theme-check-common/src/utils/styles.ts b/packages/theme-check-common/src/utils/styles.ts index 315158f72..9379605c1 100644 --- a/packages/theme-check-common/src/utils/styles.ts +++ b/packages/theme-check-common/src/utils/styles.ts @@ -1,16 +1,16 @@ import { + AttributeNode, + LiquidHtmlNode, + LiquidRawTag, NodeTypes, TextNode, - LiquidRawTag, - LiquidHtmlNode, toLiquidHtmlAST, - AttributeNode, } from '@shopify/liquid-html-parser'; import safeParse from 'postcss-safe-parser'; import selectorParser from 'postcss-selector-parser'; -import { SourceCodeType } from '../types'; import { AbstractFileSystem } from '../AbstractFileSystem'; import { isValuedHtmlAttribute, ValuedHtmlAttribute } from '../checks/utils'; +import { SourceCodeType } from '../types'; import { visit } from '../visitor'; export function extractCSSClassNames(css: string): Set { diff --git a/packages/theme-check-common/src/utils/traversal.spec.ts b/packages/theme-check-common/src/utils/traversal.spec.ts index fbf05a2fa..ab7f80e15 100644 --- a/packages/theme-check-common/src/utils/traversal.spec.ts +++ b/packages/theme-check-common/src/utils/traversal.spec.ts @@ -1,6 +1,6 @@ -import { expect, describe, it } from 'vitest'; +import { describe, expect, it } from 'vitest'; import { Reference } from '../types'; -import { getAncestorUris, getAllSnippetDescendantUris, getRenderedSnippetUris } from './traversal'; +import { getAllSnippetDescendantUris, getAncestorUris, getRenderedSnippetUris } from './traversal'; function ref( sourceUri: string, diff --git a/packages/theme-check-common/src/utils/traversal.ts b/packages/theme-check-common/src/utils/traversal.ts index 1c631859c..f609f9504 100644 --- a/packages/theme-check-common/src/utils/traversal.ts +++ b/packages/theme-check-common/src/utils/traversal.ts @@ -1,5 +1,5 @@ -import { Reference } from '../types'; import { isSnippet } from '../to-schema'; +import { Reference } from '../types'; /** BFS upward through direct references to find all ancestor URIs. */ export async function getAncestorUris( diff --git a/packages/theme-check-common/src/visitor.spec.ts b/packages/theme-check-common/src/visitor.spec.ts index a7983e5fa..830bf81c4 100644 --- a/packages/theme-check-common/src/visitor.spec.ts +++ b/packages/theme-check-common/src/visitor.spec.ts @@ -1,8 +1,8 @@ -import { LiquidHtmlNode, LiquidHtmlNodeTypes, SourceCodeType } from './types'; +import { NodeTypes } from '@shopify/liquid-html-parser'; +import { assert, describe, expect, it } from 'vitest'; import { toJSONAST, toLiquidHTMLAST, toSourceCode } from './to-source-code'; -import { expect, describe, it, assert } from 'vitest'; +import { LiquidHtmlNode, LiquidHtmlNodeTypes, SourceCodeType } from './types'; import { Visitor, findCurrentNode, findJSONNode, visit } from './visitor'; -import { NodeTypes } from '@shopify/liquid-html-parser'; describe('Module: visitor', () => { it('should return an array of the return type of the visitor', () => { diff --git a/packages/theme-check-common/src/visitor.ts b/packages/theme-check-common/src/visitor.ts index badc16c60..bc3c27188 100644 --- a/packages/theme-check-common/src/visitor.ts +++ b/packages/theme-check-common/src/visitor.ts @@ -1,5 +1,5 @@ import { NodeTypes as LiquidHtmlNodeTypes } from '@shopify/liquid-html-parser'; -import { AST, LiquidHtmlNode, NodeOfType, SourceCodeType, NodeTypes, JSONNode } from './types'; +import { AST, JSONNode, LiquidHtmlNode, NodeOfType, NodeTypes, SourceCodeType } from './types'; export type VisitorMethod = ( node: NodeOfType, diff --git a/packages/theme-check-common/src/visitors/index.ts b/packages/theme-check-common/src/visitors/index.ts index c8e26ba92..1d6fb866d 100644 --- a/packages/theme-check-common/src/visitors/index.ts +++ b/packages/theme-check-common/src/visitors/index.ts @@ -1,2 +1,2 @@ -export { visitLiquid } from './liquid'; export { visitJSON } from './json'; +export { visitLiquid } from './liquid'; diff --git a/packages/theme-check-common/src/visitors/json.ts b/packages/theme-check-common/src/visitors/json.ts index 9ea0b28ef..41ad8bf80 100644 --- a/packages/theme-check-common/src/visitors/json.ts +++ b/packages/theme-check-common/src/visitors/json.ts @@ -1,4 +1,4 @@ -import { JSONNode, CheckNodeMethod, JSONCheck, SourceCodeType } from '../types'; +import { CheckNodeMethod, JSONCheck, JSONNode, SourceCodeType } from '../types'; function isJSONNode(thing: unknown): thing is JSONNode { return !!thing && typeof thing === 'object' && 'type' in thing; diff --git a/packages/theme-check-common/src/visitors/liquid.ts b/packages/theme-check-common/src/visitors/liquid.ts index 41c78ddef..60074461e 100644 --- a/packages/theme-check-common/src/visitors/liquid.ts +++ b/packages/theme-check-common/src/visitors/liquid.ts @@ -1,5 +1,5 @@ import { nonTraversableProperties } from '@shopify/liquid-html-parser'; -import { LiquidHtmlNode, CheckNodeMethod, LiquidCheck, SourceCodeType } from '../types'; +import { CheckNodeMethod, LiquidCheck, LiquidHtmlNode, SourceCodeType } from '../types'; function isLiquidHtmlNode(thing: unknown): thing is LiquidHtmlNode { return !!thing && typeof thing === 'object' && 'type' in thing; diff --git a/packages/theme-check-docs-updater/src/index.ts b/packages/theme-check-docs-updater/src/index.ts index e4266c7e9..85896e74b 100644 --- a/packages/theme-check-docs-updater/src/index.ts +++ b/packages/theme-check-docs-updater/src/index.ts @@ -1,4 +1,3 @@ -export { ThemeLiquidDocsManager } from './themeLiquidDocsManager'; export { Resource, Resources, @@ -6,3 +5,4 @@ export { downloadThemeLiquidDocs, root, } from './themeLiquidDocsDownloader'; +export { ThemeLiquidDocsManager } from './themeLiquidDocsManager'; diff --git a/packages/theme-check-docs-updater/src/themeLiquidDocsManager.spec.ts b/packages/theme-check-docs-updater/src/themeLiquidDocsManager.spec.ts index cd628c833..f02a6e41e 100644 --- a/packages/theme-check-docs-updater/src/themeLiquidDocsManager.spec.ts +++ b/packages/theme-check-docs-updater/src/themeLiquidDocsManager.spec.ts @@ -1,6 +1,6 @@ -import { expect, describe, it, beforeEach, afterEach, vi, assert } from 'vitest'; -import { ThemeLiquidDocsManager } from './themeLiquidDocsManager'; +import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'; import { downloadResource, Resources } from './themeLiquidDocsDownloader'; +import { ThemeLiquidDocsManager } from './themeLiquidDocsManager'; import { noop } from './utils'; vi.mock('./themeLiquidDocsDownloader', async (importOriginal) => { diff --git a/packages/theme-check-node/src/NodeFileSystem.ts b/packages/theme-check-node/src/NodeFileSystem.ts index 440883981..3d9971564 100644 --- a/packages/theme-check-node/src/NodeFileSystem.ts +++ b/packages/theme-check-node/src/NodeFileSystem.ts @@ -1,6 +1,6 @@ import { - FileStat, AbstractFileSystem, + FileStat, FileTuple, FileType, path, diff --git a/packages/theme-check-node/src/autofix.ts b/packages/theme-check-node/src/autofix.ts index 377c6a307..cb9d809be 100644 --- a/packages/theme-check-node/src/autofix.ts +++ b/packages/theme-check-node/src/autofix.ts @@ -1,12 +1,12 @@ -import { writeFile } from 'fs/promises'; import { + FixApplicator, Offense, Theme, - autofix as coreAutofix, - FixApplicator, applyFixToString, + autofix as coreAutofix, path, } from '@shopify/theme-check-common'; +import { writeFile } from 'fs/promises'; export const saveToDiskFixApplicator: FixApplicator = async (sourceCode, fix) => { const updatedSource = applyFixToString(sourceCode.source, fix); diff --git a/packages/theme-check-node/src/cli.ts b/packages/theme-check-node/src/cli.ts index 2ddba72af..c62316415 100644 --- a/packages/theme-check-node/src/cli.ts +++ b/packages/theme-check-node/src/cli.ts @@ -1,5 +1,5 @@ -import { check, themeCheckRun } from './index'; import path from 'node:path'; +import { themeCheckRun } from './index'; async function main(): Promise { const root = path.resolve(process.argv[2]); diff --git a/packages/theme-check-node/src/config/find-config-path.spec.ts b/packages/theme-check-node/src/config/find-config-path.spec.ts index 1cc32bba4..f6b473fcf 100644 --- a/packages/theme-check-node/src/config/find-config-path.spec.ts +++ b/packages/theme-check-node/src/config/find-config-path.spec.ts @@ -1,4 +1,4 @@ -import { describe, it, expect, afterEach, beforeEach } from 'vitest'; +import { afterEach, beforeEach, describe, expect, it } from 'vitest'; import { createMockConfigFile, makeTmpFolder, removeTmpFolder } from '../test/test-helpers'; import { findConfigPath } from './find-config-path'; diff --git a/packages/theme-check-node/src/config/index.ts b/packages/theme-check-node/src/config/index.ts index 5115b430c..d95aac812 100644 --- a/packages/theme-check-node/src/config/index.ts +++ b/packages/theme-check-node/src/config/index.ts @@ -1,2 +1,2 @@ -export { loadConfig } from './load-config'; export { findConfigPath } from './find-config-path'; +export { loadConfig } from './load-config'; diff --git a/packages/theme-check-node/src/config/installation-location.ts b/packages/theme-check-node/src/config/installation-location.ts index 7fb21bcd2..94b52b74d 100644 --- a/packages/theme-check-node/src/config/installation-location.ts +++ b/packages/theme-check-node/src/config/installation-location.ts @@ -1,5 +1,5 @@ -import path from 'node:path'; import os from 'node:os'; +import path from 'node:path'; // This is used to load global checks (in the context where someone installed the CLI globally) // This shouldn't be used by VS Code since it's baked into the extension with webpack. diff --git a/packages/theme-check-node/src/config/load-config-description.ts b/packages/theme-check-node/src/config/load-config-description.ts index 15385d129..33c89eadf 100644 --- a/packages/theme-check-node/src/config/load-config-description.ts +++ b/packages/theme-check-node/src/config/load-config-description.ts @@ -6,12 +6,12 @@ import { path as pathUtils, } from '@shopify/theme-check-common'; import path from 'node:path'; +import { URI } from 'vscode-uri'; import { fileExists } from '../file-utils'; import { AbsolutePath } from '../temp'; import { thisNodeModuleRoot } from './installation-location'; import { findThirdPartyChecks, loadThirdPartyChecks } from './load-third-party-checks'; import { ConfigDescription } from './types'; -import { URI, Utils } from 'vscode-uri'; const flatten = (arrs: T[][]): T[] => arrs.flat(); diff --git a/packages/theme-check-node/src/config/load-config.spec.ts b/packages/theme-check-node/src/config/load-config.spec.ts index bcd473bbd..225465f60 100644 --- a/packages/theme-check-node/src/config/load-config.spec.ts +++ b/packages/theme-check-node/src/config/load-config.spec.ts @@ -1,7 +1,3 @@ -import fs from 'node:fs/promises'; -import path from 'node:path'; -import { describe, it, expect, afterEach, beforeEach, assert, vi } from 'vitest'; -import { loadConfig } from './load-config'; import { allChecks, CheckDefinition, @@ -10,6 +6,10 @@ import { Severity, SourceCodeType, } from '@shopify/theme-check-common'; +import fs from 'node:fs/promises'; +import path from 'node:path'; +import { afterEach, assert, beforeEach, describe, expect, it, vi } from 'vitest'; +import { URI } from 'vscode-uri'; import { createMockConfigFile, createMockNodeModule, @@ -18,7 +18,7 @@ import { removeTmpFolder, } from '../test/test-helpers'; import { thisNodeModuleRoot } from './installation-location'; -import { URI } from 'vscode-uri'; +import { loadConfig } from './load-config'; import * as resolveModule from './resolve'; describe('Unit: loadConfig', () => { diff --git a/packages/theme-check-node/src/config/load-config.ts b/packages/theme-check-node/src/config/load-config.ts index 42361562f..969db732a 100644 --- a/packages/theme-check-node/src/config/load-config.ts +++ b/packages/theme-check-node/src/config/load-config.ts @@ -1,10 +1,10 @@ import { Config } from '@shopify/theme-check-common'; +import fs from 'fs/promises'; import { AbsolutePath } from '../temp'; import { loadConfigDescription } from './load-config-description'; import { resolveConfig } from './resolve'; import { ModernIdentifier } from './types'; import { validateConfig } from './validation'; -import fs from 'fs/promises'; /** * Given an absolute path to a config file, this function returns diff --git a/packages/theme-check-node/src/config/load-third-party-checks.spec.ts b/packages/theme-check-node/src/config/load-third-party-checks.spec.ts index a5a8e44d9..057109592 100644 --- a/packages/theme-check-node/src/config/load-third-party-checks.spec.ts +++ b/packages/theme-check-node/src/config/load-third-party-checks.spec.ts @@ -1,13 +1,13 @@ -import path from 'node:path'; import fs from 'node:fs/promises'; -import { describe, it, expect, afterEach, beforeEach } from 'vitest'; -import { findThirdPartyChecks, loadThirdPartyChecks } from './load-third-party-checks'; +import path from 'node:path'; +import { afterEach, beforeEach, describe, expect, it } from 'vitest'; import { - makeTmpFolder, - removeTmpFolder, createMockNodeModule, + makeTmpFolder, mockNodeModuleCheck, + removeTmpFolder, } from '../test/test-helpers'; +import { findThirdPartyChecks, loadThirdPartyChecks } from './load-third-party-checks'; describe('Module: ThirdPartyChecks', () => { let tempDir: string; diff --git a/packages/theme-check-node/src/config/resolve/merge-fragments.spec.ts b/packages/theme-check-node/src/config/resolve/merge-fragments.spec.ts index 7f9e8082e..5cb4d24ae 100644 --- a/packages/theme-check-node/src/config/resolve/merge-fragments.spec.ts +++ b/packages/theme-check-node/src/config/resolve/merge-fragments.spec.ts @@ -1,6 +1,6 @@ -import { describe, it, expect } from 'vitest'; -import { mergeFragments } from './merge-fragments'; +import { describe, expect, it } from 'vitest'; import { ConfigDescription, ConfigFragment } from '../types'; +import { mergeFragments } from './merge-fragments'; const emptyConfig: ConfigDescription = { extends: [], diff --git a/packages/theme-check-node/src/config/resolve/read-yaml.spec.ts b/packages/theme-check-node/src/config/resolve/read-yaml.spec.ts index b1643c28e..f0419e8c0 100644 --- a/packages/theme-check-node/src/config/resolve/read-yaml.spec.ts +++ b/packages/theme-check-node/src/config/resolve/read-yaml.spec.ts @@ -1,15 +1,15 @@ +import { Severity } from '@shopify/theme-check-common'; +import { realpathSync } from 'node:fs'; import fs from 'node:fs/promises'; import path from 'node:path'; -import { realpathSync } from 'node:fs'; -import { describe, it, expect, afterAll, beforeAll } from 'vitest'; -import { readYamlConfigDescription } from './read-yaml'; -import { Severity } from '@shopify/theme-check-common'; +import { afterAll, beforeAll, describe, expect, it } from 'vitest'; import { createMockConfigFile, + createMockNodeModule, makeTmpFolder, removeTmpFolder, - createMockNodeModule, } from '../../test/test-helpers'; +import { readYamlConfigDescription } from './read-yaml'; const mockYamlContent = ` root: ./dist diff --git a/packages/theme-check-node/src/config/resolve/resolve-config.spec.ts b/packages/theme-check-node/src/config/resolve/resolve-config.spec.ts index 0ebd4f2e2..5cc8b9755 100644 --- a/packages/theme-check-node/src/config/resolve/resolve-config.spec.ts +++ b/packages/theme-check-node/src/config/resolve/resolve-config.spec.ts @@ -1,9 +1,9 @@ -import { describe, it, expect, afterEach, beforeEach } from 'vitest'; import fs from 'node:fs/promises'; import path from 'node:path'; -import { resolveConfig } from './resolve-config'; -import { ModernIdentifiers } from '../types'; +import { afterEach, beforeEach, describe, expect, it } from 'vitest'; import { createMockConfigFile, makeTmpFolder, removeTmpFolder } from '../../test/test-helpers'; +import { ModernIdentifiers } from '../types'; +import { resolveConfig } from './resolve-config'; describe('Unit: resolveConfig', () => { let tempDir: string; diff --git a/packages/theme-check-node/src/config/resolve/resolve-config.ts b/packages/theme-check-node/src/config/resolve/resolve-config.ts index a4d3672af..89c5b18a4 100644 --- a/packages/theme-check-node/src/config/resolve/resolve-config.ts +++ b/packages/theme-check-node/src/config/resolve/resolve-config.ts @@ -1,8 +1,8 @@ import path from 'node:path'; -import { readYamlConfigDescription } from './read-yaml'; -import { mergeFragments } from './merge-fragments'; -import { ConfigDescription, ModernIdentifier, ModernIdentifiers } from '../types'; import { AbsolutePath } from '../../temp'; +import { ConfigDescription, ModernIdentifier, ModernIdentifiers } from '../types'; +import { mergeFragments } from './merge-fragments'; +import { readYamlConfigDescription } from './read-yaml'; const modernConfigsPath = () => { if (process.env.WEBPACK_MODE) { diff --git a/packages/theme-check-node/src/config/validation.spec.ts b/packages/theme-check-node/src/config/validation.spec.ts index e2efc0550..76fa5447d 100644 --- a/packages/theme-check-node/src/config/validation.spec.ts +++ b/packages/theme-check-node/src/config/validation.spec.ts @@ -1,13 +1,13 @@ -import { describe, it, expect } from 'vitest'; -import { validateConfig } from './validation'; import { allChecks, - Severity, Config, LiquidCheckDefinition, SchemaProp, + Severity, SourceCodeType, } from '@shopify/theme-check-common'; +import { describe, expect, it } from 'vitest'; +import { validateConfig } from './validation'; describe('Unit: validateConfig', () => { const ParserBlockingScript = allChecks.find((cd) => cd.meta.code === 'ParserBlockingScript')!; diff --git a/packages/theme-check-node/src/config/validation.ts b/packages/theme-check-node/src/config/validation.ts index 33ea2b1c3..a3c40e2f3 100644 --- a/packages/theme-check-node/src/config/validation.ts +++ b/packages/theme-check-node/src/config/validation.ts @@ -1,4 +1,4 @@ -import { Config, CheckSettings, Schema, SchemaProp } from '@shopify/theme-check-common'; +import { CheckSettings, Config, Schema, SchemaProp } from '@shopify/theme-check-common'; import { strict as assert } from 'node:assert'; export function validateConfig(config: Config) { diff --git a/packages/theme-check-node/src/index.spec.ts b/packages/theme-check-node/src/index.spec.ts index 04883b333..b81b0f46e 100644 --- a/packages/theme-check-node/src/index.spec.ts +++ b/packages/theme-check-node/src/index.spec.ts @@ -1,7 +1,7 @@ +import { pathToFileURL } from 'node:url'; import { afterEach, assert, beforeEach, describe, expect, it } from 'vitest'; import { Config, SourceCodeType, getTheme, getThemeFilesPathPattern } from './index'; import { Workspace, makeTempWorkspace } from './test/test-helpers'; -import { pathToFileURL } from 'node:url'; describe('Unit: getTheme', () => { let workspace: Workspace; diff --git a/packages/theme-check-node/src/index.ts b/packages/theme-check-node/src/index.ts index 22cb13827..425af2179 100644 --- a/packages/theme-check-node/src/index.ts +++ b/packages/theme-check-node/src/index.ts @@ -1,16 +1,9 @@ +import { isLiquidHtmlNode } from '@shopify/liquid-html-parser'; import { - Config, - DocDefinition, - JSONSourceCode, - JSONValidator, - LiquidSourceCode, - Offense, - Reference, - SectionSchema, - Theme, - ThemeBlockSchema, toSourceCode as commonToSourceCode, + Config, check as coreCheck, + DocDefinition, extractCSSClassesFromAssetUri, extractCSSClassesFromLiquidUri, extractDocDefinition, @@ -18,23 +11,30 @@ import { isBlock, isIgnored, isSection, + JSONSourceCode, + JSONValidator, + LiquidSourceCode, memo, + Offense, path as pathUtils, + Reference, + SectionSchema, + Theme, + ThemeBlockSchema, toSchema, } from '@shopify/theme-check-common'; -import { buildThemeGraph, ThemeGraph } from '@shopify/theme-graph'; import { ThemeLiquidDocsManager } from '@shopify/theme-check-docs-updater'; -import { isLiquidHtmlNode } from '@shopify/liquid-html-parser'; +import { buildThemeGraph, ThemeGraph } from '@shopify/theme-graph'; import fs from 'node:fs/promises'; import path from 'node:path'; import { promisify } from 'node:util'; import { URI } from 'vscode-uri'; import glob = require('glob'); +import { fileURLToPath } from 'node:url'; import { autofix } from './autofix'; import { findConfigPath, loadConfig as resolveConfig } from './config'; import { NodeFileSystem } from './NodeFileSystem'; -import { fileURLToPath } from 'node:url'; const asyncGlob = promisify(glob); diff --git a/packages/theme-check-node/src/test/test-helpers.ts b/packages/theme-check-node/src/test/test-helpers.ts index c55af1ec3..d892e69d7 100644 --- a/packages/theme-check-node/src/test/test-helpers.ts +++ b/packages/theme-check-node/src/test/test-helpers.ts @@ -1,8 +1,8 @@ +import { path as pathUtils } from '@shopify/theme-check-common'; import * as mktemp from 'mktemp'; import fs from 'node:fs/promises'; import os from 'node:os'; import path from 'node:path'; -import { path as pathUtils } from '@shopify/theme-check-common'; export async function makeTmpFolder() { const tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), 'test-')); diff --git a/packages/theme-graph/src/getWebComponentMap.ts b/packages/theme-graph/src/getWebComponentMap.ts index 6c3fb01cc..4ef621377 100644 --- a/packages/theme-graph/src/getWebComponentMap.ts +++ b/packages/theme-graph/src/getWebComponentMap.ts @@ -1,7 +1,7 @@ import { path, recursiveReadDirectory } from '@shopify/theme-check-common'; +import { CallExpression } from 'acorn'; import { ancestor as visit } from 'acorn-walk'; import { Dependencies, Void, WebComponentMap } from './types'; -import { CallExpression } from 'acorn'; /** * Regular expression for web component names diff --git a/packages/theme-graph/src/graph/augment.ts b/packages/theme-graph/src/graph/augment.ts index 5a0072dce..8d991dc87 100644 --- a/packages/theme-graph/src/graph/augment.ts +++ b/packages/theme-graph/src/graph/augment.ts @@ -1,7 +1,7 @@ import { - memoize, - memo, recursiveReadDirectory as findAllFiles, + memo, + memoize, path, } from '@shopify/theme-check-common'; import { toSourceCode } from '../toSourceCode'; diff --git a/packages/theme-graph/src/index.ts b/packages/theme-graph/src/index.ts index 95cbe31b4..de19da75b 100644 --- a/packages/theme-graph/src/index.ts +++ b/packages/theme-graph/src/index.ts @@ -1,5 +1,5 @@ +export { findWebComponentReferences, getWebComponentMap } from './getWebComponentMap'; export { buildThemeGraph } from './graph/build'; export { serializeThemeGraph } from './graph/serialize'; -export { getWebComponentMap, findWebComponentReferences } from './getWebComponentMap'; export { toCssSourceCode, toJsSourceCode, toSourceCode, toSvgSourceCode } from './toSourceCode'; export * from './types'; diff --git a/packages/theme-graph/src/types.ts b/packages/theme-graph/src/types.ts index 5aba6f3f9..260a591b0 100644 --- a/packages/theme-graph/src/types.ts +++ b/packages/theme-graph/src/types.ts @@ -1,12 +1,12 @@ import { JSONSourceCode, LiquidSourceCode, - Dependencies as ThemeCheckDependencies, - UriString, - Reference, Location, - Range, Mode, + Range, + Reference, + Dependencies as ThemeCheckDependencies, + UriString, } from '@shopify/theme-check-common'; import { Program } from 'acorn'; @@ -204,7 +204,7 @@ export interface JsSourceCode { ast: Program | Error; } -export { Reference, Range, Location }; +export { Location, Range, Reference }; export type Void = void | Void[]; /** e.g. product-element, */ diff --git a/packages/theme-language-server-browser/src/index.spec.ts b/packages/theme-language-server-browser/src/index.spec.ts index 0a26d38ce..d0cbaa37d 100644 --- a/packages/theme-language-server-browser/src/index.spec.ts +++ b/packages/theme-language-server-browser/src/index.spec.ts @@ -1,4 +1,4 @@ -import { expect, describe, it } from 'vitest'; +import { describe, expect, it } from 'vitest'; import { startServer } from './index'; describe('Module: index (browser)', () => { diff --git a/packages/theme-language-server-common/src/ClientCapabilities.ts b/packages/theme-language-server-common/src/ClientCapabilities.ts index 8a45be78b..01093cf7f 100644 --- a/packages/theme-language-server-common/src/ClientCapabilities.ts +++ b/packages/theme-language-server-common/src/ClientCapabilities.ts @@ -1,6 +1,6 @@ import { - ClientCapabilities as LanguageClientCapabilities, InitializeParams, + ClientCapabilities as LanguageClientCapabilities, } from 'vscode-languageserver'; export class ClientCapabilities { diff --git a/packages/theme-language-server-common/src/TypeSystem.spec.ts b/packages/theme-language-server-common/src/TypeSystem.spec.ts index 10b297f62..d1a410dd9 100644 --- a/packages/theme-language-server-common/src/TypeSystem.spec.ts +++ b/packages/theme-language-server-common/src/TypeSystem.spec.ts @@ -7,10 +7,10 @@ import { toLiquidHtmlAST, } from '@shopify/liquid-html-parser'; import { - MetafieldDefinitionMap, - path as pathUtils, BasicParamTypes, + MetafieldDefinitionMap, ObjectEntry, + path as pathUtils, } from '@shopify/theme-check-common'; import { assert, beforeEach, describe, expect, it, vi } from 'vitest'; import { URI } from 'vscode-uri'; diff --git a/packages/theme-language-server-common/src/TypeSystem.ts b/packages/theme-language-server-common/src/TypeSystem.ts index 9b8859d3c..bc6d83b82 100644 --- a/packages/theme-language-server-common/src/TypeSystem.ts +++ b/packages/theme-language-server-common/src/TypeSystem.ts @@ -14,22 +14,23 @@ import { } from '@shopify/liquid-html-parser'; import { ArrayReturnType, + BasicParamTypes, DocsetEntry, + FETCHED_METAFIELD_CATEGORIES, FilterEntry, - MetafieldDefinitionMap, MetafieldDefinition, + MetafieldDefinitionMap, Mode, ObjectEntry, ReturnType, SourceCodeType, ThemeDocset, + getValidParamTypes, isError, parseJSON, - path, - FETCHED_METAFIELD_CATEGORIES, - BasicParamTypes, - getValidParamTypes, parseParamType, + path, + visit, } from '@shopify/theme-check-common'; import { GetThemeSettingsSchemaForURI, @@ -38,7 +39,6 @@ import { isSettingsCategory, } from './settings'; import { findLast, memo } from './utils'; -import { visit } from '@shopify/theme-check-common'; export type GetModeForURI = (uri: string) => Promise; diff --git a/packages/theme-language-server-common/src/codeActions/CodeActionsProvider.ts b/packages/theme-language-server-common/src/codeActions/CodeActionsProvider.ts index fe05cf119..67a22b12b 100644 --- a/packages/theme-language-server-common/src/codeActions/CodeActionsProvider.ts +++ b/packages/theme-language-server-common/src/codeActions/CodeActionsProvider.ts @@ -1,8 +1,8 @@ import { CodeAction, CodeActionParams, Command } from 'vscode-languageserver'; import { DiagnosticsManager } from '../diagnostics'; import { DocumentManager } from '../documents'; -import { FixAllProvider, FixProvider, SuggestionProvider } from './providers'; import { BaseCodeActionsProvider } from './BaseCodeActionsProvider'; +import { FixAllProvider, FixProvider, SuggestionProvider } from './providers'; export const CodeActionKinds = Array.from( new Set([FixAllProvider.kind, FixProvider.kind, SuggestionProvider.kind]), diff --git a/packages/theme-language-server-common/src/codeActions/index.ts b/packages/theme-language-server-common/src/codeActions/index.ts index d4fb12d1b..9797a4f77 100644 --- a/packages/theme-language-server-common/src/codeActions/index.ts +++ b/packages/theme-language-server-common/src/codeActions/index.ts @@ -1 +1 @@ -export { CodeActionsProvider, CodeActionKinds } from './CodeActionsProvider'; +export { CodeActionKinds, CodeActionsProvider } from './CodeActionsProvider'; diff --git a/packages/theme-language-server-common/src/codeActions/providers/FixAllProvider.spec.ts b/packages/theme-language-server-common/src/codeActions/providers/FixAllProvider.spec.ts index 0420dddca..2e07d48c8 100644 --- a/packages/theme-language-server-common/src/codeActions/providers/FixAllProvider.spec.ts +++ b/packages/theme-language-server-common/src/codeActions/providers/FixAllProvider.spec.ts @@ -1,10 +1,10 @@ -import { describe, it, expect, vi, beforeEach } from 'vitest'; +import { Offense, Severity, SourceCodeType, path } from '@shopify/theme-check-common'; +import { beforeEach, describe, expect, it, vi } from 'vitest'; +import { TextDocument } from 'vscode-languageserver-textdocument'; import { URI } from 'vscode-uri'; -import { Offense, SourceCodeType, Severity, path } from '@shopify/theme-check-common'; import { DiagnosticsManager } from '../../diagnostics'; import { DocumentManager } from '../../documents'; import { FixAllProvider } from './FixAllProvider'; -import { TextDocument } from 'vscode-languageserver-textdocument'; describe('Unit: FixAllProvider', () => { const uri = path.normalize(URI.file('/path/to/file.liquid')); diff --git a/packages/theme-language-server-common/src/codeActions/providers/FixProvider.spec.ts b/packages/theme-language-server-common/src/codeActions/providers/FixProvider.spec.ts index 65150f3cf..1be70aa6d 100644 --- a/packages/theme-language-server-common/src/codeActions/providers/FixProvider.spec.ts +++ b/packages/theme-language-server-common/src/codeActions/providers/FixProvider.spec.ts @@ -1,10 +1,10 @@ -import { describe, it, expect, vi, beforeEach } from 'vitest'; +import { Offense, Severity, SourceCodeType, path } from '@shopify/theme-check-common'; +import { beforeEach, describe, expect, it, vi } from 'vitest'; +import { TextDocument } from 'vscode-languageserver-textdocument'; import { URI } from 'vscode-uri'; -import { Offense, SourceCodeType, Severity, path } from '@shopify/theme-check-common'; import { DiagnosticsManager } from '../../diagnostics'; import { DocumentManager } from '../../documents'; import { FixProvider } from './FixProvider'; -import { TextDocument } from 'vscode-languageserver-textdocument'; describe('Unit: FixProvider', () => { const uri = path.normalize(URI.file('/path/to/file.liquid')); diff --git a/packages/theme-language-server-common/src/codeActions/providers/index.ts b/packages/theme-language-server-common/src/codeActions/providers/index.ts index acd48a4aa..3151e90cc 100644 --- a/packages/theme-language-server-common/src/codeActions/providers/index.ts +++ b/packages/theme-language-server-common/src/codeActions/providers/index.ts @@ -1,3 +1,3 @@ -export { FixProvider } from './FixProvider'; export { FixAllProvider } from './FixAllProvider'; +export { FixProvider } from './FixProvider'; export { SuggestionProvider } from './SuggestionProvider'; diff --git a/packages/theme-language-server-common/src/commands/index.ts b/packages/theme-language-server-common/src/commands/index.ts index b5f740e1b..ff4e0ba18 100644 --- a/packages/theme-language-server-common/src/commands/index.ts +++ b/packages/theme-language-server-common/src/commands/index.ts @@ -1,2 +1,2 @@ -export { ExecuteCommandProvider, Commands } from './ExecuteCommandProvider'; +export { Commands, ExecuteCommandProvider } from './ExecuteCommandProvider'; export { applyFixCommand } from './providers'; diff --git a/packages/theme-language-server-common/src/commands/providers/ApplySuggestionProvider.spec.ts b/packages/theme-language-server-common/src/commands/providers/ApplySuggestionProvider.spec.ts index c71958203..92ef5d482 100644 --- a/packages/theme-language-server-common/src/commands/providers/ApplySuggestionProvider.spec.ts +++ b/packages/theme-language-server-common/src/commands/providers/ApplySuggestionProvider.spec.ts @@ -1,18 +1,18 @@ -import { describe, it, expect, vi, beforeEach, Mock } from 'vitest'; -import { URI } from 'vscode-uri'; import { Offense, - SourceCodeType, - Severity, + path, Position, + Severity, + SourceCodeType, Suggestion, - path, } from '@shopify/theme-check-common'; +import { beforeEach, describe, expect, it, Mock, vi } from 'vitest'; +import { TextDocument } from 'vscode-languageserver-textdocument'; +import { URI } from 'vscode-uri'; import { DiagnosticsManager } from '../../diagnostics'; +import { offenseToDiagnostic } from '../../diagnostics/offenseToDiagnostic'; import { DocumentManager } from '../../documents'; import { ApplySuggestionProvider } from './ApplySuggestionProvider'; -import { TextDocument } from 'vscode-languageserver-textdocument'; -import { offenseToDiagnostic } from '../../diagnostics/offenseToDiagnostic'; describe('Unit: ApplySuggestionProvider', () => { const uri = path.normalize(URI.file('/path/to/file.liquid')); diff --git a/packages/theme-language-server-common/src/commands/providers/index.ts b/packages/theme-language-server-common/src/commands/providers/index.ts index 76f55af71..b4dd57cb8 100644 --- a/packages/theme-language-server-common/src/commands/providers/index.ts +++ b/packages/theme-language-server-common/src/commands/providers/index.ts @@ -1,3 +1,3 @@ -export { applyFixCommand, ApplyFixesProvider } from './ApplyFixesProvider'; -export { applySuggestionCommand, ApplySuggestionProvider } from './ApplySuggestionProvider'; +export { ApplyFixesProvider, applyFixCommand } from './ApplyFixesProvider'; +export { ApplySuggestionProvider, applySuggestionCommand } from './ApplySuggestionProvider'; export { RunChecksProvider } from './RunChecksProvider'; diff --git a/packages/theme-language-server-common/src/completions/CompletionsProvider.ts b/packages/theme-language-server-common/src/completions/CompletionsProvider.ts index 64704916d..1c191784d 100644 --- a/packages/theme-language-server-common/src/completions/CompletionsProvider.ts +++ b/packages/theme-language-server-common/src/completions/CompletionsProvider.ts @@ -12,8 +12,8 @@ import { GetThemeSettingsSchemaForURI } from '../settings'; import { GetTranslationsForURI } from '../translations'; import { createLiquidCompletionParams } from './params'; import { - ContentForCompletionProvider, ContentForBlockTypeCompletionProvider, + ContentForCompletionProvider, ContentForParameterCompletionProvider, FilterCompletionProvider, FilterNamedParameterCompletionProvider, diff --git a/packages/theme-language-server-common/src/completions/params/LiquidCompletionParams.spec.ts b/packages/theme-language-server-common/src/completions/params/LiquidCompletionParams.spec.ts index 167697165..dd0fec3e8 100644 --- a/packages/theme-language-server-common/src/completions/params/LiquidCompletionParams.spec.ts +++ b/packages/theme-language-server-common/src/completions/params/LiquidCompletionParams.spec.ts @@ -1,7 +1,7 @@ import { LiquidHtmlNode } from '@shopify/theme-check-common'; import { describe, expect, it } from 'vitest'; import { CompletionParams, Position } from 'vscode-languageserver'; -import { DocumentManager, AugmentedLiquidSourceCode } from '../../documents'; +import { AugmentedLiquidSourceCode, DocumentManager } from '../../documents'; import { createLiquidCompletionParams } from './LiquidCompletionParams'; describe('Module: LiquidCompletionParams', async () => { diff --git a/packages/theme-language-server-common/src/completions/params/fix.spec.ts b/packages/theme-language-server-common/src/completions/params/fix.spec.ts index 254fe0ee0..39d9ecd4a 100644 --- a/packages/theme-language-server-common/src/completions/params/fix.spec.ts +++ b/packages/theme-language-server-common/src/completions/params/fix.spec.ts @@ -1,6 +1,6 @@ -import { describe, it, expect } from 'vitest'; import fs from 'node:fs'; import path from 'node:path'; +import { describe, expect, it } from 'vitest'; import { fix } from './fix'; const scenarios = fs diff --git a/packages/theme-language-server-common/src/completions/params/index.ts b/packages/theme-language-server-common/src/completions/params/index.ts index c7fcaa309..8c3afe4fc 100644 --- a/packages/theme-language-server-common/src/completions/params/index.ts +++ b/packages/theme-language-server-common/src/completions/params/index.ts @@ -1,2 +1,2 @@ -export { LiquidCompletionParams, createLiquidCompletionParams } from './LiquidCompletionParams'; export { CURSOR } from './fix'; +export { LiquidCompletionParams, createLiquidCompletionParams } from './LiquidCompletionParams'; diff --git a/packages/theme-language-server-common/src/completions/providers/ContentForBlockTypeCompletionProvider.spec.ts b/packages/theme-language-server-common/src/completions/providers/ContentForBlockTypeCompletionProvider.spec.ts index 7d4b0f7f6..d5735ad90 100644 --- a/packages/theme-language-server-common/src/completions/providers/ContentForBlockTypeCompletionProvider.spec.ts +++ b/packages/theme-language-server-common/src/completions/providers/ContentForBlockTypeCompletionProvider.spec.ts @@ -1,6 +1,5 @@ import { MetafieldDefinitionMap } from '@shopify/theme-check-common'; import { beforeEach, describe, expect, it } from 'vitest'; -import { InsertTextFormat } from 'vscode-json-languageservice'; import { DocumentManager } from '../../documents'; import { CompletionsProvider } from '../CompletionsProvider'; diff --git a/packages/theme-language-server-common/src/completions/providers/ContentForParameterCompletionProvider.spec.ts b/packages/theme-language-server-common/src/completions/providers/ContentForParameterCompletionProvider.spec.ts index cb1c6f6e1..7e8936fcc 100644 --- a/packages/theme-language-server-common/src/completions/providers/ContentForParameterCompletionProvider.spec.ts +++ b/packages/theme-language-server-common/src/completions/providers/ContentForParameterCompletionProvider.spec.ts @@ -1,9 +1,9 @@ -import { describe, afterEach, beforeEach, it, expect, vi } from 'vitest'; -import { CompletionsProvider } from '../CompletionsProvider'; -import { DocumentManager } from '../../documents'; import { MetafieldDefinitionMap } from '@shopify/theme-check-common'; -import { TextEdit, InsertTextFormat } from 'vscode-languageserver-protocol'; +import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'; +import { InsertTextFormat, TextEdit } from 'vscode-languageserver-protocol'; import { TextDocument } from 'vscode-languageserver-textdocument'; +import { DocumentManager } from '../../documents'; +import { CompletionsProvider } from '../CompletionsProvider'; import { CURSOR } from '../params'; vi.mock('./data/contentForParameterCompletionOptions', async () => { diff --git a/packages/theme-language-server-common/src/completions/providers/ContentForParameterCompletionProvider.ts b/packages/theme-language-server-common/src/completions/providers/ContentForParameterCompletionProvider.ts index bb9392f3c..1a1ab9559 100644 --- a/packages/theme-language-server-common/src/completions/providers/ContentForParameterCompletionProvider.ts +++ b/packages/theme-language-server-common/src/completions/providers/ContentForParameterCompletionProvider.ts @@ -1,16 +1,16 @@ import { LiquidVariableLookup, NodeTypes } from '@shopify/liquid-html-parser'; +import { DocDefinition, GetDocDefinitionForURI } from '@shopify/theme-check-common'; import { CompletionItem, CompletionItemKind, InsertTextFormat, TextEdit, } from 'vscode-languageserver'; +import { AugmentedLiquidSourceCode } from '../../documents'; +import { getParameterCompletionTemplate } from '../../utils/liquidDoc'; import { CURSOR, LiquidCompletionParams } from '../params'; import { Provider } from './common'; -import { AugmentedLiquidSourceCode } from '../../documents'; import { DEFAULT_COMPLETION_OPTIONS } from './data/contentForParameterCompletionOptions'; -import { DocDefinition, GetDocDefinitionForURI } from '@shopify/theme-check-common'; -import { getParameterCompletionTemplate } from '../../utils/liquidDoc'; /** * Offers completions for parameters for the `content_for` tag after a user has diff --git a/packages/theme-language-server-common/src/completions/providers/FilterCompletionProvider.spec.ts b/packages/theme-language-server-common/src/completions/providers/FilterCompletionProvider.spec.ts index 334abe158..28d50e868 100644 --- a/packages/theme-language-server-common/src/completions/providers/FilterCompletionProvider.spec.ts +++ b/packages/theme-language-server-common/src/completions/providers/FilterCompletionProvider.spec.ts @@ -1,7 +1,7 @@ import { FilterEntry, MetafieldDefinitionMap, ObjectEntry } from '@shopify/theme-check-common'; +import { beforeEach, describe, expect, it } from 'vitest'; import { InsertTextFormat, type TextEdit } from 'vscode-languageserver'; import { TextDocument } from 'vscode-languageserver-textdocument'; -import { describe, beforeEach, it, expect } from 'vitest'; import { DocumentManager } from '../../documents'; import { CompletionsProvider } from '../CompletionsProvider'; import { CURSOR } from '../params'; diff --git a/packages/theme-language-server-common/src/completions/providers/FilterCompletionProvider.ts b/packages/theme-language-server-common/src/completions/providers/FilterCompletionProvider.ts index 040377298..d8ae393dc 100644 --- a/packages/theme-language-server-common/src/completions/providers/FilterCompletionProvider.ts +++ b/packages/theme-language-server-common/src/completions/providers/FilterCompletionProvider.ts @@ -6,9 +6,9 @@ import { InsertTextFormat, TextEdit, } from 'vscode-languageserver'; +import { AugmentedLiquidSourceCode } from '../../documents'; import { PseudoType, TypeSystem, isArrayType } from '../../TypeSystem'; import { memoize } from '../../utils'; -import { AugmentedLiquidSourceCode } from '../../documents'; import { CURSOR, LiquidCompletionParams } from '../params'; import { Provider, createCompletionItem, sortByName } from './common'; diff --git a/packages/theme-language-server-common/src/completions/providers/FilterNamedParameterCompletionProvider.spec.ts b/packages/theme-language-server-common/src/completions/providers/FilterNamedParameterCompletionProvider.spec.ts index 2e52b3e2a..7570cf6fe 100644 --- a/packages/theme-language-server-common/src/completions/providers/FilterNamedParameterCompletionProvider.spec.ts +++ b/packages/theme-language-server-common/src/completions/providers/FilterNamedParameterCompletionProvider.spec.ts @@ -1,4 +1,4 @@ -import { describe, beforeEach, it, expect } from 'vitest'; +import { beforeEach, describe, expect, it } from 'vitest'; import { InsertTextFormat, type TextEdit } from 'vscode-languageserver'; import { TextDocument } from 'vscode-languageserver-textdocument'; diff --git a/packages/theme-language-server-common/src/completions/providers/FilterNamedParameterCompletionProvider.ts b/packages/theme-language-server-common/src/completions/providers/FilterNamedParameterCompletionProvider.ts index 778c5ec1f..5f59828b4 100644 --- a/packages/theme-language-server-common/src/completions/providers/FilterNamedParameterCompletionProvider.ts +++ b/packages/theme-language-server-common/src/completions/providers/FilterNamedParameterCompletionProvider.ts @@ -6,9 +6,9 @@ import { InsertTextFormat, TextEdit, } from 'vscode-languageserver'; +import { AugmentedLiquidSourceCode } from '../../documents'; import { CURSOR, LiquidCompletionParams } from '../params'; import { Provider, createCompletionItem } from './common'; -import { AugmentedLiquidSourceCode } from '../../documents'; export class FilterNamedParameterCompletionProvider implements Provider { constructor(private readonly themeDocset: ThemeDocset) {} diff --git a/packages/theme-language-server-common/src/completions/providers/HtmlAttributeCompletionProvider.spec.ts b/packages/theme-language-server-common/src/completions/providers/HtmlAttributeCompletionProvider.spec.ts index aec04591e..90cba77c7 100644 --- a/packages/theme-language-server-common/src/completions/providers/HtmlAttributeCompletionProvider.spec.ts +++ b/packages/theme-language-server-common/src/completions/providers/HtmlAttributeCompletionProvider.spec.ts @@ -1,9 +1,9 @@ -import { describe, beforeEach, it, expect } from 'vitest'; +import { MetafieldDefinitionMap } from '@shopify/theme-check-common'; +import { beforeEach, describe, expect, it } from 'vitest'; +import { HtmlData } from '../../docset'; import { DocumentManager } from '../../documents'; import { CompletionsProvider } from '../CompletionsProvider'; -import { HtmlData } from '../../docset'; import { sortByName } from './common'; -import { MetafieldDefinitionMap } from '@shopify/theme-check-common'; const globalAttributeNames = [...HtmlData.globalAttributes].sort(sortByName).map((x) => x.name); const aTag = HtmlData.tags.find((x) => x.name === 'a')!; diff --git a/packages/theme-language-server-common/src/completions/providers/HtmlAttributeCompletionProvider.ts b/packages/theme-language-server-common/src/completions/providers/HtmlAttributeCompletionProvider.ts index fa0d71554..7b41c9b8e 100644 --- a/packages/theme-language-server-common/src/completions/providers/HtmlAttributeCompletionProvider.ts +++ b/packages/theme-language-server-common/src/completions/providers/HtmlAttributeCompletionProvider.ts @@ -1,3 +1,4 @@ +import { LiquidHtmlNode } from '@shopify/liquid-html-parser'; import { CompletionItem, CompletionItemKind, @@ -16,7 +17,6 @@ import { } from '../../utils'; import { CURSOR, LiquidCompletionParams } from '../params'; import { Provider, sortByName } from './common'; -import { LiquidHtmlNode } from '@shopify/liquid-html-parser'; export class HtmlAttributeCompletionProvider implements Provider { constructor(private readonly documentManager: DocumentManager) {} diff --git a/packages/theme-language-server-common/src/completions/providers/HtmlAttributeValueCompletionProvider.spec.ts b/packages/theme-language-server-common/src/completions/providers/HtmlAttributeValueCompletionProvider.spec.ts index 4b29af77e..872b53ebe 100644 --- a/packages/theme-language-server-common/src/completions/providers/HtmlAttributeValueCompletionProvider.spec.ts +++ b/packages/theme-language-server-common/src/completions/providers/HtmlAttributeValueCompletionProvider.spec.ts @@ -1,7 +1,7 @@ -import { describe, beforeEach, it, expect } from 'vitest'; +import { MetafieldDefinitionMap } from '@shopify/theme-check-common'; +import { beforeEach, describe, expect, it } from 'vitest'; import { DocumentManager } from '../../documents'; import { CompletionsProvider } from '../CompletionsProvider'; -import { MetafieldDefinitionMap } from '@shopify/theme-check-common'; describe('Module: HtmlAttributeValueCompletionProvider', async () => { let provider: CompletionsProvider; diff --git a/packages/theme-language-server-common/src/completions/providers/HtmlTagCompletionProvider.spec.ts b/packages/theme-language-server-common/src/completions/providers/HtmlTagCompletionProvider.spec.ts index 5b454005d..f1c30bf88 100644 --- a/packages/theme-language-server-common/src/completions/providers/HtmlTagCompletionProvider.spec.ts +++ b/packages/theme-language-server-common/src/completions/providers/HtmlTagCompletionProvider.spec.ts @@ -1,9 +1,9 @@ -import { describe, beforeEach, it, expect } from 'vitest'; +import { MetafieldDefinitionMap } from '@shopify/theme-check-common'; +import { beforeEach, describe, expect, it } from 'vitest'; +import { HtmlData } from '../../docset'; import { DocumentManager } from '../../documents'; import { CompletionsProvider } from '../CompletionsProvider'; -import { HtmlData } from '../../docset'; import { sortByName } from './common'; -import { MetafieldDefinitionMap } from '@shopify/theme-check-common'; const allTagNames = [...HtmlData.tags].sort(sortByName).map((x) => x.name); diff --git a/packages/theme-language-server-common/src/completions/providers/LiquidDocParamTypeCompletionProvider.spec.ts b/packages/theme-language-server-common/src/completions/providers/LiquidDocParamTypeCompletionProvider.spec.ts index 7817586a2..7e94cc11b 100644 --- a/packages/theme-language-server-common/src/completions/providers/LiquidDocParamTypeCompletionProvider.spec.ts +++ b/packages/theme-language-server-common/src/completions/providers/LiquidDocParamTypeCompletionProvider.spec.ts @@ -1,8 +1,7 @@ -import { describe, beforeEach, it, expect } from 'vitest'; -import { CompletionsProvider } from '../CompletionsProvider'; +import { BasicParamTypes, MetafieldDefinitionMap } from '@shopify/theme-check-common'; +import { beforeEach, describe, expect, it } from 'vitest'; import { DocumentManager } from '../../documents'; -import { MetafieldDefinitionMap } from '@shopify/theme-check-common'; -import { BasicParamTypes } from '@shopify/theme-check-common'; +import { CompletionsProvider } from '../CompletionsProvider'; describe('Module: LiquidDocParamTypeCompletionProvider', async () => { let provider: CompletionsProvider; diff --git a/packages/theme-language-server-common/src/completions/providers/LiquidDocParamTypeCompletionProvider.ts b/packages/theme-language-server-common/src/completions/providers/LiquidDocParamTypeCompletionProvider.ts index b04da71eb..974e42368 100644 --- a/packages/theme-language-server-common/src/completions/providers/LiquidDocParamTypeCompletionProvider.ts +++ b/packages/theme-language-server-common/src/completions/providers/LiquidDocParamTypeCompletionProvider.ts @@ -1,9 +1,13 @@ import { NodeTypes } from '@shopify/liquid-html-parser'; +import { + filePathSupportsLiquidDoc, + getValidParamTypes, + SupportedDocTagTypes, + ThemeDocset, +} from '@shopify/theme-check-common'; import { CompletionItem, CompletionItemKind, MarkupKind } from 'vscode-languageserver'; import { LiquidCompletionParams } from '../params'; import { Provider } from './common'; -import { filePathSupportsLiquidDoc } from '@shopify/theme-check-common'; -import { getValidParamTypes, SupportedDocTagTypes, ThemeDocset } from '@shopify/theme-check-common'; export class LiquidDocParamTypeCompletionProvider implements Provider { constructor(private readonly themeDocset: ThemeDocset) {} diff --git a/packages/theme-language-server-common/src/completions/providers/LiquidDocTagCompletionProvider.spec.ts b/packages/theme-language-server-common/src/completions/providers/LiquidDocTagCompletionProvider.spec.ts index 3d59586cc..baede090c 100644 --- a/packages/theme-language-server-common/src/completions/providers/LiquidDocTagCompletionProvider.spec.ts +++ b/packages/theme-language-server-common/src/completions/providers/LiquidDocTagCompletionProvider.spec.ts @@ -1,7 +1,7 @@ -import { describe, beforeEach, it, expect } from 'vitest'; -import { CompletionsProvider } from '../CompletionsProvider'; -import { DocumentManager } from '../../documents'; import { MetafieldDefinitionMap } from '@shopify/theme-check-common'; +import { beforeEach, describe, expect, it } from 'vitest'; +import { DocumentManager } from '../../documents'; +import { CompletionsProvider } from '../CompletionsProvider'; describe('Module: LiquidDocTagCompletionProvider', async () => { let provider: CompletionsProvider; diff --git a/packages/theme-language-server-common/src/completions/providers/LiquidDocTagCompletionProvider.ts b/packages/theme-language-server-common/src/completions/providers/LiquidDocTagCompletionProvider.ts index 76e9e1502..56f113bc1 100644 --- a/packages/theme-language-server-common/src/completions/providers/LiquidDocTagCompletionProvider.ts +++ b/packages/theme-language-server-common/src/completions/providers/LiquidDocTagCompletionProvider.ts @@ -1,14 +1,14 @@ import { NodeTypes } from '@shopify/liquid-html-parser'; +import { filePathSupportsLiquidDoc } from '@shopify/theme-check-common'; import { CompletionItem, CompletionItemKind, InsertTextFormat, MarkupKind, } from 'vscode-languageserver'; +import { formatLiquidDocTagHandle, SUPPORTED_LIQUID_DOC_TAG_HANDLES } from '../../utils/liquidDoc'; import { LiquidCompletionParams } from '../params'; import { Provider } from './common'; -import { formatLiquidDocTagHandle, SUPPORTED_LIQUID_DOC_TAG_HANDLES } from '../../utils/liquidDoc'; -import { filePathSupportsLiquidDoc } from '@shopify/theme-check-common'; export class LiquidDocTagCompletionProvider implements Provider { constructor() {} diff --git a/packages/theme-language-server-common/src/completions/providers/LiquidTagsCompletionProvider.spec.ts b/packages/theme-language-server-common/src/completions/providers/LiquidTagsCompletionProvider.spec.ts index e627bdfc5..d014cf7f8 100644 --- a/packages/theme-language-server-common/src/completions/providers/LiquidTagsCompletionProvider.spec.ts +++ b/packages/theme-language-server-common/src/completions/providers/LiquidTagsCompletionProvider.spec.ts @@ -1,8 +1,8 @@ -import { describe, beforeEach, it, expect } from 'vitest'; +import { MetafieldDefinitionMap, TagEntry } from '@shopify/theme-check-common'; +import { beforeEach, describe, expect, it } from 'vitest'; +import { InsertTextFormat, InsertTextMode } from 'vscode-languageserver-protocol'; import { DocumentManager } from '../../documents'; import { CompletionsProvider } from '../CompletionsProvider'; -import { MetafieldDefinitionMap, TagEntry } from '@shopify/theme-check-common'; -import { InsertTextFormat, InsertTextMode, TextEdit } from 'vscode-languageserver-protocol'; const caseSyntax = `{% case variable %} {% when first_value %} diff --git a/packages/theme-language-server-common/src/completions/providers/ObjectAttributeCompletionProvider.spec.ts b/packages/theme-language-server-common/src/completions/providers/ObjectAttributeCompletionProvider.spec.ts index 61ddb4bd8..de29cf340 100644 --- a/packages/theme-language-server-common/src/completions/providers/ObjectAttributeCompletionProvider.spec.ts +++ b/packages/theme-language-server-common/src/completions/providers/ObjectAttributeCompletionProvider.spec.ts @@ -1,8 +1,8 @@ -import { describe, beforeEach, it, expect, vi } from 'vitest'; +import { MetafieldDefinitionMap, ObjectEntry } from '@shopify/theme-check-common'; +import { beforeEach, describe, expect, it, vi } from 'vitest'; import { DocumentManager } from '../../documents'; -import { CompletionsProvider } from '../CompletionsProvider'; import { SettingsSchemaJSONFile } from '../../settings'; -import { MetafieldDefinitionMap, ObjectEntry } from '@shopify/theme-check-common'; +import { CompletionsProvider } from '../CompletionsProvider'; describe('Module: ObjectAttributeCompletionProvider', async () => { let provider: CompletionsProvider; diff --git a/packages/theme-language-server-common/src/completions/providers/ObjectAttributeCompletionProvider.ts b/packages/theme-language-server-common/src/completions/providers/ObjectAttributeCompletionProvider.ts index 3f8c90cd3..fe0683547 100644 --- a/packages/theme-language-server-common/src/completions/providers/ObjectAttributeCompletionProvider.ts +++ b/packages/theme-language-server-common/src/completions/providers/ObjectAttributeCompletionProvider.ts @@ -1,10 +1,10 @@ import { NodeTypes } from '@shopify/liquid-html-parser'; import { ObjectEntry } from '@shopify/theme-check-common'; import { CompletionItem, CompletionItemKind } from 'vscode-languageserver'; +import { GetThemeSettingsSchemaForURI } from '../../settings'; import { TypeSystem, isArrayType } from '../../TypeSystem'; import { CURSOR, LiquidCompletionParams } from '../params'; import { Provider, createCompletionItem, sortByName } from './common'; -import { GetThemeSettingsSchemaForURI } from '../../settings'; const ArrayCoreProperties = ['size', 'first', 'last'] as const; const StringCoreProperties = ['size'] as const; diff --git a/packages/theme-language-server-common/src/completions/providers/ObjectCompletionProvider.spec.ts b/packages/theme-language-server-common/src/completions/providers/ObjectCompletionProvider.spec.ts index 60e84a2b6..af7b48879 100644 --- a/packages/theme-language-server-common/src/completions/providers/ObjectCompletionProvider.spec.ts +++ b/packages/theme-language-server-common/src/completions/providers/ObjectCompletionProvider.spec.ts @@ -1,7 +1,7 @@ -import { describe, beforeEach, it, expect } from 'vitest'; +import { MetafieldDefinitionMap, ObjectEntry } from '@shopify/theme-check-common'; +import { beforeEach, describe, expect, it } from 'vitest'; import { DocumentManager } from '../../documents'; import { CompletionsProvider } from '../CompletionsProvider'; -import { MetafieldDefinitionMap, ObjectEntry } from '@shopify/theme-check-common'; describe('Module: ObjectCompletionProvider', async () => { let provider: CompletionsProvider; diff --git a/packages/theme-language-server-common/src/completions/providers/RenderSnippetCompletionProvider.spec.ts b/packages/theme-language-server-common/src/completions/providers/RenderSnippetCompletionProvider.spec.ts index b7cee58cd..b9056513c 100644 --- a/packages/theme-language-server-common/src/completions/providers/RenderSnippetCompletionProvider.spec.ts +++ b/packages/theme-language-server-common/src/completions/providers/RenderSnippetCompletionProvider.spec.ts @@ -1,7 +1,7 @@ -import { describe, beforeEach, it, expect } from 'vitest'; +import { MetafieldDefinitionMap } from '@shopify/theme-check-common'; +import { beforeEach, describe, expect, it } from 'vitest'; import { DocumentManager } from '../../documents'; import { CompletionsProvider } from '../CompletionsProvider'; -import { MetafieldDefinitionMap } from '@shopify/theme-check-common'; describe('Module: RenderSnippetCompletionProvider', async () => { let provider: CompletionsProvider; diff --git a/packages/theme-language-server-common/src/completions/providers/RenderSnippetParameterCompletionProvider.spec.ts b/packages/theme-language-server-common/src/completions/providers/RenderSnippetParameterCompletionProvider.spec.ts index 89c04c905..50dfa8036 100644 --- a/packages/theme-language-server-common/src/completions/providers/RenderSnippetParameterCompletionProvider.spec.ts +++ b/packages/theme-language-server-common/src/completions/providers/RenderSnippetParameterCompletionProvider.spec.ts @@ -1,7 +1,7 @@ -import { describe, beforeEach, it, expect } from 'vitest'; -import { CompletionsProvider } from '../CompletionsProvider'; +import { DocDefinition, MetafieldDefinitionMap } from '@shopify/theme-check-common'; +import { beforeEach, describe, expect, it } from 'vitest'; import { DocumentManager } from '../../documents'; -import { MetafieldDefinitionMap, DocDefinition } from '@shopify/theme-check-common'; +import { CompletionsProvider } from '../CompletionsProvider'; const uri = 'file:///snippets/product-card.liquid'; diff --git a/packages/theme-language-server-common/src/completions/providers/RenderSnippetParameterCompletionProvider.ts b/packages/theme-language-server-common/src/completions/providers/RenderSnippetParameterCompletionProvider.ts index b12197c58..43cf90e54 100644 --- a/packages/theme-language-server-common/src/completions/providers/RenderSnippetParameterCompletionProvider.ts +++ b/packages/theme-language-server-common/src/completions/providers/RenderSnippetParameterCompletionProvider.ts @@ -1,4 +1,5 @@ import { NodeTypes } from '@shopify/liquid-html-parser'; +import { GetDocDefinitionForURI } from '@shopify/theme-check-common'; import { CompletionItem, CompletionItemKind, @@ -7,10 +8,9 @@ import { Range, TextEdit, } from 'vscode-languageserver'; +import { formatLiquidDocParameter, getParameterCompletionTemplate } from '../../utils/liquidDoc'; import { CURSOR, LiquidCompletionParams } from '../params'; import { Provider } from './common'; -import { formatLiquidDocParameter, getParameterCompletionTemplate } from '../../utils/liquidDoc'; -import { GetDocDefinitionForURI } from '@shopify/theme-check-common'; export type GetSnippetNamesForURI = (uri: string) => Promise; diff --git a/packages/theme-language-server-common/src/completions/providers/TranslationCompletionProvider.spec.ts b/packages/theme-language-server-common/src/completions/providers/TranslationCompletionProvider.spec.ts index 42ad76c52..6a86ed1f4 100644 --- a/packages/theme-language-server-common/src/completions/providers/TranslationCompletionProvider.spec.ts +++ b/packages/theme-language-server-common/src/completions/providers/TranslationCompletionProvider.spec.ts @@ -1,8 +1,8 @@ -import { describe, beforeEach, it, expect } from 'vitest'; +import { MetafieldDefinitionMap } from '@shopify/theme-check-common'; +import { beforeEach, describe, expect, it } from 'vitest'; import { InsertTextFormat } from 'vscode-languageserver'; import { DocumentManager } from '../../documents'; import { CompletionsProvider } from '../CompletionsProvider'; -import { MetafieldDefinitionMap } from '@shopify/theme-check-common'; describe('Module: TranslationCompletionProvider', async () => { let provider: CompletionsProvider; diff --git a/packages/theme-language-server-common/src/completions/providers/TranslationCompletionProvider.ts b/packages/theme-language-server-common/src/completions/providers/TranslationCompletionProvider.ts index f8ca2b898..38c5173c1 100644 --- a/packages/theme-language-server-common/src/completions/providers/TranslationCompletionProvider.ts +++ b/packages/theme-language-server-common/src/completions/providers/TranslationCompletionProvider.ts @@ -1,4 +1,5 @@ import { LiquidHtmlNode, NodeTypes } from '@shopify/liquid-html-parser'; +import { findCurrentNode } from '@shopify/theme-check-common'; import { CompletionItem, CompletionItemKind, @@ -14,7 +15,6 @@ import { renderTranslation, translationOptions, } from '../../translations'; -import { findCurrentNode } from '@shopify/theme-check-common'; import { LiquidCompletionParams } from '../params'; import { Provider } from './common'; diff --git a/packages/theme-language-server-common/src/completions/providers/index.ts b/packages/theme-language-server-common/src/completions/providers/index.ts index 33f6181a0..512840ae7 100644 --- a/packages/theme-language-server-common/src/completions/providers/index.ts +++ b/packages/theme-language-server-common/src/completions/providers/index.ts @@ -1,20 +1,20 @@ -export { ContentForCompletionProvider } from './ContentForCompletionProvider'; +export { Provider } from './common/Provider'; export { ContentForBlockTypeCompletionProvider } from './ContentForBlockTypeCompletionProvider'; +export { ContentForCompletionProvider } from './ContentForCompletionProvider'; export { ContentForParameterCompletionProvider } from './ContentForParameterCompletionProvider'; -export { HtmlTagCompletionProvider } from './HtmlTagCompletionProvider'; -export { HtmlAttributeCompletionProvider } from './HtmlAttributeCompletionProvider'; -export { HtmlAttributeValueCompletionProvider } from './HtmlAttributeValueCompletionProvider'; export { FilterCompletionProvider } from './FilterCompletionProvider'; export { FilterNamedParameterCompletionProvider } from './FilterNamedParameterCompletionProvider'; +export { HtmlAttributeCompletionProvider } from './HtmlAttributeCompletionProvider'; +export { HtmlAttributeValueCompletionProvider } from './HtmlAttributeValueCompletionProvider'; +export { HtmlTagCompletionProvider } from './HtmlTagCompletionProvider'; +export { LiquidDocParamTypeCompletionProvider } from './LiquidDocParamTypeCompletionProvider'; +export { LiquidDocTagCompletionProvider } from './LiquidDocTagCompletionProvider'; export { LiquidTagsCompletionProvider } from './LiquidTagsCompletionProvider'; export { ObjectAttributeCompletionProvider } from './ObjectAttributeCompletionProvider'; export { ObjectCompletionProvider } from './ObjectCompletionProvider'; -export { TranslationCompletionProvider } from './TranslationCompletionProvider'; export { RenderSnippetCompletionProvider } from './RenderSnippetCompletionProvider'; export { GetSnippetNamesForURI, RenderSnippetParameterCompletionProvider, } from './RenderSnippetParameterCompletionProvider'; -export { LiquidDocTagCompletionProvider } from './LiquidDocTagCompletionProvider'; -export { LiquidDocParamTypeCompletionProvider } from './LiquidDocParamTypeCompletionProvider'; -export { Provider } from './common/Provider'; +export { TranslationCompletionProvider } from './TranslationCompletionProvider'; diff --git a/packages/theme-language-server-common/src/css/CSSLanguageService.ts b/packages/theme-language-server-common/src/css/CSSLanguageService.ts index 00db110ed..571d8c218 100644 --- a/packages/theme-language-server-common/src/css/CSSLanguageService.ts +++ b/packages/theme-language-server-common/src/css/CSSLanguageService.ts @@ -1,5 +1,5 @@ import { LiquidRawTag, NodeTypes } from '@shopify/liquid-html-parser'; -import { Mode, Modes, SourceCodeType, findCurrentNode } from '@shopify/theme-check-common'; +import { SourceCodeType, findCurrentNode } from '@shopify/theme-check-common'; import { LanguageService, Stylesheet, getCSSLanguageService } from 'vscode-css-languageservice'; import { CompletionItem, diff --git a/packages/theme-language-server-common/src/definitions/BaseDefinitionProvider.ts b/packages/theme-language-server-common/src/definitions/BaseDefinitionProvider.ts index 153646262..7f8d90325 100644 --- a/packages/theme-language-server-common/src/definitions/BaseDefinitionProvider.ts +++ b/packages/theme-language-server-common/src/definitions/BaseDefinitionProvider.ts @@ -1,5 +1,5 @@ import { LiquidHtmlNode } from '@shopify/liquid-html-parser'; -import { DefinitionParams, DefinitionLink } from 'vscode-languageserver-protocol'; +import { DefinitionLink, DefinitionParams } from 'vscode-languageserver-protocol'; export interface BaseDefinitionProvider { definitions( diff --git a/packages/theme-language-server-common/src/definitions/providers/SchemaTranslationStringDefinitionProvider.spec.ts b/packages/theme-language-server-common/src/definitions/providers/SchemaTranslationStringDefinitionProvider.spec.ts index ed0fc3c03..0fdc3fb44 100644 --- a/packages/theme-language-server-common/src/definitions/providers/SchemaTranslationStringDefinitionProvider.spec.ts +++ b/packages/theme-language-server-common/src/definitions/providers/SchemaTranslationStringDefinitionProvider.spec.ts @@ -1,4 +1,4 @@ -import { JSONSourceCode, SourceCodeType, toSourceCode } from '@shopify/theme-check-common'; +import { JSONSourceCode, toSourceCode } from '@shopify/theme-check-common'; import { assert, beforeEach, describe, expect, it } from 'vitest'; import { DefinitionParams, LocationLink } from 'vscode-languageserver-protocol'; import { TextDocument } from 'vscode-languageserver-textdocument'; diff --git a/packages/theme-language-server-common/src/definitions/providers/TranslationStringDefinitionProvider.spec.ts b/packages/theme-language-server-common/src/definitions/providers/TranslationStringDefinitionProvider.spec.ts index e739056ab..e6e9a9adf 100644 --- a/packages/theme-language-server-common/src/definitions/providers/TranslationStringDefinitionProvider.spec.ts +++ b/packages/theme-language-server-common/src/definitions/providers/TranslationStringDefinitionProvider.spec.ts @@ -1,4 +1,4 @@ -import { JSONSourceCode, SourceCodeType, toSourceCode } from '@shopify/theme-check-common'; +import { JSONSourceCode, toSourceCode } from '@shopify/theme-check-common'; import { assert, beforeEach, describe, expect, it } from 'vitest'; import { DefinitionParams, LocationLink } from 'vscode-languageserver-protocol'; import { TextDocument } from 'vscode-languageserver-textdocument'; diff --git a/packages/theme-language-server-common/src/definitions/providers/TranslationStringDefinitionProvider.ts b/packages/theme-language-server-common/src/definitions/providers/TranslationStringDefinitionProvider.ts index a708a640d..360e42803 100644 --- a/packages/theme-language-server-common/src/definitions/providers/TranslationStringDefinitionProvider.ts +++ b/packages/theme-language-server-common/src/definitions/providers/TranslationStringDefinitionProvider.ts @@ -1,12 +1,12 @@ import { LiquidHtmlNode, NodeTypes } from '@shopify/liquid-html-parser'; import { SourceCodeType, nodeAtPath } from '@shopify/theme-check-common'; import { - DefinitionParams, DefinitionLink, - Range, + DefinitionParams, LocationLink, + Range, } from 'vscode-languageserver-protocol'; -import { DocumentManager, AugmentedJsonSourceCode } from '../../documents'; +import { AugmentedJsonSourceCode, DocumentManager } from '../../documents'; import { BaseDefinitionProvider } from '../BaseDefinitionProvider'; export class TranslationStringDefinitionProvider implements BaseDefinitionProvider { diff --git a/packages/theme-language-server-common/src/diagnostics/DiagnosticsManager.spec.ts b/packages/theme-language-server-common/src/diagnostics/DiagnosticsManager.spec.ts index c6e21237a..d491353f8 100644 --- a/packages/theme-language-server-common/src/diagnostics/DiagnosticsManager.spec.ts +++ b/packages/theme-language-server-common/src/diagnostics/DiagnosticsManager.spec.ts @@ -1,6 +1,6 @@ import { Offense, SourceCodeType } from '@shopify/theme-check-common'; -import { vi, expect, describe, it, beforeEach } from 'vitest'; -import { Connection, Diagnostic, Range } from 'vscode-languageserver'; +import { beforeEach, describe, expect, it, vi } from 'vitest'; +import { Connection } from 'vscode-languageserver'; import { DiagnosticsManager } from './DiagnosticsManager'; import { offenseToDiagnostic } from './offenseToDiagnostic'; diff --git a/packages/theme-language-server-common/src/diagnostics/offenseToDiagnostic.ts b/packages/theme-language-server-common/src/diagnostics/offenseToDiagnostic.ts index 9c57049f4..d430c781a 100644 --- a/packages/theme-language-server-common/src/diagnostics/offenseToDiagnostic.ts +++ b/packages/theme-language-server-common/src/diagnostics/offenseToDiagnostic.ts @@ -1,5 +1,5 @@ +import { allChecks, assertNever, Offense, Severity } from '@shopify/theme-check-common'; import { Diagnostic, DiagnosticSeverity, Range } from 'vscode-languageserver'; -import { allChecks, Offense, Severity, assertNever } from '@shopify/theme-check-common'; type CheckToDocsUrl = { [code in string]?: string; diff --git a/packages/theme-language-server-common/src/diagnostics/runChecks.spec.ts b/packages/theme-language-server-common/src/diagnostics/runChecks.spec.ts index 386ec6d22..a9e9c6a5a 100644 --- a/packages/theme-language-server-common/src/diagnostics/runChecks.spec.ts +++ b/packages/theme-language-server-common/src/diagnostics/runChecks.spec.ts @@ -1,5 +1,4 @@ import { - AbstractFileSystem, allChecks, LiquidCheckDefinition, path, diff --git a/packages/theme-language-server-common/src/diagnostics/runChecks.ts b/packages/theme-language-server-common/src/diagnostics/runChecks.ts index 1fcf5afa4..6b7157f35 100644 --- a/packages/theme-language-server-common/src/diagnostics/runChecks.ts +++ b/packages/theme-language-server-common/src/diagnostics/runChecks.ts @@ -1,7 +1,7 @@ import { check, - extractCSSClassesFromLiquidUri, extractCSSClassesFromAssetUri, + extractCSSClassesFromLiquidUri, findRoot, makeFileExists, Offense, @@ -15,10 +15,10 @@ import { import { CSSLanguageService } from '../css/CSSLanguageService'; import { AugmentedSourceCode, DocumentManager } from '../documents'; +import { ThemeGraphManager } from '../server/ThemeGraphManager'; import { Dependencies } from '../types'; import { DiagnosticsManager } from './DiagnosticsManager'; import { offenseSeverity } from './offenseToDiagnostic'; -import { ThemeGraphManager } from '../server/ThemeGraphManager'; export function makeRunChecks( documentManager: DocumentManager, diff --git a/packages/theme-language-server-common/src/docset/MarkdownRenderer.spec.ts b/packages/theme-language-server-common/src/docset/MarkdownRenderer.spec.ts index 8c3f0650d..33d61d0b6 100644 --- a/packages/theme-language-server-common/src/docset/MarkdownRenderer.spec.ts +++ b/packages/theme-language-server-common/src/docset/MarkdownRenderer.spec.ts @@ -1,7 +1,7 @@ -import { describe, it, expect } from 'vitest'; +import { describe, expect, it } from 'vitest'; -import { render, renderHtmlEntry, type HtmlEntry } from './MarkdownRenderer'; import type { DocsetEntry } from '@shopify/theme-check-common'; +import { render, renderHtmlEntry, type HtmlEntry } from './MarkdownRenderer'; const DOC_ENTRY: DocsetEntry = { name: 'entry', diff --git a/packages/theme-language-server-common/src/docset/index.ts b/packages/theme-language-server-common/src/docset/index.ts index 8c40f02ae..4a90fa2c7 100644 --- a/packages/theme-language-server-common/src/docset/index.ts +++ b/packages/theme-language-server-common/src/docset/index.ts @@ -1,2 +1,2 @@ -export { render, renderHtmlEntry, DocsetEntryType } from './MarkdownRenderer'; export * from './HtmlDocset'; +export { DocsetEntryType, render, renderHtmlEntry } from './MarkdownRenderer'; diff --git a/packages/theme-language-server-common/src/documentHighlights/BaseDocumentHighlightsProvider.ts b/packages/theme-language-server-common/src/documentHighlights/BaseDocumentHighlightsProvider.ts index be2722b57..83eda2301 100644 --- a/packages/theme-language-server-common/src/documentHighlights/BaseDocumentHighlightsProvider.ts +++ b/packages/theme-language-server-common/src/documentHighlights/BaseDocumentHighlightsProvider.ts @@ -1,5 +1,5 @@ -import { DocumentHighlight, DocumentHighlightParams } from 'vscode-languageserver'; import { LiquidHtmlNode } from '@shopify/theme-check-common'; +import { DocumentHighlight, DocumentHighlightParams } from 'vscode-languageserver'; export interface BaseDocumentHighlightsProvider { documentHighlights: ( diff --git a/packages/theme-language-server-common/src/documentHighlights/DocumentHighlightsProvider.ts b/packages/theme-language-server-common/src/documentHighlights/DocumentHighlightsProvider.ts index 856ba0e1e..459770301 100644 --- a/packages/theme-language-server-common/src/documentHighlights/DocumentHighlightsProvider.ts +++ b/packages/theme-language-server-common/src/documentHighlights/DocumentHighlightsProvider.ts @@ -1,7 +1,6 @@ -import { SourceCodeType } from '@shopify/theme-check-common'; +import { findCurrentNode, SourceCodeType } from '@shopify/theme-check-common'; import { DocumentHighlight, DocumentHighlightParams } from 'vscode-languageserver'; import { DocumentManager } from '../documents'; -import { findCurrentNode } from '@shopify/theme-check-common'; import { BaseDocumentHighlightsProvider } from './BaseDocumentHighlightsProvider'; import { HtmlTagNameDocumentHighlightsProvider, diff --git a/packages/theme-language-server-common/src/documentHighlights/providers/HtmlTagNameDocumentHighlightsProvider.spec.ts b/packages/theme-language-server-common/src/documentHighlights/providers/HtmlTagNameDocumentHighlightsProvider.spec.ts index ff4c231b9..6beb7f792 100644 --- a/packages/theme-language-server-common/src/documentHighlights/providers/HtmlTagNameDocumentHighlightsProvider.spec.ts +++ b/packages/theme-language-server-common/src/documentHighlights/providers/HtmlTagNameDocumentHighlightsProvider.spec.ts @@ -1,8 +1,8 @@ import { assert, beforeEach, describe, expect, it } from 'vitest'; import { DocumentHighlightParams } from 'vscode-languageserver'; import { Position } from 'vscode-languageserver-protocol'; -import { DocumentHighlightsProvider, PREVENT_DEFAULT } from '../DocumentHighlightsProvider'; import { DocumentManager } from '../../documents'; +import { DocumentHighlightsProvider, PREVENT_DEFAULT } from '../DocumentHighlightsProvider'; describe('Module: HtmlTagNameDocumentHighlightsProvider', () => { let documentManager: DocumentManager; diff --git a/packages/theme-language-server-common/src/documentHighlights/providers/HtmlTagNameDocumentHighlightsProvider.ts b/packages/theme-language-server-common/src/documentHighlights/providers/HtmlTagNameDocumentHighlightsProvider.ts index c7a09a707..df336be46 100644 --- a/packages/theme-language-server-common/src/documentHighlights/providers/HtmlTagNameDocumentHighlightsProvider.ts +++ b/packages/theme-language-server-common/src/documentHighlights/providers/HtmlTagNameDocumentHighlightsProvider.ts @@ -1,8 +1,8 @@ import { LiquidHtmlNode } from '@shopify/liquid-html-parser'; import { DocumentHighlightParams } from 'vscode-languageserver'; import { DocumentManager } from '../../documents'; -import { BaseDocumentHighlightsProvider } from '../BaseDocumentHighlightsProvider'; import { getHtmlElementNameRanges } from '../../utils/htmlTagNames'; +import { BaseDocumentHighlightsProvider } from '../BaseDocumentHighlightsProvider'; export class HtmlTagNameDocumentHighlightsProvider implements BaseDocumentHighlightsProvider { constructor(public documentManager: DocumentManager) {} diff --git a/packages/theme-language-server-common/src/documentHighlights/providers/LiquidBlockTagDocumentHighlightsProvider.spec.ts b/packages/theme-language-server-common/src/documentHighlights/providers/LiquidBlockTagDocumentHighlightsProvider.spec.ts index 5e4c034e7..1e456a750 100644 --- a/packages/theme-language-server-common/src/documentHighlights/providers/LiquidBlockTagDocumentHighlightsProvider.spec.ts +++ b/packages/theme-language-server-common/src/documentHighlights/providers/LiquidBlockTagDocumentHighlightsProvider.spec.ts @@ -1,8 +1,8 @@ import { assert, beforeEach, describe, expect, it } from 'vitest'; import { DocumentHighlightParams } from 'vscode-languageserver'; import { Position } from 'vscode-languageserver-protocol'; -import { DocumentHighlightsProvider, PREVENT_DEFAULT } from '../DocumentHighlightsProvider'; import { DocumentManager } from '../../documents'; +import { DocumentHighlightsProvider } from '../DocumentHighlightsProvider'; describe('Module: LiquidBlockTagDocumentHighlightsProvider', () => { let documentManager: DocumentManager; diff --git a/packages/theme-language-server-common/src/documents/DocumentManager.spec.ts b/packages/theme-language-server-common/src/documents/DocumentManager.spec.ts index 3ff9b5f65..8ee18db32 100644 --- a/packages/theme-language-server-common/src/documents/DocumentManager.spec.ts +++ b/packages/theme-language-server-common/src/documents/DocumentManager.spec.ts @@ -9,9 +9,9 @@ import { import { MockFileSystem } from '@shopify/theme-check-common/src/test'; import { assert, beforeEach, describe, expect, it, vi } from 'vitest'; import { URI, Utils } from 'vscode-uri'; -import { DocumentManager } from './DocumentManager'; -import { mockConnection } from '../test/MockConnection'; import { ClientCapabilities } from '../ClientCapabilities'; +import { mockConnection } from '../test/MockConnection'; +import { DocumentManager } from './DocumentManager'; describe('Module: DocumentManager', () => { const mockRoot = 'mock-fs:'; diff --git a/packages/theme-language-server-common/src/documents/DocumentManager.ts b/packages/theme-language-server-common/src/documents/DocumentManager.ts index 21c1b2790..93f6e935d 100644 --- a/packages/theme-language-server-common/src/documents/DocumentManager.ts +++ b/packages/theme-language-server-common/src/documents/DocumentManager.ts @@ -2,25 +2,25 @@ import { AbstractFileSystem, assertNever, extractCSSClassesFromLiquidAST, + extractDocDefinition, + isError, + IsValidSchema, + memo, memoize, + Mode, path, recursiveReadDirectory, SourceCodeType, Theme, - toSourceCode, toSchema, + toSourceCode, UriString, - IsValidSchema, - memo, - Mode, - isError, } from '@shopify/theme-check-common'; import { Connection } from 'vscode-languageserver'; import { TextDocument } from 'vscode-languageserver-textdocument'; import { ClientCapabilities } from '../ClientCapabilities'; import { percent, Progress } from '../progress'; import { AugmentedSourceCode } from './types'; -import { extractDocDefinition } from '@shopify/theme-check-common'; const sleep = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms)); diff --git a/packages/theme-language-server-common/src/documents/types.ts b/packages/theme-language-server-common/src/documents/types.ts index 653879e30..c8b3316e0 100644 --- a/packages/theme-language-server-common/src/documents/types.ts +++ b/packages/theme-language-server-common/src/documents/types.ts @@ -1,12 +1,12 @@ import { - SourceCodeType, - SourceCode, + AppBlockSchema, + DocDefinition, SectionSchema, + SourceCode, + SourceCodeType, ThemeBlockSchema, - AppBlockSchema, } from '@shopify/theme-check-common'; import { TextDocument } from 'vscode-languageserver-textdocument'; -import { DocDefinition } from '@shopify/theme-check-common'; /** Util type to add the common `textDocument` property to the SourceCode. */ type _AugmentedSourceCode = SourceCode & { diff --git a/packages/theme-language-server-common/src/formatting/providers/BracketsAutoclosingOnTypeFormattingProvider.ts b/packages/theme-language-server-common/src/formatting/providers/BracketsAutoclosingOnTypeFormattingProvider.ts index 6813e9c1a..060229e74 100644 --- a/packages/theme-language-server-common/src/formatting/providers/BracketsAutoclosingOnTypeFormattingProvider.ts +++ b/packages/theme-language-server-common/src/formatting/providers/BracketsAutoclosingOnTypeFormattingProvider.ts @@ -1,8 +1,8 @@ import { - Range, DocumentOnTypeFormattingParams, - TextEdit, Position, + Range, + TextEdit, } from 'vscode-languageserver-protocol'; import { AugmentedSourceCode } from '../../documents'; import { BaseOnTypeFormattingProvider } from '../types'; diff --git a/packages/theme-language-server-common/src/formatting/providers/HtmlElementAutoclosingOnTypeFormattingProvider.ts b/packages/theme-language-server-common/src/formatting/providers/HtmlElementAutoclosingOnTypeFormattingProvider.ts index adff431c1..c0460b74d 100644 --- a/packages/theme-language-server-common/src/formatting/providers/HtmlElementAutoclosingOnTypeFormattingProvider.ts +++ b/packages/theme-language-server-common/src/formatting/providers/HtmlElementAutoclosingOnTypeFormattingProvider.ts @@ -6,6 +6,7 @@ import { NodeTypes, toLiquidHtmlAST, } from '@shopify/liquid-html-parser'; +import { findCurrentNode } from '@shopify/theme-check-common'; import { DocumentOnTypeFormattingParams, Position, @@ -14,7 +15,6 @@ import { } from 'vscode-languageserver-protocol'; import { TextDocument } from 'vscode-languageserver-textdocument'; import { AugmentedLiquidSourceCode } from '../../documents'; -import { findCurrentNode } from '@shopify/theme-check-common'; import { BaseOnTypeFormattingProvider, SetCursorPosition } from '../types'; const defer = (fn: () => void) => setTimeout(fn, 10); diff --git a/packages/theme-language-server-common/src/formatting/types.ts b/packages/theme-language-server-common/src/formatting/types.ts index 7ccf400a9..349235f2a 100644 --- a/packages/theme-language-server-common/src/formatting/types.ts +++ b/packages/theme-language-server-common/src/formatting/types.ts @@ -1,6 +1,6 @@ import { DocumentOnTypeFormattingParams, Position, TextEdit } from 'vscode-languageserver-protocol'; -import { AugmentedSourceCode } from '../documents'; import { TextDocument } from 'vscode-languageserver-textdocument'; +import { AugmentedSourceCode } from '../documents'; export interface BaseOnTypeFormattingProvider { onTypeFormatting( diff --git a/packages/theme-language-server-common/src/hover/BaseHoverProvider.ts b/packages/theme-language-server-common/src/hover/BaseHoverProvider.ts index 03eced7d8..d02b00149 100644 --- a/packages/theme-language-server-common/src/hover/BaseHoverProvider.ts +++ b/packages/theme-language-server-common/src/hover/BaseHoverProvider.ts @@ -1,5 +1,5 @@ -import { Hover, HoverParams } from 'vscode-languageserver'; import { LiquidHtmlNode } from '@shopify/theme-check-common'; +import { Hover, HoverParams } from 'vscode-languageserver'; export interface BaseHoverProvider { hover( diff --git a/packages/theme-language-server-common/src/hover/HoverProvider.ts b/packages/theme-language-server-common/src/hover/HoverProvider.ts index 22210611c..7eff310c9 100644 --- a/packages/theme-language-server-common/src/hover/HoverProvider.ts +++ b/packages/theme-language-server-common/src/hover/HoverProvider.ts @@ -1,4 +1,5 @@ import { + findCurrentNode, GetDocDefinitionForURI, MetafieldDefinitionMap, Mode, @@ -8,6 +9,7 @@ import { import { Hover, HoverParams } from 'vscode-languageserver'; import { TypeSystem } from '../TypeSystem'; import { DocumentManager } from '../documents'; +import { GetThemeSettingsSchemaForURI } from '../settings'; import { GetTranslationsForURI } from '../translations'; import { BaseHoverProvider } from './BaseHoverProvider'; import { @@ -18,16 +20,14 @@ import { LiquidObjectAttributeHoverProvider, LiquidObjectHoverProvider, LiquidTagHoverProvider, - TranslationHoverProvider, RenderSnippetHoverProvider, RenderSnippetParameterHoverProvider, + TranslationHoverProvider, } from './providers'; -import { HtmlAttributeValueHoverProvider } from './providers/HtmlAttributeValueHoverProvider'; -import { findCurrentNode } from '@shopify/theme-check-common'; -import { GetThemeSettingsSchemaForURI } from '../settings'; -import { LiquidDocTagHoverProvider } from './providers/LiquidDocTagHoverProvider'; import { ContentForArgumentHoverProvider } from './providers/ContentForArgumentHoverProvider'; import { ContentForTypeHoverProvider } from './providers/ContentForTypeHoverProvider'; +import { HtmlAttributeValueHoverProvider } from './providers/HtmlAttributeValueHoverProvider'; +import { LiquidDocTagHoverProvider } from './providers/LiquidDocTagHoverProvider'; export class HoverProvider { private providers: BaseHoverProvider[] = []; diff --git a/packages/theme-language-server-common/src/hover/providers/ContentForArgumentHoverProvider.spec.ts b/packages/theme-language-server-common/src/hover/providers/ContentForArgumentHoverProvider.spec.ts index 470aea242..5a58c1dc3 100644 --- a/packages/theme-language-server-common/src/hover/providers/ContentForArgumentHoverProvider.spec.ts +++ b/packages/theme-language-server-common/src/hover/providers/ContentForArgumentHoverProvider.spec.ts @@ -1,8 +1,11 @@ -import { describe, beforeEach, it, expect } from 'vitest'; +import { + DocDefinition, + GetDocDefinitionForURI, + MetafieldDefinitionMap, +} from '@shopify/theme-check-common'; +import { beforeEach, describe, expect, it } from 'vitest'; import { DocumentManager } from '../../documents'; import { HoverProvider } from '../HoverProvider'; -import { MetafieldDefinitionMap } from '@shopify/theme-check-common'; -import { GetDocDefinitionForURI, DocDefinition } from '@shopify/theme-check-common'; const uri = 'file:///blocks/product-card.liquid'; diff --git a/packages/theme-language-server-common/src/hover/providers/ContentForArgumentHoverProvider.ts b/packages/theme-language-server-common/src/hover/providers/ContentForArgumentHoverProvider.ts index 1a13bc0ec..3fe702dcc 100644 --- a/packages/theme-language-server-common/src/hover/providers/ContentForArgumentHoverProvider.ts +++ b/packages/theme-language-server-common/src/hover/providers/ContentForArgumentHoverProvider.ts @@ -1,8 +1,8 @@ import { NodeTypes } from '@shopify/liquid-html-parser'; -import { LiquidHtmlNode, GetDocDefinitionForURI, getBlockName } from '@shopify/theme-check-common'; +import { GetDocDefinitionForURI, LiquidHtmlNode, getBlockName } from '@shopify/theme-check-common'; import { Hover, HoverParams } from 'vscode-languageserver'; -import { BaseHoverProvider } from '../BaseHoverProvider'; import { formatLiquidDocParameter } from '../../utils/liquidDoc'; +import { BaseHoverProvider } from '../BaseHoverProvider'; export class ContentForArgumentHoverProvider implements BaseHoverProvider { constructor(private getDocDefinitionForURI: GetDocDefinitionForURI) {} diff --git a/packages/theme-language-server-common/src/hover/providers/ContentForTypeHoverProvider.spec.ts b/packages/theme-language-server-common/src/hover/providers/ContentForTypeHoverProvider.spec.ts index 5f2c64b64..186e72eeb 100644 --- a/packages/theme-language-server-common/src/hover/providers/ContentForTypeHoverProvider.spec.ts +++ b/packages/theme-language-server-common/src/hover/providers/ContentForTypeHoverProvider.spec.ts @@ -1,8 +1,11 @@ -import { describe, it, expect } from 'vitest'; +import { + DocDefinition, + GetDocDefinitionForURI, + MetafieldDefinitionMap, +} from '@shopify/theme-check-common'; +import { describe, expect, it } from 'vitest'; import { DocumentManager } from '../../documents'; import { HoverProvider } from '../HoverProvider'; -import { MetafieldDefinitionMap } from '@shopify/theme-check-common'; -import { GetDocDefinitionForURI, DocDefinition } from '@shopify/theme-check-common'; const uri = 'file:///blocks/product-card.liquid'; diff --git a/packages/theme-language-server-common/src/hover/providers/ContentForTypeHoverProvider.ts b/packages/theme-language-server-common/src/hover/providers/ContentForTypeHoverProvider.ts index 8ae729de1..f27c7aee5 100644 --- a/packages/theme-language-server-common/src/hover/providers/ContentForTypeHoverProvider.ts +++ b/packages/theme-language-server-common/src/hover/providers/ContentForTypeHoverProvider.ts @@ -1,8 +1,8 @@ import { NodeTypes } from '@shopify/liquid-html-parser'; -import { LiquidHtmlNode, GetDocDefinitionForURI } from '@shopify/theme-check-common'; +import { GetDocDefinitionForURI, LiquidHtmlNode } from '@shopify/theme-check-common'; import { Hover, HoverParams } from 'vscode-languageserver'; -import { BaseHoverProvider } from '../BaseHoverProvider'; import { formatLiquidDocContentMarkdown } from '../../utils/liquidDoc'; +import { BaseHoverProvider } from '../BaseHoverProvider'; export class ContentForTypeHoverProvider implements BaseHoverProvider { constructor(private getDocDefinitionForURI: GetDocDefinitionForURI) {} diff --git a/packages/theme-language-server-common/src/hover/providers/HtmlAttributeHoverProvider.spec.ts b/packages/theme-language-server-common/src/hover/providers/HtmlAttributeHoverProvider.spec.ts index a32eec84f..8541f0402 100644 --- a/packages/theme-language-server-common/src/hover/providers/HtmlAttributeHoverProvider.spec.ts +++ b/packages/theme-language-server-common/src/hover/providers/HtmlAttributeHoverProvider.spec.ts @@ -1,7 +1,7 @@ -import { describe, beforeEach, it, expect } from 'vitest'; +import { MetafieldDefinitionMap } from '@shopify/theme-check-common'; +import { beforeEach, describe, expect, it } from 'vitest'; import { DocumentManager } from '../../documents'; import { HoverProvider } from '../HoverProvider'; -import { MetafieldDefinitionMap } from '@shopify/theme-check-common'; describe('Module: HtmlAttributeHoverProvider', async () => { let provider: HoverProvider; diff --git a/packages/theme-language-server-common/src/hover/providers/HtmlAttributeHoverProvider.ts b/packages/theme-language-server-common/src/hover/providers/HtmlAttributeHoverProvider.ts index 9b30bd564..f652cc52c 100644 --- a/packages/theme-language-server-common/src/hover/providers/HtmlAttributeHoverProvider.ts +++ b/packages/theme-language-server-common/src/hover/providers/HtmlAttributeHoverProvider.ts @@ -1,5 +1,5 @@ +import { LiquidHtmlNode } from '@shopify/liquid-html-parser'; import { Hover } from 'vscode-languageserver'; -import { BaseHoverProvider } from '../BaseHoverProvider'; import { HtmlData, renderHtmlEntry } from '../../docset'; import { findLast, @@ -8,7 +8,7 @@ import { isNamedHtmlElementNode, isTextNode, } from '../../utils'; -import { LiquidHtmlNode } from '@shopify/liquid-html-parser'; +import { BaseHoverProvider } from '../BaseHoverProvider'; export class HtmlAttributeHoverProvider implements BaseHoverProvider { async hover(currentNode: LiquidHtmlNode, ancestors: LiquidHtmlNode[]): Promise { diff --git a/packages/theme-language-server-common/src/hover/providers/HtmlAttributeValueHoverProvider.spec.ts b/packages/theme-language-server-common/src/hover/providers/HtmlAttributeValueHoverProvider.spec.ts index 53ee4d06b..471576b1a 100644 --- a/packages/theme-language-server-common/src/hover/providers/HtmlAttributeValueHoverProvider.spec.ts +++ b/packages/theme-language-server-common/src/hover/providers/HtmlAttributeValueHoverProvider.spec.ts @@ -1,7 +1,7 @@ -import { describe, beforeEach, it, expect } from 'vitest'; +import { MetafieldDefinitionMap } from '@shopify/theme-check-common'; +import { beforeEach, describe, expect, it } from 'vitest'; import { DocumentManager } from '../../documents'; import { HoverProvider } from '../HoverProvider'; -import { MetafieldDefinitionMap } from '@shopify/theme-check-common'; describe('Module: HtmlAttributeHoverProvider', async () => { let provider: HoverProvider; diff --git a/packages/theme-language-server-common/src/hover/providers/HtmlTagHoverProvider.spec.ts b/packages/theme-language-server-common/src/hover/providers/HtmlTagHoverProvider.spec.ts index f27450fa1..90a9142b5 100644 --- a/packages/theme-language-server-common/src/hover/providers/HtmlTagHoverProvider.spec.ts +++ b/packages/theme-language-server-common/src/hover/providers/HtmlTagHoverProvider.spec.ts @@ -1,7 +1,7 @@ -import { describe, beforeEach, it, expect } from 'vitest'; +import { MetafieldDefinitionMap } from '@shopify/theme-check-common'; +import { beforeEach, describe, expect, it } from 'vitest'; import { DocumentManager } from '../../documents'; import { HoverProvider } from '../HoverProvider'; -import { MetafieldDefinitionMap } from '@shopify/theme-check-common'; describe('Module: HtmlTagHoverProvider', async () => { let provider: HoverProvider; diff --git a/packages/theme-language-server-common/src/hover/providers/LiquidDocTagHoverProvider.spec.ts b/packages/theme-language-server-common/src/hover/providers/LiquidDocTagHoverProvider.spec.ts index f0e94479f..e64431840 100644 --- a/packages/theme-language-server-common/src/hover/providers/LiquidDocTagHoverProvider.spec.ts +++ b/packages/theme-language-server-common/src/hover/providers/LiquidDocTagHoverProvider.spec.ts @@ -1,9 +1,9 @@ -import { describe, beforeEach, it, expect } from 'vitest'; -import { DocumentManager } from '../../documents'; -import { HoverProvider } from '../HoverProvider'; import { MetafieldDefinitionMap } from '@shopify/theme-check-common'; +import { beforeEach, describe, expect, it } from 'vitest'; import '../../../../theme-check-common/src/test/test-setup'; +import { DocumentManager } from '../../documents'; import { formatLiquidDocTagHandle, SUPPORTED_LIQUID_DOC_TAG_HANDLES } from '../../utils/liquidDoc'; +import { HoverProvider } from '../HoverProvider'; describe('Module: RenderSnippetParameterHoverProvider', async () => { let provider: HoverProvider; diff --git a/packages/theme-language-server-common/src/hover/providers/LiquidDocTagHoverProvider.ts b/packages/theme-language-server-common/src/hover/providers/LiquidDocTagHoverProvider.ts index 4673851a2..666cabb2f 100644 --- a/packages/theme-language-server-common/src/hover/providers/LiquidDocTagHoverProvider.ts +++ b/packages/theme-language-server-common/src/hover/providers/LiquidDocTagHoverProvider.ts @@ -1,9 +1,9 @@ import { NodeTypes } from '@shopify/liquid-html-parser'; import { LiquidHtmlNode } from '@shopify/theme-check-common'; import { Hover, HoverParams, MarkupKind } from 'vscode-languageserver'; -import { BaseHoverProvider } from '../BaseHoverProvider'; -import { formatLiquidDocTagHandle, SUPPORTED_LIQUID_DOC_TAG_HANDLES } from '../../utils/liquidDoc'; import { DocumentManager } from '../../documents'; +import { formatLiquidDocTagHandle, SUPPORTED_LIQUID_DOC_TAG_HANDLES } from '../../utils/liquidDoc'; +import { BaseHoverProvider } from '../BaseHoverProvider'; export class LiquidDocTagHoverProvider implements BaseHoverProvider { constructor(private documentManager: DocumentManager) {} diff --git a/packages/theme-language-server-common/src/hover/providers/LiquidFilterArgumentHoverProvider.spec.ts b/packages/theme-language-server-common/src/hover/providers/LiquidFilterArgumentHoverProvider.spec.ts index 964121452..c36feb4d6 100644 --- a/packages/theme-language-server-common/src/hover/providers/LiquidFilterArgumentHoverProvider.spec.ts +++ b/packages/theme-language-server-common/src/hover/providers/LiquidFilterArgumentHoverProvider.spec.ts @@ -1,7 +1,7 @@ -import { describe, beforeEach, it, expect } from 'vitest'; +import { MetafieldDefinitionMap } from '@shopify/theme-check-common'; +import { beforeEach, describe, expect, it } from 'vitest'; import { DocumentManager } from '../../documents'; import { HoverProvider } from '../HoverProvider'; -import { MetafieldDefinitionMap } from '@shopify/theme-check-common'; describe('Module: LiquidFilterArgumentHoverProvider', async () => { let provider: HoverProvider; diff --git a/packages/theme-language-server-common/src/hover/providers/LiquidFilterHoverProvider.spec.ts b/packages/theme-language-server-common/src/hover/providers/LiquidFilterHoverProvider.spec.ts index 86f748af0..d4cdd1975 100644 --- a/packages/theme-language-server-common/src/hover/providers/LiquidFilterHoverProvider.spec.ts +++ b/packages/theme-language-server-common/src/hover/providers/LiquidFilterHoverProvider.spec.ts @@ -1,7 +1,7 @@ -import { describe, beforeEach, it, expect } from 'vitest'; +import { MetafieldDefinitionMap } from '@shopify/theme-check-common'; +import { beforeEach, describe, expect, it } from 'vitest'; import { DocumentManager } from '../../documents'; import { HoverProvider } from '../HoverProvider'; -import { MetafieldDefinitionMap } from '@shopify/theme-check-common'; describe('Module: LiquidFilterHoverProvider', async () => { let provider: HoverProvider; diff --git a/packages/theme-language-server-common/src/hover/providers/LiquidObjectAttributeHoverProvider.spec.ts b/packages/theme-language-server-common/src/hover/providers/LiquidObjectAttributeHoverProvider.spec.ts index e04bf7c69..d460d2637 100644 --- a/packages/theme-language-server-common/src/hover/providers/LiquidObjectAttributeHoverProvider.spec.ts +++ b/packages/theme-language-server-common/src/hover/providers/LiquidObjectAttributeHoverProvider.spec.ts @@ -1,7 +1,7 @@ -import { describe, beforeEach, it, expect } from 'vitest'; +import { MetafieldDefinitionMap, ObjectEntry } from '@shopify/theme-check-common'; +import { beforeEach, describe, expect, it } from 'vitest'; import { DocumentManager } from '../../documents'; import { HoverProvider } from '../HoverProvider'; -import { MetafieldDefinitionMap, ObjectEntry } from '@shopify/theme-check-common'; describe('Module: LiquidObjectAttributeHoverProvider', async () => { let provider: HoverProvider; diff --git a/packages/theme-language-server-common/src/hover/providers/LiquidObjectHoverProvider.spec.ts b/packages/theme-language-server-common/src/hover/providers/LiquidObjectHoverProvider.spec.ts index 72d4d610f..f2a2e3c9d 100644 --- a/packages/theme-language-server-common/src/hover/providers/LiquidObjectHoverProvider.spec.ts +++ b/packages/theme-language-server-common/src/hover/providers/LiquidObjectHoverProvider.spec.ts @@ -1,7 +1,7 @@ -import { describe, beforeEach, it, expect } from 'vitest'; +import { MetafieldDefinitionMap, ObjectEntry } from '@shopify/theme-check-common'; +import { beforeEach, describe, expect, it } from 'vitest'; import { DocumentManager } from '../../documents'; import { HoverProvider } from '../HoverProvider'; -import { MetafieldDefinitionMap, ObjectEntry } from '@shopify/theme-check-common'; describe('Module: LiquidObjectHoverProvider', async () => { let provider: HoverProvider; diff --git a/packages/theme-language-server-common/src/hover/providers/LiquidTagHoverProvider.spec.ts b/packages/theme-language-server-common/src/hover/providers/LiquidTagHoverProvider.spec.ts index f0fc12f4f..dac3b5e04 100644 --- a/packages/theme-language-server-common/src/hover/providers/LiquidTagHoverProvider.spec.ts +++ b/packages/theme-language-server-common/src/hover/providers/LiquidTagHoverProvider.spec.ts @@ -1,7 +1,7 @@ -import { describe, beforeEach, it, expect } from 'vitest'; +import { MetafieldDefinitionMap } from '@shopify/theme-check-common'; +import { beforeEach, describe, expect, it } from 'vitest'; import { DocumentManager } from '../../documents'; import { HoverProvider } from '../HoverProvider'; -import { MetafieldDefinitionMap } from '@shopify/theme-check-common'; describe('Module: LiquidTagHoverProvider', async () => { let provider: HoverProvider; diff --git a/packages/theme-language-server-common/src/hover/providers/RenderSnippetHoverProvider.spec.ts b/packages/theme-language-server-common/src/hover/providers/RenderSnippetHoverProvider.spec.ts index 620f0b13a..efa5f2c99 100644 --- a/packages/theme-language-server-common/src/hover/providers/RenderSnippetHoverProvider.spec.ts +++ b/packages/theme-language-server-common/src/hover/providers/RenderSnippetHoverProvider.spec.ts @@ -1,8 +1,11 @@ -import { describe, it, expect } from 'vitest'; +import { + DocDefinition, + GetDocDefinitionForURI, + MetafieldDefinitionMap, +} from '@shopify/theme-check-common'; +import { describe, expect, it } from 'vitest'; import { DocumentManager } from '../../documents'; import { HoverProvider } from '../HoverProvider'; -import { MetafieldDefinitionMap } from '@shopify/theme-check-common'; -import { GetDocDefinitionForURI, DocDefinition } from '@shopify/theme-check-common'; const uri = 'file:///snippets/product-card.liquid'; diff --git a/packages/theme-language-server-common/src/hover/providers/RenderSnippetHoverProvider.ts b/packages/theme-language-server-common/src/hover/providers/RenderSnippetHoverProvider.ts index 63cbe7d05..353f48c0e 100644 --- a/packages/theme-language-server-common/src/hover/providers/RenderSnippetHoverProvider.ts +++ b/packages/theme-language-server-common/src/hover/providers/RenderSnippetHoverProvider.ts @@ -1,8 +1,8 @@ import { NodeTypes } from '@shopify/liquid-html-parser'; -import { LiquidHtmlNode, GetDocDefinitionForURI } from '@shopify/theme-check-common'; +import { GetDocDefinitionForURI, LiquidHtmlNode } from '@shopify/theme-check-common'; import { Hover, HoverParams } from 'vscode-languageserver'; -import { BaseHoverProvider } from '../BaseHoverProvider'; import { formatLiquidDocContentMarkdown } from '../../utils/liquidDoc'; +import { BaseHoverProvider } from '../BaseHoverProvider'; export class RenderSnippetHoverProvider implements BaseHoverProvider { constructor(private getDocDefinitionForURI: GetDocDefinitionForURI) {} diff --git a/packages/theme-language-server-common/src/hover/providers/RenderSnippetParameterHoverProvider.spec.ts b/packages/theme-language-server-common/src/hover/providers/RenderSnippetParameterHoverProvider.spec.ts index 8381e6aa7..2eb1bc345 100644 --- a/packages/theme-language-server-common/src/hover/providers/RenderSnippetParameterHoverProvider.spec.ts +++ b/packages/theme-language-server-common/src/hover/providers/RenderSnippetParameterHoverProvider.spec.ts @@ -1,8 +1,11 @@ -import { describe, beforeEach, it, expect } from 'vitest'; +import { + DocDefinition, + GetDocDefinitionForURI, + MetafieldDefinitionMap, +} from '@shopify/theme-check-common'; +import { beforeEach, describe, expect, it } from 'vitest'; import { DocumentManager } from '../../documents'; import { HoverProvider } from '../HoverProvider'; -import { MetafieldDefinitionMap } from '@shopify/theme-check-common'; -import { GetDocDefinitionForURI, DocDefinition } from '@shopify/theme-check-common'; const uri = 'file:///snippets/product-card.liquid'; diff --git a/packages/theme-language-server-common/src/hover/providers/RenderSnippetParameterHoverProvider.ts b/packages/theme-language-server-common/src/hover/providers/RenderSnippetParameterHoverProvider.ts index 3cf2f1b9d..c3935acfc 100644 --- a/packages/theme-language-server-common/src/hover/providers/RenderSnippetParameterHoverProvider.ts +++ b/packages/theme-language-server-common/src/hover/providers/RenderSnippetParameterHoverProvider.ts @@ -1,8 +1,8 @@ import { NodeTypes } from '@shopify/liquid-html-parser'; -import { LiquidHtmlNode, GetDocDefinitionForURI } from '@shopify/theme-check-common'; +import { GetDocDefinitionForURI, LiquidHtmlNode } from '@shopify/theme-check-common'; import { Hover, HoverParams } from 'vscode-languageserver'; -import { BaseHoverProvider } from '../BaseHoverProvider'; import { formatLiquidDocParameter } from '../../utils/liquidDoc'; +import { BaseHoverProvider } from '../BaseHoverProvider'; export class RenderSnippetParameterHoverProvider implements BaseHoverProvider { constructor(private getDocDefinitionForURI: GetDocDefinitionForURI) {} diff --git a/packages/theme-language-server-common/src/hover/providers/TranslationHoverProvider.spec.ts b/packages/theme-language-server-common/src/hover/providers/TranslationHoverProvider.spec.ts index 99e00b713..994436976 100644 --- a/packages/theme-language-server-common/src/hover/providers/TranslationHoverProvider.spec.ts +++ b/packages/theme-language-server-common/src/hover/providers/TranslationHoverProvider.spec.ts @@ -1,7 +1,7 @@ -import { describe, beforeEach, it, expect } from 'vitest'; +import { MetafieldDefinitionMap } from '@shopify/theme-check-common'; +import { beforeEach, describe, expect, it } from 'vitest'; import { DocumentManager } from '../../documents'; import { HoverProvider } from '../HoverProvider'; -import { MetafieldDefinitionMap } from '@shopify/theme-check-common'; describe('Module: TranslationHoverProvider', async () => { let provider: HoverProvider; diff --git a/packages/theme-language-server-common/src/hover/providers/index.ts b/packages/theme-language-server-common/src/hover/providers/index.ts index 234bce653..8a7404967 100644 --- a/packages/theme-language-server-common/src/hover/providers/index.ts +++ b/packages/theme-language-server-common/src/hover/providers/index.ts @@ -1,11 +1,11 @@ -export { LiquidTagHoverProvider } from './LiquidTagHoverProvider'; -export { LiquidFilterHoverProvider } from './LiquidFilterHoverProvider'; -export { LiquidFilterArgumentHoverProvider } from './LiquidFilterArgumentHoverProvider'; -export { LiquidObjectHoverProvider } from './LiquidObjectHoverProvider'; -export { LiquidObjectAttributeHoverProvider } from './LiquidObjectAttributeHoverProvider'; -export { HtmlTagHoverProvider } from './HtmlTagHoverProvider'; export { HtmlAttributeHoverProvider } from './HtmlAttributeHoverProvider'; export { HtmlAttributeValueHoverProvider } from './HtmlAttributeValueHoverProvider'; -export { TranslationHoverProvider } from './TranslationHoverProvider'; +export { HtmlTagHoverProvider } from './HtmlTagHoverProvider'; +export { LiquidFilterArgumentHoverProvider } from './LiquidFilterArgumentHoverProvider'; +export { LiquidFilterHoverProvider } from './LiquidFilterHoverProvider'; +export { LiquidObjectAttributeHoverProvider } from './LiquidObjectAttributeHoverProvider'; +export { LiquidObjectHoverProvider } from './LiquidObjectHoverProvider'; +export { LiquidTagHoverProvider } from './LiquidTagHoverProvider'; export { RenderSnippetHoverProvider } from './RenderSnippetHoverProvider'; export { RenderSnippetParameterHoverProvider } from './RenderSnippetParameterHoverProvider'; +export { TranslationHoverProvider } from './TranslationHoverProvider'; diff --git a/packages/theme-language-server-common/src/index.spec.ts b/packages/theme-language-server-common/src/index.spec.ts index a421bd787..9f22e3f0e 100644 --- a/packages/theme-language-server-common/src/index.spec.ts +++ b/packages/theme-language-server-common/src/index.spec.ts @@ -1,4 +1,4 @@ -import { expect, describe, it } from 'vitest'; +import { describe, expect, it } from 'vitest'; import { startServer } from './index'; describe('Module: index (common)', () => { diff --git a/packages/theme-language-server-common/src/index.ts b/packages/theme-language-server-common/src/index.ts index 400395ff1..88e271445 100644 --- a/packages/theme-language-server-common/src/index.ts +++ b/packages/theme-language-server-common/src/index.ts @@ -1,36 +1,36 @@ import { - Config as ThemeCheckConfig, - allChecks, - recommended as recommendedChecks, AbstractFileSystem, FileStat, FileTuple, FileType, SourceCodeType, + Config as ThemeCheckConfig, + allChecks, + recommended as recommendedChecks, } from '@shopify/theme-check-common'; -export * from './types'; export { visit } from '@shopify/theme-check-common'; export { + CssModule, + JavaScriptModule, + JsonModule, + LiquidModule, Reference, - ThemeGraph, SerializableEdge, SerializableNode, + ThemeGraph, ThemeModule, - CssModule, - JsonModule, - JavaScriptModule, - LiquidModule, } from '@shopify/theme-graph'; -export { debounce, memo, parseJSON, ArgumentTypes } from './utils'; export { startServer } from './server'; +export * from './types'; +export { ArgumentTypes, debounce, memo, parseJSON } from './utils'; export { - ThemeCheckConfig, - recommendedChecks, - allChecks, AbstractFileSystem, FileStat, FileTuple, FileType, SourceCodeType, + ThemeCheckConfig, + allChecks, + recommendedChecks, }; diff --git a/packages/theme-language-server-common/src/json/JSONContributions.ts b/packages/theme-language-server-common/src/json/JSONContributions.ts index 142b1fe4a..b91a92200 100644 --- a/packages/theme-language-server-common/src/json/JSONContributions.ts +++ b/packages/theme-language-server-common/src/json/JSONContributions.ts @@ -14,18 +14,18 @@ import { import { AugmentedSourceCode, DocumentManager } from '../documents'; import { GetTranslationsForURI } from '../translations'; import { JSONCompletionProvider } from './completions/JSONCompletionProvider'; +import { BlockSettingsPropertyCompletionProvider } from './completions/providers/BlockSettingsPropertyCompletionProvider'; import { BlockTypeCompletionProvider } from './completions/providers/BlockTypeCompletionProvider'; import { ReferencedBlockTypeCompletionProvider } from './completions/providers/ReferencedBlockTypeCompletionProvider'; import { SchemaTranslationsCompletionProvider } from './completions/providers/SchemaTranslationCompletionProvider'; +import { SettingsPropertyCompletionProvider } from './completions/providers/SettingsPropertyCompletionProvider'; import { JSONHoverProvider } from './hover/JSONHoverProvider'; +import { BlockSettingsHoverProvider } from './hover/providers/BlockSettingsHoverProvider'; import { SchemaTranslationHoverProvider } from './hover/providers/SchemaTranslationHoverProvider'; +import { SettingsHoverProvider } from './hover/providers/SettingsHoverProvider'; import { TranslationPathHoverProvider } from './hover/providers/TranslationPathHoverProvider'; import { RequestContext } from './RequestContext'; import { findSchemaNode } from './utils'; -import { SettingsPropertyCompletionProvider } from './completions/providers/SettingsPropertyCompletionProvider'; -import { SettingsHoverProvider } from './hover/providers/SettingsHoverProvider'; -import { BlockSettingsPropertyCompletionProvider } from './completions/providers/BlockSettingsPropertyCompletionProvider'; -import { BlockSettingsHoverProvider } from './hover/providers/BlockSettingsHoverProvider'; /** The getInfoContribution API will only fallback if we return undefined synchronously */ const SKIP_CONTRIBUTION = undefined as any; diff --git a/packages/theme-language-server-common/src/json/JSONLanguageService.ts b/packages/theme-language-server-common/src/json/JSONLanguageService.ts index b9a1db9f5..74d1364fa 100644 --- a/packages/theme-language-server-common/src/json/JSONLanguageService.ts +++ b/packages/theme-language-server-common/src/json/JSONLanguageService.ts @@ -1,6 +1,5 @@ import { LiquidRawTag, NodeTypes } from '@shopify/liquid-html-parser'; import { - IsValidSchema, JsonValidationSet, Mode, Modes, @@ -8,7 +7,6 @@ import { SourceCodeType, findCurrentNode, isValid, - toJSONAST, visit, } from '@shopify/theme-check-common'; import { JSONDocument, LanguageService, getLanguageService } from 'vscode-json-languageservice'; @@ -23,12 +21,12 @@ import { ClientCapabilities as LSPClientCapabilities, } from 'vscode-languageserver'; import { TextDocument } from 'vscode-languageserver-textdocument'; +import { URI } from 'vscode-uri'; import { DocumentManager } from '../documents'; +import { FindThemeRootURI } from '../internal-types'; import { GetTranslationsForURI } from '../translations'; -import { JSONContributions, GetThemeBlockNames, GetThemeBlockSchema } from './JSONContributions'; +import { GetThemeBlockNames, GetThemeBlockSchema, JSONContributions } from './JSONContributions'; import { createJSONDocumentLinksVisitor } from './documentLinks/DocumentLinksProvider'; -import { URI } from 'vscode-uri'; -import { FindThemeRootURI } from '../internal-types'; export class JSONLanguageService { // We index by Mode here because I don't want to reconfigure the service depending on the URI. diff --git a/packages/theme-language-server-common/src/json/completions/providers/BlockSettingsPropertyCompletionProvider.spec.ts b/packages/theme-language-server-common/src/json/completions/providers/BlockSettingsPropertyCompletionProvider.spec.ts index 2b1bb09a0..2fc2d04ad 100644 --- a/packages/theme-language-server-common/src/json/completions/providers/BlockSettingsPropertyCompletionProvider.spec.ts +++ b/packages/theme-language-server-common/src/json/completions/providers/BlockSettingsPropertyCompletionProvider.spec.ts @@ -1,6 +1,6 @@ -import { describe, it, expect, assert, beforeEach } from 'vitest'; -import { JSONLanguageService } from '../../JSONLanguageService'; +import { assert, beforeEach, describe, expect, it } from 'vitest'; import { DocumentManager } from '../../../documents'; +import { JSONLanguageService } from '../../JSONLanguageService'; import { getRequestParams, isCompletionList, diff --git a/packages/theme-language-server-common/src/json/completions/providers/BlockSettingsPropertyCompletionProvider.ts b/packages/theme-language-server-common/src/json/completions/providers/BlockSettingsPropertyCompletionProvider.ts index 7d85539c4..192796608 100644 --- a/packages/theme-language-server-common/src/json/completions/providers/BlockSettingsPropertyCompletionProvider.ts +++ b/packages/theme-language-server-common/src/json/completions/providers/BlockSettingsPropertyCompletionProvider.ts @@ -1,12 +1,12 @@ +import { deepGet, isError, SourceCodeType } from '@shopify/theme-check-common'; import { JSONPath } from 'vscode-json-languageservice'; +import { GetTranslationsForURI } from '../../../translations'; import { GetThemeBlockSchema } from '../../JSONContributions'; import { RequestContext } from '../../RequestContext'; -import { JSONCompletionItem, JSONCompletionProvider } from '../JSONCompletionProvider'; +import { getSectionBlockByName, schemaSettingsPropertyCompletionItems } from '../../schemaSettings'; import { isBlockFile, isSectionFile } from '../../utils'; -import { deepGet, isError, SourceCodeType } from '@shopify/theme-check-common'; +import { JSONCompletionItem, JSONCompletionProvider } from '../JSONCompletionProvider'; import { isSectionOrBlockSchema } from './BlockTypeCompletionProvider'; -import { GetTranslationsForURI } from '../../../translations'; -import { getSectionBlockByName, schemaSettingsPropertyCompletionItems } from '../../schemaSettings'; /** * The BlockSettingsPropertyCompletionProvider offers value completions of the diff --git a/packages/theme-language-server-common/src/json/completions/providers/BlockTypeCompletionProvider.spec.ts b/packages/theme-language-server-common/src/json/completions/providers/BlockTypeCompletionProvider.spec.ts index 90d5d895a..cb49c2f44 100644 --- a/packages/theme-language-server-common/src/json/completions/providers/BlockTypeCompletionProvider.spec.ts +++ b/packages/theme-language-server-common/src/json/completions/providers/BlockTypeCompletionProvider.spec.ts @@ -1,6 +1,6 @@ -import { describe, it, expect, assert, beforeEach } from 'vitest'; -import { JSONLanguageService } from '../../JSONLanguageService'; +import { assert, beforeEach, describe, expect, it } from 'vitest'; import { DocumentManager } from '../../../documents'; +import { JSONLanguageService } from '../../JSONLanguageService'; import { getRequestParams, isCompletionList } from '../../test/test-helpers'; /** diff --git a/packages/theme-language-server-common/src/json/completions/providers/BlockTypeCompletionProvider.ts b/packages/theme-language-server-common/src/json/completions/providers/BlockTypeCompletionProvider.ts index 29e967432..ccf0adc4a 100644 --- a/packages/theme-language-server-common/src/json/completions/providers/BlockTypeCompletionProvider.ts +++ b/packages/theme-language-server-common/src/json/completions/providers/BlockTypeCompletionProvider.ts @@ -9,10 +9,10 @@ import { import { JSONPath } from 'vscode-json-languageservice'; import { JSONCompletionItem } from 'vscode-json-languageservice/lib/umd/jsonContributions'; import { CompletionItemKind } from 'vscode-languageserver-protocol'; +import { GetThemeBlockNames } from '../../JSONContributions'; import { isLiquidRequestContext, RequestContext } from '../../RequestContext'; import { isSectionOrBlockFile } from '../../utils'; import { JSONCompletionProvider } from '../JSONCompletionProvider'; -import { GetThemeBlockNames } from '../../JSONContributions'; /** * The BlockTypeCompletionProvider offers value completions of the diff --git a/packages/theme-language-server-common/src/json/completions/providers/ReferencedBlockTypeCompletionProvider.spec.ts b/packages/theme-language-server-common/src/json/completions/providers/ReferencedBlockTypeCompletionProvider.spec.ts index 791d86d21..10972cfb1 100644 --- a/packages/theme-language-server-common/src/json/completions/providers/ReferencedBlockTypeCompletionProvider.spec.ts +++ b/packages/theme-language-server-common/src/json/completions/providers/ReferencedBlockTypeCompletionProvider.spec.ts @@ -1,6 +1,6 @@ -import { describe, it, expect, assert, beforeEach } from 'vitest'; -import { JSONLanguageService } from '../../JSONLanguageService'; +import { assert, beforeEach, describe, expect, it } from 'vitest'; import { DocumentManager } from '../../../documents'; +import { JSONLanguageService } from '../../JSONLanguageService'; import { getRequestParams, isCompletionList, diff --git a/packages/theme-language-server-common/src/json/completions/providers/ReferencedBlockTypeCompletionProvider.ts b/packages/theme-language-server-common/src/json/completions/providers/ReferencedBlockTypeCompletionProvider.ts index a8c8eb906..1dde6d2c0 100644 --- a/packages/theme-language-server-common/src/json/completions/providers/ReferencedBlockTypeCompletionProvider.ts +++ b/packages/theme-language-server-common/src/json/completions/providers/ReferencedBlockTypeCompletionProvider.ts @@ -1,6 +1,7 @@ import { deepGet, isError } from '@shopify/theme-check-common'; import { JSONPath } from 'vscode-json-languageservice'; import { JSONCompletionItem } from 'vscode-json-languageservice/lib/umd/jsonContributions'; +import { GetThemeBlockNames, GetThemeBlockSchema } from '../../JSONContributions'; import { isLiquidRequestContext, RequestContext } from '../../RequestContext'; import { isSectionOrBlockFile } from '../../utils'; import { JSONCompletionProvider } from '../JSONCompletionProvider'; @@ -8,7 +9,6 @@ import { createBlockNameCompletionItems, isSectionOrBlockSchema, } from './BlockTypeCompletionProvider'; -import { GetThemeBlockNames, GetThemeBlockSchema } from '../../JSONContributions'; /** * The ReferencedBlockTypeCompletionProvider offers value completions of the diff --git a/packages/theme-language-server-common/src/json/completions/providers/SettingsPropertyCompletionProvider.spec.ts b/packages/theme-language-server-common/src/json/completions/providers/SettingsPropertyCompletionProvider.spec.ts index f9a87eb0e..6ea4facd7 100644 --- a/packages/theme-language-server-common/src/json/completions/providers/SettingsPropertyCompletionProvider.spec.ts +++ b/packages/theme-language-server-common/src/json/completions/providers/SettingsPropertyCompletionProvider.spec.ts @@ -1,6 +1,6 @@ -import { describe, it, expect, assert, beforeEach } from 'vitest'; -import { JSONLanguageService } from '../../JSONLanguageService'; +import { assert, beforeEach, describe, expect, it } from 'vitest'; import { DocumentManager } from '../../../documents'; +import { JSONLanguageService } from '../../JSONLanguageService'; import { getRequestParams, isCompletionList, diff --git a/packages/theme-language-server-common/src/json/completions/providers/SettingsPropertyCompletionProvider.ts b/packages/theme-language-server-common/src/json/completions/providers/SettingsPropertyCompletionProvider.ts index b7c333178..aeb015a9d 100644 --- a/packages/theme-language-server-common/src/json/completions/providers/SettingsPropertyCompletionProvider.ts +++ b/packages/theme-language-server-common/src/json/completions/providers/SettingsPropertyCompletionProvider.ts @@ -1,12 +1,12 @@ import { isError, SourceCodeType } from '@shopify/theme-check-common'; import { JSONPath } from 'vscode-json-languageservice'; import { JSONCompletionItem } from 'vscode-json-languageservice/lib/umd/jsonContributions'; +import { GetTranslationsForURI } from '../../../translations'; import { RequestContext } from '../../RequestContext'; +import { schemaSettingsPropertyCompletionItems } from '../../schemaSettings'; import { isBlockFile, isSectionFile } from '../../utils'; import { JSONCompletionProvider } from '../JSONCompletionProvider'; -import { GetTranslationsForURI } from '../../../translations'; import { isSectionOrBlockSchema } from './BlockTypeCompletionProvider'; -import { schemaSettingsPropertyCompletionItems } from '../../schemaSettings'; /** * The SettingsPropertyCompletionProvider offers property completions for: diff --git a/packages/theme-language-server-common/src/json/documentLinks/DocumentLinksProvider.spec.ts b/packages/theme-language-server-common/src/json/documentLinks/DocumentLinksProvider.spec.ts index 05cee9d70..4f2ed34a0 100644 --- a/packages/theme-language-server-common/src/json/documentLinks/DocumentLinksProvider.spec.ts +++ b/packages/theme-language-server-common/src/json/documentLinks/DocumentLinksProvider.spec.ts @@ -1,9 +1,9 @@ -import { beforeEach, describe, expect, it } from 'vitest'; -import { DocumentManager } from '../../documents'; -import { createJSONDocumentLinksVisitor } from './DocumentLinksProvider'; import { toJSONAST, visit } from '@shopify/theme-check-common'; +import { beforeEach, describe, expect, it } from 'vitest'; import { URI } from 'vscode-uri'; +import { DocumentManager } from '../../documents'; import { JSONLanguageService } from '../JSONLanguageService'; +import { createJSONDocumentLinksVisitor } from './DocumentLinksProvider'; describe('JSON Document Links', () => { let documentManager: DocumentManager; diff --git a/packages/theme-language-server-common/src/json/documentLinks/DocumentLinksProvider.ts b/packages/theme-language-server-common/src/json/documentLinks/DocumentLinksProvider.ts index da639e126..d7841335b 100644 --- a/packages/theme-language-server-common/src/json/documentLinks/DocumentLinksProvider.ts +++ b/packages/theme-language-server-common/src/json/documentLinks/DocumentLinksProvider.ts @@ -1,8 +1,7 @@ -import { JSONNode, SourceCodeType } from '@shopify/theme-check-common'; +import { JSONNode, SourceCodeType, Visitor } from '@shopify/theme-check-common'; import { DocumentLink, Range } from 'vscode-languageserver'; import { TextDocument } from 'vscode-languageserver-textdocument'; import { URI, Utils } from 'vscode-uri'; -import { Visitor } from '@shopify/theme-check-common'; export function createJSONDocumentLinksVisitor( textDocument: TextDocument, diff --git a/packages/theme-language-server-common/src/json/hover/providers/BlockSettingsHoverProvider.spec.ts b/packages/theme-language-server-common/src/json/hover/providers/BlockSettingsHoverProvider.spec.ts index 870a61461..50a551027 100644 --- a/packages/theme-language-server-common/src/json/hover/providers/BlockSettingsHoverProvider.spec.ts +++ b/packages/theme-language-server-common/src/json/hover/providers/BlockSettingsHoverProvider.spec.ts @@ -1,4 +1,4 @@ -import { describe, beforeEach, it, expect } from 'vitest'; +import { beforeEach, describe, expect, it } from 'vitest'; import { DocumentManager } from '../../../documents'; import { JSONLanguageService } from '../../JSONLanguageService'; import { getRequestParams, mockJSONLanguageService } from '../../test/test-helpers'; diff --git a/packages/theme-language-server-common/src/json/hover/providers/BlockSettingsHoverProvider.ts b/packages/theme-language-server-common/src/json/hover/providers/BlockSettingsHoverProvider.ts index e95bbcf3a..23cc607a3 100644 --- a/packages/theme-language-server-common/src/json/hover/providers/BlockSettingsHoverProvider.ts +++ b/packages/theme-language-server-common/src/json/hover/providers/BlockSettingsHoverProvider.ts @@ -8,12 +8,12 @@ import { } from '@shopify/theme-check-common'; import { JSONPath, MarkedString } from 'vscode-json-languageservice'; import { GetTranslationsForURI, renderTranslation, translationValue } from '../../../translations'; -import { isLiquidRequestContext, LiquidRequestContext, RequestContext } from '../../RequestContext'; -import { isSectionOrBlockFile } from '../../utils'; -import { JSONHoverProvider } from '../JSONHoverProvider'; import { isSectionOrBlockSchema } from '../../completions/providers/BlockTypeCompletionProvider'; import { GetThemeBlockSchema } from '../../JSONContributions'; +import { isLiquidRequestContext, LiquidRequestContext, RequestContext } from '../../RequestContext'; import { getSectionBlockByName } from '../../schemaSettings'; +import { isSectionOrBlockFile } from '../../utils'; +import { JSONHoverProvider } from '../JSONHoverProvider'; export class BlockSettingsHoverProvider implements JSONHoverProvider { constructor( diff --git a/packages/theme-language-server-common/src/json/hover/providers/SettingsHoverProvider.spec.ts b/packages/theme-language-server-common/src/json/hover/providers/SettingsHoverProvider.spec.ts index 9e99be9af..44e2847e9 100644 --- a/packages/theme-language-server-common/src/json/hover/providers/SettingsHoverProvider.spec.ts +++ b/packages/theme-language-server-common/src/json/hover/providers/SettingsHoverProvider.spec.ts @@ -1,4 +1,4 @@ -import { describe, beforeEach, it, expect } from 'vitest'; +import { beforeEach, describe, expect, it } from 'vitest'; import { DocumentManager } from '../../../documents'; import { JSONLanguageService } from '../../JSONLanguageService'; import { getRequestParams, mockJSONLanguageService } from '../../test/test-helpers'; diff --git a/packages/theme-language-server-common/src/json/hover/providers/SettingsHoverProvider.ts b/packages/theme-language-server-common/src/json/hover/providers/SettingsHoverProvider.ts index 9abc419fe..b3846fff8 100644 --- a/packages/theme-language-server-common/src/json/hover/providers/SettingsHoverProvider.ts +++ b/packages/theme-language-server-common/src/json/hover/providers/SettingsHoverProvider.ts @@ -1,11 +1,11 @@ import { isError } from '@shopify/theme-check-common'; import { JSONPath, MarkedString } from 'vscode-json-languageservice'; +import { AugmentedLiquidSourceCode } from '../../../documents'; import { GetTranslationsForURI, renderTranslation, translationValue } from '../../../translations'; +import { isSectionOrBlockSchema } from '../../completions/providers/BlockTypeCompletionProvider'; import { isLiquidRequestContext, LiquidRequestContext, RequestContext } from '../../RequestContext'; import { isSectionOrBlockFile } from '../../utils'; import { JSONHoverProvider } from '../JSONHoverProvider'; -import { AugmentedLiquidSourceCode } from '../../../documents'; -import { isSectionOrBlockSchema } from '../../completions/providers/BlockTypeCompletionProvider'; export class SettingsHoverProvider implements JSONHoverProvider { constructor(private getDefaultSchemaTranslations: GetTranslationsForURI) {} diff --git a/packages/theme-language-server-common/src/json/schemaSettings.spec.ts b/packages/theme-language-server-common/src/json/schemaSettings.spec.ts index ed71a72ba..bdd5276de 100644 --- a/packages/theme-language-server-common/src/json/schemaSettings.spec.ts +++ b/packages/theme-language-server-common/src/json/schemaSettings.spec.ts @@ -1,4 +1,4 @@ -import { describe, it, expect } from 'vitest'; +import { describe, expect, it } from 'vitest'; import { getSectionBlockByName, schemaSettingsPropertyCompletionItems } from './schemaSettings'; describe('Unit: schemaSettings', () => { diff --git a/packages/theme-language-server-common/src/json/schemaSettings.ts b/packages/theme-language-server-common/src/json/schemaSettings.ts index cb7177852..84481ee14 100644 --- a/packages/theme-language-server-common/src/json/schemaSettings.ts +++ b/packages/theme-language-server-common/src/json/schemaSettings.ts @@ -1,6 +1,6 @@ +import { Section, Setting, Translations } from '@shopify/theme-check-common'; import { CompletionItemKind, MarkupKind } from 'vscode-json-languageservice'; import { renderTranslation, translationValue } from '../translations'; -import { Section, Setting, Translations } from '@shopify/theme-check-common'; import { JSONCompletionItem } from './completions/JSONCompletionProvider'; export function schemaSettingsPropertyCompletionItems( diff --git a/packages/theme-language-server-common/src/json/test/test-helpers.ts b/packages/theme-language-server-common/src/json/test/test-helpers.ts index a61fcc9a3..ad6cc28c9 100644 --- a/packages/theme-language-server-common/src/json/test/test-helpers.ts +++ b/packages/theme-language-server-common/src/json/test/test-helpers.ts @@ -1,3 +1,4 @@ +import { SourceCodeType } from '@shopify/theme-check-common'; import { CompletionItem, CompletionList, @@ -5,10 +6,9 @@ import { HoverParams, } from 'vscode-languageserver-protocol'; import { DocumentManager } from '../../documents'; +import { GetTranslationsForURI } from '../../translations'; import { GetThemeBlockNames } from '../JSONContributions'; import { JSONLanguageService } from '../JSONLanguageService'; -import { SourceCodeType } from '@shopify/theme-check-common'; -import { GetTranslationsForURI } from '../../translations'; export function getRequestParams( documentManager: DocumentManager, diff --git a/packages/theme-language-server-common/src/linkedEditingRanges/LinkedEditingRangesProvider.ts b/packages/theme-language-server-common/src/linkedEditingRanges/LinkedEditingRangesProvider.ts index 86580aff6..436c9c528 100644 --- a/packages/theme-language-server-common/src/linkedEditingRanges/LinkedEditingRangesProvider.ts +++ b/packages/theme-language-server-common/src/linkedEditingRanges/LinkedEditingRangesProvider.ts @@ -1,7 +1,6 @@ -import { LiquidHtmlNode, SourceCodeType } from '@shopify/theme-check-common'; +import { findCurrentNode, LiquidHtmlNode, SourceCodeType } from '@shopify/theme-check-common'; import { LinkedEditingRangeParams, LinkedEditingRanges } from 'vscode-languageserver'; import { DocumentManager } from '../documents'; -import { findCurrentNode } from '@shopify/theme-check-common'; import { BaseLinkedEditingRangesProvider } from './BaseLinkedEditingRangesProvider'; import { EmptyHtmlTagLinkedRangesProvider, HtmlTagNameLinkedRangesProvider } from './providers'; diff --git a/packages/theme-language-server-common/src/linkedEditingRanges/providers/EmptyHtmlTagLinkedRangesProvider.spec.ts b/packages/theme-language-server-common/src/linkedEditingRanges/providers/EmptyHtmlTagLinkedRangesProvider.spec.ts index fcafdf06c..d7f6e08ac 100644 --- a/packages/theme-language-server-common/src/linkedEditingRanges/providers/EmptyHtmlTagLinkedRangesProvider.spec.ts +++ b/packages/theme-language-server-common/src/linkedEditingRanges/providers/EmptyHtmlTagLinkedRangesProvider.spec.ts @@ -1,8 +1,8 @@ -import { describe, beforeEach, it, expect, assert } from 'vitest'; -import { LinkedEditingRangesProvider } from '..'; -import { DocumentManager } from '../../documents'; +import { assert, beforeEach, describe, expect, it } from 'vitest'; import { LinkedEditingRangeParams } from 'vscode-languageserver'; import { Position } from 'vscode-languageserver-protocol'; +import { LinkedEditingRangesProvider } from '..'; +import { DocumentManager } from '../../documents'; import { htmlElementNameWordPattern } from '../wordPattern'; describe('Module: EmptyHtmlTagLinkedRangesProvider', () => { diff --git a/packages/theme-language-server-common/src/linkedEditingRanges/providers/HtmlTagNameLinkedRangesProvider.spec.ts b/packages/theme-language-server-common/src/linkedEditingRanges/providers/HtmlTagNameLinkedRangesProvider.spec.ts index fc771ef1a..e81a67879 100644 --- a/packages/theme-language-server-common/src/linkedEditingRanges/providers/HtmlTagNameLinkedRangesProvider.spec.ts +++ b/packages/theme-language-server-common/src/linkedEditingRanges/providers/HtmlTagNameLinkedRangesProvider.spec.ts @@ -1,10 +1,10 @@ -import { describe, beforeEach, it, expect, assert } from 'vitest'; -import { LinkedEditingRangesProvider } from '../LinkedEditingRangesProvider'; -import { DocumentManager } from '../../documents'; +import { assert, beforeEach, describe, expect, it } from 'vitest'; import { LinkedEditingRangeParams } from 'vscode-languageserver'; import { Position } from 'vscode-languageserver-protocol'; -import { htmlElementNameWordPattern } from '../wordPattern'; import { TextDocument } from 'vscode-languageserver-textdocument'; +import { DocumentManager } from '../../documents'; +import { LinkedEditingRangesProvider } from '../LinkedEditingRangesProvider'; +import { htmlElementNameWordPattern } from '../wordPattern'; describe('Module: HtmlTagNameLinkedRangesProvider', () => { const uri = 'file:///path/to/document.liquid'; diff --git a/packages/theme-language-server-common/src/linkedEditingRanges/providers/HtmlTagNameLinkedRangesProvider.ts b/packages/theme-language-server-common/src/linkedEditingRanges/providers/HtmlTagNameLinkedRangesProvider.ts index 461ce0df9..f3e0860b9 100644 --- a/packages/theme-language-server-common/src/linkedEditingRanges/providers/HtmlTagNameLinkedRangesProvider.ts +++ b/packages/theme-language-server-common/src/linkedEditingRanges/providers/HtmlTagNameLinkedRangesProvider.ts @@ -1,8 +1,8 @@ import { LiquidHtmlNode } from '@shopify/liquid-html-parser'; import { LinkedEditingRangeParams } from 'vscode-languageserver'; import { DocumentManager } from '../../documents'; -import { BaseLinkedEditingRangesProvider } from '../BaseLinkedEditingRangesProvider'; import { getHtmlElementNameRanges } from '../../utils/htmlTagNames'; +import { BaseLinkedEditingRangesProvider } from '../BaseLinkedEditingRangesProvider'; import { htmlElementNameWordPattern } from '../wordPattern'; export class HtmlTagNameLinkedRangesProvider implements BaseLinkedEditingRangesProvider { diff --git a/packages/theme-language-server-common/src/rename/RenameProvider.ts b/packages/theme-language-server-common/src/rename/RenameProvider.ts index 7327910c6..ec57741d3 100644 --- a/packages/theme-language-server-common/src/rename/RenameProvider.ts +++ b/packages/theme-language-server-common/src/rename/RenameProvider.ts @@ -1,5 +1,6 @@ import { LiquidHtmlNode } from '@shopify/liquid-html-parser'; -import { SourceCodeType } from '@shopify/theme-check-common'; +import { findCurrentNode, SourceCodeType } from '@shopify/theme-check-common'; +import { Connection } from 'vscode-languageserver'; import { PrepareRenameParams, PrepareRenameResult, @@ -7,14 +8,12 @@ import { TextDocumentPositionParams, WorkspaceEdit, } from 'vscode-languageserver-protocol'; +import { ClientCapabilities } from '../ClientCapabilities'; import { DocumentManager } from '../documents'; -import { findCurrentNode } from '@shopify/theme-check-common'; +import { FindThemeRootURI } from '../internal-types'; import { BaseRenameProvider } from './BaseRenameProvider'; import { HtmlTagNameRenameProvider } from './providers/HtmlTagNameRenameProvider'; import { LiquidVariableRenameProvider } from './providers/LiquidVariableRenameProvider'; -import { Connection } from 'vscode-languageserver'; -import { ClientCapabilities } from '../ClientCapabilities'; -import { FindThemeRootURI } from '../internal-types'; /** * RenameProvider is responsible for providing rename support for the theme language server. diff --git a/packages/theme-language-server-common/src/rename/providers/HtmlTagNameRenameProvider.spec.ts b/packages/theme-language-server-common/src/rename/providers/HtmlTagNameRenameProvider.spec.ts index 452b8bcb3..03f6b415c 100644 --- a/packages/theme-language-server-common/src/rename/providers/HtmlTagNameRenameProvider.spec.ts +++ b/packages/theme-language-server-common/src/rename/providers/HtmlTagNameRenameProvider.spec.ts @@ -1,9 +1,9 @@ import { assert, beforeEach, describe, expect, it } from 'vitest'; import { Position, TextDocumentEdit } from 'vscode-languageserver-protocol'; -import { DocumentManager } from '../../documents'; -import { RenameProvider } from '../RenameProvider'; import { ClientCapabilities } from '../../ClientCapabilities'; +import { DocumentManager } from '../../documents'; import { mockConnection } from '../../test/MockConnection'; +import { RenameProvider } from '../RenameProvider'; const mockRoot = 'file:'; diff --git a/packages/theme-language-server-common/src/rename/providers/LiquidVariableRenameProvider.spec.ts b/packages/theme-language-server-common/src/rename/providers/LiquidVariableRenameProvider.spec.ts index 3bc4aa60d..7a0abbff9 100644 --- a/packages/theme-language-server-common/src/rename/providers/LiquidVariableRenameProvider.spec.ts +++ b/packages/theme-language-server-common/src/rename/providers/LiquidVariableRenameProvider.spec.ts @@ -1,10 +1,10 @@ import { assert, beforeEach, describe, expect, it } from 'vitest'; import { Position, TextDocumentEdit } from 'vscode-languageserver-protocol'; import { TextDocument } from 'vscode-languageserver-textdocument'; +import { ClientCapabilities } from '../../ClientCapabilities'; import { DocumentManager } from '../../documents'; -import { RenameProvider } from '../RenameProvider'; import { mockConnection, MockConnection } from '../../test/MockConnection'; -import { ClientCapabilities } from '../../ClientCapabilities'; +import { RenameProvider } from '../RenameProvider'; const mockRoot = 'file:'; diff --git a/packages/theme-language-server-common/src/renamed/handlers/AssetRenameHandler.spec.ts b/packages/theme-language-server-common/src/renamed/handlers/AssetRenameHandler.spec.ts index 5c1bd9b49..76fa6ccce 100644 --- a/packages/theme-language-server-common/src/renamed/handlers/AssetRenameHandler.spec.ts +++ b/packages/theme-language-server-common/src/renamed/handlers/AssetRenameHandler.spec.ts @@ -2,7 +2,6 @@ import { MockFileSystem } from '@shopify/theme-check-common/src/test'; import { assert, beforeEach, describe, expect, it } from 'vitest'; import { TextDocumentEdit } from 'vscode-json-languageservice'; import { ApplyWorkspaceEditParams } from 'vscode-languageserver-protocol'; -import { TextDocument } from 'vscode-languageserver-textdocument'; import { ClientCapabilities } from '../../ClientCapabilities'; import { DocumentManager } from '../../documents'; import { MockConnection, mockConnection } from '../../test/MockConnection'; diff --git a/packages/theme-language-server-common/src/renamed/handlers/AssetRenameHandler.ts b/packages/theme-language-server-common/src/renamed/handlers/AssetRenameHandler.ts index 8866a7e80..a62a75298 100644 --- a/packages/theme-language-server-common/src/renamed/handlers/AssetRenameHandler.ts +++ b/packages/theme-language-server-common/src/renamed/handlers/AssetRenameHandler.ts @@ -10,9 +10,9 @@ import { } from 'vscode-languageserver-protocol'; import { ClientCapabilities } from '../../ClientCapabilities'; import { DocumentManager, isLiquidSourceCode } from '../../documents'; +import { FindThemeRootURI } from '../../internal-types'; import { assetName, isAsset } from '../../utils/uri'; import { BaseRenameHandler } from '../BaseRenameHandler'; -import { FindThemeRootURI } from '../../internal-types'; /** * The AssetRenameHandler will handle asset renames. diff --git a/packages/theme-language-server-common/src/renamed/handlers/BlockRenameHandler.ts b/packages/theme-language-server-common/src/renamed/handlers/BlockRenameHandler.ts index b09f8ad92..63f6a0c51 100644 --- a/packages/theme-language-server-common/src/renamed/handlers/BlockRenameHandler.ts +++ b/packages/theme-language-server-common/src/renamed/handlers/BlockRenameHandler.ts @@ -33,10 +33,10 @@ import { isJsonSourceCode, isLiquidSourceCode, } from '../../documents'; +import { FindThemeRootURI } from '../../internal-types'; import { blockName, isBlock, isSection, isSectionGroup, isTemplate } from '../../utils/uri'; import { BaseRenameHandler } from '../BaseRenameHandler'; import { isValidSectionGroup, isValidTemplate } from './utils'; -import { FindThemeRootURI } from '../../internal-types'; type DocumentChange = TextDocumentEdit; diff --git a/packages/theme-language-server-common/src/renamed/handlers/SnippetRenameHandler.ts b/packages/theme-language-server-common/src/renamed/handlers/SnippetRenameHandler.ts index 204a8537b..5151ddfe0 100644 --- a/packages/theme-language-server-common/src/renamed/handlers/SnippetRenameHandler.ts +++ b/packages/theme-language-server-common/src/renamed/handlers/SnippetRenameHandler.ts @@ -10,9 +10,9 @@ import { } from 'vscode-languageserver-protocol'; import { ClientCapabilities } from '../../ClientCapabilities'; import { DocumentManager, isLiquidSourceCode } from '../../documents'; +import { FindThemeRootURI } from '../../internal-types'; import { isSnippet, snippetName } from '../../utils/uri'; import { BaseRenameHandler } from '../BaseRenameHandler'; -import { FindThemeRootURI } from '../../internal-types'; /** * The SnippetRenameHandler will handle snippet renames. diff --git a/packages/theme-language-server-common/src/server/ThemeGraphManager.ts b/packages/theme-language-server-common/src/server/ThemeGraphManager.ts index a83bcbced..9fa73739a 100644 --- a/packages/theme-language-server-common/src/server/ThemeGraphManager.ts +++ b/packages/theme-language-server-common/src/server/ThemeGraphManager.ts @@ -1,11 +1,11 @@ import { AbstractFileSystem, + Mode, path, recursiveReadDirectory, SectionSchema, SourceCodeType, ThemeBlockSchema, - Mode, } from '@shopify/theme-check-common'; import { buildThemeGraph, @@ -19,6 +19,7 @@ import { Range } from 'vscode-json-languageservice'; import { Connection } from 'vscode-languageserver'; import { TextDocument } from 'vscode-languageserver-textdocument'; import { DocumentManager } from '../documents'; +import { FindThemeRootURI } from '../internal-types'; import { AugmentedLocation, AugmentedLocationWithExistence, @@ -26,7 +27,6 @@ import { ThemeGraphDidUpdateNotification, } from '../types'; import { debounce } from '../utils'; -import { FindThemeRootURI } from '../internal-types'; export class ThemeGraphManager { graphs: Map> = new Map(); diff --git a/packages/theme-language-server-common/src/test/CompletionItemsAssertion.spec.ts b/packages/theme-language-server-common/src/test/CompletionItemsAssertion.spec.ts index 93897bf9f..d2de6b212 100644 --- a/packages/theme-language-server-common/src/test/CompletionItemsAssertion.spec.ts +++ b/packages/theme-language-server-common/src/test/CompletionItemsAssertion.spec.ts @@ -1,7 +1,7 @@ -import { expect, describe, it, beforeEach } from 'vitest'; +import { MetafieldDefinitionMap } from '@shopify/theme-check-common'; +import { beforeEach, describe, expect, it } from 'vitest'; import { CompletionsProvider } from '../completions'; import { DocumentManager } from '../documents'; -import { MetafieldDefinitionMap } from '@shopify/theme-check-common'; describe('Module: CompletionItemsAssertion', () => { let provider: CompletionsProvider; diff --git a/packages/theme-language-server-common/src/test/CompletionItemsAssertion.ts b/packages/theme-language-server-common/src/test/CompletionItemsAssertion.ts index eed553537..5a39f8002 100644 --- a/packages/theme-language-server-common/src/test/CompletionItemsAssertion.ts +++ b/packages/theme-language-server-common/src/test/CompletionItemsAssertion.ts @@ -1,7 +1,7 @@ +import { AsyncExpectationResult, MatcherState, RawMatcherFn } from '@vitest/expect'; +import { expect } from 'vitest'; import { CompletionItem, Position } from 'vscode-languageserver-protocol'; import { CompletionsProvider } from '../completions'; -import { expect } from 'vitest'; -import { AsyncExpectationResult, MatcherState, RawMatcherFn } from '@vitest/expect'; export type CompleteContext = { relativePath: string; source: string }; diff --git a/packages/theme-language-server-common/src/test/HoverAssertion.ts b/packages/theme-language-server-common/src/test/HoverAssertion.ts index b95d1c0d1..6ddd046b1 100644 --- a/packages/theme-language-server-common/src/test/HoverAssertion.ts +++ b/packages/theme-language-server-common/src/test/HoverAssertion.ts @@ -1,5 +1,5 @@ -import { expect } from 'vitest'; import { AsyncExpectationResult, MatcherState, RawMatcherFn } from '@vitest/expect'; +import { expect } from 'vitest'; import { HoverParams, MarkupContent } from 'vscode-languageserver-protocol'; import { HoverProvider } from '../hover'; diff --git a/packages/theme-language-server-common/src/test/MockConnection.ts b/packages/theme-language-server-common/src/test/MockConnection.ts index 674ce7059..6c06e5e80 100644 --- a/packages/theme-language-server-common/src/test/MockConnection.ts +++ b/packages/theme-language-server-common/src/test/MockConnection.ts @@ -1,6 +1,6 @@ -import { vi } from 'vitest'; +import { path } from '@shopify/theme-check-common'; import { EventEmitter } from 'node:events'; -import { createConnection } from 'vscode-languageserver/lib/common/server'; +import { vi } from 'vitest'; import { ClientCapabilities, DidChangeTextDocumentNotification, @@ -14,7 +14,7 @@ import { ProtocolConnection, WatchDog, } from 'vscode-languageserver'; -import { path } from '@shopify/theme-check-common'; +import { createConnection } from 'vscode-languageserver/lib/common/server'; type MockFn = ReturnType; diff --git a/packages/theme-language-server-common/src/types.ts b/packages/theme-language-server-common/src/types.ts index 57acb1420..9dc6dd49b 100644 --- a/packages/theme-language-server-common/src/types.ts +++ b/packages/theme-language-server-common/src/types.ts @@ -3,12 +3,12 @@ import { Config, Dependencies as ThemeCheckDependencies, } from '@shopify/theme-check-common'; -import { URI } from 'vscode-languageserver'; import * as rpc from 'vscode-jsonrpc'; +import { URI } from 'vscode-languageserver'; -import { WithOptional } from './utils'; -import { Range } from 'vscode-json-languageservice'; import { Reference } from '@shopify/theme-graph'; +import { Range } from 'vscode-json-languageservice'; +import { WithOptional } from './utils'; export type Dependencies = WithOptional< RequiredDependencies, diff --git a/packages/theme-language-server-common/src/utils/htmlTagNames.ts b/packages/theme-language-server-common/src/utils/htmlTagNames.ts index b53bc0b92..6c34aa2ae 100644 --- a/packages/theme-language-server-common/src/utils/htmlTagNames.ts +++ b/packages/theme-language-server-common/src/utils/htmlTagNames.ts @@ -1,5 +1,5 @@ -import { LiquidHtmlNode, HtmlElement, NodeTypes } from '@shopify/liquid-html-parser'; -import { TextDocumentPositionParams, Range } from 'vscode-languageserver'; +import { HtmlElement, LiquidHtmlNode, NodeTypes } from '@shopify/liquid-html-parser'; +import { Range, TextDocumentPositionParams } from 'vscode-languageserver'; import { TextDocument } from 'vscode-languageserver-textdocument'; import { isCovered } from './isCovered'; diff --git a/packages/theme-language-server-common/src/utils/index.ts b/packages/theme-language-server-common/src/utils/index.ts index 97414bcc0..7be7acb7f 100644 --- a/packages/theme-language-server-common/src/utils/index.ts +++ b/packages/theme-language-server-common/src/utils/index.ts @@ -6,7 +6,7 @@ export { memoize, parseJSON, } from '@shopify/theme-check-common'; -export * from './debounce'; export * from './array'; -export * from './node'; +export * from './debounce'; export * from './isCovered'; +export * from './node'; diff --git a/packages/theme-language-server-node/src/dependencies.ts b/packages/theme-language-server-node/src/dependencies.ts index 050b97c8e..a89ac214d 100644 --- a/packages/theme-language-server-node/src/dependencies.ts +++ b/packages/theme-language-server-node/src/dependencies.ts @@ -2,8 +2,8 @@ import { AbstractFileSystem, Config, findRoot, - loadConfig as nodeLoadConfig, makeFileExists, + loadConfig as nodeLoadConfig, path, recursiveReadDirectory, } from '@shopify/theme-check-node'; diff --git a/packages/theme-language-server-node/src/index.spec.ts b/packages/theme-language-server-node/src/index.spec.ts index e10a192d7..b5cfc0b46 100644 --- a/packages/theme-language-server-node/src/index.spec.ts +++ b/packages/theme-language-server-node/src/index.spec.ts @@ -1,4 +1,4 @@ -import { expect, it, describe } from 'vitest'; +import { describe, expect, it } from 'vitest'; import { startServer } from './index'; describe('Module: index (server)', () => { diff --git a/packages/vscode-extension/src/browser/extension.ts b/packages/vscode-extension/src/browser/extension.ts index 074c1447b..eaace3a59 100644 --- a/packages/vscode-extension/src/browser/extension.ts +++ b/packages/vscode-extension/src/browser/extension.ts @@ -2,19 +2,19 @@ import { FileStat, FileTuple, path } from '@shopify/theme-check-common'; import { commands, ExtensionContext, languages, Uri, workspace } from 'vscode'; import { + DocumentSelector, LanguageClient, LanguageClientOptions, - DocumentSelector, } from 'vscode-languageclient/browser'; -import LiquidFormatter from '../common/formatter'; -import { vscodePrettierFormat } from './formatter'; -import { documentSelectors } from '../common/constants'; import { makeDeadCode, openLocation } from '../common/commands'; +import { documentSelectors } from '../common/constants'; +import LiquidFormatter from '../common/formatter'; import { createReferencesTreeView, setupContext, watchReferencesTreeViewConfig, } from '../common/ReferencesProvider'; +import { vscodePrettierFormat } from './formatter'; const sleep = (ms: number) => new Promise((res) => setTimeout(res, ms)); diff --git a/packages/vscode-extension/src/browser/formatter.ts b/packages/vscode-extension/src/browser/formatter.ts index 9052fcd55..e4dbf1283 100644 --- a/packages/vscode-extension/src/browser/formatter.ts +++ b/packages/vscode-extension/src/browser/formatter.ts @@ -1,7 +1,7 @@ -import { Format } from '../common/formatter'; import LiquidPrettierPlugin from '@shopify/prettier-plugin-liquid'; import babelPrettierPlugin from 'prettier/parser-babel'; import * as prettier from 'prettier/standalone'; +import { Format } from '../common/formatter'; export const vscodePrettierFormat: Format = async (textDocument) => { // In browser, we don't have access to the file system nor can we run arbitrary node code diff --git a/packages/vscode-extension/src/common/VsCodeFileSystem.ts b/packages/vscode-extension/src/common/VsCodeFileSystem.ts index 4a465e9d9..14a593399 100644 --- a/packages/vscode-extension/src/common/VsCodeFileSystem.ts +++ b/packages/vscode-extension/src/common/VsCodeFileSystem.ts @@ -1,4 +1,4 @@ -import { AbstractFileSystem, FileTuple, FileStat } from '@shopify/theme-check-common'; +import { AbstractFileSystem, FileStat, FileTuple } from '@shopify/theme-check-common'; import { Connection } from 'vscode-languageserver'; import { URI } from 'vscode-uri'; diff --git a/packages/vscode-extension/src/node/extension.ts b/packages/vscode-extension/src/node/extension.ts index 0bf9b99fc..44dd29669 100644 --- a/packages/vscode-extension/src/node/extension.ts +++ b/packages/vscode-extension/src/node/extension.ts @@ -8,15 +8,15 @@ import { ServerOptions, TransportKind, } from 'vscode-languageclient/node'; -import { documentSelectors } from '../common/constants'; -import LiquidFormatter from '../common/formatter'; -import { vscodePrettierFormat } from './formatter'; import { createReferencesTreeView, setupContext, watchReferencesTreeViewConfig, } from '../common/ReferencesProvider'; import { makeDeadCode, openLocation } from '../common/commands'; +import { documentSelectors } from '../common/constants'; +import LiquidFormatter from '../common/formatter'; +import { vscodePrettierFormat } from './formatter'; const sleep = (ms: number) => new Promise((res) => setTimeout(res, ms)); diff --git a/packages/vscode-extension/src/node/formatter.spec.ts b/packages/vscode-extension/src/node/formatter.spec.ts index a8282814e..95dbe7a39 100644 --- a/packages/vscode-extension/src/node/formatter.spec.ts +++ b/packages/vscode-extension/src/node/formatter.spec.ts @@ -1,7 +1,7 @@ -import { describe, it, expect, vi, beforeEach } from 'vitest'; -import type * as vscode from 'vscode'; import * as prettier from 'prettier'; -import { vscodePrettierFormat, nodePrettierFormat } from './formatter'; +import { beforeEach, describe, expect, it, vi } from 'vitest'; +import type * as vscode from 'vscode'; +import { nodePrettierFormat, vscodePrettierFormat } from './formatter'; vi.mock('prettier', () => ({ format: vi.fn(), diff --git a/packages/vscode-extension/src/node/formatter.ts b/packages/vscode-extension/src/node/formatter.ts index b1685e011..67353973c 100644 --- a/packages/vscode-extension/src/node/formatter.ts +++ b/packages/vscode-extension/src/node/formatter.ts @@ -1,7 +1,7 @@ -import path from 'node:path'; -import { workspace } from 'vscode'; import LiquidPrettierPlugin from '@shopify/prettier-plugin-liquid'; +import path from 'node:path'; import * as prettier from 'prettier'; +import { workspace } from 'vscode'; import { Format } from '../common/formatter'; export const vscodePrettierFormat: Format = async (textDocument) => {