cluaupp 1.5.2-cf → 2.0.0-beta.1

package/api/roblox-api.lock.json

@@ -1,9 +1,18 @@
 {
 	"schemaVersion": 2,
-	"profileHash": "81e280ef74182ccfe3087e5ded99e51d85cf9368e5d01102b19bda788a5f10bb",
+	"profileHash": "1f6a8b3a31a8e75c98b411542f4a82e3057496da51301fc00d2d88ae04d8bf7e",
 	"overridesHash": "4d9132f0307a553e92b8863663295b0ddb9fc7cad57db75a8fb7b7d1ab258f46",
 	"robloxApiVersion": "1",
 	"files": {
-		"api/generated/lsp-index.json": "58651ae79c0ce9a0abba227d5e53706eb7f2527c55dc7a9daf6a7d7cfa76ec11"
+		"include/clpp/generated/enums.clh": "9b86e6325e405acee840eb4a19551e7bff0812a724b0312ee5b597482ecfa0c2",
+		"include/clpp/datatypes.clh": "4c188f9d60f4fda8a6dce947ca16d23abff988bfd2e4d6ebfee567f16489079f",
+		"include/clpp/generated/instances.clh": "63ec7b18880ec345b9ede43ecbf0cf8e80bc5d7f2fd3e0e60aad827bef5c3ec3",
+		"include/clpp/roblox.clh": "5bb8ac8cd84ca662da9a8e14329875612707160b231c1a9d5fab759d21b824af",
+		"src/api.generated.js": "1443cb1fd7f8bbc51835cc0ef09b11d569f94ec3d6e734ff92f7c7ffb6fbe93f",
+		"api/generated/luau/enums.d.luau": "b59709c0cead596e2512fad56a8efb8d2e1a07488aa678218bce69f2a5b1ca0d",
+		"api/generated/luau/datatypes.d.luau": "555ce875e7c491a5a3c2eb90c4c2db7b56c7d3d41f10d9a7c2c667eb07f4fccc",
+		"api/generated/luau/classes.d.luau": "b1faf83c53c88217370094764d5e1f6a30a05501dd916f1b759ac37cb590e6b8",
+		"api/generated/luau/globals.d.luau": "44673b0daa8306aa2dd2e7c08c0c97c6e18a51926b00237ce0f1d262821d0f35",
+		"api/generated/lsp-index.json": "a0c5c91fa6be7348489ad473af3f8c442e6f184a037808c60ebe36aa058f3fef"
 	}
 }

package/bin/cluaupp.js

@@ -36,5 +36,7 @@ function runNativeIfPresent() {
 	return false;
 }
 
-runNativeIfPresent();
+// The Rust launcher still uses the removed `clpp api compile` protocol. Keep it opt-in
+// until it uses the in-package Roblox compiler too.
+if (process.env.CLUAUPP_USE_NATIVE === "1") runNativeIfPresent();
 require("../generated/cli.js");

package/editors/vscode/syntaxes/clpp.tmLanguage.json

