whet 0.1.1 → 0.2.0

package/bin/haxe/ds/IntMap.d.ts

@@ -0,0 +1,6 @@
+import {IMap} from "../Constraints"
+import {EsMap} from "../../genes/util/EsMap"
+
+export declare class IntMap<T> extends EsMap<number, T> implements IMap<number, T> {
+	constructor()
+}

package/bin/haxe/ds/IntMap.js

@@ -0,0 +1,25 @@
+import {IMap} from "../Constraints.js"
+import {EsMap} from "../../genes/util/EsMap.js"
+import {Register} from "../../genes/Register.js"
+
+const $global = Register.$global
+
+export const IntMap = Register.global("$hxClasses")["haxe.ds.IntMap"] = 
+class IntMap extends Register.inherits(EsMap) {
+	[Register.new]() {
+		super[Register.new]();
+	}
+	static get __name__() {
+		return "haxe.ds.IntMap"
+	}
+	static get __interfaces__() {
+		return [IMap]
+	}
+	static get __super__() {
+		return EsMap
+	}
+	get __class__() {
+		return IntMap
+	}
+}
+

package/bin/haxe/ds/Vector.d.ts

@@ -0,0 +1,2 @@
+
+export type VectorData<T> = T[]

package/bin/minimatch/MinimatchOptions.d.ts

