@promptbook/utils 0.71.0-0 → 0.72.0-0

package/esm/typings/src/llm-providers/openai/OpenAiAssistantExecutionTools.d.ts

@@ -0,0 +1,37 @@
+import type { LlmExecutionTools } from '../../execution/LlmExecutionTools';
+import type { ChatPromptResult } from '../../execution/PromptResult';
+import type { Prompt } from '../../types/Prompt';
+import type { string_markdown } from '../../types/typeAliases';
+import type { string_markdown_text } from '../../types/typeAliases';
+import type { string_title } from '../../types/typeAliases';
+import type { OpenAiAssistantExecutionToolsOptions } from './OpenAiAssistantExecutionToolsOptions';
+import { OpenAiExecutionTools } from './OpenAiExecutionTools';
+/**
+ * Execution Tools for calling OpenAI API Assistants
+ *
+ * This is usefull for calling OpenAI API with a single assistant, for more wide usage use `OpenAiExecutionTools`.
+ *
+ * @public exported from `@promptbook/openai`
+ */
+export declare class OpenAiAssistantExecutionTools extends OpenAiExecutionTools implements LlmExecutionTools {
+    private readonly assistantId?;
+    /**
+     * Creates OpenAI Execution Tools.
+     *
+     * @param options which are relevant are directly passed to the OpenAI client
+     */
+    constructor(options?: OpenAiAssistantExecutionToolsOptions);
+    get title(): string_title & string_markdown_text;
+    get description(): string_markdown;
+    /**
+     * Calls OpenAI API to use a chat model.
+     */
+    callChatModel(prompt: Pick<Prompt, 'content' | 'parameters' | 'modelRequirements' | 'format'>): Promise<ChatPromptResult>;
+}
+/**
+ * TODO: !!!!!! DO not use colors - can be used in browser
+ * TODO: [🧠][🧙‍♂️] Maybe there can be some wizzard for thoose who want to use just OpenAI
+ * TODO: Maybe make custom OpenAiError
+ * TODO: [🧠][🈁] Maybe use `isDeterministic` from options
+ * TODO: [🧠][🌰] Allow to pass `title` for tracking purposes
+ */

package/esm/typings/src/llm-providers/openai/OpenAiAssistantExecutionToolsOptions.d.ts

@@ -0,0 +1,14 @@
+import type { ClientOptions } from 'openai';
+import type { string_token } from '../../types/typeAliases';
+import type { OpenAiExecutionToolsOptions } from './OpenAiExecutionToolsOptions';
+/**
+ * Options for `OpenAiAssistantExecutionTools`
+ *
+ * @public exported from `@promptbook/openai`
+ */
+export type OpenAiAssistantExecutionToolsOptions = OpenAiExecutionToolsOptions & ClientOptions & {
+    /**
+     * Which assistant to use
+     */
+    assistantId?: string_token;
+};

package/esm/typings/src/llm-providers/openai/OpenAiExecutionTools.d.ts

@@ -1,3 +1,4 @@
+import OpenAI from 'openai';
 import type { AvailableModel } from '../../execution/AvailableModel';
 import type { LlmExecutionTools } from '../../execution/LlmExecutionTools';
 import type { ChatPromptResult } from '../../execution/PromptResult';
