5 files changed, 8 insertions, 10 deletions

diff --git a/subprojects/frontend/src/graph/GraphStore.ts b/subprojects/frontend/src/graph/GraphStore.ts
index 30d0a2f3..a133d636 100644
--- a/subprojects/frontend/src/graph/GraphStore.ts
+++ b/subprojects/frontend/src/graph/GraphStore.ts
@@ -25,6 +25,7 @@ export function getDefaultVisibility(
     case 'class':
     case 'reference':
     case 'opposite':
+    case 'base':
       return 'all';
     case 'predicate':
       return detail.error ? 'must' : 'none';
diff --git a/subprojects/frontend/src/graph/export/exportDiagram.tsx b/subprojects/frontend/src/graph/export/exportDiagram.tsx
index 73b40fea..663cafe1 100644
--- a/subprojects/frontend/src/graph/export/exportDiagram.tsx
+++ b/subprojects/frontend/src/graph/export/exportDiagram.tsx
@@ -6,7 +6,7 @@
 
 import createCache from '@emotion/cache';
 import { serializeStyles } from '@emotion/serialize';
-import type { StyleSheet } from '@emotion/utils';
+import type { StyleSheet } from '@emotion/sheet';
 import italicFontURL from '@fontsource/open-sans/files/open-sans-latin-400-italic.woff2?url';
 import normalFontURL from '@fontsource/open-sans/files/open-sans-latin-400-normal.woff2?url';
 import boldFontURL from '@fontsource/open-sans/files/open-sans-latin-700-normal.woff2?url';
diff --git a/subprojects/frontend/src/language/problem.grammar b/subprojects/frontend/src/language/problem.grammar
index b8038b70..56867964 100644
--- a/subprojects/frontend/src/language/problem.grammar
+++ b/subprojects/frontend/src/language/problem.grammar
@@ -52,8 +52,7 @@ statement {
     kw<"extern"> ckw<"aggregator"> AggregatorName "."
   } |
   PredicateDefinition {
-    ckw<"shadow">?
-    (kw<"error">? kw<"pred"> | kw<"error">)
+    ((kw<"error"> | kw<"partial"> | ckw<"shadow">)* kw<"pred"> | kw<"error">)
     RelationName ParameterList<Parameter>?
     PredicateBody { ("<->" sep<OrOp, Conjunction>)? "." }
   } |
diff --git a/subprojects/frontend/src/persistence/compressionWorker.ts b/subprojects/frontend/src/persistence/compressionWorker.ts
index 7b93b20b..df476535 100644
--- a/subprojects/frontend/src/persistence/compressionWorker.ts
+++ b/subprojects/frontend/src/persistence/compressionWorker.ts
@@ -1,13 +1,10 @@
 /*
- * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ * SPDX-FileCopyrightText: 2023-2024 The Refinery Authors <https://refinery.tools/>
  *
  * SPDX-License-Identifier: EPL-2.0
  */
 
-import type { Zstd } from '@hpcc-js/wasm';
-// We need to use a deep import for proper code splitting with `vite-plugin-pwa`.
-// @ts-expect-error Typescript doesn't find the declarations for the deep import.
-import { Zstd as zstdLoader } from '@hpcc-js/wasm/zstd';
+import { Zstd } from '@hpcc-js/wasm-zstd';
 
 import type {
   CompressResponse,
@@ -56,13 +53,13 @@ async function base64Decode(compressedText: string): Promise<Uint8Array> {
   return new Uint8Array(await result.arrayBuffer());
 }
 
-let zstd: Awaited<ReturnType<typeof Zstd.load>> | undefined;
+let zstd: Zstd | undefined;
 
 globalThis.onmessage = (event) => {
   (async () => {
     if (zstd === undefined) {
       // Since we don't have types for the deep import, we have to cast here.
-      zstd = await (zstdLoader as { load: typeof Zstd.load }).load();
+      zstd = await Zstd.load();
     }
     // Since the render thread will only send us valid messages,
     // we can save a bit of bundle size by using a cast instead of `parse`
diff --git a/subprojects/frontend/src/xtext/xtextServiceResults.ts b/subprojects/frontend/src/xtext/xtextServiceResults.ts
index c5bc1320..7c2fb8ec 100644
--- a/subprojects/frontend/src/xtext/xtextServiceResults.ts
+++ b/subprojects/frontend/src/xtext/xtextServiceResults.ts
@@ -156,6 +156,7 @@ export const RelationMetadata = z.object({
       opposite: z.string(),
     }),
     z.object({ type: z.literal('predicate'), error: z.boolean() }),
+    z.object({ type: z.literal('base') }),
     z.object({ type: z.literal('builtin') }),
   ]),
 });