create-wirejs-app 2.0.12 → 2.0.13

package/README.md

@@ -0,0 +1,3 @@
+Experimental.
+
+If this package interests you, contact the author.

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "create-wirejs-app",
-	"version": "2.0.12",
+	"version": "2.0.13",
 	"description": "Initializes a wirejs package.",
 	"author": "Jon Wire",
 	"license": "MIT",
@@ -17,6 +17,7 @@
 	"files": [
 		"bin.js",
 		"package.json",
+		"README.md",
 		"templates/*"
 	]
-}
+}

package/templates/default/api/package.json

@@ -8,7 +8,7 @@
 		"prebuild": "wirejs-scripts prebuild-api"
 	},
 	"exports": {
-		"wirejs:client": "./index.client.js",
-		"default": "./index.js"
+		"wirejs:client": "./dist/index.client.js",
+		"default": "./dist/index.js"
 	}
-}
+}

package/templates/default/gitignore

@@ -4,4 +4,5 @@ pre-dist
 temp
 src/build_id.json
 api/index.client.js
-api/index.js
+api/index.js
+api/dist

package/templates/default/package.json

@@ -11,10 +11,10 @@
 		"dompurify": "^3.2.3",
 		"marked": "^15.0.6",
 		"wirejs-dom": "^1.0.38",
-		"wirejs-resources": "^0.1.11"
+		"wirejs-resources": "^0.1.12"
 	},
 	"devDependencies": {
-		"wirejs-scripts": "^3.0.9",
+		"wirejs-scripts": "^3.0.10",
 		"typescript": "^5.7.3"
 	},
 	"scripts": {
@@ -23,4 +23,4 @@
 		"start": "wirejs-scripts start",
 		"build": "wirejs-scripts build"
 	}
-}
+}

package/templates/default/src/package.json

@@ -5,6 +5,6 @@
 	"type": "module",
 	"dependencies": {
 		"wirejs-dom": "*",
-        "my-api": "*"
+		"my-api": "*"
 	}
-}
+}

package/templates/default/src/ssr/simple-wiki/%.ts

@@ -5,32 +5,32 @@ import type { AuthenticationMachineState, Context } from 'wirejs-resources';
 import { accountMenu } from '../../components/account-menu.js';
 import { auth, wiki } from 'my-api';
 
-type WithoutNodes<T> = KindaPretty<{
-	[K in keyof T]: T[K] extends Node
-		? T[K] extends { data: any } ? WithoutNodes<T[K]['data']> : undefined
-		: WithoutNodes<T[K]>
-}>
+type WithoutNodes<T> = undefined | (
+	T extends object ? {
+		[K in keyof T
+			as T[K] extends Node ? never : K]: WithoutNodes<T[K]>
+	} : T
+);
 
 /**
  * Shallow check for a `data` hydration property. If present, returns the
  * argument typed according to the given `T`.
  */
-function initData<T extends { data: any }>(arg0: any): WithoutNodes<T['data']> | undefined {
-	return arg0?.data ? arg0.data : undefined;
+function initData<T>(arg0: any): WithoutNodes<T> | undefined {
+	return arg0;
 }
 
 async function Wiki(init: { context?: Context, data?: any }) {
-	const { context } = init;
+	const { context, data } = init;
 
-	const data = initData<typeof self>(init);
-
-	console.log('Wiki init', init);
 	const filepath = (context || window).location.pathname;
 
-	const content = data?.content || await wiki.read(context, filepath);
+	const content: string =
+		data?.content ?? await wiki.read(context, filepath);
+
 	const initialState: AuthenticationMachineState =
-		data?.initialAuthState || await auth.getState(context)
-	;
+		data?.initialAuthState ?? await auth.getState(context);
+
 	const accountMenuNode = accountMenu({ api: auth, initialState });
 
 	let markdown: string = content ?? `This page doesn't exist yet`;
@@ -82,7 +82,7 @@ async function Wiki(init: { context?: Context, data?: any }) {
 		}
 		${node('editor', invisibleDiv)}
 		${node('actions', actionsFor(initialState))}
-	</div>`.extend(self => ({
+	</div>`.extend(_ => ({
 		data: {
 			initialAuthState: initialState
 		}