@alloy-js/csharp 0.20.0-dev.1 → 0.20.0-dev.10

package/dist/src/symbols/named-type.js

@@ -0,0 +1,31 @@
+import { CSharpSymbol } from "./csharp.js";
+
+// represents a symbol from a .cs file. Class, enum, interface etc.
+
+/**
+ * A symbol for a named type in C# such as a class, interface, enum, and so
+ * forth. Named types are generally defined in a namespace, and can have members
+ * of their own.
+ */
+export class NamedTypeSymbol extends CSharpSymbol {
+  symbolKind = "named-type";
+  static memberSpaces = ["members"];
+  constructor(name, spaces, kind, options) {
+    super(name, spaces, options);
+    this.#typeKind = kind;
+  }
+  #typeKind;
+  get typeKind() {
+    return this.#typeKind;
+  }
+  copy() {
+    const options = this.getCopyOptions();
+    const copy = new NamedTypeSymbol(this.name, undefined, this.#typeKind, options);
+    this.initializeCopy(copy);
+    return copy;
+  }
+  get members() {
+    return this.memberSpaceFor("members");
+  }
+}
+//# sourceMappingURL=named-type.js.map

package/dist/src/symbols/named-type.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["CSharpSymbol","NamedTypeSymbol","symbolKind","memberSpaces","constructor","name","spaces","kind","options","typeKind","copy","getCopyOptions","undefined","initializeCopy","members","memberSpaceFor"],"sources":["../../../src/symbols/named-type.ts"],"sourcesContent":[null],"mappings":"AACA,SAASA,YAAY,QAAQ,aAAa;;AAE1C;;AAWA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,eAAe,SAASD,YAAY,CAAC;EAChCE,UAAU,GAAwB,YAAY;EAC9D,OAAuBC,YAAY,GAAG,CAAC,SAAS,CAAC;EAEjDC,WAAWA,CACTC,IAAsB,EACtBC,MAA+C,EAC/CC,IAAuB,EACvBC,OAA6B,EAC7B;IACA,KAAK,CAACH,IAAI,EAAEC,MAAM,EAAEE,OAAO,CAAC;IAC5B,IAAI,CAAC,CAACC,QAAQ,GAAGF,IAAI;EACvB;EAEA,CAACE,QAAQ;EACT,IAAIA,QAAQA,CAAA,EAAG;IACb,OAAO,IAAI,CAAC,CAACA,QAAQ;EACvB;EAEAC,IAAIA,CAAA,EAAG;IACL,MAAMF,OAAO,GAAG,IAAI,CAACG,cAAc,CAAC,CAAC;IACrC,MAAMD,IAAI,GAAG,IAAIT,eAAe,CAC9B,IAAI,CAACI,IAAI,EACTO,SAAS,EACT,IAAI,CAAC,CAACH,QAAQ,EACdD,OACF,CAAC;IACD,IAAI,CAACK,cAAc,CAACH,IAAI,CAAC;IACzB,OAAOA,IAAI;EACb;EAEA,IAAII,OAAOA,CAAA,EAAG;IACZ,OAAO,IAAI,CAACC,cAAc,CAAC,SAAS,CAAC;EACvC;AACF","ignoreList":[]}

package/dist/src/symbols/namespace.d.ts

@@ -0,0 +1,22 @@
+import { OutputSymbolOptions } from "@alloy-js/core";
+import { NamedTypeSymbol } from "./named-type.js";
+export interface NamespaceSymbolOptions extends OutputSymbolOptions {
+    isGlobal?: boolean;
+}
+/**
+ * A symbol for a namespace in C#.
+ */
+export declare class NamespaceSymbol extends NamedTypeSymbol {
+    #private;
+    readonly symbolKind = "namespace";
+    constructor(name: string, parentNamespace?: NamespaceSymbol, options?: NamespaceSymbolOptions);
+    /**
+     * Whether this symbol is the global namespace symbol.
+     */
+    get isGlobal(): boolean;
+    getFullyQualifiedName(options?: {
+        omitGlobal?: boolean;
+    }): string;
+    copy(): NamespaceSymbol;
+}
+//# sourceMappingURL=namespace.d.ts.map

