@aquera/nile-elements 0.0.126 → 0.0.127

package/package.json

@@ -3,7 +3,7 @@
   "description": "Webcomponent nile-elements following open-wc recommendations",
   "license": "MIT",
   "author": "nile-elements",
-  "version": "0.0.126",
+  "version": "0.0.127",
   "main": "dist/src/index.js",
   "type": "module",
   "module": "dist/src/index.js",

package/src/nile-code-editor/nile-code-editor.ts

@@ -309,41 +309,51 @@ export class NileCodeEditor extends NileElement {
   customAutocomplete = (context: CompletionContext): CompletionResult | null => {
     // Getting the valid last line, last text from the code editor
     let text = context.state.doc.sliceString(0, context.pos);
-    let textBeforeCursor=text.split('\n').at(-1)?.split(' ').at(-1)+'';
-
-    if (!(this.isValidPath(textBeforeCursor) && ['.', '['].includes(textBeforeCursor[textBeforeCursor.length - 1]))) {
-      return { from: context.pos, options: [] };
-    }
-    // Parse the path for dot or bracket notation
-    const path = this.parsePath(textBeforeCursor);
-    if (path) {
-      const resolved = this.resolveNestedProperties(this.customAutoCompletions, path);
-      // If resolved is an object, provide its keys as suggestions
-      if (resolved && typeof resolved === 'object') {
-        return {
-          from: context.pos,
-          options: Object.keys(resolved).map((key) => ({
-            label: key,
-            type: 'property',
-            info: `Key of ${path[path.length - 1]}`
-          })),
-        };
+    const [textBeforeCursor,textAfterSeperation]=this.splitStringAtLastSeparator(text.split('\n').at(-1)?.split(' ').at(-1)+'')
+
+    if (!this.isValidPath(textBeforeCursor)) return { from: context.pos, options: [] };
+    if(['.', '['].includes(textBeforeCursor[textBeforeCursor.length - 1])){
+      // Parse the path for dot or bracket notation
+      const path = this.parsePath(textBeforeCursor);
+      if (path) {
+        let resolved = this.resolveNestedProperties(this.customAutoCompletions, path);
+        if(textAfterSeperation){
+          const obj:any={}
+          Object.keys(resolved).forEach((key)=>{
+            if(key.startsWith(textAfterSeperation)){
+              obj[key]=resolved[key]
+            }
+          })
+          resolved=obj
+        }
+        // If resolved is an object, provide its keys as suggestions
+        if (resolved && typeof resolved === 'object') {
+          return {
+            from: context.pos,
+            options: Object.keys(resolved).map((key) => ({
+              label: key,
+              type: 'property',
+              info: `Key of ${path[path.length - 1]}`,
+              apply: key.slice(textAfterSeperation.length),
+              boost: 999
+            })),
+          };
+        }
       }
     }
+    
     // Match for top-level object suggestions, e.g., "a"
     const baseMatch: any = textBeforeCursor.match(/([a-zA-Z_$][\w$]*)$/);
     if (baseMatch) {
-      const resolved = this.customAutoCompletions[baseMatch[1]];
-      // If resolved is an object, provide its top-level properties as suggestions
-      if (resolved && typeof resolved === 'object') {
-        return {
-          from: context.pos - baseMatch[1].length,
-          options: Object.keys(resolved).map((key) => ({
-            label: key,
-            type: 'property',
-            info: `Property of ${baseMatch[1]}`,
-          })),
-        };
+      const optionsList=Object.keys(this.customAutoCompletions).filter(key=>key.startsWith(textBeforeCursor));
+      return {
+        from: context.pos - baseMatch[1].length,
+        options: optionsList.map((key) => ({
+          label: key,
+          type: 'property',
+          apply: key.slice(textBeforeCursor.length),
+          boost: 999
+        }))
       }
     }
     // Default to an empty list if no match
@@ -386,6 +396,11 @@ export class NileCodeEditor extends NileElement {
     return regex.test(path);
   }
 
+  splitStringAtLastSeparator(input:string) {
+    const lastSeparatorIndex = Math.max(input.lastIndexOf('.'), input.lastIndexOf('['));
+    if (lastSeparatorIndex === -1) return [input, ''];  
+    return [input.slice(0, lastSeparatorIndex + 1), input.slice(lastSeparatorIndex + 1).replace(/["'\[]/g, '')];
+  }
   /* #endregion */
 }