Replace lang extensions by builtin blocktype definitions

apps/vs-code-extension/src/language-server.ts

@@ -2,20 +2,14 @@
 //
 // SPDX-License-Identifier: AGPL-3.0-only
 
-import { StdLangExtension } from '@jvalue/jayvee-extensions/std/lang';
-import {
-  createJayveeServices,
-  useExtension,
-} from '@jvalue/jayvee-language-server';
+import { createJayveeServices } from '@jvalue/jayvee-language-server';
 import { startLanguageServer } from 'langium';
 import { NodeFileSystem } from 'langium/node';
 import { ProposedFeatures, createConnection } from 'vscode-languageserver/node';
 
 // Create a connection to the client
 const connection = createConnection(ProposedFeatures.all);
 
-useExtension(new StdLangExtension());
-
 // Inject the shared services and language-specific services
 const { shared } = createJayveeServices({
   connection,

apps/vs-code-extension/src/standard-library-file-system-provider.ts

@@ -2,12 +2,7 @@
 //
 // SPDX-License-Identifier: AGPL-3.0-only
 
-import { StdLangExtension } from '@jvalue/jayvee-extensions/std/lang';
-import {
-  getStdLib,
-  registerConstraints,
-  useExtension as useLangExtension,
-} from '@jvalue/jayvee-language-server';
+import { getStdLib, registerConstraints } from '@jvalue/jayvee-language-server';
 import {
   EventEmitter,
   ExtensionContext,
@@ -34,7 +29,6 @@ export class StandardLibraryFileSystemProvider implements FileSystemProvider {
   private registerStdLib() {
     // The VSCode Extension needs to register the StdLangExtension,
     // otherwise the StdLib does not include the blocktype definitions.
-    useLangExtension(new StdLangExtension());
     registerConstraints();
 
     Object.entries(getStdLib()).forEach(([libName, lib]) => {

example/test.jv

@@ -0,0 +1,19 @@
+/*
+Interprets an input file as a csv-file containing string-values delimited by `delimiter` and outputs a `Sheet`.
+
+@example Interprets an input file as a csv-file containing string-values delimited by `;` and outputs `Sheet`.
+block AgencyCSVInterpreter oftype CSVInterpreter {  
+    delimiter: ";";
+  }
+*/
+builtin blocktype CSVInterpreter {
+	input default oftype TextFile;
+	output default oftype Sheet;
+
+	// The delimiter for values in the CSV file.
+	property delimiter oftype text: ',';
+	// The enclosing character that may be used for values in the CSV file.
+	property enclosing oftype text: '';
+	// The character to escape enclosing characters in values.
+	property enclosingEscape oftype text: '';
+}

libs/execution/src/lib/execution-context.ts

@@ -6,6 +6,7 @@ import { strict as assert } from 'assert';
 
 import {
   BlockDefinition,
+  BlockMetaInformation,
   ConstraintDefinition,
   EvaluationContext,
   InternalValueRepresentation,
@@ -14,7 +15,6 @@ import {
   TransformDefinition,
   Valuetype,
   evaluatePropertyValue,
-  getOrFailBockMetaInf,
   getOrFailConstraintMetaInf,
   isBlockDefinition,
   isExpressionConstraintDefinition,
@@ -150,7 +150,8 @@ export class ExecutionContext {
       return getOrFailConstraintMetaInf(currentNode.type);
     } else if (isBlockDefinition(currentNode)) {
       assert(isReference(currentNode.type));
-      return getOrFailBockMetaInf(currentNode.type);
+      assert(BlockMetaInformation.canBeWrapped(currentNode.type));
+      return new BlockMetaInformation(currentNode.type);
     }
     assertUnreachable(currentNode);
   }