@typetorch/framework 0.5.3 → 0.5.4

package/out/assets/dom.d.ts

@@ -13,5 +13,13 @@ export declare function resolveParent(path: string, create: boolean): Instance |
  * cloning a UI template into PlayerGui) keep the tag and the attributes but live elsewhere, so they never count.
  */
 export declare function isLiveCopy(instance: Instance): boolean;
+/**
+ * Copies the CollectionService tags of `from` and its descendants onto the instances at the same place in `to` (matched
+ * by name, and by order among siblings of the same name); AssetSync's own `__typetorch_asset:` tags stay out. A loaded
+ * hot-asset version arrives without the tags its place copy has (2026-10-13: a game that finds its UI by tag lost it
+ * on every server that loaded the uploads), so the load gives them back from the place's copy before it goes live.
+ * Returns how many tags were added.
+ */
+export declare function restoreTags(from: Instance, to: Instance): number;
 /** The live copies tagged for `key` (normally one; two for a moment while a new version replaces the old). */
 export declare function liveCopies(key: string): Instance[];

package/out/assets/dom.luau

@@ -2,6 +2,7 @@
 local TS = _G[script]
 local CollectionService = TS.import(script, TS.getModule(script, "@rbxts", "services")).CollectionService
 local _manifest = TS.import(script, script.Parent, "manifest")
+local ASSET_TAG_PREFIX = _manifest.ASSET_TAG_PREFIX
 local assetTag = _manifest.assetTag
 local ATTR_PATH = _manifest.ATTR_PATH
 local pathSegments = _manifest.pathSegments
@@ -73,6 +74,68 @@ local function isLiveCopy(instance)
 	local parent = instance.Parent
 	return path ~= nil and parent ~= nil and resolveParent(path, false) == parent
 end
+--[[
+	*
+	 * Copies the CollectionService tags of `from` and its descendants onto the instances at the same place in `to` (matched
+	 * by name, and by order among siblings of the same name); AssetSync's own `__typetorch_asset:` tags stay out. A loaded
+	 * hot-asset version arrives without the tags its place copy has (2026-10-13: a game that finds its UI by tag lost it
+	 * on every server that loaded the uploads), so the load gives them back from the place's copy before it goes live.
+	 * Returns how many tags were added.
+	 
+]]
+local function restoreTags(from, to)
+	local added = 0
+	local visit
+	visit = function(source, target)
+		for _, tag in source:GetTags() do
+			local _arg1 = #ASSET_TAG_PREFIX
+			local _condition = string.sub(tag, 1, _arg1) == ASSET_TAG_PREFIX
+			if not _condition then
+				_condition = target:HasTag(tag)
+			end
+			if _condition then
+				continue
+			end
+			target:AddTag(tag)
+			added += 1
+		end
+		local byName = {}
+		for _, child in target:GetChildren() do
+			local _name = child.Name
+			local list = byName[_name]
+			if list == nil then
+				local _name_1 = child.Name
+				local _arg1 = { child }
+				byName[_name_1] = _arg1
+			else
+				table.insert(list, child)
+			end
+		end
+		local seen = {}
+		for _, child in source:GetChildren() do
+			local _name = child.Name
+			local _condition = seen[_name]
+			if _condition == nil then
+				_condition = 0
+			end
+			local index = _condition
+			local _name_1 = child.Name
+			local _arg1 = index + 1
+			seen[_name_1] = _arg1
+			local _name_2 = child.Name
+			local _match = byName[_name_2]
+			if _match ~= nil then
+				_match = _match[index + 1]
+			end
+			local match = _match
+			if match ~= nil then
+				visit(child, match)
+			end
+		end
+	end
+	visit(from, to)
+	return added
+end
 --* The live copies tagged for `key` (normally one; two for a moment while a new version replaces the old). 
 local function liveCopies(key)
 	local _exp = CollectionService:GetTagged(assetTag(key))
