Merge branch 'main' into jcd/codespace-dev

.devcontainer/devcontainer.json

@@ -1,5 +1,5 @@
 {
-  "image": "mcr.microsoft.com/vscode/devcontainers/javascript-node",
+  "image": "mcr.microsoft.com/vscode/devcontainers/javascript-node:18",
   "containerEnv": {
     "DATA_WORKSPACE": "/workspaces/web/data"
   },

.github/workflows/test.yaml

@@ -41,10 +41,8 @@ jobs:
         working-directory: packages/core
         run: pnpm build
 
-      - name: Test core
-        working-directory: packages/core
-        run: pnpm test
+      - name: Build rest
+        run: pnpm --filter compile --filter viewer run build
 
-      - name: Build viewer
-        working-directory: packages/viewer
-        run: pnpm build
+      - name: Run all tests
+        run: pnpm --recursive run test

.tool-versions

@@ -0,0 +1,3 @@
+# Pinned here and in devcontainer to avoid OOM issues stemming from
+# https://github.com/TypeStrong/ts-node/issues/1995
+nodejs 18.16.0

packages/compile/package.json

@@ -37,7 +37,7 @@
     "glob": "^8.0.3",
     "js-yaml": "^4.1.0",
     "yaml-front-matter": "^4.1.1",
-    "zod": "^3.21.3"
+    "zod": "3.20.1"
   },
   "devDependencies": {
     "@types/cors": "^2.8.12",

packages/compile/src/main.test.ts

@@ -40,7 +40,7 @@ function cleanup() {
 beforeEach(cleanup)
 afterAll(cleanup)
 
-it('builds a bundle', () => {
+it.todo('builds a bundle', () => {
   const { output, error } = run('valid')
   expect(error).toBe(false)
   expect(output).toContain(
@@ -55,7 +55,7 @@ it('builds a bundle', () => {
   expect(bundle.traits.length).toEqual(3)
 })
 
-it('writes error messages for invalid bundles', () => {
+it.todo('writes error messages for invalid bundles', () => {
   const { output, error } = run('invalid')
 
   expect(error).toEqual(true)

packages/compile/src/validations.ts

@@ -1,7 +1,7 @@
 import { z } from 'zod'
 import yaml from 'yaml-front-matter'
 
-import { Bundle, Property, formula as Formula, schemas } from '@pi-base/core'
+import { Bundle, Property, Trait, formula as Formula, schemas } from '@pi-base/core'
 
 import { File } from './fs.js'
 
@@ -228,7 +228,7 @@ export function trait(input: File) {
       ...rest
     } = loadFront(input.contents)
 
-    const trait: Trait<string> = schemas.trait(z.string()).parse({
+    const trait = schemas.trait<string>(z.string()).parse({
       uid: String(uid).trim(),
       space: String(space).trim(),
       property: String(property).trim(),

packages/compile/tsconfig.json

@@ -1,16 +1,17 @@
 {
   "compilerOptions": {
+    "allowSyntheticDefaultImports": true,
     "declaration": true,
     "declarationDir": "dist/types",
-    "module": "NodeNext",
-    "moduleResolution": "NodeNext",
+    "module": "es2022",
+    "moduleResolution": "node",
     "noImplicitAny": true,
     "outDir": "dist/esm",
     "preserveConstEnums": true,
     "removeComments": true,
     "sourceMap": true,
     "strict": true,
-    "target": "ESNext"
+    "target": "es2022"
   },
   "include": [
     "src/**/*"

packages/core/tsconfig.json

@@ -1,16 +1,17 @@
 {
   "compilerOptions": {
+    "allowSyntheticDefaultImports": true,
     "declaration": true,
     "declarationDir": "dist/types",
-    "module": "NodeNext",
+    "module": "es2022",
     "moduleResolution": "Node",
     "noImplicitAny": true,
     "outDir": "dist/esm",
     "preserveConstEnums": true,
     "removeComments": true,
     "sourceMap": true,
     "strict": true,
-    "target": "ESNext"
+    "target": "es2022"
   },
   "include": [
     "src/**/*"

packages/viewer/src/gateway.test.ts

@@ -1,12 +1,13 @@
 import { expect, it, vi } from 'vitest'
 import { bundle } from '@pi-base/core'
+
 import * as debug from './debug'
 
 import { sync } from './gateway'
 
 const trace = vi.spyOn(debug, 'trace')
 
-it.skip('can fetch successfully', async () => {
+it.todo('can fetch successfully', async () => {
   const remote = {
     bundle: {
       spaces: new Map(),
@@ -36,7 +37,7 @@ it.skip('can fetch successfully', async () => {
   ])
 })
 
-it.skip('notifies if the etag matches', async () => {
+it.todo('notifies if the etag matches', async () => {
   const current = {
     spaces: [],
     properties: [],