feat: make "test" a modifier of Environment

.changeset/purple-rivers-yell.md

@@ -0,0 +1,7 @@
+---
+"@typed/environment": patch
+"@typed/template": patch
+"@typed/router": patch
+---
+
+Make "test" a modifier of the environment rather than an individual environment

package.json

@@ -61,7 +61,7 @@
     "effect": "^2.4.1",
     "eslint": "^8.57.0",
     "eslint-import-resolver-typescript": "^3.6.1",
-    "eslint-plugin-codegen": "0.23.0",
+    "eslint-plugin-codegen": "0.24.1",
     "eslint-plugin-deprecation": "^2.0.0",
     "eslint-plugin-import": "^2.29.1",
     "eslint-plugin-simple-import-sort": "^12.0.0",

packages/environment/src/index.ts

@@ -9,24 +9,45 @@ import type * as Effect from "effect/Effect"
  * @since 1.0.0
  */
 export type Environment =
-  | "dom"
-  | "server"
-  | "serviceWorker"
-  | "static"
-  | "test"
-  | "webWorker"
+  | Environment.Value
+  | `test:${Environment.Value}`
+
+export namespace Environment {
+  export type Value =
+    | "dom"
+    | "server"
+    | "serviceWorker"
+    | "static"
+    | "webWorker"
+}
+
+class EnvironmentValueImpl<T extends Environment.Value> extends String {
+  readonly test: string
+  constructor(value: T) {
+    super(value)
+
+    this.test = `test:${value}` as `test:${T}`
+  }
+}
+
+export type EnvironmentValue<T extends Environment.Value> = T & {
+  readonly test: `test:${T}`
+}
+
+function EnvironmentValue<const T extends Environment.Value>(value: T): EnvironmentValue<T> {
+  return new EnvironmentValueImpl(value) as any
+}
 
 /**
  * @since 1.0.0
  */
-export const Environment: { readonly [_ in Environment]: _ } = {
-  dom: "dom",
-  server: "server",
-  serviceWorker: "serviceWorker",
-  static: "static",
-  test: "test",
-  webWorker: "webWorker"
-}
+export const Environment = {
+  dom: EnvironmentValue("dom"),
+  server: EnvironmentValue("server"),
+  serviceWorker: EnvironmentValue("serviceWorker"),
+  static: EnvironmentValue("static"),
+  webWorker: EnvironmentValue("webWorker")
+} satisfies { readonly [_ in Environment.Value]: EnvironmentValue<_> }
 
 /**
  * @since 1.0.0
@@ -62,7 +83,9 @@ export const isStatic: Effect.Effect<boolean, never, CurrentEnvironment> = Curre
 /**
  * @since 1.0.0
  */
-export const isTest: Effect.Effect<boolean, never, CurrentEnvironment> = CurrentEnvironment.with((e) => e === "test")
+export const isTest: Effect.Effect<boolean, never, CurrentEnvironment> = CurrentEnvironment.with((e) =>
+  e.startsWith("test:")
+)
 
 /**
  * @since 1.0.0

packages/router/src/Matcher.ts

@@ -133,7 +133,7 @@ class RouteMatcherImpl<A, E, R> implements RouteMatcher<A, E, R> {
       let matcher: Match.ValueMatcher<string, A | B, E | E2, R | R2 | Navigation.Navigation | Scope.Scope> = Match
         .value(
           // Only if we're rendering in a DOM-based environment should we allow for routing to last indefinitely
-          env === "dom" ? Navigation.CurrentPath : Fx.take(Navigation.CurrentPath, 1)
+          env === "dom" || env === "test:dom" ? Navigation.CurrentPath : Fx.take(Navigation.CurrentPath, 1)
         )
 
       for (const { guard, match, route } of this.guards) {

packages/router/test/index.ts

@@ -1,4 +1,4 @@
-import { CurrentEnvironment } from "@typed/environment"
+import { CurrentEnvironment, Environment } from "@typed/environment"
 import * as Fx from "@typed/fx"
 import * as Navigation from "@typed/navigation"
 import * as Router from "@typed/router"
@@ -44,5 +44,5 @@ describe("Router", () => {
 const resources = (url: string) =>
   Navigation.initialMemory({ url }).pipe(
     Layer.provideMerge(Router.layer("/")),
-    Layer.provideMerge(CurrentEnvironment.layer("test"))
+    Layer.provideMerge(CurrentEnvironment.layer(Environment.dom.test))
   )

packages/template/src/Html.ts

@@ -75,7 +75,7 @@ export function renderHtmlTemplate(ctx: RenderContext.RenderContext) {
     Placeholder.Error<Values[number]>,
     Scope.Scope | Placeholder.Context<readonly [] extends Values ? never : Values[number]>
   > => {
-    const isStatic = ctx.environment === "static"
+    const isStatic = ctx.environment === "static" || ctx.environment === "test:static"
     const entry = getServerEntry(templateStrings, ctx.templateCache, isStatic)
 
     if (values.length === 0) {

packages/template/src/Many.ts

@@ -31,7 +31,7 @@ export function many<A, E, R, B extends PropertyKey, R2, E2>(
         const ctx = get(context, RenderContext)
         const hydrateContext = getOption(context, HydrateContext)
 
-        if (ctx.environment === "dom") {
+        if (ctx.environment === "dom" || ctx.environment === "test:dom") {
           // If we're hydrating, attempt to provide the correct HydrateContext to rendering Fx
           if (isSome(hydrateContext) && hydrateContext.value.hydrate) {
             return Fx.keyed(values, {

packages/template/src/internal/render.ts

@@ -600,7 +600,6 @@ export const renderTemplate: (document: Document, renderContext: RenderContext)
     values: Values
   ) => {
     const entry = getBrowserEntry(document, renderContext, templateStrings)
-    console.log("entry", ...entry.template.nodes)
     if (values.length === 0) {
       return Fx.sync(() => DomRenderEvent(persistent(document.importNode(entry.content, true))))
     }