package/dist/src/symbols/namespace.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"namespace.d.ts","sourceRoot":"","sources":["../../../src/symbols/namespace.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAElD,MAAM,WAAW,sBAAuB,SAAQ,mBAAmB;IACjE,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED;;GAEG;AACH,qBAAa,eAAgB,SAAQ,eAAe;;IAClD,SAAgB,UAAU,eAAe;gBAEvC,IAAI,EAAE,MAAM,EACZ,eAAe,CAAC,EAAE,eAAe,EACjC,OAAO,CAAC,EAAE,sBAAsB;IAUlC;;OAEG;IACH,IAAI,QAAQ,YAEX;IAED,qBAAqB,CAAC,OAAO,GAAE;QAAE,UAAU,CAAC,EAAE,OAAO,CAAA;KAAO,GAAG,MAAM;IAoBrE,IAAI;CASL"}

package/dist/src/symbols/namespace.js

@@ -0,0 +1,45 @@
+import { NamedTypeSymbol } from "./named-type.js";
+/**
+ * A symbol for a namespace in C#.
+ */
+export class NamespaceSymbol extends NamedTypeSymbol {
+  symbolKind = "namespace";
+  constructor(name, parentNamespace, options) {
+    const space = parentNamespace?.members;
+    super(name, space, "namespace", options);
+    this.#isGlobal = !!options?.isGlobal;
+  }
+  #isGlobal;
+  /**
+   * Whether this symbol is the global namespace symbol.
+   */
+  get isGlobal() {
+    return this.#isGlobal;
+  }
+  getFullyQualifiedName(options = {}) {
+    const parts = [];
+
+    // eslint-disable-next-line @typescript-eslint/no-this-alias
+    let current = this;
+    while (current && !current.isGlobal) {
+      parts.unshift(current.name);
+      current = current.ownerSymbol;
+    }
+    const idPart = parts.join(".");
+    if (options.omitGlobal) {
+      return idPart;
+    } else {
+      return `global::${idPart}`;
+    }
+  }
+  copy() {
+    const options = this.getCopyOptions();
+    const copy = new NamespaceSymbol(this.name, undefined, {
+      ...options,
+      isGlobal: this.#isGlobal
+    });
+    this.initializeCopy(copy);
+    return copy;
+  }
+}
+//# sourceMappingURL=namespace.js.map

package/dist/src/symbols/namespace.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["NamedTypeSymbol","NamespaceSymbol","symbolKind","constructor","name","parentNamespace","options","space","members","isGlobal","getFullyQualifiedName","parts","current","unshift","ownerSymbol","idPart","join","omitGlobal","copy","getCopyOptions","undefined","initializeCopy"],"sources":["../../../src/symbols/namespace.ts"],"sourcesContent":[null],"mappings":"AACA,SAASA,eAAe,QAAQ,iBAAiB;AAMjD;AACA;AACA;AACA,OAAO,MAAMC,eAAe,SAASD,eAAe,CAAC;EACnCE,UAAU,GAAG,WAAW;EACxCC,WAAWA,CACTC,IAAY,EACZC,eAAiC,EACjCC,OAAgC,EAChC;IACA,MAAMC,KAAK,GAAGF,eAAe,EAAEG,OAAO;IAEtC,KAAK,CAACJ,IAAI,EAAEG,KAAK,EAAE,WAAW,EAAED,OAAO,CAAC;IAExC,IAAI,CAAC,CAACG,QAAQ,GAAG,CAAC,CAACH,OAAO,EAAEG,QAAQ;EACtC;EAEA,CAACA,QAAQ;EACT;AACF;AACA;EACE,IAAIA,QAAQA,CAAA,EAAG;IACb,OAAO,IAAI,CAAC,CAACA,QAAQ;EACvB;EAEAC,qBAAqBA,CAACJ,OAAiC,GAAG,CAAC,CAAC,EAAU;IACpE,MAAMK,KAAK,GAAG,EAAE;;IAEhB;IACA,IAAIC,OAAoC,GAAG,IAAI;IAE/C,OAAOA,OAAO,IAAI,CAACA,OAAO,CAACH,QAAQ,EAAE;MACnCE,KAAK,CAACE,OAAO,CAACD,OAAO,CAACR,IAAI,CAAC;MAC3BQ,OAAO,GAAGA,OAAO,CAACE,WAA0C;IAC9D;IAEA,MAAMC,MAAM,GAAGJ,KAAK,CAACK,IAAI,CAAC,GAAG,CAAC;IAE9B,IAAIV,OAAO,CAACW,UAAU,EAAE;MACtB,OAAOF,MAAM;IACf,CAAC,MAAM;MACL,OAAO,WAAWA,MAAM,EAAE;IAC5B;EACF;EAEAG,IAAIA,CAAA,EAAG;IACL,MAAMZ,OAAO,GAAG,IAAI,CAACa,cAAc,CAAC,CAAC;IACrC,MAAMD,IAAI,GAAG,IAAIjB,eAAe,CAAC,IAAI,CAACG,IAAI,EAAEgB,SAAS,EAAE;MACrD,GAAGd,OAAO;MACVG,QAAQ,EAAE,IAAI,CAAC,CAACA;IAClB,CAAC,CAAC;IACF,IAAI,CAACY,cAAc,CAACH,IAAI,CAAC;IACzB,OAAOA,IAAI;EACb;AACF","ignoreList":[]}

