whet 0.1.1 → 0.4.0

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;
@@ -281,10 +361,26 @@ class BaseCache extends Register.inherits() {
 		HxOverrides.remove(this.cache.get(this.key(stone)), value);
 		return Promise.resolve(null);
 	}
+	
+	/**
+	Remove all cached entries for a stone.
+	*/
+	clearStone(stone) {
+		this.cache.remove(this.key(stone));
+	}
 	toString() {
 		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.d.ts

@@ -31,5 +31,10 @@ export declare class CacheManager {
 	* The path is not reserved. Caching depends on stone's `cacheStrategy` and success of source generation.
 	*/
 	getDir(stone: AnyStone, hash?: null | SourceHash): string
+	
+	/**
+	Remove all cached entries for a stone. Opt-in – not called automatically by Project.removeStone.
+	*/
+	clearStone(stone: AnyStone): void
 	close(): Promise<void>
 }

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
@@ -151,6 +233,14 @@ class CacheManager extends Register.inherits() {
 		};
 		return id;
 	}
+	
+	/**
+	Remove all cached entries for a stone. Opt-in – not called automatically by Project.removeStone.
+	*/
+	clearStone(stone) {
+		this.memCache.clearStone(stone);
+		this.fileCache.clearStone(stone);
+	}
 	close() {
 		return this.fileCache.close();
 	}

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

@@ -15,6 +15,7 @@ export declare class FileCache extends BaseCache<string, RuntimeFileCacheValue>
 	protected set(source: Source): Promise<RuntimeFileCacheValue>
 	protected getExistingDirs(stone: AnyStone): string[]
 	protected remove(stone: AnyStone, value: RuntimeFileCacheValue): Promise<any>
+	clearStone(stone: AnyStone): void
 	protected setRecentUseOrder(values: RuntimeFileCacheValue[], value: RuntimeFileCacheValue): boolean
 	protected getDirFor(value: RuntimeFileCacheValue): string
 	protected hasSourceId(value: RuntimeFileCacheValue, sourceId: string): boolean

package/bin/whet/cache/FileCache.js

@@ -220,6 +220,10 @@ class FileCache extends Register.inherits(() => BaseCache, true) {
 			});
 		});
 	}
