@proteinjs/conversation 1.0.6 → 1.0.8
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/.eslintrc.js +20 -0
- package/.prettierignore +4 -0
- package/.prettierrc +8 -0
- package/CHANGELOG.md +18 -4
- package/LICENSE +21 -0
- package/dist/src/CodegenConversation.d.ts.map +1 -1
- package/dist/src/CodegenConversation.js +2 -2
- package/dist/src/CodegenConversation.js.map +1 -1
- package/dist/src/Conversation.d.ts.map +1 -1
- package/dist/src/Conversation.js +33 -17
- package/dist/src/Conversation.js.map +1 -1
- package/dist/src/Function.d.ts.map +1 -1
- package/dist/src/OpenAi.d.ts.map +1 -1
- package/dist/src/OpenAi.js +55 -38
- package/dist/src/OpenAi.js.map +1 -1
- package/dist/src/Paragraph.d.ts.map +1 -1
- package/dist/src/Paragraph.js +2 -1
- package/dist/src/Paragraph.js.map +1 -1
- package/dist/src/Sentence.d.ts.map +1 -1
- package/dist/src/Sentence.js +4 -2
- package/dist/src/Sentence.js.map +1 -1
- package/dist/src/code_template/Code.d.ts.map +1 -1
- package/dist/src/code_template/Code.js +6 -2
- package/dist/src/code_template/Code.js.map +1 -1
- package/dist/src/code_template/CodeTemplate.d.ts.map +1 -1
- package/dist/src/code_template/CodeTemplate.js +2 -1
- package/dist/src/code_template/CodeTemplate.js.map +1 -1
- package/dist/src/code_template/Repo.d.ts.map +1 -1
- package/dist/src/code_template/Repo.js +8 -4
- package/dist/src/code_template/Repo.js.map +1 -1
- package/dist/src/fs/conversation_fs/ConversationFsModerator.d.ts.map +1 -1
- package/dist/src/fs/conversation_fs/ConversationFsModerator.js +18 -7
- package/dist/src/fs/conversation_fs/ConversationFsModerator.js.map +1 -1
- package/dist/src/fs/conversation_fs/ConversationFsModule.d.ts.map +1 -1
- package/dist/src/fs/conversation_fs/ConversationFsModule.js +1 -3
- package/dist/src/fs/conversation_fs/ConversationFsModule.js.map +1 -1
- package/dist/src/fs/conversation_fs/FsFunctions.d.ts.map +1 -1
- package/dist/src/fs/conversation_fs/FsFunctions.js +15 -29
- package/dist/src/fs/conversation_fs/FsFunctions.js.map +1 -1
- package/dist/src/fs/git/GitModule.d.ts.map +1 -1
- package/dist/src/fs/git/GitModule.js.map +1 -1
- package/dist/src/fs/keyword_to_files_index/KeywordToFilesIndexFunctions.d.ts.map +1 -1
- package/dist/src/fs/keyword_to_files_index/KeywordToFilesIndexFunctions.js +2 -2
- package/dist/src/fs/keyword_to_files_index/KeywordToFilesIndexFunctions.js.map +1 -1
- package/dist/src/fs/keyword_to_files_index/KeywordToFilesIndexModule.d.ts.map +1 -1
- package/dist/src/fs/keyword_to_files_index/KeywordToFilesIndexModule.js +1 -3
- package/dist/src/fs/keyword_to_files_index/KeywordToFilesIndexModule.js.map +1 -1
- package/dist/src/fs/package/PackageFunctions.d.ts.map +1 -1
- package/dist/src/fs/package/PackageFunctions.js +20 -30
- package/dist/src/fs/package/PackageFunctions.js.map +1 -1
- package/dist/src/fs/package/PackageModule.d.ts.map +1 -1
- package/dist/src/fs/package/PackageModule.js +15 -8
- package/dist/src/fs/package/PackageModule.js.map +1 -1
- package/dist/src/history/MessageHistory.d.ts.map +1 -1
- package/dist/src/history/MessageHistory.js +6 -3
- package/dist/src/history/MessageHistory.js.map +1 -1
- package/dist/src/template/ConversationTemplate.d.ts.map +1 -1
- package/dist/src/template/ConversationTemplateFunctions.d.ts.map +1 -1
- package/dist/src/template/ConversationTemplateFunctions.js +2 -2
- package/dist/src/template/ConversationTemplateFunctions.js.map +1 -1
- package/dist/src/template/ConversationTemplateModule.d.ts.map +1 -1
- package/dist/src/template/ConversationTemplateModule.js +9 -7
- package/dist/src/template/ConversationTemplateModule.js.map +1 -1
- package/dist/src/template/createCode/CreateCodeConversationTemplate.d.ts.map +1 -1
- package/dist/src/template/createCode/CreateCodeConversationTemplate.js +2 -9
- package/dist/src/template/createCode/CreateCodeConversationTemplate.js.map +1 -1
- package/dist/src/template/createPackage/CreatePackageConversationTemplate.d.ts.map +1 -1
- package/dist/src/template/createPackage/CreatePackageConversationTemplate.js +1 -8
- package/dist/src/template/createPackage/CreatePackageConversationTemplate.js.map +1 -1
- package/dist/test/createKeywordFilesIndex.test.js.map +1 -1
- package/dist/test/openai/openai.generateList.test.js.map +1 -1
- package/dist/test/openai/openai.parseCodeFromMarkdown.test.js +7 -3
- package/dist/test/openai/openai.parseCodeFromMarkdown.test.js.map +1 -1
- package/dist/test/repo/repo.test.js.map +1 -1
- package/jest.config.js +2 -2
- package/package.json +9 -3
- package/src/CodegenConversation.ts +6 -4
- package/src/Conversation.ts +102 -33
- package/src/ConversationModule.ts +2 -2
- package/src/Function.ts +0 -1
- package/src/OpenAi.ts +128 -63
- package/src/Paragraph.ts +3 -2
- package/src/Sentence.ts +5 -3
- package/src/code_template/Code.ts +25 -19
- package/src/code_template/CodeTemplate.ts +8 -7
- package/src/code_template/CodeTemplateModule.ts +2 -2
- package/src/code_template/Repo.ts +25 -19
- package/src/fs/conversation_fs/ConversationFsModerator.ts +34 -20
- package/src/fs/conversation_fs/ConversationFsModule.ts +13 -7
- package/src/fs/conversation_fs/FsFunctions.ts +33 -44
- package/src/fs/git/GitModule.ts +2 -4
- package/src/fs/keyword_to_files_index/KeywordToFilesIndexFunctions.ts +31 -31
- package/src/fs/keyword_to_files_index/KeywordToFilesIndexModule.ts +19 -18
- package/src/fs/package/PackageFunctions.ts +34 -41
- package/src/fs/package/PackageModule.ts +33 -21
- package/src/history/MessageHistory.ts +7 -4
- package/src/history/MessageModerator.ts +1 -1
- package/src/template/ConversationTemplate.ts +9 -9
- package/src/template/ConversationTemplateFunctions.ts +8 -7
- package/src/template/ConversationTemplateModule.ts +24 -15
- package/src/template/createApp/CreateAppTemplate.ts +1 -1
- package/src/template/createCode/CreateCodeConversationTemplate.ts +9 -11
- package/src/template/createPackage/CreatePackageConversationTemplate.ts +2 -9
- package/src/template/createPackage/jest.config.js +2 -2
- package/test/createKeywordFilesIndex.test.ts +3 -3
- package/test/openai/openai.generateList.test.ts +5 -3
- package/test/openai/openai.parseCodeFromMarkdown.test.ts +10 -5
- package/test/repo/repo.test.ts +3 -4
- package/tsconfig.json +16 -20
package/.eslintrc.js
ADDED
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
module.exports = {
|
|
2
|
+
extends: ['eslint:recommended', 'plugin:@typescript-eslint/recommended', 'plugin:prettier/recommended', 'prettier'],
|
|
3
|
+
parser: '@typescript-eslint/parser',
|
|
4
|
+
plugins: ['@typescript-eslint', 'prettier'],
|
|
5
|
+
root: true,
|
|
6
|
+
ignorePatterns: ['**/dist/*', '**/node_modules/*', '*.md'],
|
|
7
|
+
|
|
8
|
+
rules: {
|
|
9
|
+
'prettier/prettier': ['warn'],
|
|
10
|
+
curly: ['warn'],
|
|
11
|
+
'eol-last': ['warn', 'always'],
|
|
12
|
+
'keyword-spacing': ['warn', { before: true }],
|
|
13
|
+
'no-undef': 'off',
|
|
14
|
+
'@typescript-eslint/no-unused-vars': 'off',
|
|
15
|
+
'@typescript-eslint/no-var-requires': 'off',
|
|
16
|
+
'@typescript-eslint/no-explicit-any': 'off',
|
|
17
|
+
'@typescript-eslint/prefer-as-const': 'off',
|
|
18
|
+
'@typescript-eslint/ban-types': 'off',
|
|
19
|
+
},
|
|
20
|
+
};
|
package/.prettierignore
ADDED
package/.prettierrc
ADDED
package/CHANGELOG.md
CHANGED
|
@@ -3,22 +3,36 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
-
## [1.0.
|
|
6
|
+
## [1.0.8](https://github.com/proteinjs/conversation/compare/@proteinjs/conversation@1.0.7...@proteinjs/conversation@1.0.8) (2024-05-10)
|
|
7
7
|
|
|
8
|
-
**Note:** Version bump only for package @proteinjs/conversation
|
|
9
8
|
|
|
9
|
+
### Bug Fixes
|
|
10
10
|
|
|
11
|
+
* add .md to lint ignore files ([73034c8](https://github.com/proteinjs/conversation/commit/73034c883bdbd45ad098999258407d6396d6ed8c))
|
|
11
12
|
|
|
12
13
|
|
|
13
14
|
|
|
14
|
-
## [1.0.2](https://github.com/proteinjs/conversation/compare/@proteinjs/conversation@1.0.1...@proteinjs/conversation@1.0.2) (2024-04-19)
|
|
15
15
|
|
|
16
|
-
|
|
16
|
+
|
|
17
|
+
## [1.0.7](https://github.com/proteinjs/conversation/compare/@proteinjs/conversation@1.0.6...@proteinjs/conversation@1.0.7) (2024-05-10)
|
|
18
|
+
|
|
19
|
+
|
|
20
|
+
### Bug Fixes
|
|
21
|
+
|
|
22
|
+
* add linting and lint all files ([eae8f12](https://github.com/proteinjs/conversation/commit/eae8f128bb40ccc2a6656ec847ef4f39fc50c11b))
|
|
17
23
|
|
|
18
24
|
|
|
19
25
|
|
|
20
26
|
|
|
21
27
|
|
|
28
|
+
## [1.0.3](https://github.com/proteinjs/conversation/compare/@proteinjs/conversation@1.0.2...@proteinjs/conversation@1.0.3) (2024-04-19)
|
|
29
|
+
|
|
30
|
+
**Note:** Version bump only for package @proteinjs/conversation
|
|
31
|
+
|
|
32
|
+
## [1.0.2](https://github.com/proteinjs/conversation/compare/@proteinjs/conversation@1.0.1...@proteinjs/conversation@1.0.2) (2024-04-19)
|
|
33
|
+
|
|
34
|
+
**Note:** Version bump only for package @proteinjs/conversation
|
|
35
|
+
|
|
22
36
|
## 1.0.1 (2024-04-19)
|
|
23
37
|
|
|
24
38
|
**Note:** Version bump only for package @proteinjs/conversation
|
package/LICENSE
ADDED
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
MIT License
|
|
2
|
+
|
|
3
|
+
Copyright (c) 2023 Brent Bahry
|
|
4
|
+
|
|
5
|
+
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
6
|
+
of this software and associated documentation files (the "Software"), to deal
|
|
7
|
+
in the Software without restriction, including without limitation the rights
|
|
8
|
+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
9
|
+
copies of the Software, and to permit persons to whom the Software is
|
|
10
|
+
furnished to do so, subject to the following conditions:
|
|
11
|
+
|
|
12
|
+
The above copyright notice and this permission notice shall be included in all
|
|
13
|
+
copies or substantial portions of the Software.
|
|
14
|
+
|
|
15
|
+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
16
|
+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
17
|
+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
18
|
+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
19
|
+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
20
|
+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
21
|
+
SOFTWARE.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CodegenConversation.d.ts","sourceRoot":"","sources":["../../src/CodegenConversation.ts"],"names":[],"mappings":"AAcA,qBAAa,mBAAmB;IAC9B,OAAO,CAAC,MAAM,CAAC,gBAAgB,CAAoC;IACnE,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAW;IAClC,OAAO,CAAC,MAAM,CAAC,KAAK,CAA0B;IAC9C,OAAO,CAAC,QAAQ,CAAS;gBAEb,QAAQ,EAAE,MAAM;IAItB,KAAK;
|
|
1
|
+
{"version":3,"file":"CodegenConversation.d.ts","sourceRoot":"","sources":["../../src/CodegenConversation.ts"],"names":[],"mappings":"AAcA,qBAAa,mBAAmB;IAC9B,OAAO,CAAC,MAAM,CAAC,gBAAgB,CAAoC;IACnE,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAW;IAClC,OAAO,CAAC,MAAM,CAAC,KAAK,CAA0B;IAC9C,OAAO,CAAC,QAAQ,CAAS;gBAEb,QAAQ,EAAE,MAAM;IAItB,KAAK;YAYG,kBAAkB;YAUlB,UAAU;IAgBxB,OAAO,CAAC,iBAAiB;IA4BzB,OAAO,CAAC,aAAa;CAGtB"}
|
|
@@ -167,12 +167,12 @@ var CodegenConversation = /** @class */ (function () {
|
|
|
167
167
|
// `Use the ${searchFilesFunctionName} function to find the file if needed; read the file if needed`,
|
|
168
168
|
// `If the user is referring to a function, object, class, or type and you don't have the relevant file content, first inspect the conversation summary in the chat history (if it exists) to find a file name, and call the ${searchFilesFunctionName} function and read the file before responding to the user`,
|
|
169
169
|
// `Before calling ${searchFilesFunctionName}, ${searchLibrariesFunctionName} or ${searchPackagesFunctionName}, use the conversation summary in the chat history to identify a file or keyword to search for instead; after reading that file, respond to the user's request`,
|
|
170
|
-
//
|
|
170
|
+
//
|
|
171
171
|
// `Use the ${getRecentlyAccessedFilePathsFunctionName} function find a file that might pertain to the user's request before searching files, libraries or packages; read that file then respond to the user`,
|
|
172
172
|
// `When trying to locate code, use the ${getRecentlyAccessedFilePathsFunctionName} function to search recently accessed files first, then proceed to calling other functions: ${searchLibrariesFunctionName}, ${searchPackagesFunctionName}, ${searchFilesFunctionName}`,
|
|
173
173
|
// `The conversation summary indicates files recently worked in as well`,
|
|
174
174
|
// `If that doesn't yield results, proceed to calling the ${searchLibrariesFunctionName} function, then fall back to functions: ${searchPackagesFunctionName}, ${searchFilesFunctionName}`,
|
|
175
|
-
//
|
|
175
|
+
//
|
|
176
176
|
// `To find code, a file, or a library, call ${getRecentlyAccessedFilePathsFunctionName} and read the most recent file, after trying that call ${searchLibrariesFunctionName} then ${searchFilesFunctionName} to find a relevant file`,
|
|
177
177
|
// `The file mentioned in the conversation summary should be read if we're not already working in a file`,
|
|
178
178
|
// `If there is a conversation summary assistant message, use that to pick a file to read before responding to the user if not already working with a specific file`,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CodegenConversation.js","sourceRoot":"","sources":["../../src/CodegenConversation.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sDAA0C;AAC1C,+CAA8C;AAC9C,mGAAyG;AACzG,oFAA0F;AAC1F,kFAAwF;AACxF,4DAAkE;AAElE,wCAAsD;AACtD,gDAAsD;AAMtD;IAME,6BAAY,QAAgB;QAC1B,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC3B,CAAC;IAEK,mCAAK,GAAX;;;;;4BACuB,qBAAM,IAAI,CAAC,kBAAkB,EAAE,EAAA;;wBAA9C,YAAY,GAAG,SAA+B;wBACpD,YAAY,CAAC,6BAA6B,CAAC,CAAC,mBAAmB,CAAC,gBAAgB,CAAC,CAAC,CAAC;wBAC7E,gBAAgB,GAAG,IAAI,CAAC,aAAa,CAAC,mBAAmB,CAAC,gBAAgB,CAAC,CAAC;wBACnE,qBAAM,YAAY,CAAC,gBAAgB,CAAC,CAAC,gBAAgB,CAAC,EAAE,mBAAmB,CAAC,KAAK,CAAC,EAAA;;wBAA7F,QAAQ,GAAG,SAAkF;;;
|
|
1
|
+
{"version":3,"file":"CodegenConversation.js","sourceRoot":"","sources":["../../src/CodegenConversation.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Conversation.d.ts","sourceRoot":"","sources":["../../src/Conversation.ts"],"names":[],"mappings":"AAIA,OAAO,EAAU,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAGnD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAsB,MAAM,UAAU,CAAC;AAG7D,MAAM,MAAM,kBAAkB,GAAG;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,kBAAkB,EAAE,CAAC;IAC/B,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,MAAM,CAAC,EAAE;QACP,aAAa,CAAC,EAAE,OAAO,CAAC;QACxB,oBAAoB,CAAC,EAAE,MAAM,CAAC;QAC9B,UAAU,CAAC,EAAE,MAAM,CAAC;KACrB,CAAC;CACH,
|
|
1
|
+
{"version":3,"file":"Conversation.d.ts","sourceRoot":"","sources":["../../src/Conversation.ts"],"names":[],"mappings":"AAIA,OAAO,EAAU,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAGnD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAsB,MAAM,UAAU,CAAC;AAG7D,MAAM,MAAM,kBAAkB,GAAG;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,kBAAkB,EAAE,CAAC;IAC/B,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,MAAM,CAAC,EAAE;QACP,aAAa,CAAC,EAAE,OAAO,CAAC;QACxB,oBAAoB,CAAC,EAAE,MAAM,CAAC;QAC9B,UAAU,CAAC,EAAE,MAAM,CAAC;KACrB,CAAC;CACH,CAAC;AAEF,qBAAa,YAAY;IACvB,OAAO,CAAC,UAAU,CAAQ;IAC1B,OAAO,CAAC,OAAO,CAAC;IAChB,OAAO,CAAC,cAAc,CAAoC;IAC1D,OAAO,CAAC,SAAS,CAAkB;IACnC,OAAO,CAAC,iBAAiB,CAA0B;IACnD,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,MAAM,CAAqB;gBAEvB,MAAM,EAAE,kBAAkB;IAqBtC,OAAO,CAAC,UAAU;IAclB,OAAO,CAAC,YAAY;IAuBpB,OAAO,CAAC,oBAAoB;YAId,iBAAiB;IAkC/B,4BAA4B,CAAC,OAAO,EAAE,MAAM;IAK5C,OAAO,CAAC,YAAY;IAKpB,0BAA0B,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,OAAO,UAAQ;IAc9D,6BAA6B,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,OAAO,UAAQ;IAYjE,wBAAwB,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,OAAO,UAAQ;IAYtD,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,KAAK,CAAC,EAAE,aAAa;IAY1D,YAAY,CAAC,WAAW,EAAE,MAAM,EAAE,EAAE,KAAK,CAAC,EAAE,aAAa;IAgBzD,kBAAkB,CACtB,oBAAoB,EAAE,MAAM,EAC5B,uBAAuB,EAAE,MAAM,EAAE,EACjC,WAAW,EAAE,MAAM,EACnB,KAAK,CAAC,EAAE,aAAa;IAajB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,aAAa;IAmBnE,YAAY,CAAC,WAAW,EAAE,MAAM,EAAE,EAAE,KAAK,CAAC,EAAE,aAAa;CAahE;AAED,eAAO,MAAM,wCAAwC,iCAAiC,CAAC;AACvF,eAAO,MAAM,oCAAoC,iBAAkB,YAAY;;;;;;;;;;;;;;;mBAgBtD;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE;CAE3C,CAAC"}
|
package/dist/src/Conversation.js
CHANGED
|
@@ -53,23 +53,27 @@ var Conversation = /** @class */ (function () {
|
|
|
53
53
|
this.generatedCode = false;
|
|
54
54
|
this.generatedList = false;
|
|
55
55
|
this.params = params;
|
|
56
|
-
this.history = new MessageHistory_1.MessageHistory({
|
|
56
|
+
this.history = new MessageHistory_1.MessageHistory({
|
|
57
|
+
maxMessages: (_a = params.limits) === null || _a === void 0 ? void 0 : _a.maxMessagesInHistory,
|
|
58
|
+
enforceMessageLimit: (_b = params.limits) === null || _b === void 0 ? void 0 : _b.enforceLimits,
|
|
59
|
+
});
|
|
57
60
|
this.logger = new util_1.Logger(params.name, params.logLevel);
|
|
58
|
-
if (params.modules)
|
|
61
|
+
if (params.modules) {
|
|
59
62
|
this.addModules(params.modules);
|
|
63
|
+
}
|
|
60
64
|
if (typeof ((_c = params.limits) === null || _c === void 0 ? void 0 : _c.enforceLimits) === 'undefined' || params.limits.enforceLimits) {
|
|
61
|
-
this.addFunctions('Conversation', [
|
|
62
|
-
(0, exports.summarizeConversationHistoryFunction)(this),
|
|
63
|
-
]);
|
|
65
|
+
this.addFunctions('Conversation', [(0, exports.summarizeConversationHistoryFunction)(this)]);
|
|
64
66
|
}
|
|
65
|
-
if ((_d = params.limits) === null || _d === void 0 ? void 0 : _d.tokenLimit)
|
|
67
|
+
if ((_d = params.limits) === null || _d === void 0 ? void 0 : _d.tokenLimit) {
|
|
66
68
|
this.tokenLimit = params.limits.tokenLimit;
|
|
69
|
+
}
|
|
67
70
|
}
|
|
68
71
|
Conversation.prototype.addModules = function (modules) {
|
|
69
72
|
for (var _i = 0, modules_1 = modules; _i < modules_1.length; _i++) {
|
|
70
73
|
var module_1 = modules_1[_i];
|
|
71
|
-
if (module_1.getSystemMessages().length < 1)
|
|
74
|
+
if (module_1.getSystemMessages().length < 1) {
|
|
72
75
|
continue;
|
|
76
|
+
}
|
|
73
77
|
this.addSystemMessagesToHistory([
|
|
74
78
|
"The following are instructions from the ".concat(module_1.getName(), " module: ").concat(module_1.getSystemMessages().join('. ')),
|
|
75
79
|
]);
|
|
@@ -85,15 +89,17 @@ var Conversation = /** @class */ (function () {
|
|
|
85
89
|
for (var _i = 0, functions_1 = functions; _i < functions_1.length; _i++) {
|
|
86
90
|
var f = functions_1[_i];
|
|
87
91
|
if (f.instructions) {
|
|
88
|
-
if (!f.instructions || f.instructions.length < 1)
|
|
92
|
+
if (!f.instructions || f.instructions.length < 1) {
|
|
89
93
|
continue;
|
|
94
|
+
}
|
|
90
95
|
functionInstructionsAdded = true;
|
|
91
96
|
var instructionsParagraph = f.instructions.join('. ');
|
|
92
97
|
functionInstructions += " ".concat(f.definition.name, ": ").concat(instructionsParagraph, ".");
|
|
93
98
|
}
|
|
94
99
|
}
|
|
95
|
-
if (!functionInstructionsAdded)
|
|
100
|
+
if (!functionInstructionsAdded) {
|
|
96
101
|
return;
|
|
102
|
+
}
|
|
97
103
|
this.addSystemMessagesToHistory([functionInstructions]);
|
|
98
104
|
};
|
|
99
105
|
Conversation.prototype.addMessageModerators = function (messageModerators) {
|
|
@@ -107,15 +113,17 @@ var Conversation = /** @class */ (function () {
|
|
|
107
113
|
return __generator(this, function (_b) {
|
|
108
114
|
switch (_b.label) {
|
|
109
115
|
case 0:
|
|
110
|
-
if (((_a = this.params.limits) === null || _a === void 0 ? void 0 : _a.enforceLimits) === false)
|
|
116
|
+
if (((_a = this.params.limits) === null || _a === void 0 ? void 0 : _a.enforceLimits) === false) {
|
|
111
117
|
return [2 /*return*/];
|
|
118
|
+
}
|
|
112
119
|
resolvedModel = model ? model : OpenAi_1.DEFAULT_MODEL;
|
|
113
120
|
encoder = (0, tiktoken_1.encoding_for_model)(resolvedModel);
|
|
114
121
|
conversation = this.history.toString() + messages.join('. ');
|
|
115
122
|
encoded = encoder.encode(conversation);
|
|
116
123
|
console.log("current tokens: ".concat(encoded.length));
|
|
117
|
-
if (encoded.length < this.tokenLimit)
|
|
124
|
+
if (encoded.length < this.tokenLimit) {
|
|
118
125
|
return [2 /*return*/];
|
|
126
|
+
}
|
|
119
127
|
summarizeConversationRequest = "First, call the ".concat(exports.summarizeConversationHistoryFunctionName, " function");
|
|
120
128
|
return [4 /*yield*/, OpenAi_1.OpenAi.generateResponse([summarizeConversationRequest], model, this.history, this.functions, this.messageModerators, this.params.logLevel)];
|
|
121
129
|
case 1:
|
|
@@ -140,7 +148,9 @@ var Conversation = /** @class */ (function () {
|
|
|
140
148
|
Conversation.prototype.addSystemMessagesToHistory = function (messages, unshift) {
|
|
141
149
|
var _a, _b, _c;
|
|
142
150
|
if (unshift === void 0) { unshift = false; }
|
|
143
|
-
var chatCompletions = messages.map(function (message) {
|
|
151
|
+
var chatCompletions = messages.map(function (message) {
|
|
152
|
+
return { role: 'system', content: message };
|
|
153
|
+
});
|
|
144
154
|
if (unshift) {
|
|
145
155
|
(_a = this.history.getMessages()).unshift.apply(_a, chatCompletions);
|
|
146
156
|
this.history.prune();
|
|
@@ -154,24 +164,30 @@ var Conversation = /** @class */ (function () {
|
|
|
154
164
|
Conversation.prototype.addAssistantMessagesToHistory = function (messages, unshift) {
|
|
155
165
|
var _a;
|
|
156
166
|
if (unshift === void 0) { unshift = false; }
|
|
157
|
-
var chatCompletions = messages.map(function (message) {
|
|
167
|
+
var chatCompletions = messages.map(function (message) {
|
|
168
|
+
return { role: 'assistant', content: message };
|
|
169
|
+
});
|
|
158
170
|
if (unshift) {
|
|
159
171
|
(_a = this.history.getMessages()).unshift.apply(_a, chatCompletions);
|
|
160
172
|
this.history.prune();
|
|
161
173
|
}
|
|
162
|
-
else
|
|
174
|
+
else {
|
|
163
175
|
this.history.push(chatCompletions);
|
|
176
|
+
}
|
|
164
177
|
};
|
|
165
178
|
Conversation.prototype.addUserMessagesToHistory = function (messages, unshift) {
|
|
166
179
|
var _a;
|
|
167
180
|
if (unshift === void 0) { unshift = false; }
|
|
168
|
-
var chatCompletions = messages.map(function (message) {
|
|
181
|
+
var chatCompletions = messages.map(function (message) {
|
|
182
|
+
return { role: 'user', content: message };
|
|
183
|
+
});
|
|
169
184
|
if (unshift) {
|
|
170
185
|
(_a = this.history.getMessages()).unshift.apply(_a, chatCompletions);
|
|
171
186
|
this.history.prune();
|
|
172
187
|
}
|
|
173
|
-
else
|
|
188
|
+
else {
|
|
174
189
|
this.history.push(chatCompletions);
|
|
190
|
+
}
|
|
175
191
|
};
|
|
176
192
|
Conversation.prototype.generateResponse = function (messages, model) {
|
|
177
193
|
return __awaiter(this, void 0, void 0, function () {
|
|
@@ -281,7 +297,7 @@ var summarizeConversationHistoryFunction = function (conversation) {
|
|
|
281
297
|
description: 'A 1-3 sentence summary of the current chat history',
|
|
282
298
|
},
|
|
283
299
|
},
|
|
284
|
-
required: ['summary']
|
|
300
|
+
required: ['summary'],
|
|
285
301
|
},
|
|
286
302
|
},
|
|
287
303
|
call: function (params) { return __awaiter(void 0, void 0, void 0, function () { return __generator(this, function (_a) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Conversation.js","sourceRoot":"","sources":["../../src/Conversation.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,mCAAiD;AACjD,2DAA0D;AAE1D,wCAAmD;AACnD,kDAA0C;AAG1C,qCAA6D;AAC7D,kEAA4E;AAa5E;IAWE,sBAAY,MAA0B;;QAV9B,eAAU,GAAG,IAAI,CAAC;QAElB,mBAAc,GAAiC,EAAE,CAAC;QAClD,cAAS,GAAe,EAAE,CAAC;QAC3B,sBAAiB,GAAuB,EAAE,CAAC;QAC3C,kBAAa,GAAG,KAAK,CAAC;QACtB,kBAAa,GAAG,KAAK,CAAC;QAK5B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,OAAO,GAAG,IAAI,+BAAc,CAAC,
|
|
1
|
+
{"version":3,"file":"Conversation.js","sourceRoot":"","sources":["../../src/Conversation.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Function.d.ts","sourceRoot":"","sources":["../../src/Function.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,0BAA0B,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"Function.d.ts","sourceRoot":"","sources":["../../src/Function.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,0BAA0B,EAAE,MAAM,uBAAuB,CAAC;AAEnE,MAAM,WAAW,QAAQ;IACvB,UAAU,EAAE,0BAA0B,CAAC,QAAQ,CAAC;IAChD,IAAI,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;IAC7B,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;CACzB"}
|
package/dist/src/OpenAi.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OpenAi.d.ts","sourceRoot":"","sources":["../../src/OpenAi.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAU,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAMzC,eAAO,MAAM,aAAa,EAAE,aAA+B,CAAC;AAC5D,qBAAa,MAAM;WACJ,gBAAgB,
|
|
1
|
+
{"version":3,"file":"OpenAi.d.ts","sourceRoot":"","sources":["../../src/OpenAi.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAU,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAMzC,eAAO,MAAM,aAAa,EAAE,aAA+B,CAAC;AAC5D,qBAAa,MAAM;WACJ,gBAAgB,CAC3B,QAAQ,EAAE,MAAM,EAAE,EAClB,KAAK,CAAC,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,cAAc,EACxB,SAAS,CAAC,EAAE,QAAQ,EAAE,EACtB,iBAAiB,CAAC,EAAE,gBAAgB,EAAE,EACtC,QAAQ,GAAE,QAAiB,GAC1B,OAAO,CAAC,MAAM,CAAC;IAiClB,OAAO,CAAC,MAAM,CAAC,eAAe;mBAQT,cAAc;mBA2Dd,YAAY;WA6CpB,YAAY,CACvB,QAAQ,EAAE,MAAM,EAAE,EAClB,KAAK,CAAC,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,cAAc,EACxB,SAAS,CAAC,EAAE,QAAQ,EAAE,EACtB,iBAAiB,CAAC,EAAE,gBAAgB,EAAE,EACtC,qBAAqB,GAAE,OAAc,EACrC,QAAQ,GAAE,QAAiB;WAuBhB,UAAU,CACrB,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,EACnB,KAAK,CAAC,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,cAAc,EACxB,SAAS,CAAC,EAAE,QAAQ,EAAE,EACtB,iBAAiB,CAAC,EAAE,gBAAgB,EAAE,EACtC,qBAAqB,GAAE,OAAc,EACrC,QAAQ,GAAE,QAAiB;IAa7B,MAAM,CAAC,qBAAqB,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM;IAI9D,MAAM,CAAC,qBAAqB,CAAC,IAAI,EAAE,MAAM;WA6B5B,YAAY,CACvB,QAAQ,EAAE,MAAM,EAAE,EAClB,KAAK,CAAC,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,cAAc,EACxB,SAAS,CAAC,EAAE,QAAQ,EAAE,EACtB,iBAAiB,CAAC,EAAE,gBAAgB,EAAE,EACtC,qBAAqB,GAAE,OAAc,EACrC,QAAQ,GAAE,QAAiB,GAC1B,OAAO,CAAC,MAAM,EAAE,CAAC;CAkBrB"}
|
package/dist/src/OpenAi.js
CHANGED
|
@@ -55,12 +55,16 @@ var OpenAi = /** @class */ (function () {
|
|
|
55
55
|
switch (_a.label) {
|
|
56
56
|
case 0:
|
|
57
57
|
logger = new util_1.Logger('OpenAi.generateResponse', logLevel);
|
|
58
|
-
messageParams = messages.map(function (message) {
|
|
59
|
-
|
|
58
|
+
messageParams = messages.map(function (message) {
|
|
59
|
+
return { role: 'user', content: message };
|
|
60
|
+
});
|
|
61
|
+
if (history) {
|
|
60
62
|
history.push(messageParams);
|
|
63
|
+
}
|
|
61
64
|
messageParamsWithHistory = history ? history : new MessageHistory_1.MessageHistory().push(messageParams);
|
|
62
|
-
if (messageModerators)
|
|
65
|
+
if (messageModerators) {
|
|
63
66
|
messageParamsWithHistory = OpenAi.moderateHistory(messageParamsWithHistory, messageModerators);
|
|
67
|
+
}
|
|
64
68
|
return [4 /*yield*/, OpenAi.executeRequest(messageParamsWithHistory, logLevel, functions, model)];
|
|
65
69
|
case 1:
|
|
66
70
|
response = _a.sent();
|
|
@@ -70,8 +74,9 @@ var OpenAi = /** @class */ (function () {
|
|
|
70
74
|
return [4 /*yield*/, this.callFunction(logLevel, responseMessage.function_call, functions)];
|
|
71
75
|
case 2:
|
|
72
76
|
functionReturnMessage = _a.sent();
|
|
73
|
-
if (functionReturnMessage)
|
|
77
|
+
if (functionReturnMessage) {
|
|
74
78
|
messageParamsWithHistory.push([functionReturnMessage]);
|
|
79
|
+
}
|
|
75
80
|
return [4 /*yield*/, this.generateResponse([], model, messageParamsWithHistory, functions, messageModerators, logLevel)];
|
|
76
81
|
case 3: return [2 /*return*/, _a.sent()];
|
|
77
82
|
case 4:
|
|
@@ -105,12 +110,15 @@ var OpenAi = /** @class */ (function () {
|
|
|
105
110
|
case 1:
|
|
106
111
|
_a.trys.push([1, 3, , 7]);
|
|
107
112
|
latestMessage = messageParamsWithHistory.getMessages()[messageParamsWithHistory.getMessages().length - 1];
|
|
108
|
-
if (latestMessage.content)
|
|
113
|
+
if (latestMessage.content) {
|
|
109
114
|
logger.info("Sending request: ".concat(latestMessage.content));
|
|
110
|
-
|
|
115
|
+
}
|
|
116
|
+
else if (latestMessage.role == 'function') {
|
|
111
117
|
logger.info("Sending request: returning output of ".concat(latestMessage.name, " function"));
|
|
112
|
-
|
|
118
|
+
}
|
|
119
|
+
else {
|
|
113
120
|
logger.info("Sending request");
|
|
121
|
+
}
|
|
114
122
|
logger.debug("Sending messages: ".concat(JSON.stringify(messageParamsWithHistory.getMessages(), null, 2)), true);
|
|
115
123
|
return [4 /*yield*/, openaiApi.chat.completions.create({
|
|
116
124
|
model: model ? model : exports.DEFAULT_MODEL,
|
|
@@ -121,16 +129,21 @@ var OpenAi = /** @class */ (function () {
|
|
|
121
129
|
case 2:
|
|
122
130
|
response = _a.sent();
|
|
123
131
|
responseMessage = response.choices[0].message;
|
|
124
|
-
if (responseMessage.content)
|
|
132
|
+
if (responseMessage.content) {
|
|
125
133
|
logger.info("Received response: ".concat(responseMessage.content));
|
|
126
|
-
|
|
134
|
+
}
|
|
135
|
+
else if (responseMessage.function_call) {
|
|
127
136
|
logger.info("Received response: call ".concat(responseMessage.function_call.name, " function"));
|
|
128
|
-
|
|
137
|
+
}
|
|
138
|
+
else {
|
|
129
139
|
logger.info("Received response");
|
|
130
|
-
|
|
140
|
+
}
|
|
141
|
+
if (response.usage) {
|
|
131
142
|
logger.info(JSON.stringify(response.usage));
|
|
132
|
-
|
|
143
|
+
}
|
|
144
|
+
else {
|
|
133
145
|
logger.info(JSON.stringify("Usage data missing"));
|
|
146
|
+
}
|
|
134
147
|
return [3 /*break*/, 7];
|
|
135
148
|
case 3:
|
|
136
149
|
error_1 = _a.sent();
|
|
@@ -189,8 +202,9 @@ var OpenAi = /** @class */ (function () {
|
|
|
189
202
|
logger.error(error_2.message);
|
|
190
203
|
return [3 /*break*/, 4];
|
|
191
204
|
case 4:
|
|
192
|
-
if (!returnObject)
|
|
205
|
+
if (!returnObject) {
|
|
193
206
|
return [2 /*return*/];
|
|
207
|
+
}
|
|
194
208
|
return [2 /*return*/, {
|
|
195
209
|
role: 'function',
|
|
196
210
|
name: f.definition.name,
|
|
@@ -209,22 +223,22 @@ var OpenAi = /** @class */ (function () {
|
|
|
209
223
|
switch (_a.label) {
|
|
210
224
|
case 0:
|
|
211
225
|
systemMessages = [
|
|
212
|
-
{
|
|
226
|
+
{
|
|
227
|
+
role: 'system',
|
|
228
|
+
content: 'Return only the code and exclude example usage, markdown, explanations, comments and notes.',
|
|
229
|
+
},
|
|
213
230
|
{ role: 'system', content: "Write code in typescript." },
|
|
214
231
|
{ role: 'system', content: "Declare explicit types for all function parameters." },
|
|
215
232
|
{ role: 'system', content: 'Export all functions and objects generated.' },
|
|
216
233
|
{ role: 'system', content: 'Do not omit function implementations.' },
|
|
217
234
|
];
|
|
218
|
-
resolvedHistory = history
|
|
219
|
-
includeSystemMessages
|
|
220
|
-
history.push(systemMessages)
|
|
221
|
-
:
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
new MessageHistory_1.MessageHistory().push(systemMessages)
|
|
226
|
-
:
|
|
227
|
-
undefined;
|
|
235
|
+
resolvedHistory = history
|
|
236
|
+
? includeSystemMessages
|
|
237
|
+
? history.push(systemMessages)
|
|
238
|
+
: history
|
|
239
|
+
: includeSystemMessages
|
|
240
|
+
? new MessageHistory_1.MessageHistory().push(systemMessages)
|
|
241
|
+
: undefined;
|
|
228
242
|
return [4 /*yield*/, this.generateResponse(messages, model, resolvedHistory, functions, messageModerators, logLevel)];
|
|
229
243
|
case 1:
|
|
230
244
|
code = _a.sent();
|
|
@@ -249,20 +263,23 @@ var OpenAi = /** @class */ (function () {
|
|
|
249
263
|
return "Update this code:\n\n".concat(code, "\n\n").concat(description);
|
|
250
264
|
};
|
|
251
265
|
OpenAi.parseCodeFromMarkdown = function (code) {
|
|
252
|
-
if (!code.match(/```([\s\S]+?)```/g))
|
|
266
|
+
if (!code.match(/```([\s\S]+?)```/g)) {
|
|
253
267
|
return code;
|
|
268
|
+
}
|
|
254
269
|
var filteredLines = [];
|
|
255
270
|
var inCodeBlock = false;
|
|
256
271
|
for (var _i = 0, _a = code.split('\n'); _i < _a.length; _i++) {
|
|
257
272
|
var line = _a[_i];
|
|
258
273
|
if (line.startsWith('```')) {
|
|
259
274
|
inCodeBlock = !inCodeBlock;
|
|
260
|
-
if (!inCodeBlock)
|
|
275
|
+
if (!inCodeBlock) {
|
|
261
276
|
filteredLines.push('');
|
|
277
|
+
}
|
|
262
278
|
continue;
|
|
263
279
|
}
|
|
264
|
-
if (inCodeBlock)
|
|
280
|
+
if (inCodeBlock) {
|
|
265
281
|
filteredLines.push(line);
|
|
282
|
+
}
|
|
266
283
|
}
|
|
267
284
|
// remove the last '' that will become a \n
|
|
268
285
|
// we only want spaces between code blocks
|
|
@@ -278,19 +295,19 @@ var OpenAi = /** @class */ (function () {
|
|
|
278
295
|
switch (_a.label) {
|
|
279
296
|
case 0:
|
|
280
297
|
systemMessages = [
|
|
281
|
-
{
|
|
298
|
+
{
|
|
299
|
+
role: 'system',
|
|
300
|
+
content: 'Return only the list and exclude example usage, markdown and all explanations, comments and notes.',
|
|
301
|
+
},
|
|
282
302
|
{ role: 'system', content: 'Separate each item in the list by a ;' },
|
|
283
303
|
];
|
|
284
|
-
resolvedHistory = history
|
|
285
|
-
includeSystemMessages
|
|
286
|
-
history.push(systemMessages)
|
|
287
|
-
:
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
|
|
291
|
-
new MessageHistory_1.MessageHistory().push(systemMessages)
|
|
292
|
-
:
|
|
293
|
-
undefined;
|
|
304
|
+
resolvedHistory = history
|
|
305
|
+
? includeSystemMessages
|
|
306
|
+
? history.push(systemMessages)
|
|
307
|
+
: history
|
|
308
|
+
: includeSystemMessages
|
|
309
|
+
? new MessageHistory_1.MessageHistory().push(systemMessages)
|
|
310
|
+
: undefined;
|
|
294
311
|
return [4 /*yield*/, this.generateResponse(messages, model, resolvedHistory, functions, messageModerators, logLevel)];
|
|
295
312
|
case 1:
|
|
296
313
|
list = _a.sent();
|
package/dist/src/OpenAi.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OpenAi.js","sourceRoot":"","sources":["../../src/OpenAi.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iCAA6C;AAE7C,wCAAmD;AAGnD,2DAA0D;AAG1D,SAAS,KAAK,CAAC,EAAU;IACvB,OAAO,IAAI,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"OpenAi.js","sourceRoot":"","sources":["../../src/OpenAi.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Paragraph.d.ts","sourceRoot":"","sources":["../../src/Paragraph.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC,qBAAa,SAAS;IACpB,OAAO,CAAC,SAAS,CAAkB;IAEnC,GAAG,CAAC,QAAQ,EAAE,QAAQ;IAKtB,QAAQ,IAAI,MAAM;
|
|
1
|
+
{"version":3,"file":"Paragraph.d.ts","sourceRoot":"","sources":["../../src/Paragraph.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC,qBAAa,SAAS;IACpB,OAAO,CAAC,SAAS,CAAkB;IAEnC,GAAG,CAAC,QAAQ,EAAE,QAAQ;IAKtB,QAAQ,IAAI,MAAM;CAOnB"}
|
package/dist/src/Paragraph.js
CHANGED
|
@@ -10,8 +10,9 @@ var Paragraph = /** @class */ (function () {
|
|
|
10
10
|
return this;
|
|
11
11
|
};
|
|
12
12
|
Paragraph.prototype.toString = function () {
|
|
13
|
-
if (this.sentences.length == 0)
|
|
13
|
+
if (this.sentences.length == 0) {
|
|
14
14
|
return '';
|
|
15
|
+
}
|
|
15
16
|
return this.sentences.join(' ');
|
|
16
17
|
};
|
|
17
18
|
return Paragraph;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Paragraph.js","sourceRoot":"","sources":["../../src/Paragraph.ts"],"names":[],"mappings":";;;AAEA;IAAA;QACU,cAAS,GAAe,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"Paragraph.js","sourceRoot":"","sources":["../../src/Paragraph.ts"],"names":[],"mappings":";;;AAEA;IAAA;QACU,cAAS,GAAe,EAAE,CAAC;IAcrC,CAAC;IAZC,uBAAG,GAAH,UAAI,QAAkB;QACpB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC9B,OAAO,IAAI,CAAC;IACd,CAAC;IAED,4BAAQ,GAAR;QACE,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,IAAI,CAAC,EAAE;YAC9B,OAAO,EAAE,CAAC;SACX;QAED,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAClC,CAAC;IACH,gBAAC;AAAD,CAAC,AAfD,IAeC;AAfY,8BAAS"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Sentence.d.ts","sourceRoot":"","sources":["../../src/Sentence.ts"],"names":[],"mappings":"AACA,qBAAa,QAAQ;IACnB,OAAO,CAAC,KAAK,CAAgB;IAE7B,GAAG,CAAC,IAAI,EAAE,MAAM;IAKhB,QAAQ,IAAI,MAAM;
|
|
1
|
+
{"version":3,"file":"Sentence.d.ts","sourceRoot":"","sources":["../../src/Sentence.ts"],"names":[],"mappings":"AACA,qBAAa,QAAQ;IACnB,OAAO,CAAC,KAAK,CAAgB;IAE7B,GAAG,CAAC,IAAI,EAAE,MAAM;IAKhB,QAAQ,IAAI,MAAM;CAYnB"}
|
package/dist/src/Sentence.js
CHANGED
|
@@ -11,11 +11,13 @@ var Sentence = /** @class */ (function () {
|
|
|
11
11
|
return this;
|
|
12
12
|
};
|
|
13
13
|
Sentence.prototype.toString = function () {
|
|
14
|
-
if (this.lines.length == 0)
|
|
14
|
+
if (this.lines.length == 0) {
|
|
15
15
|
return '';
|
|
16
|
+
}
|
|
16
17
|
var sentence = this.lines.join(', ');
|
|
17
|
-
if (sentence.lastIndexOf('.') !=
|
|
18
|
+
if (sentence.lastIndexOf('.') != sentence.length - 1) {
|
|
18
19
|
sentence += '.';
|
|
20
|
+
}
|
|
19
21
|
return sentence;
|
|
20
22
|
};
|
|
21
23
|
return Sentence;
|