@@ -93,5 +156,6 @@ return {
 	stringAttribute = stringAttribute,
 	resolveParent = resolveParent,
 	isLiveCopy = isLiveCopy,
+	restoreTags = restoreTags,
 	liveCopies = liveCopies,
 }

package/out/assets/manifest.d.ts

@@ -144,6 +144,8 @@ export interface AssetStatus {
     ms?: number;
     /** Loaded after the start-up wait ran out. */
     late?: boolean;
+    /** CollectionService tags a loaded copy got back from the place's copy (restoreTags). */
+    tags?: number;
 }
 export interface AssetSyncReport {
     /** none: the artifact has no Assets attribute; invalid: unusable; unread: reading it failed (see errors). */

package/out/assets/sync.luau

@@ -9,6 +9,7 @@ local _dom = TS.import(script, script.Parent, "dom")
 local liveCopies = _dom.liveCopies
 local numberAttribute = _dom.numberAttribute
 local resolveParent = _dom.resolveParent
+local restoreTags = _dom.restoreTags
 local stringAttribute = _dom.stringAttribute
 local _manifest = TS.import(script, script.Parent, "manifest")
 local assetTag = _manifest.assetTag
@@ -409,6 +410,50 @@ local function syncEntry(entry, status, placeMatches, ownEpoch, threads)
 				if target == nil then
 					error(`no {string.split(entry.path, "/")[1]} service`, 0)
 				end
+				-- The uploaded version has no CollectionService tags: the place's copy (on a hot swap, the copy being
+				-- replaced, which got them the same way) gives them back (restoreTags).
+				local _result_1
+				if fallback ~= nil and fallback.Parent ~= nil then
+					_result_1 = fallback
+				else
+					-- ▼ ReadonlyArray.find ▼
+					local _callback_2 = function(candidate)
+						return candidate.Parent ~= nil
+					end
+					local _result_2
+					for _i, _v in baked do
+						if _callback_2(_v, _i - 1, baked) == true then
+							_result_2 = _v
+							break
+						end
+					end
+					-- ▲ ReadonlyArray.find ▲
+					_result_1 = _result_2
+				end
+				local source = _result_1
+				do
+					local index = #tagged - 1
+					local _shouldIncrement = false
+					while true do
+						if _shouldIncrement then
+							index -= 1
+						else
+							_shouldIncrement = true
+						end
+						if not (source == nil and index >= 0) then
+							break
+						end
+						if tagged[index + 1].Parent ~= nil then
+							source = tagged[index + 1]
+						end
+					end
+				end
+				if source ~= nil then
+					local restored = restoreTags(source, copy)
+					if restored > 0 then
+						status.tags = restored
+					end
+				end
 				stamp(copy, entry, entry.ver)
 				copy.Parent = target
 			end)
@@ -425,7 +470,7 @@ local function syncEntry(entry, status, placeMatches, ownEpoch, threads)
 			if _condition == nil then
 				_condition = entry.ver
 			end
-			warn("[src/assets/sync.ts:298]", `hot asset {_exp_1} (version {_condition}) failed: {reason}`)
+			warn("[src/assets/sync.ts:308]", `hot asset {_exp_1} (version {_condition}) failed: {reason}`)
 			return nil
 		end
 		-- The new copy is live: the copies it replaces go.
@@ -438,7 +483,7 @@ local function syncEntry(entry, status, placeMatches, ownEpoch, threads)
 		status.ms = math.floor((os.clock() - started) * 1000)
 		if late then
 			status.late = true
-			print("[src/assets/sync.ts:311]", `hot asset {entry.key} loaded late ({status.ms} ms)`)
+			print("[src/assets/sync.ts:321]", `hot asset {entry.key} loaded late ({status.ms} ms)`)
 		end
 	end)
 	table.insert(_threads, _arg0)
@@ -495,7 +540,7 @@ local function run(kernel, deadline, ownEpoch, threads)
 	report.placeVersion = game.PlaceVersion
 	local placeMatches = place == "same" or place == "vouched"
 	if place == "differs" then
