cluaupp 1.4.1 → 1.5.0

package/generated/lsp.js

@@ -3,22 +3,133 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.start = start;
 const node_1 = require("vscode-languageserver/node");
 const vscode_languageserver_textdocument_1 = require("vscode-languageserver-textdocument");
+const language_js_1 = require("./flare/language.js");
 const package_info_js_1 = require("./package-info.js");
+const KIND = {
+    keyword: node_1.CompletionItemKind.Keyword,
+    type: node_1.CompletionItemKind.TypeParameter,
+    snippet: node_1.CompletionItemKind.Snippet,
+    value: node_1.CompletionItemKind.EnumMember,
+    field: node_1.CompletionItemKind.Field,
+};
+const SEVERITY = {
+    error: node_1.DiagnosticSeverity.Error,
+    warning: node_1.DiagnosticSeverity.Warning,
+    hint: node_1.DiagnosticSeverity.Hint,
+};
+const SYMBOL = {
+    packet: node_1.SymbolKind.Event,
+    query: node_1.SymbolKind.Method,
+    option: node_1.SymbolKind.Namespace,
+};
+function flareDiagnostics(document) {
+    return (0, language_js_1.diagnoseFlare)(document.getText(), document.uri).map((item) => ({
+        range: {
+            start: { line: item.line, character: item.start },
+            end: { line: item.line, character: Math.max(item.end, item.start + 1) },
+        },
+        message: item.message,
+        severity: SEVERITY[item.severity],
+        source: "flare",
+    }));
+}
 function start(_options = {}) {
     const connection = (0, node_1.createConnection)(node_1.ProposedFeatures.all);
     const documents = new node_1.TextDocuments(vscode_languageserver_textdocument_1.TextDocument);
     connection.onInitialize(() => ({
         capabilities: {
-            textDocumentSync: node_1.TextDocumentSyncKind.Full,
+            textDocumentSync: node_1.TextDocumentSyncKind.Incremental,
+            completionProvider: {
+                triggerCharacters: [" ", "(", ",", ">", "="],
+                resolveProvider: false,
+            },
+            hoverProvider: true,
+            documentSymbolProvider: true,
+            signatureHelpProvider: {
+                triggerCharacters: ["(", ","],
+            },
         },
-        serverInfo: { name: "cluaupp", version: package_info_js_1.pkg.version },
+        serverInfo: { name: "cluaupp-flare", version: package_info_js_1.pkg.version },
     }));
-    const clear = (uri) => {
-        connection.sendDiagnostics({ uri, diagnostics: [] });
+    const publish = (document) => {
+        if (!(0, language_js_1.isFlareDocument)(document.uri)) {
+            connection.sendDiagnostics({ uri: document.uri, diagnostics: [] });
+            return;
+        }
+        connection.sendDiagnostics({ uri: document.uri, diagnostics: flareDiagnostics(document) });
     };
-    documents.onDidOpen((event) => clear(event.document.uri));
-    documents.onDidChangeContent((event) => clear(event.document.uri));
-    documents.onDidClose((event) => clear(event.document.uri));
+    documents.onDidOpen((event) => publish(event.document));
+    documents.onDidChangeContent((event) => publish(event.document));
+    documents.onDidClose((event) => {
+        connection.sendDiagnostics({ uri: event.document.uri, diagnostics: [] });
+    });
+    connection.onCompletion((params) => {
+        const document = documents.get(params.textDocument.uri);
+        if (!document || !(0, language_js_1.isFlareDocument)(document.uri)) {
+            return [];
+        }
+        return (0, language_js_1.completionsAt)(document.getText(), params.position.line, params.position.character).map((item) => ({
+            label: item.label,
+            kind: KIND[item.kind],
+            detail: item.detail,
+            documentation: { kind: node_1.MarkupKind.Markdown, value: item.documentation },
+            insertText: item.insertText,
+            insertTextFormat: item.snippet ? 2 : 1,
+            sortText: item.sortText,
+        }));
+    });
+    connection.onHover((params) => {
+        const document = documents.get(params.textDocument.uri);
+        if (!document || !(0, language_js_1.isFlareDocument)(document.uri)) {
+            return null;
+        }
+        const hover = (0, language_js_1.hoverAt)(document.getText(), params.position.line, params.position.character);
+        if (!hover) {
+            return null;
+        }
+        return {
+            contents: { kind: node_1.MarkupKind.Markdown, value: hover.contents },
+            range: {
+                start: { line: params.position.line, character: hover.start },
+                end: { line: params.position.line, character: hover.end },
+            },
+        };
+    });
+    connection.onDocumentSymbol((params) => {
+        const document = documents.get(params.textDocument.uri);
+        if (!document || !(0, language_js_1.isFlareDocument)(document.uri)) {
+            return [];
+        }
+        return (0, language_js_1.symbolsIn)(document.getText()).map((symbol) => ({
+            name: symbol.name,
+            detail: symbol.detail,
+            kind: SYMBOL[symbol.kind],
+            range: {
+                start: { line: symbol.line, character: 0 },
+                end: { line: symbol.line, character: Math.max(symbol.end, 1) },
+            },
+            selectionRange: {
+                start: { line: symbol.line, character: symbol.start },
+                end: { line: symbol.line, character: Math.max(symbol.end, symbol.start + 1) },
+            },
+        }));
+    });
+    connection.onSignatureHelp((params) => {
+        const document = documents.get(params.textDocument.uri);
+        if (!document || !(0, language_js_1.isFlareDocument)(document.uri)) {
+            return null;
+        }
+        const signature = (0, language_js_1.signatureAt)(document.getText(), params.position.line, params.position.character);
+        if (!signature) {
+            return null;
+        }
+        const info = node_1.SignatureInformation.create(signature.label, signature.documentation, ...signature.parameters.map((parameter) => node_1.ParameterInformation.create(parameter.label, parameter.documentation)));
+        return {
+            signatures: [info],
+            activeSignature: 0,
+            activeParameter: signature.activeParameter,
+        };
+    });
     documents.listen(connection);
     connection.listen();
 }

package/include/clpp/libs/roster.clh

@@ -5,7 +5,10 @@
 // Table = u16 count + key/value pairs. Array = u16 len + values. Methods also work as Roster::X(rawTable).
 
 struct Roster {
+	// Construct with `new Roster()` / `new Roster(table)` — emits Luau Roster.new.
+	// `New` is the CL++ name because `new` is a keyword.
 	static Roster New();
+	static Roster New(auto initial);
 
 	int Size();
 	int Length();
@@ -13,6 +16,7 @@ struct Roster {
 	auto GetData();
 
 	auto At(int index);
+	// Array value search (1-based index). Dictionary keys: Has / Get / Set / Remove.
 	int Find(auto value);
 	int Find(auto value, int initPos);
 	int Find(auto value, int initPos, int maxPos);
@@ -23,6 +27,7 @@ struct Roster {
 	auto Shift();
 	int Unshift(auto value);
 	auto RemoveAt(int index);
+	Roster Remove(auto key);
 
 	Roster Map(func mapper);
 	Roster Filter(func predicate);
@@ -74,6 +79,7 @@ struct Roster {
 	static auto Shift(auto data);
 	static int Unshift(auto data, auto value);
 	static auto RemoveAt(auto data, int index);
+	static Roster Remove(auto data, auto key);
 	static Roster Map(auto data, func mapper);
 	static Roster Filter(auto data, func predicate);
 	static auto Reduce(auto data, func reducer, auto initial);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "cluaupp",
-	"version": "1.4.1",
+	"version": "1.5.0",
 	"description": "Cluaupp toolchain — compile CL++ to Luau with Rojo and CluauppLibs.",
 	"author": "KartzDev",
 	"license": "MIT",

package/runtime/Roster/init.luau

@@ -352,6 +352,12 @@ function Roster.RemoveAt(source: any, index: number): any
 	return table.remove(unwrap(source), index)
 end
 
+function Roster.Remove(source: any, key: any): any
+	local data = unwrap(source)
+	data[key] = nil
+	return asRoster(source, data)
+end
+
 function Roster.Map(source: any, mapper: (value: any, index: any) -> any): any
 	local data = unwrap(source)
 	local result = {}

package/src/cli.ts

@@ -92,7 +92,7 @@ program
 
 program
 	.command("lsp")
-	.description("Language server stdio (JSON-RPC). Use `clpp install` for CL++ IntelliSense.")
+	.description("Language server stdio — Flare `.flare` IntelliSense. CL++ still uses `clpp setup`.")
 	.argument("[folder]", "project folder", ".")
 	.action((folder: string) => {
 		startLsp({ projectRoot: path.resolve(process.cwd(), folder) });
@@ -101,7 +101,7 @@ program
 program
 	.command("intellisense")
 	.alias("intelisense")
-	.description("Point the editor at CL++ (`clpp install`)")
+	.description("Install Flare IntelliSense and point CL++ at `clpp setup`")
 	.argument("[folder]", "project folder", ".")
 	.action(async (folder: string) => {
 		try {

package/src/flare/index.ts

@@ -5,8 +5,27 @@ import { parseFlare } from "./parse.js";
 import type { FlareEmitResult, FlareSchema } from "./types.js";
 
 export type { FlareEmitResult, FlareSchema } from "./types.js";
-export { parseFlare } from "./parse.js";
 export { emitFlare, emitFlareHeader, emitFlareLuau } from "./emit.js";
+export { parseFlare, FLARE_TYPE_ALIASES, FLARE_IDENT } from "./parse.js";
+export {
+	analyzeFlare,
+	completionsAt,
+	diagnoseFlare,
+	hoverAt,
+	isFlareDocument,
+	signatureAt,
+	symbolsIn,
+	FLARE_CANONICAL_TYPES,
+	FLARE_TYPE_DOCS,
+} from "./language.js";
+export type {
+	FlareAnalysis,
+	FlareCompletion,
+	FlareDiagnostic,
+	FlareHover,
+	FlareSignature,
+	FlareSymbol,
+} from "./language.js";
 
 export function isFlareFile(fileName: string): boolean {
 	return path.extname(fileName).toLowerCase() === ".flare";