@aquera/nile-elements 0.1.1 → 0.1.2

package/package.json

@@ -3,7 +3,7 @@
   "description": "Webcomponent nile-elements following open-wc recommendations",
   "license": "MIT",
   "author": "nile-elements",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "main": "dist/src/index.js",
   "type": "module",
   "module": "dist/src/index.js",
@@ -117,6 +117,7 @@
     "@codemirror/lang-javascript": "6.2.1",
     "@codemirror/lang-sql": "6.7.0",
     "@codemirror/lang-json": "^6.0.1",
+    "@codemirror/lang-html":"6.4.9",
     "codemirror": "6.0.1",
     "chalk": "5.3.0",
     "figlet": "1.7.0",

package/plop-templates/lit/lit.ts.hbs

@@ -5,8 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import {LitElement, html, property, CSSResultArray, TemplateResult} from 'lit';
-import { customElement } from 'lit/decorators.js';
+import {LitElement, html, CSSResultArray, TemplateResult} from 'lit';
+import { customElement, property} from 'lit/decorators.js';
 import {styles} from './nile-{{name}}.css';
 import NileElement from '../internal/nile-element';
 

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

@@ -6,7 +6,6 @@
  */
 
 import {
-  LitElement,
   html,
   CSSResultArray,
   TemplateResult,
@@ -20,16 +19,17 @@ import { ViewUpdate, placeholder } from '@codemirror/view';
 import { 
   Compartment,
   EditorState,
+  Extension
 } from '@codemirror/state';
 
 import { lineNumbers } from '@codemirror/view';
 import {
   javascript,
   javascriptLanguage,
-  scopeCompletionSource,
 } from '@codemirror/lang-javascript';
 import { sql } from '@codemirror/lang-sql';
 import { json } from '@codemirror/lang-json';
+import { html as htmlLang } from '@codemirror/lang-html';
 import { autocompletion,CompletionContext,CompletionResult } from '@codemirror/autocomplete';
 import NileElement from '../internal/nile-element';
 import { basicSetup } from './extensionSetup';
@@ -58,7 +58,9 @@ export class NileCodeEditor extends NileElement {
 
   @property({ type: Object, reflect: true , attribute: true }) customAutoCompletions: object | any = {};
 
-  @property({ type: String, reflect: true , attribute: true}) language: 'javascript' | 'sql' | 'json' = 'javascript';
+  @property({ type: Array, reflect: true , attribute: true }) customCompletionsPaths: string[] = [];
+
+  @property({ type: String, reflect: true , attribute: true}) language: 'javascript' | 'sql' | 'json' | 'html' = 'javascript';
 
   @property({ type: String, reflect: true , attribute: 'error-message' }) errorMessage: string = '';
 
@@ -157,7 +159,7 @@ export class NileCodeEditor extends NileElement {
         ]
       })
     }
