Restructure sample: rename projects, flatten client dir, @typeshim→@client, merge people-ui into app

sample/TypeShim.Sample.Client/.gitignore → sample/.gitignore

@@ -97,7 +97,7 @@ temp/
 # Preserve root lock
 !package-lock.json
 # If individual workspace package-locks accidentally get created (npm -w install inside):
-@typeshim/*/package-lock.json
+@client/*/package-lock.json
 
 # -----------------------------
 # Misc bundler artifacts

sample/TypeShim.Sample.Client/@typeshim/app/index.html → sample/@client/app/index.html

@@ -4,7 +4,7 @@
     <meta charset="UTF-8" />
     <link rel="icon" type="image/svg+xml" href="/vite.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>@typeshim/app Demo</title>
+    <title>@client/app Demo</title>
 
     <!-- enable when using WasmFingerprintAssets=true on the dotnet wasm project-->
     <!-- <script type="importmap"></script> -->

sample/TypeShim.Sample.Client/@typeshim/app/package.json → sample/@client/app/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "@typeshim/app",
+  "name": "@client/app",
   "version": "1.0.0",
   "description": "",
   "main": "index.js",
@@ -11,8 +11,5 @@
   },
   "keywords": [],
   "author": "",
-  "license": "ISC",
-  "dependencies": {
-    "@typeshim/people-ui": "*"
-  }
+  "license": "ISC"
 }

sample/TypeShim.Sample.Client/@typeshim/app/src/App.tsx → sample/@client/app/src/App.tsx

@@ -1,8 +1,8 @@
 import { useState } from 'react';
 import Home from './pages/Home';
 import People from './pages/People';
-import { TypeShimProvider } from '@typeshim/wasm-exports';
-import { AppProvider } from '@typeshim/people-ui';
+import { TypeShimProvider } from '@client/wasm-exports';
+import { AppProvider } from './people/AppProvider';
 
 type Page = 'home' | 'people';
 
@@ -28,7 +28,7 @@ function Content() {
                 display: 'flex',
                 gap: '1rem'
             }}>
-                <strong style={{ marginRight: '1rem' }}>@typeshim/app</strong>
+                <strong style={{ marginRight: '1rem' }}>@client/app</strong>
                 <nav style={{ display: 'flex', gap: '1rem' }}>
                     <a
                         href="#"

sample/TypeShim.Sample.Client/@typeshim/app/src/pages/Home.tsx → sample/@client/app/src/pages/Home.tsx

