Merge pull request #18 from getlang-dev/chores

chore: upgrade deps, lint rules

.changeset/config.json

@@ -1,11 +1,11 @@
 {
-  "$schema": "https://unpkg.com/@changesets/[email protected].1/schema.json",
+  "$schema": "https://unpkg.com/@changesets/[email protected].3/schema.json",
   "changelog": ["@changesets/changelog-github", { "repo": "getlang-dev/get" }],
   "commit": false,
   "fixed": [],
   "linked": [],
   "access": "public",
   "baseBranch": "main",
-  "updateInternalDependencies": "patch",
+  "updateInternalDependencies": "minor",
   "ignore": []
 }

biome.json

@@ -25,7 +25,8 @@
       },
       "style": {
         "noUselessElse": "off",
-        "noNonNullAssertion": "off"
+        "noNonNullAssertion": "off",
+        "useBlockStatements": "error"
       }
     }
   },

package.json

@@ -2,7 +2,7 @@
   "name": "get",
   "license": "Apache-2.0",
   "private": true,
-  "packageManager": "[email protected].27",
+  "packageManager": "[email protected].29",
   "scripts": {
     "format": "biome check --write",
     "lint": "bun lint:check && bun lint:types && bun lint:unused && bun lint:repo",
@@ -21,10 +21,10 @@
     "@biomejs/biome": "1.8.2",
     "@changesets/changelog-github": "^0.5.0",
     "@changesets/cli": "^2.27.8",
-    "@types/bun": "^1.1.8",
-    "knip": "^5.30.0",
+    "@types/bun": "^1.1.10",
+    "knip": "^5.30.5",
     "sherif": "^1.0.0",
-    "typescript": "^5.5.4"
+    "typescript": "^5.6.2"
   },
   "knip": {
     "vitest": {},

packages/get/execute.ts

@@ -119,7 +119,9 @@ export async function execute(
       let value = await visit(node.context)
       const optional = node.typeInfo.type === Type.Maybe
       value = optional ? value : assert(value)
-      if (value instanceof NullSelection) return value
+      if (value instanceof NullSelection) {
+        return value
+      }
       context = { value, typeInfo: node.context.typeInfo }
     }
     return unwrap(context, cb)

packages/lib/values/html.ts

@@ -66,7 +66,7 @@ export const toValue = (el: AnyHtmlNode) => {
   if (el.nodeType === 2) {
     str = el.value
   } else if (textContent(el)) {
-    str = textContent(el)
+    str = textContent(el).replaceAll(/\s+/g, ' ')
   }
   return str.trim()
 }

packages/parser/ast/typeinfo.ts

@@ -37,7 +37,9 @@ export function tequal(a: TypeInfo, b: TypeInfo): boolean {
   } else if (a.type === 'struct' && b.type === 'struct') {
     const ax = Object.entries(a.schema)
     const bx = Object.entries(b.schema)
-    if (ax.length !== bx.length) return false
+    if (ax.length !== bx.length) {
+      return false
+    }
     return ax.every(([ak, av]) => {
       const bv = b.schema[ak]
       return bv && tequal(av, bv)

packages/parser/desugar/inference/typeinfo.ts

@@ -64,7 +64,9 @@ export function inferTypeInfo(): TransformVisitor {
 
   function ctx<C extends CExpr>(cb: (tnode: C, ivisit: Visit) => C) {
     return function enter(node: C, visit: Visit): C {
-      if (!node.context) return cb(node, visit)
+      if (!node.context) {
+        return cb(node, visit)
+      }
       const context = visit(node.context)
       const itemContext: any = {
         ...context,
@@ -133,7 +135,9 @@ export function inferTypeInfo(): TransformVisitor {
       enter: ctx((node, visit) => {
         const xnode = trace.SliceExpr.enter(node, visit)
         let typeInfo: TypeInfo = { type: Type.Value }
-        if (optional) typeInfo = { type: Type.Maybe, option: typeInfo }
+        if (optional) {
+          typeInfo = { type: Type.Maybe, option: typeInfo }
+        }
         return { ...xnode, typeInfo }
       }),
     },
@@ -189,7 +193,9 @@ export function inferTypeInfo(): TransformVisitor {
     ObjectLiteralExpr: {
       enter: ctx((node, visit) => {
         const xnode = trace.ObjectLiteralExpr.enter(node, child => {
-          if (child === node.context) return visit(child)
+          if (child === node.context) {
+            return visit(child)
+          }
           const entry = node.entries.find(e => e.value === child)
           invariant(
             entry,

packages/parser/desugar/trace.ts

@@ -5,7 +5,9 @@ import type { TransformVisitor, Visit } from '../visitor/transform.js'
 
 export function traceVisitor(scope: RootScope<Expr>) {
   function ctx<C extends CExpr>(node: C, visit: Visit, cb: (tnode: C) => C) {
-    if (!node.context) return cb(node)
+    if (!node.context) {
+      return cb(node)
+    }
     const context = visit(node.context)
     scope.pushContext(context)
     const xnode = cb({ ...node, context })

packages/parser/desugar/utils.ts

@@ -19,7 +19,9 @@ export function selectTypeInfo(
   selector: Expr,
 ): TypeInfo | null {
   const sel = render(selector)
-  if (!sel) return null
+  if (!sel) {
+    return null
+  }
   return toPath(sel).reduce<TypeInfo>(
     (acc, cur) =>
       (acc.type === Type.Struct && acc.schema[cur]) || { type: Type.Value },

test/modules.spec.ts

@@ -100,8 +100,10 @@ describe('modules', () => {
 
   test('imports cache', async () => {
     const importHook = mock(async (module: string) => {
-      if (module === 'Top') return `extract \`"top"\``
-      if (module === 'Mid')
+      if (module === 'Top') {
+        return `extract \`"top"\``
+      }
+      if (module === 'Mid') {
         return `
         import Top
         set inputA = \`"foo"\`
@@ -110,6 +112,7 @@ describe('modules', () => {
           midValue: \`"mid"\`
         }
       `
+      }
       throw new Error(`Unexpected import: ${module}`)
     })