Tabular extension exec tests

libs/extensions/std/exec/src/file-util.spec.ts → libs/execution/src/lib/util/file-util.spec.ts

@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: AGPL-3.0-only
 
-import { FileExtension, MimeType } from '@jvalue/jayvee-execution';
+import { FileExtension, MimeType } from '../types';
 
 import {
   inferFileExtensionFromContentTypeString,

libs/extensions/std/exec/src/file-util.ts → libs/execution/src/lib/util/file-util.ts

@@ -2,9 +2,10 @@
 //
 // SPDX-License-Identifier: AGPL-3.0-only
 
-import { FileExtension, MimeType } from '@jvalue/jayvee-execution';
 import * as mime from 'mime-types';
 
+import { FileExtension, MimeType } from '../types';
+
 export function inferMimeTypeFromFileExtensionString(
   fileExtension: string | undefined,
 ): MimeType | undefined {

libs/execution/src/lib/util/index.ts

@@ -3,3 +3,5 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 
 export * from './implements-static-decorator';
+export * from './file-util';
+export * from './string-util';

libs/extensions/std/exec/test/utils.ts → libs/execution/test/utils/file-util.ts

@@ -10,13 +10,10 @@ import {
   FileExtension,
   MimeType,
   TextFile,
-} from '@jvalue/jayvee-execution';
-
-import {
   inferFileExtensionFromFileExtensionString,
   inferMimeTypeFromFileExtensionString,
-} from '../src/file-util';
-import { splitLines } from '../src/string-util';
+  splitLines,
+} from '../../src';
 
 export function createBinaryFileFromLocalFile(fileName: string): BinaryFile {
   const extName = path.extname(fileName);

libs/execution/test/utils/index.ts

@@ -0,0 +1,6 @@
+// SPDX-FileCopyrightText: 2023 Friedrich-Alexander-Universitat Erlangen-Nurnberg
+//
+// SPDX-License-Identifier: AGPL-3.0-only
+
+export * from './test-infrastructure-util';
+export * from './file-util';

libs/execution/test/utils.ts → libs/execution/test/utils/test-infrastructure-util.ts

@@ -19,7 +19,7 @@ import {
   TableColumn,
   blockExecutorRegistry,
   constraintExecutorRegistry,
-} from '../src';
+} from '../../src';
 
 export function clearBlockExecutorRegistry() {
   blockExecutorRegistry.clear();

libs/extensions/std/exec/src/archive-interpreter-executor.spec.ts

@@ -5,7 +5,10 @@
 import * as path from 'path';
 
 import * as R from '@jvalue/jayvee-execution';
-import { getTestExecutionContext } from '@jvalue/jayvee-execution/test';
+import {
+  createBinaryFileFromLocalFile,
+  getTestExecutionContext,
+} from '@jvalue/jayvee-execution/test';
 import {
   BlockDefinition,
   IOType,
@@ -21,8 +24,6 @@ import {
 import { AstNode, AstNodeLocator, LangiumDocument } from 'langium';
 import { NodeFileSystem } from 'langium/node';
 
-import { createBinaryFileFromLocalFile } from '../test';
-
 import { ArchiveInterpreterExecutor } from './archive-interpreter-executor';
 
 describe('Validation of ArchiveInterpreterExecutor', () => {

libs/extensions/std/exec/src/archive-interpreter-executor.ts

@@ -18,15 +18,12 @@ import {
   MimeType,
   err,
   implementsStatic,
+  inferFileExtensionFromFileExtensionString,
+  inferMimeTypeFromFileExtensionString,
 } from '@jvalue/jayvee-execution';
 import { IOType, PrimitiveValuetypes } from '@jvalue/jayvee-language-server';
 import * as JSZip from 'jszip';
 
-import {
-  inferFileExtensionFromFileExtensionString,
-  inferMimeTypeFromFileExtensionString,
-} from './file-util';
-
 @implementsStatic<BlockExecutorClass>()
 export class ArchiveInterpreterExecutor extends AbstractBlockExecutor<
   IOType.FILE,

libs/extensions/std/exec/src/file-picker-executor.spec.ts

@@ -5,7 +5,10 @@
 import * as path from 'path';
 
 import * as R from '@jvalue/jayvee-execution';
-import { getTestExecutionContext } from '@jvalue/jayvee-execution/test';
+import {
+  createBinaryFileFromLocalFile,
+  getTestExecutionContext,
+} from '@jvalue/jayvee-execution/test';
 import {
   BlockDefinition,
   IOType,
@@ -21,8 +24,6 @@ import {
 import { AstNode, AstNodeLocator, LangiumDocument } from 'langium';
 import { NodeFileSystem } from 'langium/node';
 
-import { createBinaryFileFromLocalFile } from '../test';
-
 import { FilePickerExecutor } from './file-picker-executor';
 
 describe('Validation of FilePickerExecutor', () => {

libs/extensions/std/exec/src/gtfs-rt-interpreter-executor.spec.ts

@@ -5,7 +5,10 @@
 import * as path from 'path';
 
 import * as R from '@jvalue/jayvee-execution';
-import { getTestExecutionContext } from '@jvalue/jayvee-execution/test';
+import {
+  createBinaryFileFromLocalFile,
+  getTestExecutionContext,
+} from '@jvalue/jayvee-execution/test';
 import {
   BlockDefinition,
   IOType,
@@ -21,8 +24,6 @@ import {
 import { AstNode, AstNodeLocator, LangiumDocument } from 'langium';
 import { NodeFileSystem } from 'langium/node';
 
-import { createBinaryFileFromLocalFile } from '../test';
-
 import { GtfsRTInterpreterExecutor } from './gtfs-rt-interpreter-executor';
 
 describe('Validation of GtfsRTInterpreterExecutor', () => {

libs/extensions/std/exec/src/http-extractor-executor.ts

@@ -16,16 +16,14 @@ import {
   MimeType,
   None,
   implementsStatic,
+  inferFileExtensionFromContentTypeString,
+  inferFileExtensionFromFileExtensionString,
+  inferMimeTypeFromFileExtensionString,
 } from '@jvalue/jayvee-execution';
 import { IOType, PrimitiveValuetypes } from '@jvalue/jayvee-language-server';
 import { http, https } from 'follow-redirects';
 import { AstNode } from 'langium';
 
-import {
-  inferFileExtensionFromContentTypeString,
-  inferFileExtensionFromFileExtensionString,
-  inferMimeTypeFromFileExtensionString,
-} from './file-util';
 import {
   createBackoffStrategy,
   isBackoffStrategyHandle,

libs/extensions/std/exec/src/text-file-interpreter-executor.spec.ts

@@ -5,7 +5,10 @@
 import * as path from 'path';
 
 import * as R from '@jvalue/jayvee-execution';
-import { getTestExecutionContext } from '@jvalue/jayvee-execution/test';
+import {
+  createBinaryFileFromLocalFile,
+  getTestExecutionContext,
+} from '@jvalue/jayvee-execution/test';
 import {
   BlockDefinition,
   IOType,
@@ -21,8 +24,6 @@ import {
 import { AstNode, AstNodeLocator, LangiumDocument } from 'langium';
 import { NodeFileSystem } from 'langium/node';
 
-import { createBinaryFileFromLocalFile } from '../test';
-
 import { TextFileInterpreterExecutor } from './text-file-interpreter-executor';
 
 describe('Validation of TextFileInterpreterExecutor', () => {

libs/extensions/std/exec/src/text-file-interpreter-executor.ts

@@ -12,11 +12,10 @@ import {
   ExecutionContext,
   TextFile,
   implementsStatic,
+  splitLines,
 } from '@jvalue/jayvee-execution';
 import { IOType, PrimitiveValuetypes } from '@jvalue/jayvee-language-server';
 
-import { splitLines } from './string-util';
-
 @implementsStatic<BlockExecutorClass>()
 export class TextFileInterpreterExecutor extends AbstractBlockExecutor<
   IOType.FILE,

libs/extensions/std/exec/src/text-line-deleter-executor.spec.ts

@@ -5,7 +5,10 @@
 import * as path from 'path';
 
 import * as R from '@jvalue/jayvee-execution';
-import { getTestExecutionContext } from '@jvalue/jayvee-execution/test';
+import {
+  createTextFileFromLocalFile,
+  getTestExecutionContext,
+} from '@jvalue/jayvee-execution/test';
 import {
   BlockDefinition,
   IOType,
@@ -21,8 +24,6 @@ import {
 import { AstNode, AstNodeLocator, LangiumDocument } from 'langium';
 import { NodeFileSystem } from 'langium/node';
 
-import { createTextFileFromLocalFile } from '../test';
-
 import { TextLineDeleterExecutor } from './text-line-deleter-executor';
 
 describe('Validation of TextLineDeleterExecutor', () => {

libs/extensions/std/exec/src/text-range-selector-executor.spec.ts

@@ -5,7 +5,10 @@
 import * as path from 'path';
 
 import * as R from '@jvalue/jayvee-execution';
-import { getTestExecutionContext } from '@jvalue/jayvee-execution/test';
+import {
+  createTextFileFromLocalFile,
+  getTestExecutionContext,
+} from '@jvalue/jayvee-execution/test';
 import {
   BlockDefinition,
   IOType,
@@ -21,8 +24,6 @@ import {
 import { AstNode, AstNodeLocator, LangiumDocument } from 'langium';
 import { NodeFileSystem } from 'langium/node';
 
-import { createTextFileFromLocalFile } from '../test';
-
 import { TextRangeSelectorExecutor } from './text-range-selector-executor';
 
 describe('Validation of TextRangeSelectorExecutor', () => {

libs/extensions/std/exec/test/index.ts

@@ -3,4 +3,3 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 
 export * from './mocks';
-export * from './utils';

libs/extensions/tabular/exec/jest.config.ts

@@ -5,6 +5,7 @@
 export default {
   displayName: 'extensions-tabular-exec',
   preset: '../../../../jest.preset.js',
+  testEnvironment: './test/jsdom-environment-fix.ts',
   globals: {
     'ts-jest': {
       tsconfig: '<rootDir>/tsconfig.spec.json',