@@ -14,7 +15,7 @@ import type { OpenAiExecutionToolsOptions } from './OpenAiExecutionToolsOptions'
  * @public exported from `@promptbook/openai`
  */
 export declare class OpenAiExecutionTools implements LlmExecutionTools {
-    private readonly options;
+    protected readonly options: OpenAiExecutionToolsOptions;
     /**
      * OpenAI API client.
      */
@@ -27,7 +28,7 @@ export declare class OpenAiExecutionTools implements LlmExecutionTools {
     constructor(options?: OpenAiExecutionToolsOptions);
     get title(): string_title & string_markdown_text;
     get description(): string_markdown;
-    private getClient;
+    getClient(): Promise<OpenAI>;
     /**
      * Check the `options` passed to `constructor`
      */

package/esm/typings/src/llm-providers/remote/RemoteLlmExecutionTools.d.ts

@@ -20,7 +20,7 @@ import type { RemoteLlmExecutionToolsOptions } from './interfaces/RemoteLlmExecu
  * @public exported from `@promptbook/remote-client`
  */
 export declare class RemoteLlmExecutionTools implements LlmExecutionTools {
-    private readonly options;
+    protected readonly options: RemoteLlmExecutionToolsOptions;
     constructor(options: RemoteLlmExecutionToolsOptions);
     get title(): string_title & string_markdown_text;
     get description(): string_markdown;

package/esm/typings/src/scripting/javascript/JavascriptEvalExecutionTools.d.ts

@@ -9,7 +9,7 @@ import type { JavascriptExecutionToolsOptions } from './JavascriptExecutionTools
  * @public exported from `@promptbook/execute-javascript`
  */
 export declare class JavascriptEvalExecutionTools implements ScriptExecutionTools {
-    private readonly options;
+    protected readonly options: JavascriptExecutionToolsOptions;
     constructor(options?: JavascriptExecutionToolsOptions);
     /**
      * Executes a JavaScript

package/esm/typings/src/scripting/python/PythonExecutionTools.d.ts

@@ -9,7 +9,7 @@ import type { ScriptExecutionToolsExecuteOptions } from '../../execution/ScriptE
  * @private still in development
  */
 export declare class PythonExecutionTools implements ScriptExecutionTools {
-    private readonly options;
+    protected readonly options: CommonExecutionToolsOptions;
     constructor(options?: CommonExecutionToolsOptions);
     /**
      * Executes a Python

package/esm/typings/src/scripting/typescript/TypescriptExecutionTools.d.ts

@@ -9,7 +9,7 @@ import type { ScriptExecutionToolsExecuteOptions } from '../../execution/ScriptE
  * @private still in development
  */
 export declare class TypescriptExecutionTools implements ScriptExecutionTools {
-    private readonly options;
+    protected readonly options: CommonExecutionToolsOptions;
     constructor(options?: CommonExecutionToolsOptions);
     /**
      * Executes a TypeScript

package/esm/typings/src/storage/files-storage/FilesStorage.d.ts

@@ -6,7 +6,7 @@ import type { FilesStorageOptions } from './FilesStorageOptions';
  * @public exported from `@promptbook/node`
  */
 export declare class FilesStorage<TItem> implements PromptbookStorage<TItem> {
-    private readonly options;
+    protected readonly options: FilesStorageOptions;
     constructor(options: FilesStorageOptions);
     /**
      * @@@

package/esm/typings/src/types/PipelineJson/KnowledgeSourceJson.d.ts

@@ -11,18 +11,11 @@ import type { string_name } from '../typeAliases';
  */
 export type KnowledgeSourceJson = {
     /**
-     * Unique identifier of the knowledge source
+     * @@@
      */
     readonly name: string_name;
     /**
-     * Source of one knowledge
-     *
-     * It can be a link, a relative path to file or direct text or combination of those
-     *
-     * For example `"https://pavolhejny.com/"`
-     * For example `"./pavol-hejny-cv.pdf"`
-     * For example `"Pavol Hejný has web https://pavolhejny.com/"`
-     * For example `"Pavol Hejný is web developer and creator of Promptbook and Collboard"`
+     * @@@
      */
     readonly sourceContent: string_knowledge_source_content;
 };

package/esm/typings/src/types/PipelineJson/ParameterJson.d.ts

@@ -33,7 +33,6 @@ export type ParameterJson = {
     readonly sampleValues?: Array<string_parameter_value>;
 };
 /**
- * TODO: [🧠] !!!!!! Should be here registered subparameter from foreach or not?
  * TODO: [♈] Probbably move expectations from templates to parameters
  * TODO: [🍙] Make some standard order of json properties
  */

package/esm/typings/src/types/PipelineJson/TemplateJsonCommon.d.ts

@@ -1,4 +1,3 @@
-import type { ForeachJson } from '../../commands/FOREACH/ForeachJson';
 import type { FormatCommand } from '../../commands/FORMAT/FormatCommand';
 import type { TemplateType } from '../../commands/TEMPLATE/TemplateTypes';
 import type { string_javascript } from '../typeAliases';
@@ -43,10 +42,6 @@ export interface TemplateJsonCommon {
      * @see https://github.com/webgptorg/promptbook/discussions/66
      */
     readonly jokerParameterNames?: Array<string_parameter_name>;
-    /**
-     * @@@
-     */
-    readonly foreach?: ForeachJson;
     /**
      * Type of the execution
      * This determines if the template is send to LLM, user or some scripting evaluation

package/esm/typings/src/types/execution-report/ExecutionReportJson.d.ts

@@ -39,6 +39,3 @@ export type ExecutionReportJson = {
      */
     readonly promptExecutions: Array<ExecutionPromptReportJson>;
 };
-/**
- * TODO: !!!!!! FOREACH in report
- */ 

package/esm/typings/src/utils/expectation-counters/index.d.ts

@@ -6,6 +6,3 @@ import type { ExpectationUnit } from '../../types/PipelineJson/Expectations';
  * @public exported from `@promptbook/utils`
  */
 export declare const CountUtils: Record<ExpectationUnit, (text: string) => ExpectationAmount>;
-/**
- * TODO: [🧠][🤠] This should be probbably as part of `TextFormatDefinition`
- */

package/esm/typings/src/utils/{parameters/extractParameterNames.d.ts → extractParameterNames.d.ts}

@@ -1,5 +1,5 @@
-import type { string_parameter_name } from '../../types/typeAliases';
-import type { string_template } from '../../types/typeAliases';
+import type { string_parameter_name } from '../types/typeAliases';
+import type { string_template } from '../types/typeAliases';
 /**
  * Parses the template and returns the list of all parameter names
  *

package/esm/typings/src/utils/organization/{empty_object.d.ts → f.d.ts}

@@ -1,10 +1,6 @@
 /**
  * Organizational helper to better mark the place where to really use empty object `{}`
  *
- * Note: There are 2 similar types>
- * - `empty_object` @@@
- * - `just_empty_object` @@@
- *
  * @private within the repository
  */
-export type empty_object = {};
+export type really_empty_object = Record<string, never>;

package/esm/typings/src/utils/{parameters/replaceParameters.d.ts → replaceParameters.d.ts}

@@ -1,5 +1,5 @@
-import type { Parameters } from '../../types/typeAliases';
-import type { string_template } from '../../types/typeAliases';
+import type { Parameters } from '../types/typeAliases';
+import type { string_template } from '../types/typeAliases';
 /**
  * Replaces parameters in template with values from parameters object
  *

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@promptbook/utils",
-    "version": "0.71.0-0",
+    "version": "0.72.0-0",
     "description": "Supercharge your use of large language models",
     "private": false,
     "sideEffects": false,
@@ -12,25 +12,21 @@
         "Pavol Hejný <me@pavolhejny.com> (https://www.pavolhejny.com/)"
     ],
     "keywords": [
-        "ai",
-        "llm",
-        "prompt",
-        "template",
-        "language-model",
-        "chatgpt",
         "autogpt",
-        "machine-learning",
-        "natural-language-processing",
-        "nlp",
         "openai",
         "gpt-3",
         "gpt-4",
-        "gpt-4o",
-        "gpt-4o-mini",
-        "o1",
-        "o1-mini",
-        "o1-preview",
-        "anthropic"
+        "chatgpt",
+        "ai",
+        "machine-learning",
+        "natural-language-processing",
+        "nlp",
+        "prompt",
+        "template",
+        "pipeline",
+        "automation",
+        "text-generation",
+        "language-model"
     ],
     "license": "CC-BY-4.0",
     "bugs": {

package/umd/index.umd.js

@@ -12,7 +12,7 @@
     /**
      * The version of the Promptbook library
      */
-    var PROMPTBOOK_VERSION = '0.70.0-1';
+    var PROMPTBOOK_VERSION = '0.68.5';
     // TODO:[main] !!!! List here all the versions and annotate + put into script
 
     /*! *****************************************************************************
@@ -633,9 +633,6 @@
         return promptbookMermaid;
     }
     /**
-     * TODO: !!!!! FOREACH in mermaid graph
-     * TODO: !!!!! Knowledge in mermaid graph
-     * TODO: !!!!! Personas in mermaid graph
      * TODO: Maybe use some Mermaid package instead of string templating
      * TODO: [🕌] When more than 2 functionalities, split into separate functions
      */
@@ -745,72 +742,52 @@
      * @public exported from `@promptbook/utils`
      */
     function extractParameterNamesFromTemplate(template) {
-        var e_1, _a, e_2, _b, e_3, _c, e_4, _d;
-        var title = template.title, description = template.description, templateType = template.templateType, content = template.content, preparedContent = template.preparedContent, jokerParameterNames = template.jokerParameterNames, foreach = template.foreach;
+        var e_1, _a, e_2, _b, e_3, _c;
+        var title = template.title, description = template.description, templateType = template.templateType, content = template.content, preparedContent = template.preparedContent, jokerParameterNames = template.jokerParameterNames;
         var parameterNames = new Set();
         try {
-            for (var _e = __values(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read(extractParameterNames(title)), false), __read(extractParameterNames(description || '')), false), __read(extractParameterNames(content)), false), __read(extractParameterNames(preparedContent || '')), false)), _f = _e.next(); !_f.done; _f = _e.next()) {
-                var parameterName = _f.value;
+            for (var _d = __values(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read(extractParameterNames(title)), false), __read(extractParameterNames(description || '')), false), __read(extractParameterNames(content)), false), __read(extractParameterNames(preparedContent || '')), false)), _e = _d.next(); !_e.done; _e = _d.next()) {
+                var parameterName = _e.value;
                 parameterNames.add(parameterName);
             }
         }
         catch (e_1_1) { e_1 = { error: e_1_1 }; }
         finally {
             try {
-                if (_f && !_f.done && (_a = _e.return)) _a.call(_e);
+                if (_e && !_e.done && (_a = _d.return)) _a.call(_d);
             }
             finally { if (e_1) throw e_1.error; }
         }
         if (templateType === 'SCRIPT_TEMPLATE') {
             try {
-                for (var _g = __values(extractVariables(content)), _h = _g.next(); !_h.done; _h = _g.next()) {
-                    var parameterName = _h.value;
+                for (var _f = __values(extractVariables(content)), _g = _f.next(); !_g.done; _g = _f.next()) {
+                    var parameterName = _g.value;
                     parameterNames.add(parameterName);
                 }
             }
             catch (e_2_1) { e_2 = { error: e_2_1 }; }
             finally {
                 try {
-                    if (_h && !_h.done && (_b = _g.return)) _b.call(_g);
+                    if (_g && !_g.done && (_b = _f.return)) _b.call(_f);
                 }
                 finally { if (e_2) throw e_2.error; }
             }
         }
         try {
-            for (var _j = __values(jokerParameterNames || []), _k = _j.next(); !_k.done; _k = _j.next()) {
-                var jokerName = _k.value;
+            for (var _h = __values(jokerParameterNames || []), _j = _h.next(); !_j.done; _j = _h.next()) {
+                var jokerName = _j.value;
                 parameterNames.add(jokerName);
             }
         }
         catch (e_3_1) { e_3 = { error: e_3_1 }; }
         finally {
             try {
-                if (_k && !_k.done && (_c = _j.return)) _c.call(_j);
+                if (_j && !_j.done && (_c = _h.return)) _c.call(_h);
             }
             finally { if (e_3) throw e_3.error; }
         }
         parameterNames.delete('content');
         //                      <- Note {websiteContent} is used in `preparedContent`
-        // Note: [🍭] Fixing dependent subparameterName from FOREACH command
-        if (foreach !== undefined) {
-            try {
-                for (var _l = __values(foreach.subparameterNames), _m = _l.next(); !_m.done; _m = _l.next()) {
-                    var subparameterName = _m.value;
-                    if (parameterNames.has(subparameterName)) {
-                        parameterNames.delete(subparameterName);
-                        parameterNames.add(foreach.parameterName);
-                        // <- TODO: [🚎] Warn/logic error when `subparameterName` not used
-                    }
-                }
-            }
-            catch (e_4_1) { e_4 = { error: e_4_1 }; }
-            finally {
-                try {
-                    if (_m && !_m.done && (_d = _l.return)) _d.call(_l);
-                }
-                finally { if (e_4) throw e_4.error; }
-            }
-        }
         return parameterNames;
     }
     /**
@@ -1295,9 +1272,6 @@
         LINES: countLines,
         PAGES: countPages,
     };
-    /**
-     * TODO: [🧠][🤠] This should be probbably as part of `TextFormatDefinition`
-     */
 
     /**
      * Makes first letter of a string uppercase
@@ -1552,6 +1526,108 @@
         return true;
     }
 
+    /**
+     * Function parseNumber will parse number from string
+     *
+     * Unlike Number.parseInt, Number.parseFloat it will never ever result in NaN
+     * Note: it also works only with decimal numbers
+     *
+     * @returns parsed number
+     * @throws {ParseError} if the value is not a number
+     *
+     * @public exported from `@promptbook/utils`
+     */
+    function parseNumber(value) {
+        var originalValue = value;
+        if (typeof value === 'number') {
+            value = value.toString(); // <- TODO: Maybe more efficient way to do this
+        }
+        if (typeof value !== 'string') {
+            return 0;
+        }
+        value = value.trim();
+        if (value.startsWith('+')) {
+            return parseNumber(value.substring(1));
+        }
+        if (value.startsWith('-')) {
+            var number = parseNumber(value.substring(1));
+            if (number === 0) {
+                return 0; // <- Note: To prevent -0
+            }
+            return -number;
+        }
+        value = value.replace(/,/g, '.');
+        value = value.toUpperCase();
+        if (value === '') {
+            return 0;
+        }
+        if (value === '♾' || value.startsWith('INF')) {
+            return Infinity;
+        }
+        if (value.includes('/')) {
+            var _a = __read(value.split('/'), 2), numerator_ = _a[0], denominator_ = _a[1];
+            var numerator = parseNumber(numerator_);
+            var denominator = parseNumber(denominator_);
+            if (denominator === 0) {
+                throw new ParseError("Unable to parse number from \"".concat(originalValue, "\" because denominator is zero"));
+            }
+            return numerator / denominator;
+        }
+        if (/^(NAN|NULL|NONE|UNDEFINED|ZERO|NO.*)$/.test(value)) {
+            return 0;
+        }
+        if (value.includes('E')) {
+            var _b = __read(value.split('E'), 2), significand = _b[0], exponent = _b[1];
+            return parseNumber(significand) * Math.pow(10, parseNumber(exponent));
+        }
+        if (!/^[0-9.]+$/.test(value) || value.split('.').length > 2) {
+            throw new ParseError("Unable to parse number from \"".concat(originalValue, "\""));
+        }
+        var num = parseFloat(value);
+        if (isNaN(num)) {
+            throw new ParseError("Unexpected NaN when parsing number from \"".concat(originalValue, "\""));
+        }
+        return num;
+    }
+    /**
+     * TODO: Maybe use sth. like safe-eval in fraction/calculation case @see https://www.npmjs.com/package/safe-eval
+     * TODO: [🧠][🌻] Maybe export through `@promptbook/markdown-utils` not `@promptbook/utils`
+     */
+
+    /**
+     * Generates random seed
+     *
+     * Note: `$` is used to indicate that this function is not a pure function - it is not deterministic
+     * Warning: This function is not cryptographically secure (it uses Math.random internally)
+     * @public exported from `@promptbook/utils`
+     */
+    function $randomSeed() {
+        return Math.random();
+    }
+
+    /**
+     * Removes quotes from a string
+     *
+     * Tip: This is very usefull for post-processing of the result of the LLM model
+     * Note: This function removes only the same quotes from the beginning and the end of the string
+     * Note: There are two simmilar functions:
+     * - `removeQuotes` which removes only bounding quotes
+     * - `unwrapResult` which removes whole introduce sentence
+     *
+     * @param text optionally quoted text
+     * @returns text without quotes
+     * @public exported from `@promptbook/utils`
+     */
+    function removeQuotes(text) {
+        if (text.startsWith('"') && text.endsWith('"')) {
+            return text.slice(1, -1);
+        }
+        if (text.startsWith('\'') && text.endsWith('\'')) {
+            return text.slice(1, -1);
+        }
+        return text;
+    }
+
     /**
      * @@@
      *
@@ -1754,7 +1830,6 @@
         'samples',
         'modelName',
         'currentDate',
-        // <- TODO: !!!!! list here all command names
         // <- TODO: Add more like 'date', 'modelName',...
         // <- TODO: Add [emoji] + instructions ACRY when adding new reserved parameter
     ]);
@@ -1770,18 +1845,6 @@
      * @private within the repository
      */
     var RESERVED_PARAMETER_RESTRICTED = 'RESTRICTED-' + REPLACING_NONCE;
-    // <- TODO: [🧜‍♂️]
-    /**
-     * @@@
-     *
-     * @public exported from `@promptbook/core`
-     */
-    Object.freeze({
-        delimiter: ',',
-        quoteChar: '"',
-        newline: '\n',
-        skipEmptyLines: true,
-    });
     /**
      * TODO: [🧠][🧜‍♂️] Maybe join remoteUrl and path into single value
      */
@@ -1865,108 +1928,6 @@
         return replacedTemplate;
     }
 
-    /**
-     * Function parseNumber will parse number from string
-     *
-     * Unlike Number.parseInt, Number.parseFloat it will never ever result in NaN
-     * Note: it also works only with decimal numbers
-     *
-     * @returns parsed number
-     * @throws {ParseError} if the value is not a number
-     *
-     * @public exported from `@promptbook/utils`
-     */
-    function parseNumber(value) {
-        var originalValue = value;
-        if (typeof value === 'number') {
-            value = value.toString(); // <- TODO: Maybe more efficient way to do this
-        }
-        if (typeof value !== 'string') {
-            return 0;
-        }
-        value = value.trim();
-        if (value.startsWith('+')) {
-            return parseNumber(value.substring(1));
-        }
-        if (value.startsWith('-')) {
-            var number = parseNumber(value.substring(1));
-            if (number === 0) {
-                return 0; // <- Note: To prevent -0
-            }
-            return -number;
-        }
-        value = value.replace(/,/g, '.');
-        value = value.toUpperCase();
-        if (value === '') {
-            return 0;
-        }
-        if (value === '♾' || value.startsWith('INF')) {
-            return Infinity;
-        }
-        if (value.includes('/')) {
-            var _a = __read(value.split('/'), 2), numerator_ = _a[0], denominator_ = _a[1];
-            var numerator = parseNumber(numerator_);
-            var denominator = parseNumber(denominator_);
-            if (denominator === 0) {
-                throw new ParseError("Unable to parse number from \"".concat(originalValue, "\" because denominator is zero"));
-            }
-            return numerator / denominator;
-        }
-        if (/^(NAN|NULL|NONE|UNDEFINED|ZERO|NO.*)$/.test(value)) {
-            return 0;
-        }
-        if (value.includes('E')) {
-            var _b = __read(value.split('E'), 2), significand = _b[0], exponent = _b[1];
-            return parseNumber(significand) * Math.pow(10, parseNumber(exponent));
-        }
-        if (!/^[0-9.]+$/.test(value) || value.split('.').length > 2) {
-            throw new ParseError("Unable to parse number from \"".concat(originalValue, "\""));
-        }
-        var num = parseFloat(value);
-        if (isNaN(num)) {
-            throw new ParseError("Unexpected NaN when parsing number from \"".concat(originalValue, "\""));
-        }
-        return num;
-    }
-    /**
-     * TODO: Maybe use sth. like safe-eval in fraction/calculation case @see https://www.npmjs.com/package/safe-eval
-     * TODO: [🧠][🌻] Maybe export through `@promptbook/markdown-utils` not `@promptbook/utils`
-     */
-
-    /**
-     * Generates random seed
-     *
-     * Note: `$` is used to indicate that this function is not a pure function - it is not deterministic
-     * Warning: This function is not cryptographically secure (it uses Math.random internally)
-     * @public exported from `@promptbook/utils`
-     */
-    function $randomSeed() {
-        return Math.random();
-    }
-
-    /**
-     * Removes quotes from a string
-     *
-     * Tip: This is very usefull for post-processing of the result of the LLM model
-     * Note: This function removes only the same quotes from the beginning and the end of the string
-     * Note: There are two simmilar functions:
-     * - `removeQuotes` which removes only bounding quotes
-     * - `unwrapResult` which removes whole introduce sentence
-     *
-     * @param text optionally quoted text
-     * @returns text without quotes
-     * @public exported from `@promptbook/utils`
-     */
-    function removeQuotes(text) {
-        if (text.startsWith('"') && text.endsWith('"')) {
-            return text.slice(1, -1);
-        }
-        if (text.startsWith('\'') && text.endsWith('\'')) {
-            return text.slice(1, -1);
-        }
-        return text;
-    }
-
     /**
      * @@@
      *