@mongosh/editor 1.1.0 → 1.1.1
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.
- package/AUTHORS +1 -0
- package/lib/editor.d.ts +3 -0
- package/lib/editor.js +14 -1
- package/lib/editor.js.map +1 -1
- package/package.json +7 -7
package/AUTHORS
CHANGED
package/lib/editor.d.ts
CHANGED
|
@@ -17,6 +17,7 @@ export declare class Editor {
|
|
|
17
17
|
_instanceState: ShellInstanceState;
|
|
18
18
|
_loadExternalCode: (input: string, filename: string) => Promise<ShellResult>;
|
|
19
19
|
_lastContent: string;
|
|
20
|
+
_lastInputCode: string;
|
|
20
21
|
print: (...args: any[]) => Promise<void>;
|
|
21
22
|
constructor({ input, vscodeDir, tmpDir, instanceState, loadExternalCode }: EditorOptions);
|
|
22
23
|
static create(options: EditorOptions): Editor;
|
|
@@ -35,6 +36,8 @@ export declare class Editor {
|
|
|
35
36
|
originalCode: string;
|
|
36
37
|
modifiedCode: string;
|
|
37
38
|
}): string;
|
|
39
|
+
_setLastInputCode(code: string): void;
|
|
40
|
+
_getLastInputCode(code: string): string;
|
|
38
41
|
runEditCommand(code: string): Promise<void>;
|
|
39
42
|
get messageBus(): MongoshBus;
|
|
40
43
|
}
|
package/lib/editor.js
CHANGED
|
@@ -39,6 +39,7 @@ class Editor {
|
|
|
39
39
|
this._instanceState = instanceState;
|
|
40
40
|
this._loadExternalCode = loadExternalCode;
|
|
41
41
|
this._lastContent = '';
|
|
42
|
+
this._lastInputCode = '';
|
|
42
43
|
this.print = instanceState.context.print;
|
|
43
44
|
const wrapperFn = (code) => {
|
|
44
45
|
return Object.assign(this.runEditCommand(code), {
|
|
@@ -133,12 +134,24 @@ class Editor {
|
|
|
133
134
|
}
|
|
134
135
|
return `${originalCode} = ${modifiedCode}`;
|
|
135
136
|
}
|
|
137
|
+
_setLastInputCode(code) {
|
|
138
|
+
if (code !== '') {
|
|
139
|
+
this._lastInputCode = code;
|
|
140
|
+
}
|
|
141
|
+
}
|
|
142
|
+
_getLastInputCode(code) {
|
|
143
|
+
if (code !== '') {
|
|
144
|
+
return code;
|
|
145
|
+
}
|
|
146
|
+
return this._lastInputCode;
|
|
147
|
+
}
|
|
136
148
|
async runEditCommand(code) {
|
|
137
149
|
await this.print('Opening an editor...');
|
|
138
150
|
const editor = await this._getEditor();
|
|
139
151
|
if (!editor) {
|
|
140
152
|
throw new Error('Command failed with an error: please define an external editor');
|
|
141
153
|
}
|
|
154
|
+
this._setLastInputCode(code);
|
|
142
155
|
const content = await this._getEditorContent(code);
|
|
143
156
|
const ext = await this._getExtension(editor);
|
|
144
157
|
const tmpDoc = await this._createTempFile({ content, ext });
|
|
@@ -157,7 +170,7 @@ class Editor {
|
|
|
157
170
|
const [exitCode] = await events_1.once(proc, 'exit');
|
|
158
171
|
if (exitCode === 0) {
|
|
159
172
|
const modifiedCode = await this._readAndDeleteTempFile(tmpDoc);
|
|
160
|
-
const result = this._prepareResult({ originalCode: code, modifiedCode });
|
|
173
|
+
const result = this._prepareResult({ originalCode: this._getLastInputCode(code), modifiedCode });
|
|
161
174
|
this._input.unshift(result);
|
|
162
175
|
return;
|
|
163
176
|
}
|
package/lib/editor.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"editor.js","sourceRoot":"","sources":["../src/editor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAA6B;AAC7B,mCAA8B;AAC9B,2BAAoC;AAEpC,kEAAyC;AAEzC,0EAAsD;AACtD,oFAAoF;AACpF,kDAAmF;AAKnF,MAAM,QAAQ,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC,EAAE,CAAC;AAU3C,MAAa,MAAM;
|
|
1
|
+
{"version":3,"file":"editor.js","sourceRoot":"","sources":["../src/editor.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@mongosh/editor",
|
|
3
|
-
"version": "1.1.
|
|
3
|
+
"version": "1.1.1",
|
|
4
4
|
"description": "MongoDB Shell External Editor",
|
|
5
5
|
"main": "./lib/index.js",
|
|
6
6
|
"repository": {
|
|
@@ -29,15 +29,15 @@
|
|
|
29
29
|
"unitTestsOnly": true
|
|
30
30
|
},
|
|
31
31
|
"dependencies": {
|
|
32
|
-
"@mongosh/js-multiline-to-singleline": "1.1.
|
|
33
|
-
"@mongosh/service-provider-core": "1.1.
|
|
34
|
-
"@mongosh/shell-api": "1.1.
|
|
35
|
-
"@mongosh/shell-evaluator": "1.1.
|
|
36
|
-
"@mongosh/types": "1.1.
|
|
32
|
+
"@mongosh/js-multiline-to-singleline": "1.1.1",
|
|
33
|
+
"@mongosh/service-provider-core": "1.1.1",
|
|
34
|
+
"@mongosh/shell-api": "1.1.1",
|
|
35
|
+
"@mongosh/shell-evaluator": "1.1.1",
|
|
36
|
+
"@mongosh/types": "1.1.1",
|
|
37
37
|
"js-beautify": "^1.14.0"
|
|
38
38
|
},
|
|
39
39
|
"devDependencies": {
|
|
40
40
|
"nanobus": "^4.5.0"
|
|
41
41
|
},
|
|
42
|
-
"gitHead": "
|
|
42
|
+
"gitHead": "ecf5653fa1520731a3e9172550278f68f0784923"
|
|
43
43
|
}
|