7 files changed, 110 insertions, 38 deletions

diff --git a/subprojects/frontend/package.json b/subprojects/frontend/package.json
index 0cd99d74..7d5e19d1 100644
--- a/subprojects/frontend/package.json
+++ b/subprojects/frontend/package.json
@@ -30,28 +30,28 @@
   "dependencies": {
     "@codemirror/autocomplete": "^6.12.0",
     "@codemirror/commands": "^6.3.3",
-    "@codemirror/language": "^6.10.0",
-    "@codemirror/lint": "^6.4.2",
-    "@codemirror/search": "^6.5.5",
+    "@codemirror/language": "^6.10.1",
+    "@codemirror/lint": "^6.5.0",
+    "@codemirror/search": "^6.5.6",
     "@codemirror/state": "^6.4.0",
-    "@codemirror/view": "^6.23.1",
+    "@codemirror/view": "^6.24.0",
     "@emotion/react": "^11.11.3",
     "@emotion/styled": "^11.11.0",
     "@fontsource-variable/jetbrains-mono": "^5.0.19",
-    "@fontsource-variable/open-sans": "^5.0.23",
-    "@hpcc-js/wasm": "^2.15.3",
+    "@fontsource-variable/open-sans": "^5.0.25",
+    "@hpcc-js/wasm": "^2.16.0",
     "@lezer/common": "^1.2.1",
     "@lezer/highlight": "^1.2.0",
     "@lezer/lr": "^1.4.0",
     "@material-icons/svg": "^1.0.33",
-    "@mui/icons-material": "^5.15.6",
-    "@mui/material": "^5.15.6",
-    "@mui/system": "^5.15.6",
-    "@mui/x-data-grid": "^6.19.2",
+    "@mui/icons-material": "^5.15.10",
+    "@mui/material": "^5.15.10",
+    "@mui/system": "^5.15.9",
+    "@mui/x-data-grid": "^6.19.4",
     "ansi-styles": "^6.2.1",
     "csstype": "^3.1.3",
     "d3": "^7.8.5",
-    "d3-graphviz": "patch:d3-graphviz@npm%3A5.2.0#~/.yarn/patches/d3-graphviz-npm-5.2.0-161b1fbad4.patch",
+    "d3-graphviz": "patch:d3-graphviz@npm%3A5.3.0#~/.yarn/patches/d3-graphviz-npm-5.3.0-e0eace978a.patch",
     "d3-selection": "^3.0.0",
     "d3-zoom": "patch:d3-zoom@npm%3A3.0.0#~/.yarn/patches/d3-zoom-npm-3.0.0-18f706a421.patch",
     "escape-string-regexp": "^5.0.0",
@@ -61,7 +61,7 @@
     "mobx": "^6.12.0",
     "mobx-react-lite": "^4.0.5",
     "ms": "^2.1.3",
-    "nanoid": "^5.0.4",
+    "nanoid": "^5.0.5",
     "notistack": "^3.0.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
@@ -80,13 +80,13 @@
     "@types/lodash-es": "^4.17.12",
     "@types/micromatch": "^4.0.6",
     "@types/ms": "^0.7.34",
-    "@types/node": "^20.11.10",
+    "@types/node": "^20.11.19",
     "@types/pnpapi": "^0.0.5",
-    "@types/react": "^18.2.48",
-    "@types/react-dom": "^18.2.18",
-    "@typescript-eslint/eslint-plugin": "^6.20.0",
-    "@typescript-eslint/parser": "^6.20.0",
-    "@vitejs/plugin-react-swc": "^3.5.0",
+    "@types/react": "^18.2.56",
+    "@types/react-dom": "^18.2.19",
+    "@typescript-eslint/eslint-plugin": "^6.21.0",
+    "@typescript-eslint/parser": "^6.21.0",
+    "@vitejs/plugin-react-swc": "^3.6.0",
     "@xstate/cli": "^0.5.17",
     "cross-env": "^7.0.3",
     "eslint": "^8.56.0",
@@ -103,10 +103,10 @@
     "html-minifier-terser": "^7.2.0",
     "micromatch": "^4.0.5",
     "pnpapi": "^0.0.0",
-    "prettier": "^3.2.4",
+    "prettier": "^3.2.5",
     "typescript": "5.3.3",
-    "vite": "^5.0.12",
-    "vite-plugin-pwa": "^0.17.5",
+    "vite": "^5.1.3",
+    "vite-plugin-pwa": "^0.19.0",
     "workbox-window": "^7.0.0"
   }
 }
