@typespec/emitter-framework 0.9.0-dev.0 → 0.9.0-dev.10

package/dist/src/testing/scenario-test/harness.js

@@ -1,145 +1,49 @@
-import { normalizePath } from "@typespec/compiler";
+import { logDiagnostics, NodeHost } from "@typespec/compiler";
+import { expectDiagnosticEmpty } from "@typespec/compiler/testing";
 import { readdirSync, readFileSync, statSync, writeFileSync } from "fs";
-import minimist from "minimist";
-import path from "path";
+import { join } from "pathe";
 import { format } from "prettier";
-import { afterAll, describe, expect, it } from "vitest";
-import { emitWithDiagnostics } from "./test-host.js";
-const rawArgs = process.env.TEST_ARGS ? process.env.TEST_ARGS.split(" ") : [];
-
-// Parse command-line arguments with minimist
-const args = minimist(rawArgs, {
-  alias: {
-    filter: "f" // Short alias for `--filter`
-  },
-  default: {
-    filter: undefined // Default to undefined if no filter is provided
-  }
-});
-
-// Extract the filter paths from the parsed arguments
-const filterPaths = args.filter ? Array.isArray(args.filter) // Handle single or multiple file paths
-? args.filter : [args.filter] : undefined;
+import { afterAll, beforeAll, describe, expect, it } from "vitest";
+import { getExcerptForQuery, parseCodeblockExpectation } from "./code-block-expectation.js";
 const SCENARIOS_UPDATE = process.env["RECORD"] === "true" || process.env["SCENARIOS_UPDATE"] === "true";
