@alloy-js/core 0.6.0 → 0.7.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alloy-js/core",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "description": "",
   "main": "./dist/src/index.js",
   "exports": {

package/src/binder.ts

@@ -99,9 +99,9 @@ export interface OutputSymbol {
   binder: Binder;
 
   /**
-   * A unique value that references this symbol.
+   * The unique values that reference this symbol.
    */
-  refkey: Refkey;
+  refkeys: Refkey[];
 
   /**
    * The instance members available on this symbol.
@@ -228,6 +228,7 @@ export type CreateSymbolOptions<T extends OutputSymbol = OutputSymbol> = {
   name: string;
   scope?: OutputScope;
   refkey?: Refkey;
+  refkeys?: Refkey[];
   flags?: OutputSymbolFlags;
 } & Omit<T, keyof OutputSymbol>;
 
@@ -524,10 +525,20 @@ export function createOutputBinder(options: BinderOptions = {}): Binder {
       name,
       scope = useDefaultScope(args.flags),
       refkey,
+      refkeys,
       flags = OutputSymbolFlags.None,
       ...rest
     } = args;
 
+    const allRefkeys = [];
+    if (refkey) {
+      allRefkeys.push(refkey);
+    }
+
+    if (refkeys) {
+      allRefkeys.push(...refkeys);
+    }
+
     if (!scope) {
       throw new Error(
         "No scope was provided and no scope could be found in context",
@@ -556,7 +567,7 @@ export function createOutputBinder(options: BinderOptions = {}): Binder {
       originalName: name,
       name: name,
       scope,
-      refkey,
+      refkeys: allRefkeys,
       binder,
       flags,
       ...rest,
@@ -583,7 +594,9 @@ export function createOutputBinder(options: BinderOptions = {}): Binder {
     }
 
     scope.symbols.add(symbol);
-    scope.symbolsByRefkey.set(symbol.refkey, symbol);
+    for (const refkey of allRefkeys) {
+      scope.symbolsByRefkey.set(refkey, symbol);
+    }
 
     deconflict(symbol);
     notifyRefkey(symbol);
@@ -598,9 +611,11 @@ export function createOutputBinder(options: BinderOptions = {}): Binder {
       return;
     }
 
-    const resolution = waitingDeclarations.get(symbol.refkey);
-    if (!resolution) return;
-    resolution.value = undefined;
+    for (const refkey of symbol.refkeys) {
+      const resolution = waitingDeclarations.get(refkey);
+      if (!resolution) return;
+      resolution.value = undefined;
+    }
   }
 
   function instantiateSymbolInto(source: OutputSymbol, target: OutputSymbol) {
@@ -619,7 +634,8 @@ export function createOutputBinder(options: BinderOptions = {}): Binder {
         createSymbol({
           name: sym.name,
           scope: target.instanceMemberScope!,
-          refkey: refkey(target.refkey, sym.refkey),
+          // todo: fix this or change this or something??
+          refkeys: [refkey(target.refkeys[0], sym.refkeys[0])],
           flags: sym.flags | OutputSymbolFlags.InstanceMember,
         });
       }
@@ -816,22 +832,21 @@ export function createOutputBinder(options: BinderOptions = {}): Binder {
 
   function notifyRefkey(symbol: OutputSymbol): void {
     effect(() => {
-      const refkey = symbol.refkey;
-      if (!refkey) return;
-
-      // notify those waiting for this refkey
-      knownDeclarations.set(refkey, symbol);
-      if (waitingDeclarations.has(refkey)) {
-        const signal = waitingDeclarations.get(refkey)!;
-        signal.value = symbol;
-      }
+      for (const refkey of symbol.refkeys) {
+        // notify those waiting for this refkey
+        knownDeclarations.set(refkey, symbol);
+        if (waitingDeclarations.has(refkey)) {
+          const signal = waitingDeclarations.get(refkey)!;
+          signal.value = symbol;
+        }
 
-      // notify those waiting for this symbol name
-      const waitingScope = waitingSymbolNames.get(symbol.scope);
-      if (waitingScope) {
-        const waitingName = waitingScope.get(symbol.name);
-        if (waitingName) {
-          waitingName.value = symbol;
+        // notify those waiting for this symbol name
+        const waitingScope = waitingSymbolNames.get(symbol.scope);
+        if (waitingScope) {
+          const waitingName = waitingScope.get(symbol.name);
+          if (waitingName) {
+            waitingName.value = symbol;
+          }
         }
       }
     });

package/src/jsx-runtime.ts

@@ -304,6 +304,7 @@ export namespace JSX {
     literalline: {};
     lbr: {};
     indent: { children: Children };
+    indentIfBreak: { children: Children; groupId: symbol; negate?: boolean };
     fill: { children: Children };
     breakParent: {};
     ifBreak: { children: Children; flatContents?: Children; groupId?: symbol };
@@ -357,6 +358,8 @@ export function taggedComponent<TProps = Props>(
 export const intrinsicElementKey = Symbol();
 
 export type IndentIntrinsicElement = IntrinsicElementBase<"indent">;
+export type IndentIfBreakIntrinsicElement =
+  IntrinsicElementBase<"indentIfBreak">;
 export type BrIntrinsicElement = IntrinsicElementBase<"br">;
 export type LineIntrinsicElement = IntrinsicElementBase<"line">;
 export type HbrIntrinsicElement = IntrinsicElementBase<"hbr">;
@@ -379,6 +382,7 @@ export type IfBreakIntrinsicElement = IntrinsicElementBase<"ifBreak">;
 
 export type IntrinsicElement =
   | IndentIntrinsicElement
+  | IndentIfBreakIntrinsicElement
   | BrIntrinsicElement
   | LineIntrinsicElement
   | HbrIntrinsicElement

package/src/render.ts

@@ -32,6 +32,7 @@ const {
     group,
     hardline,
     indent,
+    indentIfBreak,
     line,
     lineSuffix,
     lineSuffixBoundary,
@@ -348,6 +349,19 @@ function appendChild(node: RenderedTextTree, rawChild: Child) {
       switch (child.name) {
         case "indent":
           return formatHookWithChildren(indent);
+        case "indentIfBreak":
+          node.push(
+            createRenderTreeHook(newNode, {
+              print(tree, print) {
+                return indentIfBreak(print(tree), {
+                  groupId: child.props.groupId,
+                  negate: child.props.negate,
+                });
+              },
+            }),
+          );
+          renderWorker(newNode, child.props.children);
+          return;
         case "fill":
           return formatHookWithChildren(fill as any);
         case "group":

package/src/write-output.ts

@@ -1,4 +1,4 @@
-import { mkdirSync, statSync, writeFileSync } from "node:fs";
+import { existsSync, mkdirSync, writeFileSync } from "node:fs";
 import { relative, resolve } from "pathe";
 import { OutputDirectory } from "./render.js";
 import { traverseOutput } from "./utils.js";
@@ -10,7 +10,7 @@ export function writeOutput(output: OutputDirectory, basePath: string = "") {
   traverseOutput(output, {
     visitDirectory(directory) {
       const path = resolve(basePath, directory.path);
-      if (statSync(path)) {
+      if (existsSync(path)) {
         return;
       }
       // eslint-disable-next-line no-console
@@ -19,7 +19,7 @@ export function writeOutput(output: OutputDirectory, basePath: string = "") {
     },
     visitFile(file) {
       const path = resolve(basePath, file.path);
-      if (statSync(path)) {
+      if (existsSync(path)) {
         // eslint-disable-next-line no-console
         console.log("overwrite", relative(process.cwd(), path));
       } else {

package/temp/api.json

@@ -4229,7 +4229,16 @@
             },
             {
               "kind": "Content",
-              "text": ";\n    flags?: "
+              "text": ";\n    refkeys?: "
+            },
+            {
+              "kind": "Reference",
+              "text": "Refkey",
+              "canonicalReference": "@alloy-js/core!Refkey:type"
+            },
+            {
+              "kind": "Content",
+              "text": "[];\n    flags?: "
             },
             {
               "kind": "Reference",
@@ -4281,7 +4290,7 @@
           ],
           "typeTokenRange": {
             "startIndex": 5,
-            "endIndex": 16
+            "endIndex": 18
           }
         },
         {
@@ -6133,6 +6142,37 @@
           ],
           "name": "Indent"
         },
+        {
+          "kind": "TypeAlias",
+          "canonicalReference": "@alloy-js/core!IndentIfBreakIntrinsicElement:type",
+          "docComment": "",
+          "excerptTokens": [
+            {
+              "kind": "Content",
+              "text": "export type IndentIfBreakIntrinsicElement = "
+            },
+            {
+              "kind": "Reference",
+              "text": "IntrinsicElementBase",
+              "canonicalReference": "@alloy-js/core!IntrinsicElementBase:interface"
+            },
+            {
+              "kind": "Content",
+              "text": "<\"indentIfBreak\">"
+            },
+            {
+              "kind": "Content",
+              "text": ";"
+            }
+          ],
+          "fileUrlPath": "src/jsx-runtime.ts",
+          "releaseTag": "Public",
+          "name": "IndentIfBreakIntrinsicElement",
+          "typeTokenRange": {
+            "startIndex": 1,
+            "endIndex": 3
+          }
+        },
         {
           "kind": "TypeAlias",
           "canonicalReference": "@alloy-js/core!IndentIntrinsicElement:type",
@@ -6309,6 +6349,15 @@
               "kind": "Content",
               "text": " | "
             },
+            {
+              "kind": "Reference",
+              "text": "IndentIfBreakIntrinsicElement",
+              "canonicalReference": "@alloy-js/core!IndentIfBreakIntrinsicElement:type"
+            },
+            {
+              "kind": "Content",
+              "text": " | "
+            },
             {
               "kind": "Reference",
               "text": "BrIntrinsicElement",
@@ -6477,7 +6526,7 @@
           "name": "IntrinsicElement",
           "typeTokenRange": {
             "startIndex": 1,
-            "endIndex": 38
+            "endIndex": 40
           }
         },
         {
@@ -7822,6 +7871,42 @@
                     "endIndex": 4
                   }
                 },
+                {
+                  "kind": "PropertySignature",
+                  "canonicalReference": "@alloy-js/core!JSX.IntrinsicElements#indentIfBreak:member",
+                  "docComment": "",
+                  "excerptTokens": [
+                    {
+                      "kind": "Content",
+                      "text": "indentIfBreak: "
+                    },
+                    {
+                      "kind": "Content",
+                      "text": "{\n            children: "
+                    },
+                    {
+                      "kind": "Reference",
+                      "text": "Children",
+                      "canonicalReference": "@alloy-js/core!Children:type"
+                    },
+                    {
+                      "kind": "Content",
+                      "text": ";\n            groupId: symbol;\n            negate?: boolean;\n        }"
+                    },
+                    {
+                      "kind": "Content",
+                      "text": ";"
+                    }
+                  ],
+                  "isReadonly": false,
+                  "isOptional": false,
+                  "releaseTag": "Public",
+                  "name": "indentIfBreak",
+                  "propertyTypeTokenRange": {
+                    "startIndex": 1,
+                    "endIndex": 4
+                  }
+                },
                 {
                   "kind": "PropertySignature",
                   "canonicalReference": "@alloy-js/core!JSX.IntrinsicElements#lbr:member",
@@ -11214,18 +11299,22 @@
             },
             {
               "kind": "PropertySignature",
-              "canonicalReference": "@alloy-js/core!OutputSymbol#refkey:member",
-              "docComment": "/**\n * A unique value that references this symbol.\n */\n",
+              "canonicalReference": "@alloy-js/core!OutputSymbol#refkeys:member",
+              "docComment": "/**\n * The unique values that reference this symbol.\n */\n",
               "excerptTokens": [
                 {
                   "kind": "Content",
-                  "text": "refkey: "
+                  "text": "refkeys: "
                 },
                 {
                   "kind": "Reference",
                   "text": "Refkey",
                   "canonicalReference": "@alloy-js/core!Refkey:type"
                 },
+                {
+                  "kind": "Content",
+                  "text": "[]"
+                },
                 {
                   "kind": "Content",
                   "text": ";"
@@ -11234,10 +11323,10 @@
               "isReadonly": false,
               "isOptional": false,
               "releaseTag": "Public",
-              "name": "refkey",
+              "name": "refkeys",
               "propertyTypeTokenRange": {
                 "startIndex": 1,
-                "endIndex": 2
+                "endIndex": 3
               }
             },
             {

package/test/symbols.test.ts

@@ -158,7 +158,7 @@ describe("static members", () => {
     const resolution = binder.resolveDeclarationByKey(
       root,
       undefined,
-      staticSym.refkey,
+      staticSym.refkeys[0],
     );
     expect(resolution.value).toBeDefined();
     const { commonScope, pathUp, pathDown, targetDeclaration, memberPath } =
@@ -202,7 +202,7 @@ describe("static members", () => {
     const resolution = binder.resolveDeclarationByKey(
       root,
       undefined,
-      nested_static.refkey,
+      nested_static.refkeys[0],
     );
     expect(resolution.value).toBeDefined();
     const { commonScope, pathUp, pathDown, targetDeclaration, memberPath } =
@@ -284,7 +284,7 @@ describe("instance members", () => {
     const resolution = binder.resolveDeclarationByKey(
       undefined,
       rootSym.instanceMemberScope!,
-      instance.refkey,
+      instance.refkeys[0],
     );
     expect(resolution.value).toBeDefined();
     const { commonScope, pathUp, pathDown, targetDeclaration, memberPath } =
@@ -318,7 +318,7 @@ describe("instance members", () => {
     });
 
     expect(() =>
-      binder.resolveDeclarationByKey(root, undefined, instance.refkey),
+      binder.resolveDeclarationByKey(root, undefined, instance.refkeys[0]),
     ).toThrow(/Cannot resolve member symbols/);
   });
 });
@@ -349,7 +349,10 @@ describe("instantiating members", () => {
       instantiation.flags & OutputSymbolFlags.InstanceMemberContainer,
     ).toBeTruthy();
     expect(instantiation.instanceMemberScope).toBeDefined();
-    const expectedRefkey = refkey(instantiation.refkey, instance.refkey);
+    const expectedRefkey = refkey(
+      instantiation.refkeys[0],
+      instance.refkeys[0],
+    );
     expect(
       instantiation.instanceMemberScope!.symbolsByRefkey.get(expectedRefkey),
     ).toBeDefined();
@@ -380,7 +383,10 @@ describe("instantiating members", () => {
       instantiation.flags & OutputSymbolFlags.InstanceMemberContainer,
     ).toBeTruthy();
     expect(instantiation.instanceMemberScope).toBeDefined();
-    const expectedRefkey = refkey(instantiation.refkey, instance.refkey);
+    const expectedRefkey = refkey(
+      instantiation.refkeys[0],
+      instance.refkeys[0],
+    );
     expect(
       instantiation.instanceMemberScope!.symbolsByRefkey.get(expectedRefkey),
     ).toBeDefined();
@@ -393,7 +399,7 @@ describe("instantiating members", () => {
       flags: OutputSymbolFlags.InstanceMember,
     });
     const newExpectedRefkey = refkey(
-      instantiation.refkey,
+      instantiation.refkeys[0],
       newInstanceMemberRefkey,
     );
     expect(
@@ -558,7 +564,7 @@ describe("refkey resolution", () => {
 
     expect(resolvedSym.value).toBe(undefined);
 
-    sym.refkey = key;
+    sym.refkeys[0] = key;
     expect(resolvedSym.value?.targetDeclaration).toBe(sym);
   });
 });
@@ -581,7 +587,7 @@ describe("Deleting symbols", () => {
 
     expect(resolvedSym.value).toBe(undefined);
 
-    sym.refkey = key;
+    sym.refkeys[0] = key;
     expect(resolvedSym.value?.targetDeclaration).toBe(sym);
 
     binder.deleteSymbol(sym);