@teamscala/service-boot 0.23.534 → 0.23.536

package/package.json

@@ -7,8 +7,9 @@
   "dependencies": {
     "@orpc/openapi": "*",
     "@orpc/server": "*",
-    "@teamscala/agreement-generation": "*",
+    "@tailwindcss/oxide": "*",
     "@teamscala/agreement-render": "*",
+    "@teamscala/agreement-signing": "*",
     "@teamscala/auth": "*",
     "@teamscala/auth-channel-setup": "*",
     "@teamscala/auth-factory": "*",
@@ -108,8 +109,6 @@
     "./build-client-assets/hydrate-bundle.ts": "./src/build-client-assets/hydrate-bundle.ts",
     "./build-client-assets/manifest": "./src/build-client-assets/manifest.ts",
     "./build-client-assets/manifest.ts": "./src/build-client-assets/manifest.ts",
-    "./build-client-assets/source-candidates": "./src/build-client-assets/source-candidates.ts",
-    "./build-client-assets/source-candidates.ts": "./src/build-client-assets/source-candidates.ts",
     "./build-client-assets/sourcemaps-upload": "./src/build-client-assets/sourcemaps-upload.ts",
     "./build-client-assets/sourcemaps-upload.ts": "./src/build-client-assets/sourcemaps-upload.ts",
     "./build-client-assets/styles-build": "./src/build-client-assets/styles-build.ts",
@@ -302,5 +301,5 @@
   "repository": "https://github.com/teamgbg/service-boot",
   "sideEffects": false,
   "type": "module",
-  "version": "0.23.534"
+  "version": "0.23.536"
 }

package/src/agreement-gate/signing-session.ts

@@ -12,7 +12,7 @@ import {
 import {
 	buildCertificateData,
 	type CertificateData,
-} from "@teamscala/agreement-generation/agreement-certificate";
+} from "@teamscala/agreement-signing/agreement-certificate";
 import { collectBlocks, forEachContent, type PuckData } from "@teamscala/puck-tree/collect-blocks";
 import { findFirstAgreement } from "./agreement-lookup.ts";
 import { resolveAgreementViewerDirectory } from "./resolution-caches.ts";

package/src/attach-proposal-accept.ts

@@ -7,7 +7,7 @@ import type { Hono } from "hono";
 import { getAppLogger } from "@teamscala/logger/app-loggers";
 import { signAgreementAccessToken } from "@teamscala/document-signing/agreement-access-token";
 import { parseCookie } from "./content-gate/parse-cookie.ts";
-import { verifyAccessToken } from "@teamscala/content-gate-token";
+import { verifyAccessToken } from "@teamscala/content-gate-token/content-gate-token";
 import { agTtlMs } from "./gate-ttls.ts";
 import { createAgreementFromProposal } from "@teamscala/agreement-render/create-agreement-from-proposal";
 import { getCookieDomain } from "@teamscala/db/registry/cookie-domain";

package/src/attach-proposal-magic.ts

@@ -5,7 +5,7 @@
 
 import type { Hono } from "hono";
 import { getAppLogger } from "@teamscala/logger/app-loggers";
-import { verifyAccessToken } from "@teamscala/content-gate-token";
+import { verifyAccessToken } from "@teamscala/content-gate-token/content-gate-token";
 import { propTtlMs } from "./gate-ttls.ts";
 
 const PROP_COOKIE = "prop_token";

package/src/build-client-assets/styles-build.ts

@@ -7,7 +7,7 @@ import { dirname, join, resolve } from "node:path";
 import { getAppLogger } from "@teamscala/logger/app-loggers";
 import { compile } from "tailwindcss";
 import { fileHash, removeStaleHashedFiles } from "./hashed-output.ts";
-import { scanSourceCandidates } from "./source-candidates.ts";
+import { Scanner } from "@tailwindcss/oxide";
 import { mkdir, rename } from "node:fs/promises";
 
 const STYLES_BASE = "styles";
@@ -118,7 +118,7 @@ export async function buildTailwindCss(
 		},
 	});
 
