@mojir/lits 2.1.19 → 2.1.20

package/dist/cli/cli.js

@@ -92,7 +92,7 @@ typeof SuppressedError === "function" ? SuppressedError : function (error, suppr
     return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
 };
 
-var version = "2.1.19";
+var version = "2.1.20";
 
 function getCodeMarker(sourceCodeInfo) {
     if (!sourceCodeInfo.position || !sourceCodeInfo.code)
@@ -14822,18 +14822,25 @@ var Parser = /** @class */ (function () {
     return Parser;
 }());
 
-var autoCompleteTokenTypes = [
-    'Operator',
-    'ReservedSymbol',
-    'Symbol',
-];
 var litsCommands = new Set(__spreadArray(__spreadArray([], __read(normalExpressionKeys), false), __read(specialExpressionKeys), false));
 // TODO: replace with get suggestions function
 var AutoCompleter = /** @class */ (function () {
-    function AutoCompleter(tokenStream, params) {
-        this.searchPrefix = '';
+    function AutoCompleter(originalProgram, originalPosition, lits, params) {
+        this.originalProgram = originalProgram;
+        this.originalPosition = originalPosition;
+        this.prefixProgram = '';
+        this.suffixProgram = '';
+        this.searchString = '';
         this.suggestions = [];
         this.suggestionIndex = null;
+        var partialProgram = this.originalProgram.slice(0, this.originalPosition);
+        var tokenStream = null;
+        try {
+            tokenStream = lits.tokenize(partialProgram);
+        }
+        catch (_a) {
+            // do nothing
+        }
         if (!tokenStream) {
             return;
         }
@@ -14841,14 +14848,28 @@ var AutoCompleter = /** @class */ (function () {
         if (!lastToken) {
             return;
         }
-        var _a = __read(lastToken, 2), tokenType = _a[0], tokenValue = _a[1];
-        if (!autoCompleteTokenTypes.includes(tokenType)) {
-            return;
-        }
-        this.searchPrefix = tokenValue;
-        this.generateSuggestions(params);
+        this.searchString = lastToken[1];
+        this.prefixProgram = this.originalProgram.slice(0, this.originalPosition - this.searchString.length);
+        this.suffixProgram = this.originalProgram.slice(this.prefixProgram.length + this.searchString.length);
+        this.originalProgram.slice(this.prefixProgram.length + this.searchString.length);
+        this.suggestions = this.generateSuggestions(params);
     }
     AutoCompleter.prototype.getNextSuggestion = function () {
+        return this.getAutoCompleteSuggestionResult(this.getNextSuggestionSymbol());
+    };
+    AutoCompleter.prototype.getPreviousSuggestion = function () {
+        return this.getAutoCompleteSuggestionResult(this.getPreviousSuggestionSymbol());
+    };
+    AutoCompleter.prototype.getAutoCompleteSuggestionResult = function (suggestion) {
+        if (suggestion === null) {
+            return null;
+        }
+        return {
+            program: this.prefixProgram + suggestion + this.suffixProgram,
+            position: this.prefixProgram.length + suggestion.length,
+        };
+    };
+    AutoCompleter.prototype.getNextSuggestionSymbol = function () {
         if (this.suggestions.length === 0) {
             return null;
         }
@@ -14861,12 +14882,9 @@ var AutoCompleter = /** @class */ (function () {
                 this.suggestionIndex = 0;
             }
         }
-        return {
-            suggestion: this.suggestions[this.suggestionIndex],
-            searchPattern: this.searchPrefix,
-        };
+        return this.suggestions[this.suggestionIndex];
     };
-    AutoCompleter.prototype.getPreviousSuggestion = function () {
+    AutoCompleter.prototype.getPreviousSuggestionSymbol = function () {
         if (this.suggestions.length === 0) {
             return null;
         }
@@ -14879,41 +14897,38 @@ var AutoCompleter = /** @class */ (function () {
                 this.suggestionIndex = this.suggestions.length - 1;
             }
         }
-        return {
-            suggestion: this.suggestions[this.suggestionIndex],
-            searchPattern: this.searchPrefix,
-        };
+        return this.suggestions[this.suggestionIndex];
     };
     AutoCompleter.prototype.getSuggestions = function () {
         return __spreadArray([], __read(this.suggestions), false);
     };
-    AutoCompleter.prototype.getSearchPrefix = function () {
-        return this.searchPrefix;
+    AutoCompleter.prototype.getSearchString = function () {
+        return this.searchString;
     };
     AutoCompleter.prototype.generateSuggestions = function (params) {
         var _this = this;
         var _a, _b, _c, _d;
         var suggestions = new Set();
         litsCommands.forEach(function (name) {
-            if (name.startsWith(_this.searchPrefix)) {
+            if (name.startsWith(_this.searchString)) {
                 suggestions.add(name);
             }
         });
         Object.keys((_a = params.globalContext) !== null && _a !== void 0 ? _a : {})
-            .filter(function (name) { return name.startsWith(_this.searchPrefix); })
+            .filter(function (name) { return name.startsWith(_this.searchString); })
             .forEach(function (name) { return suggestions.add(name); });
         (_b = params.contexts) === null || _b === void 0 ? void 0 : _b.forEach(function (context) {
             Object.keys(context)
-                .filter(function (name) { return name.startsWith(_this.searchPrefix); })
+                .filter(function (name) { return name.startsWith(_this.searchString); })
                 .forEach(function (name) { return suggestions.add(name); });
         });
         Object.keys((_c = params.jsFunctions) !== null && _c !== void 0 ? _c : {})
-            .filter(function (name) { return name.startsWith(_this.searchPrefix); })
+            .filter(function (name) { return name.startsWith(_this.searchString); })
             .forEach(function (name) { return suggestions.add(name); });
         Object.keys((_d = params.values) !== null && _d !== void 0 ? _d : {})
-            .filter(function (name) { return name.startsWith(_this.searchPrefix); })
+            .filter(function (name) { return name.startsWith(_this.searchString); })
             .forEach(function (name) { return suggestions.add(name); });
-        this.suggestions = __spreadArray([], __read(suggestions), false).sort(function (a, b) { return a.localeCompare(b); });
+        return __spreadArray([], __read(suggestions), false).sort(function (a, b) { return a.localeCompare(b); });
     };
     return AutoCompleter;
 }());
@@ -15093,15 +15108,9 @@ var Lits = /** @class */ (function () {
         (_a = this.astCache) === null || _a === void 0 ? void 0 : _a.set(program, ast);
         return ast;
     };
-    Lits.prototype.getAutoCompleter = function (partialProgram, params) {
+    Lits.prototype.getAutoCompleter = function (program, position, params) {
         if (params === void 0) { params = {}; }
-        try {
-            var tokenStream = this.tokenize(partialProgram);
-            return new AutoCompleter(tokenStream, params);
-        }
-        catch (_a) {
-            return new AutoCompleter(null, params);
-        }
+        return new AutoCompleter(program, position, this, params);
     };
     return Lits;
 }());

package/dist/cli/src/AutoCompleter/AutoCompleter.d.ts

@@ -1,17 +1,23 @@
-import type { ContextParams } from '../Lits/Lits';
-import type { TokenStream } from '../tokenizer/tokenize';
+import type { ContextParams, Lits } from '../Lits/Lits';
 export type AutoCompleteSuggestion = {
-    suggestion: string;
-    searchPattern: string;
+    program: string;
+    position: number;
 };
 export declare class AutoCompleter {
-    private searchPrefix;
+    readonly originalProgram: string;
+    readonly originalPosition: number;
+    private prefixProgram;
+    private suffixProgram;
+    private searchString;
     private suggestions;
     private suggestionIndex;
-    constructor(tokenStream: TokenStream | null, params: ContextParams);
+    constructor(originalProgram: string, originalPosition: number, lits: Lits, params: ContextParams);
     getNextSuggestion(): AutoCompleteSuggestion | null;
     getPreviousSuggestion(): AutoCompleteSuggestion | null;
+    private getAutoCompleteSuggestionResult;
+    private getNextSuggestionSymbol;
+    private getPreviousSuggestionSymbol;
     getSuggestions(): string[];
-    getSearchPrefix(): string;
+    getSearchString(): string;
     private generateSuggestions;
 }

package/dist/cli/src/Lits/Lits.d.ts

@@ -47,6 +47,6 @@ export declare class Lits {
     apply(fn: LitsFunction, fnParams: unknown[], params?: ContextParams): Any;
     private generateApplyFunctionCall;
     private generateAst;
-    getAutoCompleter(partialProgram: string, params?: ContextParams): AutoCompleter;
+    getAutoCompleter(program: string, position: number, params?: ContextParams): AutoCompleter;
 }
 export {};

package/dist/index.esm.js

@@ -14859,18 +14859,25 @@ var Parser = /** @class */ (function () {
     return Parser;
 }());
 
-var autoCompleteTokenTypes = [
-    'Operator',
-    'ReservedSymbol',
-    'Symbol',
-];
 var litsCommands = new Set(__spreadArray(__spreadArray([], __read(normalExpressionKeys), false), __read(specialExpressionKeys), false));
 // TODO: replace with get suggestions function
 var AutoCompleter = /** @class */ (function () {
-    function AutoCompleter(tokenStream, params) {
-        this.searchPrefix = '';
+    function AutoCompleter(originalProgram, originalPosition, lits, params) {
+        this.originalProgram = originalProgram;
+        this.originalPosition = originalPosition;
+        this.prefixProgram = '';
+        this.suffixProgram = '';
+        this.searchString = '';
         this.suggestions = [];
         this.suggestionIndex = null;
+        var partialProgram = this.originalProgram.slice(0, this.originalPosition);
+        var tokenStream = null;
+        try {
+            tokenStream = lits.tokenize(partialProgram);
+        }
+        catch (_a) {
+            // do nothing
+        }
         if (!tokenStream) {
             return;
         }
@@ -14878,14 +14885,28 @@ var AutoCompleter = /** @class */ (function () {
         if (!lastToken) {
             return;
         }
-        var _a = __read(lastToken, 2), tokenType = _a[0], tokenValue = _a[1];
-        if (!autoCompleteTokenTypes.includes(tokenType)) {
-            return;
-        }
-        this.searchPrefix = tokenValue;
-        this.generateSuggestions(params);
+        this.searchString = lastToken[1];
+        this.prefixProgram = this.originalProgram.slice(0, this.originalPosition - this.searchString.length);
+        this.suffixProgram = this.originalProgram.slice(this.prefixProgram.length + this.searchString.length);
+        this.originalProgram.slice(this.prefixProgram.length + this.searchString.length);
+        this.suggestions = this.generateSuggestions(params);
     }
     AutoCompleter.prototype.getNextSuggestion = function () {
+        return this.getAutoCompleteSuggestionResult(this.getNextSuggestionSymbol());
+    };
+    AutoCompleter.prototype.getPreviousSuggestion = function () {
+        return this.getAutoCompleteSuggestionResult(this.getPreviousSuggestionSymbol());
+    };
+    AutoCompleter.prototype.getAutoCompleteSuggestionResult = function (suggestion) {
+        if (suggestion === null) {
+            return null;
+        }
+        return {
+            program: this.prefixProgram + suggestion + this.suffixProgram,
+            position: this.prefixProgram.length + suggestion.length,
+        };
+    };
+    AutoCompleter.prototype.getNextSuggestionSymbol = function () {
         if (this.suggestions.length === 0) {
             return null;
         }
@@ -14898,12 +14919,9 @@ var AutoCompleter = /** @class */ (function () {
                 this.suggestionIndex = 0;
             }
         }
-        return {
-            suggestion: this.suggestions[this.suggestionIndex],
-            searchPattern: this.searchPrefix,
-        };
+        return this.suggestions[this.suggestionIndex];
     };
-    AutoCompleter.prototype.getPreviousSuggestion = function () {
+    AutoCompleter.prototype.getPreviousSuggestionSymbol = function () {
         if (this.suggestions.length === 0) {
             return null;
         }
@@ -14916,41 +14934,38 @@ var AutoCompleter = /** @class */ (function () {
                 this.suggestionIndex = this.suggestions.length - 1;
             }
         }
-        return {
-            suggestion: this.suggestions[this.suggestionIndex],
-            searchPattern: this.searchPrefix,
-        };
+        return this.suggestions[this.suggestionIndex];
     };
     AutoCompleter.prototype.getSuggestions = function () {
         return __spreadArray([], __read(this.suggestions), false);
     };
-    AutoCompleter.prototype.getSearchPrefix = function () {
-        return this.searchPrefix;
+    AutoCompleter.prototype.getSearchString = function () {
+        return this.searchString;
     };
     AutoCompleter.prototype.generateSuggestions = function (params) {
         var _this = this;
         var _a, _b, _c, _d;
         var suggestions = new Set();
         litsCommands.forEach(function (name) {
-            if (name.startsWith(_this.searchPrefix)) {
+            if (name.startsWith(_this.searchString)) {
                 suggestions.add(name);
             }
         });
         Object.keys((_a = params.globalContext) !== null && _a !== void 0 ? _a : {})
-            .filter(function (name) { return name.startsWith(_this.searchPrefix); })
+            .filter(function (name) { return name.startsWith(_this.searchString); })
             .forEach(function (name) { return suggestions.add(name); });
         (_b = params.contexts) === null || _b === void 0 ? void 0 : _b.forEach(function (context) {
             Object.keys(context)
-                .filter(function (name) { return name.startsWith(_this.searchPrefix); })
+                .filter(function (name) { return name.startsWith(_this.searchString); })
                 .forEach(function (name) { return suggestions.add(name); });
         });
         Object.keys((_c = params.jsFunctions) !== null && _c !== void 0 ? _c : {})
-            .filter(function (name) { return name.startsWith(_this.searchPrefix); })
+            .filter(function (name) { return name.startsWith(_this.searchString); })
             .forEach(function (name) { return suggestions.add(name); });
         Object.keys((_d = params.values) !== null && _d !== void 0 ? _d : {})
-            .filter(function (name) { return name.startsWith(_this.searchPrefix); })
+            .filter(function (name) { return name.startsWith(_this.searchString); })
             .forEach(function (name) { return suggestions.add(name); });
-        this.suggestions = __spreadArray([], __read(suggestions), false).sort(function (a, b) { return a.localeCompare(b); });
+        return __spreadArray([], __read(suggestions), false).sort(function (a, b) { return a.localeCompare(b); });
     };
     return AutoCompleter;
 }());
@@ -15130,15 +15145,9 @@ var Lits = /** @class */ (function () {
         (_a = this.astCache) === null || _a === void 0 ? void 0 : _a.set(program, ast);
         return ast;
     };
-    Lits.prototype.getAutoCompleter = function (partialProgram, params) {
+    Lits.prototype.getAutoCompleter = function (program, position, params) {
         if (params === void 0) { params = {}; }
-        try {
-            var tokenStream = this.tokenize(partialProgram);
-            return new AutoCompleter(tokenStream, params);
-        }
-        catch (_a) {
-            return new AutoCompleter(null, params);
-        }
+        return new AutoCompleter(program, position, this, params);
     };
     return Lits;
 }());