@@ -20,24 +20,43 @@
   "repository": {
     "comments": {
       "patterns": [
-        { "name": "comment.line.double-slash.clpp", "match": "//.*$" },
-        { "name": "comment.block.clpp", "begin": "/\\*", "end": "\\*/" }
+        {
+          "name": "comment.line.clpp",
+          "match": "<<.*$"
+        },
+        {
+          "name": "comment.block.clpp",
+          "begin": "<<\\[",
+          "end": "\\]>>"
+        },
+        {
+          "name": "comment.line.legacy.clpp",
+          "match": "//.*$"
+        }
       ]
     },
     "directives": {
       "patterns": [
         {
-          "match": "^\\s*(#(pragma|define|ifdef|ifndef|endif))\\b.*$",
-          "name": "meta.preprocessor.clpp",
-          "captures": { "1": { "name": "keyword.control.directive.clpp" } }
+          "match": "^\\s*#pragma\\b.*$",
+          "name": "meta.preprocessor.clpp"
         }
       ]
     },
     "link": {
       "patterns": [
-        { "name": "keyword.control.link.clpp", "match": "^\\s*\\blink\\b" },
-        { "name": "keyword.control.link.as.clpp", "match": "\\b(as|from)\\b" },
-        { "name": "support.namespace.clpp", "match": "@(clpp|game)(?:\\.[A-Za-z_][A-Za-z0-9_]*)*" }
+        {
+          "name": "keyword.control.link.clpp",
+          "match": "^\\s*\\blink\\b"
+        },
+        {
+          "name": "keyword.control.link.as.clpp",
+          "match": "\\b(as|from)\\b"
+        },
+        {
+          "name": "support.namespace.clpp",
+          "match": "@(?:clpp|game|[A-Z][A-Za-z0-9_]*)(?:\\.[A-Za-z_][A-Za-z0-9_]*)*"
+        }
       ]
     },
     "attributes": {
@@ -46,29 +65,115 @@
     },
     "strings": {
       "patterns": [
-        { "name": "string.quoted.double.clpp", "begin": "\"", "end": "\"" },
-        { "name": "string.quoted.single.clpp", "begin": "'", "end": "'" },
-        { "name": "string.quoted.other.clpp", "begin": "`", "end": "`" }
+        {
+          "name": "string.quoted.double.clpp",
+          "begin": "\"",
+          "end": "\"",
+          "patterns": [
+            { "name": "constant.character.escape.clpp", "match": "\\\\." }
+          ]
+        },
+        {
+          "name": "string.quoted.single.clpp",
+          "begin": "'",
+          "end": "'",
+          "patterns": [
+            { "name": "constant.character.escape.clpp", "match": "\\\\." }
+          ]
+        },
+        {
+          "name": "string.quoted.other.clpp",
+          "begin": "`",
+          "end": "`",
+          "patterns": [
+            { "name": "constant.character.escape.clpp", "match": "\\\\[\\\\`{}]" },
+            {
+              "name": "meta.interpolation.clpp",
+              "begin": "\\{",
+              "end": "\\}",
+              "patterns": [
+                { "include": "#receiver" },
+                { "include": "#keywords" },
+                { "include": "#types" },
+                { "include": "#constants" },
+                { "include": "#numbers" },
+                { "include": "#operators" },
+                { "include": "#properties" }
+              ]
+            }
+          ]
+        }
       ]
     },
     "keywords": {
       "patterns": [
-        { "name": "keyword.control.clpp", "match": "\\b(if|else|guard|for|in|while|switch|case|default|break|return|match|spawn|parallel|async|await|link|as|from)\\b" },
-        { "name": "keyword.other.clpp", "match": "\\b(struct|class|namespace|using|template|typedef|enum|public|private|protected|static|const|constexpr|inline|extern|new)\\b" },
-        { "name": "storage.modifier.clpp", "match": "\\b(observable|signal|func)\\b" }
+        {
+          "name": "keyword.control.clpp",
+          "match": "\\b(if|else|guard|for|in|while|switch|case|default|break|return|match|spawn|parallel|async|await|link|as|from)\\b"
+        },
+        {
+          "name": "keyword.other.clpp",
+          "match": "\\b(struct|class|namespace|using|template|typedef|enum|public|private|protected|static|const|constexpr|inline|extern|new)\\b"
+        },
+        {
+          "name": "storage.modifier.clpp",
+          "match": "\\b(observable|signal|func)\\b"
+        },
+        {
+          "name": "support.function.builtin.clpp",
+          "match": "\\b(post|warn|report|GetService|static_cast|pcall|xpcall|to_string|to_number|to_bool|string_concat)\\b"
+        }
       ]
     },
     "types": {
       "patterns": [
-        { "name": "storage.type.clpp", "match": "\\b(void|int|float|double|bool|string|auto|func|array|dictionary|map|optional|Option|Result)\\b" }
+        {
+          "name": "storage.type.clpp",
+          "match": "\\b(void|int|float|double|bool|string|auto|func|array|dictionary|map|optional)\\b"
+        },
+        {
+          "name": "entity.name.type.clpp",
+          "match": "\\b([A-Z][A-Za-z0-9_]*)(?=\\s+[A-Za-z_])"
+        },
+        {
+          "name": "entity.name.type.clpp",
+          "match": "\\b([A-Z][A-Za-z0-9_]*)(?=\\s*::)"
+        },
+        {
+          "name": "entity.name.type.clpp",
+          "match": "(?<=\\b(?:struct|class|enum|new)\\s+)([A-Z][A-Za-z0-9_]*)"
+        },
+        {
+          "name": "entity.name.type.clpp",
+          "match": "(?<=<)\\s*(?:void|int|float|double|bool|string|[A-Z][A-Za-z0-9_]*)(?=\\s*>)"
+        }
       ]
     },
-    "constants": { "name": "constant.language.clpp", "match": "\\b(true|false|null|nullptr)\\b" },
-    "numbers": { "name": "constant.numeric.clpp", "match": "\\b\\d+(\\.\\d+)?\\b" },
+    "constants": {
+      "name": "constant.language.clpp",
+      "match": "\\b(true|false|null|nullptr)\\b"
+    },
+    "numbers": {
+      "name": "constant.numeric.clpp",
+      "match": "\\b\\d+(\\.\\d+)?\\b"
+    },
     "receiver": {
       "patterns": [
-        { "name": "keyword.other.receiver.clpp", "match": "@this\\b" },
-        { "match": "(@)([A-Za-z_][A-Za-z0-9_]*)", "captures": { "1": { "name": "keyword.other.receiver.clpp" }, "2": { "name": "variable.other.property.receiver.clpp" } } }
+        {
+          "name": "keyword.other.receiver.clpp",
+          "match": "@this\\b"
+        },
+        {
+          "match": "(@)([A-Za-z_][A-Za-z0-9_]*)",
+          "captures": {
+            "1": { "name": "keyword.other.receiver.clpp" },
+            "2": { "name": "variable.other.property.receiver.clpp" }
+          }
+        },
+        {
+          "name": "keyword.other.receiver.clpp",
+          "match": "\\bthis\\b"
+        }
       ]
     },
     "operators": {
@@ -77,14 +182,30 @@
         { "name": "keyword.operator.cleanup.clpp", "match": "~>" },
         { "name": "keyword.operator.scope.clpp", "match": "::" },
         { "name": "keyword.operator.arrow.clpp", "match": "=>" },
+        { "name": "keyword.operator.comparison.clpp", "match": "==|!=|<=|>=|<|>" },
+        { "name": "keyword.operator.logical.clpp", "match": "&&|\\|\\||!" },
         { "name": "keyword.operator.assignment.clpp", "match": "\\+=|-=|\\*=|/=|=" }
       ]
     },
     "properties": {
       "patterns": [
-        { "match": "\\.(?![:.])([A-Za-z_][A-Za-z0-9_]*)", "captures": { "1": { "name": "variable.other.property.clpp" } } }
+        {
+          "match": "\\.(?![:.])([A-Za-z_][A-Za-z0-9_]*)",
+          "captures": {
+            "1": { "name": "variable.other.property.clpp" }
+          }
+        },
+        {
+          "match": "(?<![.:]):(?![:])([A-Za-z_][A-Za-z0-9_]*)",
+          "captures": {
+            "1": { "name": "variable.other.property.clpp" }
+          }
+        }
       ]
     },
