@alloy-js/go 0.3.1-dev.0 → 0.3.1-dev.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alloy-js/go",
-  "version": "0.3.1-dev.0",
+  "version": "0.3.1-dev.1",
   "description": "Go bindings for Alloy",
   "repository": {
     "type": "git",
@@ -27,13 +27,13 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@alloy-js/core": "~0.23.0 || >= 0.24.0-dev.1",
+    "@alloy-js/core": "~0.23.1 || >= 0.24.0-dev.7",
     "change-case": "^5.4.4",
     "pathe": "^2.0.3"
   },
   "devDependencies": {
-    "@alloy-js/cli": "~0.23.0 || >= 0.24.0-dev.0",
-    "@alloy-js/rollup-plugin": "~0.1.1 || >= 0.1.2-dev.1",
+    "@alloy-js/cli": "~0.23.0 || >= 0.24.0-dev.1",
+    "@alloy-js/rollup-plugin": "~0.1.1 || >= 0.1.2-dev.2",
     "@microsoft/api-extractor": "~7.52.8",
     "@rollup/plugin-typescript": "^12.1.2",
     "concurrently": "^9.2.0",

package/src/components/doc/comment.test.tsx

@@ -1,5 +1,4 @@
 import { List, Prose } from "@alloy-js/core";
-import "@alloy-js/core/testing";
 import { d } from "@alloy-js/core/testing";
 import { describe, expect, it } from "vitest";
 import { BlockComment, LineComment } from "./comment.jsx";

package/src/components/interface/interface.test.tsx

@@ -1,6 +1,6 @@
-import { List, Output, refkey, render } from "@alloy-js/core";
+import { List, Output, refkey } from "@alloy-js/core";
 import { describe, expect, it } from "vitest";
-import { assertFileContents, TestPackage } from "../../../test/utils.js";
+import { TestPackage } from "../../../test/utils.js";
 import { ModuleDirectory } from "../ModuleDirectory.jsx";
 import { SourceDirectory } from "../SourceDirectory.jsx";
 import { SourceFile } from "../SourceFile.jsx";
@@ -260,7 +260,7 @@ describe("embedded", () => {
     const TestInterface = refkey("TestInterface");
     const TestInterfaceEmbed = refkey("TestInterfaceEmbed");
 
-    const res = render(
+    expect(
       <Output>
         <ModuleDirectory name="github.com/alloy-framework/alloy">
           <SourceDirectory path=".">
@@ -292,9 +292,7 @@ describe("embedded", () => {
           </SourceDirectory>
         </ModuleDirectory>
       </Output>,
-    );
-
-    assertFileContents(res, {
+    ).toRenderTo({
       "hello/types.go": `
         package hello
 

package/src/components/struct/struct.test.tsx

@@ -1,6 +1,6 @@
-import { List, Output, refkey, render } from "@alloy-js/core";
+import { List, Output, refkey } from "@alloy-js/core";
 import { describe, expect, it } from "vitest";
-import { assertFileContents, TestPackage } from "../../../test/utils.js";
+import { TestPackage } from "../../../test/utils.js";
 import { ModuleDirectory } from "../ModuleDirectory.js";
 import { SourceDirectory } from "../SourceDirectory.js";
 import { SourceFile } from "../SourceFile.js";
@@ -320,7 +320,7 @@ describe("embedded", () => {
     const TestStruct = refkey("TestStruct");
     const TestStructEmbed = refkey("TestStructEmbed");
 
-    const res = render(
+    expect(
       <Output>
         <ModuleDirectory name="github.com/alloy-framework/alloy">
           <SourceDirectory path=".">
@@ -352,9 +352,7 @@ describe("embedded", () => {
           </SourceDirectory>
         </ModuleDirectory>
       </Output>,
-    );
-
-    assertFileContents(res, {
+    ).toRenderTo({
       "hello/types.go": `
         package hello
 
@@ -380,7 +378,7 @@ describe("embedded", () => {
     const TestStruct = refkey("TestStruct");
     const TestStructEmbed = refkey("TestStructEmbed");
 
-    const res = render(
+    expect(
       <Output>
         <ModuleDirectory name="github.com/alloy-framework/alloy">
           <SourceDirectory path=".">
@@ -412,9 +410,7 @@ describe("embedded", () => {
           </SourceDirectory>
         </ModuleDirectory>
       </Output>,
-    );
-
-    assertFileContents(res, {
+    ).toRenderTo({
       "hello/types.go": `
         package hello
 

package/src/components/var/var-declaration.test.tsx

@@ -1,7 +1,5 @@
 import { Output, refkey, render } from "@alloy-js/core";
-import "@alloy-js/core/testing";
 import { expect, it } from "vitest";
-import { assertFileContents } from "../../../test/utils.js";
 import * as go from "../index.js";
 
 it("works variable", () => {
@@ -82,7 +80,7 @@ it("works const group", () => {
 it("works end-to-end", () => {
   const TestType = refkey("TestType");
 
-  const res = render(
+  expect(
     <Output>
       <go.ModuleDirectory name="github.com/alloy-framework/alloy">
         <go.SourceDirectory path=".">
@@ -99,9 +97,7 @@ it("works end-to-end", () => {
         </go.SourceDirectory>
       </go.ModuleDirectory>
     </Output>,
-  );
-
-  assertFileContents(res, {
+  ).toRenderTo({
     "types.go": `
       package alloy
 
@@ -147,7 +143,7 @@ it("throws end-to-end cross-package with unexported type", () => {
 it("works end-to-end cross-package", () => {
   const TestType = refkey("TestType");
 
-  const res = render(
+  expect(
     <Output>
       <go.ModuleDirectory name="github.com/alloy-framework/alloy">
         <go.SourceDirectory path="hello">
@@ -166,9 +162,7 @@ it("works end-to-end cross-package", () => {
         </go.SourceDirectory>
       </go.ModuleDirectory>
     </Output>,
-  );
-
-  assertFileContents(res, {
+  ).toRenderTo({
     "hello/types.go": `
       package hello
 
@@ -188,7 +182,7 @@ it("works with conflict resolution", () => {
   const TestType1 = refkey("TestType1");
   const TestType2 = refkey("TestType2");
 
-  const res = render(
+  expect(
     <Output>
       <go.ModuleDirectory name="github.com/alloy-framework/alloy">
         <go.SourceDirectory path="hello" name="hello">
@@ -218,9 +212,17 @@ it("works with conflict resolution", () => {
         </go.SourceDirectory>
       </go.ModuleDirectory>
     </Output>,
-  );
+  ).toRenderTo({
+    "hello/types.go": `
+      package hello
+
+      type TestType string
+    `,
+    "hello2/types.go": `
+      package hello
 
-  assertFileContents(res, {
+      type TestType string
+    `,
     "world/test.go": `
       package world
 

package/test/utils.tsx

@@ -1,69 +1,6 @@
-import {
-  Children,
-  ContentOutputFile,
-  Output,
-  OutputDirectory,
-  OutputFile,
-  PrintTreeOptions,
-  render,
-} from "@alloy-js/core";
-import { dedent } from "@alloy-js/core/testing";
-import { expect } from "vitest";
+import { Children, Output } from "@alloy-js/core";
 import * as go from "../src/index.js";
 
-export function toSourceText(c: Children, options?: PrintTreeOptions): string {
-  const res = render(
-    <Output>
-      <go.SourceFile path="test.go">{c}</go.SourceFile>
-    </Output>,
-    options,
-  );
-
-  return findFile(res, "test.go").contents;
-}
-
-export function findFile(
-  res: OutputDirectory,
-  path: string,
-): ContentOutputFile {
-  const result = findFileWorker(res, path);
-
-  if (!result) {
-    throw new Error("Expected to find file " + path);
-  }
-  return result as ContentOutputFile;
-
-  function findFileWorker(
-    res: OutputDirectory,
-    path: string,
-  ): OutputFile | null {
-    for (const item of res.contents) {
-      if (item.kind === "file") {
-        if (item.path === path) {
-          return item;
-        }
-        continue;
-      } else {
-        const found = findFileWorker(item, path);
-        if (found) {
-          return found;
-        }
-      }
-    }
-    return null;
-  }
-}
-
-export function assertFileContents(
-  res: OutputDirectory,
-  expectedFiles: Record<string, string>,
-) {
-  for (const [path, contents] of Object.entries(expectedFiles)) {
-    const file = findFile(res, path);
-    expect(file.contents.trim()).toBe(dedent(contents).trim());
-  }
-}
-
 export function TestPackage(props: { children: Children }): Children {
   return (
     <Output>