diff --git a/subprojects/frontend/src/editor/EditorTheme.ts b/subprojects/frontend/src/editor/EditorTheme.ts
index 1cad4a36..4978c7f7 100644
--- a/subprojects/frontend/src/editor/EditorTheme.ts
+++ b/subprojects/frontend/src/editor/EditorTheme.ts
@@ -40,7 +40,9 @@ function createTypeHashStyles(
 export default styled('div', {
   name: 'EditorTheme',
   shouldForwardProp: (propName) =>
-    propName !== 'showLineNumbers' && propName !== 'showActiveLine',
+    propName !== 'showLineNumbers' &&
+    propName !== 'showActiveLine' &&
+    propName !== 'colorIdentifiers',
 })<{
   showLineNumbers: boolean;
   showActiveLine: boolean;
@@ -126,7 +128,7 @@ export default styled('div', {
         color: theme.palette.text.secondary,
       },
     },
-    '.tok-problem-individual': {
+    '.tok-problem-atom': {
       '&, & .tok-variableName': {
         color: theme.palette.text.primary,
       },
diff --git a/subprojects/frontend/src/language/problem.grammar b/subprojects/frontend/src/language/problem.grammar
index ce3baa02..b69ee73f 100644
--- a/subprojects/frontend/src/language/problem.grammar
+++ b/subprojects/frontend/src/language/problem.grammar
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ * SPDX-FileCopyrightText: 2021-2024 The Refinery Authors <https://refinery.tools/>
  *
  * SPDX-License-Identifier: EPL-2.0
  */
@@ -22,13 +22,16 @@
 @top Problem { statement* }
 
 statement {
+  ImportStatement {
+    kw<"import"> ModuleName (kw<"as"> ModuleName)? "."
+  } |
   Assertion {
     kw<"default">? (NotOp | UnknownOp)? RelationName
     ParameterList<AssertionArgument>
     (":" Expr)? "."
   } |
   ProblemDeclaration {
-    kw<"problem"> QualifiedName "."
+    (ckw<"module"> | kw<"problem">) ModuleName "."
   } |
   ClassDefinition {
     kw<"abstract">? kw<"class"> RelationName
@@ -37,7 +40,7 @@ statement {
   } |
   EnumDefinition {
     kw<"enum"> RelationName
-    (EnumBody { "{" sep<",", IndividualNodeName> "}" } | ".")
+    (EnumBody { "{" sep<",", AtomNodeName> "}" } | ".")
   } |
   PredicateDefinition {
     (
@@ -56,8 +59,11 @@ statement {
   //  RuleName ParameterList<Parameter>?
   //  RuleBody { ":" sep<OrOp, Conjunction> "==>" sep<OrOp, Consequent> "." }
   //} |
-  IndividualDeclaration {
-    kw<"indiv"> sep<",", IndividualNodeName> "."
+  AtomDeclaration {
+    kw<"declare">? ckw<"atom"> sep<",", AtomNodeName> "."
+  } |
+  NodeDeclaration {
+    (kw<"declare"> | kw<"declare">? ckw<"multi">) sep<",", NodeName> "."
   } |
   ScopeDeclaration {
     kw<"scope"> sep<",", ScopeElement> "."
@@ -161,13 +167,15 @@ RelationName { QualifiedName ~name }
 
 //RuleName { QualifiedName }
 
-IndividualNodeName { QualifiedName }
+AtomNodeName { QualifiedName }
 
 VariableName[@dynamicPrecedence=10] { QualifiedName ~name }
 
 NodeName { QualifiedName }
 
-QualifiedName[implicitCompletion=true] { identifier ("::" identifier)* }
+ModuleName { QualifiedName }
+
+QualifiedName[implicitCompletion=true] { "::"? identifier (QualifiedNameSeparator "::" identifier)* }
 
 kw<term> { @specialize[@name={term},implicitCompletion=true]<identifier, term> }
 
@@ -181,6 +189,10 @@ sep1<separator, content> { content (separator content)* }
 
 @skip { LineComment | BlockComment | whitespace }
 
+@external tokens qualifiedNameSeparator from "./tokens" {
+  QualifiedNameSeparator
+}
+
 @tokens {
   whitespace { std.whitespace+ }
 
diff --git a/subprojects/frontend/src/language/problemLanguageSupport.ts b/subprojects/frontend/src/language/problemLanguageSupport.ts
index 2121e05f..14826363 100644
--- a/subprojects/frontend/src/language/problemLanguageSupport.ts
+++ b/subprojects/frontend/src/language/problemLanguageSupport.ts
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ * SPDX-FileCopyrightText: 2021-2024 The Refinery Authors <https://refinery.tools/>
  *
  * SPDX-License-Identifier: EPL-2.0
  */
@@ -27,7 +27,8 @@ const parserWithMetadata = parser.configure({
     styleTags({
       LineComment: t.lineComment,
       BlockComment: t.blockComment,
-      'problem class enum pred fn indiv scope': t.definitionKeyword,
+      'module problem class enum pred fn scope': t.definitionKeyword,
+      'import as declare atom multi': t.definitionKeyword,
       'abstract extends refers contains container opposite': t.modifier,
       'default error contained containment': t.modifier,
       'true false unknown error': t.keyword,
@@ -44,8 +45,9 @@ const parserWithMetadata = parser.configure({
       String: t.string,
       'RelationName/QualifiedName': t.typeName,
       // 'RuleName/QualifiedName': t.typeName,
-      'IndividualNodeName/QualifiedName': t.atom,
+      'AtomNodeName/QualifiedName': t.atom,
       'VariableName/QualifiedName': t.variableName,
+      'ModuleName/QualifiedName': t.typeName,
       '{ }': t.brace,
       '( )': t.paren,
       '[ ]': t.squareBracket,
@@ -54,7 +56,8 @@ const parserWithMetadata = parser.configure({
     }),
     indentNodeProp.add({
       ProblemDeclaration: indentDeclaration,
-      UniqueDeclaration: indentDeclaration,
+      AtomDeclaration: indentDeclaration,
+      NodeDeclaration: indentDeclaration,
       ScopeDeclaration: indentDeclaration,
       PredicateBody: indentPredicateOrRule,
       FunctionBody: indentPredicateOrRule,
@@ -70,7 +73,8 @@ const parserWithMetadata = parser.configure({
       // RuleBody: foldInside,
       Conjunction: foldConjunction,
       // Consequent: foldWholeNode,
-      UniqueDeclaration: foldDeclaration,
+      AtomDeclaration: foldDeclaration,
+      NodeDeclaration: foldDeclaration,
       ScopeDeclaration: foldDeclaration,
       BlockComment: foldBlockComment,
     }),
diff --git a/subprojects/frontend/src/language/tokens.ts b/subprojects/frontend/src/language/tokens.ts
new file mode 100644
index 00000000..b5d022f1
--- /dev/null
+++ b/subprojects/frontend/src/language/tokens.ts
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2018-2024 by Marijn Haverbeke <marijnh@gmail.com> and others
+ * Copyright (C) 2024 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: MIT AND EPL-2.0
+ *
+ * Based on the CSS tokenizer at
+ * https://github.com/lezer-parser/css/blob/790568c968a660a94bf0fbd97a86c66da1c529e5/src/tokens.js
+ */
+
+import { ExternalTokenizer } from '@lezer/lr';
+
+/* eslint-disable-next-line import/no-unresolved --
+  Synthetic import from `@lezer/generator/rollup` cannot be found by ESLint.
+*/
+import { QualifiedNameSeparator } from './problem.grammar.terms';
+
+const colon = 58;
+const underscore = 95;
+
+function isAlpha(ch: number) {
+  return (ch >= 65 && ch <= 90) || (ch >= 97 && ch <= 122) || ch >= 161;
+}
+
+function isDigit(ch: number) {
+  return ch >= 48 && ch <= 57;
+}
+
+function isIdentifier(ch: number) {
+  return isAlpha(ch) || isDigit(ch) || ch === underscore;
+}
+
+/* eslint-disable-next-line import/prefer-default-export --
+  Lezer requires a named export.
+*/
+export const qualifiedNameSeparator = new ExternalTokenizer((input) => {
+  if (input.peek(0) === colon && input.peek(1) === colon) {
+    const previous = input.peek(-1);
+    if (isIdentifier(previous)) {
+      // Inject an extra 0-length token into the token stream to let Lezer
+      // consume the `::` on its own. Explicitly consuming 2 characters here
+      // leads to inconsistent highlighting of qualified names.
+      input.acceptToken(QualifiedNameSeparator);
+    }
+  }
+});
diff --git a/subprojects/frontend/src/xtext/ContentAssistService.ts b/subprojects/frontend/src/xtext/ContentAssistService.ts
index ac8ab36a..d42dde14 100644
--- a/subprojects/frontend/src/xtext/ContentAssistService.ts
+++ b/subprojects/frontend/src/xtext/ContentAssistService.ts
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ * SPDX-FileCopyrightText: 2021-2024 The Refinery Authors <https://refinery.tools/>
  *
  * SPDX-License-Identifier: EPL-2.0
  */
@@ -108,7 +108,11 @@ function createCompletion(entry: ContentAssistEntry): Completion {
       boost = -90;
       break;
     default:
-      {
+      if (entry.proposal.startsWith('::')) {
+        // Move absolute names below relative names,
+        // they should only be preferred if no relative name is available.
+        boost = -60;
+      } else {
         // Penalize qualified names (vs available unqualified names).
         const extraSegments = entry.proposal.match(/::/g)?.length || 0;
         boost = Math.max(-5 * extraSegments, -50);
diff --git a/subprojects/frontend/types/grammar.d.ts b/subprojects/frontend/types/grammar.d.ts
index 92f99ec3..c7848e33 100644
--- a/subprojects/frontend/types/grammar.d.ts
+++ b/subprojects/frontend/types/grammar.d.ts
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2018 by Marijn Haverbeke <marijn@haverbeke.berlin> and others
- * Copyright (C) 2021-2023 The Refinery Authors <https://refinery.tools/>
+ * Copyright (C) 2021-2024 The Refinery Authors <https://refinery.tools/>
  *
  * SPDX-License-Identifier: MIT
  */
@@ -10,3 +10,7 @@ declare module '*.grammar' {
 
   export const parser: LRParser;
 }
+
+declare module '*.terms' {
+  export const QualifiedNameSeparator: number;
+}