+	clearStone(stone) {
+		super.clearStone(stone);
+		this.flush();
+	}
 	setRecentUseOrder(values, value) {
 		let changed = super.setRecentUseOrder(values, value);
 		if (changed) {

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

@@ -0,0 +1,17 @@
+import {AnyStone} from "../Stone"
+import {SourceHash} from "../SourceHash"
+import {Source} from "../Source"
+import {AsyncLocalStorage} from "node:async_hooks"
+
+export declare class MemoContext {
+	constructor()
+	protected sources: Map<AnyStone, Promise<Source>>
+	protected hashes: Map<AnyStone, Promise<SourceHash>>
+	protected partials: Map<AnyStone, Map<string, Promise<null | Source>>>
+	protected static als: AsyncLocalStorage<MemoContext>
+	
+	/**
+	Execute fn within a MemoContext. Reuses existing context or creates a new one.
+	*/
+	static ensure<T>(fn: (() => T)): T
+}

package/bin/whet/cache/MemoContext.js

@@ -0,0 +1,35 @@
+import {AsyncLocalStorage} from "node:async_hooks"
+import {Register} from "../../genes/Register.js"
+
+const $global = Register.$global
+
+export const MemoContext = Register.global("$hxClasses")["whet.cache.MemoContext"] = 
+class MemoContext extends Register.inherits() {
+	[Register.new]() {
+		this.partials = new Map();
+		this.hashes = new Map();
+		this.sources = new Map();
+	}
+	
+	/**
+	Execute fn within a MemoContext. Reuses existing context or creates a new one.
+	*/
+	static ensure(fn) {
+		if (MemoContext.als.getStore() != null) {
+			return fn();
+		};
+		return MemoContext.als.run(new MemoContext(), fn);
+	}
+	static get __name__() {
+		return "whet.cache.MemoContext"
+	}
+	get __class__() {
+		return MemoContext
+	}
+}
+MemoContext.prototype.sources = null;
+MemoContext.prototype.hashes = null;
+MemoContext.prototype.partials = null;
+
+
+MemoContext.als = new AsyncLocalStorage()

package/bin/whet/magic/RoutePathType.js

@@ -11,7 +11,7 @@ export const RoutePathType_Fields_ = Register.global("$hxClasses")["whet.magic._
 class RoutePathType_Fields_ {
 	static makeRoutePath(routerPathType) {
 		if (((routerPathType) instanceof Router) || ((routerPathType) instanceof Stone) || typeof(routerPathType) == "string") {
-			return [{"routeUnder": "", "source": (typeof(routerPathType) == "string") ? new Files({"paths": [routerPathType]}) : routerPathType, "filter": null, "extractDirs": null}];
+			return [{"routeUnder": "", "source": (typeof(routerPathType) == "string") ? Files.fromPath(routerPathType) : routerPathType, "filter": null, "extractDirs": null}];
 		};
 		if (!((routerPathType) instanceof Array)) {
 			throw new Error("RoutePath should be a Stone, Router, or an array.");
@@ -23,7 +23,7 @@ class RoutePathType_Fields_ {
 			let item = _g2[_g1];
 			++_g1;
 			if (((item) instanceof Router) || ((item) instanceof Stone) || typeof(item) == "string") {
-				_g.push({"routeUnder": "", "source": (typeof(item) == "string") ? new Files({"paths": [item]}) : item, "filter": null, "extractDirs": null});
+				_g.push({"routeUnder": "", "source": (typeof(item) == "string") ? Files.fromPath(item) : item, "filter": null, "extractDirs": null});
 			} else if (((item) instanceof Array)) {
 				let inner = item;
 				if (typeof(inner[0]) != "string") {
@@ -36,12 +36,12 @@ class RoutePathType_Fields_ {
 				switch (inner.length) {
 					case 2:
 						let src = inner[1];
-						let tmp1 = (typeof(src) == "string") ? new Files({"paths": [src]}) : src;
+						let tmp1 = (typeof(src) == "string") ? Files.fromPath(src) : src;
 						tmp = {"routeUnder": inner[0], "source": tmp1, "filter": null, "extractDirs": null};
 						break
 					case 3:
 						let src1 = inner[1];
-						let tmp2 = (typeof(src1) == "string") ? new Files({"paths": [src1]}) : src1;
+						let tmp2 = (typeof(src1) == "string") ? Files.fromPath(src1) : src1;
 						if (!(typeof(inner[2]) == "string" || inner[2] instanceof Minimatch)) {
 							throw new Error("Third" + " element of RoutePath array should be a glob pattern (string or `minimatch` object)");
 						};
@@ -50,7 +50,7 @@ class RoutePathType_Fields_ {
 						break
 					case 4:
 						let src2 = inner[1];
-						let tmp4 = (typeof(src2) == "string") ? new Files({"paths": [src2]}) : src2;
+						let tmp4 = (typeof(src2) == "string") ? Files.fromPath(src2) : src2;
 						if (!(typeof(inner[2]) == "string" || inner[2] instanceof Minimatch)) {
 							throw new Error("Third" + " element of RoutePath array should be a glob pattern (string or `minimatch` object)");
 						};

package/bin/whet/profiler/Profiler.d.ts

@@ -0,0 +1,65 @@
+import {SpanStats} from "./SpanStats"
+import {SpanRecorder} from "./SpanRecorder"
+import {SpanEvent, AnySpan, SpanEventType} from "./Span"
+import {AnyStone} from "../Stone"
+import {AsyncLocalStorage} from "node:async_hooks"
+
+export declare class Profiler {
+	constructor(config?: null | ProfilerConfig)
+	recorder: SpanRecorder
+	stats: SpanStats
+	protected listeners: ((arg0: SpanEvent) => void)[]
+	protected context: AsyncLocalStorage<AnySpan>
+	protected baseEpochUs: number
+	protected basePerfUs: number
+	protected nextSpanId: number
+	
+	/**
+	Primary API: wraps an async operation with timing and ALS context.
+	*/
+	withSpan<T, R>(stone: AnyStone, op: string, fn: (() => Promise<R>), meta?: null | T): Promise<R>
+	
+	/**
+	Secondary API: manual start for spans where no function can be wrapped (e.g. LockWait).
+	*/
+	startSpan<T>(stone: AnyStone, op: string, meta?: null | T): AnySpan
+	
+	/**
+	Complete a manually started span.
+	*/
+	endSpan(span: AnySpan): void
+	
+	/**
+	Returns the current span from AsyncLocalStorage context, or null if none.
+	*/
+	getCurrentSpan(): null | AnySpan
+	
+	/**
+	Subscribe to span events. Returns unsubscribe function.
+	*/
+	subscribe(listener: ((arg0: SpanEvent) => void)): (() => void)
+	
+	/**
+	Export spans in the given format ("json" or "trace"). Defaults to "json".
+	*/
+	export(format: string): any
+	
+	/**
+	Return spans recorded since the given span ID (exclusive).
+	*/
+	getSpansSince(sinceId: number): AnySpan[]
+	
+	/**
+	Return aggregated profiling summary.
+	*/
+	getSummary(): any
+	protected exportJson(): any
+	protected exportChromeTrace(): any
+	protected serializeSpan(span: AnySpan): any
+	protected emit(type: SpanEventType, span: AnySpan): void
+	protected static ensureStoneEntry(byStone: {[key: string]: any}, stone: string): void
+}
+
+export type ProfilerConfig = {
+	maxSpans?: null | number
+}