Skip to content

Commit ac2ee24

Browse files
bump api
1 parent 8bb0d1e commit ac2ee24

File tree

14 files changed

+97
-115
lines changed

14 files changed

+97
-115
lines changed

.vscodeignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ tsconfig.json
99
vsc-extension-quickstart.md
1010
tslint.json
1111
tmp/**
12+
**/tmp/**
1213
server/**
1314
!server/dist/server.js
1415
client/dist/*.map
@@ -29,4 +30,5 @@ modules
2930
.github
3031
.vscode
3132
jest.config.js
32-
abap remote fs.code-workspace
33+
abap remote fs.code-workspace
34+
*.cpuprofile

client/package-lock.json

Lines changed: 44 additions & 79 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

client/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
"@abaplint/core": "^2.102.65",
6262
"@types/tmp": "0.2.3",
6363
"abap_cloud_platform": "^1.1.3",
64-
"abap-adt-api": "5.0.6",
64+
"abap-adt-api": "^5.2.5",
6565
"abapfs": "file:../modules/abapfs",
6666
"abapobject": "file:../modules/abapObject",
6767
"client-oauth2": "^4.3.3",

client/src/commands/connectionwizard.ts

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
1-
import { AbapServiceKey, cfCodeGrant, CfEntity, CfInfo, cfInfo, cfInstanceServiceKeyCreate, cfInstanceServiceKeys, CfOrganizationEntity, cfOrganizations, cfPasswordGrant, CfResource, CfServiceEntity, CfServiceInstanceEntity, cfServiceInstances, cfServices, CfSpaceEntity, cfSpaces, getAbapSystemInfo, getAbapUserInfo, isAbapEntity, isAbapServiceKey, loginServer } from "abap_cloud_platform";
2-
import { Token } from "client-oauth2";
3-
import { isLeft } from "fp-ts/Either";
4-
import { pipe } from "fp-ts/lib/function";
5-
import { none } from "fp-ts/lib/Option";
6-
import { bind, chain, map } from "fp-ts/lib/TaskEither";
7-
import { ConfigurationTarget, QuickPickItem, Uri, workspace } from "vscode";
8-
import { ClientConfiguration } from "vscode-abap-remote-fs-sharedapi";
9-
import { saveNewRemote, validateNewConfigId } from "../config";
1+
import { AbapServiceKey, cfCodeGrant, CfInfo, cfInfo, cfInstanceServiceKeyCreate, cfInstanceServiceKeys, cfOrganizations, cfPasswordGrant, CfResource, CfServiceEntity, CfServiceInstanceEntity, cfServiceInstances, cfServices, cfSpaces, getAbapSystemInfo, getAbapUserInfo, isAbapEntity, isAbapServiceKey, loginServer } from "abap_cloud_platform"
2+
import { Token } from "client-oauth2"
3+
import { pipe } from "fp-ts/lib/function"
4+
import { bind, chain, map } from "fp-ts/lib/TaskEither"
5+
import { ConfigurationTarget, QuickPickItem, Uri, workspace } from "vscode"
6+
import { ClientConfiguration } from "vscode-abap-remote-fs-sharedapi"
7+
import { saveNewRemote, validateNewConfigId } from "../config"
108
import {
119
after, askConfirmation, inputBox, isString, openDialog, quickPick, rfsChainE, rfsExtract, rfsTaskEither, RfsTaskEither,
1210
rfsTryCatch, rfsWrap
13-
} from "../lib";
11+
} from "../lib"
1412

1513
interface SimpleSource extends QuickPickItem { key: "LOADKEY" | "MANUAL" | "NONCLOUD" }
1614
interface UrlSource extends QuickPickItem { key: "URL", url: string }
@@ -60,7 +58,7 @@ const entitySelector = (endpoint: string, instance: CfResource<CfServiceInstance
6058
const key = await cfInstanceServiceKeyCreate(endpoint, instance, s.name, token)
6159
if (isAbapEntity(key.entity)) return key.entity.credentials
6260
}
63-
throw new Error("Invalid key");
61+
throw new Error("Invalid key")
6462
}
6563

6664
const selectKey = (endpoint: string, username: string, password: string) => {
@@ -204,7 +202,7 @@ const configFromFile = (name: RfsTaskEither<Uri>) => pipe(
204202
map((f) => {
205203
const key = JSON.parse(f)
206204
if (isAbapServiceKey(key)) return { key }
207-
throw new Error("File is not an ABAP service key");
205+
throw new Error("File is not an ABAP service key")
208206
}),
209207
chain(rfsWrap(x => configFromKey(x.key)))
210208
)

client/tsconfig.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
"exclude": [
2323
"node_modules",
2424
".vscode-test",
25-
"*.d.ts"
25+
"*.d.ts",
26+
"*.test.ts"
2627
]
2728
}

modules/abapObject/package-lock.json

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

modules/abapObject/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@
2020
"typescript": "^4.9.4"
2121
},
2222
"dependencies": {
23-
"abap-adt-api": "5.0.6"
23+
"abap-adt-api": "^5.2.5"
2424
}
2525
}
Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { AbapObjectCreator } from "../creator"
2-
import { AbapObjectBase } from ".."
2+
import { AbapObject, AbapObjectBase, AbapObjectService } from ".."
33

44
const tag = Symbol("AbapInterface")
55
@AbapObjectCreator("INTF/OI")
@@ -8,6 +8,19 @@ export class AbapInterface extends AbapObjectBase {
88
get extension() {
99
return ".intf.abap"
1010
}
11+
constructor(
12+
type: string,
13+
name: string,
14+
path: string,
15+
_expandable: boolean,
16+
techName: string,
17+
parent: AbapObject | undefined,
18+
sapGuiUri: string,
19+
service: AbapObjectService,
20+
owner?: string
21+
) {
22+
super(type, name, path, false, techName, parent, sapGuiUri, service, owner)
23+
}
1124
}
1225

1326
export const isAbapInterface = (x: any): x is AbapInterface => !!x?.[tag]

0 commit comments

Comments
 (0)