-    if(changedProperties.has('customAutoCompletions') || changedProperties.has('suggestionBracketSupport') ){
+    if(changedProperties.has('customAutoCompletions') || changedProperties.has('customCompletionsPaths')){
       this.view.dispatch({ 
         effects: [
           this.customCompletionComp.reconfigure(javascriptLanguage.data.of({
@@ -225,7 +227,7 @@ export class NileCodeEditor extends NileElement {
     }));
 
     this.viewState = EditorState.create({
-      doc: !this.multiline ? this.convertToSingleLine(this.value) : this.value,
+      doc: !this.multiline ? convertToSingleLine(this.value) : this.value,
       extensions: [
         basicSetup({
           highlightActiveLine: false,
@@ -253,22 +255,89 @@ export class NileCodeEditor extends NileElement {
     return this.viewState
   }
 
-  singleLineMultiLineToggle() {
-    this.view.dispatch({
-      changes: {
-        from: 0,
-        to: this.view.state.doc.length,
-        insert: !this.multiline
-          ? this.convertToSingleLine(this.value)
-          : this.value,
-      },
-    });
+  customAutocomplete = (context: CompletionContext): CompletionResult | null => {
+    // Getting the valid last line, last text from the code editor
+    const text = context.state.doc.sliceString(0, context.pos);
+    const lastWord = text.split('\n').at(-1)?.split(' ').at(-1) || '';
+    const [textBeforeCursor, baseTextAfterSeperation] = splitStringAtLastSeparator(lastWord);
+    
+    return this.getNestedSuggestions(context, textBeforeCursor, baseTextAfterSeperation) 
+    || this.getTopLevelSuggestions(context, textBeforeCursor);
+  };
+
+  getNestedSuggestions(context: CompletionContext, textBeforeCursor: string, baseTextAfterSeperation: string) {
+    // Return early if not a valid path or not ending with . or [
+    if (!isValidPath(textBeforeCursor) || !['.', '['].includes(textBeforeCursor.at(-1)!)) {
+      return null;
+    }
+
+    const path = parsePath(textBeforeCursor);
+    if (!path) return null;
+
+    const textAfterSeperation = baseTextAfterSeperation.replace(/["'\[]/g, '');
+    const isInString = textAfterSeperation !== baseTextAfterSeperation;
+    const isBracket = textBeforeCursor.at(-1) === '[';
+
+    // Return null if we're in a string after a dot
+    if (textBeforeCursor.at(-1) === '.' && isInString) return null;
+
+    // Get nested properties and filter by text after separation if it exists
+    let resolved = resolveNestedProperties(this.customAutoCompletions, path);
+    if (!resolved || typeof resolved !== 'object') return null;
+
+    if (textAfterSeperation) {
+      resolved = Object.fromEntries(
+        Object.entries(resolved).filter(([key]) => 
+          key.toLowerCase().startsWith(textAfterSeperation.toLowerCase())
+        )
+      );
+    }
+
+    return {
+      from: context.pos - textAfterSeperation.length,
+      options: Object.keys(resolved).map(key => ({
+        label: key,
+        type: 'property',
+        info: `Key of ${path[path.length - 1]}`,
+        apply: !this.allowVariableInCustomSuggestion && (isBracket && !isInString) 
+          ? `'${key}'` 
+          : key,
+        boost: 999
+      }))
+    };
   }
 
-  convertToSingleLine(code: any) {
-    if (!code) return '';
-    // Remove line breaks and unnecessary whitespace
-    return code.replace(/\s+/g, ' ').trim();
+  getTopLevelSuggestions(context: CompletionContext,textBeforeCursor:string){
+    const baseMatch: any = textBeforeCursor.match(/([a-zA-Z_$][\w$]*)$/);
+    if (!baseMatch) return null;
+  
+    const optionsList = Object.keys(this.customAutoCompletions).filter(key => 
+      Object.keys(this.customAutoCompletions[key]).length && 
+      key.toLowerCase().startsWith(textBeforeCursor.toLowerCase())
+    );
+    
+    const options=optionsList.map((key) => ({
+      label: key,
+      type: 'property',
+      apply: key,
+      boost: 999
+    }))
+    if(this.customCompletionsPaths.length){
+      this.customCompletionsPaths
+      .filter(path=>path.toLocaleLowerCase().includes(textBeforeCursor.toLocaleLowerCase()))
+      .map(path=>{
+        options.push({
+          label: ''+path,
+          type: 'property',
+          apply: ''+path,
+          boost: 998
+        })
+      })
+    }
+    return {
+      from: context.pos - baseMatch[1].length,
+      options: options
+    }
   }
 
   emitAfterTimeout(value:any){
@@ -283,18 +352,32 @@ export class NileCodeEditor extends NileElement {
     });
     this.view.dispatch(transaction);
   }
-  
+
+  singleLineMultiLineToggle() {
+    this.view.dispatch({
+      changes: {
+        from: 0,
+        to: this.view.state.doc.length,
+        insert: !this.multiline
+          ? convertToSingleLine(this.value)
+          : this.value,
+      },
+    });
+  }
+
   //EXTENSION CONFIGURATIONS
   getLineNumbersExension() {
     return  (!this.multiline && this.lineNumbers) || (this.multiline && this.lineNumbersMultiline) ? lineNumbers() : [];
   }
   
-  getLanguageExtension(){
+  getLanguageExtension():Extension{
     switch(this.language){
       case 'sql':
         return sql();
       case 'json':
         return json();
+      case 'html':
+        return htmlLang();
       default:
         return javascript();   
     }
@@ -319,108 +402,6 @@ export class NileCodeEditor extends NileElement {
       tr.newDoc.lines > 1 ? [] : tr
     );
   }
-
-  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);
-    const [textBeforeCursor, baseTextAfterSeperation] = this.splitStringAtLastSeparator(text.split('\n').at(-1)?.split(' ').at(-1) + '')
-    const textAfterSeperation = baseTextAfterSeperation.replace(/["'\[]/g, '')
-
-    const isInString = textAfterSeperation != baseTextAfterSeperation;
-    const isBracket = textBeforeCursor.at(-1) == '[';
-    const isDot = textBeforeCursor.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) {
-        if (isDot && isInString) return null;
-        let resolved = this.resolveNestedProperties(this.customAutoCompletions, path);
-        if (textAfterSeperation) {
-          const obj: any = {}
-          Object.keys(resolved).forEach((key) => {
-            if (key.toLowerCase().startsWith(textAfterSeperation.toLowerCase())) {
-              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 - textAfterSeperation.length,
-            options: Object.keys(resolved).map((key) => ({
-              label: key,
-              type: 'property',
-              info: `Key of ${path[path.length - 1]}`,
-              apply: !this.allowVariableInCustomSuggestion && (isBracket && !isInString) ? "\'" + key + "\'" : key,
-              boost: 999
-            })),
-          };
-        }
-      }
-    }
-
-    // Match for top-level object suggestions, e.g., "a"
-    const baseMatch: any = textBeforeCursor.match(/([a-zA-Z_$][\w$]*)$/);
-    if (baseMatch) {
-      const optionsList=Object.keys(this.customAutoCompletions).filter(key=>key.toLowerCase().startsWith(textBeforeCursor.toLowerCase()));
-      return {
-        from: context.pos - baseMatch[1].length,
-        options: optionsList.map((key) => ({
-          label: key,
-          type: 'property',
-          apply: key,
-          boost: 999
-        }))
-      }
-    }
-    // Default to an empty list if no match
-    return null;
-  };
-
-  resolveNestedProperties = (obj:any, keys:any[]) => {
-    return keys.reduce((acc, key) => {
-      if (acc && typeof acc === 'object') {
-        return acc[key];
-      }
-      return null;
-    }, obj);
-  };
-
-  parsePath(text: string) {
-    const regex = /([a-zA-Z_$][\w$]*)(\[(?:[^\]]+)\]|\.[a-zA-Z_$][\w$]*)*/g;
-    const matches = [...text.matchAll(regex)];
-    if (matches.length > 0) {
-      const base = matches[0][1]; // The base object name
-      const keys = [base];
-      // Extract keys from dot or bracket notation
-      const pathMatches = text.match(/\[(.*?)\]|\.(\w+)/g) || [];
-      for (const match of pathMatches) {
-        if (match.startsWith('[')) {
-          keys.push(match.slice(1, -1).replace(/['"]/g, '')); // Remove brackets and quotes
-        } else if (match.startsWith('.')) {
-          keys.push(match.slice(1));
-        }
-      }
-      return keys;
-    }
-    return null;
-  };
-
-  isValidPath(path: string) {
-    // Regex to validate the format of the string
-    const regex = /^([a-zA-Z_$][\w$]*)(\.[a-zA-Z_$][\w$]*|\[\s*(['"]?[a-zA-Z0-9_$]*['"]?)\s*\])*([\.\[])?$/;
-    // Test the string against the regex
-    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)];
-  }
   /* #endregion */
 }
 
@@ -431,3 +412,51 @@ declare global {
     'nile-code-editor': NileCodeEditor;
   }
 }
+
+function parsePath(text: string) {
+  const regex = /([a-zA-Z_$][\w$]*)(\[(?:[^\]]+)\]|\.[a-zA-Z_$][\w$]*)*/g;
+  const matches = [...text.matchAll(regex)];
+  if (matches.length > 0) {
+    const base = matches[0][1]; // The base object name
+    const keys = [base];
+    // Extract keys from dot or bracket notation
+    const pathMatches = text.match(/\[(.*?)\]|\.(\w+)/g) || [];
+    for (const match of pathMatches) {
+      if (match.startsWith('[')) {
+        keys.push(match.slice(1, -1).replace(/['"]/g, '')); // Remove brackets and quotes
+      } else if (match.startsWith('.')) {
+        keys.push(match.slice(1));
+      }
+    }
+    return keys;
+  }
+  return null;
+};
+
+function 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)];
+}
+
+function resolveNestedProperties (obj:any, keys:any[]){
+  return keys.reduce((acc, key) => {
+    if (acc && typeof acc === 'object') {
+      return acc[key];
+    }
+    return null;
+  }, obj);
+};
+
+function isValidPath(path: string) {
+  // Regex to validate the format of the string
+  const regex = /^([a-zA-Z_$][\w$]*)(\.[a-zA-Z_$][\w$]*|\[\s*(['"]?[a-zA-Z0-9_$]*['"]?)\s*\])*([\.\[])?$/;
+  // Test the string against the regex
+  return regex.test(path);
+}
+
+function convertToSingleLine(code: string) {
+  if (!code) return '';
+  // Remove line breaks and unnecessary whitespace
+  return code.replace(/\s+/g, ' ').trim();
+}

package/vscode-html-custom-data.json

@@ -726,7 +726,7 @@
     },
     {
       "name": "nile-code-editor",
-      "description": "Nile icon component.\n\nEvents:\n\n  * `nile-focus` {`Event`} - \n\n  * `nile-blur` {`Event`} - \n\nAttributes:\n\n  * `value` {`string`} - \n\n  * `expandIcon` {`string`} - \n\n  * `placeholder` {`string`} - \n\n  * `customAutoCompletions` - \n\n  * `language` {`\"javascript\" | \"sql\" | \"json\"`} - \n\n  * `error-message` {`string`} - \n\n  * `error` {`boolean`} - \n\n  * `noborder` {`boolean`} - \n\n  * `multiline` {`boolean`} - \n\n  * `allowVariableInCustomSuggestion` {`boolean`} - \n\n  * `lineNumbers` {`boolean`} - \n\n  * `lineNumbersMultiline` {`boolean`} - \n\n  * `hasScroller` {`boolean`} - \n\n  * `expandable` {`boolean`} - \n\n  * `readonly` {`boolean`} - \n\n  * `debounce` {`boolean`} - \n\nProperties:\n\n  * `codeEditor` {`HTMLInputElement`} - \n\n  * `value` {`string`} - \n\n  * `expandIcon` {`string`} - \n\n  * `placeholder` {`string`} - \n\n  * `customAutoCompletions` - \n\n  * `language` {`\"javascript\" | \"sql\" | \"json\"`} - \n\n  * `errorMessage` {`string`} - \n\n  * `error` {`boolean`} - \n\n  * `noborder` {`boolean`} - \n\n  * `multiline` {`boolean`} - \n\n  * `allowVariableInCustomSuggestion` {`boolean`} - \n\n  * `lineNumbers` {`boolean`} - \n\n  * `lineNumbersMultiline` {`boolean`} - \n\n  * `hasScroller` {`boolean`} - \n\n  * `expandable` {`boolean`} - \n\n  * `readonly` {`boolean`} - \n\n  * `debounce` {`boolean`} - \n\n  * `view` - \n\n  * `viewState` - \n\n  * `timeOut` - \n\n  * `lineNumbersComp` - \n\n  * `restrictSingleLineComp` - \n\n  * `readOnlyComp` - \n\n  * `customCompletionComp` - \n\n  * `placeholderComp` - \n\n  * `insertBetweenCode` - \n\n  * `customAutocomplete` - \n\n  * `resolveNestedProperties` - \n\n  * `BUBBLES` {`boolean`} - \n\n  * `COMPOSED` {`boolean`} - \n\n  * `CANCELABLE` {`boolean`} - ",
+      "description": "Nile icon component.\n\nEvents:\n\n  * `nile-focus` {`Event`} - \n\n  * `nile-blur` {`Event`} - \n\nAttributes:\n\n  * `value` {`string`} - \n\n  * `expandIcon` {`string`} - \n\n  * `placeholder` {`string`} - \n\n  * `customAutoCompletions` - \n\n  * `customCompletionsPaths` {`string[]`} - \n\n  * `language` {`\"html\" | \"javascript\" | \"sql\" | \"json\"`} - \n\n  * `error-message` {`string`} - \n\n  * `error` {`boolean`} - \n\n  * `noborder` {`boolean`} - \n\n  * `multiline` {`boolean`} - \n\n  * `allowVariableInCustomSuggestion` {`boolean`} - \n\n  * `lineNumbers` {`boolean`} - \n\n  * `lineNumbersMultiline` {`boolean`} - \n\n  * `hasScroller` {`boolean`} - \n\n  * `expandable` {`boolean`} - \n\n  * `readonly` {`boolean`} - \n\n  * `debounce` {`boolean`} - \n\nProperties:\n\n  * `codeEditor` {`HTMLInputElement`} - \n\n  * `value` {`string`} - \n\n  * `expandIcon` {`string`} - \n\n  * `placeholder` {`string`} - \n\n  * `customAutoCompletions` - \n\n  * `customCompletionsPaths` {`string[]`} - \n\n  * `language` {`\"html\" | \"javascript\" | \"sql\" | \"json\"`} - \n\n  * `errorMessage` {`string`} - \n\n  * `error` {`boolean`} - \n\n  * `noborder` {`boolean`} - \n\n  * `multiline` {`boolean`} - \n\n  * `allowVariableInCustomSuggestion` {`boolean`} - \n\n  * `lineNumbers` {`boolean`} - \n\n  * `lineNumbersMultiline` {`boolean`} - \n\n  * `hasScroller` {`boolean`} - \n\n  * `expandable` {`boolean`} - \n\n  * `readonly` {`boolean`} - \n\n  * `debounce` {`boolean`} - \n\n  * `view` - \n\n  * `viewState` - \n\n  * `timeOut` - \n\n  * `lineNumbersComp` - \n\n  * `restrictSingleLineComp` - \n\n  * `readOnlyComp` - \n\n  * `customCompletionComp` - \n\n  * `placeholderComp` - \n\n  * `customAutocomplete` - \n\n  * `insertBetweenCode` - \n\n  * `BUBBLES` {`boolean`} - \n\n  * `COMPOSED` {`boolean`} - \n\n  * `CANCELABLE` {`boolean`} - ",
       "attributes": [
         {
           "name": "value",
@@ -744,10 +744,17 @@
           "name": "customAutoCompletions",
           "description": "`customAutoCompletions` - \n\nProperty: customAutoCompletions\n\nDefault: [object Object]"
         },
+        {
+          "name": "customCompletionsPaths",
+          "description": "`customCompletionsPaths` {`string[]`} - \n\nProperty: customCompletionsPaths\n\nDefault: "
+        },
         {
           "name": "language",
-          "description": "`language` {`\"javascript\" | \"sql\" | \"json\"`} - \n\nProperty: language\n\nDefault: javascript",
+          "description": "`language` {`\"html\" | \"javascript\" | \"sql\" | \"json\"`} - \n\nProperty: language\n\nDefault: javascript",
           "values": [
+            {
+              "name": "html"
+            },
             {
               "name": "javascript"
             },