Merge remote-tracking branch 'origin/main' into feat/signed-transactions

Author: Gozala

typescript/packages/common-builder/src/built-in.ts

@@ -64,7 +64,7 @@ export const navigateTo = createNodeFactory({
 // Example:
 // str`Hello, ${name}!`
 //
-// TODO: This should be a built-in module
+// TODO(seefeld): This should be a built-in module
 export function str(
   strings: TemplateStringsArray,
   ...values: any[]

typescript/packages/common-builder/src/opaque-ref.ts

@@ -48,7 +48,7 @@ export function opaqueRef<T>(value?: Opaque<T> | T): OpaqueRef<T> {
       get: () => unsafe_materialize(unsafe_binding, path),
       set: (newValue: Opaque<any>) => {
         if (unsafe_binding) {
-          unsafe_materialize(unsafe_binding, path); // TODO: Set value
+          unsafe_materialize(unsafe_binding, path); // TODO(seefeld): Set value
         } else setValueAtPath(store, ["value", ...path], newValue);
       },
       key: (key: PropertyKey) => createNestedProxy([...path, key]),
@@ -101,7 +101,7 @@ export function opaqueRef<T>(value?: Opaque<T> | T): OpaqueRef<T> {
           ),
         });
       },
-      toJSON: () => null, // TODO: Merge with Cell and cover doc-less case
+      toJSON: () => null, // TODO(seefeld): Merge with Cell and cover doc-less case
       /**
        * We assume the cell is an array and will provide an infinite iterator.
        * The primary use-case is destructuring a tuple (`[a, b] = ...`). We

typescript/packages/common-builder/src/recipe.ts

@@ -204,7 +204,7 @@ function factoryFromRecipe<T, R>(
   paths.set(inputs, ["argument"]);
 
   // Add paths for all the internal cells
-  // TODO: Infer more stable identifiers
+  // TODO(seefeld): Infer more stable identifiers
   let count = 0;
   cells.forEach((cell: OpaqueRef<any>) => {
     if (paths.has(cell)) return;
@@ -249,12 +249,12 @@ function factoryFromRecipe<T, R>(
   let argumentSchema: JSONSchema;
 
   if (typeof argumentSchemaArg === "string") {
-    // TODO: initial is likely not needed anymore
-    // TODO: But we need a new one for the result
+    // TODO(seefeld): initial is likely not needed anymore
+    // TODO(seefeld): But we need a new one for the result
     argumentSchema = createJsonSchema(defaults, {});
     argumentSchema.description = argumentSchemaArg;
 
-    delete argumentSchema.properties?.[UI]; // TODO: This should be a schema for views
+    delete argumentSchema.properties?.[UI]; // TODO(seefeld): This should be a schema for views
     if (argumentSchema.properties?.internal?.properties) {
       for (
         const key of Object.keys(
@@ -314,7 +314,7 @@ function factoryFromRecipe<T, R>(
   }, recipe) satisfies RecipeFactory<T, R>;
 
   // Bind all cells to the recipe
-  // TODO: Does OpaqueRef cause issues here?
+  // TODO(seefeld): Does OpaqueRef cause issues here?
   [...cells]
     .filter((cell) => !cell.export().path.length) // Only bind root cells
     .forEach((cell) =>

typescript/packages/common-builder/src/spell.ts

@@ -6,7 +6,7 @@ import { derive, type OpaqueRef, recipe, stream, UI } from "./index.ts";
 
 type PathSegment = PropertyKey | { fn: string; args: any[] };
 const getPath = Symbol("getPath");
-type PathCollector = Function & {
+type PathCollector = ((this: any, ...args: any[]) => any) & {
   [getPath]: PathSegment[];
   [key: string]: PathCollector;
 };
@@ -44,7 +44,7 @@ function createPathCollector(path: PathSegment[] = []): PathCollector {
 export const $ = createPathCollector();
 
 // Resolve $ to a paths on `self`
-// TODO: Also for non-top-level ones
+// TODO(seefeld): Also for non-top-level ones
 function resolve$(self: OpaqueRef<any>, query: PathCollector) {
   const entries = Object.entries(query);
   const result: Record<string, any> = {};

typescript/packages/common-builder/src/types.ts

@@ -138,7 +138,7 @@ export function isStreamAlias(value: any): value is StreamAlias {
 
 export type Module = {
   type: "ref" | "javascript" | "recipe" | "raw" | "isolated" | "passthrough";
-  implementation?: Function | Recipe | string;
+  implementation?: ((...args: any[]) => any) | Recipe | string;
   wrapper?: "handler";
   argumentSchema?: JSONSchema;
   resultSchema?: JSONSchema;

typescript/packages/common-builder/src/utils.ts

@@ -236,7 +236,7 @@ export function createJsonSchema(
         if (Array.isArray(value ?? defaultValue)) {
           schema.type = "array";
           if ((value ?? defaultValue).length > 0) {
-            let properties: { [key: string]: any } = {};
+            const properties: { [key: string]: any } = {};
             for (let i = 0; i < (value ?? defaultValue).length; i++) {
               const item = value?.[i] ?? defaultValue?.[i];
               if (typeof item === "object" && item !== null) {

typescript/packages/common-charm/src/charm.ts

@@ -127,7 +127,7 @@ export class CharmManager {
           },
         };
         if (hasUI && !resultSchema.properties![UI]) {
-          resultSchema.properties![UI] = { type: "object" }; // TODO: vdom schema
+          resultSchema.properties![UI] = { type: "object" }; // TODO(seefeld): make this the vdom schema
         }
         if (hasName && !resultSchema.properties![NAME]) {
           resultSchema.properties![NAME] = { type: "string" };

typescript/packages/common-charm/src/iterate.ts

@@ -7,8 +7,9 @@ import { Charm, CharmManager } from "./charm.ts";
 import { buildFullRecipe, getIframeRecipe } from "./iframe/recipe.ts";
 import { buildPrompt } from "./iframe/prompt.ts";
 
-const llmUrl = typeof window !== "undefined"
-  ? window.location.protocol + "//" + window.location.host + "/api/ai/llm"
+const llmUrl = typeof globalThis.location !== "undefined"
+  ? globalThis.location.protocol + "//" + globalThis.location.host +
+    "/api/ai/llm"
   : "//api/ai/llm";
 
 const llm = new LLMClient(llmUrl);
@@ -93,7 +94,7 @@ export const saveNewRecipeVersion = async (
     name,
   });
 
-  return compileAndRunRecipe(
+  return await compileAndRunRecipe(
     charmManager,
     newRecipeSrc,
     newSpec,
@@ -121,7 +122,7 @@ export async function castNewRecipe(
     name,
   });
 
-  return compileAndRunRecipe(charmManager, newRecipeSrc, newSpec, data);
+  return await compileAndRunRecipe(charmManager, newRecipeSrc, newSpec, data);
 }
 
 export async function compileRecipe(
@@ -157,7 +158,7 @@ export async function compileAndRunRecipe(
   }
 
   const newCharm = await charmManager.runPersistent(recipe, runOptions);
-  charmManager.add([newCharm]);
+  await charmManager.add([newCharm]);
   await charmManager.syncRecipe(newCharm);
 
   return newCharm.entityId;

typescript/packages/common-charm/src/storage.ts

@@ -236,7 +236,7 @@ class StorageImpl implements Storage {
     this.cancel();
   }
 
-  // TODO: Should just be one again.
+  // TODO(seefeld,gozala): Should just be one again.
   private _getStorageProviderForSpace(space: Space): StorageProvider {
     if (!space) throw new Error("No space set");
 
@@ -608,7 +608,7 @@ class StorageImpl implements Storage {
 
     // Write all storage jobs to storage, in parallel
     await Promise.all(
-      Array.from(storageJobsBySpace.keys()).map(async (space) =>
+      Array.from(storageJobsBySpace.keys()).map((space) =>
         this._getStorageProviderForSpace(space).send(
           storageJobsBySpace.get(space)!.map(({ entityId, value }) => ({
             entityId,

typescript/packages/common-charm/src/storage/base.ts

@@ -15,7 +15,9 @@ export interface StorageProvider {
    */
   send<T = any>(
     batch: { entityId: EntityId; value: StorageValue<T> }[],
-  ): Promise<{ ok: {}; error?: undefined } | { ok?: undefined; error?: Error }>;
+  ): Promise<
+    { ok: object; error?: undefined } | { ok?: undefined; error?: Error }
+  >;
 
   /**
    * Sync a value from storage. Use `get()` to retrieve the value.
@@ -69,7 +71,9 @@ export abstract class BaseStorageProvider implements StorageProvider {
 
   abstract send<T = any>(
     batch: { entityId: EntityId; value: StorageValue<T> }[],
-  ): Promise<{ ok: {}; error?: undefined } | { ok?: undefined; error: Error }>;
+  ): Promise<
+    { ok: object; error?: undefined } | { ok?: undefined; error: Error }
+  >;
 
   abstract sync(entityId: EntityId, expectedInStorage: boolean): Promise<void>;