@inglorious/ssx 1.5.12 → 1.6.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inglorious/ssx",
-  "version": "1.5.12",
+  "version": "1.6.0",
   "description": "Server-Side-X. Xecution? Xperience? Who knows.",
   "author": "IceOnFire <antony.mistretta@gmail.com> (https://ingloriouscoderz.it)",
   "license": "MIT",
@@ -57,7 +57,7 @@
     "svgo": "^4.0.0",
     "vite": "^7.1.3",
     "vite-plugin-image-optimizer": "^2.0.3",
-    "@inglorious/web": "4.1.5"
+    "@inglorious/web": "4.2.0"
   },
   "devDependencies": {
     "prettier": "^3.6.2",

package/src/render/html.js

@@ -1,3 +1,7 @@
+/** @typedef {import('lit-html').TemplateResult} TemplateResult */
+/** @typedef {import('@inglorious/store').Store} Store */
+/** @typedef {import('@inglorious/web').Api} Api */
+
 import { html } from "@inglorious/web"
 import { render as ssrRender } from "@lit-labs/ssr"
 import { collectResult } from "@lit-labs/ssr/lib/render-result.js"
@@ -8,8 +12,8 @@ import { layout as defaultLayout } from "./layout.js"
  * Renders a page or component to HTML using the store state.
  * It handles SSR rendering of Lit templates and optional HTML wrapping.
  *
- * @param {Object} store - The application store instance.
- * @param {Function} renderFn - A function that returns a Lit template. Receives `api` as argument.
+ * @param {Store} store - The application store instance.
+ * @param {(api: Api) => TemplateResult | null} renderFn - The root render function.
  * @param {Object} [options] - Rendering options.
  * @param {boolean} [options.wrap=false] - Whether to wrap the output in a full HTML document.
  * @param {Function} [options.layout] - Custom layout function.
@@ -52,26 +56,17 @@ function stripLitMarkers(html) {
 
 // TODO: this was copied from @inglorious/web, maybe expose it?
 /**
- * Creates a render function bound to the store API.
- * This mimics the `api.render` behavior but for SSR context.
- *
- * @param {Object} api - The store API.
- * @returns {Function} The render function.
+ * Creates a render function for the mount API.
+ * @param {Api} api - The mount API.
+ * @returns {Api['render']} A `render` function that can render an entity or a type by its ID.
+ * @private
  */
 function createRender(api) {
-  return function (id, options = {}) {
+  return function (id) {
     const entity = api.getEntity(id)
 
     if (!entity) {
-      const { allowType } = options
-      if (!allowType) return ""
-
-      const type = api.getType(id)
-      if (!type?.render) {
-        console.warn(`No entity or type found: ${id}`)
-        return html`<div>Not found: ${id}</div>`
-      }
-      return type.render(api)
+      return ""
     }
 
     const type = api.getType(entity.type)

package/src/render/render.test.js

@@ -20,6 +20,7 @@ describe("renderPage", () => {
       types: { index: module.index },
       updateMode: "manual",
     })
+    store.update()
 
     const html = await renderPage(store, page, undefined, DEFAULT_OPTIONS)
 

package/src/scripts/app.js

@@ -56,7 +56,7 @@ const module = await getRoute(page.pattern)()
 const type = module[page.moduleName]
 types[page.moduleName] = type
 
-const store = createStore({ types, entities, middlewares })
+const store = createStore({ types, entities, middlewares, autoCreateEntities: true })
 
 const root = document.getElementById("root")
 

package/src/store/index.js

@@ -1,3 +1,4 @@
+import { existsSync } from "node:fs"
 import path from "node:path"
 import { pathToFileURL } from "node:url"
 
@@ -33,14 +34,18 @@ export async function generateStore(pages = [], options = {}, loader) {
   const extensions = ["js", "ts"]
 
   for (const ext of extensions) {
-    try {
-      const module = await load(path.join(srcDir, "store", `entities.${ext}`))
-      entities = module.entities
-      break
-    } catch {
-      // ignore and try next extension
+    const fullPath = path.join(srcDir, "store", `entities.${ext}`)
+
+    if (existsSync(fullPath)) {
+      try {
+        const module = await load(fullPath)
+        entities = module.entities
+        break
+      } catch {
+        // ignore and try next extension
+      }
     }
   }
 
-  return createStore({ types, entities, updateMode: "manual" })
+  return createStore({ types, entities, autoCreateEntities: true })
 }

package/src/store/store.test.js

@@ -1,3 +1,4 @@
+import { existsSync } from "node:fs"
 import path from "node:path"
 
 import { describe, expect, it, vi } from "vitest"
@@ -7,6 +8,8 @@ import { generateStore } from "."
 const ROOT_DIR = path.join(import.meta.dirname, "..", "__fixtures__")
 const PAGES_DIR = path.join(ROOT_DIR, "src", "pages")
 
+vi.mock("node:fs")
+
 describe("generateStore", () => {
   it("should generate the proper types and entities from a static page", async () => {
     const page = {
@@ -55,25 +58,32 @@ describe("generateStore", () => {
     expect(store.getState()).not.toHaveProperty("about")
   })
 
-  it("should attempt to load entities.js and entities.ts", async () => {
+  it("should check for entities.js and entities.ts and load them if they exist", async () => {
+    vi.mocked(existsSync).mockReturnValue(true)
+
     const loader = vi.fn(async (p) => {
-      // Mock a successful page load
-      if (p.endsWith("index.js")) {
-        return { index: { render: () => {} } }
+      if (p.includes("index.js")) {
+        return {
+          index: { render: () => "" },
+        }
+      }
+
+      if (p.includes("entities.js") || p.includes("entities.ts")) {
+        return {
+          entities: {},
+        }
       }
-      // Mock entity files not being found
-      throw new Error("MODULE_NOT_FOUND")
+
+      return {}
     })
 
     const page = { filePath: path.join(PAGES_DIR, "index.js") }
-    await generateStore([page], { rootDir: "." }, loader)
+
+    await generateStore([page], { rootDir: ROOT_DIR }, loader)
 
     expect(loader).toHaveBeenCalledWith(page.filePath)
     expect(loader).toHaveBeenCalledWith(
-      path.join("src", "store", "entities.js"),
-    )
-    expect(loader).toHaveBeenCalledWith(
-      path.join("src", "store", "entities.ts"),
+      path.join(ROOT_DIR, "src", "store", "entities.js"),
     )
   })
 })