package/dist/src/symbols/reference.d.ts

@@ -1,3 +1,3 @@
-import * as core from "@alloy-js/core";
-export declare function ref(refkey: core.Refkey): () => string;
+import { Children, OutputSymbol, Refkey } from "@alloy-js/core";
+export declare function ref(refkey: Refkey): () => [Children, OutputSymbol | undefined];
 //# sourceMappingURL=reference.d.ts.map

package/dist/src/symbols/reference.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"reference.d.ts","sourceRoot":"","sources":["../../../src/symbols/reference.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,gBAAgB,CAAC;AAoBvC,wBAAgB,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,GAAG,MAAM,MAAM,CA4CrD"}
+{"version":3,"file":"reference.d.ts","sourceRoot":"","sources":["../../../src/symbols/reference.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAQ,YAAY,EAAE,MAAM,EAAW,MAAM,gBAAgB,CAAC;AAW/E,wBAAgB,GAAG,CACjB,MAAM,EAAE,MAAM,GACb,MAAM,CAAC,QAAQ,EAAE,YAAY,GAAG,SAAS,CAAC,CAiD5C"}

package/dist/src/symbols/reference.js

@@ -1,54 +1,60 @@
-import * as core from "@alloy-js/core";
-import { useNamespace } from "../components/Namespace.js";
-import { useSourceFile } from "../components/SourceFile.js";
-
-// when resolving references across source files, the last element
-// in pathDown will be the containing source file. we only need this
-// here so we can find and remove this scope as it's not useful
-// when building the reference
-
+import { createComponent as _$createComponent } from "@alloy-js/core/jsx-runtime";
+import { AccessExpression } from "#components/access-expression/access-expression.js";
+import { memo, resolve } from "@alloy-js/core";
+import { CSharpNamespaceScope } from "../scopes/namespace.js";
+import { useSourceFileScope } from "../scopes/source-file.js";
 // converts a refkey to its fully qualified name
 // e.g. if refkey is for bar in enum type foo, and
 // foo is in the same namespace as the refkey, then
 // the result would be foo.bar.
 export function ref(refkey) {
-  const targetNamespaceCtx = useNamespace();
-  const resolveResult = core.resolve(refkey);
-  return core.memo(() => {
+  const refSfScope = useSourceFileScope();
+  const resolveResult = resolve(refkey);
+  return memo(() => {
     if (resolveResult.value === undefined) {
-      return "<Unresolved Symbol>";
+      return ["<Unresolved Symbol>", undefined];
     }
-
-    // targetDeclaration is the symbol with the refkey
-    // pathDown is an array of scopes to that symbol and can be empty.
-    // the entries are top-down, so namespace, source-file, member
-    //  - referencing a type within the same namespace will have an empty path
-    //  - referencing a member (e.g. enum value) within the same namespace will
-    //    have a single path entry that contains the owning type
-    //  - referencing a type within the same namespace but in a different source
-    //    file will have at least a source-file entry
-    //  - referencing a symbol outside the current namespace will have at least
-    //    two entries, namespace, source-file
+    const result = resolveResult.value;
     const {
-      targetDeclaration,
-      pathDown
-    } = resolveResult.value;
-    const sourceNamespace = pathDown.find(v => {
-      return v.kind === "namespace";
-    });
-    if (sourceNamespace && sourceNamespace.name !== targetNamespaceCtx.name) {
-      // the source symbol is in a different namespace that the target refkey.
-      // add the applicable using statement to the target's source file.
-      const targetSrc = useSourceFile();
-      targetSrc.addUsing(sourceNamespace.name);
+      commonScope,
+      pathDown,
+      memberPath
+    } = result;
+    let {
+      lexicalDeclaration
+    } = result;
+    if (!commonScope) {
+      // this shouldn't be possible in csharp.
+      return ["<Unresolved Symbol>", undefined];
     }
-
-    // we only need to build the fully-qualified name for members
-    // TODO: possibly a subset of members
-    const syms = pathDown.filter(v => {
-      return v.kind === "member";
-    }).map(s => s.owner);
-    syms.push(targetDeclaration);
-    return syms.map(sym => sym.name).join(".");
+    if (commonScope instanceof CSharpNamespaceScope && commonScope.ownerSymbol.isGlobal && lexicalDeclaration.symbolKind === "namespace" && memberPath.length > 0) {
+      // we need to using the namespace
+      let nsToUse;
+      while (lexicalDeclaration.symbolKind === "namespace" && memberPath.length > 0) {
+        nsToUse = lexicalDeclaration;
+        lexicalDeclaration = memberPath.shift();
+      }
+      refSfScope.addUsing(nsToUse);
+    }
+    const parts = [];
+    for (const nsScope of pathDown) {
+      parts.push(_$createComponent(AccessExpression.Part, {
+        get symbol() {
+          return nsScope.ownerSymbol;
+        }
+      }));
+    }
+    parts.push(_$createComponent(AccessExpression.Part, {
+      symbol: lexicalDeclaration
+    }));
+    for (const member of memberPath) {
+      parts.push(_$createComponent(AccessExpression.Part, {
+        symbol: member
+      }));
+    }
+    return [_$createComponent(AccessExpression, {
+      children: parts
+    }), result.symbol];
   });
-}
+}
+//# sourceMappingURL=reference.js.map

package/dist/src/symbols/reference.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["AccessExpression","memo","resolve","CSharpNamespaceScope","useSourceFileScope","ref","refkey","refSfScope","resolveResult","value","undefined","result","commonScope","pathDown","memberPath","lexicalDeclaration","ownerSymbol","isGlobal","symbolKind","length","nsToUse","shift","addUsing","parts","nsScope","push","_$createComponent","Part","symbol","member","children"],"sources":["../../../src/symbols/reference.tsx"],"sourcesContent":[null],"mappings":";AAAA,SAASA,gBAAgB;AACzB,SAAmBC,IAAI,EAAwBC,OAAO,QAAQ,gBAAgB;AAE9E,SAASC,oBAAoB,QAAQ,wBAAwB;AAC7D,SAASC,kBAAkB,QAAQ,0BAA0B;AAI7D;AACA;AACA;AACA;AACA,OAAO,SAASC,GAAGA,CACjBC,MAAc,EAC8B;EAC5C,MAAMC,UAAU,GAAGH,kBAAkB,CAAC,CAAE;EACxC,MAAMI,aAAa,GAAGN,OAAO,CAA4BI,MAAgB,CAAC;EAC1E,OAAOL,IAAI,CAAC,MAAM;IAChB,IAAIO,aAAa,CAACC,KAAK,KAAKC,SAAS,EAAE;MACrC,OAAO,CAAC,qBAAqB,EAAEA,SAAS,CAAC;IAC3C;IAEA,MAAMC,MAAM,GAAGH,aAAa,CAACC,KAAK;IAClC,MAAM;MAAEG,WAAW;MAAEC,QAAQ;MAAEC;IAAW,CAAC,GAAGH,MAAM;IACpD,IAAI;MAAEI;IAAmB,CAAC,GAAGJ,MAAM;IAEnC,IAAI,CAACC,WAAW,EAAE;MAChB;MACA,OAAO,CAAC,qBAAqB,EAAEF,SAAS,CAAC;IAC3C;IAEA,IACEE,WAAW,YAAYT,oBAAoB,IAC3CS,WAAW,CAACI,WAAW,CAACC,QAAQ,IAChCF,kBAAkB,CAACG,UAAU,KAAK,WAAW,IAC7CJ,UAAU,CAACK,MAAM,GAAG,CAAC,EACrB;MACA;MACA,IAAIC,OAAwB;MAC5B,OACEL,kBAAkB,CAACG,UAAU,KAAK,WAAW,IAC7CJ,UAAU,CAACK,MAAM,GAAG,CAAC,EACrB;QACAC,OAAO,GAAGL,kBAAqC;QAC/CA,kBAAkB,GAAGD,UAAU,CAACO,KAAK,CAAC,CAAE;MAC1C;MAEAd,UAAU,CAACe,QAAQ,CAACF,OAAQ,CAAC;IAC/B;IAEA,MAAMG,KAAK,GAAG,EAAE;IAEhB,KAAK,MAAMC,OAAO,IAAIX,QAAQ,EAAE;MAC9BU,KAAK,CAACE,IAAI,CAAAC,iBAAA,CAAE1B,gBAAgB,CAAC2B,IAAI;QAAA,IAACC,MAAMA,CAAA;UAAA,OAAEJ,OAAO,CAACR,WAAW;QAAA;MAAA,EAAK,CAAC;IACrE;IAEAO,KAAK,CAACE,IAAI,CAAAC,iBAAA,CAAE1B,gBAAgB,CAAC2B,IAAI;MAACC,MAAM,EAAEb;IAAkB,EAAI,CAAC;IACjE,KAAK,MAAMc,MAAM,IAAIf,UAAU,EAAE;MAC/BS,KAAK,CAACE,IAAI,CAAAC,iBAAA,CAAE1B,gBAAgB,CAAC2B,IAAI;QAACC,MAAM,EAAEC;MAAM,EAAI,CAAC;IACvD;IAEA,OAAO,CAAAH,iBAAA,CAAE1B,gBAAgB;MAAC8B,QAAQ,EAAEP;IAAK,IAAMZ,MAAM,CAACiB,MAAM,CAAC;EAC/D,CAAC,CAAC;AACJ","ignoreList":[]}

package/dist/test/project-directory.test.js

@@ -37,7 +37,9 @@ it("defines a project directory file with multiple source files", () => {
         }
       });
     }
