Skip to content

Commit

Permalink
update to flowr 2.1.5 (#127)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Ellpeck
Ellpeck authored Nov 13, 2024
1 parent 8107516 commit 8a486d8
Show file tree
Hide file tree
Showing 8 changed files with 120 additions and 138 deletions.
191 changes: 86 additions & 105 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@
"watch-web": "webpack --watch"
},
"dependencies": {
"@eagleoutice/flowr-dev": "^0.0.2024-09-27-19-24",
"@eagleoutice/flowr": "^2.1.5",
"assert": "^2.1.0",
"browserify-zlib": "^0.2.0",
"constants-browserify": "^1.0.0",
Expand Down
2 changes: 1 addition & 1 deletion src/extension.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { registerDiagramCommands } from './diagram'
import type { FlowrSession } from './flowr/utils'
import { selectionSlicer } from './selection-slicer'
import { positionSlicers } from './position-slicer'
import { flowrVersion } from '@eagleoutice/flowr-dev/util/version'
import { flowrVersion } from '@eagleoutice/flowr/util/version'

export const MINIMUM_R_MAJOR = 3
export const BEST_R_MAJOR = 4
Expand Down
18 changes: 9 additions & 9 deletions src/flowr/internal-session.ts
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
import * as vscode from 'vscode'
import { BEST_R_MAJOR, MINIMUM_R_MAJOR, getConfig, isVerbose, updateStatusBar } from '../extension'
import { Settings } from '../settings'
import { dataflowGraphToMermaid } from '@eagleoutice/flowr-dev/core/print/dataflow-printer'
import { extractCFG } from '@eagleoutice/flowr-dev/util/cfg/cfg'
import { dataflowGraphToMermaid } from '@eagleoutice/flowr/core/print/dataflow-printer'
import { extractCFG } from '@eagleoutice/flowr/util/cfg/cfg'
import type { FlowrSession, SliceReturn } from './utils'
import { consolidateNewlines, makeSliceElements, makeSlicingCriteria } from './utils'
import type { RShellOptions } from '@eagleoutice/flowr-dev/r-bridge/shell'
import { RShell, RShellReviveOptions } from '@eagleoutice/flowr-dev/r-bridge/shell'
import { PipelineExecutor } from '@eagleoutice/flowr-dev/core/pipeline-executor'
import { DEFAULT_DATAFLOW_PIPELINE, DEFAULT_NORMALIZE_PIPELINE, DEFAULT_SLICING_PIPELINE } from '@eagleoutice/flowr-dev/core/steps/pipeline/default-pipelines'
import { requestFromInput } from '@eagleoutice/flowr-dev/r-bridge/retriever'
import { normalizedAstToMermaid } from '@eagleoutice/flowr-dev/util/mermaid/ast'
import { cfgToMermaid } from '@eagleoutice/flowr-dev/util/mermaid/cfg'
import type { RShellOptions } from '@eagleoutice/flowr/r-bridge/shell'
import { RShell, RShellReviveOptions } from '@eagleoutice/flowr/r-bridge/shell'
import { PipelineExecutor } from '@eagleoutice/flowr/core/pipeline-executor'
import { DEFAULT_DATAFLOW_PIPELINE, DEFAULT_NORMALIZE_PIPELINE, DEFAULT_SLICING_PIPELINE } from '@eagleoutice/flowr/core/steps/pipeline/default-pipelines'
import { requestFromInput } from '@eagleoutice/flowr/r-bridge/retriever'
import { normalizedAstToMermaid } from '@eagleoutice/flowr/util/mermaid/ast'
import { cfgToMermaid } from '@eagleoutice/flowr/util/mermaid/cfg'

export class FlowrInternalSession implements FlowrSession {

Expand Down
30 changes: 15 additions & 15 deletions src/flowr/server-session.ts
View file
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
import * as net from 'net'
import * as vscode from 'vscode'
import * as ws from 'ws'
import type { FlowrMessage } from '@eagleoutice/flowr-dev/cli/repl/server/messages/messages'
import type { SourceRange } from '@eagleoutice/flowr-dev/util/range'
import type { FlowrMessage } from '@eagleoutice/flowr/cli/repl/server/messages/all-messages'
import type { SourceRange } from '@eagleoutice/flowr/util/range'
import { establishInternalSession, getConfig, isVerbose, isWeb, updateStatusBar } from '../extension'
import type { ConnectionType } from '../settings'
import { Settings } from '../settings'
import { dataflowGraphToMermaid } from '@eagleoutice/flowr-dev/core/print/dataflow-printer'
import { extractCFG } from '@eagleoutice/flowr-dev/util/cfg/cfg'
import { normalizedAstToMermaid } from '@eagleoutice/flowr-dev/util/mermaid/ast'
import { cfgToMermaid } from '@eagleoutice/flowr-dev/util/mermaid/cfg'
import { dataflowGraphToMermaid } from '@eagleoutice/flowr/core/print/dataflow-printer'
import { extractCFG } from '@eagleoutice/flowr/util/cfg/cfg'
import { normalizedAstToMermaid } from '@eagleoutice/flowr/util/mermaid/ast'
import { cfgToMermaid } from '@eagleoutice/flowr/util/mermaid/cfg'
import type { FlowrSession, SliceReturn } from './utils'
import { consolidateNewlines, makeSliceElements, makeSlicingCriteria } from './utils'
import type { NodeId } from '@eagleoutice/flowr-dev/r-bridge/lang-4.x/ast/model/processing/node-id'
import { visitAst } from '@eagleoutice/flowr-dev/r-bridge/lang-4.x/ast/model/processing/visitor'
import type { DataflowGraphJson } from '@eagleoutice/flowr-dev/dataflow/graph/graph'
import { DataflowGraph } from '@eagleoutice/flowr-dev/dataflow/graph/graph'
import type { NormalizedAst } from '@eagleoutice/flowr-dev/r-bridge/lang-4.x/ast/model/processing/decorate'
import { BiMap } from '@eagleoutice/flowr-dev/util/bimap'
import type { FlowrHelloResponseMessage } from '@eagleoutice/flowr-dev/cli/repl/server/messages/message-hello'
import type { FileAnalysisResponseMessageJson } from '@eagleoutice/flowr-dev/cli/repl/server/messages/message-analysis'
import type { SliceResponseMessage } from '@eagleoutice/flowr-dev/cli/repl/server/messages/message-slice'
import type { NodeId } from '@eagleoutice/flowr/r-bridge/lang-4.x/ast/model/processing/node-id'
import { visitAst } from '@eagleoutice/flowr/r-bridge/lang-4.x/ast/model/processing/visitor'
import type { DataflowGraphJson } from '@eagleoutice/flowr/dataflow/graph/graph'
import { DataflowGraph } from '@eagleoutice/flowr/dataflow/graph/graph'
import type { NormalizedAst } from '@eagleoutice/flowr/r-bridge/lang-4.x/ast/model/processing/decorate'
import { BiMap } from '@eagleoutice/flowr/util/bimap'
import type { FlowrHelloResponseMessage } from '@eagleoutice/flowr/cli/repl/server/messages/message-hello'
import type { FileAnalysisResponseMessageJson } from '@eagleoutice/flowr/cli/repl/server/messages/message-analysis'
import type { SliceResponseMessage } from '@eagleoutice/flowr/cli/repl/server/messages/message-slice'

export class FlowrServerSession implements FlowrSession {

Expand Down
8 changes: 4 additions & 4 deletions src/flowr/utils.ts
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import type * as vscode from 'vscode'

import type { NodeId } from '@eagleoutice/flowr-dev/r-bridge/lang-4.x/ast/model/processing/node-id'
import type { SourceRange } from '@eagleoutice/flowr-dev/util/range'
import type { SingleSlicingCriterion } from '@eagleoutice/flowr-dev/slicing/criterion/parse'
import type { NodeId } from '@eagleoutice/flowr/r-bridge/lang-4.x/ast/model/processing/node-id'
import type { SourceRange } from '@eagleoutice/flowr/util/range'
import type { SingleSlicingCriterion, SlicingCriteria } from '@eagleoutice/flowr/slicing/criterion/parse'

// Contains utility functions and a common interface for the two FlowrSession implementations

Expand Down Expand Up @@ -38,7 +38,7 @@ function toSlicingCriterion(pos: vscode.Position): SingleSlicingCriterion {
return `${pos.line + 1}:${pos.character + 1}`
}

export function makeSlicingCriteria(positions: vscode.Position[], doc: vscode.TextDocument, verbose: boolean = true): SingleSlicingCriterion[] {
export function makeSlicingCriteria(positions: vscode.Position[], doc: vscode.TextDocument, verbose: boolean = true): SlicingCriteria {
positions = positions.map(pos => {
const range = getPositionAt(pos, doc)
pos = range?.start ?? pos
Expand Down
4 changes: 2 additions & 2 deletions src/slice.ts
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import * as vscode from 'vscode'
import type { SourceRange } from '@eagleoutice/flowr-dev/util/range'
import type { SourceRange } from '@eagleoutice/flowr/util/range'
import { getConfig } from './extension'
import type { SliceDisplay } from './settings'
import { Settings } from './settings'
import { getSelectionSlicer, showSelectionSliceInEditor } from './selection-slicer'
import { disposeActivePositionSlicer, getActivePositionSlicer, addCurrentPositions, positionSlicers } from './position-slicer'
import type { NodeId } from '@eagleoutice/flowr-dev/r-bridge/lang-4.x/ast/model/processing/node-id'
import type { NodeId } from '@eagleoutice/flowr/r-bridge/lang-4.x/ast/model/processing/node-id'
import { getReconstructionContentProvider, makeUri } from './doc-provider'

export function registerSliceCommands(context: vscode.ExtensionContext) {
Expand Down
3 changes: 2 additions & 1 deletion tsconfig.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
],
"sourceMap": true,
"rootDir": "src",
"strict": true
"strict": true,
"esModuleInterop": true
}
}

0 comments on commit 8a486d8

Please sign in to comment.