-		warn("[src/assets/sync.ts:356]", `hot assets: the manifest is for place v{manifest.placeVersion}, this server runs v{game.PlaceVersion}: keys without a matching baked copy load from their uploaded versions (typetorch assets sync --deploy <branch> fixes it)`)
+		warn("[src/assets/sync.ts:366]", `hot assets: the manifest is for place v{manifest.placeVersion}, this server runs v{game.PlaceVersion}: keys without a matching baked copy load from their uploaded versions (typetorch assets sync --deploy <branch> fixes it)`)
 	end
 	local loads = {}
 	for _, entry in manifest.entries do
@@ -515,7 +560,7 @@ local function run(kernel, deadline, ownEpoch, threads)
 		if not ok then
 			status.source = "failed"
 			status.error = shortError(result)
-			warn("[src/assets/sync.ts:369]", `hot asset {entry.key} failed: {status.error}`)
+			warn("[src/assets/sync.ts:379]", `hot asset {entry.key} failed: {status.error}`)
 		elseif result ~= nil then
 			table.insert(loads, result)
 		end
@@ -549,7 +594,7 @@ local function run(kernel, deadline, ownEpoch, threads)
 		end
 		report.timedOut = true
 		load.fail("timed out")
-		warn("[src/assets/sync.ts:378]", `hot asset {load.status.key}: still loading; the old copy stays until it finishes`)
+		warn("[src/assets/sync.ts:388]", `hot asset {load.status.key}: still loading; the old copy stays until it finishes`)
 	end
 	report.unmanaged = unmanagedKeys()
 end
@@ -596,7 +641,7 @@ local function syncHotAssets(kernel, trove)
 		local _errors = report.errors
 		local _arg0 = `AssetSync failed: {shortError(err)}`
 		table.insert(_errors, _arg0)
-		warn("[src/assets/sync.ts:407]", `AssetSync failed: {err}`)
+		warn("[src/assets/sync.ts:417]", `AssetSync failed: {err}`)
 	end
 	report.running = false
 	report.ms = math.floor((os.clock() - started) * 1000)
@@ -617,7 +662,7 @@ local function syncHotAssets(kernel, trove)
 			table.insert(parts, _arg0)
 		end
 		table.sort(parts)
-		print("[src/assets/sync.ts:417]", `hot assets: {table.concat(parts, ", ")} in {report.ms} ms (place {report.place or "?"})`)
+		print("[src/assets/sync.ts:427]", `hot assets: {table.concat(parts, ", ")} in {report.ms} ms (place {report.place or "?"})`)
 	end
 end
 return {

package/out/version.d.ts

@@ -2,4 +2,4 @@
  * This framework's version, as package.json says (scripts/test-state-inspect.luau checks they match). Shown in
  * uploaded log headers (Logs > Upload); bump it with package.json.
  */
-export declare const FRAMEWORK_VERSION = "0.5.3";
+export declare const FRAMEWORK_VERSION = "0.5.4";

package/out/version.luau

@@ -5,7 +5,7 @@
 	 * uploaded log headers (Logs > Upload); bump it with package.json.
 	 
 ]]
-local FRAMEWORK_VERSION = "0.5.3"
+local FRAMEWORK_VERSION = "0.5.4"
 return {
 	FRAMEWORK_VERSION = FRAMEWORK_VERSION,
 }

package/package.json