-	const candidates = await scanSourceCandidates(compiler.sources, log);
+	const candidates = new Scanner({ sources: compiler.sources.map((source) => ({ ...source, negated: source.negated ?? false })) }).scan();
 	const cssOutput = stripRemoteImports(compiler.build(candidates));
 	log.info(
 		`[build-client-assets] tailwind: ${candidates.length} candidate(s) from ${compiler.sources.length} source(s)`,

package/src/content-gate/config-types.ts

@@ -3,7 +3,7 @@
  * @status handwritten
  */
 
-import type { GateSegmentation } from "@teamscala/content-gate-token";
+import type { GateSegmentation } from "@teamscala/content-gate-token/content-gate-token";
 
 type Resolved = Record<string, unknown>;
 

package/src/gpt-gate.ts

@@ -4,7 +4,7 @@
  */
 
 import type { AccessConfig, ContentGateConfig } from "./content-gate/config-types.ts";
-import { signAccessToken, verifyAccessTokenIdentity } from "@teamscala/content-gate-token";
+import { signAccessToken, verifyAccessTokenIdentity } from "@teamscala/content-gate-token/content-gate-token";
 import { gptTtlMs } from "./gate-ttls.ts";
 
 const GPT_COOKIE = "gpt_token";

package/src/proposal-gate.ts

@@ -4,7 +4,7 @@
  */
 
 import type { AccessConfig, ContentGateConfig } from "./content-gate/config-types.ts";
-import { signAccessToken, verifyAccessToken } from "@teamscala/content-gate-token";
+import { signAccessToken, verifyAccessToken } from "@teamscala/content-gate-token/content-gate-token";
 import { resolveProposalAuthorizedEmails } from "./proposal-authorized-emails.ts";
 import { propTtlMs } from "./gate-ttls.ts";
 import { getAppLogger } from "@teamscala/logger/app-loggers";

package/src/quiz-gate.ts

@@ -4,7 +4,7 @@
  */
 
 import type { AccessConfig, ContentGateConfig } from "./content-gate/config-types.ts";
-import { signAccessToken, verifyAccessTokenIdentity } from "@teamscala/content-gate-token";
+import { signAccessToken, verifyAccessTokenIdentity } from "@teamscala/content-gate-token/content-gate-token";
 import { quizTtlMs } from "./gate-ttls.ts";
 
 const QUIZ_COOKIE = "quiz_token";

package/src/build-client-assets/source-candidates.test.ts

@@ -1,60 +0,0 @@
-// @system codegen
-// @status generated
-// @edit change the suite in the owned-suites band, then re-run codegen. Hand-edits are overwritten.
-//
-// This suite's assertions are OWNED by the codegen band: the band module
-// carries them verbatim, this file is the emission, and hand edits here are
-// overwritten on the next run. The rationale each assertion carries moved
-// with it into the band.
-
-import { describe, expect, test } from "bun:test";
-import { mkdir, rm } from "node:fs/promises";
-import { join } from "node:path";
-import { tmpdir } from "node:os";
-import { scanSourceCandidates } from "./source-candidates.ts";
-
-const noopLog = { warn: () => {}, info: () => {}, error: () => {} } as never;
-
-async function makeSourceTree(tag: string, files: Record<string, string>) {
-	const root = join(tmpdir(), `source-candidates-${tag}-${process.pid}`);
-	await rm(root, { recursive: true, force: true });
-	for (const [rel, content] of Object.entries(files)) {
-		const p = join(root, rel);
-		await mkdir(p.slice(0, p.lastIndexOf("/")), { recursive: true });
-		await Bun.file(p).write(content);
-	}
-	return root;
-}
-
-describe("scanSourceCandidates", () => {
-	test("scans a DIRECTORY source and extracts utility candidates", async () => {
-		const root = await makeSourceTree("dir-src", {
-			"src/Button.tsx": 'export const k = "h-12 px-6 text-base rounded-md";',
-		});
-		const candidates = await scanSourceCandidates(
-			[{ base: root, pattern: "src" }],
-			noopLog,
-		);
-		expect(candidates).toContain("h-12");
-		expect(candidates).toContain("px-6");
-		expect(candidates).toContain("text-base");
-		expect(candidates).toContain("rounded-md");
-		await rm(root, { recursive: true, force: true });
-	});
-
-	test("skips an absent source silently instead of zeroing the scan", async () => {
-		const root = await makeSourceTree("absent-src", {
-			"src/Keep.tsx": "flex gap-2",
-		});
-		const candidates = await scanSourceCandidates(
-			[
-				{ base: root, pattern: "src" },
-				{ base: root, pattern: "does-not-exist" },
-			],
-			noopLog,
-		);
-		expect(candidates).toContain("flex");
-		expect(candidates).toContain("gap-2");
-		await rm(root, { recursive: true, force: true });
-	});
-});

package/src/build-client-assets/source-candidates.ts

@@ -1,76 +0,0 @@
-/**
- * @system service-boot
- * @status handwritten
- */
-
-import { resolve } from "node:path";
-import { stat } from "node:fs/promises";
-import { getAppLogger } from "@teamscala/logger/app-loggers";
-
-async function existsStat(path: string): Promise<boolean> {
-	try {
-		await stat(path);
-		return true;
-	} catch {
-		return false;
-	}
-}
-
-const SCAN_EXTS = new Set([
-	".ts",
-	".tsx",
-	".js",
-	".jsx",
-	".mjs",
-	".cjs",
-	".html",
-	".md",
-	".mdx",
-]);
-const CANDIDATE_RE = /[A-Za-z0-9_:/[\].%#!,&-]+/g;
-
-export async function scanSourceCandidates(
-	sources: Array<{ base: string; pattern: string; negated?: boolean }>,
-	log: ReturnType<typeof getAppLogger>,
-): Promise<string[]> {
-	const candidates = new Set<string>();
-	for (const src of sources) {
-		if (src.negated) continue;
-		let root: string;
-		try {
-			root = resolve(src.base, src.pattern);
-		} catch {
-			continue;
-		}
-		if (!await existsStat(root)) continue;
-		const rootInNodeModules = root.includes("/node_modules/");
-		try {
-			const glob = new Bun.Glob("**/*");
-			for await (const file of glob.scan({
-				cwd: root,
-				absolute: true,
-				onlyFiles: true,
-			})) {
-				if (!rootInNodeModules && file.includes("/node_modules/")) continue;
-				if (file.includes("/dist/") || file.endsWith(".d.ts")) continue;
-				const dot = file.lastIndexOf(".");
-				if (dot < 0 || !SCAN_EXTS.has(file.slice(dot))) continue;
-				let text: string;
-				try {
-					text = await Bun.file(file).text();
-				} catch {
-					continue;
-				}
-				const matched = text.match(CANDIDATE_RE);
-				if (matched) for (const t of matched) candidates.add(t);
-			}
-		} catch (err) {
-			log.warn(
-				`[build-client-assets] candidate scan skipped ${root}: ${
-					err instanceof Error ? err.message : String(err)
-				}`,
-			);
-		}
-	}
-	return [...candidates];
-}