also exports constants via builder!

Author: seefeldb

packages/builder/src/factory.ts

@@ -3,11 +3,12 @@
  */
 
 import type {
-  BuilderFunctions,
+  BuilderFunctionsAndConstants,
   Cell,
   CreateCellFunction,
   JSONSchema,
 } from "./types.ts";
+import { AuthSchema, ID, ID_FIELD, NAME, schema, TYPE, UI } from "./types.ts";
 import { opaqueRef, stream } from "./opaque-ref.ts";
 import { getTopFrame, recipe } from "./recipe.ts";
 import { byRef, compute, derive, handler, lift, render } from "./module.ts";
@@ -30,7 +31,7 @@ import { getRecipeEnvironment } from "./env.ts";
  */
 export const createBuilder = (
   runtime: Runtime,
-): BuilderFunctions => {
+): BuilderFunctionsAndConstants => {
   // Implementation of createCell moved from runner/harness
   const createCell: CreateCellFunction = function createCell<T = any>(
     schema?: JSONSchema,
@@ -96,5 +97,16 @@ export const createBuilder = (
 
     // Environment
     getRecipeEnvironment,
+
+    // Constants
+    ID,
+    ID_FIELD,
+    TYPE,
+    NAME,
+    UI,
+
+    // Schema utilities
+    schema,
+    AuthSchema,
   };
 };

packages/builder/src/index.ts

@@ -1,6 +1,9 @@
 // Export the factory function
 export { createBuilder } from "./factory.ts";
-export type { BuilderFunctions, BuilderRuntime } from "./types.ts";
+export type {
+  BuilderFunctionsAndConstants as BuilderFunctions,
+  BuilderRuntime,
+} from "./types.ts";
 
 // Internal functions and exports needed by other packages
 export {

packages/builder/src/types.ts

@@ -28,6 +28,15 @@ import type {
   StreamFunction,
   StrFunction,
 } from "./interface.ts";
+import {
+  AuthSchema,
+  ID,
+  ID_FIELD,
+  NAME,
+  schema,
+  TYPE,
+  UI,
+} from "./interface.ts";
 
 export { AuthSchema, ID, ID_FIELD, NAME, TYPE, UI } from "./interface.ts";
 export type {
@@ -250,7 +259,7 @@ export function markAsStatic(value: unknown): unknown {
 }
 
 // Builder functions interface
-export interface BuilderFunctions {
+export interface BuilderFunctionsAndConstants {
   // Recipe creation
   recipe: RecipeFunction;
 
@@ -280,6 +289,17 @@ export interface BuilderFunctions {
 
   // Environment
   getRecipeEnvironment: GetRecipeEnvironmentFunction;
+
+  // Constants
+  ID: typeof ID;
+  ID_FIELD: typeof ID_FIELD;
+  TYPE: typeof TYPE;
+  NAME: typeof NAME;
+  UI: typeof UI;
+
+  // Schema utilities
+  schema: typeof schema;
+  AuthSchema: typeof AuthSchema;
 }
 
 // Runtime interface needed by createCell
@@ -302,4 +322,4 @@ export interface BuilderRuntime {
 export type CreateBuilder = (
   runtime: BuilderRuntime,
   getCellLinkOrThrow?: (value: any) => any,
-) => BuilderFunctions;
+) => BuilderFunctionsAndConstants;

packages/html/test/html-recipes.test.ts

@@ -1,6 +1,6 @@
-import { beforeEach, describe, it, afterEach } from "@std/testing/bdd";
+import { afterEach, beforeEach, describe, it } from "@std/testing/bdd";
 import { h, render, VNode } from "../src/index.ts";
-import { createBuilder, UI } from "@commontools/builder";
+import { createBuilder } from "@commontools/builder";
 import { Runtime } from "@commontools/runner";
 import * as assert from "./assert.ts";
 import { JSDOM } from "jsdom";
@@ -12,6 +12,7 @@ describe("recipes with HTML", () => {
   let lift: ReturnType<typeof createBuilder>["lift"];
   let recipe: ReturnType<typeof createBuilder>["recipe"];
   let str: ReturnType<typeof createBuilder>["str"];
+  let UI: ReturnType<typeof createBuilder>["UI"];
 
   beforeEach(() => {
     // Set up a fresh JSDOM instance for each test
@@ -26,11 +27,11 @@ describe("recipes with HTML", () => {
 
     // Set up runtime
     runtime = new Runtime({
-      storageUrl: "volatile://"
+      storageUrl: "volatile://",
     });
-    
+
     const builder = createBuilder(runtime);
-    ({ lift, recipe, str } = builder);
+    ({ lift, recipe, str, UI } = builder);
   });
 
   afterEach(async () => {
@@ -48,7 +49,7 @@ describe("recipes with HTML", () => {
     const result = runtime.run(
       simpleRecipe,
       { value: 5 },
-      runtime.documentMap.getDoc(undefined, "simple-ui-result", "test")
+      runtime.documentMap.getDoc(undefined, "simple-ui-result", "test"),
     );
 
     await runtime.idle();
@@ -98,7 +99,7 @@ describe("recipes with HTML", () => {
           { title: "item 2", done: true },
         ],
       },
-      runtime.documentMap.getDoc(undefined, "todo-list-result", "test")
+      runtime.documentMap.getDoc(undefined, "todo-list-result", "test"),
     );
 
     await runtime.idle();
@@ -140,7 +141,7 @@ describe("recipes with HTML", () => {
           { title: "item 2", done: true },
         ],
       },
-      runtime.documentMap.getDoc(undefined, "nested-todo-result", "test")
+      runtime.documentMap.getDoc(undefined, "nested-todo-result", "test"),
     );
 
     await runtime.idle();
@@ -161,7 +162,7 @@ describe("recipes with HTML", () => {
     const result = runtime.run(
       strRecipe,
       { name: "world" },
-      runtime.documentMap.getDoc(undefined, "str-recipe-result", "test")
+      runtime.documentMap.getDoc(undefined, "str-recipe-result", "test"),
     );
 
     await runtime.idle();
@@ -202,7 +203,7 @@ describe("recipes with HTML", () => {
     const result = runtime.run(
       nestedMapRecipe,
       data,
-      runtime.documentMap.getDoc(undefined, "nested-map-result", "test")
+      runtime.documentMap.getDoc(undefined, "nested-map-result", "test"),
     );
 
     await runtime.idle();

packages/runner/src/harness/local-build.ts

@@ -1,13 +1,11 @@
 import ts from "typescript";
 import { RawSourceMap, SourceMapConsumer } from "source-map-js";
 import * as commonHtml from "@commontools/html";
-import * as commonBuilder from "@commontools/builder";
-import { createBuilder } from "@commontools/builder";
-import { getCellLinkOrThrow } from "../query-result-proxy.ts";
 import * as zod from "zod";
 import * as zodToJsonSchema from "zod-to-json-schema";
 import * as merkleReference from "merkle-reference";
 import turndown from "turndown";
+import { createBuilder } from "@commontools/builder";
 import { type IRuntime } from "../runtime.ts";
 
 let DOMParser: any;
@@ -210,6 +208,7 @@ export const tsToExports = async (
       case "@commontools/html":
         return commonHtml;
       case "@commontools/builder":
+      case "@commontools/builder/interface":
         return createBuilder(config.runtime);
       case "zod":
         return zod;

packages/runner/test/recipes.test.ts

@@ -4,7 +4,6 @@ import {
   type Cell,
   createBuilder,
   type JSONSchema,
-  TYPE,
 } from "@commontools/builder";
 import { Runtime } from "../src/runtime.ts";
 import { type ErrorWithContext } from "../src/scheduler.ts";
@@ -18,6 +17,7 @@ describe("Recipe Runner", () => {
   let createCell: ReturnType<typeof createBuilder>["createCell"];
   let handler: ReturnType<typeof createBuilder>["handler"];
   let byRef: ReturnType<typeof createBuilder>["byRef"];
+  let TYPE: ReturnType<typeof createBuilder>["TYPE"];
 
   beforeEach(() => {
     runtime = new Runtime({
@@ -30,6 +30,7 @@ describe("Recipe Runner", () => {
       createCell,
       handler,
       byRef,
+      TYPE,
     } = builder);
   });
 

packages/runner/test/schema-lineage.test.ts

@@ -4,21 +4,21 @@ import {
   type Cell,
   createBuilder,
   type JSONSchema,
-  UI,
 } from "@commontools/builder";
 import { isCell } from "../src/cell.ts";
 import { Runtime } from "../src/runtime.ts";
 
 describe("Schema Lineage", () => {
   let runtime: Runtime;
   let recipe: ReturnType<typeof createBuilder>["recipe"];
+  let UI: ReturnType<typeof createBuilder>["UI"];
 
   beforeEach(() => {
     runtime = new Runtime({
       storageUrl: "volatile://",
     });
     const builder = createBuilder(runtime);
-    ({ recipe } = builder);
+    ({ recipe, UI } = builder);
   });
 
   afterEach(async () => {
@@ -234,13 +234,14 @@ describe("Schema Lineage", () => {
 describe("Schema propagation end-to-end example", () => {
   let runtime: Runtime;
   let recipe: ReturnType<typeof createBuilder>["recipe"];
+  let UI: ReturnType<typeof createBuilder>["UI"];
 
   beforeEach(() => {
     runtime = new Runtime({
       storageUrl: "volatile://",
     });
     const builder = createBuilder(runtime);
-    ({ recipe } = builder);
+    ({ recipe, UI } = builder);
   });
 
   afterEach(async () => {