@alloy-js/core 0.16.0 → 0.18.0-dev.2

package/src/code.ts

@@ -2,7 +2,7 @@
 // it should be possible to share logic between this and the babel transform, but
 // this is an exercise for the future.
 import { hbr, indent } from "./components/stc/sti.js";
-import { Child, Children } from "./jsx-runtime.js";
+import type { Child, Children } from "./runtime/component.js";
 
 export function text(
   template: TemplateStringsArray,

package/src/components/Block.tsx

@@ -1,4 +1,7 @@
-import { Children, childrenArray, computed, Indent } from "@alloy-js/core";
+import { computed } from "@vue/reactivity";
+import type { Children } from "../runtime/component.js";
+import { childrenArray } from "../utils.jsx";
+import { Indent } from "./Indent.jsx";
 
 export interface BlockProps {
   /**

package/src/components/Declaration.tsx

@@ -1,9 +1,10 @@
-import { OutputSymbol } from "../binder.js";
 import { useContext } from "../context.js";
 import { BinderContext } from "../context/binder.js";
 import { DeclarationContext } from "../context/declaration.js";
-import { Children, onCleanup } from "../jsx-runtime.js";
+import { onCleanup } from "../reactivity.js";
 import { Refkey } from "../refkey.js";
+import type { Children } from "../runtime/component.js";
+import { OutputSymbol } from "../symbols/output-symbol.js";
 
 /**
  * Create a declaration by providing an already created symbol. The symbol is
@@ -68,18 +69,18 @@ export function Declaration(props: DeclarationProps) {
     throw new Error("Need binder context to create declarations");
   }
 
-  let declaration;
+  let declaration: OutputSymbol;
   if ("symbol" in props) {
     declaration = props.symbol;
   } else {
-    declaration = binder.createSymbol({
-      name: props.name!,
-      refkey: props.refkey,
+    declaration = new OutputSymbol(props.name, {
+      binder,
+      refkeys: [props.refkey ?? []].flat(),
       metadata: props.metadata,
     });
 
     onCleanup(() => {
-      binder.deleteSymbol(declaration!);
+      declaration.delete();
     });
   }
 

package/src/components/For.tsx

@@ -1,5 +1,6 @@
-import { Children, memo } from "@alloy-js/core/jsx-runtime";
 import { isRef, Ref } from "@vue/reactivity";
+import { memo } from "../reactivity.js";
+import type { Children } from "../runtime/component.js";
 import { baseListPropsToMapJoinArgs, mapJoin } from "../utils.js";
 import { BaseListProps } from "./List.jsx";
 

package/src/components/Indent.tsx

@@ -1,4 +1,4 @@
-import { Children } from "@alloy-js/core/jsx-runtime";
+import type { Children } from "../runtime/component.js";
 
 export interface IndentProps {
   children: Children;

package/src/components/List.tsx

@@ -1,4 +1,6 @@
-import { Children, memo, splitProps } from "@alloy-js/core/jsx-runtime";
+import { splitProps } from "../props-combinators.js";
+import { memo } from "../reactivity.js";
+import type { Children } from "../runtime/component.js";
 import { childrenArray } from "../utils.js";
 import { For } from "./For.jsx";
 

package/src/components/MemberDeclaration.tsx

@@ -1,9 +1,10 @@
-import { OutputSymbol, OutputSymbolFlags } from "../binder.js";
 import { useContext } from "../context.js";
 import { BinderContext } from "../context/binder.js";
 import { MemberDeclarationContext } from "../context/member-declaration.js";
-import { Children } from "../jsx-runtime.js";
-import { Refkey } from "../refkey.js";
+import type { Refkey } from "../refkey.js";
+import type { Children } from "../runtime/component.js";
+import { OutputSymbolFlags } from "../symbols/flags.js";
+import { OutputSymbol } from "../symbols/output-symbol.js";
 
 /**
  * Create a member declaration by providing a symbol name and optional symbol
@@ -85,9 +86,9 @@ export function MemberDeclaration(props: MemberDeclarationProps) {
         "Must provide a member name, or else provide a member symbol",
       );
     }
-    declaration = binder.createSymbol({
-      name: infoProps.name!,
-      refkey: infoProps.refkey,
+
+    declaration = new OutputSymbol(infoProps.name!, {
+      refkeys: infoProps.refkey,
       metadata: infoProps.metadata,
       flags:
         infoProps.static ?

package/src/components/MemberScope.tsx

@@ -1,9 +1,6 @@
-import { OutputSymbol } from "../binder.js";
-import { Children } from "../jsx-runtime.js";
-
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-import { OutputSymbolFlags } from "../binder.js";
 import { MemberScopeContext } from "../context/member-scope.js";
+import type { Children } from "../runtime/component.js";
+import type { OutputSymbol } from "../symbols/output-symbol.js";
 export interface MemberScopeProps {
   /**
    * The name of the member scope.

package/src/components/Output.tsx

@@ -5,9 +5,10 @@ import {
 } from "../binder.js";
 import { BinderContext } from "../context/binder.js";
 import { NamePolicyContext } from "../context/name-policy.js";
-import { Children, getContext } from "../jsx-runtime.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 { extensionEffects } from "../slot.js";
 import { SourceDirectory } from "./SourceDirectory.js";
 

package/src/components/Prose.tsx

@@ -1,5 +1,5 @@
 import { childrenArray, computed } from "@alloy-js/core";
-import { Children } from "@alloy-js/core/jsx-runtime";
+import type { Children } from "../runtime/component.js";
 
 export interface Prose {
   children: Children;

package/src/components/ReferenceOrContent.tsx

@@ -1,8 +1,8 @@
-import { Children } from "@alloy-js/core/jsx-runtime";
 import { computed } from "@vue/reactivity";
 import { useContext } from "../context.js";
 import { BinderContext } from "../context/binder.js";
 import type { Refkey } from "../refkey.js";
+import type { Children } from "../runtime/component.js";
 
 export interface ReferenceOrContentProps {
   readonly refkey: Refkey;

package/src/components/Scope.tsx

@@ -1,8 +1,6 @@
-import { OutputScope } from "../binder.js";
-import { useContext } from "../context.js";
-import { BinderContext } from "../context/binder.js";
 import { ScopeContext } from "../context/scope.js";
-import { Children } from "../jsx-runtime.js";
+import type { Children } from "../runtime/component.js";
+import { OutputScope } from "../symbols/output-scope.js";
 
 /**
  * Declare a scope by providing an already created scope. The scope is merely
@@ -53,11 +51,9 @@ export function Scope(props: ScopeProps) {
   if ("value" in props) {
     scope = props.value;
   } else {
-    const binder = useContext(BinderContext)!;
-    scope = binder.createScope({
+    scope = new OutputScope(props.name ?? "", {
       kind: props.kind,
       metadata: props.metadata,
-      name: props.name ?? "",
     });
   }
 

package/src/components/Show.tsx

@@ -1,4 +1,4 @@
-import { Children } from "@alloy-js/core/jsx-runtime";
+import type { Children } from "../runtime/component.js";
 
 export interface ShowProps {
   children: Children;

package/src/components/SourceDirectory.tsx

@@ -2,7 +2,8 @@ import { shallowReactive } from "@vue/reactivity";
 import { join } from "pathe";
 import { useContext } from "../context.js";
 import { SourceDirectoryContext } from "../context/source-directory.js";
-import { Children, getContext } from "../jsx-runtime.js";
+import { getContext } from "../reactivity.js";
+import type { Children } from "../runtime/component.js";
 
 export interface SourceDirectoryProps {
   path: string;

package/src/components/SourceFile.tsx

@@ -2,9 +2,10 @@ import { join } from "pathe";
 import { useContext } from "../context.js";
 import { SourceDirectoryContext } from "../context/source-directory.js";
 import { SourceFileContext } from "../context/source-file.js";
-import { Children, ComponentDefinition, getContext } from "../jsx-runtime.js";
+import { getContext } from "../reactivity.js";
 import { Refkey } from "../refkey.js";
 import { PrintTreeOptions } from "../render.js";
+import type { Children, ComponentDefinition } from "../runtime/component.js";
 import { Show } from "./Show.jsx";
 
 export interface SourceFileProps extends PrintTreeOptions {

package/src/components/StatementList.tsx

@@ -1,4 +1,5 @@
-import { Children, List } from "@alloy-js/core";
+import type { Children } from "../runtime/component.js";
+import { List } from "./List.jsx";
 
 export interface StatementListProps {
   children: Children;

package/src/components/Switch.tsx

@@ -1,4 +1,5 @@
-import { Children, memo, taggedComponent } from "@alloy-js/core/jsx-runtime";
+import { memo } from "../reactivity.js";
+import { type Children, taggedComponent } from "../runtime/component.js";
 import { childrenArray, findKeyedChildren } from "../utils.js";
 
 export interface SwitchProps {

package/src/components/Wrap.tsx

@@ -1,4 +1,4 @@
-import { Children, ComponentDefinition } from "@alloy-js/core/jsx-runtime";
+import type { Children, ComponentDefinition } from "../runtime/component.js";
 
 export interface WrapProps<TProps> {
   /**

package/src/context/assignment.ts

@@ -1,9 +1,9 @@
-import { OutputSymbol } from "../binder.js";
 import {
   ComponentContext,
   createNamedContext,
   useContext,
 } from "../context.js";
+import type { OutputSymbol } from "../symbols/output-symbol.js";
 
 export interface AssignmentContext {
   /**

package/src/context/binder.ts

@@ -1,6 +1,6 @@
-import { Binder } from "../binder.js";
+import type { Binder } from "../binder.js";
 import {
-  ComponentContext,
+  type ComponentContext,
   createNamedContext,
   useContext,
 } from "../context.js";
@@ -15,5 +15,5 @@ export const BinderContext: ComponentContext<Binder> =
   createNamedContext("Binder");
 
 export function useBinder() {
-  return useContext(BinderContext)!;
+  return useContext(BinderContext);
 }

package/src/context/declaration.ts

@@ -1,5 +1,5 @@
-import { OutputSymbol } from "../binder.js";
 import { ComponentContext, createNamedContext } from "../context.js";
+import type { OutputSymbol } from "../symbols/output-symbol.js";
 
 export const DeclarationContext: ComponentContext<OutputSymbol> =
   createNamedContext("Declaration");

package/src/context/member-declaration.ts

@@ -1,9 +1,9 @@
-import { OutputSymbol } from "../binder.js";
 import {
   ComponentContext,
   createNamedContext,
   useContext,
 } from "../context.js";
+import type { OutputSymbol } from "../symbols/output-symbol.js";
 
 /**
  * Provides the symbol for the member currently being declared.

package/src/context/member-scope.ts

@@ -1,9 +1,9 @@
-import { OutputScope } from "../binder.js";
 import {
   ComponentContext,
   createNamedContext,
   useContext,
 } from "../context.js";
+import type { OutputScope } from "../symbols/output-scope.js";
 
 /**
  * The member scope context provides the instance and static member scopes that

package/src/context/name-policy.ts

@@ -3,7 +3,7 @@ import {
   createNamedContext,
   useContext,
 } from "../context.js";
-import { NamePolicy } from "../name-policy.js";
+import type { NamePolicy } from "../name-policy.js";
 
 export const NamePolicyContext: ComponentContext<NamePolicy<string>> =
   createNamedContext<NamePolicy<string>>("NamePolicy", {

package/src/context/scope.ts

@@ -1,9 +1,9 @@
-import { OutputScope } from "../binder.js";
 import {
   ComponentContext,
   createNamedContext,
   useContext,
 } from "../context.js";
+import type { OutputScope } from "../symbols/output-scope.js";
 
 export const ScopeContext: ComponentContext<OutputScope> =
   createNamedContext("Scope");

package/src/context/source-directory.ts

@@ -1,5 +1,5 @@
 import { ComponentContext, createNamedContext } from "../context.js";
-import { SourceFileContext } from "./source-file.js";
+import type { SourceFileContext } from "./source-file.js";
 
 export interface SourceDirectoryContext {
   contents: (SourceDirectoryContext | SourceFileContext)[];

package/src/context/source-file.ts

@@ -1,6 +1,6 @@
 import { ComponentContext, createNamedContext } from "../context.js";
-import { ComponentDefinition } from "../jsx-runtime.js";
-import { Refkey } from "../refkey.js";
+import type { Refkey } from "../refkey.js";
+import { ComponentDefinition } from "../runtime/component.js";
 
 export interface SourceFileContext {
   path: string;

package/src/context.ts

@@ -1,11 +1,7 @@
 import { shallowRef } from "@vue/reactivity";
-import {
-  Children,
-  ComponentDefinition,
-  effect,
-  getContext,
-} from "./jsx-runtime.js";
-import { stc, StcSignature } from "./stc.js";
+import { effect, getContext } from "./reactivity.js";
+import type { Children, ComponentDefinition } from "./runtime/component.js";
+import { stc, type StcSignature } from "./stc.js";
 
 export interface ComponentContext<T> {
   id: symbol;

package/src/debug.ts

@@ -2,7 +2,7 @@ import { isReactive } from "@vue/reactivity";
 import Table from "cli-table3";
 import pc from "picocolors";
 import { contextsByKey } from "./context.js";
-import { Context, getContext } from "./jsx-runtime.js";
+import { Context, getContext } from "./reactivity.js";
 
 interface DebugInterface {
   component: {
@@ -206,3 +206,7 @@ function kvTable(sep = "  ") {
     style: { "padding-left": 0, "padding-right": 0 },
   });
 }
+
+export function shouldDebug() {
+  return typeof process !== "undefined" && !!process.env?.ALLOY_DEBUG;
+}

package/src/index.ts

@@ -1,4 +1,6 @@
 export {
+  TrackOpTypes,
+  TriggerOpTypes,
   computed,
   isProxy,
   isReactive,
@@ -10,7 +12,13 @@ export {
   toRaw,
   toRef,
   toRefs,
+  track,
+  trigger,
+  watch,
+  type Reactive,
   type Ref,
+  type ShallowReactive,
+  type ShallowRef,
   type ToRef,
   type ToRefs,
 } from "@vue/reactivity";
@@ -19,12 +27,18 @@ export * from "./code.js";
 export * from "./components/index.js";
 export * from "./context.js";
 export * from "./context/index.js";
-export * from "./jsx-runtime.js";
 export * from "./name-policy.js";
+export * from "./props-combinators.js";
+export * from "./reactive-union-set.js";
+export * from "./reactivity.js";
 export * from "./refkey.js";
 export * from "./render.js";
+export * from "./runtime/component.js";
+export * from "./runtime/intrinsic.js";
 export * from "./stc.js";
 export * from "./sti.js";
+export * from "./symbols/index.js";
+export * from "./symbols/symbol-flow.js";
 export * from "./tap.js";
 export * from "./utils.js";
 export * from "./write-output.js";