@@ -1,53 +1,53 @@
-{
-	"name": "@typetorch/framework",
-	"version": "0.5.3",
-	"description": "TypeTorch framework for roblox-ts: hot-swappable modules (dependency injection, lifecycle, troves), guarded networking, hot assets and the in-game dev menu. Ships inside every TypeTorch artifact.",
-	"license": "MIT",
-	"author": "TypeTorch",
-	"homepage": "https://github.com/typetorch/framework#readme",
-	"repository": {
-		"type": "git",
-		"url": "git+https://github.com/typetorch/framework.git"
-	},
-	"bugs": {
-		"url": "https://github.com/typetorch/framework/issues"
-	},
-	"keywords": ["roblox", "roblox-ts", "rbxts", "hot-reload", "hot-swap", "dependency-injection", "typetorch"],
-	"main": "out/init.luau",
-	"types": "out/index.d.ts",
-	"files": ["out", "!**/*.tsbuildinfo"],
-	"publishConfig": {
-		"access": "public"
-	},
-	"scripts": {
-		"build": "rbxtsc --type package",
-		"watch": "rbxtsc --type package -w",
-		"clean": "node -e \"require('fs').rmSync('out',{recursive:true,force:true})\"",
-		"prepublishOnly": "node -e \"require('fs').rmSync('out',{recursive:true,force:true})\" && rbxtsc --type package"
-	},
-	"peerDependencies": {
-		"@rbxts/compiler-types": "^3.0.0-types.0",
-		"@typetorch/transformer": "^0.2.0",
-		"roblox-ts": "^3.0.0"
-	},
-	"peerDependenciesMeta": {
-		"@typetorch/transformer": {
-			"optional": true
-		}
-	},
-	"dependencies": {
-		"@rbxts/services": "^1.6.0",
-		"@rbxts/t": "^3.2.1",
-		"@rbxts/trove": "^1.3.0"
-	},
-	"devDependencies": {
-		"@rbxts/compiler-types": "^3.0.0-types.0",
-		"@rbxts/types": "^1.0.956",
-		"rbxts-transform-debug": "2.2.0",
-		"roblox-ts": "^3.0.0",
-		"typescript": "5.5.3"
-	},
-	"overrides": {
-		"typescript": "5.5.3"
-	}
-}
+{
+	"name": "@typetorch/framework",
+	"version": "0.5.4",
+	"description": "TypeTorch framework for roblox-ts: hot-swappable modules (dependency injection, lifecycle, troves), guarded networking, hot assets and the in-game dev menu. Ships inside every TypeTorch artifact.",
+	"license": "MIT",
+	"author": "TypeTorch",
+	"homepage": "https://github.com/typetorch/framework#readme",
+	"repository": {
+		"type": "git",
+		"url": "git+https://github.com/typetorch/framework.git"
+	},
+	"bugs": {
+		"url": "https://github.com/typetorch/framework/issues"
+	},
+	"keywords": ["roblox", "roblox-ts", "rbxts", "hot-reload", "hot-swap", "dependency-injection", "typetorch"],
+	"main": "out/init.luau",
+	"types": "out/index.d.ts",
+	"files": ["out", "!**/*.tsbuildinfo"],
+	"publishConfig": {
+		"access": "public"
+	},
+	"scripts": {
+		"build": "rbxtsc --type package",
+		"watch": "rbxtsc --type package -w",
+		"clean": "node -e \"require('fs').rmSync('out',{recursive:true,force:true})\"",
+		"prepublishOnly": "node -e \"require('fs').rmSync('out',{recursive:true,force:true})\" && rbxtsc --type package"
+	},
+	"peerDependencies": {
+		"@rbxts/compiler-types": "^3.0.0-types.0",
+		"@typetorch/transformer": "^0.2.0",
+		"roblox-ts": "^3.0.0"
+	},
+	"peerDependenciesMeta": {
+		"@typetorch/transformer": {
+			"optional": true
+		}
+	},
+	"dependencies": {
+		"@rbxts/services": "^1.6.0",
+		"@rbxts/t": "^3.2.1",
+		"@rbxts/trove": "^1.3.0"
+	},
+	"devDependencies": {
+		"@rbxts/compiler-types": "^3.0.0-types.0",
+		"@rbxts/types": "^1.0.956",
+		"rbxts-transform-debug": "2.2.0",
+		"roblox-ts": "^3.0.0",
+		"typescript": "5.5.3"
+	},
+	"overrides": {
+		"typescript": "5.5.3"
+	}
+}