-  }));
+  }), {
+    insertFinalNewLine: false
+  });
   const projDir = res.contents[0];
   expect(projDir.path).equals("~/projects/TestProject");
   expect(projDir.contents[0].path).equals("~/projects/TestProject/TestProject.csproj");
@@ -53,17 +55,15 @@ it("defines a project directory file with multiple source files", () => {
   const srcDir = projDir.contents[1];
   expect(srcDir.contents[0].path).equals("~/projects/TestProject/src/Test1.cs");
   expect(srcDir.contents[0].contents).toBe(coretest.d`
-    namespace TestCode
-    {
-        public class TestClass1;
-    }
+    namespace TestCode;
+    
+    public class TestClass1;
   `);
   expect(srcDir.contents[1].path).equals("~/projects/TestProject/src/Test2.cs");
   expect(srcDir.contents[1].contents).toBe(coretest.d`
-    namespace TestCode
-    {
-        public class TestClass2;
-    }
+    namespace TestCode;
+    
+    public class TestClass2;
   `);
 });
 it("defines a project directory file with multiple source files and a custom TFM", () => {
@@ -101,7 +101,9 @@ it("defines a project directory file with multiple source files and a custom TFM
         }
       });
     }
-  }));
+  }), {
+    insertFinalNewLine: false
+  });
   const projDir = res.contents[0];
   expect(projDir.path).equals("~/projects/TestProject");
   expect(projDir.contents[0].path).equals("~/projects/TestProject/TestProject.csproj");
