From c430e0e715ffbe6c10f00349efd5568339f0a9f7 Mon Sep 17 00:00:00 2001 From: William Killerud Date: Sat, 10 Dec 2022 12:32:09 +0100 Subject: [PATCH 1/6] test: update expected event structure to match actual --- .../e2e/suite/completion/completion.test.ts | 29 +++++++++---------- src/test/e2e/suite/completion/helper.ts | 7 ++--- 2 files changed, 17 insertions(+), 19 deletions(-) diff --git a/src/test/e2e/suite/completion/completion.test.ts b/src/test/e2e/suite/completion/completion.test.ts index 01c53d65..f5a54358 100644 --- a/src/test/e2e/suite/completion/completion.test.ts +++ b/src/test/e2e/suite/completion/completion.test.ts @@ -61,7 +61,7 @@ describe("SCSS Completion Test", function () { { label: "fun-fun-function", detail: "Function declared in _functions.scss", - insertText: '{"_tabstop":1,"value":".fun-fun-function()"}', + insertText: '".fun-fun-function()"', }, ]; @@ -79,7 +79,7 @@ describe("SCSS Completion Test", function () { { label: "fun-fun-function", detail: "Function declared in _functions.scss", - insertText: '{"_tabstop":1,"value":"fun-fun-function()"}', + insertText: '"fun-fun-function()"', }, ]; @@ -91,7 +91,7 @@ describe("SCSS Completion Test", function () { { label: "mix-mix-mixin", detail: "Mixin declared in _mixins.scss", - insertText: '{"_tabstop":1,"value":".mix-mix-mixin"}', + insertText: '".mix-mix-mixin"', }, ]; @@ -102,7 +102,7 @@ describe("SCSS Completion Test", function () { { label: "mix-mix-mixin", detail: "Mixin declared in _mixins.scss", - insertText: '{"_tabstop":1,"value":"mix-mix-mixin"}', + insertText: '"mix-mix-mixin"', }, ]; @@ -183,7 +183,7 @@ describe("SCSS Completion Test", function () { { label: "fun-fun-function", detail: "Function declared in _functions.scss", - insertText: '{"_tabstop":1,"value":".fun-fun-function()"}', + insertText: '".fun-fun-function()"', }, ]; @@ -201,7 +201,7 @@ describe("SCSS Completion Test", function () { { label: "fun-fun-function", detail: "Function declared in _functions.scss", - insertText: '{"_tabstop":1,"value":"fun-fun-function()"}', + insertText: '"fun-fun-function()"', }, ]; @@ -221,7 +221,7 @@ describe("SCSS Completion Test", function () { { label: "fun-fun-function", detail: "Function declared in _functions.scss", - insertText: '{"_tabstop":1,"value":".fun-fun-function()"}', + insertText: '".fun-fun-function()"', }, ]; @@ -239,7 +239,7 @@ describe("SCSS Completion Test", function () { { label: "fun-fun-function", detail: "Function declared in _functions.scss", - insertText: '{"_tabstop":1,"value":".fun-fun-function()"}', + insertText: '".fun-fun-function()"', }, ]; @@ -258,7 +258,7 @@ describe("SassDoc Completion Test", () => { const expectedCompletions = [ { label: "SassDoc block", - insertText: '{"_tabstop":1,"value":" ${0}\\n/// @output ${2}"}', + insertText: '" ${0}\\n/// @output ${2}"', }, ]; @@ -269,8 +269,7 @@ describe("SassDoc Completion Test", () => { const expectedCompletions = [ { label: "SassDoc block", - insertText: - '{"_tabstop":1,"value":" ${0}\\n/// @content ${1}\\n/// @output ${2}"}', + insertText: '" ${0}\\n/// @content ${1}\\n/// @output ${2}"', }, ]; @@ -282,7 +281,7 @@ describe("SassDoc Completion Test", () => { { label: "SassDoc block", insertText: - '{"_tabstop":1,"value":" ${0}\\n/// @param {${1:Number}} \\\\$a [1px] ${2:-}\\n/// @param {${3:Number}} \\\\$b [2px] ${4:-}\\n/// @output ${6:-}"}', + '" ${0}\\n/// @param {${1:Number}} \\\\$a [1px] ${2:-}\\n/// @param {${3:Number}} \\\\$b [2px] ${4:-}\\n/// @output ${6:-}"', }, ]; @@ -294,7 +293,7 @@ describe("SassDoc Completion Test", () => { { label: "SassDoc block", insertText: - '{"_tabstop":1,"value":" ${0}\\n/// @param {${1:type}} \\\\$a ${2:-}\\n/// @param {${3:type}} \\\\$b ${4:-}\\n/// @output ${6:-}"}', + '" ${0}\\n/// @param {${1:type}} \\\\$a ${2:-}\\n/// @param {${3:type}} \\\\$b ${4:-}\\n/// @output ${6:-}"', }, ]; @@ -306,7 +305,7 @@ describe("SassDoc Completion Test", () => { { label: "SassDoc block", insertText: - '{"_tabstop":1,"value":" ${0}\\n/// @param {${1:type}} \\\\ ${2:-}\\n/// @return {${3:type}} ${4:-}"}', + '" ${0}\\n/// @param {${1:type}} \\\\ ${2:-}\\n/// @return {${3:type}} ${4:-}"', }, ]; @@ -318,7 +317,7 @@ describe("SassDoc Completion Test", () => { { label: "SassDoc block", insertText: - '{"_tabstop":1,"value":" ${0}\\n/// @param {${1:Number}} \\\\$a [1px] ${2:-}\\n/// @param {${3:Number}} \\\\$b [2px] ${4:-}\\n/// @return {${5:type}} ${6:-}"}', + '" ${0}\\n/// @param {${1:Number}} \\\\$a [1px] ${2:-}\\n/// @param {${3:Number}} \\\\$b [2px] ${4:-}\\n/// @return {${5:type}} ${6:-}"', }, ]; diff --git a/src/test/e2e/suite/completion/helper.ts b/src/test/e2e/suite/completion/helper.ts index 52a3891f..afa783fe 100644 --- a/src/test/e2e/suite/completion/helper.ts +++ b/src/test/e2e/suite/completion/helper.ts @@ -77,10 +77,9 @@ export async function testCompletion( assert.strictEqual(match.detail, ei.detail); } if (ei.insertText) { - assert.strictEqual( - JSON.stringify(match.insertText), - ei.insertText, - `Expected insertText to match ${ + assert.ok( + JSON.stringify(match.insertText).includes(ei.insertText), + `Expected insertText to include ${ ei.insertText }. Actual: ${JSON.stringify(match.insertText)}`, ); From c3fcc6e99f2f95413a1e7f0de9c51a66c9b053af Mon Sep 17 00:00:00 2001 From: William Killerud Date: Sun, 9 Oct 2022 18:05:26 +0200 Subject: [PATCH 2/6] feat: extract code actions --- README.md | 8 + package.json | 3 +- src/client/browser-client.ts | 2 + src/client/client.ts | 79 +++- src/client/node-client.ts | 2 + .../features/code-actions/extract-provider.ts | 213 +++++++++++ src/server/features/code-actions/index.ts | 1 + src/server/features/code-actions/types.ts | 15 + src/server/server.ts | 66 +++- src/server/settings.ts | 5 + src/server/utils/string.ts | 54 +++ .../features/code-actions/extract.spec.ts | 341 ++++++++++++++++++ 12 files changed, 784 insertions(+), 5 deletions(-) create mode 100644 src/server/features/code-actions/extract-provider.ts create mode 100644 src/server/features/code-actions/index.ts create mode 100644 src/server/features/code-actions/types.ts create mode 100644 src/test/features/code-actions/extract.spec.ts diff --git a/README.md b/README.md index 827ea37a..6ec9f18d 100644 --- a/README.md +++ b/README.md @@ -79,6 +79,14 @@ mixin or function. To use this feature, right-click a variable, mixin or function and choose `Find All References`. +### Code actions + +#### Extract + +Available when you have an active selection. Pick between extracting to a variable, function or mixin. + +See the [Refactoring](https://code.visualstudio.com/docs/editor/refactoring) chapter of the VS Code documentation to see how to use this feature. + ## Recommended settings for Visual Studio Code **Improved code suggestions for variables under namespaces** diff --git a/package.json b/package.json index f44209a4..1cc612a8 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,8 @@ "onLanguage:scss", "onLanguage:vue", "onLanguage:svelte", - "onLanguage:astro" + "onLanguage:astro", + "onCommand:_somesass.applyExtractCodeAction" ], "capabilities": { "virtualWorkspaces": true diff --git a/src/client/browser-client.ts b/src/client/browser-client.ts index 24d886c7..06cee1dc 100644 --- a/src/client/browser-client.ts +++ b/src/client/browser-client.ts @@ -15,6 +15,7 @@ import { EXTENSION_ID, EXTENSION_NAME } from "../shared/constants"; import { createLanguageClientOptions, getCurrentWorkspace, + registerCodeActionCommand, serveFileSystemRequests, } from "./client"; @@ -77,6 +78,7 @@ async function initializeClient( serveFileSystemRequests(client, { TextDecoder, }); + registerCodeActionCommand(client); } catch (error: unknown) { await window.showErrorMessage( `Client initialization failed. ${ diff --git a/src/client/client.ts b/src/client/client.ts index 28a8305d..7901c00c 100644 --- a/src/client/client.ts +++ b/src/client/client.ts @@ -1,4 +1,14 @@ -import { TextEditor, Uri, window, workspace, WorkspaceFolder } from "vscode"; +import { + commands, + Position, + Selection, + TextEdit, + TextEditor, + Uri, + window, + workspace, + WorkspaceFolder, +} from "vscode"; import { FileStat } from "vscode-css-languageservice"; import { BaseLanguageClient, @@ -7,6 +17,7 @@ import { RevealOutputChannelOn, } from "vscode-languageclient"; import { defaultSettings, ISettings } from "../server/settings"; +import { getEOL } from "../server/utils/string"; import { EXTENSION_ID, EXTENSION_NAME, @@ -177,3 +188,69 @@ export function serveFileSystemRequests( }, ); } + +export function registerCodeActionCommand(client: BaseLanguageClient) { + commands.registerCommand( + "_somesass.applyExtractCodeAction", + applyExtractCodeAction, + ); + + function applyExtractCodeAction( + uri: string, + documentVersion: number, + textEdit: TextEdit, + ) { + const textEditor = window.activeTextEditor; + if (!textEditor || textEditor.document.uri.toString() !== uri) { + return; + } + + if (textEditor.document.version !== documentVersion) { + window.showInformationMessage( + "The document has changed since the extract edit was made. Please save and retry.", + ); + return; + } + + textEditor + .edit((editor) => { + editor.replace( + client.protocol2CodeConverter.asRange(textEdit.range), + textEdit.newText, + ); + }) + .then((success) => { + if (!success) { + window.showErrorMessage( + "Failed to extract. Consider opening an issue with steps to reproduce.", + ); + return; + } + + // Position where the newly extracted symbol is being used. + const lines = textEdit.newText.split(getEOL(textEdit.newText)); + const lineOfUsage = lines[lines.length - 1]; + + const _variable = lineOfUsage.indexOf("_variable"); + const _function = lineOfUsage.indexOf("_function"); + const _mixin = lineOfUsage.indexOf("_mixin"); + + const newCursorPosition = new Position( + textEdit.range.start.line + lines.length - 1, + Math.max(_variable, _function, _mixin) + 1, + ); + + // Clear selection + textEditor.selection = new Selection( + newCursorPosition, + newCursorPosition, + ); + + // Trigger rename of extracted symbol + commands.executeCommand("editor.action.rename", [ + textEditor.document.uri, + newCursorPosition, + ]); + }); + } +} diff --git a/src/client/node-client.ts b/src/client/node-client.ts index 83a3c438..088c3029 100644 --- a/src/client/node-client.ts +++ b/src/client/node-client.ts @@ -16,6 +16,7 @@ import { NodeFileSystem } from "../shared/node-file-system"; import { createLanguageClientOptions, getCurrentWorkspace, + registerCodeActionCommand, serveFileSystemRequests, } from "./client"; @@ -93,6 +94,7 @@ async function initializeClient( fs: new NodeFileSystem(), TextDecoder, }); + registerCodeActionCommand(client); } catch (error: unknown) { await window.showErrorMessage( `Client initialization failed. ${ diff --git a/src/server/features/code-actions/extract-provider.ts b/src/server/features/code-actions/extract-provider.ts new file mode 100644 index 00000000..e2d5e4bc --- /dev/null +++ b/src/server/features/code-actions/extract-provider.ts @@ -0,0 +1,213 @@ +import { TextDocument } from "vscode-languageserver-textdocument"; +import { + CodeAction, + CodeActionKind, + Position, + Range, + TextDocumentEdit, + TextEdit, + VersionedTextDocumentIdentifier, + WorkspaceEdit, +} from "vscode-languageserver-types"; +import { IEditorSettings } from "../../settings"; +import { getEOL, getLinesFromText, indentText } from "../../utils/string"; +import { CodeActionProvider } from "./types"; + +export class ExtractProvider implements CodeActionProvider { + private _settings: IEditorSettings; + + constructor(settings: IEditorSettings) { + this._settings = settings; + } + + public async provideCodeActions( + document: TextDocument, + range: Range, + ): Promise { + if (!this.hasSelection(range)) { + return []; + } + + return [ + this.provideExtractVariableAction(document, range), + this.provideExtractMixinAction(document, range), + this.provideExtractFunctionAction(document, range), + ]; + } + + private hasSelection(range: Range): boolean { + const lineDiff = range.start.line - range.end.line; + const charDiff = range.start.character - range.end.character; + return lineDiff !== 0 || charDiff !== 0; + } + + private provideExtractFunctionAction( + document: TextDocument, + range: Range, + ): CodeAction { + const selectedText = document.getText(range); + const preceedingOnLine = document.getText( + Range.create( + Position.create(range.start.line, 0), + Position.create(range.start.line, range.start.character), + ), + ); + + const onlyNonWhitespace = preceedingOnLine.trimStart(); + const lastIndent = preceedingOnLine.length - onlyNonWhitespace.length; + const indent = preceedingOnLine.substring(0, lastIndent); + + const lines = getLinesFromText(selectedText); + const eol = + lines.length > 1 ? getEOL(selectedText) : getEOL(document.getText()); + + const newLines = [ + `${indent}@function _function() {`, + `${indent}${indentText( + `@return ${lines + .map((line, index) => + index === 0 ? line : indentText(line, this._settings), + ) + .join(eol)}`, + this._settings, + )}${selectedText.endsWith(";") ? "" : ";"}`, + `${indent}}`, + `${indent}${onlyNonWhitespace}_function()${ + selectedText.endsWith(";") ? ";" : "" + }`, + ].join(eol); + + const workspaceEdit: WorkspaceEdit = { + documentChanges: [ + TextDocumentEdit.create( + VersionedTextDocumentIdentifier.create( + document.uri, + document.version, + ), + [ + TextEdit.replace( + Range.create( + Position.create(range.start.line, 0), + Position.create(range.end.line, range.end.character), + ), + newLines, + ), + ], + ), + ], + }; + + const action = CodeAction.create( + "Extract function", + workspaceEdit, + CodeActionKind.RefactorExtract + ".function", + ); + + return action; + } + + private provideExtractMixinAction( + document: TextDocument, + range: Range, + ): CodeAction { + const selectedText = document.getText(range); + const preceedingOnLine = document.getText( + Range.create( + Position.create(range.start.line, 0), + Position.create(range.start.line, range.start.character), + ), + ); + + const onlyNonWhitespace = preceedingOnLine.trimStart(); + const lastIndent = preceedingOnLine.length - onlyNonWhitespace.length; + const indent = preceedingOnLine.substring(0, lastIndent); + + const lines = getLinesFromText(selectedText); + const eol = + lines.length > 1 ? getEOL(selectedText) : getEOL(document.getText()); + + const newLines = [ + "@mixin _mixin {", + ...lines.map((line, index) => + line + ? indentText(index === 0 ? `${indent}${line}` : line, this._settings) + : line, + ), + `${indent}}`, + `${indent}@include _mixin;`, + ].join(eol); + + const workspaceEdit: WorkspaceEdit = { + documentChanges: [ + TextDocumentEdit.create( + VersionedTextDocumentIdentifier.create( + document.uri, + document.version, + ), + [TextEdit.replace(range, newLines)], + ), + ], + }; + + const action = CodeAction.create( + "Extract mixin", + workspaceEdit, + CodeActionKind.RefactorExtract, + ); + + return action; + } + + private provideExtractVariableAction( + document: TextDocument, + range: Range, + ): CodeAction { + const selectedText = document.getText(range); + const preceedingOnLine = document.getText( + Range.create( + Position.create(range.start.line, 0), + Position.create(range.start.line, range.start.character), + ), + ); + + const onlyNonWhitespace = preceedingOnLine.trimStart(); + const lastIndent = preceedingOnLine.length - onlyNonWhitespace.length; + const indent = preceedingOnLine.substring(0, lastIndent); + + const eol = getEOL(document.getText()); + + const newLines = `${indent}$_variable: ${ + selectedText.endsWith(";") ? selectedText : `${selectedText};` + }${eol}${indent}${onlyNonWhitespace}${ + selectedText.endsWith(";") ? "$_variable;" : "$_variable" + }`; + + const workspaceEdit: WorkspaceEdit = { + documentChanges: [ + TextDocumentEdit.create( + VersionedTextDocumentIdentifier.create( + document.uri, + document.version, + ), + [ + TextEdit.replace( + Range.create( + Position.create(range.start.line, 0), + Position.create(range.end.line, range.end.character), + ), + newLines, + ), + ], + ), + ], + }; + + const action = CodeAction.create( + "Extract variable", + workspaceEdit, + CodeActionKind.RefactorExtract + ".constant", + ); + + return action; + } +} diff --git a/src/server/features/code-actions/index.ts b/src/server/features/code-actions/index.ts new file mode 100644 index 00000000..e5403401 --- /dev/null +++ b/src/server/features/code-actions/index.ts @@ -0,0 +1 @@ +export * from "./extract-provider"; diff --git a/src/server/features/code-actions/types.ts b/src/server/features/code-actions/types.ts new file mode 100644 index 00000000..e45dd9be --- /dev/null +++ b/src/server/features/code-actions/types.ts @@ -0,0 +1,15 @@ +import type { TextDocument } from "vscode-languageserver-textdocument"; +import type { + CodeAction, + CodeActionContext, + Range, +} from "vscode-languageserver-types"; + +export interface CodeActionProvider { + provideCodeActions: ( + document: TextDocument, + range: Range, + context: CodeActionContext, + ) => Promise; + resolveCodeAction?: (codeAction: CodeAction) => Promise; +} diff --git a/src/server/server.ts b/src/server/server.ts index 3c6eced9..0ac0d2e0 100644 --- a/src/server/server.ts +++ b/src/server/server.ts @@ -1,4 +1,11 @@ -import { Connection, FileChangeType } from "vscode-languageserver"; +import { + CodeAction, + CodeActionKind, + Command, + Connection, + FileChangeType, + TextDocumentEdit, +} from "vscode-languageserver"; import { TextDocument } from "vscode-languageserver-textdocument"; import { TextDocuments, @@ -10,6 +17,7 @@ import type { } from "vscode-languageserver/node"; import { URI } from "vscode-uri"; import type { FileSystemProvider } from "../shared/file-system"; +import { ExtractProvider } from "./features/code-actions"; import { doCompletion } from "./features/completion"; import { doDiagnostics } from "./features/diagnostics/diagnostics"; import { goDefinition } from "./features/go-definition/go-definition"; @@ -20,7 +28,7 @@ import { searchWorkspaceSymbol } from "./features/workspace-symbols/workspace-sy import { getFileSystemProvider } from "./file-system-provider"; import { RuntimeEnvironment } from "./runtime"; import ScannerService from "./scanner"; -import type { ISettings } from "./settings"; +import type { IEditorSettings, ISettings } from "./settings"; import StorageService from "./storage"; import { getSCSSRegionsDocument } from "./utils/embedded"; @@ -41,6 +49,7 @@ export class SomeSassServer { public listen(): void { let workspaceRoot: URI; let settings: ISettings; + let editorSettings: IEditorSettings; let storageService: StorageService; let scannerService: ScannerService; let fileSystemProvider: FileSystemProvider; @@ -65,7 +74,6 @@ export class SomeSassServer { ); workspaceRoot = URI.parse(options.workspace); - settings = options.settings; return { capabilities: { @@ -90,12 +98,25 @@ export class SomeSassServer { hoverProvider: true, definitionProvider: true, workspaceSymbolProvider: true, + codeActionProvider: { + codeActionKinds: [ + CodeActionKind.RefactorExtract, + CodeActionKind.RefactorExtract + ".function", + CodeActionKind.RefactorExtract + ".constant", + ], + resolveProvider: false, + }, }, }; }, ); this.connection.onInitialized(async () => { + settings = await this.connection.workspace.getConfiguration("somesass"); + editorSettings = await this.connection.workspace.getConfiguration( + "editor", + ); + storageService = new StorageService(); scannerService = new ScannerService( storageService, @@ -260,6 +281,45 @@ export class SomeSassServer { ); }); + this.connection.onCodeAction(async (params) => { + const codeActionProviders = [new ExtractProvider(editorSettings)]; + + const document = documents.get(params.textDocument.uri); + if (document === undefined) { + return undefined; + } + + const allActions: (Command | CodeAction)[] = []; + + for (const provider of codeActionProviders) { + const actions = await provider.provideCodeActions( + document, + params.range, + ); + + if (provider instanceof ExtractProvider) { + for (const action of actions) { + const edit: TextDocumentEdit | undefined = action.edit + ?.documentChanges?.[0] as TextDocumentEdit; + + const command = Command.create( + action.title, + "_somesass.applyExtractCodeAction", + document.uri, + document.version, + edit && edit.edits[0], + ); + + allActions.push( + CodeAction.create(action.title, command, action.kind), + ); + } + } + } + + return allActions; + }); + this.connection.onShutdown(() => { storageService.clear(); }); diff --git a/src/server/settings.ts b/src/server/settings.ts index d248ec8c..8f878ccf 100644 --- a/src/server/settings.ts +++ b/src/server/settings.ts @@ -16,6 +16,11 @@ export interface ISettings { readonly suggestFunctionsInStringContextAfterSymbols: string; } +export interface IEditorSettings { + insertSpaces: boolean; + tabSize: number; +} + export const defaultSettings: ISettings = Object.freeze({ scannerDepth: 30, scannerExclude: [ diff --git a/src/server/utils/string.ts b/src/server/utils/string.ts index 361d6f58..161d4133 100644 --- a/src/server/utils/string.ts +++ b/src/server/utils/string.ts @@ -1,3 +1,5 @@ +import { IEditorSettings } from "../settings"; + /** * Returns word by specified position. */ @@ -56,6 +58,19 @@ export function getLinesFromText(text: string): string[] { return text.split(reNewline); } +const space = " "; +const tab = " "; + +export function indentText(text: string, settings: IEditorSettings): string { + if (settings.insertSpaces) { + const numberOfSpaces = + typeof settings.tabSize === "number" ? settings.tabSize : 2; + return `${space.repeat(numberOfSpaces)}${text}`; + } + + return `${tab}${text}`; +} + /** Strips the dollar prefix off a variable name */ export function asDollarlessVariable(variable: string): string { return variable.replace(/^\$/, ""); @@ -74,3 +89,42 @@ function stripTrailingCharacter(string: string, char: string): string { ? string.slice(0, Math.max(0, string.length - char.length)) : string; } + +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * MIT License + * + * Copyright (c) 2015 - present Microsoft Corporation + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + *--------------------------------------------------------------------------------------------*/ +export function getEOL(text: string): string { + for (let i = 0; i < text.length; i++) { + const ch = text.charAt(i); + if (ch === "\r") { + if (i + 1 < text.length && text.charAt(i + 1) === "\n") { + return "\r\n"; + } + return "\r"; + } else if (ch === "\n") { + return "\n"; + } + } + return "\n"; +} diff --git a/src/test/features/code-actions/extract.spec.ts b/src/test/features/code-actions/extract.spec.ts new file mode 100644 index 00000000..c69f80b1 --- /dev/null +++ b/src/test/features/code-actions/extract.spec.ts @@ -0,0 +1,341 @@ +import { deepStrictEqual } from "assert"; +import { EOL } from "os"; +import { TextDocument } from "vscode-languageserver-textdocument"; +import { Position, Range } from "vscode-languageserver-types"; +import { ExtractProvider } from "../../../server/features/code-actions"; + +describe("Providers/Extract", () => { + it("supports extracting a variable", async () => { + const provider = new ExtractProvider({ + tabSize: 2, + insertSpaces: true, + }); + + const document = TextDocument.create( + "unit.scss", + "scss", + 1, + `--var: black;${EOL}`, + ); + const selection = Range.create( + Position.create(0, 7), + Position.create(0, 12), + ); + + const [variableAction] = await provider.provideCodeActions( + document, + selection, + ); + + deepStrictEqual(variableAction.edit?.documentChanges, [ + { + edits: [ + { + newText: `$_variable: black;${EOL}--var: $_variable`, + range: { + end: { + character: 12, + line: 0, + }, + start: { + character: 0, + line: 0, + }, + }, + }, + ], + textDocument: { + uri: "unit.scss", + version: 1, + }, + }, + ]); + }); + + it("supports extracting a multiline variable", async () => { + const provider = new ExtractProvider({ + tabSize: 2, + insertSpaces: false, + }); + + const document = TextDocument.create( + "unit.scss", + "scss", + 1, + `box-shadow: inset 0 0 0 jkl.rem(1px) var(--jkl-calendar-border-color), + 0 0 0 jkl.rem(1px) var(--jkl-calendar-border-color), jkl.rem(2px) jkl.rem(4px) jkl.rem(16px) rgb(0 0 0 / 24%); +`, + ); + const selection = Range.create( + Position.create(0, 12), + Position.create(1, 111), + ); + + const [variableAction] = await provider.provideCodeActions( + document, + selection, + ); + + deepStrictEqual(variableAction.edit?.documentChanges, [ + { + edits: [ + { + newText: `$_variable: inset 0 0 0 jkl.rem(1px) var(--jkl-calendar-border-color), + 0 0 0 jkl.rem(1px) var(--jkl-calendar-border-color), jkl.rem(2px) jkl.rem(4px) jkl.rem(16px) rgb(0 0 0 / 24%); +box-shadow: $_variable;`, + range: { + end: { + character: 111, + line: 1, + }, + start: { + character: 0, + line: 0, + }, + }, + }, + ], + textDocument: { + uri: "unit.scss", + version: 1, + }, + }, + ]); + }); + + it("supports extracting a mixin with tab indents", async () => { + const provider = new ExtractProvider({ + tabSize: 2, + insertSpaces: false, + }); + + const document = TextDocument.create( + "unit.scss", + "scss", + 1, + ` +a.cta { + color: var(--cta-text); + text-decoration: none; + + &:visited { + color: var(--cta-text); + } +} +`, + ); + const selection = Range.create( + Position.create(2, 1), + Position.create(7, 2), + ); + + const [, mixinAction] = await provider.provideCodeActions( + document, + selection, + ); + + deepStrictEqual(mixinAction.edit?.documentChanges, [ + { + edits: [ + { + // prettier-ignore + newText: `@mixin _mixin { + color: var(--cta-text); + text-decoration: none; + + &:visited { + color: var(--cta-text); + } + } + @include _mixin;`, + range: { + end: { + character: 2, + line: 7, + }, + start: { + character: 1, + line: 2, + }, + }, + }, + ], + textDocument: { + uri: "unit.scss", + version: 1, + }, + }, + ]); + }); + + it("supports extracting a mixin with space indents", async () => { + const provider = new ExtractProvider({ + tabSize: 4, + insertSpaces: true, + }); + + const document = TextDocument.create( + "unit.scss", + "scss", + 1, + ` +a.cta { + color: var(--cta-text); + text-decoration: none; + + &:visited { + color: var(--cta-text); + } +} +`, + ); + const selection = Range.create( + Position.create(2, 4), + Position.create(7, 5), + ); + + const [, mixinAction] = await provider.provideCodeActions( + document, + selection, + ); + + deepStrictEqual(mixinAction.edit?.documentChanges, [ + { + edits: [ + { + // prettier-ignore + newText: `@mixin _mixin { + color: var(--cta-text); + text-decoration: none; + + &:visited { + color: var(--cta-text); + } + } + @include _mixin;`, + range: { + end: { + character: 5, + line: 7, + }, + start: { + character: 4, + line: 2, + }, + }, + }, + ], + textDocument: { + uri: "unit.scss", + version: 1, + }, + }, + ]); + }); + + it("supports extracting a function with tab indents", async () => { + const provider = new ExtractProvider({ + tabSize: 2, + insertSpaces: false, + }); + + const document = TextDocument.create( + "unit.scss", + "scss", + 1, + `box-shadow: inset 0 0 0 jkl.rem(1px) var(--jkl-calendar-border-color), + 0 0 0 jkl.rem(1px) var(--jkl-calendar-border-color), jkl.rem(2px) jkl.rem(4px) jkl.rem(16px) rgb(0 0 0 / 24%); +`, + ); + const selection = Range.create( + Position.create(0, 12), + Position.create(1, 111), + ); + + const [, , functionAction] = await provider.provideCodeActions( + document, + selection, + ); + + deepStrictEqual(functionAction.edit?.documentChanges, [ + { + edits: [ + { + newText: `@function _function() { + @return inset 0 0 0 jkl.rem(1px) var(--jkl-calendar-border-color), + 0 0 0 jkl.rem(1px) var(--jkl-calendar-border-color), jkl.rem(2px) jkl.rem(4px) jkl.rem(16px) rgb(0 0 0 / 24%); +} +box-shadow: _function();`, + range: { + end: { + character: 111, + line: 1, + }, + start: { + character: 0, + line: 0, + }, + }, + }, + ], + textDocument: { + uri: "unit.scss", + version: 1, + }, + }, + ]); + }); + + it("supports extracting a function with space indents", async () => { + const provider = new ExtractProvider({ + tabSize: 2, + insertSpaces: true, + }); + + const document = TextDocument.create( + "unit.scss", + "scss", + 1, + `box-shadow: inset 0 0 0 jkl.rem(1px) var(--jkl-calendar-border-color), + 0 0 0 jkl.rem(1px) var(--jkl-calendar-border-color), jkl.rem(2px) jkl.rem(4px) jkl.rem(16px) rgb(0 0 0 / 24%); +`, + ); + const selection = Range.create( + Position.create(0, 12), + Position.create(1, 112), + ); + + const [, , functionAction] = await provider.provideCodeActions( + document, + selection, + ); + + deepStrictEqual(functionAction.edit?.documentChanges, [ + { + edits: [ + { + newText: `@function _function() { + @return inset 0 0 0 jkl.rem(1px) var(--jkl-calendar-border-color), + 0 0 0 jkl.rem(1px) var(--jkl-calendar-border-color), jkl.rem(2px) jkl.rem(4px) jkl.rem(16px) rgb(0 0 0 / 24%); +} +box-shadow: _function();`, + range: { + end: { + character: 112, + line: 1, + }, + start: { + character: 0, + line: 0, + }, + }, + }, + ], + textDocument: { + uri: "unit.scss", + version: 1, + }, + }, + ]); + }); +}); From 8c70d459aacc8fb931578642907c738bf7174c5c Mon Sep 17 00:00:00 2001 From: William Killerud Date: Sat, 10 Dec 2022 12:50:53 +0100 Subject: [PATCH 3/6] docs: update name of command for testing web ext --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 822bd2d8..99ad4ff7 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -49,7 +49,7 @@ Follow the instructions from the link above. Summarized: - Open the link generated by `localtunnel` - Press the Click to Continue button - Go to `vscode.dev` and open a GitHub repo with SCSS -- Run **Developer: Install Web Extension...** from the Command Palette +- Run **Developer: Install Extension from Location...** from the Command Palette - Paste the link generated by `localtunnel` ## Debugging From 5f7e8a02cf12135393cae9fc1f0a5fc3e6d26b88 Mon Sep 17 00:00:00 2001 From: William Killerud Date: Sat, 10 Dec 2022 12:53:03 +0100 Subject: [PATCH 4/6] fix: prefer the indentSize setting if it exists --- src/server/settings.ts | 2 ++ src/server/utils/string.ts | 8 ++++++-- src/test/features/code-actions/extract.spec.ts | 8 +++++++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/server/settings.ts b/src/server/settings.ts index 8f878ccf..bc5e9741 100644 --- a/src/server/settings.ts +++ b/src/server/settings.ts @@ -18,6 +18,8 @@ export interface ISettings { export interface IEditorSettings { insertSpaces: boolean; + /** Introduced in 1.74 */ + indentSize: number | undefined; tabSize: number; } diff --git a/src/server/utils/string.ts b/src/server/utils/string.ts index 161d4133..5514386f 100644 --- a/src/server/utils/string.ts +++ b/src/server/utils/string.ts @@ -63,8 +63,12 @@ const tab = " "; export function indentText(text: string, settings: IEditorSettings): string { if (settings.insertSpaces) { - const numberOfSpaces = - typeof settings.tabSize === "number" ? settings.tabSize : 2; + const numberOfSpaces: number = + typeof settings.indentSize === "number" + ? settings.indentSize + : typeof settings.tabSize === "number" + ? settings.tabSize + : 2; return `${space.repeat(numberOfSpaces)}${text}`; } diff --git a/src/test/features/code-actions/extract.spec.ts b/src/test/features/code-actions/extract.spec.ts index c69f80b1..1322cab2 100644 --- a/src/test/features/code-actions/extract.spec.ts +++ b/src/test/features/code-actions/extract.spec.ts @@ -9,6 +9,7 @@ describe("Providers/Extract", () => { const provider = new ExtractProvider({ tabSize: 2, insertSpaces: true, + indentSize: 2, }); const document = TextDocument.create( @@ -56,6 +57,7 @@ describe("Providers/Extract", () => { const provider = new ExtractProvider({ tabSize: 2, insertSpaces: false, + indentSize: 2, }); const document = TextDocument.create( @@ -107,6 +109,7 @@ box-shadow: $_variable;`, const provider = new ExtractProvider({ tabSize: 2, insertSpaces: false, + indentSize: 2, }); const document = TextDocument.create( @@ -170,8 +173,9 @@ a.cta { it("supports extracting a mixin with space indents", async () => { const provider = new ExtractProvider({ - tabSize: 4, + tabSize: 2, insertSpaces: true, + indentSize: 4, }); const document = TextDocument.create( @@ -237,6 +241,7 @@ a.cta { const provider = new ExtractProvider({ tabSize: 2, insertSpaces: false, + indentSize: 2, }); const document = TextDocument.create( @@ -290,6 +295,7 @@ box-shadow: _function();`, const provider = new ExtractProvider({ tabSize: 2, insertSpaces: true, + indentSize: 2, }); const document = TextDocument.create( From 194f04560538aec390fec7cad7d2d3431b355ab5 Mon Sep 17 00:00:00 2001 From: William Killerud Date: Sat, 10 Dec 2022 16:56:15 +0100 Subject: [PATCH 5/6] chore: update dependencies --- package-lock.json | 656 +++++++++++++++++++++++----------------------- package.json | 6 +- 2 files changed, 334 insertions(+), 328 deletions(-) diff --git a/package-lock.json b/package-lock.json index 628c0a2a..c548c6e9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -49,13 +49,13 @@ "mocha": "^10.0.0", "nyc": "^15.1.0", "patch-package": "^6.5.0", - "prettier": "2.7.1", + "prettier": "^2.8.1", "rimraf": "^3.0.2", - "sinon": "^14.0.0", + "sinon": "15.0.0", "ts-loader": "^9.3.1", "typescript": "^4.7.4", "webpack": "^5.73.0", - "webpack-cli": "^4.10.0" + "webpack-cli": "4.10.0" }, "engines": { "vscode": "^1.66.0" @@ -87,30 +87,30 @@ } }, "node_modules/@babel/compat-data": { - "version": "7.20.1", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.20.1.tgz", - "integrity": "sha512-EWZ4mE2diW3QALKvDMiXnbZpRvlj+nayZ112nK93SnhqOtpdsbVD4W+2tEoT3YNBAG9RBR0ISY758ZkOgsn6pQ==", + "version": "7.20.5", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.20.5.tgz", + "integrity": "sha512-KZXo2t10+/jxmkhNXc7pZTqRvSOIvVv/+lJwHS+B2rErwOyjuVRh60yVpb7liQ1U5t7lLJ1bz+t8tSypUZdm0g==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/core": { - "version": "7.20.2", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.20.2.tgz", - "integrity": "sha512-w7DbG8DtMrJcFOi4VrLm+8QM4az8Mo+PuLBKLp2zrYRCow8W/f9xiXm5sN53C8HksCyDQwCKha9JiDoIyPjT2g==", + "version": "7.20.5", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.20.5.tgz", + "integrity": "sha512-UdOWmk4pNWTm/4DlPUl/Pt4Gz4rcEMb7CY0Y3eJl5Yz1vI8ZJGmHWaVE55LoxRjdpx0z259GE9U5STA9atUinQ==", "dev": true, "dependencies": { "@ampproject/remapping": "^2.1.0", "@babel/code-frame": "^7.18.6", - "@babel/generator": "^7.20.2", + "@babel/generator": "^7.20.5", "@babel/helper-compilation-targets": "^7.20.0", "@babel/helper-module-transforms": "^7.20.2", - "@babel/helpers": "^7.20.1", - "@babel/parser": "^7.20.2", + "@babel/helpers": "^7.20.5", + "@babel/parser": "^7.20.5", "@babel/template": "^7.18.10", - "@babel/traverse": "^7.20.1", - "@babel/types": "^7.20.2", + "@babel/traverse": "^7.20.5", + "@babel/types": "^7.20.5", "convert-source-map": "^1.7.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", @@ -135,12 +135,12 @@ } }, "node_modules/@babel/generator": { - "version": "7.20.4", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.20.4.tgz", - "integrity": "sha512-luCf7yk/cm7yab6CAW1aiFnmEfBJplb/JojV56MYEK7ziWfGmFlTfmL9Ehwfy4gFhbjBfWO1wj7/TuSbVNEEtA==", + "version": "7.20.5", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.20.5.tgz", + "integrity": "sha512-jl7JY2Ykn9S0yj4DQP82sYvPU+T3g0HFcWTqDLqiuA9tGRNIj9VfbtXGAYTTkyNEnQk1jkMGOdYka8aG/lulCA==", "dev": true, "dependencies": { - "@babel/types": "^7.20.2", + "@babel/types": "^7.20.5", "@jridgewell/gen-mapping": "^0.3.2", "jsesc": "^2.5.1" }, @@ -306,14 +306,14 @@ } }, "node_modules/@babel/helpers": { - "version": "7.20.1", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.20.1.tgz", - "integrity": "sha512-J77mUVaDTUJFZ5BpP6mMn6OIl3rEWymk2ZxDBQJUG3P+PbmyMcF3bYWvz0ma69Af1oobDqT/iAsvzhB58xhQUg==", + "version": "7.20.6", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.20.6.tgz", + "integrity": "sha512-Pf/OjgfgFRW5bApskEz5pvidpim7tEDPlFtKcNRXWmfHGn9IEI2W2flqRQXTFb7gIPTyK++N6rVHuwKut4XK6w==", "dev": true, "dependencies": { "@babel/template": "^7.18.10", - "@babel/traverse": "^7.20.1", - "@babel/types": "^7.20.0" + "@babel/traverse": "^7.20.5", + "@babel/types": "^7.20.5" }, "engines": { "node": ">=6.9.0" @@ -405,9 +405,9 @@ } }, "node_modules/@babel/parser": { - "version": "7.20.3", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.20.3.tgz", - "integrity": "sha512-OP/s5a94frIPXwjzEcv5S/tpQfc6XhxYUnmWpgdqMWGgYCuErA3SzozaRAMQgSZWKeTJxht9aWAkUY+0UzvOFg==", + "version": "7.20.5", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.20.5.tgz", + "integrity": "sha512-r27t/cy/m9uKLXQNWWebeCUHgnAZq0CpG1OwKRxzJMP1vpSU4bSIK2hq+/cp0bQxetkXx38n09rNu8jVkcK/zA==", "dev": true, "bin": { "parser": "bin/babel-parser.js" @@ -431,19 +431,19 @@ } }, "node_modules/@babel/traverse": { - "version": "7.20.1", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.20.1.tgz", - "integrity": "sha512-d3tN8fkVJwFLkHkBN479SOsw4DMZnz8cdbL/gvuDuzy3TS6Nfw80HuQqhw1pITbIruHyh7d1fMA47kWzmcUEGA==", + "version": "7.20.5", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.20.5.tgz", + "integrity": "sha512-WM5ZNN3JITQIq9tFZaw1ojLU3WgWdtkxnhM1AegMS+PvHjkM5IXjmYEGY7yukz5XS4sJyEf2VzWjI8uAavhxBQ==", "dev": true, "dependencies": { "@babel/code-frame": "^7.18.6", - "@babel/generator": "^7.20.1", + "@babel/generator": "^7.20.5", "@babel/helper-environment-visitor": "^7.18.9", "@babel/helper-function-name": "^7.19.0", "@babel/helper-hoist-variables": "^7.18.6", "@babel/helper-split-export-declaration": "^7.18.6", - "@babel/parser": "^7.20.1", - "@babel/types": "^7.20.0", + "@babel/parser": "^7.20.5", + "@babel/types": "^7.20.5", "debug": "^4.1.0", "globals": "^11.1.0" }, @@ -461,9 +461,9 @@ } }, "node_modules/@babel/types": { - "version": "7.20.2", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.20.2.tgz", - "integrity": "sha512-FnnvsNWgZCr232sqtXggapvlkk/tuwR/qhGzcmxI0GXLCjmPYQPzio2FbdlWuY6y1sHFfQKk+rRbUZ9VStQMog==", + "version": "7.20.5", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.20.5.tgz", + "integrity": "sha512-c9fst/h2/dcF7H+MJKZ2T0KjEQ8hY/BNnDk/H3XY8C4Aw/eWQXWn/lWntHF9ooUBnGmEvbfGrTgLWc+um0YDUg==", "dev": true, "dependencies": { "@babel/helper-string-parser": "^7.19.4", @@ -805,9 +805,9 @@ } }, "node_modules/@sinonjs/fake-timers/node_modules/@sinonjs/commons": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.5.tgz", - "integrity": "sha512-rTpCA0wG1wUxglBSFdMMY0oTrKYvgf4fNgv/sXbfCVAdf+FnPBdKJR/7XbpTCwbCrvCbdPYnlWaUUYz4V2fPDA==", + "version": "1.8.6", + "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.6.tgz", + "integrity": "sha512-Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ==", "dev": true, "dependencies": { "type-detect": "4.0.8" @@ -923,9 +923,9 @@ "dev": true }, "node_modules/@types/node": { - "version": "16.18.3", - "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.3.tgz", - "integrity": "sha512-jh6m0QUhIRcZpNv7Z/rpN+ZWXOicUUQbSoWks7Htkbb9IjFQj4kzcX/xFCkjstCj5flMsN8FiSvt+q+Tcs4Llg==", + "version": "16.18.7", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.7.tgz", + "integrity": "sha512-SghuoXv8ghvkrKjTyvhRTeNzivPzGQ8pe09PPGdyqsExiKvBYV/6E3imvjsaJuW8ca61qQN2+SoSzyEHS9r2LA==", "dev": true }, "node_modules/@types/semver": { @@ -950,9 +950,9 @@ "dev": true }, "node_modules/@types/vscode": { - "version": "1.73.0", - "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.73.0.tgz", - "integrity": "sha512-FhkfF7V3fj7S3WqXu7AxFesBLO3uMkdCPJJPbwyZXezv2xJ6xBWHYM2CmkkbO8wT9Fr3KipwxGGOoQRrYq7mHg==", + "version": "1.74.0", + "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.74.0.tgz", + "integrity": "sha512-LyeCIU3jb9d38w0MXFwta9r0Jx23ugujkAxdwLTNCyspdZTKUc43t7ppPbCiPoQ/Ivd/pnDFZrb4hWd45wrsgA==", "dev": true }, "node_modules/@types/webpack-env": { @@ -962,14 +962,14 @@ "dev": true }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "5.42.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.42.1.tgz", - "integrity": "sha512-LyR6x784JCiJ1j6sH5Y0K6cdExqCCm8DJUTcwG5ThNXJj/G8o5E56u5EdG4SLy+bZAwZBswC+GYn3eGdttBVCg==", + "version": "5.46.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.46.0.tgz", + "integrity": "sha512-QrZqaIOzJAjv0sfjY4EjbXUi3ZOFpKfzntx22gPGr9pmFcTjcFw/1sS1LJhEubfAGwuLjNrPV0rH+D1/XZFy7Q==", "dev": true, "dependencies": { - "@typescript-eslint/scope-manager": "5.42.1", - "@typescript-eslint/type-utils": "5.42.1", - "@typescript-eslint/utils": "5.42.1", + "@typescript-eslint/scope-manager": "5.46.0", + "@typescript-eslint/type-utils": "5.46.0", + "@typescript-eslint/utils": "5.46.0", "debug": "^4.3.4", "ignore": "^5.2.0", "natural-compare-lite": "^1.4.0", @@ -995,14 +995,14 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "5.42.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.42.1.tgz", - "integrity": "sha512-kAV+NiNBWVQDY9gDJDToTE/NO8BHi4f6b7zTsVAJoTkmB/zlfOpiEVBzHOKtlgTndCKe8vj9F/PuolemZSh50Q==", + "version": "5.46.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.46.0.tgz", + "integrity": "sha512-joNO6zMGUZg+C73vwrKXCd8usnsmOYmgW/w5ZW0pG0RGvqeznjtGDk61EqqTpNrFLUYBW2RSBFrxdAZMqA4OZA==", "dev": true, "dependencies": { - "@typescript-eslint/scope-manager": "5.42.1", - "@typescript-eslint/types": "5.42.1", - "@typescript-eslint/typescript-estree": "5.42.1", + "@typescript-eslint/scope-manager": "5.46.0", + "@typescript-eslint/types": "5.46.0", + "@typescript-eslint/typescript-estree": "5.46.0", "debug": "^4.3.4" }, "engines": { @@ -1022,13 +1022,13 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "5.42.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.42.1.tgz", - "integrity": "sha512-QAZY/CBP1Emx4rzxurgqj3rUinfsh/6mvuKbLNMfJMMKYLRBfweus8brgXF8f64ABkIZ3zdj2/rYYtF8eiuksQ==", + "version": "5.46.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.46.0.tgz", + "integrity": "sha512-7wWBq9d/GbPiIM6SqPK9tfynNxVbfpihoY5cSFMer19OYUA3l4powA2uv0AV2eAZV6KoAh6lkzxv4PoxOLh1oA==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.42.1", - "@typescript-eslint/visitor-keys": "5.42.1" + "@typescript-eslint/types": "5.46.0", + "@typescript-eslint/visitor-keys": "5.46.0" }, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -1039,13 +1039,13 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "5.42.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.42.1.tgz", - "integrity": "sha512-WWiMChneex5w4xPIX56SSnQQo0tEOy5ZV2dqmj8Z371LJ0E+aymWD25JQ/l4FOuuX+Q49A7pzh/CGIQflxMVXg==", + "version": "5.46.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.46.0.tgz", + "integrity": "sha512-dwv4nimVIAsVS2dTA0MekkWaRnoYNXY26dKz8AN5W3cBFYwYGFQEqm/cG+TOoooKlncJS4RTbFKgcFY/pOiBCg==", "dev": true, "dependencies": { - "@typescript-eslint/typescript-estree": "5.42.1", - "@typescript-eslint/utils": "5.42.1", + "@typescript-eslint/typescript-estree": "5.46.0", + "@typescript-eslint/utils": "5.46.0", "debug": "^4.3.4", "tsutils": "^3.21.0" }, @@ -1066,9 +1066,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "5.42.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.42.1.tgz", - "integrity": "sha512-Qrco9dsFF5lhalz+lLFtxs3ui1/YfC6NdXu+RAGBa8uSfn01cjO7ssCsjIsUs484vny9Xm699FSKwpkCcqwWwA==", + "version": "5.46.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.46.0.tgz", + "integrity": "sha512-wHWgQHFB+qh6bu0IAPAJCdeCdI0wwzZnnWThlmHNY01XJ9Z97oKqKOzWYpR2I83QmshhQJl6LDM9TqMiMwJBTw==", "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -1079,13 +1079,13 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "5.42.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.42.1.tgz", - "integrity": "sha512-qElc0bDOuO0B8wDhhW4mYVgi/LZL+igPwXtV87n69/kYC/7NG3MES0jHxJNCr4EP7kY1XVsRy8C/u3DYeTKQmw==", + "version": "5.46.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.46.0.tgz", + "integrity": "sha512-kDLNn/tQP+Yp8Ro2dUpyyVV0Ksn2rmpPpB0/3MO874RNmXtypMwSeazjEN/Q6CTp8D7ExXAAekPEcCEB/vtJkw==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.42.1", - "@typescript-eslint/visitor-keys": "5.42.1", + "@typescript-eslint/types": "5.46.0", + "@typescript-eslint/visitor-keys": "5.46.0", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", @@ -1106,16 +1106,16 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "5.42.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.42.1.tgz", - "integrity": "sha512-Gxvf12xSp3iYZd/fLqiQRD4uKZjDNR01bQ+j8zvhPjpsZ4HmvEFL/tC4amGNyxN9Rq+iqvpHLhlqx6KTxz9ZyQ==", + "version": "5.46.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.46.0.tgz", + "integrity": "sha512-4O+Ps1CRDw+D+R40JYh5GlKLQERXRKW5yIQoNDpmXPJ+C7kaPF9R7GWl+PxGgXjB3PQCqsaaZUpZ9dG4U6DO7g==", "dev": true, "dependencies": { "@types/json-schema": "^7.0.9", "@types/semver": "^7.3.12", - "@typescript-eslint/scope-manager": "5.42.1", - "@typescript-eslint/types": "5.42.1", - "@typescript-eslint/typescript-estree": "5.42.1", + "@typescript-eslint/scope-manager": "5.46.0", + "@typescript-eslint/types": "5.46.0", + "@typescript-eslint/typescript-estree": "5.46.0", "eslint-scope": "^5.1.1", "eslint-utils": "^3.0.0", "semver": "^7.3.7" @@ -1132,12 +1132,12 @@ } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "5.42.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.42.1.tgz", - "integrity": "sha512-LOQtSF4z+hejmpUvitPlc4hA7ERGoj2BVkesOcG91HCn8edLGUXbTrErmutmPbl8Bo9HjAvOO/zBKQHExXNA2A==", + "version": "5.46.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.46.0.tgz", + "integrity": "sha512-E13gBoIXmaNhwjipuvQg1ByqSAu/GbEpP/qzFihugJ+MomtoJtFAJG/+2DRPByf57B863m0/q7Zt16V9ohhANw==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.42.1", + "@typescript-eslint/types": "5.46.0", "eslint-visitor-keys": "^3.3.0" }, "engines": { @@ -1148,10 +1148,15 @@ "url": "https://opencollective.com/typescript-eslint" } }, + "node_modules/@vscode/l10n": { + "version": "0.0.10", + "resolved": "https://registry.npmjs.org/@vscode/l10n/-/l10n-0.0.10.tgz", + "integrity": "sha512-E1OCmDcDWa0Ya7vtSjp/XfHFGqYJfh+YPC1RkATU71fTac+j1JjCcB3qwSzmlKAighx2WxhLlfhS0RwAN++PFQ==" + }, "node_modules/@vscode/test-electron": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@vscode/test-electron/-/test-electron-2.2.0.tgz", - "integrity": "sha512-xk2xrOTMG75/hxO8OVVZ+GErv9gmdZwOD8rEHV3ty3n1Joav2yFcfrmqD6Ukref27U13LEL8gVvSHzauGAK5nQ==", + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/@vscode/test-electron/-/test-electron-2.2.1.tgz", + "integrity": "sha512-DUdwSYVc9p/PbGveaq20dbAAXHfvdq4zQ24ILp6PKizOBxrOfMsOq8Vts5nMzeIo0CxtA/RxZLFyDv001PiUSg==", "dev": true, "dependencies": { "http-proxy-agent": "^4.0.1", @@ -1160,7 +1165,7 @@ "unzipper": "^0.10.11" }, "engines": { - "node": ">=8.9.3" + "node": ">=16" } }, "node_modules/@vscode/test-web": { @@ -1568,9 +1573,9 @@ } }, "node_modules/anymatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz", - "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==", + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", + "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", "dev": true, "dependencies": { "normalize-path": "^3.0.0", @@ -1988,9 +1993,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001431", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001431.tgz", - "integrity": "sha512-zBUoFU0ZcxpvSt9IU66dXVT/3ctO1cy4y9cscs1szkPlcWb6pasYM144GqrUygUbT+k7cmUCW61cvskjcv0enQ==", + "version": "1.0.30001439", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001439.tgz", + "integrity": "sha512-1MgUzEkoMO6gKfXflStpYgZDlFM7M/ck/bgfVCACO5vnAf0fXoNVHdWtqGU+MYca+4bL9Z5bpOVmR33cWW9G2A==", "dev": true, "funding": [ { @@ -2637,9 +2642,9 @@ } }, "node_modules/enhanced-resolve": { - "version": "5.10.0", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.10.0.tgz", - "integrity": "sha512-T0yTFjdpldGY8PmuXXR0PyQ1ufZpEGiHVrp7zHKB7jdR4qlmZHhONVM5AQOAWXuF/w3dnHbEQVrNptJgt7F+cQ==", + "version": "5.12.0", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz", + "integrity": "sha512-QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ==", "dev": true, "dependencies": { "graceful-fs": "^4.2.4", @@ -2662,9 +2667,9 @@ } }, "node_modules/es-abstract": { - "version": "1.20.4", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.4.tgz", - "integrity": "sha512-0UtvRN79eMe2L+UNEF1BwRe364sj/DXhQ/k5FmivgoSdpM90b8Jc0mDzKMGo7QS0BVbOP/bTwBKNnDc9rNzaPA==", + "version": "1.20.5", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.5.tgz", + "integrity": "sha512-7h8MM2EQhsCA7pU/Nv78qOXFpD8Rhqd12gYiSJVkrH9+e8VuA8JlPJK/hQjjlLv6pJvx/z1iRFKzYb0XT/RuAQ==", "dev": true, "dependencies": { "call-bind": "^1.0.2", @@ -2673,6 +2678,7 @@ "function.prototype.name": "^1.1.5", "get-intrinsic": "^1.1.3", "get-symbol-description": "^1.0.0", + "gopd": "^1.0.1", "has": "^1.0.3", "has-property-descriptors": "^1.0.0", "has-symbols": "^1.0.3", @@ -2688,8 +2694,8 @@ "object.assign": "^4.1.4", "regexp.prototype.flags": "^1.4.3", "safe-regex-test": "^1.0.0", - "string.prototype.trimend": "^1.0.5", - "string.prototype.trimstart": "^1.0.5", + "string.prototype.trimend": "^1.0.6", + "string.prototype.trimstart": "^1.0.6", "unbox-primitive": "^1.0.2" }, "engines": { @@ -2771,9 +2777,9 @@ } }, "node_modules/eslint": { - "version": "8.27.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.27.0.tgz", - "integrity": "sha512-0y1bfG2ho7mty+SiILVf9PfuRA49ek4Nc60Wmmu62QlobNR+CeXa4xXIJgcuwSQgZiWaPH+5BDsctpIW0PR/wQ==", + "version": "8.29.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.29.0.tgz", + "integrity": "sha512-isQ4EEiyUjZFbEKvEGJKKGBwXtvXX+zJbkVKCgTuB9t/+jUBcy8avhkEwWJecI15BkRkOYmvIM5ynbhRjEkoeg==", "dev": true, "dependencies": { "@eslint/eslintrc": "^1.3.3", @@ -3223,9 +3229,9 @@ } }, "node_modules/fastq": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz", - "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==", + "version": "1.14.0", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.14.0.tgz", + "integrity": "sha512-eR2D+V9/ExcbF9ls441yIuN6TI2ED1Y2ZcA5BmMtJsOkWOFRJQ0Jt0g1UwqXJJVAb+V+umH5Dfr8oh4EVP7VVg==", "dependencies": { "reusify": "^1.0.4" } @@ -3629,9 +3635,9 @@ "dev": true }, "node_modules/globals": { - "version": "13.17.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz", - "integrity": "sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==", + "version": "13.18.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.18.0.tgz", + "integrity": "sha512-/mR4KI8Ps2spmoc0Ulu9L7agOF0du1CZNQ3dke8yItYlyKNmGrkONemBbd6V8UTc1Wgcqn21t3WYB7dbRmh6/A==", "dev": true, "dependencies": { "type-fest": "^0.20.2" @@ -3939,9 +3945,9 @@ ] }, "node_modules/ignore": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz", - "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==", + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.1.tgz", + "integrity": "sha512-d2qQLzTJ9WxQftPAuEQpSPmKqzxePjzVbpAVv62AQ64NTL+wR4JkrVqR/LqFsFEUsHDAiId52mJteHDFuDkElA==", "dev": true, "engines": { "node": ">= 4" @@ -4621,10 +4627,14 @@ } }, "node_modules/js-sdsl": { - "version": "4.1.5", - "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.1.5.tgz", - "integrity": "sha512-08bOAKweV2NUC1wqTtf3qZlnpOX/R2DU9ikpjOHs0H+ibQv3zpncVQg6um4uYtRtrwIX8M4Nh3ytK4HGlYAq7Q==", - "dev": true + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.2.0.tgz", + "integrity": "sha512-dyBIzQBDkCqCu+0upx25Y2jGdbTGxE9fshMsCdK0ViOongpV+n5tXRcZY9v7CaVQ79AGS9KA1KHtojxiM7aXSQ==", + "dev": true, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/js-sdsl" + } }, "node_modules/js-tokens": { "version": "4.0.0", @@ -4732,9 +4742,9 @@ } }, "node_modules/koa": { - "version": "2.13.4", - "resolved": "https://registry.npmjs.org/koa/-/koa-2.13.4.tgz", - "integrity": "sha512-43zkIKubNbnrULWlHdN5h1g3SEKXOEzoAlRsHOTFpnlDu8JlAOZSMJBLULusuXRequboiwJcj5vtYXKB3k7+2g==", + "version": "2.14.1", + "resolved": "https://registry.npmjs.org/koa/-/koa-2.14.1.tgz", + "integrity": "sha512-USJFyZgi2l0wDgqkfD27gL4YGno7TfUkcmOe6UOLFOVuN+J7FwnNu4Dydl4CUQzraM1lBAiGed0M9OVJoT0Kqw==", "dev": true, "dependencies": { "accepts": "^1.3.5", @@ -5667,9 +5677,9 @@ "dev": true }, "node_modules/nise": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/nise/-/nise-5.1.2.tgz", - "integrity": "sha512-+gQjFi8v+tkfCuSCxfURHLhRhniE/+IaYbIphxAN2JRR9SHKhY8hgXpaXiYfHdw+gcGe4buxgbprBQFab9FkhA==", + "version": "5.1.3", + "resolved": "https://registry.npmjs.org/nise/-/nise-5.1.3.tgz", + "integrity": "sha512-U597iWTTBBYIV72986jyU382/MMZ70ApWcRmkoF1AZ75bpqOtI3Gugv/6+0jLgoDOabmcSwYBkSSAWIp1eA5cg==", "dev": true, "dependencies": { "@sinonjs/commons": "^2.0.0", @@ -5689,9 +5699,9 @@ } }, "node_modules/nise/node_modules/@sinonjs/fake-timers/node_modules/@sinonjs/commons": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.5.tgz", - "integrity": "sha512-rTpCA0wG1wUxglBSFdMMY0oTrKYvgf4fNgv/sXbfCVAdf+FnPBdKJR/7XbpTCwbCrvCbdPYnlWaUUYz4V2fPDA==", + "version": "1.8.6", + "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.6.tgz", + "integrity": "sha512-Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ==", "dev": true, "dependencies": { "type-detect": "4.0.8" @@ -6569,13 +6579,13 @@ } }, "node_modules/playwright": { - "version": "1.27.1", - "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.27.1.tgz", - "integrity": "sha512-xXYZ7m36yTtC+oFgqH0eTgullGztKSRMb4yuwLPl8IYSmgBM88QiB+3IWb1mRIC9/NNwcgbG0RwtFlg+EAFQHQ==", + "version": "1.28.1", + "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.28.1.tgz", + "integrity": "sha512-92Sz6XBlfHlb9tK5UCDzIFAuIkHHpemA9zwUaqvo+w7sFMSmVMGmvKcbptof/eJObq63PGnMhM75x7qxhTR78Q==", "dev": true, "hasInstallScript": true, "dependencies": { - "playwright-core": "1.27.1" + "playwright-core": "1.28.1" }, "bin": { "playwright": "cli.js" @@ -6585,9 +6595,9 @@ } }, "node_modules/playwright-core": { - "version": "1.27.1", - "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.27.1.tgz", - "integrity": "sha512-9EmeXDncC2Pmp/z+teoVYlvmPWUC6ejSSYZUln7YaP89Z6lpAaiaAnqroUt/BoLo8tn7WYShcfaCh+xofZa44Q==", + "version": "1.28.1", + "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.28.1.tgz", + "integrity": "sha512-3PixLnGPno0E8rSBJjtwqTwJe3Yw72QwBBBxNoukIj3lEeBNXwbNiKrNuB1oyQgTBw5QHUhNO3SteEtHaMK6ag==", "dev": true, "bin": { "playwright": "cli.js" @@ -6606,9 +6616,9 @@ } }, "node_modules/prettier": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz", - "integrity": "sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==", + "version": "2.8.1", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.1.tgz", + "integrity": "sha512-lqGoSJBQNJidqCHE80vqZJHWHRFoNYsSpP9AjFhlhi9ODCJA541svILes/+/1GM3VaL/abZi7cpFzOpdR9UPKg==", "dev": true, "bin": { "prettier": "bin-prettier.js" @@ -6991,9 +7001,9 @@ } }, "node_modules/rxjs": { - "version": "7.5.7", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.7.tgz", - "integrity": "sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==", + "version": "7.6.0", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.6.0.tgz", + "integrity": "sha512-DDa7d8TFNUalGC9VqXvQ1euWNN7sc63TrUCuM9J998+ViviahMIjKSOU7rfcgFOF+FCD71BhDRv4hrFz+ImDLQ==", "dev": true, "dependencies": { "tslib": "^2.1.0" @@ -7202,9 +7212,9 @@ } }, "node_modules/sinon": { - "version": "14.0.2", - "resolved": "https://registry.npmjs.org/sinon/-/sinon-14.0.2.tgz", - "integrity": "sha512-PDpV0ZI3ZCS3pEqx0vpNp6kzPhHrLx72wA0G+ZLaaJjLIYeE0n8INlgaohKuGy7hP0as5tbUd23QWu5U233t+w==", + "version": "15.0.0", + "resolved": "https://registry.npmjs.org/sinon/-/sinon-15.0.0.tgz", + "integrity": "sha512-pV97G1GbslaSJoSdy2F2z8uh5F+uPGp3ddOzA4JsBOUBLEQRz2OAqlKGRFTSh2KiqUCmHkzyAeu7R4x1Hx0wwg==", "dev": true, "dependencies": { "@sinonjs/commons": "^2.0.0", @@ -7544,9 +7554,9 @@ } }, "node_modules/terser": { - "version": "5.15.1", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.15.1.tgz", - "integrity": "sha512-K1faMUvpm/FBxjBXud0LWVAGxmvoPbZbfTCYbSgaaYQaIXI3/TdI7a7ZGA73Zrou6Q8Zmz3oeUTsp/dj+ag2Xw==", + "version": "5.16.1", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.16.1.tgz", + "integrity": "sha512-xvQfyfA1ayT0qdK47zskQgRZeWLoOQ8JQ6mIgRGVNwZKdQMU+5FkCBjmv4QjcrTzyZquRw2FVtlJSRUmMKQslw==", "dev": true, "dependencies": { "@jridgewell/source-map": "^0.3.2", @@ -7684,9 +7694,9 @@ } }, "node_modules/ts-loader": { - "version": "9.4.1", - "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-9.4.1.tgz", - "integrity": "sha512-384TYAqGs70rn9F0VBnh6BPTfhga7yFNdC5gXbQpDrBj9/KsT4iRkGqKXhziofHOlE2j6YEaiTYVGKKvPhGWvw==", + "version": "9.4.2", + "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-9.4.2.tgz", + "integrity": "sha512-OmlC4WVmFv5I0PpaxYb+qGeGOdm5giHU7HwDDUjw59emP2UYMHy9fFSDcYgSNoH8sXcj4hGCSEhlDZ9ULeDraA==", "dev": true, "dependencies": { "chalk": "^4.1.0", @@ -7827,9 +7837,9 @@ } }, "node_modules/typescript": { - "version": "4.8.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.4.tgz", - "integrity": "sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ==", + "version": "4.9.4", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.4.tgz", + "integrity": "sha512-Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg==", "dev": true, "bin": { "tsc": "bin/tsc", @@ -7963,14 +7973,14 @@ } }, "node_modules/vscode-css-languageservice": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-6.1.1.tgz", - "integrity": "sha512-7d2NCq2plT0njAKmGZ11uof95y2fwbgq8QuToE3kX9uYQfVmejHX2/lFGKbK5AV5+Ja0L80UZoU0QspwqMKMHA==", + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-6.2.1.tgz", + "integrity": "sha512-FMaMjB2LQdkHjTCP2CWh2S94xuGsxSc8xr0H9nAACVd/iUDyZLoKFjwoB+mA3v0rpCH2U5vVCVwxyULy61CgqA==", "dependencies": { + "@vscode/l10n": "^0.0.10", "vscode-languageserver-textdocument": "^1.0.7", "vscode-languageserver-types": "^3.17.2", - "vscode-nls": "^5.2.0", - "vscode-uri": "^3.0.4" + "vscode-uri": "^3.0.6" } }, "node_modules/vscode-jsonrpc": { @@ -8015,20 +8025,15 @@ } }, "node_modules/vscode-languageserver-textdocument": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.7.tgz", - "integrity": "sha512-bFJH7UQxlXT8kKeyiyu41r22jCZXG8kuuVVA33OEJn1diWOZK5n8zBSPZFHVBOu8kXZ6h0LIRhf5UnCo61J4Hg==" + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.8.tgz", + "integrity": "sha512-1bonkGqQs5/fxGT5UchTgjGVnfysL0O8v1AYMBjqTbWQTFn721zaPGDYFkOKtfDgFiSgXM3KwaG3FMGfW4Ed9Q==" }, "node_modules/vscode-languageserver-types": { "version": "3.17.2", "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.2.tgz", "integrity": "sha512-zHhCWatviizPIq9B7Vh9uvrH6x3sK8itC84HkamnBWoDFJtzBf7SWlpLCZUit72b3os45h6RWQNC9xHRDF8dRA==" }, - "node_modules/vscode-nls": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-5.2.0.tgz", - "integrity": "sha512-RAaHx7B14ZU04EU31pT+rKz2/zSl7xMsfIZuo8pd+KZO6PXtQmpevpq3vxvWNcrGbdmhM/rr5Uw5Mz+NBfhVng==" - }, "node_modules/vscode-uri": { "version": "3.0.6", "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.6.tgz", @@ -8493,27 +8498,27 @@ } }, "@babel/compat-data": { - "version": "7.20.1", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.20.1.tgz", - "integrity": "sha512-EWZ4mE2diW3QALKvDMiXnbZpRvlj+nayZ112nK93SnhqOtpdsbVD4W+2tEoT3YNBAG9RBR0ISY758ZkOgsn6pQ==", + "version": "7.20.5", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.20.5.tgz", + "integrity": "sha512-KZXo2t10+/jxmkhNXc7pZTqRvSOIvVv/+lJwHS+B2rErwOyjuVRh60yVpb7liQ1U5t7lLJ1bz+t8tSypUZdm0g==", "dev": true }, "@babel/core": { - "version": "7.20.2", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.20.2.tgz", - "integrity": "sha512-w7DbG8DtMrJcFOi4VrLm+8QM4az8Mo+PuLBKLp2zrYRCow8W/f9xiXm5sN53C8HksCyDQwCKha9JiDoIyPjT2g==", + "version": "7.20.5", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.20.5.tgz", + "integrity": "sha512-UdOWmk4pNWTm/4DlPUl/Pt4Gz4rcEMb7CY0Y3eJl5Yz1vI8ZJGmHWaVE55LoxRjdpx0z259GE9U5STA9atUinQ==", "dev": true, "requires": { "@ampproject/remapping": "^2.1.0", "@babel/code-frame": "^7.18.6", - "@babel/generator": "^7.20.2", + "@babel/generator": "^7.20.5", "@babel/helper-compilation-targets": "^7.20.0", "@babel/helper-module-transforms": "^7.20.2", - "@babel/helpers": "^7.20.1", - "@babel/parser": "^7.20.2", + "@babel/helpers": "^7.20.5", + "@babel/parser": "^7.20.5", "@babel/template": "^7.18.10", - "@babel/traverse": "^7.20.1", - "@babel/types": "^7.20.2", + "@babel/traverse": "^7.20.5", + "@babel/types": "^7.20.5", "convert-source-map": "^1.7.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", @@ -8530,12 +8535,12 @@ } }, "@babel/generator": { - "version": "7.20.4", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.20.4.tgz", - "integrity": "sha512-luCf7yk/cm7yab6CAW1aiFnmEfBJplb/JojV56MYEK7ziWfGmFlTfmL9Ehwfy4gFhbjBfWO1wj7/TuSbVNEEtA==", + "version": "7.20.5", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.20.5.tgz", + "integrity": "sha512-jl7JY2Ykn9S0yj4DQP82sYvPU+T3g0HFcWTqDLqiuA9tGRNIj9VfbtXGAYTTkyNEnQk1jkMGOdYka8aG/lulCA==", "dev": true, "requires": { - "@babel/types": "^7.20.2", + "@babel/types": "^7.20.5", "@jridgewell/gen-mapping": "^0.3.2", "jsesc": "^2.5.1" }, @@ -8660,14 +8665,14 @@ "dev": true }, "@babel/helpers": { - "version": "7.20.1", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.20.1.tgz", - "integrity": "sha512-J77mUVaDTUJFZ5BpP6mMn6OIl3rEWymk2ZxDBQJUG3P+PbmyMcF3bYWvz0ma69Af1oobDqT/iAsvzhB58xhQUg==", + "version": "7.20.6", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.20.6.tgz", + "integrity": "sha512-Pf/OjgfgFRW5bApskEz5pvidpim7tEDPlFtKcNRXWmfHGn9IEI2W2flqRQXTFb7gIPTyK++N6rVHuwKut4XK6w==", "dev": true, "requires": { "@babel/template": "^7.18.10", - "@babel/traverse": "^7.20.1", - "@babel/types": "^7.20.0" + "@babel/traverse": "^7.20.5", + "@babel/types": "^7.20.5" } }, "@babel/highlight": { @@ -8740,9 +8745,9 @@ } }, "@babel/parser": { - "version": "7.20.3", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.20.3.tgz", - "integrity": "sha512-OP/s5a94frIPXwjzEcv5S/tpQfc6XhxYUnmWpgdqMWGgYCuErA3SzozaRAMQgSZWKeTJxht9aWAkUY+0UzvOFg==", + "version": "7.20.5", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.20.5.tgz", + "integrity": "sha512-r27t/cy/m9uKLXQNWWebeCUHgnAZq0CpG1OwKRxzJMP1vpSU4bSIK2hq+/cp0bQxetkXx38n09rNu8jVkcK/zA==", "dev": true }, "@babel/template": { @@ -8757,19 +8762,19 @@ } }, "@babel/traverse": { - "version": "7.20.1", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.20.1.tgz", - "integrity": "sha512-d3tN8fkVJwFLkHkBN479SOsw4DMZnz8cdbL/gvuDuzy3TS6Nfw80HuQqhw1pITbIruHyh7d1fMA47kWzmcUEGA==", + "version": "7.20.5", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.20.5.tgz", + "integrity": "sha512-WM5ZNN3JITQIq9tFZaw1ojLU3WgWdtkxnhM1AegMS+PvHjkM5IXjmYEGY7yukz5XS4sJyEf2VzWjI8uAavhxBQ==", "dev": true, "requires": { "@babel/code-frame": "^7.18.6", - "@babel/generator": "^7.20.1", + "@babel/generator": "^7.20.5", "@babel/helper-environment-visitor": "^7.18.9", "@babel/helper-function-name": "^7.19.0", "@babel/helper-hoist-variables": "^7.18.6", "@babel/helper-split-export-declaration": "^7.18.6", - "@babel/parser": "^7.20.1", - "@babel/types": "^7.20.0", + "@babel/parser": "^7.20.5", + "@babel/types": "^7.20.5", "debug": "^4.1.0", "globals": "^11.1.0" }, @@ -8783,9 +8788,9 @@ } }, "@babel/types": { - "version": "7.20.2", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.20.2.tgz", - "integrity": "sha512-FnnvsNWgZCr232sqtXggapvlkk/tuwR/qhGzcmxI0GXLCjmPYQPzio2FbdlWuY6y1sHFfQKk+rRbUZ9VStQMog==", + "version": "7.20.5", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.20.5.tgz", + "integrity": "sha512-c9fst/h2/dcF7H+MJKZ2T0KjEQ8hY/BNnDk/H3XY8C4Aw/eWQXWn/lWntHF9ooUBnGmEvbfGrTgLWc+um0YDUg==", "dev": true, "requires": { "@babel/helper-string-parser": "^7.19.4", @@ -9052,9 +9057,9 @@ }, "dependencies": { "@sinonjs/commons": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.5.tgz", - "integrity": "sha512-rTpCA0wG1wUxglBSFdMMY0oTrKYvgf4fNgv/sXbfCVAdf+FnPBdKJR/7XbpTCwbCrvCbdPYnlWaUUYz4V2fPDA==", + "version": "1.8.6", + "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.6.tgz", + "integrity": "sha512-Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ==", "dev": true, "requires": { "type-detect": "4.0.8" @@ -9169,9 +9174,9 @@ "dev": true }, "@types/node": { - "version": "16.18.3", - "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.3.tgz", - "integrity": "sha512-jh6m0QUhIRcZpNv7Z/rpN+ZWXOicUUQbSoWks7Htkbb9IjFQj4kzcX/xFCkjstCj5flMsN8FiSvt+q+Tcs4Llg==", + "version": "16.18.7", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.7.tgz", + "integrity": "sha512-SghuoXv8ghvkrKjTyvhRTeNzivPzGQ8pe09PPGdyqsExiKvBYV/6E3imvjsaJuW8ca61qQN2+SoSzyEHS9r2LA==", "dev": true }, "@types/semver": { @@ -9196,9 +9201,9 @@ "dev": true }, "@types/vscode": { - "version": "1.73.0", - "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.73.0.tgz", - "integrity": "sha512-FhkfF7V3fj7S3WqXu7AxFesBLO3uMkdCPJJPbwyZXezv2xJ6xBWHYM2CmkkbO8wT9Fr3KipwxGGOoQRrYq7mHg==", + "version": "1.74.0", + "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.74.0.tgz", + "integrity": "sha512-LyeCIU3jb9d38w0MXFwta9r0Jx23ugujkAxdwLTNCyspdZTKUc43t7ppPbCiPoQ/Ivd/pnDFZrb4hWd45wrsgA==", "dev": true }, "@types/webpack-env": { @@ -9208,14 +9213,14 @@ "dev": true }, "@typescript-eslint/eslint-plugin": { - "version": "5.42.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.42.1.tgz", - "integrity": "sha512-LyR6x784JCiJ1j6sH5Y0K6cdExqCCm8DJUTcwG5ThNXJj/G8o5E56u5EdG4SLy+bZAwZBswC+GYn3eGdttBVCg==", + "version": "5.46.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.46.0.tgz", + "integrity": "sha512-QrZqaIOzJAjv0sfjY4EjbXUi3ZOFpKfzntx22gPGr9pmFcTjcFw/1sS1LJhEubfAGwuLjNrPV0rH+D1/XZFy7Q==", "dev": true, "requires": { - "@typescript-eslint/scope-manager": "5.42.1", - "@typescript-eslint/type-utils": "5.42.1", - "@typescript-eslint/utils": "5.42.1", + "@typescript-eslint/scope-manager": "5.46.0", + "@typescript-eslint/type-utils": "5.46.0", + "@typescript-eslint/utils": "5.46.0", "debug": "^4.3.4", "ignore": "^5.2.0", "natural-compare-lite": "^1.4.0", @@ -9225,53 +9230,53 @@ } }, "@typescript-eslint/parser": { - "version": "5.42.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.42.1.tgz", - "integrity": "sha512-kAV+NiNBWVQDY9gDJDToTE/NO8BHi4f6b7zTsVAJoTkmB/zlfOpiEVBzHOKtlgTndCKe8vj9F/PuolemZSh50Q==", + "version": "5.46.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.46.0.tgz", + "integrity": "sha512-joNO6zMGUZg+C73vwrKXCd8usnsmOYmgW/w5ZW0pG0RGvqeznjtGDk61EqqTpNrFLUYBW2RSBFrxdAZMqA4OZA==", "dev": true, "requires": { - "@typescript-eslint/scope-manager": "5.42.1", - "@typescript-eslint/types": "5.42.1", - "@typescript-eslint/typescript-estree": "5.42.1", + "@typescript-eslint/scope-manager": "5.46.0", + "@typescript-eslint/types": "5.46.0", + "@typescript-eslint/typescript-estree": "5.46.0", "debug": "^4.3.4" } }, "@typescript-eslint/scope-manager": { - "version": "5.42.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.42.1.tgz", - "integrity": "sha512-QAZY/CBP1Emx4rzxurgqj3rUinfsh/6mvuKbLNMfJMMKYLRBfweus8brgXF8f64ABkIZ3zdj2/rYYtF8eiuksQ==", + "version": "5.46.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.46.0.tgz", + "integrity": "sha512-7wWBq9d/GbPiIM6SqPK9tfynNxVbfpihoY5cSFMer19OYUA3l4powA2uv0AV2eAZV6KoAh6lkzxv4PoxOLh1oA==", "dev": true, "requires": { - "@typescript-eslint/types": "5.42.1", - "@typescript-eslint/visitor-keys": "5.42.1" + "@typescript-eslint/types": "5.46.0", + "@typescript-eslint/visitor-keys": "5.46.0" } }, "@typescript-eslint/type-utils": { - "version": "5.42.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.42.1.tgz", - "integrity": "sha512-WWiMChneex5w4xPIX56SSnQQo0tEOy5ZV2dqmj8Z371LJ0E+aymWD25JQ/l4FOuuX+Q49A7pzh/CGIQflxMVXg==", + "version": "5.46.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.46.0.tgz", + "integrity": "sha512-dwv4nimVIAsVS2dTA0MekkWaRnoYNXY26dKz8AN5W3cBFYwYGFQEqm/cG+TOoooKlncJS4RTbFKgcFY/pOiBCg==", "dev": true, "requires": { - "@typescript-eslint/typescript-estree": "5.42.1", - "@typescript-eslint/utils": "5.42.1", + "@typescript-eslint/typescript-estree": "5.46.0", + "@typescript-eslint/utils": "5.46.0", "debug": "^4.3.4", "tsutils": "^3.21.0" } }, "@typescript-eslint/types": { - "version": "5.42.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.42.1.tgz", - "integrity": "sha512-Qrco9dsFF5lhalz+lLFtxs3ui1/YfC6NdXu+RAGBa8uSfn01cjO7ssCsjIsUs484vny9Xm699FSKwpkCcqwWwA==", + "version": "5.46.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.46.0.tgz", + "integrity": "sha512-wHWgQHFB+qh6bu0IAPAJCdeCdI0wwzZnnWThlmHNY01XJ9Z97oKqKOzWYpR2I83QmshhQJl6LDM9TqMiMwJBTw==", "dev": true }, "@typescript-eslint/typescript-estree": { - "version": "5.42.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.42.1.tgz", - "integrity": "sha512-qElc0bDOuO0B8wDhhW4mYVgi/LZL+igPwXtV87n69/kYC/7NG3MES0jHxJNCr4EP7kY1XVsRy8C/u3DYeTKQmw==", + "version": "5.46.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.46.0.tgz", + "integrity": "sha512-kDLNn/tQP+Yp8Ro2dUpyyVV0Ksn2rmpPpB0/3MO874RNmXtypMwSeazjEN/Q6CTp8D7ExXAAekPEcCEB/vtJkw==", "dev": true, "requires": { - "@typescript-eslint/types": "5.42.1", - "@typescript-eslint/visitor-keys": "5.42.1", + "@typescript-eslint/types": "5.46.0", + "@typescript-eslint/visitor-keys": "5.46.0", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", @@ -9280,35 +9285,40 @@ } }, "@typescript-eslint/utils": { - "version": "5.42.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.42.1.tgz", - "integrity": "sha512-Gxvf12xSp3iYZd/fLqiQRD4uKZjDNR01bQ+j8zvhPjpsZ4HmvEFL/tC4amGNyxN9Rq+iqvpHLhlqx6KTxz9ZyQ==", + "version": "5.46.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.46.0.tgz", + "integrity": "sha512-4O+Ps1CRDw+D+R40JYh5GlKLQERXRKW5yIQoNDpmXPJ+C7kaPF9R7GWl+PxGgXjB3PQCqsaaZUpZ9dG4U6DO7g==", "dev": true, "requires": { "@types/json-schema": "^7.0.9", "@types/semver": "^7.3.12", - "@typescript-eslint/scope-manager": "5.42.1", - "@typescript-eslint/types": "5.42.1", - "@typescript-eslint/typescript-estree": "5.42.1", + "@typescript-eslint/scope-manager": "5.46.0", + "@typescript-eslint/types": "5.46.0", + "@typescript-eslint/typescript-estree": "5.46.0", "eslint-scope": "^5.1.1", "eslint-utils": "^3.0.0", "semver": "^7.3.7" } }, "@typescript-eslint/visitor-keys": { - "version": "5.42.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.42.1.tgz", - "integrity": "sha512-LOQtSF4z+hejmpUvitPlc4hA7ERGoj2BVkesOcG91HCn8edLGUXbTrErmutmPbl8Bo9HjAvOO/zBKQHExXNA2A==", + "version": "5.46.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.46.0.tgz", + "integrity": "sha512-E13gBoIXmaNhwjipuvQg1ByqSAu/GbEpP/qzFihugJ+MomtoJtFAJG/+2DRPByf57B863m0/q7Zt16V9ohhANw==", "dev": true, "requires": { - "@typescript-eslint/types": "5.42.1", + "@typescript-eslint/types": "5.46.0", "eslint-visitor-keys": "^3.3.0" } }, + "@vscode/l10n": { + "version": "0.0.10", + "resolved": "https://registry.npmjs.org/@vscode/l10n/-/l10n-0.0.10.tgz", + "integrity": "sha512-E1OCmDcDWa0Ya7vtSjp/XfHFGqYJfh+YPC1RkATU71fTac+j1JjCcB3qwSzmlKAighx2WxhLlfhS0RwAN++PFQ==" + }, "@vscode/test-electron": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@vscode/test-electron/-/test-electron-2.2.0.tgz", - "integrity": "sha512-xk2xrOTMG75/hxO8OVVZ+GErv9gmdZwOD8rEHV3ty3n1Joav2yFcfrmqD6Ukref27U13LEL8gVvSHzauGAK5nQ==", + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/@vscode/test-electron/-/test-electron-2.2.1.tgz", + "integrity": "sha512-DUdwSYVc9p/PbGveaq20dbAAXHfvdq4zQ24ILp6PKizOBxrOfMsOq8Vts5nMzeIo0CxtA/RxZLFyDv001PiUSg==", "dev": true, "requires": { "http-proxy-agent": "^4.0.1", @@ -9652,9 +9662,9 @@ } }, "anymatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz", - "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==", + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", + "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", "dev": true, "requires": { "normalize-path": "^3.0.0", @@ -9954,9 +9964,9 @@ "dev": true }, "caniuse-lite": { - "version": "1.0.30001431", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001431.tgz", - "integrity": "sha512-zBUoFU0ZcxpvSt9IU66dXVT/3ctO1cy4y9cscs1szkPlcWb6pasYM144GqrUygUbT+k7cmUCW61cvskjcv0enQ==", + "version": "1.0.30001439", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001439.tgz", + "integrity": "sha512-1MgUzEkoMO6gKfXflStpYgZDlFM7M/ck/bgfVCACO5vnAf0fXoNVHdWtqGU+MYca+4bL9Z5bpOVmR33cWW9G2A==", "dev": true }, "cdocparser": { @@ -10453,9 +10463,9 @@ } }, "enhanced-resolve": { - "version": "5.10.0", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.10.0.tgz", - "integrity": "sha512-T0yTFjdpldGY8PmuXXR0PyQ1ufZpEGiHVrp7zHKB7jdR4qlmZHhONVM5AQOAWXuF/w3dnHbEQVrNptJgt7F+cQ==", + "version": "5.12.0", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz", + "integrity": "sha512-QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ==", "dev": true, "requires": { "graceful-fs": "^4.2.4", @@ -10469,9 +10479,9 @@ "dev": true }, "es-abstract": { - "version": "1.20.4", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.4.tgz", - "integrity": "sha512-0UtvRN79eMe2L+UNEF1BwRe364sj/DXhQ/k5FmivgoSdpM90b8Jc0mDzKMGo7QS0BVbOP/bTwBKNnDc9rNzaPA==", + "version": "1.20.5", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.5.tgz", + "integrity": "sha512-7h8MM2EQhsCA7pU/Nv78qOXFpD8Rhqd12gYiSJVkrH9+e8VuA8JlPJK/hQjjlLv6pJvx/z1iRFKzYb0XT/RuAQ==", "dev": true, "requires": { "call-bind": "^1.0.2", @@ -10480,6 +10490,7 @@ "function.prototype.name": "^1.1.5", "get-intrinsic": "^1.1.3", "get-symbol-description": "^1.0.0", + "gopd": "^1.0.1", "has": "^1.0.3", "has-property-descriptors": "^1.0.0", "has-symbols": "^1.0.3", @@ -10495,8 +10506,8 @@ "object.assign": "^4.1.4", "regexp.prototype.flags": "^1.4.3", "safe-regex-test": "^1.0.0", - "string.prototype.trimend": "^1.0.5", - "string.prototype.trimstart": "^1.0.5", + "string.prototype.trimend": "^1.0.6", + "string.prototype.trimstart": "^1.0.6", "unbox-primitive": "^1.0.2" } }, @@ -10557,9 +10568,9 @@ "dev": true }, "eslint": { - "version": "8.27.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.27.0.tgz", - "integrity": "sha512-0y1bfG2ho7mty+SiILVf9PfuRA49ek4Nc60Wmmu62QlobNR+CeXa4xXIJgcuwSQgZiWaPH+5BDsctpIW0PR/wQ==", + "version": "8.29.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.29.0.tgz", + "integrity": "sha512-isQ4EEiyUjZFbEKvEGJKKGBwXtvXX+zJbkVKCgTuB9t/+jUBcy8avhkEwWJecI15BkRkOYmvIM5ynbhRjEkoeg==", "dev": true, "requires": { "@eslint/eslintrc": "^1.3.3", @@ -10905,9 +10916,9 @@ "dev": true }, "fastq": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz", - "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==", + "version": "1.14.0", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.14.0.tgz", + "integrity": "sha512-eR2D+V9/ExcbF9ls441yIuN6TI2ED1Y2ZcA5BmMtJsOkWOFRJQ0Jt0g1UwqXJJVAb+V+umH5Dfr8oh4EVP7VVg==", "requires": { "reusify": "^1.0.4" } @@ -11198,9 +11209,9 @@ "dev": true }, "globals": { - "version": "13.17.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz", - "integrity": "sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==", + "version": "13.18.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.18.0.tgz", + "integrity": "sha512-/mR4KI8Ps2spmoc0Ulu9L7agOF0du1CZNQ3dke8yItYlyKNmGrkONemBbd6V8UTc1Wgcqn21t3WYB7dbRmh6/A==", "dev": true, "requires": { "type-fest": "^0.20.2" @@ -11408,9 +11419,9 @@ "dev": true }, "ignore": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz", - "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==", + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.1.tgz", + "integrity": "sha512-d2qQLzTJ9WxQftPAuEQpSPmKqzxePjzVbpAVv62AQ64NTL+wR4JkrVqR/LqFsFEUsHDAiId52mJteHDFuDkElA==", "dev": true }, "import-fresh": { @@ -11882,9 +11893,9 @@ } }, "js-sdsl": { - "version": "4.1.5", - "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.1.5.tgz", - "integrity": "sha512-08bOAKweV2NUC1wqTtf3qZlnpOX/R2DU9ikpjOHs0H+ibQv3zpncVQg6um4uYtRtrwIX8M4Nh3ytK4HGlYAq7Q==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.2.0.tgz", + "integrity": "sha512-dyBIzQBDkCqCu+0upx25Y2jGdbTGxE9fshMsCdK0ViOongpV+n5tXRcZY9v7CaVQ79AGS9KA1KHtojxiM7aXSQ==", "dev": true }, "js-tokens": { @@ -11972,9 +11983,9 @@ } }, "koa": { - "version": "2.13.4", - "resolved": "https://registry.npmjs.org/koa/-/koa-2.13.4.tgz", - "integrity": "sha512-43zkIKubNbnrULWlHdN5h1g3SEKXOEzoAlRsHOTFpnlDu8JlAOZSMJBLULusuXRequboiwJcj5vtYXKB3k7+2g==", + "version": "2.14.1", + "resolved": "https://registry.npmjs.org/koa/-/koa-2.14.1.tgz", + "integrity": "sha512-USJFyZgi2l0wDgqkfD27gL4YGno7TfUkcmOe6UOLFOVuN+J7FwnNu4Dydl4CUQzraM1lBAiGed0M9OVJoT0Kqw==", "dev": true, "requires": { "accepts": "^1.3.5", @@ -12735,9 +12746,9 @@ "dev": true }, "nise": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/nise/-/nise-5.1.2.tgz", - "integrity": "sha512-+gQjFi8v+tkfCuSCxfURHLhRhniE/+IaYbIphxAN2JRR9SHKhY8hgXpaXiYfHdw+gcGe4buxgbprBQFab9FkhA==", + "version": "5.1.3", + "resolved": "https://registry.npmjs.org/nise/-/nise-5.1.3.tgz", + "integrity": "sha512-U597iWTTBBYIV72986jyU382/MMZ70ApWcRmkoF1AZ75bpqOtI3Gugv/6+0jLgoDOabmcSwYBkSSAWIp1eA5cg==", "dev": true, "requires": { "@sinonjs/commons": "^2.0.0", @@ -12757,9 +12768,9 @@ }, "dependencies": { "@sinonjs/commons": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.5.tgz", - "integrity": "sha512-rTpCA0wG1wUxglBSFdMMY0oTrKYvgf4fNgv/sXbfCVAdf+FnPBdKJR/7XbpTCwbCrvCbdPYnlWaUUYz4V2fPDA==", + "version": "1.8.6", + "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.6.tgz", + "integrity": "sha512-Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ==", "dev": true, "requires": { "type-detect": "4.0.8" @@ -13414,18 +13425,18 @@ } }, "playwright": { - "version": "1.27.1", - "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.27.1.tgz", - "integrity": "sha512-xXYZ7m36yTtC+oFgqH0eTgullGztKSRMb4yuwLPl8IYSmgBM88QiB+3IWb1mRIC9/NNwcgbG0RwtFlg+EAFQHQ==", + "version": "1.28.1", + "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.28.1.tgz", + "integrity": "sha512-92Sz6XBlfHlb9tK5UCDzIFAuIkHHpemA9zwUaqvo+w7sFMSmVMGmvKcbptof/eJObq63PGnMhM75x7qxhTR78Q==", "dev": true, "requires": { - "playwright-core": "1.27.1" + "playwright-core": "1.28.1" } }, "playwright-core": { - "version": "1.27.1", - "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.27.1.tgz", - "integrity": "sha512-9EmeXDncC2Pmp/z+teoVYlvmPWUC6ejSSYZUln7YaP89Z6lpAaiaAnqroUt/BoLo8tn7WYShcfaCh+xofZa44Q==", + "version": "1.28.1", + "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.28.1.tgz", + "integrity": "sha512-3PixLnGPno0E8rSBJjtwqTwJe3Yw72QwBBBxNoukIj3lEeBNXwbNiKrNuB1oyQgTBw5QHUhNO3SteEtHaMK6ag==", "dev": true }, "prelude-ls": { @@ -13435,9 +13446,9 @@ "dev": true }, "prettier": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz", - "integrity": "sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==", + "version": "2.8.1", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.1.tgz", + "integrity": "sha512-lqGoSJBQNJidqCHE80vqZJHWHRFoNYsSpP9AjFhlhi9ODCJA541svILes/+/1GM3VaL/abZi7cpFzOpdR9UPKg==", "dev": true }, "prettier-linter-helpers": { @@ -13706,9 +13717,9 @@ } }, "rxjs": { - "version": "7.5.7", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.7.tgz", - "integrity": "sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==", + "version": "7.6.0", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.6.0.tgz", + "integrity": "sha512-DDa7d8TFNUalGC9VqXvQ1euWNN7sc63TrUCuM9J998+ViviahMIjKSOU7rfcgFOF+FCD71BhDRv4hrFz+ImDLQ==", "dev": true, "requires": { "tslib": "^2.1.0" @@ -13867,9 +13878,9 @@ } }, "sinon": { - "version": "14.0.2", - "resolved": "https://registry.npmjs.org/sinon/-/sinon-14.0.2.tgz", - "integrity": "sha512-PDpV0ZI3ZCS3pEqx0vpNp6kzPhHrLx72wA0G+ZLaaJjLIYeE0n8INlgaohKuGy7hP0as5tbUd23QWu5U233t+w==", + "version": "15.0.0", + "resolved": "https://registry.npmjs.org/sinon/-/sinon-15.0.0.tgz", + "integrity": "sha512-pV97G1GbslaSJoSdy2F2z8uh5F+uPGp3ddOzA4JsBOUBLEQRz2OAqlKGRFTSh2KiqUCmHkzyAeu7R4x1Hx0wwg==", "dev": true, "requires": { "@sinonjs/commons": "^2.0.0", @@ -14117,9 +14128,9 @@ } }, "terser": { - "version": "5.15.1", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.15.1.tgz", - "integrity": "sha512-K1faMUvpm/FBxjBXud0LWVAGxmvoPbZbfTCYbSgaaYQaIXI3/TdI7a7ZGA73Zrou6Q8Zmz3oeUTsp/dj+ag2Xw==", + "version": "5.16.1", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.16.1.tgz", + "integrity": "sha512-xvQfyfA1ayT0qdK47zskQgRZeWLoOQ8JQ6mIgRGVNwZKdQMU+5FkCBjmv4QjcrTzyZquRw2FVtlJSRUmMKQslw==", "dev": true, "requires": { "@jridgewell/source-map": "^0.3.2", @@ -14214,9 +14225,9 @@ "dev": true }, "ts-loader": { - "version": "9.4.1", - "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-9.4.1.tgz", - "integrity": "sha512-384TYAqGs70rn9F0VBnh6BPTfhga7yFNdC5gXbQpDrBj9/KsT4iRkGqKXhziofHOlE2j6YEaiTYVGKKvPhGWvw==", + "version": "9.4.2", + "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-9.4.2.tgz", + "integrity": "sha512-OmlC4WVmFv5I0PpaxYb+qGeGOdm5giHU7HwDDUjw59emP2UYMHy9fFSDcYgSNoH8sXcj4hGCSEhlDZ9ULeDraA==", "dev": true, "requires": { "chalk": "^4.1.0", @@ -14324,9 +14335,9 @@ } }, "typescript": { - "version": "4.8.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.4.tgz", - "integrity": "sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ==", + "version": "4.9.4", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.4.tgz", + "integrity": "sha512-Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg==", "dev": true }, "unbox-primitive": { @@ -14425,14 +14436,14 @@ "dev": true }, "vscode-css-languageservice": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-6.1.1.tgz", - "integrity": "sha512-7d2NCq2plT0njAKmGZ11uof95y2fwbgq8QuToE3kX9uYQfVmejHX2/lFGKbK5AV5+Ja0L80UZoU0QspwqMKMHA==", + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-6.2.1.tgz", + "integrity": "sha512-FMaMjB2LQdkHjTCP2CWh2S94xuGsxSc8xr0H9nAACVd/iUDyZLoKFjwoB+mA3v0rpCH2U5vVCVwxyULy61CgqA==", "requires": { + "@vscode/l10n": "^0.0.10", "vscode-languageserver-textdocument": "^1.0.7", "vscode-languageserver-types": "^3.17.2", - "vscode-nls": "^5.2.0", - "vscode-uri": "^3.0.4" + "vscode-uri": "^3.0.6" } }, "vscode-jsonrpc": { @@ -14468,20 +14479,15 @@ } }, "vscode-languageserver-textdocument": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.7.tgz", - "integrity": "sha512-bFJH7UQxlXT8kKeyiyu41r22jCZXG8kuuVVA33OEJn1diWOZK5n8zBSPZFHVBOu8kXZ6h0LIRhf5UnCo61J4Hg==" + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.8.tgz", + "integrity": "sha512-1bonkGqQs5/fxGT5UchTgjGVnfysL0O8v1AYMBjqTbWQTFn721zaPGDYFkOKtfDgFiSgXM3KwaG3FMGfW4Ed9Q==" }, "vscode-languageserver-types": { "version": "3.17.2", "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.2.tgz", "integrity": "sha512-zHhCWatviizPIq9B7Vh9uvrH6x3sK8itC84HkamnBWoDFJtzBf7SWlpLCZUit72b3os45h6RWQNC9xHRDF8dRA==" }, - "vscode-nls": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-5.2.0.tgz", - "integrity": "sha512-RAaHx7B14ZU04EU31pT+rKz2/zSl7xMsfIZuo8pd+KZO6PXtQmpevpq3vxvWNcrGbdmhM/rr5Uw5Mz+NBfhVng==" - }, "vscode-uri": { "version": "3.0.6", "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.6.tgz", diff --git a/package.json b/package.json index 1cc612a8..3bf0d875 100644 --- a/package.json +++ b/package.json @@ -123,13 +123,13 @@ "mocha": "^10.0.0", "nyc": "^15.1.0", "patch-package": "^6.5.0", - "prettier": "2.7.1", + "prettier": "^2.8.1", "rimraf": "^3.0.2", - "sinon": "^14.0.0", + "sinon": "15.0.0", "ts-loader": "^9.3.1", "typescript": "^4.7.4", "webpack": "^5.73.0", - "webpack-cli": "^4.10.0" + "webpack-cli": "4.10.0" }, "dependencies": { "color": "^4.2.3", From de85343a7a730ff149834bacf2e3490aeee4e09b Mon Sep 17 00:00:00 2001 From: William Killerud Date: Sat, 10 Dec 2022 17:33:34 +0100 Subject: [PATCH 6/6] chore: version --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index c548c6e9..2f6fb642 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "some-sass", - "version": "2.6.4", + "version": "2.7.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "some-sass", - "version": "2.6.4", + "version": "2.7.0", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index 3bf0d875..8d7bd291 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "some-sass", "displayName": "Some Sass", "description": "Provides code suggestions, documentation and code navigation for modern SCSS", - "version": "2.6.4", + "version": "2.7.0", "publisher": "SomewhatStationery", "license": "MIT", "engines": {