admin/n8n-enterprise-unlocked
1
0
Fork 0
mirror of https://github.com/Abdulazizzn/n8n-enterprise-unlocked.git synced 2025-12-20 11:22:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(editor): Capture indexed access expressions when building completions (#8331)

Browse Source
This commit is contained in:
Iván Ovejero
2024-01-17 11:02:40 +01:00
committed by GitHub
parent 7cdbb424e3
commit 159b328587
3 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packages/editor-ui/src/plugins/codemirror/completions/__tests__/completions.test.ts
View File

@@ -197,6 +197,17 @@ describe('Resolution-based completions', () => {
}); });
}); });
describe('indexed access completions', () => {
test('should return string completions for indexed access that resolves to string literal: {{ "abc"[0].| }}', () => {
// @ts-expect-error Spied function is mistyped
resolveParameterSpy.mockReturnValueOnce('a');
expect(completions('{{ "abc"[0].| }}')).toHaveLength(
natives('string').length + extensions('string').length,
);
});
});
describe('complex expression completions', () => { describe('complex expression completions', () => {
const resolveParameterSpy = vi.spyOn(workflowHelpers, 'resolveParameter'); const resolveParameterSpy = vi.spyOn(workflowHelpers, 'resolveParameter');
const { $input } = mockProxy; const { $input } = mockProxy;

1
packages/editor-ui/src/plugins/codemirror/completions/datatype.completions.ts
View File

@@ -503,6 +503,7 @@ const regexes = {
doubleQuoteStringLiteral: /(".+")\.([^"{\s])*/, // "abc". doubleQuoteStringLiteral: /(".+")\.([^"{\s])*/, // "abc".
dateLiteral: /\(?new Date\(\(?.*?\)\)?\.([^{\s])*/, // new Date(). or (new Date()). dateLiteral: /\(?new Date\(\(?.*?\)\)?\.([^{\s])*/, // new Date(). or (new Date()).
arrayLiteral: /(\[.+\])\.([^{\s])*/, // [1, 2, 3]. arrayLiteral: /(\[.+\])\.([^{\s])*/, // [1, 2, 3].
indexedAccess: /([^{\s]+\[.+\])\.([^{\s])*/, // 'abc'[0]. or 'abc'.split('')[0] or similar ones
objectLiteral: /\(\{.*\}\)\.([^{\s])*/, // ({}). objectLiteral: /\(\{.*\}\)\.([^{\s])*/, // ({}).
mathGlobal: /Math\.([^{\s])*/, // Math. mathGlobal: /Math\.([^{\s])*/, // Math.

3
packages/editor-ui/src/plugins/codemirror/completions/utils.ts
View File

@@ -43,9 +43,8 @@ export function longestCommonPrefix(...strings: string[]) {
// suggestions can be matched based on it. // suggestions can be matched based on it.
function extractSubExpression(userInput: string): string { function extractSubExpression(userInput: string): string {
const dollarSignIndex = userInput.indexOf('$'); const dollarSignIndex = userInput.indexOf('$');
// If it's not a dollar sign expression just strip parentheses
if (dollarSignIndex === -1) { if (dollarSignIndex === -1) {
userInput = userInput.replace(/^.+(\(|\[|{)/, ''); return userInput;
} else if (!stringLiteralRegex.test(userInput)) { } else if (!stringLiteralRegex.test(userInput)) {
// If there is a dollar sign in the input and input is not a string literal, // If there is a dollar sign in the input and input is not a string literal,
// extract part of following the last $ // extract part of following the last $