@@ -117,16 +119,15 @@ it("defines a project directory file with multiple source files and a custom TFM
   const srcDir = projDir.contents[1];
   expect(srcDir.contents[0].path).equals("~/projects/TestProject/src/Test1.cs");
   expect(srcDir.contents[0].contents).toBe(coretest.d`
-    namespace TestCode
-    {
-        public class TestClass1;
-    }
+    namespace TestCode;
+    
+    public class TestClass1;
   `);
   expect(srcDir.contents[1].path).equals("~/projects/TestProject/src/Test2.cs");
   expect(srcDir.contents[1].contents).toBe(coretest.d`
-    namespace TestCode
-    {
-        public class TestClass2;
-    }
+    namespace TestCode;
+    
+    public class TestClass2;
   `);
-});
+});
+//# sourceMappingURL=project-directory.test.js.map

package/dist/test/project-directory.test.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["core","coretest","expect","it","csharp","res","render","_$createComponent","Output","children","ProjectDirectory","name","path","version","description","Namespace","SourceFile","ClassDeclaration","insertFinalNewLine","projDir","contents","equals","toBe","d","srcDir","targetFrameworkMoniker"],"sources":["../../test/project-directory.test.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/test/using.test.js

@@ -3,7 +3,7 @@ import * as core from "@alloy-js/core";
 import * as coretest from "@alloy-js/core/testing";
 import { expect, it } from "vitest";
 import * as csharp from "../src/index.js";
-import { assertFileContents, findFile } from "./utils.js";
+import { findFile } from "./utils.js";
 it("uses a single namespace", () => {
   const res = core.render(_$createComponent(core.Output, {
     get children() {
@@ -21,7 +21,9 @@ it("uses a single namespace", () => {
   expect(findFile(res, "Test1.cs").contents).toBe(coretest.d`
     using Foo;
 
-    namespace TestCode {}
+    namespace TestCode;
+    
+
   `);
 });
 it("uses multiple namespaces", () => {
@@ -42,7 +44,9 @@ it("uses multiple namespaces", () => {
     using Bar.Baz;
     using Foo;
 
-    namespace TestCode {}
+    namespace TestCode;
+
+
   `);
 });
 it("adds using statement across namespaces", () => {
@@ -53,7 +57,7 @@ it("adds using statement across namespaces", () => {
     name: "BodyParam",
     type: inputTypeRefkey
   }];
-  const res = core.render(_$createComponent(core.Output, {
+  expect(_$createComponent(core.Output, {
     get namePolicy() {
       return csharp.createCSharpNamePolicy();
     },
@@ -111,32 +115,30 @@ it("adds using statement across namespaces", () => {
         }
       })];
     }
-  }));
-  assertFileContents(res, {
+  })).toRenderTo({
     "Models.cs": coretest.d`
-      namespace Models
+      namespace Models;
+
+      public class Input;
+      public class Output;
+      public enum TestEnum
       {
-          public class Input;
-          public class Output;
-          public enum TestEnum
-          {
-              One,
-              Two
-          }
+          One,
+          Two
       }
     `,
     "Client.cs": coretest.d`
       using Models;
       using System;
 
-      namespace Client
+      namespace Client;
+      
+      public class Client
       {
-          public class Client
-          {
-              public Output MethodOne(Input bodyParam) {}
-          }
-          TestEnum.Two;
+          public Output MethodOne(Input bodyParam) {}
       }
+      TestEnum.Two;
     `
   });
-});
+});
+//# sourceMappingURL=using.test.js.map

package/dist/test/using.test.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["core","coretest","expect","it","csharp","findFile","res","render","_$createComponent","Output","children","Namespace","name","SourceFile","path","using","contents","toBe","d","inputTypeRefkey","refkey","outputTypeRefkey","twoValRefkey","params","type","namePolicy","createCSharpNamePolicy","ClassDeclaration","_$createIntrinsic","EnumDeclaration","EnumMember","Method","parameters","returns","toRenderTo"],"sources":["../../test/using.test.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/test/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../test/utils.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,gBAAgB,CAAC;AAKvC,wBAAgB,aAAa,CAAC,KAAK,EAAE;IACnC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC;CACzB,GAAG,IAAI,CAAC,QAAQ,CAMhB;AACD,wBAAgB,YAAY,CAAC,CAAC,EAAE,IAAI,CAAC,QAAQ,GAAG,MAAM,CAWrD;AAED,wBAAgB,UAAU,CAAC,CAAC,EAAE,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,eAAe,CAMjE;AAED,wBAAgB,QAAQ,CACtB,GAAG,EAAE,IAAI,CAAC,eAAe,EACzB,IAAI,EAAE,MAAM,GACX,IAAI,CAAC,iBAAiB,CA2BxB;AAED,wBAAgB,kBAAkB,CAChC,GAAG,EAAE,IAAI,CAAC,eAAe,EACzB,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GACpC,IAAI,CAKN"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../test/utils.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,gBAAgB,CAAC;AAKvC,wBAAgB,aAAa,CAAC,KAAK,EAAE;IACnC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC;CACzB,GAAG,IAAI,CAAC,QAAQ,CAMhB;AACD,wBAAgB,YAAY,CAAC,CAAC,EAAE,IAAI,CAAC,QAAQ,GAAG,MAAM,CAYrD;AAED,wBAAgB,UAAU,CAAC,CAAC,EAAE,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,eAAe,CAMjE;AAED,wBAAgB,QAAQ,CACtB,GAAG,EAAE,IAAI,CAAC,eAAe,EACzB,IAAI,EAAE,MAAM,GACX,IAAI,CAAC,iBAAiB,CA2BxB;AAED,wBAAgB,kBAAkB,CAChC,GAAG,EAAE,IAAI,CAAC,eAAe,EACzB,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GACpC,IAAI,CAKN"}

package/dist/test/utils.js

@@ -9,8 +9,8 @@ export function TestNamespace(props) {
       return csharp.createCSharpNamePolicy();
     },
     get children() {
-      return _$createComponent(csharp.Namespace, {
-        name: "TestCode",
+      return _$createComponent(csharp.SourceFile, {
+        path: "Test.cs",
         get children() {
           return props.children;
         }
@@ -34,7 +34,9 @@ export function toSourceText(c) {
         }
       });
     }
-  }));
+  }), {
+    insertFinalNewLine: false
+  });
   const file = findFile(res, "Test.cs");
   return file.contents;
 }
@@ -76,4 +78,5 @@ export function assertFileContents(res, expectedFiles) {
     const file = findFile(res, path);
     expect(file.contents).toBe(coretest.dedent(contents));
   }
-}
+}
+//# sourceMappingURL=utils.js.map

package/dist/test/utils.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["core","coretest","expect","csharp","TestNamespace","props","_$createComponent","Output","namePolicy","createCSharpNamePolicy","children","SourceFile","path","toSourceText","c","res","render","Namespace","name","insertFinalNewLine","file","findFile","contents","testRender","result","findFileWorker","Error","item","kind","includes","found","assertFileContents","expectedFiles","Object","entries","toBe","dedent"],"sources":["../../test/utils.tsx"],"sourcesContent":[null],"mappings":";AAAA,OAAO,KAAKA,IAAI,MAAM,gBAAgB;AACtC,OAAO,KAAKC,QAAQ,MAAM,wBAAwB;AAClD,SAASC,MAAM,QAAQ,QAAQ;AAC/B,OAAO,KAAKC,MAAM,MAAM,iBAAiB;AAEzC,OAAO,SAASC,aAAaA,CAACC,KAE7B,EAAiB;EAChB,OAAAC,iBAAA,CACGN,IAAI,CAACO,MAAM;IAAA,IAACC,UAAUA,CAAA;MAAA,OAAEL,MAAM,CAACM,sBAAsB,CAAC,CAAC;IAAA;IAAA,IAAAC,SAAA;MAAA,OAAAJ,iBAAA,CACrDH,MAAM,CAACQ,UAAU;QAACC,IAAI;QAAA,IAAAF,SAAA;UAAA,OAAYL,KAAK,CAACK,QAAQ;QAAA;MAAA;IAAA;EAAA;AAGvD;AACA,OAAO,SAASG,YAAYA,CAACC,CAAgB,EAAU;EACrD,MAAMC,GAAG,GAAGf,IAAI,CAACgB,MAAM,CAAAV,iBAAA,CACpBN,IAAI,CAACO,MAAM;IAAA,IAACC,UAAUA,CAAA;MAAA,OAAEL,MAAM,CAACM,sBAAsB,CAAC,CAAC;IAAA;IAAA,IAAAC,SAAA;MAAA,OAAAJ,iBAAA,CACrDH,MAAM,CAACc,SAAS;QAACC,IAAI;QAAA,IAAAR,SAAA;UAAA,OAAAJ,iBAAA,CACnBH,MAAM,CAACQ,UAAU;YAACC,IAAI;YAAAF,QAAA,EAAYI;UAAC;QAAA;MAAA;IAAA;EAAA,IAGxC;IAAEK,kBAAkB,EAAE;EAAM,CAC9B,CAAC;EAED,MAAMC,IAAI,GAAGC,QAAQ,CAACN,GAAG,EAAE,SAAS,CAAC;EACrC,OAAOK,IAAI,CAACE,QAAQ;AACtB;AAEA,OAAO,SAASC,UAAUA,CAACT,CAAgB,EAAwB;EACjE,OAAOd,IAAI,CAACgB,MAAM,CAAAV,iBAAA,CACfN,IAAI,CAACO,MAAM;IAAA,IAAAG,SAAA;MAAA,OAAAJ,iBAAA,CACTH,MAAM,CAACc,SAAS;QAACC,IAAI;QAAAR,QAAA,EAAaI;MAAC;IAAA;EAAA,EAExC,CAAC;AACH;AAEA,OAAO,SAASO,QAAQA,CACtBN,GAAyB,EACzBH,IAAY,EACY;EACxB,MAAMY,MAAM,GAAGC,cAAc,CAACV,GAAG,EAAEH,IAAI,CAAC;EAExC,IAAI,CAACY,MAAM,EAAE;IACX,MAAM,IAAIE,KAAK,CAAC,wBAAwB,GAAGd,IAAI,CAAC;EAClD;EACA,OAAOY,MAAM;EAEb,SAASC,cAAcA,CACrBV,GAAyB,EACzBH,IAAY,EACY;IACxB,KAAK,MAAMe,IAAI,IAAIZ,GAAG,CAACO,QAAQ,EAAE;MAC/B,IAAIK,IAAI,CAACC,IAAI,KAAK,MAAM,EAAE;QACxB,IAAID,IAAI,CAACf,IAAI,CAACiB,QAAQ,CAACjB,IAAI,CAAC,EAAE;UAC5B,OAAOe,IAAI;QACb;QACA;MACF,CAAC,MAAM;QACL,MAAMG,KAAK,GAAGL,cAAc,CAACE,IAAI,EAAEf,IAAI,CAAC;QACxC,IAAIkB,KAAK,EAAE;UACT,OAAOA,KAAK;QACd;MACF;IACF;IACA,OAAO,IAAI;EACb;AACF;AAEA,OAAO,SAASC,kBAAkBA,CAChChB,GAAyB,EACzBiB,aAAqC,EAC/B;EACN,KAAK,MAAM,CAACpB,IAAI,EAAEU,QAAQ,CAAC,IAAIW,MAAM,CAACC,OAAO,CAACF,aAAa,CAAC,EAAE;IAC5D,MAAMZ,IAAI,GAAGC,QAAQ,CAACN,GAAG,EAAEH,IAAI,CAAC;IAChCV,MAAM,CAACkB,IAAI,CAACE,QAAQ,CAAC,CAACa,IAAI,CAAClC,QAAQ,CAACmC,MAAM,CAACd,QAAQ,CAAC,CAAC;EACvD;AACF","ignoreList":[]}

package/dist/test/vitest.setup.js

@@ -1 +1,2 @@
-import "@alloy-js/core/testing";
+import "@alloy-js/core/testing";
+//# sourceMappingURL=vitest.setup.js.map

package/dist/test/vitest.setup.js.map

@@ -0,0 +1 @@
+{"version":3,"names":[],"sources":["../../test/vitest.setup.ts"],"sourcesContent":[null],"mappings":"AAAA,OAAO,wBAAwB","ignoreList":[]}