@typed-assistant/builder 0.0.86 → 0.0.87

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @typed-assistant/builder
 
+## 0.0.87
+
+### Patch Changes
+
+- Apply search filters before paginating logs so filtered results span all pages.
+- Hide the Next pagination button entirely when no additional log pages are available.
+
 ## 0.0.86
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typed-assistant/builder",
-  "version": "0.0.86",
+  "version": "0.0.87",
   "exports": {
     "./appProcess": "./src/appProcess.tsx",
     "./bunInstall": "./src/bunInstall.tsx",
@@ -30,8 +30,8 @@
     "typescript": "^5.4.0",
     "@typed-assistant/eslint-config": "0.0.10",
     "@typed-assistant/logger": "0.0.22",
-    "@typed-assistant/typescript-config": "0.0.11",
-    "@typed-assistant/utils": "0.0.19"
+    "@typed-assistant/utils": "0.0.19",
+    "@typed-assistant/typescript-config": "0.0.11"
   },
   "publishConfig": {
     "access": "public",

package/src/setupWebserver.tsx

@@ -427,33 +427,52 @@ const getLogsFromFile = async ({
   filter?: string
 }) => {
   try {
-    const limit = Number(limitProp)
-    const offset = Number(offsetProp)
-
-    const logs = (
-      await Bun.file("./log.txt")
-        .text()
-        .then((text) => text.split("\n"))
-        .then((lines) =>
-          limit
-            ? lines.slice(
-                lines.length - 1 - limit * (offset + 1),
-                lines.length - 1 - limit * offset,
-              )
-            : lines,
+    const parsedLimit = Number(limitProp)
+    const limit = Number.isFinite(parsedLimit) && parsedLimit > 0
+      ? parsedLimit
+      : undefined
+    const parsedOffset = Number(offsetProp)
+    const offset = Number.isFinite(parsedOffset) && parsedOffset >= 0
+      ? parsedOffset
+      : 0
+
+    const normalizedFilter = filter?.toLowerCase().trim()
+
+    const parsedLogs = (await Bun.file("./log.txt").text())
+      .split("\n")
+      .reduce((result, line) => {
+        if (!line) return result
+
+        try {
+          const log = JSON.parse(line) as LogSchema
+          return result.concat(log)
+        } catch (e) {
+          return result.concat({
+            msg: e instanceof Error ? e.message : "Unknown parse error",
+            level: levels.fatal,
+          })
+        }
+      }, [] as LogSchema[])
+
+    const filteredLogs = parsedLogs.filter((log) => {
+      if (log.level < levels[level]) return false
+
+      if (normalizedFilter) {
+        const haystack = JSON.stringify(log).toLowerCase()
+        if (!haystack.includes(normalizedFilter)) return false
+      }
+
+      return true
+    })
+
+    const paginatedLogs = limit
+      ? filteredLogs.slice(
+          Math.max(filteredLogs.length - limit * (offset + 1), 0),
+          filteredLogs.length - limit * offset || filteredLogs.length,
         )
-    ).reduce((result, line) => {
-      if (filter && !line.toLowerCase().includes(filter.toLowerCase()))
-        return result
-
-      const log = line
-        ? JSON.parse(line)
-        : { msg: "Empty line", level: levels.fatal }
-      if (log.level < levels[level]) return result
-      return result.concat(log)
-    }, [] as LogSchema[])
-
-    return { logs }
+      : filteredLogs
+
+    return { logs: paginatedLogs }
   } catch (e) {
     return {
       logs: [

package/src/webserver/Logs.tsx

@@ -10,9 +10,11 @@ export const Logs = ({ basePath }: { basePath: string }) => {
   const [dateTimeVisibility, setDateTimeVisibility] = useState<
     "hidden" | "timeOnly" | "visible"
   >("timeOnly")
-  const { level, setLevel, logs, offset, setOffset, ws, filter, setFilter } =
+  const { level, setLevel, logs, offset, setOffset, ws, filter, setFilter, limit } =
     useLogStore()
 
+  const hasNextPage = limit ? logs.length >= limit : false
+
   return (
     <>
       <AppSection
@@ -31,7 +33,10 @@ export const Logs = ({ basePath }: { basePath: string }) => {
                 placeholder="Filter logs..."
                 className="border border-gray-300 rounded-md text-slate-800 px-2 flex-grow placeholder:text-slate-700"
                 value={filter}
-                onChange={(e) => setFilter(e.target.value)}
+                onChange={(e) => {
+                  setOffset(0)
+                  setFilter(e.target.value)
+                }}
               />
             </div>
 
@@ -63,7 +68,10 @@ export const Logs = ({ basePath }: { basePath: string }) => {
                   <select
                     className="border border-gray-300 rounded-md text-slate-800 px-2"
                     id="level"
-                    onChange={(e) => setLevel(e.target.value as typeof level)}
+                    onChange={(e) => {
+                      setOffset(0)
+                      setLevel(e.target.value as typeof level)
+                    }}
                     value={level}
                   >
                     <option value="trace">Trace</option>
@@ -85,12 +93,14 @@ export const Logs = ({ basePath }: { basePath: string }) => {
                     Previous
                   </button>
                 )}
-                <button
-                  className={buttonStyle}
-                  onClick={() => setOffset((offset) => offset + 1)}
-                >
-                  Next
-                </button>
+                {hasNextPage && (
+                  <button
+                    className={buttonStyle}
+                    onClick={() => setOffset((offset) => offset + 1)}
+                  >
+                    Next
+                  </button>
+                )}
               </div>
             </div>
           </>