monaco-yql-languages 2.2.0 → 2.2.1

package/build/yql/autocomplete/__tests__/yqlAutocomplete.test.d.ts

@@ -0,0 +1 @@
+export {};

package/build/yql/autocomplete/__tests__/yqlAutocomplete.test.js

@@ -0,0 +1,79 @@
+import { YQLAutocomplete } from '../yqlAutocomplete';
+jest.mock('../../../fillers/monaco-editor-core', () => ({
+    languages: {
+        CompletionItemKind: {
+            Property: 1,
+        },
+    },
+}));
+function extractCursor(inputWithCursor) {
+    const offset = inputWithCursor.indexOf('|');
+    if (offset === -1) {
+        throw new Error('Input must contain cursor marker');
+    }
+    return {
+        input: inputWithCursor.replace('|', ''),
+        offset,
+    };
+}
+function createEmptyRange(column) {
+    return {
+        startLineNumber: 1,
+        startColumn: column,
+        endLineNumber: 1,
+        endColumn: column,
+    };
+}
+describe('YQLAutocomplete settings suggestions range', () => {
+    it('should return encoding suggestions with empty range inside autoclosed parentheses', async () => {
+        const parseQuery = jest.fn(async () => ({ suggestEncodingSettings: true }));
+        const getEncodingSettings = jest.fn(async () => ['AUTO', 'DICT', 'PLAIN']);
+        const autocomplete = new YQLAutocomplete({
+            getQueryParser: async () => parseQuery,
+            getEncodingSettings,
+        });
+        const { input, offset } = extractCursor('ALTER TABLE test_table ALTER COLUMN id SET ENCODING(|)');
+        const suggestions = await autocomplete.getSuggestions(input, offset);
+        const expectedRange = createEmptyRange(offset + 1);
+        expect(getEncodingSettings).toHaveBeenCalledWith('');
+        expect(suggestions).toEqual([
+            expect.objectContaining({ label: 'AUTO', range: expectedRange }),
+            expect.objectContaining({ label: 'DICT', range: expectedRange }),
+            expect.objectContaining({ label: 'PLAIN', range: expectedRange }),
+        ]);
+    });
+    it('should return encoding suggestions after whitespace inside autoclosed parentheses', async () => {
+        const parseQuery = jest.fn(async () => ({ suggestEncodingSettings: true }));
+        const getEncodingSettings = jest.fn(async () => ['AUTO', 'DICT', 'PLAIN']);
+        const autocomplete = new YQLAutocomplete({
+            getQueryParser: async () => parseQuery,
+            getEncodingSettings,
+        });
+        const { input, offset } = extractCursor('ALTER TABLE test_table ALTER COLUMN id SET ENCODING( |)');
+        const suggestions = await autocomplete.getSuggestions(input, offset);
+        const expectedRange = createEmptyRange(offset + 1);
+        expect(getEncodingSettings).toHaveBeenCalledWith('');
+        expect(suggestions).toEqual([
+            expect.objectContaining({ label: 'AUTO', range: expectedRange }),
+            expect.objectContaining({ label: 'DICT', range: expectedRange }),
+            expect.objectContaining({ label: 'PLAIN', range: expectedRange }),
+        ]);
+    });
+    it('should return compression suggestions with empty range inside autoclosed parentheses', async () => {
+        const parseQuery = jest.fn(async () => ({ suggestCompressionSettings: true }));
+        const getCompressionSettings = jest.fn(async () => ['AUTO', 'LZ4', 'ZSTD']);
+        const autocomplete = new YQLAutocomplete({
+            getQueryParser: async () => parseQuery,
+            getCompressionSettings,
+        });
+        const { input, offset } = extractCursor('ALTER TABLE test_table ALTER COLUMN id SET COMPRESSION(|)');
+        const suggestions = await autocomplete.getSuggestions(input, offset);
+        const expectedRange = createEmptyRange(offset + 1);
+        expect(getCompressionSettings).toHaveBeenCalledWith('');
+        expect(suggestions).toEqual([
+            expect.objectContaining({ label: 'AUTO', range: expectedRange }),
+            expect.objectContaining({ label: 'LZ4', range: expectedRange }),
+            expect.objectContaining({ label: 'ZSTD', range: expectedRange }),
+        ]);
+    });
+});

package/build/yql/autocomplete/yqlAutocomplete.js

@@ -8,7 +8,7 @@ function getCursorPosition(input, offset) {
         column: lines[lines.length - 1].length + 1,
     };
 }
-const prefixRegexp = /([^\s]+)$/;
+const prefixRegexp = /([^\s()]+)$/;
 function getCursorPrefix(input, offset, re = prefixRegexp) {
     const prevText = input.slice(0, offset);
     const match = prevText.match(re);
@@ -17,7 +17,7 @@ function getCursorPrefix(input, offset, re = prefixRegexp) {
     }
     return '';
 }
-const prefixToReplaceRegexp = /([^\\/\s`]+)$/;
+const prefixToReplaceRegexp = /([^\\/\s`()]+)$/;
 function getRangeToInsertSuggestion(input, offset) {
     const cursorPosition = getCursorPosition(input, offset);
     const cursorPrefix = getCursorPrefix(input, offset, prefixToReplaceRegexp);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "monaco-yql-languages",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "description": "YQL languages for the Monaco Editor, based on monaco-languages.",
   "author": "YDB",
   "license": "MIT",