-    "functions": { "name": "entity.name.function.clpp", "match": "\\b([A-Za-z_][A-Za-z0-9_]*)\\s*(?=\\()" }
+    "functions": {
+      "name": "entity.name.function.clpp",
+      "match": "\\b([A-Za-z_][A-Za-z0-9_]*)\\s*(?=\\()"
+    }
   }
 }

package/examples/README.md

@@ -1,15 +1,15 @@
-# Sample game
+# Roblox example
 
-Same Roblox service tree as `cluaupp init` (`templates/game`). Language samples: [CL++ examples](https://github.com/KartzRbx/CLPP/tree/main/examples).
+[`game`](game/) uses the current CL++ `.clp` syntax and the same service layout as `cluaupp init`. Cluaupp compiles it to Luau without the independent CL++ VM executable.
 
-| Folder | Rojo | Tag |
+| Source | Rojo class | Destination |
 | --- | --- | --- |
-| `src/ServerScriptService/*.server.clpp` | Script | server |
-| `src/StarterPlayer/StarterPlayerScripts/*.client.clpp` | LocalScript | client |
-| `src/StarterPlayer/StarterCharacterScripts/*.client.clpp` | LocalScript (character) | client |
-| `src/ReplicatedStorage/Shared/*.clp` / `*.clh` | ModuleScript | none |
+| `src/ServerScriptService/*.server.clp` | Script | `ServerScriptService` |
+| `src/StarterPlayer/StarterPlayerScripts/*.client.clp` | LocalScript | `StarterPlayerScripts` |
+| `src/ReplicatedStorage/Shared/*.clp` | ModuleScript | `ReplicatedStorage.Shared` |
+
+The server and client scripts import the shared module through `link @ReplicatedStorage.Shared.GameInfo as GameInfo;`. Create another `.clp` file in that directory and use its path in a `link`; the next build discovers and emits it automatically.
 
 ```bash
-cd examples/game
-npx cluaupp build .
+node bin/cluaupp.js build examples/game
 ```

package/examples/game/cluaupp.config.json

@@ -1,6 +1,6 @@
 {
-	"rootDir": "Src",
+	"rootDir": "src",
 	"outDir": "out",
-	"strict": false,
+	"strict": true,
 	"architecture": false
 }

package/examples/game/default.project.json

@@ -4,31 +4,20 @@
 		"$className": "DataModel",
 		"ServerScriptService": {
 			"$className": "ServerScriptService",
-			"$path": "out/Server",
-			"Parallel": {
-				"$path": "out/Parallel"
-			}
+			"$path": "out/ServerScriptService"
 		},
 		"ReplicatedStorage": {
 			"$className": "ReplicatedStorage",
-			"Declarations": {
-				"$path": "out/Declarations"
-			},
-			"Include": {
-				"$path": "out/Include"
-			},
-			"Modules": {
-				"$path": "out/Modules"
-			},
 			"CluauppLibs": {
 				"$path": "libs"
-			}
+			},
+			"$path": "out/ReplicatedStorage"
 		},
 		"StarterPlayer": {
 			"$className": "StarterPlayer",
 			"StarterPlayerScripts": {
 				"$className": "StarterPlayerScripts",
-				"$path": "out/Client"
+				"$path": "out/StarterPlayer/StarterPlayerScripts"
 			}
 		},
 		"HttpService": {

package/examples/game/out/ReplicatedStorage/Shared/GameInfo.luau

@@ -0,0 +1,8 @@
+--!strict
+--!optimize 2
+-- cluaupp-source: ReplicatedStorage/Shared/GameInfo.clp
+-- Generated by Cluaupp 1.5.2-cf from ReplicatedStorage/Shared/GameInfo.clp. Do not edit: changes are overwritten on build.
+
+return table.freeze({
+	GAME_NAME = "Cluaupp example",
+})

package/examples/game/out/ReplicatedStorage/Shared/GameInfo.luau.map.json

@@ -0,0 +1,13 @@
+{
+	"version": 1,
+	"file": "GameInfo.luau",
+	"sourceRoot": "C:/Users/gtofr/OneDrive/Documentos/GitHub/Cluaupp/examples/game",
+	"sources": [
+		"ReplicatedStorage/Shared/GameInfo.clp"
+	],
+	"mappings": "AAAA",
+	"cluaupp": {
+		"source": "ReplicatedStorage/Shared/GameInfo.clp",
+		"generated": "out/ReplicatedStorage/Shared/GameInfo.luau"
+	}
+}

package/examples/game/out/ServerScriptService/Leaderstats.server.luau

@@ -0,0 +1,26 @@
+--!strict
+--!optimize 2
+-- cluaupp-source: ServerScriptService/Leaderstats.server.clp
+-- Generated by Cluaupp 1.5.2-cf from ServerScriptService/Leaderstats.server.clp. Do not edit: changes are overwritten on build.
+
+local Players = game:GetService("Players")
+
+local function BindLeaderstats(player: Player)
+	if player:FindFirstChild("leaderstats") ~= nil then
+		return
+	end
+	local stats: Folder = Instance.new("Folder")
+	stats.Parent = player
+	stats.Name = "leaderstats"
+	local coins: IntValue = Instance.new("IntValue")
+	coins.Parent = stats
+	coins.Name = "Coins"
+	coins.Value = 0
+end
+
+local players: Players = Players
+for _, __item1 in players:GetPlayers() do
+	local player = __item1 :: Player
+	BindLeaderstats(player)
+end
+players.PlayerAdded:Connect(BindLeaderstats)

package/examples/game/out/ServerScriptService/Leaderstats.server.luau.map.json

@@ -0,0 +1,13 @@
+{
+	"version": 1,
+	"file": "Leaderstats.server.luau",
+	"sourceRoot": "C:/Users/gtofr/OneDrive/Documentos/GitHub/Cluaupp/examples/game",
+	"sources": [
+		"ServerScriptService/Leaderstats.server.clp"
+	],
+	"mappings": "AAAA",
+	"cluaupp": {
+		"source": "ServerScriptService/Leaderstats.server.clp",
+		"generated": "out/ServerScriptService/Leaderstats.server.luau"
+	}
+}

package/examples/game/out/ServerScriptService/Main.server.luau

@@ -0,0 +1,15 @@
+--!strict
+--!optimize 2
+-- cluaupp-source: ServerScriptService/Main.server.clp
+-- Generated by Cluaupp 1.5.2-cf from ServerScriptService/Main.server.clp. Do not edit: changes are overwritten on build.
+
+local Players = game:GetService("Players")
+local ReplicatedStorage = game:GetService("ReplicatedStorage")
+
+local GameInfo = require(ReplicatedStorage:WaitForChild("Shared"):WaitForChild("GameInfo") :: ModuleScript)
+
+print("Cluaupp example" .. " server ready")
+local players: Players = Players
+players.PlayerAdded:Connect(function(player: Player)
+	print(player.Name .. " joined the game")
+end)

package/examples/game/out/ServerScriptService/Main.server.luau.map.json

@@ -0,0 +1,13 @@
+{
+	"version": 1,
+	"file": "Main.server.luau",
+	"sourceRoot": "C:/Users/gtofr/OneDrive/Documentos/GitHub/Cluaupp/examples/game",
+	"sources": [
+		"ServerScriptService/Main.server.clp"
+	],
+	"mappings": "AAAA",
+	"cluaupp": {
+		"source": "ServerScriptService/Main.server.clp",
+		"generated": "out/ServerScriptService/Main.server.luau"
+	}
+}

package/examples/game/out/StarterPlayer/StarterPlayerScripts/Main.client.luau

@@ -0,0 +1,10 @@
+--!strict
+--!optimize 2
+-- cluaupp-source: StarterPlayer/StarterPlayerScripts/Main.client.clp
+-- Generated by Cluaupp 1.5.2-cf from StarterPlayer/StarterPlayerScripts/Main.client.clp. Do not edit: changes are overwritten on build.
+
+local ReplicatedStorage = game:GetService("ReplicatedStorage")
+
+local GameInfo = require(ReplicatedStorage:WaitForChild("Shared"):WaitForChild("GameInfo") :: ModuleScript)
+
+print("Cluaupp example" .. " client ready")

package/examples/game/out/StarterPlayer/StarterPlayerScripts/Main.client.luau.map.json

@@ -0,0 +1,13 @@
+{
+	"version": 1,
+	"file": "Main.client.luau",
+	"sourceRoot": "C:/Users/gtofr/OneDrive/Documentos/GitHub/Cluaupp/examples/game",
+	"sources": [
+		"StarterPlayer/StarterPlayerScripts/Main.client.clp"
+	],
+	"mappings": "AAAA",
+	"cluaupp": {
+		"source": "StarterPlayer/StarterPlayerScripts/Main.client.clp",
+		"generated": "out/StarterPlayer/StarterPlayerScripts/Main.client.luau"
+	}
+}

package/examples/game/src/ReplicatedStorage/Shared/GameInfo.clp

@@ -0,0 +1 @@
+const GAME_NAME = "Cluaupp example";

package/examples/game/src/ServerScriptService/Leaderstats.server.clp

@@ -0,0 +1,18 @@
+link @clpp.roblox;
+
+func BindLeaderstats(Player player) {
+	if (player.FindFirstChild("leaderstats") != null) {
+		return;
+	}
+	Folder stats = new Folder(player);
+	stats.Name = "leaderstats";
+	IntValue coins = new IntValue(stats);
+	coins.Name = "Coins";
+	coins.Value = 0;
+}
+
+Players players = GetService<Players>();
+for (Player player in players.GetPlayers()) {
+	BindLeaderstats(player);
+}
+players.PlayerAdded ~> BindLeaderstats;

package/examples/game/src/ServerScriptService/Main.server.clp

@@ -0,0 +1,9 @@
+link @clpp.roblox;
+link @ReplicatedStorage.Shared.GameInfo as GameInfo;
+
+post(GameInfo.GAME_NAME .: " server ready");
+
+Players players = GetService<Players>();
+players.PlayerAdded ~> func (Player player) {
+	post(player.Name .: " joined the game");
+};

package/examples/game/src/StarterPlayer/StarterPlayerScripts/Main.client.clp

@@ -0,0 +1,4 @@
+link @clpp.roblox;
+link @ReplicatedStorage.Shared.GameInfo as GameInfo;
+
+post(GameInfo.GAME_NAME .: " client ready");

package/generated/api/build-profile.js

@@ -109,7 +109,7 @@ function writeProfileCache(profile, outPath) {
 function profileContentHash(profile) {
     const clone = { ...profile, sources: { ...profile.sources } };
     for (const key of Object.keys(clone.sources)) {
-        clone.sources[key] = { ...clone.sources[key], loadedAt: "" };
+        clone.sources[key] = { ...clone.sources[key], loadedAt: "", path: "" };
     }
     return (0, resolver_js_1.hashBuffer)(JSON.stringify(clone));
 }

package/generated/api/loader.js

@@ -22,7 +22,7 @@ function loadJsonFile(id, filePath) {
         meta: {
             id,
             path: absolute,
-            hash: (0, resolver_js_1.hashBuffer)(raw),
+            hash: (0, resolver_js_1.hashBuffer)(text.replace(/\r\n/g, "\n")),
             loadedAt: new Date().toISOString(),
             version: typeof data.Version !== "undefined"
                 ? data.Version
@@ -51,7 +51,7 @@ function overridesHash() {
         if (!name.endsWith(".json")) {
             continue;
         }
-        parts.push(name, node_fs_1.default.readFileSync(node_path_1.default.join(dir, name), "utf8"));
+        parts.push(name, node_fs_1.default.readFileSync(node_path_1.default.join(dir, name), "utf8").replace(/\r\n/g, "\n"));
     }
     return (0, resolver_js_1.hashBuffer)(parts.join("\n"));
 }