@halcyontech/vscode-ibmi-types 2.4.0 → 2.6.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,5 +1,5 @@
1
1
  import vscode, { EventEmitter } from 'vscode';
2
- import { Action, CommandResult, DeploymentMethod, RemoteCommand } from '../typings';
2
+ import { Action, BrowserItem, CommandResult, DeploymentMethod, RemoteCommand } from '../typings';
3
3
  import Instance from './Instance';
4
4
  export interface ILELibrarySettings {
5
5
  currentLibrary: string;
@@ -7,7 +7,7 @@ export interface ILELibrarySettings {
7
7
  }
8
8
  export declare namespace CompileTools {
9
9
  function register(context: vscode.ExtensionContext): void;
10
- function runAction(instance: Instance, uri: vscode.Uri, customAction?: Action, method?: DeploymentMethod): Promise<boolean>;
10
+ function runAction(instance: Instance, uri: vscode.Uri, customAction?: Action, method?: DeploymentMethod, browserItem?: BrowserItem): Promise<boolean>;
11
11
  /**
12
12
  * Execute a command
13
13
  */
@@ -1,4 +1,5 @@
1
1
  import * as vscode from 'vscode';
2
+ import { DeploymentMethod } from '../typings';
2
3
  export declare type SourceDateMode = "edit" | "diff";
3
4
  export declare function onCodeForIBMiConfigurationChange<T>(props: string | string[], todo: (value: vscode.ConfigurationChangeEvent) => void): vscode.Disposable;
4
5
  export declare namespace GlobalConfiguration {
@@ -35,6 +36,7 @@ export declare namespace ConnectionConfiguration {
35
36
  debugEnableDebugTracing: boolean;
36
37
  readOnlyMode: boolean;
37
38
  quickConnect: boolean;
39
+ defaultDeploymentMethod: DeploymentMethod | '';
38
40
  [name: string]: any;
39
41
  }
40
42
  interface ObjectFilters {
package/api/IBMi.d.ts CHANGED
@@ -1,7 +1,7 @@
1
1
  import * as node_ssh from "node-ssh";
2
2
  import * as vscode from "vscode";
3
3
  import { ConnectionConfiguration } from "./Configuration";
4
- import { CommandData, CommandResult, ConnectionData, IBMiMember, RemoteCommand, StandardIO } from "../typings";
4
+ import { CommandData, CommandResult, ConnectionData, IBMiMember, RemoteCommand } from "../typings";
5
5
  export interface MemberParts extends IBMiMember {
6
6
  basename: string;
7
7
  }
@@ -38,12 +38,6 @@ export default class IBMi {
38
38
  success: boolean;
39
39
  error?: any;
40
40
  }>;
41
- /**
42
- * @deprecated Use runCommand instead
43
- * @param {string} command
44
- * @param {string} [directory] If not passed, will use current home directory
45
- */
46
- remoteCommand(command: string, directory?: string): Promise<String | CommandResult>;
47
41
  /**
48
42
  * - Send PASE/QSH/ILE commands simply
49
43
  * - Commands sent here end in the 'IBM i Output' channel
@@ -54,10 +48,6 @@ export default class IBMi {
54
48
  */
55
49
  runCommand(data: RemoteCommand): Promise<CommandResult>;
56
50
  sendQsh(options: CommandData): Promise<CommandResult>;
57
- /**
58
- * @deprecated Use sendCommand instead
59
- */
60
- paseCommand(command: string, directory?: string, returnType?: number, standardIO?: StandardIO): Promise<String | CommandResult>;
61
51
  /**
62
52
  * Send commands to pase through the SSH connection.
63
53
  * Commands sent here end up in the 'Code for IBM i' output channel.
package/api/Storage.d.ts CHANGED
@@ -28,6 +28,7 @@ export declare type CachedServerSettings = {
28
28
  };
29
29
  badDataAreasChecked: boolean | null;
30
30
  libraryListValidated: boolean | null;
31
+ pathChecked?: boolean;
31
32
  } | undefined;
32
33
  export declare class GlobalStorage extends Storage {
33
34
  private static instance;
@@ -53,6 +54,7 @@ export declare class GlobalStorage extends Storage {
53
54
  };
54
55
  badDataAreasChecked: boolean;
55
56
  libraryListValidated: boolean;
57
+ pathChecked?: boolean;
56
58
  };
57
59
  setServerSettingsCache(name: string, serverSettings: CachedServerSettings): Promise<void>;
58
60
  deleteServerSettingsCache(name: string): Promise<void>;
package/api/Tools.d.ts CHANGED
@@ -26,7 +26,7 @@ export declare namespace Tools {
26
26
  * @param member
27
27
  * @param iasp Optional: an iASP name
28
28
  */
29
- function qualifyPath(library: string, object: string, member: string, iasp?: string): string;
29
+ function qualifyPath(library: string, object: string, member: string, iasp?: string, sanitise?: boolean): string;
30
30
  /**
31
31
  * Unqualify member path from root
32
32
  */
@@ -40,4 +40,5 @@ export declare namespace Tools {
40
40
  function distinct(value: any, index: number, array: any[]): boolean;
41
41
  function md5Hash(file: vscode.Uri): string;
42
42
  function capitalize(text: string): string;
43
+ function sanitizeLibraryNames(libraries: string[]): string[];
43
44
  }
@@ -1,6 +1,12 @@
1
1
  import IBMi from "../IBMi";
2
- export declare function getKeystorePath(connection: IBMi): string;
3
- export declare function getLocalCertPath(connection: IBMi): string;
4
- export declare function checkRemoteExists(connection: IBMi): Promise<boolean>;
2
+ export declare function getRemoteServerCertPath(connection: IBMi): string;
3
+ export declare function getRemoteClientCertPath(connection: IBMi): string;
4
+ export declare function remoteServerCertExists(connection: IBMi): Promise<boolean>;
5
+ export declare function remoteClientCertExists(connection: IBMi): Promise<boolean>;
6
+ /**
7
+ * Generate all certifcates on the server
8
+ */
5
9
  export declare function setup(connection: IBMi): Promise<void>;
6
- export declare function checkLocalExists(connection: IBMi): Promise<boolean>;
10
+ export declare function downloadClientCert(connection: IBMi): Promise<void>;
11
+ export declare function getLocalCertPath(connection: IBMi): string;
12
+ export declare function localClientCertExists(connection: IBMi): Promise<boolean>;
@@ -1,10 +1,13 @@
1
1
  import { ExtensionContext } from "vscode";
2
2
  import Instance from "../Instance";
3
+ import { ILELibrarySettings } from "../CompileTools";
4
+ export declare function isManaged(): boolean;
3
5
  export declare function initialize(context: ExtensionContext): Promise<void>;
4
6
  interface DebugOptions {
5
7
  password: string;
6
8
  library: string;
7
9
  object: string;
10
+ libraries: ILELibrarySettings;
8
11
  }
9
12
  export declare function startDebug(instance: Instance, options: DebugOptions): Promise<void>;
10
13
  export {};
@@ -12,6 +12,7 @@ export declare function registerDiagnostics(): vscode.Disposable[];
12
12
  * Does what it says on the tin.
13
13
  */
14
14
  export declare function clearDiagnostics(): void;
15
+ export declare function clearDiagnostic(uri: vscode.Uri, changeRange: vscode.Range): void;
15
16
  export declare function refreshDiagnosticsFromServer(instance: Instance, evfeventInfo: EvfEventInfo): Promise<void>;
16
17
  export declare function refreshDiagnosticsFromLocal(instance: Instance, evfeventInfo: EvfEventInfo): Promise<void>;
17
18
  export declare function handleEvfeventLines(lines: string[], instance: Instance, evfeventInfo: EvfEventInfo): Promise<void>;
@@ -1,8 +1,13 @@
1
1
  import { Ignore } from 'ignore';
2
- import vscode, { WorkspaceFolder } from 'vscode';
2
+ import vscode, { Uri, WorkspaceFolder } from 'vscode';
3
3
  import { DeploymentMethod, DeploymentParameters } from '../../typings';
4
+ declare type ServerFileChanges = {
5
+ uploads: Uri[];
6
+ relativeRemoteDeletes: string[];
7
+ };
4
8
  export declare namespace DeployTools {
5
9
  function launchActionsSetup(workspaceFolder?: WorkspaceFolder): Promise<void>;
10
+ function getRemoteDeployDirectory(workspaceFolder: WorkspaceFolder): string | undefined;
6
11
  /**
7
12
  * Deploy a workspace to a remote IFS location.
8
13
  * @param workspaceIndex if no index is provided, a prompt will be shown to pick one if there are multiple workspaces,
@@ -10,15 +15,19 @@ export declare namespace DeployTools {
10
15
  * @param method if no method is provided, a prompt will be shown to pick the deployment method.
11
16
  * @returns the index of the deployed workspace or `undefined` if the deployment failed
12
17
  */
13
- function launchDeploy(workspaceIndex?: number, method?: DeploymentMethod): Promise<number | undefined>;
18
+ function launchDeploy(workspaceIndex?: number, method?: DeploymentMethod): Promise<{
19
+ remoteDirectory: string;
20
+ workspaceId: number;
21
+ } | undefined>;
14
22
  function deploy(parameters: DeploymentParameters): Promise<boolean>;
15
23
  function getDeployChangedFiles(parameters: DeploymentParameters): Promise<vscode.Uri[]>;
16
24
  function getDeployGitFiles(parameters: DeploymentParameters, changeType: 'staged' | 'working'): Promise<vscode.Uri[]>;
17
25
  function getDeployCompareFiles(parameters: DeploymentParameters, progress?: vscode.Progress<{
18
26
  message?: string;
19
- }>): Promise<vscode.Uri[]>;
27
+ }>): Promise<ServerFileChanges>;
20
28
  function getDeployAllFiles(parameters: DeploymentParameters): Promise<vscode.Uri[]>;
21
29
  function setDeployLocation(node: any, workspaceFolder?: WorkspaceFolder, value?: string): Promise<void>;
22
30
  function buildPossibleDeploymentDirectory(workspace: vscode.WorkspaceFolder): string;
23
31
  function getDefaultIgnoreRules(workspaceFolder: vscode.WorkspaceFolder): Promise<Ignore>;
24
32
  }
33
+ export {};
@@ -19,6 +19,7 @@ export declare namespace Deployment {
19
19
  function toMD5Entry(line: string): MD5Entry;
20
20
  function toRelative(root: vscode.Uri, file: vscode.Uri): string;
21
21
  function findFiles(parameters: DeploymentParameters, includePattern: string, excludePattern?: string): Promise<vscode.Uri[]>;
22
+ function deleteFiles(parameters: DeploymentParameters, toDelete: string[]): Promise<void>;
22
23
  function sendCompressed(parameters: DeploymentParameters, files: vscode.Uri[], progress: vscode.Progress<{
23
24
  message?: string;
24
25
  }>): Promise<void>;
@@ -2,3 +2,4 @@ import { WorkspaceFolder } from "vscode";
2
2
  export declare function getEnvConfig(currentWorkspace: WorkspaceFolder): Promise<{
3
3
  [key: string]: string;
4
4
  }>;
5
+ export declare function getBranchLibraryName(currentBranch: string): string;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@halcyontech/vscode-ibmi-types",
3
- "version": "2.4.0",
3
+ "version": "2.6.0",
4
4
  "description": "Types for vscode-ibmi",
5
5
  "typings": "./typings.d.ts",
6
6
  "scripts": {
package/typings.d.ts CHANGED
@@ -28,12 +28,16 @@ export interface StandardIO {
28
28
  /**
29
29
  * External interface for extensions to call `code-for-ibmi.runCommand`
30
30
  */
31
+ export declare type ActionType = "member" | "streamfile" | "object" | "file";
32
+ export declare type ActionRefresh = "no" | "parent" | "filter" | "browser";
33
+ export declare type ActionEnvironment = "ile" | "qsh" | "pase";
31
34
  export interface RemoteCommand {
32
35
  title?: string;
33
36
  command: string;
34
- environment?: "ile" | "qsh" | "pase";
37
+ environment?: ActionEnvironment;
35
38
  cwd?: string;
36
39
  env?: Record<string, string>;
40
+ noLibList?: boolean;
37
41
  }
38
42
  export interface CommandData extends StandardIO {
39
43
  command: string;
@@ -46,8 +50,6 @@ export interface CommandResult {
46
50
  stderr: string;
47
51
  command?: string;
48
52
  }
49
- export declare type ActionType = "member" | "streamfile" | "object" | "file";
50
- export declare type ActionEnvironment = "ile" | "qsh" | "pase";
51
53
  export interface Action {
52
54
  name: string;
53
55
  command: string;
@@ -56,6 +58,8 @@ export interface Action {
56
58
  extensions?: string[];
57
59
  deployFirst?: boolean;
58
60
  postDownload?: string[];
61
+ refresh?: ActionRefresh;
62
+ runOnProtected?: boolean;
59
63
  }
60
64
  export interface ConnectionData {
61
65
  name: string;
@@ -63,6 +67,7 @@ export interface ConnectionData {
63
67
  port: number;
64
68
  username: string;
65
69
  password?: string;
70
+ privateKey?: string;
66
71
  privateKeyPath?: string;
67
72
  keepaliveInterval?: number;
68
73
  }
@@ -73,6 +78,7 @@ export interface Profile {
73
78
  profile: string;
74
79
  }
75
80
  export interface QsysPath {
81
+ asp?: string;
76
82
  library: string;
77
83
  name: string;
78
84
  }
@@ -101,7 +107,7 @@ export interface IFSFile {
101
107
  name: string;
102
108
  path: string;
103
109
  size?: number;
104
- modified?: Date | string;
110
+ modified?: Date;
105
111
  owner?: string;
106
112
  }
107
113
  export interface IBMiError {