@alloy-js/core 0.20.0-dev.6 → 0.20.0-dev.8

package/src/components/Output.tsx

@@ -4,9 +4,9 @@ import {
   SymbolCreator,
 } from "../binder.js";
 import { BinderContext } from "../context/binder.js";
+import { FormatOptions } from "../context/format-options.js";
 import { NamePolicyContext } from "../context/name-policy.js";
 import { NamePolicy } from "../name-policy.js";
-import { getContext } from "../reactivity.js";
 import { PrintTreeOptions } from "../render.js";
 import type { Children } from "../runtime/component.js";
 import { SourceDirectory } from "./SourceDirectory.js";
@@ -50,14 +50,6 @@ export function Output(props: OutputProps) {
     nameConflictResolver: props.nameConflictResolver,
   });
 
-  const nodeContext = getContext()!;
-  nodeContext.meta ??= {};
-  nodeContext.meta.printOptions = {
-    printWidth: props.printWidth,
-    tabWidth: props.tabWidth,
-    useTabs: props.useTabs,
-  };
-
   const dir = (
     <SourceDirectory path={basePath}>{props.children}</SourceDirectory>
   );
@@ -70,11 +62,19 @@ export function Output(props: OutputProps) {
 
   return (
     <BinderContext.Provider value={binder}>
-      {props.namePolicy ?
-        <NamePolicyContext.Provider value={props.namePolicy}>
-          {dir}
-        </NamePolicyContext.Provider>
-      : dir}
+      <FormatOptions
+        value={{
+          printWidth: props.printWidth,
+          tabWidth: props.tabWidth,
+          useTabs: props.useTabs,
+        }}
+      >
+        {props.namePolicy ?
+          <NamePolicyContext.Provider value={props.namePolicy}>
+            {dir}
+          </NamePolicyContext.Provider>
+        : dir}
+      </FormatOptions>
     </BinderContext.Provider>
   );
 }

package/src/components/SourceFile.tsx

@@ -1,5 +1,6 @@
 import { join } from "pathe";
 import { useContext } from "../context.js";
+import { useFormatOptions } from "../context/format-options.js";
 import { SourceDirectoryContext } from "../context/source-directory.js";
 import { SourceFileContext } from "../context/source-file.js";
 import { getContext } from "../reactivity.js";
@@ -44,11 +45,11 @@ export function SourceFile(props: SourceFileProps) {
   const nodeContext = getContext()!;
   nodeContext.meta ??= {};
   nodeContext.meta.sourceFile = context;
-  nodeContext.meta.printOptions = {
+  nodeContext.meta.printOptions = useFormatOptions({
     printWidth: props.printWidth,
     tabWidth: props.tabWidth,
     useTabs: props.useTabs,
-  };
+  });
 
   return (
     <SourceFileContext.Provider value={context}>

package/src/context/format-options.ts

@@ -0,0 +1,45 @@
+import { createNamedContext, useContext } from "../context.js";
+
+export interface CommonFormatOptions {
+  /**
+   * The number of characters the printer will wrap on.
+   */
+  printWidth?: number;
+
+  /**
+   * Whether to use tabs instead of spaces for indentation.
+   */
+  useTabs?: boolean;
+
+  /**
+   * The number of spaces to use for indentation.
+   */
+  tabWidth?: number;
+}
+
+export const { Provider: FormatOptions, useFormatOptions } =
+  createFormatOptionsContextFor<CommonFormatOptions>("*");
+
+/** Create a format options context for a specific file type */
+export function createFormatOptionsContextFor<T>(
+  filetype: string,
+  defaults?: T,
+) {
+  const context = createNamedContext<T>(`FormatOptions.${filetype}`);
+  return {
+    Provider: context.Provider,
+    useFormatOptions: (overrides?: Partial<T>): T => {
+      const base = { ...defaults, ...useContext(context) };
+      if (overrides === undefined) {
+        return base as any;
+      }
+      const result: any = { ...base };
+      for (const [key, value] of Object.entries(overrides)) {
+        if (value !== undefined) {
+          result[key] = value;
+        }
+      }
+      return result;
+    },
+  };
+}

package/src/context/index.ts

@@ -1,6 +1,7 @@
 export * from "./assignment.js";
 export * from "./binder.js";
 export * from "./declaration.js";
+export * from "./format-options.js";
 export * from "./member-declaration.js";
 export * from "./member-scope.js";
 export * from "./name-policy.js";

package/src/refkey.ts

@@ -167,10 +167,28 @@ export function namekey(name: string, options: NamekeyOptions = {}): Namekey {
  * instantiated variable refkey and the refkey of the inner member
  * `refkey(rk1, rk3)`.
  */
-export function memberRefkey(base: Refkey, member: Refkey): MemberRefkey {
+export function memberRefkey(
+  base: Refkey,
+  ...members: [Refkey, ...Refkey[]]
+): MemberRefkey {
+  if (members.length < 1) {
+    throw new Error("memberRefkey needs at least one member");
+  }
+
+  if (members.length === 1) {
+    return {
+      base,
+      member: members[0],
+      [RefkeySym]: true,
+    };
+  }
+
   return {
-    base,
-    member,
+    base: memberRefkey(
+      base,
+      ...(members.slice(0, -1) as [Refkey, ...Refkey[]]),
+    ),
+    member: members.at(-1)!,
     [RefkeySym]: true,
   };
 }

package/src/render.ts

@@ -208,13 +208,6 @@ export function sourceFilesForTree(
 ): OutputDirectory {
   let rootDirectory: OutputDirectory | undefined = undefined;
 
-  // when passing Output, the first render tree child is the Output component.
-  const rootRenderOptions =
-    Array.isArray(tree) ?
-      (getContextForRenderNode(tree[0] as RenderedTextTree)?.meta
-        ?.printOptions ?? {})
-    : {};
-
   collectSourceFiles(undefined, tree);
 
   if (!rootDirectory) {
@@ -265,17 +258,9 @@ export function sourceFilesForTree(
         filetype: context.meta?.sourceFile.filetype,
         contents: printTree(root, {
           printWidth:
-            options?.printWidth ??
-            context.meta?.printOptions?.printWidth ??
-            rootRenderOptions.printWidth,
-          tabWidth:
-            options?.tabWidth ??
-            context.meta?.printOptions?.tabWidth ??
-            rootRenderOptions.tabWidth,
-          useTabs:
-            options?.useTabs ??
-            context.meta?.printOptions?.useTabs ??
-            rootRenderOptions.useTabs,
+            options?.printWidth ?? context.meta?.printOptions?.printWidth,
+          tabWidth: options?.tabWidth ?? context.meta?.printOptions?.tabWidth,
+          useTabs: options?.useTabs ?? context.meta?.printOptions?.useTabs,
         }),
       };
 

package/src/symbols/output-symbol.ts

@@ -414,7 +414,7 @@ export abstract class OutputSymbol {
    *
    * @reactive
    */
-  get type() {
+  get type(): OutputSymbol | undefined {
     track(this, TrackOpTypes.GET, "type");
     return this.#type;
   }