-async function assertGetEmittedFile(testLibrary, emitterOutputDir, file, code) {
-  const [emittedFiles, diagnostics] = await emitWithDiagnostics(testLibrary, emitterOutputDir, code);
-  const errors = diagnostics.filter(d => d.severity === "error");
-  const warnings = diagnostics.filter(d => d.severity === "warning");
-  if (warnings.length > 0) {
-    // eslint-disable-next-line no-console
-    console.warn(`Warning compiling code:\n ${warnings.map(x => x.message).join("\n")}`);
-  }
-  if (errors.length > 0) {
-    throw new Error(`Error compiling code:\n ${errors.map(x => x.message).join("\n")}`);
-  }
-  const normalizedTarget = normalizePath(file);
-  const sourceFile = emittedFiles.find(x => normalizePath(x.path) === normalizedTarget);
-  if (!sourceFile) {
-    throw new Error(`File ${file} not found in emitted files:\n ${emittedFiles.map(f => f.path).join("\n")}`);
-  }
-  return sourceFile;
+export async function executeScenarios(tester, languageConfiguration, scenariosLocation, snippetExtractor) {
+  const scenarioList = discoverAllScenarios(scenariosLocation);
+  describeScenarios(scenarioList, tester, languageConfiguration, snippetExtractor);
 }
-
-/**
- * Mapping of different snapshot types to how to get them.
- * Snapshot types can take single-word string arguments templated in curly braces {} and are otherwise regex
- */
-function getCodeBlockTypes(testLibrary, languageConfiguration, emitterOutputDir, snippetExtractor) {
-  const languageTags = languageConfiguration.codeBlockTypes.join("|");
-  return {
-    // Snapshot of a particular interface named {name} in the models file
-    [`(${languageTags}) {file} interface {name}`]: async (code, {
-      file,
-      name
-    }) => {
-      const sourceFile = await assertGetEmittedFile(testLibrary, emitterOutputDir, file, code);
-      const snippet = snippetExtractor.getInterface(sourceFile.content, name);
-      if (!snippet) {
-        throw new Error(`Interface ${name} not found in ${file}`);
-      }
-      return snippet;
-    },
-    [`(${languageTags}) {file} type {name}`]: async (code, {
-      file,
-      name
-    }) => {
-      const sourceFile = await assertGetEmittedFile(testLibrary, emitterOutputDir, file, code);
-      const snippet = snippetExtractor.getTypeAlias(sourceFile.content, name);
-      if (!snippet) {
-        throw new Error(`Type alias ${name} not found in ${file}`);
-      }
-      return snippet;
-    },
-    // Snapshot of a particular function named {name} in the models file
-    [`(${languageTags}) {file} function {name}`]: async (code, {
-      file,
-      name
-    }) => {
-      const sourceFile = await assertGetEmittedFile(testLibrary, emitterOutputDir, file, code);
-      const snippet = snippetExtractor.getFunction(sourceFile.content, name);
-      if (!snippet) {
-        throw new Error(`Function ${name} not found in ${file}`);
-      }
-      return snippet;
-    },
-    // Snapshot of a particular class named {name} in the models file
-    [`(${languageTags}) {file} class {name}`]: async (code, {
-      file,
-      name
-    }) => {
-      const sourceFile = await assertGetEmittedFile(testLibrary, emitterOutputDir, file, code);
-      const snippet = snippetExtractor.getClass(sourceFile.content, name);
-      if (!snippet) {
-        throw new Error(`Class ${name} not found in ${file}`);
+function discoverAllScenarios(dir) {
+  const scenarios = [];
+  function recurse(current) {
+    const children = readdirSync(join(dir, current));
+    for (const child of children) {
+      const fullPath = join(dir, current, child);
+      const stat = statSync(fullPath);
+      if (stat.isDirectory()) {
+        recurse(join(current, child));
+      } else {
+        scenarios.push({
+          path: fullPath,
+          relativePath: join(current, child)
+        });
       }
-      return snippet;
-    },
-    // Snapshot of the entire file
-    [`(${languageTags}) {file}`]: async (code, {
-      file
-    }) => {
-      const sourceFile = await assertGetEmittedFile(testLibrary, emitterOutputDir, file, code);
-      return sourceFile.content;
-    }
-  };
-}
-export async function executeScenarios(testLibrary, languageConfiguration, scenariosLocation, emitterOutputDir, snippetExtractor) {
-  const scenarioList = filterPaths ?? [];
-  // eslint-disable-next-line no-console
-  scenarioList.length && console.log("Filtering scenarios: ", scenarioList);
-  if (!scenarioList.length) {
-    // Add all scenarios.
-    discoverAllScenarios(scenariosLocation, scenarioList);
-  }
-  describeScenarios(scenarioList, testLibrary, languageConfiguration, emitterOutputDir, snippetExtractor);
-}
-function discoverAllScenarios(location, scenarios) {
-  const children = readdirSync(location);
-  for (const child of children) {
-    const fullPath = path.join(location, child);
-    const stat = statSync(fullPath);
-    if (stat.isDirectory()) {
-      discoverAllScenarios(fullPath, scenarios);
-    } else {
-      scenarios.push(fullPath);
     }
   }
+  recurse("");
   return scenarios;
 }
-function parseFile(path, testLibrary, languageConfiguration, emitterOutputDir, snippetExtractor) {
+function parseFile(file) {
   // Read the whole file
-  const rawContent = readFileSync(path, {
+  const rawContent = readFileSync(file.path, {
     encoding: "utf-8"
   });
 
   // Split the content by H1
   const sections = splitByH1(rawContent);
   const scenarioFile = {
-    path,
+    ...file,
     scenarios: []
   };
   for (const section of sections) {
-    const scenarioContent = parseScenario(section.content, testLibrary, languageConfiguration, emitterOutputDir, snippetExtractor);
+    const scenarioContent = parseScenario(section.content);
     const scenario = {
       title: section.title,
       content: scenarioContent
@@ -151,47 +55,43 @@ function parseFile(path, testLibrary, languageConfiguration, emitterOutputDir, s
 function isTestCodeBlock(codeBlock) {
   return codeBlock.kind === "test";
 }
-function parseScenario(content, testLibrary, languageConfiguration, emitterOutputDir, snippetExtractor) {
+function parseScenario(content) {
   const rawLines = content.split("\n");
   const scenario = {
     lines: [],
     specBlock: {
       kind: "spec",
-      content: []
+      content: ""
     },
     testBlocks: []
   };
   let currentCodeBlock = null;
-
-  // Precompute output code block types once
-  const outputCodeBlockTypes = getCodeBlockTypes(testLibrary, languageConfiguration, emitterOutputDir, snippetExtractor);
   for (const line of rawLines) {
     if (line.startsWith("```") && currentCodeBlock) {
-      // Close the code block
-      scenario.lines.push(currentCodeBlock);
-      if (!isTestCodeBlock(currentCodeBlock)) {
-        scenario.specBlock.content = currentCodeBlock.content;
+      const heading = currentCodeBlock.heading;
+      const codeBlockKind = heading.includes("tsp") || heading.includes("typespec") ? "spec" : "test";
+      const content = currentCodeBlock.content.join("\n");
+      if (codeBlockKind === "spec") {
+        const codeblock = {
+          kind: "spec",
+          content
+        };
+        scenario.lines.push(codeblock);
+        scenario.specBlock.content = content;
       } else {
-        for (const [template, fn] of Object.entries(outputCodeBlockTypes)) {
-          const templateRegex = new RegExp("^" + template.replace(/\{(\w+)\}/g, "(?<$1>[^\\s]+)") + "$");
-          const match = currentCodeBlock.heading.match(templateRegex);
-          if (match) {
-            currentCodeBlock.matchedTemplate = {
-              template,
-              fn,
-              namedArgs: match.groups ?? null
-            };
-            break;
-          }
-        }
-        scenario.testBlocks.push(currentCodeBlock);
+        const codeblock = {
+          kind: "test",
+          heading: currentCodeBlock.heading,
+          content,
+          expectation: parseCodeblockExpectation(currentCodeBlock.heading, content)
+        };
+        scenario.lines.push(codeblock);
+        scenario.testBlocks.push(codeblock);
       }
       currentCodeBlock = null;
     } else if (line.startsWith("```")) {
-      const codeBlockKind = line.includes("tsp") || line.includes("typespec") ? "spec" : "test";
       // Start a new code block
       currentCodeBlock = {
-        kind: codeBlockKind,
         heading: line.substring(3),
         content: []
       };
@@ -205,26 +105,37 @@ function parseScenario(content, testLibrary, languageConfiguration, emitterOutpu
   }
   return scenario;
 }
-function describeScenarios(scenarioFiles, testLibrary, languageConfiguration, emitterOutputDir, snippetExtractor) {
-  const scenarios = scenarioFiles.map(f => parseFile(f, testLibrary, languageConfiguration, emitterOutputDir, snippetExtractor));
+function describeScenarios(scenarioFiles, tester, languageConfiguration, snippetExtractor) {
+  const scenarios = scenarioFiles.map(f => parseFile(f));
   for (const scenarioFile of scenarios) {
-    describe(`Scenario File: ${scenarioFile.path}`, () => {
+    describe(`${scenarioFile.relativePath}`, () => {
       for (const scenario of scenarioFile.scenarios) {
         const isOnly = scenario.title.includes("only:");
         const isSkip = scenario.title.includes("skip:");
         const describeFn = isSkip ? describe.skip : isOnly ? describe.only : describe;
+        let outputFiles;
+        beforeAll(async () => {
+          const code = scenario.content.specBlock.content;
+          const [{
+            outputs
+          }, diagnostics] = await tester.compileAndDiagnose(code);
+          const errors = diagnostics.filter(d => d.severity === "error");
+          const warnings = diagnostics.filter(d => d.severity === "warning");
+          if (warnings.length > 0) {
+            // TODO: this should ideally fail the test or be part of the expectation.
+            logDiagnostics(warnings, NodeHost.logSink);
+          }
+          expectDiagnosticEmpty(errors);
+          outputFiles = outputs;
+        });
         describeFn(`Scenario: ${scenario.title}`, () => {
           for (const testBlock of scenario.content.testBlocks) {
             it(`Test: ${testBlock.heading}`, async () => {
-              const {
-                fn,
-                namedArgs
-              } = testBlock.matchedTemplate;
-              const result = await fn(scenario.content.specBlock.content.join("\n"), namedArgs ?? {});
+              const result = getExcerptForQuery(snippetExtractor, testBlock.expectation, outputFiles);
               if (SCENARIOS_UPDATE) {
-                testBlock.content = (await languageConfiguration.format(result)).split("\n");
+                testBlock.content = await languageConfiguration.format(result);
               } else {
-                const expected = await languageConfiguration.format(testBlock.content.join("\n"));
+                const expected = await languageConfiguration.format(testBlock.content);
                 const actual = await languageConfiguration.format(result);
                 expect(actual).toBe(expected);
               }
@@ -252,7 +163,7 @@ async function updateFile(scenarioFile) {
       } else {
         const heading = isTestCodeBlock(line) ? line.heading : "tsp";
         newContent.push("```" + heading);
-        newContent.push(...line.content);
+        newContent.push(line.content);
         newContent.push("```");
       }
     }

package/dist/src/testing/scenario-test/index.d.ts

@@ -1,4 +1,3 @@
 export * from "./harness.js";
 export * from "./snippet-extractor.js";
-export * from "./test-host.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/src/testing/scenario-test/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/testing/scenario-test/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,wBAAwB,CAAC;AACvC,cAAc,gBAAgB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/testing/scenario-test/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,wBAAwB,CAAC"}

package/dist/src/testing/scenario-test/index.js

@@ -1,3 +1,2 @@
 export * from "./harness.js";
-export * from "./snippet-extractor.js";
-export * from "./test-host.js";
+export * from "./snippet-extractor.js";

package/dist/src/testing/scenario-test/snippet-extractor.d.ts

@@ -22,5 +22,5 @@ export interface LanguageConfiguration {
         enumNodeType?: string;
     };
 }
-export declare function createSnipperExtractor(languageConfiguration: LanguageConfiguration): SnippetExtractor;
+export declare function createSnippetExtractor(languageConfiguration: LanguageConfiguration): SnippetExtractor;
 //# sourceMappingURL=snippet-extractor.d.ts.map

package/dist/src/testing/scenario-test/snippet-extractor.js

@@ -67,7 +67,7 @@ export async function createTypeScriptExtractorConfig() {
   };
 }
 await Parser.init();
-export function createSnipperExtractor(languageConfiguration) {
+export function createSnippetExtractor(languageConfiguration) {
   return new SnippetExtractorImpl(languageConfiguration);
 }
 class SnippetExtractorImpl {

package/dist/src/typescript/components/array-expression.d.ts

@@ -1,7 +1,6 @@
-import * as ay from "@alloy-js/core";
-import { Type } from "@typespec/compiler";
+import type { Type } from "@typespec/compiler";
 export interface ArrayExpressionProps {
     elementType: Type;
 }
-export declare function ArrayExpression({ elementType }: ArrayExpressionProps): ay.Children;
+export declare function ArrayExpression({ elementType }: ArrayExpressionProps): import("@alloy-js/core").Children;
 //# sourceMappingURL=array-expression.d.ts.map

package/dist/src/typescript/components/array-expression.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"array-expression.d.ts","sourceRoot":"","sources":["../../../../src/typescript/components/array-expression.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,gBAAgB,CAAC;AACrC,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAG1C,MAAM,WAAW,oBAAoB;IACnC,WAAW,EAAE,IAAI,CAAC;CACnB;AAED,wBAAgB,eAAe,CAAC,EAAE,WAAW,EAAE,EAAE,oBAAoB,eAEpE"}
+{"version":3,"file":"array-expression.d.ts","sourceRoot":"","sources":["../../../../src/typescript/components/array-expression.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAG/C,MAAM,WAAW,oBAAoB;IACnC,WAAW,EAAE,IAAI,CAAC;CACnB;AAED,wBAAgB,eAAe,CAAC,EAAE,WAAW,EAAE,EAAE,oBAAoB,qCAEpE"}

package/dist/src/typescript/components/array-expression.js

@@ -1,10 +1,10 @@
 import { createComponent as _$createComponent } from "@alloy-js/core/jsx-runtime";
-import * as ay from "@alloy-js/core";
+import { code } from "@alloy-js/core";
 import { TypeExpression } from "./type-expression.js";
 export function ArrayExpression({
   elementType
 }) {
-  return ay.code`Array<${_$createComponent(TypeExpression, {
+  return code`Array<${_$createComponent(TypeExpression, {
     type: elementType
   })}>`;
 }

package/dist/src/typescript/components/arrow-function.d.ts

@@ -1,5 +1,5 @@
 import * as ts from "@alloy-js/typescript";
-import { Operation } from "@typespec/compiler";
+import type { Operation } from "@typespec/compiler";
 export interface ArrowFunctionProps extends ts.ArrowFunctionProps {
     type?: Operation;
     /**
@@ -13,5 +13,5 @@ export interface ArrowFunctionProps extends ts.ArrowFunctionProps {
  * function by converting from a TypeSpec Operation. Any other props provided
  * will take precedence.
  */
-export declare function ArrowFunction(props: Readonly<ArrowFunctionProps>): import("@alloy-js/core/jsx-runtime").Children;
+export declare function ArrowFunction(props: Readonly<ArrowFunctionProps>): import("@alloy-js/core").Children;
 //# sourceMappingURL=arrow-function.d.ts.map

package/dist/src/typescript/components/arrow-function.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"arrow-function.d.ts","sourceRoot":"","sources":["../../../../src/typescript/components/arrow-function.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAI/C,MAAM,WAAW,kBAAmB,SAAQ,EAAE,CAAC,kBAAkB;IAC/D,IAAI,CAAC,EAAE,SAAS,CAAC;IACjB;;;OAGG;IACH,cAAc,CAAC,EAAE,SAAS,GAAG,QAAQ,GAAG,SAAS,CAAC;CACnD;AAED;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,QAAQ,CAAC,kBAAkB,CAAC,iDAkBhE"}
+{"version":3,"file":"arrow-function.d.ts","sourceRoot":"","sources":["../../../../src/typescript/components/arrow-function.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAC3C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAIpD,MAAM,WAAW,kBAAmB,SAAQ,EAAE,CAAC,kBAAkB;IAC/D,IAAI,CAAC,EAAE,SAAS,CAAC;IACjB;;;OAGG;IACH,cAAc,CAAC,EAAE,SAAS,GAAG,QAAQ,GAAG,SAAS,CAAC;CACnD;AAED;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,QAAQ,CAAC,kBAAkB,CAAC,qCAkBhE"}

package/dist/src/typescript/components/arrow-function.js

@@ -1,4 +1,5 @@
-import { splitProps, mergeProps as _$mergeProps, createComponent as _$createComponent } from "@alloy-js/core/jsx-runtime";
+import { mergeProps as _$mergeProps, createComponent as _$createComponent } from "@alloy-js/core/jsx-runtime";
+import { splitProps } from "@alloy-js/core";
 import * as ts from "@alloy-js/typescript";
 import { buildParameterDescriptors, getReturnType } from "../utils/operation.js";
 import { TypeExpression } from "./type-expression.js";

package/dist/src/typescript/components/class-method.d.ts

@@ -1,5 +1,5 @@
 import * as ts from "@alloy-js/typescript";
-import { Operation } from "@typespec/compiler";
+import type { Operation } from "@typespec/compiler";
 export interface ClassMethodPropsWithType extends Omit<ts.ClassMethodProps, "name"> {
     type: Operation;
     name?: string;

package/dist/src/typescript/components/class-method.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"class-method.d.ts","sourceRoot":"","sources":["../../../../src/typescript/components/class-method.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAI/C,MAAM,WAAW,wBAAyB,SAAQ,IAAI,CAAC,EAAE,CAAC,gBAAgB,EAAE,MAAM,CAAC;IACjF,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,cAAc,CAAC,EAAE,SAAS,GAAG,QAAQ,GAAG,SAAS,CAAC;CACnD;AAED,MAAM,MAAM,gBAAgB,GAAG,wBAAwB,GAAG,EAAE,CAAC,gBAAgB,CAAC;AAE9E,wBAAgB,WAAW,CAAC,KAAK,EAAE,gBAAgB,qCAuBlD"}
+{"version":3,"file":"class-method.d.ts","sourceRoot":"","sources":["../../../../src/typescript/components/class-method.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAC3C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAIpD,MAAM,WAAW,wBAAyB,SAAQ,IAAI,CAAC,EAAE,CAAC,gBAAgB,EAAE,MAAM,CAAC;IACjF,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,cAAc,CAAC,EAAE,SAAS,GAAG,QAAQ,GAAG,SAAS,CAAC;CACnD;AAED,MAAM,MAAM,gBAAgB,GAAG,wBAAwB,GAAG,EAAE,CAAC,gBAAgB,CAAC;AAE9E,wBAAgB,WAAW,CAAC,KAAK,EAAE,gBAAgB,qCAuBlD"}

package/dist/src/typescript/components/enum-declaration.d.ts

@@ -1,15 +1,15 @@
-import * as ay from "@alloy-js/core";
+import { type Children, type Refkey } from "@alloy-js/core";
 import * as ts from "@alloy-js/typescript";
-import { Enum, EnumMember as TspEnumMember, Union } from "@typespec/compiler";
+import type { Enum, EnumMember as TspEnumMember, Union } from "@typespec/compiler";
 export interface EnumDeclarationProps extends Omit<ts.TypeDeclarationProps, "name"> {
     name?: string;
     type: Union | Enum;
 }
-export declare function EnumDeclaration(props: EnumDeclarationProps): ay.Children;
+export declare function EnumDeclaration(props: EnumDeclarationProps): Children;
 export interface EnumMemberProps {
     type: TspEnumMember;
-    doc?: ay.Children;
-    refkey?: ay.Refkey;
+    doc?: Children;
+    refkey?: Refkey;
 }
-export declare function EnumMember(props: EnumMemberProps): ay.Children;
+export declare function EnumMember(props: EnumMemberProps): Children;
 //# sourceMappingURL=enum-declaration.d.ts.map

package/dist/src/typescript/components/enum-declaration.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"enum-declaration.d.ts","sourceRoot":"","sources":["../../../../src/typescript/components/enum-declaration.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,gBAAgB,CAAC;AACrC,OAAO,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAC3C,OAAO,EAAE,IAAI,EAAE,UAAU,IAAI,aAAa,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAK9E,MAAM,WAAW,oBAAqB,SAAQ,IAAI,CAAC,EAAE,CAAC,oBAAoB,EAAE,MAAM,CAAC;IACjF,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,KAAK,GAAG,IAAI,CAAC;CACpB;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,oBAAoB,eA4C1D;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,aAAa,CAAC;IACpB,GAAG,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC;IAClB,MAAM,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC;CACpB;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,eAAe,eAShD"}
+{"version":3,"file":"enum-declaration.d.ts","sourceRoot":"","sources":["../../../../src/typescript/components/enum-declaration.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,QAAQ,EAAO,KAAK,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACjE,OAAO,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAC3C,OAAO,KAAK,EAAE,IAAI,EAAE,UAAU,IAAI,aAAa,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAKnF,MAAM,WAAW,oBAAqB,SAAQ,IAAI,CAAC,EAAE,CAAC,oBAAoB,EAAE,MAAM,CAAC;IACjF,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,KAAK,GAAG,IAAI,CAAC;CACpB;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,oBAAoB,YA4C1D;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,aAAa,CAAC;IACpB,GAAG,CAAC,EAAE,QAAQ,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,eAAe,YAShD"}

package/dist/src/typescript/components/enum-declaration.js

@@ -1,5 +1,5 @@
 import { createComponent as _$createComponent, memo as _$memo } from "@alloy-js/core/jsx-runtime";
-import * as ay from "@alloy-js/core";
+import { For } from "@alloy-js/core";
 import * as ts from "@alloy-js/typescript";
 import { useTsp } from "../../core/context/tsp-context.js";
 import { reportDiagnostic } from "../../lib.js";
@@ -38,7 +38,7 @@ export function EnumDeclaration(props) {
       return props.export;
     },
     get children() {
-      return _$createComponent(ay.For, {
+      return _$createComponent(For, {
         each: members,
         joiner: ",\n",
         children: ([key, value]) => {

package/dist/src/typescript/components/function-declaration.d.ts

@@ -1,5 +1,5 @@
 import * as ts from "@alloy-js/typescript";
-import { Model, Operation } from "@typespec/compiler";
+import type { Model, Operation } from "@typespec/compiler";
 export interface FunctionDeclarationPropsWithType extends Omit<ts.FunctionDeclarationProps, "name"> {
     type: Operation;
     name?: string;

package/dist/src/typescript/components/function-declaration.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"function-declaration.d.ts","sourceRoot":"","sources":["../../../../src/typescript/components/function-declaration.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAC3C,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAMtD,MAAM,WAAW,gCACf,SAAQ,IAAI,CAAC,EAAE,CAAC,wBAAwB,EAAE,MAAM,CAAC;IACjD,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,cAAc,CAAC,EAAE,SAAS,GAAG,QAAQ,GAAG,SAAS,CAAC;CACnD;AAED,MAAM,MAAM,wBAAwB,GAChC,gCAAgC,GAChC,EAAE,CAAC,wBAAwB,CAAC;AAEhC;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,wBAAwB,qCAsClE;yBAtCe,mBAAmB;4BA+CyB,uBAAuB;;AAPnF,MAAM,WAAW,4BAA6B,SAAQ,IAAI,CAAC,EAAE,CAAC,wBAAwB,EAAE,MAAM,CAAC;IAC7F,IAAI,EAAE,KAAK,CAAC;IACZ,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,MAAM,uBAAuB,GAAG,4BAA4B,GAAG,EAAE,CAAC,uBAAuB,CAAC"}
+{"version":3,"file":"function-declaration.d.ts","sourceRoot":"","sources":["../../../../src/typescript/components/function-declaration.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAC3C,OAAO,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAM3D,MAAM,WAAW,gCACf,SAAQ,IAAI,CAAC,EAAE,CAAC,wBAAwB,EAAE,MAAM,CAAC;IACjD,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,cAAc,CAAC,EAAE,SAAS,GAAG,QAAQ,GAAG,SAAS,CAAC;CACnD;AAED,MAAM,MAAM,wBAAwB,GAChC,gCAAgC,GAChC,EAAE,CAAC,wBAAwB,CAAC;AAEhC;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,wBAAwB,qCAsClE;yBAtCe,mBAAmB;4BA+CyB,uBAAuB;;AAPnF,MAAM,WAAW,4BAA6B,SAAQ,IAAI,CAAC,EAAE,CAAC,wBAAwB,EAAE,MAAM,CAAC;IAC7F,IAAI,EAAE,KAAK,CAAC;IACZ,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,MAAM,uBAAuB,GAAG,4BAA4B,GAAG,EAAE,CAAC,uBAAuB,CAAC"}

package/dist/src/typescript/components/function-expression.d.ts

@@ -1,5 +1,5 @@
 import * as ts from "@alloy-js/typescript";
-import { Operation } from "@typespec/compiler";
+import type { Operation } from "@typespec/compiler";
 export interface FunctionExpressionProps extends ts.FunctionExpressionProps {
     type?: Operation;
     /**
@@ -13,5 +13,5 @@ export interface FunctionExpressionProps extends ts.FunctionExpressionProps {
  * function expression by converting from a TypeSpec Operation. Any other props
  * provided will take precedence.
  */
-export declare function FunctionExpression(props: Readonly<FunctionExpressionProps>): import("@alloy-js/core/jsx-runtime").Children;
+export declare function FunctionExpression(props: Readonly<FunctionExpressionProps>): import("@alloy-js/core").Children;
 //# sourceMappingURL=function-expression.d.ts.map

package/dist/src/typescript/components/function-expression.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"function-expression.d.ts","sourceRoot":"","sources":["../../../../src/typescript/components/function-expression.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAI/C,MAAM,WAAW,uBAAwB,SAAQ,EAAE,CAAC,uBAAuB;IACzE,IAAI,CAAC,EAAE,SAAS,CAAC;IACjB;;;OAGG;IACH,cAAc,CAAC,EAAE,SAAS,GAAG,QAAQ,GAAG,SAAS,CAAC;CACnD;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,QAAQ,CAAC,uBAAuB,CAAC,iDAoB1E"}
+{"version":3,"file":"function-expression.d.ts","sourceRoot":"","sources":["../../../../src/typescript/components/function-expression.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAC3C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAIpD,MAAM,WAAW,uBAAwB,SAAQ,EAAE,CAAC,uBAAuB;IACzE,IAAI,CAAC,EAAE,SAAS,CAAC;IACjB;;;OAGG;IACH,cAAc,CAAC,EAAE,SAAS,GAAG,QAAQ,GAAG,SAAS,CAAC;CACnD;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,QAAQ,CAAC,uBAAuB,CAAC,qCAoB1E"}

package/dist/src/typescript/components/function-expression.js

@@ -1,4 +1,5 @@
-import { splitProps, mergeProps as _$mergeProps, createComponent as _$createComponent } from "@alloy-js/core/jsx-runtime";
+import { mergeProps as _$mergeProps, createComponent as _$createComponent } from "@alloy-js/core/jsx-runtime";
+import { splitProps } from "@alloy-js/core";
 import * as ts from "@alloy-js/typescript";
 import { buildParameterDescriptors, getReturnType } from "../utils/operation.js";
 import { TypeExpression } from "./type-expression.js";

package/dist/src/typescript/components/function-type.d.ts

@@ -1,5 +1,5 @@
 import * as ts from "@alloy-js/typescript";
-import { Operation } from "@typespec/compiler";
+import type { Operation } from "@typespec/compiler";
 export interface FunctionTypeProps extends ts.FunctionTypeProps {
     type?: Operation;
     /**
@@ -13,5 +13,5 @@ export interface FunctionTypeProps extends ts.FunctionTypeProps {
  * by converting from a TypeSpec Operation. Any other props provided will take
  * precedence.
  */
-export declare function FunctionType(props: Readonly<FunctionTypeProps>): import("@alloy-js/core/jsx-runtime").Children;
+export declare function FunctionType(props: Readonly<FunctionTypeProps>): import("@alloy-js/core").Children;
 //# sourceMappingURL=function-type.d.ts.map

package/dist/src/typescript/components/function-type.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"function-type.d.ts","sourceRoot":"","sources":["../../../../src/typescript/components/function-type.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAI/C,MAAM,WAAW,iBAAkB,SAAQ,EAAE,CAAC,iBAAiB;IAC7D,IAAI,CAAC,EAAE,SAAS,CAAC;IACjB;;;OAGG;IACH,cAAc,CAAC,EAAE,SAAS,GAAG,QAAQ,GAAG,SAAS,CAAC;CACnD;AACD;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,KAAK,EAAE,QAAQ,CAAC,iBAAiB,CAAC,iDAkB9D"}
+{"version":3,"file":"function-type.d.ts","sourceRoot":"","sources":["../../../../src/typescript/components/function-type.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAC3C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAIpD,MAAM,WAAW,iBAAkB,SAAQ,EAAE,CAAC,iBAAiB;IAC7D,IAAI,CAAC,EAAE,SAAS,CAAC;IACjB;;;OAGG;IACH,cAAc,CAAC,EAAE,SAAS,GAAG,QAAQ,GAAG,SAAS,CAAC;CACnD;AACD;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,KAAK,EAAE,QAAQ,CAAC,iBAAiB,CAAC,qCAkB9D"}

package/dist/src/typescript/components/function-type.js

@@ -1,4 +1,5 @@
-import { splitProps, mergeProps as _$mergeProps, createComponent as _$createComponent } from "@alloy-js/core/jsx-runtime";
+import { mergeProps as _$mergeProps, createComponent as _$createComponent } from "@alloy-js/core/jsx-runtime";
+import { splitProps } from "@alloy-js/core";
 import * as ts from "@alloy-js/typescript";
 import { buildParameterDescriptors, getReturnType } from "../utils/operation.js";
 import { TypeExpression } from "./type-expression.js";

package/dist/src/typescript/components/interface-declaration.d.ts

@@ -1,14 +1,14 @@
-import * as ay from "@alloy-js/core";
+import { type Children } from "@alloy-js/core";
 import * as ts from "@alloy-js/typescript";
-import { Interface, Model } from "@typespec/compiler";
+import { type Interface, type Model } from "@typespec/compiler";
 export interface TypedInterfaceDeclarationProps extends Omit<ts.InterfaceDeclarationProps, "name"> {
     type: Model | Interface;
     name?: string;
 }
 export type InterfaceDeclarationProps = TypedInterfaceDeclarationProps | ts.InterfaceDeclarationProps;
-export declare function InterfaceDeclaration(props: InterfaceDeclarationProps): ay.Children;
+export declare function InterfaceDeclaration(props: InterfaceDeclarationProps): Children;
 export interface InterfaceExpressionProps extends ts.InterfaceExpressionProps {
     type: Model | Interface;
 }
-export declare function InterfaceExpression(props: InterfaceExpressionProps): ay.Children;
+export declare function InterfaceExpression(props: InterfaceExpressionProps): Children;
 //# sourceMappingURL=interface-declaration.d.ts.map

package/dist/src/typescript/components/interface-declaration.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"interface-declaration.d.ts","sourceRoot":"","sources":["../../../../src/typescript/components/interface-declaration.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAErC,OAAO,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAC3C,OAAO,EACL,SAAS,EAET,KAAK,EAIN,MAAM,oBAAoB,CAAC;AAQ5B,MAAM,WAAW,8BAA+B,SAAQ,IAAI,CAAC,EAAE,CAAC,yBAAyB,EAAE,MAAM,CAAC;IAChG,IAAI,EAAE,KAAK,GAAG,SAAS,CAAC;IACxB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,MAAM,yBAAyB,GACjC,8BAA8B,GAC9B,EAAE,CAAC,yBAAyB,CAAC;AAEjC,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,yBAAyB,eAmCpE;AAQD,MAAM,WAAW,wBAAyB,SAAQ,EAAE,CAAC,wBAAwB;IAC3E,IAAI,EAAE,KAAK,GAAG,SAAS,CAAC;CACzB;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,wBAAwB,eAMlE"}
+{"version":3,"file":"interface-declaration.d.ts","sourceRoot":"","sources":["../../../../src/typescript/components/interface-declaration.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAS,KAAK,QAAQ,EAAgB,MAAM,gBAAgB,CAAC;AACpE,OAAO,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAC3C,OAAO,EACL,KAAK,SAAS,EAEd,KAAK,KAAK,EAIX,MAAM,oBAAoB,CAAC;AAQ5B,MAAM,WAAW,8BAA+B,SAAQ,IAAI,CAAC,EAAE,CAAC,yBAAyB,EAAE,MAAM,CAAC;IAChG,IAAI,EAAE,KAAK,GAAG,SAAS,CAAC;IACxB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,MAAM,yBAAyB,GACjC,8BAA8B,GAC9B,EAAE,CAAC,yBAAyB,CAAC;AAEjC,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,yBAAyB,YAmCpE;AAQD,MAAM,WAAW,wBAAyB,SAAQ,EAAE,CAAC,wBAAwB;IAC3E,IAAI,EAAE,KAAK,GAAG,SAAS,CAAC;CACzB;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,wBAAwB,YAMlE"}

package/dist/src/typescript/components/interface-declaration.js

@@ -1,6 +1,5 @@
 import { createComponent as _$createComponent, mergeProps as _$mergeProps, memo as _$memo } from "@alloy-js/core/jsx-runtime";
-import * as ay from "@alloy-js/core";
-import { mapJoin } from "@alloy-js/core";
+import { Block, For, mapJoin } from "@alloy-js/core";
 import * as ts from "@alloy-js/typescript";
 import { isNeverType } from "@typespec/compiler";
 import { createRekeyableMap } from "@typespec/compiler/utils";
@@ -51,7 +50,7 @@ function isTypedInterfaceDeclarationProps(props) {
   return "type" in props;
 }
 export function InterfaceExpression(props) {
-  return _$createComponent(ay.Block, {
+  return _$createComponent(Block, {
     get children() {
       return _$createComponent(InterfaceBody, props);
     }
@@ -130,7 +129,7 @@ function InterfaceBody(props) {
   const enderProp = validTypeMembers.length > 0 ? {
     ender: ";"
   } : {};
-  return [_$createComponent(ay.For, _$mergeProps({
+  return [_$createComponent(For, _$mergeProps({
     each: validTypeMembers,
     semicolon: true,
     line: true

package/dist/src/typescript/components/interface-member.d.ts

@@ -1,5 +1,5 @@
-import { Children } from "@alloy-js/core";
-import { ModelProperty, Operation } from "@typespec/compiler";
+import { type Children } from "@alloy-js/core";
+import { type ModelProperty, type Operation } from "@typespec/compiler";
 export interface InterfaceMemberProps {
     type: ModelProperty | Operation;
     doc?: Children;

package/dist/src/typescript/components/interface-member.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"interface-member.d.ts","sourceRoot":"","sources":["../../../../src/typescript/components/interface-member.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE1C,OAAO,EAAe,aAAa,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAM3E,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,aAAa,GAAG,SAAS,CAAC;IAChC,GAAG,CAAC,EAAE,QAAQ,CAAC;IACf,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,oBAAoB,YA8B1D"}
+{"version":3,"file":"interface-member.d.ts","sourceRoot":"","sources":["../../../../src/typescript/components/interface-member.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE/C,OAAO,EAAe,KAAK,aAAa,EAAE,KAAK,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAMrF,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,aAAa,GAAG,SAAS,CAAC;IAChC,GAAG,CAAC,EAAE,QAAQ,CAAC;IACf,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,oBAAoB,YA8B1D"}

package/dist/src/typescript/components/interface-method.d.ts

@@ -1,6 +1,6 @@
-import { Children } from "@alloy-js/core";
+import { type Children } from "@alloy-js/core";
 import * as ts from "@alloy-js/typescript";
-import { Operation } from "@typespec/compiler";
+import type { Operation } from "@typespec/compiler";
 export interface InterfaceMethodPropsWithType extends Omit<ts.InterfaceMethodProps, "name"> {
     type: Operation;
     name?: string;

package/dist/src/typescript/components/interface-method.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"interface-method.d.ts","sourceRoot":"","sources":["../../../../src/typescript/components/interface-method.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAc,MAAM,gBAAgB,CAAC;AACtD,OAAO,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAK/C,MAAM,WAAW,4BAA6B,SAAQ,IAAI,CAAC,EAAE,CAAC,oBAAoB,EAAE,MAAM,CAAC;IACzF,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,GAAG,CAAC,EAAE,QAAQ,CAAC;IACf,cAAc,CAAC,EAAE,SAAS,GAAG,QAAQ,GAAG,SAAS,CAAC;CACnD;AAED,MAAM,MAAM,oBAAoB,GAAG,4BAA4B,GAAG,EAAE,CAAC,oBAAoB,CAAC;AAE1F;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,QAAQ,CAAC,oBAAoB,CAAC,YAgCpE"}
+{"version":3,"file":"interface-method.d.ts","sourceRoot":"","sources":["../../../../src/typescript/components/interface-method.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,QAAQ,EAAc,MAAM,gBAAgB,CAAC;AAC3D,OAAO,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAC3C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAKpD,MAAM,WAAW,4BAA6B,SAAQ,IAAI,CAAC,EAAE,CAAC,oBAAoB,EAAE,MAAM,CAAC;IACzF,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,GAAG,CAAC,EAAE,QAAQ,CAAC;IACf,cAAc,CAAC,EAAE,SAAS,GAAG,QAAQ,GAAG,SAAS,CAAC;CACnD;AAED,MAAM,MAAM,oBAAoB,GAAG,4BAA4B,GAAG,EAAE,CAAC,oBAAoB,CAAC;AAE1F;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,QAAQ,CAAC,oBAAoB,CAAC,YAgCpE"}

package/dist/src/typescript/components/record-expression.d.ts

@@ -1,4 +1,4 @@
-import { Type } from "@typespec/compiler";
+import type { Type } from "@typespec/compiler";
 export interface RecordExpressionProps {
     elementType: Type;
 }