@@ -2,7 +2,7 @@
 export default function Home() {
     return (
     <div>
-        <h1>Welcome to @typeshim/app</h1>
+        <h1>Welcome to @client/app</h1>
         <p>This is a sample React app that demonstrates how TypeShim extends .NET &lt;&gt; Javascript interop with:</p>
         <ul>
             <li>Natural object semantics like:</li>

sample/TypeShim.Sample.Client/@typeshim/app/src/pages/People.tsx → sample/@client/app/src/pages/People.tsx

@@ -1,5 +1,5 @@
 import { useState } from 'react';
-import { PeopleList, PeopleGrid } from '@typeshim/people-ui';
+import { PeopleList, PeopleGrid } from '../people';
 
 export default function People() {
     const [view, setView] = useState<'list' | 'grid'>('list');

sample/TypeShim.Sample.Client/@typeshim/people-ui/src/AppProvider.tsx → sample/@client/app/src/people/AppProvider.tsx

@@ -1,4 +1,4 @@
-import { PeopleApp } from '@typeshim/wasm-exports';
+import { PeopleApp } from '@client/wasm-exports';
 import { useMemo, ReactNode } from 'react';
 import AppContext from './appContext';
 

sample/TypeShim.Sample.Client/@typeshim/people-ui/src/PeopleGrid.tsx → sample/@client/app/src/people/PeopleGrid.tsx

@@ -2,7 +2,7 @@
 
 import React, { useEffect, useState } from 'react';
 import { PersonCard } from './PersonCard';
-import type { Person } from '@typeshim/wasm-exports';
+import type { Person } from '@client/wasm-exports';
 import { PeopleRepository } from './PeopleRepository';
 import AppContext from './appContext';
 

sample/TypeShim.Sample.Client/@typeshim/people-ui/src/PeopleList.tsx → sample/@client/app/src/people/PeopleList.tsx

@@ -2,7 +2,7 @@
 
 import React, { useEffect, useState } from 'react';
 import { PersonCard } from './PersonCard';
-import type { Person } from '@typeshim/wasm-exports';
+import type { Person } from '@client/wasm-exports';
 import { PeopleRepository } from './PeopleRepository';
 import AppContext from './appContext';
 

sample/TypeShim.Sample.Client/@typeshim/people-ui/src/PeopleRepository.tsx → sample/@client/app/src/people/PeopleRepository.tsx

@@ -1,4 +1,4 @@
-import { People, Person, PeopleProvider } from '@typeshim/wasm-exports';
+import { People, Person, PeopleProvider } from '@client/wasm-exports';
 
 export class PeopleRepository {
 

sample/TypeShim.Sample.Client/@typeshim/people-ui/src/PersonCard.tsx → sample/@client/app/src/people/PersonCard.tsx

@@ -1,5 +1,5 @@
 import React, { useState } from 'react';
-import { Person, Dog } from '@typeshim/wasm-exports';
+import { Person, Dog } from '@client/wasm-exports';
 import { PetChip } from './PetChip';
 
 export interface PersonCardProps {

sample/TypeShim.Sample.Client/@typeshim/people-ui/src/PetChip.tsx → sample/@client/app/src/people/PetChip.tsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { Dog } from '@typeshim/wasm-exports';
+import { Dog } from '@client/wasm-exports';
 
 export interface PetChipProps {
   petProxy: Dog;

sample/TypeShim.Sample.Client/@typeshim/people-ui/src/appContext.ts → sample/@client/app/src/people/appContext.ts

@@ -1,4 +1,4 @@
-import { PeopleApp } from '@typeshim/wasm-exports';
+import { PeopleApp } from '@client/wasm-exports';
 import React from 'react';
 
 const AppContext = React.createContext<PeopleApp>(undefined!);

sample/TypeShim.Sample.Client/@typeshim/wasm-exports/TypeShimProvider.tsx → sample/@client/wasm-exports/TypeShimProvider.tsx

@@ -1,4 +1,4 @@
-import { createWasmRuntime, TypeShimInitializer } from '@typeshim/wasm-exports';
+import { createWasmRuntime, TypeShimInitializer } from '@client/wasm-exports';
 import { ReactNode, useEffect, useState } from 'react';
 
 export interface AppProviderProps {

sample/TypeShim.Sample.Client/@typeshim/wasm-exports/package.json → sample/@client/wasm-exports/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "@typeshim/wasm-exports",
+  "name": "@client/wasm-exports",
   "version": "1.0.0",
   "description": "",
   "main": "main.ts",

sample/TypeShim.Sample/TypeShim.Sample.csproj → sample/Client.Library/Client.Library.csproj

@@ -17,7 +17,7 @@
   </ItemGroup>
 
   <PropertyGroup>
-    <OutputPath>../TypeShim.Sample.Client/@typeshim/wasm-exports/lib</OutputPath>
+    <OutputPath>../@client/wasm-exports/lib</OutputPath>
     <!--<TypeShim_GeneratedDir>../../../TypeShim</TypeShim_GeneratedDir>-->
     <!--<TypeShim_TypeScriptOutputDirectory>wwwroot</TypeShim_TypeScriptOutputDirectory>-->
     <!--<TypeShim_MSBuildMessagePriority>High</TypeShim_MSBuildMessagePriority>-->

sample/TypeShim.Sample/Dtos.cs → sample/Client.Library/Dtos.cs

@@ -1,4 +1,4 @@
-namespace TypeShim.Sample;
+namespace Client.Library;
 
 public class PeopleDto
 {

sample/TypeShim.Sample/Models.cs → sample/Client.Library/Models.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Threading.Tasks;
 
-namespace TypeShim.Sample;
+namespace Client.Library;
 
 [TSExport]
 public class People()

sample/TypeShim.Sample/PeopleApiClient.cs → sample/Client.Library/PeopleApiClient.cs

@@ -6,7 +6,7 @@
 using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 
-namespace TypeShim.Sample;
+namespace Client.Library;
 
 public class PeopleApiClient(HttpClient httpClient)
 {

sample/TypeShim.Sample/PeopleApp.cs → sample/Client.Library/PeopleApp.cs

@@ -4,7 +4,7 @@
 using System;
 using System.Net.Http;
 
-namespace TypeShim.Sample;
+namespace Client.Library;
 
 [TSExport]
 public class PeopleAppOptions

sample/TypeShim.Sample/PeopleProvider.cs → sample/Client.Library/PeopleProvider.cs

@@ -4,7 +4,7 @@
 using System.Threading.Tasks;
 using TypeShim;
 
-namespace TypeShim.Sample;
+namespace Client.Library;
 
 [TSExport]
 public class PeopleProvider

sample/TypeShim.Sample/Program.cs → sample/Client.Library/Program.cs

@@ -5,7 +5,7 @@
 using System.Net.Http;
 using System.Runtime.InteropServices.JavaScript;
 
-namespace TypeShim.Sample;
+namespace Client.Library;
 
 public partial class Program
 {

sample/TypeShim.Sample/RandomEntityGenerator.cs → sample/Client.Library/RandomEntityGenerator.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace TypeShim.Sample;
+namespace Client.Library;
 
 public class RandomEntityGenerator
 {

sample/Sample.slnx

@@ -1,9 +1,4 @@
 <Solution>
-  <Project Path="TypeShim.Sample.Server/TypeShim.Sample.Server.csproj" />
-  <Project Path="TypeShim.Sample/TypeShim.Sample.csproj" />
-  <Project Path="TypeShim.Sample.Client/TypeShim.Sample.Client.esproj">
-    <BuildDependency Project="TypeShim.Sample/TypeShim.Sample.csproj" />
-    <Build />
-    <Deploy />
-  </Project>
+  <Project Path="Server/Server.csproj" />
+  <Project Path="Client.Library/Client.Library.csproj" />
 </Solution>

sample/TypeShim.Sample.Server/Controllers/PeopleController.cs → sample/Server/Controllers/PeopleController.cs

@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Mvc;
-using TypeShim.Sample;
+using Client.Library;
 
-namespace TypeShim.Sample.Server.Controllers;
+namespace Server.Controllers;
 
 [ApiController]
 [Route("[controller]")]

sample/TypeShim.Sample.Server/Program.cs → sample/Server/Program.cs

@@ -14,7 +14,7 @@
 #pragma warning restore ASP0014 // Suggest using top level route registrations
 app.UseSpa(spa =>
 {
-    // run 'npm start' or 'npm run dev' in TypeShim.Sample.Client to start the vite dev server
+    // run 'npm start' or 'npm run dev' in the sample directory to start the vite dev server
     spa.UseProxyToSpaDevelopmentServer("http://localhost:5173/");
 });
 

sample/TypeShim.Sample.Server/TypeShim.Sample.Server.csproj → sample/Server/Server.csproj

@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\TypeShim.Sample\TypeShim.Sample.csproj" />
+    <ProjectReference Include="..\Client.Library\Client.Library.csproj" />
   </ItemGroup>
 
   <ItemGroup>