@@ -32,6 +32,34 @@ export type MinimatchOptions = {
 	*/
 	matchBase?: null | boolean, 
 	/**
+	Max depth to traverse for nested extglobs like `*(a|b|c)`
+	
+	Default is 2, which is quite low, but any higher value
+	swiftly results in punishing performance impacts. Note
+	that this is *not*  relevant when the globstar types can
+	be safely coalesced into a single set.
+	
+	For example, `*(a|@(b|c)|d)` would be flattened into
+	`*(a|b|c|d)`. Thus, many common extglobs will retain good
+	performance and  never hit this limit, even if they are
+	excessively deep and complicated.
+	
+	If the limit is hit, then the extglob characters are simply
+	not parsed, and the pattern effectively switches into
+	`noextglob: true` mode for the contents of that nested
+	sub-pattern. This will typically _not_ result in a match,
+	but is considered a valid trade-off for security and
+	performance.
+	*/
+	maxExtglobRecursion?: null | number, 
+	/**
+	Max number of non-adjacent `**` patterns to recursively walk down.
+	
+	The default of 200 is almost certainly high enough for most purposes,
+	and can handle absurdly excessive patterns.
+	*/
+	maxGlobstarRecursion?: null | number, 
+	/**
 	do not expand `{x,y}` style braces
 	*/
 	nobrace?: null | boolean, 

package/bin/whet/Project.d.ts

@@ -1,3 +1,4 @@
+import {Profiler, ProfilerConfig} from "./profiler/Profiler"
 import {CacheManager} from "./cache/CacheManager"
 import {CacheStrategy} from "./cache/Cache"
 import {AnyStone, OutputFilter} from "./Stone"
@@ -13,6 +14,7 @@ export declare class Project {
 	rootDir: string
 	cache: CacheManager
 	configStore: ConfigStore
+	profiler: null | Profiler
 	stones: AnyStone[]
 	onInit: (config: any) => Promise<any>
 	
@@ -29,6 +31,8 @@ export declare class Project {
 	getStoneConfig(id: string): Promise<null | StoneConfigView>
 	setStoneConfig(id: string, patch: any, mode: string): Promise<boolean>
 	clearStoneConfigPreview(id: string): Promise<boolean>
+	enableProfiling(config?: null | ProfilerConfig): void
+	disableProfiling(): void
 	addCommand(name: string, stone?: null | AnyStone): Command
 	protected isCommandNameTaken(name: string): boolean
 	toString(): string
@@ -49,6 +53,10 @@ export type ProjectConfig = {
 	*/
 	onInit?: null | ((config: any) => Promise<any>), 
 	options?: null | Option[], 
+	/**
+	Enable profiling with optional config.
+	*/
+	profiler?: null | ProfilerConfig, 
 	rootDir?: null | string
 }
 

package/bin/whet/Project.js

@@ -1,4 +1,5 @@
 import {Router} from "./route/Router.js"
+import {Profiler} from "./profiler/Profiler.js"
 import {StoneId_Fields_} from "./magic/StoneId.js"
 import {MaybeArray_Fields_} from "./magic/MaybeArray.js"
 import {CacheManager} from "./cache/CacheManager.js"
@@ -18,6 +19,7 @@ export const Project = Register.global("$hxClasses")["whet.Project"] =
 class Project extends Register.inherits() {
 	[Register.new](config) {
 		this.stones = [];
+		this.profiler = null;
 		this.configStore = null;
 		this.cache = null;
 		Log.log(20, ...["Instantiating new Project."]);
@@ -55,6 +57,9 @@ class Project extends Register.inherits() {
 		};
 		this.configStore = config.configStore;
 		this.cache = (config.cache == null) ? new CacheManager(this) : config.cache;
+		if (config.profiler != null) {
+			this.profiler = new Profiler(config.profiler);
+		};
 		Project.projects.push(this);
 		Log.log(30, ...["New project created.", {"project": this, "projectCount": Project.projects.length}]);
 	}
@@ -201,6 +206,14 @@ class Project extends Register.inherits() {
 		store.clearEntry(stone.id);
 		return Promise.resolve(true);
 	}
+	enableProfiling(config) {
+		if (this.profiler == null) {
+			this.profiler = new Profiler(config);
+		};
+	}
+	disableProfiling() {
+		this.profiler = null;
+	}
 	addCommand(name, stone) {
 		let cmdName = name;
 		let cmdAlias = null;
@@ -252,6 +265,7 @@ Project.prototype.description = null;
 Project.prototype.rootDir = null;
 Project.prototype.cache = null;
 Project.prototype.configStore = null;
+Project.prototype.profiler = null;
 Project.prototype.stones = null;
 Project.prototype.onInit = null;
 Project.prototype.config = null;

package/bin/whet/Stone.d.ts

@@ -1,3 +1,4 @@
+import {AnySpan} from "./profiler/Span"
 import {StoneIdType} from "./magic/StoneId"
 import {MaybeArray} from "./magic/MaybeArray"
 import {CacheManager} from "./cache/CacheManager"
@@ -184,6 +185,26 @@ export declare class Stone<T extends StoneConfig> {
 	* Useful for pure JS stones.
 	*/
 	cwdPath(path: string): string
+	
+	/**
+	Wraps an async operation in a profiler span. No-op when profiler is null.
+	*/
+	protected profilerWithSpan<T, R>(op: string, fn: (() => Promise<R>), meta?: null | T): Promise<R>
+	
+	/**
+	Starts a manual profiler span. Returns null when profiler is null.
+	*/
+	protected profilerStartSpan<T>(op: string, meta?: null | T): null | AnySpan
+	
+	/**
+	Ends a manual profiler span. No-op when span is null.
+	*/
+	protected profilerEndSpan(span: null | AnySpan): void
+	
+	/**
+	Returns the current span from ALS context, or null when profiler is disabled.
+	*/
+	protected profilerGetCurrentSpan(): null | AnySpan
 	protected get_cache(): CacheManager
 	toString(): string
 }

package/bin/whet/Stone.js

@@ -75,13 +75,23 @@ class Stone extends Register.inherits() {
 		let _gthis = this;
 		if (this.locked) {
 			Log.log(20, ...["Stone is locked, waiting.", {"stone": this}]);
+			let waitSpan = (this.project.profiler != null) ? this.project.profiler.startSpan(this, "LockWait", {"queuePosition": this.lockQueue.length, "queueLength": this.lockQueue.length + 1}) : null;
 			let deferredRes;
 			let deferredRej;
 			let deferred = new Promise(function (res, rej) {
 				deferredRes = res;
 				deferredRej = rej;
 			});
-			this.lockQueue.push({"run": run, "res": deferredRes, "rej": deferredRej});
+			this.lockQueue.push({"run": function () {
+				if (waitSpan != null) {
+					_gthis.project.profiler.endSpan(waitSpan);
+				};
+				if (_gthis.project.profiler != null) {
+					return _gthis.project.profiler.withSpan(_gthis, "LockHeld", run, null);
+				} else {
+					return run();
+				};
+			}, "res": deferredRes, "rej": deferredRej});
 			return deferred;
 		} else {
 			this.locked = true;
@@ -96,7 +106,7 @@ class Stone extends Register.inherits() {
 					Log.log(10, ...["No function in lock queue. Stone is now unlocked.", {"stone": _gthis}]);
 				};
 			};
-			return run()["finally"](runNext);
+			return ((this.project.profiler != null) ? this.project.profiler.withSpan(this, "LockHeld", run, null) : run())["finally"](runNext);
 		};
 	}
 	
@@ -158,13 +168,25 @@ class Stone extends Register.inherits() {
 			throw new Error("Acquire a lock before generating.");
 		};
 		Log.log(20, ...["Generating source.", {"stone": this, "hash": hash}]);
+		let deps = (this.config.dependencies != null) ? MaybeArray_Fields_.makeArray(this.config.dependencies) : null;
 		let init;
-		if (this.config.dependencies != null) {
+		if (deps != null) {
 			let _g = [];
 			let _g1 = 0;
-			let _g2 = MaybeArray_Fields_.makeArray(this.config.dependencies);
-			while (_g1 < _g2.length) _g.push(_g2[_g1++].getSource());
-			init = Promise.all(_g);
+			while (_g1 < deps.length) _g.push(deps[_g1++].id);
+			if (this.project.profiler != null) {
+				init = this.project.profiler.withSpan(this, "DependencyResolve", function () {
+					let _g = [];
+					let _g1 = 0;
+					while (_g1 < deps.length) _g.push(deps[_g1++].getSource());
+					return Promise.all(_g);
+				}, {"dependencyIds": _g});
+			} else {
+				let _g = [];
+				let _g1 = 0;
+				while (_g1 < deps.length) _g.push(deps[_g1++].getSource());
+				init = Promise.all(_g);
+			};
 		} else {
 			init = Promise.resolve(null);
 		};
@@ -471,6 +493,48 @@ class Stone extends Register.inherits() {
 	cwdPath(path) {
 		return Path.posix.join(".", RootDir.fromProject(this.project), ".", path);
 	}
+	
+	/**
+	Wraps an async operation in a profiler span. No-op when profiler is null.
+	*/
+	profilerWithSpan(op, fn, meta) {
+		if (this.project.profiler != null) {
+			return this.project.profiler.withSpan(this, op, fn, meta);
+		} else {
+			return fn();
+		};
+	}
+	
+	/**
+	Starts a manual profiler span. Returns null when profiler is null.
+	*/
+	profilerStartSpan(op, meta) {
+		if (this.project.profiler != null) {
+			return this.project.profiler.startSpan(this, op, meta);
+		} else {
+			return null;
+		};
+	}
+	
+	/**
+	Ends a manual profiler span. No-op when span is null.
+	*/
+	profilerEndSpan(span) {
+		if (span != null) {
+			this.project.profiler.endSpan(span);
+		};
+	}
+	
+	/**
+	Returns the current span from ALS context, or null when profiler is disabled.
+	*/
+	profilerGetCurrentSpan() {
+		if (this.project.profiler != null) {
+			return this.project.profiler.getCurrentSpan();
+		} else {
+			return null;
+		};
+	}
 	get_cache() {
 		return this.project.cache;
 	}

package/bin/whet/Whet.js

@@ -26,7 +26,7 @@ class Whet_Fields_ {
 		if (entryUrl != thisUrl) {
 			return;
 		};
-		Whet_Fields_.program.enablePositionalOptions().passThroughOptions().description("Project tooling.").usage("[options] [command] [+ [command]...]").version("0.1.1", "-v, --version").allowUnknownOption(true).allowExcessArguments(true).showSuggestionAfterError(true).option("-p, --project <file>", "project to run", "Project.mjs").option("-l, --log-level <level>", "log level, a string/number", "info").option("--no-pretty", "disable pretty logging").exitOverride();
+		Whet_Fields_.program.enablePositionalOptions().passThroughOptions().description("Project tooling.").usage("[options] [command] [+ [command]...]").version("0.2.0", "-v, --version").allowUnknownOption(true).allowExcessArguments(true).showSuggestionAfterError(true).option("-p, --project <file>", "project to run", "Project.mjs").option("-l, --log-level <level>", "log level, a string/number", "info").option("--no-pretty", "disable pretty logging").option("--profile <format>", "enable profiling, export to whet-profile.json on exit (format: json or trace, default: json)").exitOverride();
 		try {
 			Whet_Fields_.program.parse();
 		}catch (_g) {
@@ -92,6 +92,25 @@ class Whet_Fields_ {
 		if (commands.length > 0) {
 			let res = Whet_Fields_.program.parseOptions(commands[0]);
 			commands[0] = res.operands.concat(res.unknown);
+			let profileFormat = Whet_Fields_.program.opts().profile;
+			if (profileFormat != null) {
+				let format = (profileFormat == true) ? "json" : profileFormat;
+				let _g = 0;
+				let _g1 = Project.projects;
+				while (_g < _g1.length) _g1[_g++].enableProfiling();
+				let onExit = function () {
+					let _g = 0;
+					let _g1 = Project.projects;
+					while (_g < _g1.length) {
+						let p = _g1[_g];
+						++_g;
+						if (p.profiler != null) {
+							Fs.writeFileSync("whet-profile.json", JSON.stringify(p.profiler["export"](format), null, "  "));
+						};
+					};
+				};
+				process.on("exit", onExit);
+			};
 			let promises = [];
 			let _g = 0;
 			let _g1 = Project.projects;

package/bin/whet/cache/BaseCache.d.ts

@@ -1,3 +1,4 @@
+import {AnySpan} from "../profiler/Span"
 import {Cache, CacheDurability, DurabilityCheck} from "./Cache"
 import {AnyStone} from "../Stone"
 import {SourceHash} from "../SourceHash"
@@ -47,4 +48,5 @@ export declare class BaseCache<Key, Value extends {
 	*/
 	protected replaceEntry(stone: AnyStone, existing: Value, replacement: Source): Promise<Value>
 	toString(): string
+	protected static setGenerateMeta(span: null | AnySpan, src: Source): void
 }

package/bin/whet/cache/BaseCache.js

@@ -23,12 +23,37 @@ class BaseCache extends Register.inherits() {
 	get(stone, durability, check) {
 		let _gthis = this;
 		return stone.acquire(function () {
-			return stone.finalMaybeHash().then(function (hash) {
+			let lockHeldSpan = (stone.project.profiler != null) ? stone.project.profiler.getCurrentSpan() : null;
+			return ((stone.project.profiler != null) ? stone.project.profiler.withSpan(stone, "Hash", function () {
+				return stone.finalMaybeHash().then(function (hash) {
+					let span = (stone.project.profiler != null) ? stone.project.profiler.getCurrentSpan() : null;
+					let meta = (hash != null) ? SourceHash.toHex(hash) : null;
+					if (span != null) {
+						span.metadata = {"hashHex": meta};
+					};
+					return hash;
+				});
+			}, null) : stone.finalMaybeHash().then(function (hash) {
+				let span = (stone.project.profiler != null) ? stone.project.profiler.getCurrentSpan() : null;
+				let meta = (hash != null) ? SourceHash.toHex(hash) : null;
+				if (span != null) {
+					span.metadata = {"hashHex": meta};
+				};
+				return hash;
+			})).then(function (hash) {
 				if (hash == null) {
 					Log.log(20, ...["Generating source, because it does not supply a hash.", {"stone": stone, "cache": _gthis}]);
 				};
 				if (hash == null) {
-					return stone.generateSource(null).then(function (generatedSource) {
+					return ((stone.project.profiler != null) ? stone.project.profiler.withSpan(stone, "Generate", function () {
+						return stone.generateSource(null).then(function (src) {
+							BaseCache.setGenerateMeta((stone.project.profiler != null) ? stone.project.profiler.getCurrentSpan() : null, src);
+							return src;
+						});
+					}, null) : stone.generateSource(null).then(function (src) {
+						BaseCache.setGenerateMeta((stone.project.profiler != null) ? stone.project.profiler.getCurrentSpan() : null, src);
+						return src;
+					})).then(function (generatedSource) {
 						return {"generatedSource": generatedSource, "hash": generatedSource.hash};
 					});
 				} else {
@@ -66,6 +91,9 @@ class BaseCache extends Register.inherits() {
 				let srcPromise = ((value != null) ? _gthis.source(stone, value) : Promise.resolve(null)).then(function (src) {
 					if (src == null) {
 						Log.log(10, ...["Not cached.", {"stone": stone, "cache": _gthis}]);
+						if (lockHeldSpan != null) {
+							lockHeldSpan.metadata = {"cacheResult": "miss"};
+						};
 						return ((value != null) ? _gthis.remove(stone, value) : Promise.resolve(null)).then(function (_) {
 							if (check._hx_index == 1) {
 								_gthis.checkDurability(stone, values, durability, function (v) {
@@ -74,19 +102,39 @@ class BaseCache extends Register.inherits() {
 									return ageCount(v) + 1;
 								});
 							};
-							return ((generatedSource != null) ? Promise.resolve(generatedSource) : stone.generateSource(hash)).then(function (src) {
-								return _gthis.set(src);
+							return ((generatedSource != null) ? Promise.resolve(generatedSource) : (stone.project.profiler != null) ? stone.project.profiler.withSpan(stone, "Generate", function () {
+								return stone.generateSource(hash).then(function (src) {
+									BaseCache.setGenerateMeta((stone.project.profiler != null) ? stone.project.profiler.getCurrentSpan() : null, src);
+									return src;
+								});
+							}, null) : stone.generateSource(hash).then(function (src) {
+								BaseCache.setGenerateMeta((stone.project.profiler != null) ? stone.project.profiler.getCurrentSpan() : null, src);
+								return src;
+							})).then(function (src) {
+								if (stone.project.profiler != null) {
+									return stone.project.profiler.withSpan(stone, "CacheWrite", function () {
+										return _gthis.set(src);
+									}, null);
+								} else {
+									return _gthis.set(src);
+								};
 							}).then(function (val) {
 								return _gthis.source(stone, val);
 							});
 						});
 					} else if (!src.complete) {
 						Log.log(10, ...["Found partial entry in cache, completing.", {"stone": stone, "cache": _gthis}]);
+						if (lockHeldSpan != null) {
+							lockHeldSpan.metadata = {"cacheResult": "partial"};
+						};
 						return _gthis.completePartialEntry(stone, value, hash).then(function (val) {
 							return _gthis.source(stone, val);
 						});
 					} else {
 						Log.log(10, ...["Found in cache", {"stone": stone, "cache": _gthis}]);
+						if (lockHeldSpan != null) {
+							lockHeldSpan.metadata = {"cacheResult": "hit"};
+						};
 						return Promise.resolve(src);
 					};
 				});
@@ -104,7 +152,23 @@ class BaseCache extends Register.inherits() {
 	getPartial(stone, sourceId, durability, check) {
 		let _gthis = this;
 		return stone.acquire(function () {
-			return stone.finalMaybeHash().then(function (hash) {
+			return ((stone.project.profiler != null) ? stone.project.profiler.withSpan(stone, "Hash", function () {
+				return stone.finalMaybeHash().then(function (hash) {
+					let span = (stone.project.profiler != null) ? stone.project.profiler.getCurrentSpan() : null;
+					let meta = (hash != null) ? SourceHash.toHex(hash) : null;
+					if (span != null) {
+						span.metadata = {"hashHex": meta};
+					};
+					return hash;
+				});
+			}, null) : stone.finalMaybeHash().then(function (hash) {
+				let span = (stone.project.profiler != null) ? stone.project.profiler.getCurrentSpan() : null;
+				let meta = (hash != null) ? SourceHash.toHex(hash) : null;
+				if (span != null) {
+					span.metadata = {"hashHex": meta};
+				};
+				return hash;
+			})).then(function (hash) {
 				let values = _gthis.cache.get(_gthis.key(stone));
 				let value = null;
 				if (values != null && values.length > 0) {
@@ -126,7 +190,9 @@ class BaseCache extends Register.inherits() {
 				} else if (value != null && value.complete) {
 					return Promise.resolve(null);
 				} else {
-					return stone.generatePartialSource(sourceId, hash).then(function (result) {
+					return ((stone.project.profiler != null) ? stone.project.profiler.withSpan(stone, "GeneratePartial", function () {
+						return stone.generatePartialSource(sourceId, hash);
+					}, {"sourceId": sourceId}) : stone.generatePartialSource(sourceId, hash)).then(function (result) {
 						if (result.complete) {
 							return ((value != null) ? _gthis.replaceEntry(stone, value, result.source) : _gthis.set(result.source)).then(function (_) {
 								return result.source.filterTo(sourceId);
@@ -193,7 +259,21 @@ class BaseCache extends Register.inherits() {
 	*/
 	completePartialEntry(stone, existing, hash) {
 		let _gthis = this;
-		return stone.list().then(function (allIds) {
+		return ((stone.project.profiler != null) ? stone.project.profiler.withSpan(stone, "List", function () {
+			return stone.list().then(function (ids) {
+				let span = (stone.project.profiler != null) ? stone.project.profiler.getCurrentSpan() : null;
+				if (span != null) {
+					span.metadata = {"resultCount": (ids != null) ? ids.length : null};
+				};
+				return ids;
+			});
+		}, null) : stone.list().then(function (ids) {
+			let span = (stone.project.profiler != null) ? stone.project.profiler.getCurrentSpan() : null;
+			if (span != null) {
+				span.metadata = {"resultCount": (ids != null) ? ids.length : null};
+			};
+			return ids;
+		})).then(function (allIds) {
 			if (allIds != null) {
 				let _g = [];
 				let _g1 = 0;
@@ -285,6 +365,15 @@ class BaseCache extends Register.inherits() {
 		let c = Boot.getClass(this);
 		return c.__name__;
 	}
+	static setGenerateMeta(span, src) {
+		if (span != null) {
+			let totalBytes = 0;
+			let _g = 0;
+			let _g1 = src.data;
+			while (_g < _g1.length) totalBytes += _g1[_g++].data.length;
+			span.metadata = {"outputCount": src.data.length, "totalBytes": totalBytes};
+		};
+	}
 	static get __name__() {
 		return "whet.cache.BaseCache"
 	}

package/bin/whet/cache/CacheManager.js

@@ -1,7 +1,9 @@
 import {MemoryCache} from "./MemoryCache.js"
 import {FileCache} from "./FileCache.js"
 import {CacheStrategy, CacheDurability, DurabilityCheck} from "./Cache.js"
+import {BaseCache} from "./BaseCache.js"
 import {RootDir} from "../SourceId.js"
+import {SourceHash} from "../SourceHash.js"
 import {Log} from "../Log.js"
 import * as Path from "path"
 import {Register} from "../../genes/Register.js"
@@ -26,8 +28,36 @@ class CacheManager extends Register.inherits() {
 		switch (_g._hx_index) {
 			case 0:
 				return stone.acquire(function () {
-					return stone.finalMaybeHash().then(function (hash) {
-						return stone.generateSource(hash);
+					return ((stone.project.profiler != null) ? stone.project.profiler.withSpan(stone, "Hash", function () {
+						return stone.finalMaybeHash().then(function (hash) {
+							let span = (stone.project.profiler != null) ? stone.project.profiler.getCurrentSpan() : null;
+							let meta = (hash != null) ? SourceHash.toHex(hash) : null;
+							if (span != null) {
+								span.metadata = {"hashHex": meta};
+							};
+							return hash;
+						});
+					}, null) : stone.finalMaybeHash().then(function (hash) {
+						let span = (stone.project.profiler != null) ? stone.project.profiler.getCurrentSpan() : null;
+						let meta = (hash != null) ? SourceHash.toHex(hash) : null;
+						if (span != null) {
+							span.metadata = {"hashHex": meta};
+						};
+						return hash;
+					})).then(function (hash) {
+						if (stone.project.profiler != null) {
+							return stone.project.profiler.withSpan(stone, "Generate", function () {
+								return stone.generateSource(hash).then(function (src) {
+									BaseCache.setGenerateMeta((stone.project.profiler != null) ? stone.project.profiler.getCurrentSpan() : null, src);
+									return src;
+								});
+							}, null);
+						} else {
+							return stone.generateSource(hash).then(function (src) {
+								BaseCache.setGenerateMeta((stone.project.profiler != null) ? stone.project.profiler.getCurrentSpan() : null, src);
+								return src;
+							});
+						};
 					});
 				});
 				break
@@ -51,10 +81,34 @@ class CacheManager extends Register.inherits() {
 		switch (_g._hx_index) {
 			case 0:
 				return stone.acquire(function () {
-					return stone.finalMaybeHash().then(function (hash) {
-						return stone.generatePartialSource(sourceId, hash).then(function (r) {
-							return r.source.filterTo(sourceId);
+					return ((stone.project.profiler != null) ? stone.project.profiler.withSpan(stone, "Hash", function () {
+						return stone.finalMaybeHash().then(function (hash) {
+							let span = (stone.project.profiler != null) ? stone.project.profiler.getCurrentSpan() : null;
+							let meta = (hash != null) ? SourceHash.toHex(hash) : null;
+							if (span != null) {
+								span.metadata = {"hashHex": meta};
+							};
+							return hash;
 						});
+					}, null) : stone.finalMaybeHash().then(function (hash) {
+						let span = (stone.project.profiler != null) ? stone.project.profiler.getCurrentSpan() : null;
+						let meta = (hash != null) ? SourceHash.toHex(hash) : null;
+						if (span != null) {
+							span.metadata = {"hashHex": meta};
+						};
+						return hash;
+					})).then(function (hash) {
+						if (stone.project.profiler != null) {
+							return stone.project.profiler.withSpan(stone, "GeneratePartial", function () {
+								return stone.generatePartialSource(sourceId, hash).then(function (r) {
+									return r.source.filterTo(sourceId);
+								});
+							}, {"sourceId": sourceId});
+						} else {
+							return stone.generatePartialSource(sourceId, hash).then(function (r) {
+								return r.source.filterTo(sourceId);
+							});
+						};
 					});
 				});
 				break
@@ -82,8 +136,36 @@ class CacheManager extends Register.inherits() {
 		switch (stone.cacheStrategy._hx_index) {
 			case 0:
 				return stone.acquire(function () {
-					return stone.finalMaybeHash().then(function (hash) {
-						return stone.generateSource(hash);
+					return ((stone.project.profiler != null) ? stone.project.profiler.withSpan(stone, "Hash", function () {
+						return stone.finalMaybeHash().then(function (hash) {
+							let span = (stone.project.profiler != null) ? stone.project.profiler.getCurrentSpan() : null;
+							let meta = (hash != null) ? SourceHash.toHex(hash) : null;
+							if (span != null) {
+								span.metadata = {"hashHex": meta};
+							};
+							return hash;
+						});
+					}, null) : stone.finalMaybeHash().then(function (hash) {
+						let span = (stone.project.profiler != null) ? stone.project.profiler.getCurrentSpan() : null;
+						let meta = (hash != null) ? SourceHash.toHex(hash) : null;
+						if (span != null) {
+							span.metadata = {"hashHex": meta};
+						};
+						return hash;
+					})).then(function (hash) {
+						if (stone.project.profiler != null) {
+							return stone.project.profiler.withSpan(stone, "Generate", function () {
+								return stone.generateSource(hash).then(function (src) {
+									BaseCache.setGenerateMeta((stone.project.profiler != null) ? stone.project.profiler.getCurrentSpan() : null, src);
+									return src;
+								});
+							}, null);
+						} else {
+							return stone.generateSource(hash).then(function (src) {
+								BaseCache.setGenerateMeta((stone.project.profiler != null) ? stone.project.profiler.getCurrentSpan() : null, src);
+								return src;
+							});
+						};
 					});
 				});
 				break