@promptbook/core 0.50.0-13 → 0.50.0-15

package/esm/index.es.js

@@ -141,37 +141,6 @@ var PromptbookSyntaxError = /** @class */ (function (_super) {
  */
 var SUPPORTED_SCRIPT_LANGUAGES = ['javascript', 'typescript', 'python'];
 
-/**
- * Parses the template and returns the list of all parameter names
- *
- * @param template the template with parameters in {curly} braces
- * @returns the list of parameter names
- *
- * @private within the library
- */
-function extractParameters(template) {
-    var e_1, _a;
-    var matches = template.matchAll(/{\w+}/g);
-    var parameterNames = [];
-    try {
-        for (var matches_1 = __values(matches), matches_1_1 = matches_1.next(); !matches_1_1.done; matches_1_1 = matches_1.next()) {
-            var match = matches_1_1.value;
-            var parameterName = match[0].slice(1, -1);
-            if (!parameterNames.includes(parameterName)) {
-                parameterNames.push(parameterName);
-            }
-        }
-    }
-    catch (e_1_1) { e_1 = { error: e_1_1 }; }
-    finally {
-        try {
-            if (matches_1_1 && !matches_1_1.done && (_a = matches_1.return)) _a.call(matches_1);
-        }
-        finally { if (e_1) throw e_1.error; }
-    }
-    return parameterNames;
-}
-
 /**
  * Computes the deepness of the markdown structure.
  *
@@ -437,10 +406,75 @@ function removeContentComments(content) {
     return spaceTrim(content.replace(/<!--(.*?)-->/gs, ''));
 }
 
+/**
+ * Creates a new set with all elements that are present in either set
+ */
+function union() {
+    var e_1, _a, e_2, _b;
+    var sets = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        sets[_i] = arguments[_i];
+    }
+    var union = new Set();
+    try {
+        for (var sets_1 = __values(sets), sets_1_1 = sets_1.next(); !sets_1_1.done; sets_1_1 = sets_1.next()) {
+            var set = sets_1_1.value;
+            try {
+                for (var _c = (e_2 = void 0, __values(Array.from(set))), _d = _c.next(); !_d.done; _d = _c.next()) {
+                    var item = _d.value;
+                    union.add(item);
+                }
+            }
+            catch (e_2_1) { e_2 = { error: e_2_1 }; }
+            finally {
+                try {
+                    if (_d && !_d.done && (_b = _c.return)) _b.call(_c);
+                }
+                finally { if (e_2) throw e_2.error; }
+            }
+        }
+    }
+    catch (e_1_1) { e_1 = { error: e_1_1 }; }
+    finally {
+        try {
+            if (sets_1_1 && !sets_1_1.done && (_a = sets_1.return)) _a.call(sets_1);
+        }
+        finally { if (e_1) throw e_1.error; }
+    }
+    return union;
+}
+
 /**
  * The version of the Promptbook library
  */
-var PROMPTBOOK_VERSION = '0.50.0-12';
+var PROMPTBOOK_VERSION = '0.50.0-14';
+
+/**
+ * Parses the template and returns the list of all parameter names
+ *
+ * @param template the template with parameters in {curly} braces
+ * @returns the list of parameter names
+ */
+function extractParameters(template) {
+    var e_1, _a;
+    var matches = template.matchAll(/{\w+}/g);
+    var parameterNames = new Set();
+    try {
+        for (var matches_1 = __values(matches), matches_1_1 = matches_1.next(); !matches_1_1.done; matches_1_1 = matches_1.next()) {
+            var match = matches_1_1.value;
+            var parameterName = match[0].slice(1, -1);
+            parameterNames.add(parameterName);
+        }
+    }
+    catch (e_1_1) { e_1 = { error: e_1_1 }; }
+    finally {
+        try {
+            if (matches_1_1 && !matches_1_1.done && (_a = matches_1.return)) _a.call(matches_1);
+        }
+        finally { if (e_1) throw e_1.error; }
+    }
+    return parameterNames;
+}
 
 /**
  * Parses the given script and returns the list of all used variables that are not defined in the script
@@ -448,11 +482,9 @@ var PROMPTBOOK_VERSION = '0.50.0-12';
  * @param script from which to extract the variables
  * @returns the list of variable names
  * @throws {PromptbookSyntaxError} if the script is invalid
- *
- * @private within the promptbookStringToJson
  */
 function extractVariables(script) {
-    var variables = [];
+    var variables = new Set();
     script = "(()=>{".concat(script, "})()");
     try {
         for (var i = 0; i < 100 /* <- TODO: This limit to configuration */; i++)
@@ -476,7 +508,7 @@ function extractVariables(script) {
                     script = "const ".concat(undefinedName, " = ()=>'';") + script;
                 }
                 else {
-                    variables.push(undefinedName);
+                    variables.add(undefinedName);
                     script = "const ".concat(undefinedName, " = '';") + script;
                 }
             }
@@ -489,6 +521,53 @@ function extractVariables(script) {
     }
     return variables;
 }
+/**
+ * TODO: [🔣] Support for multiple languages - python, java,...
+ */
+
+/**
+ * Parses the prompt template and returns the set of all used parameters
+ *
+ * @param promptTemplate the template with used parameters
+ * @returns the set of parameter names
+ * @throws {PromptbookSyntaxError} if the script is invalid
+ */
+function extractParametersFromPromptTemplate(promptTemplate) {
+    var e_1, _a, e_2, _b;
+    var parameterNames = new Set();
+    try {
+        for (var _c = __values(__spreadArray(__spreadArray(__spreadArray([], __read(extractParameters(promptTemplate.title)), false), __read(extractParameters(promptTemplate.description || '')), false), __read(extractParameters(promptTemplate.content)), false)), _d = _c.next(); !_d.done; _d = _c.next()) {
+            var parameterName = _d.value;
+            parameterNames.add(parameterName);
+        }
+    }
+    catch (e_1_1) { e_1 = { error: e_1_1 }; }
+    finally {
+        try {
+            if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
+        }
+        finally { if (e_1) throw e_1.error; }
+    }
+    if (promptTemplate.executionType === 'SCRIPT') {
+        try {
+            for (var _e = __values(extractVariables(promptTemplate.content)), _f = _e.next(); !_f.done; _f = _e.next()) {
+                var parameterName = _f.value;
+                parameterNames.add(parameterName);
+            }
+        }
+        catch (e_2_1) { e_2 = { error: e_2_1 }; }
+        finally {
+            try {
+                if (_f && !_f.done && (_b = _e.return)) _b.call(_e);
+            }
+            finally { if (e_2) throw e_2.error; }
+        }
+    }
+    return parameterNames;
+}
+/**
+ * TODO: [🔣] If script require contentLanguage
+ */
 
 /**
  * Prettify the html code
@@ -1267,7 +1346,7 @@ var ExecutionTypes = [
 /**
  * Units of text measurement
  */
-var EXPECTATION_UNITS = ['CHARACTERS', 'WORDS', 'SENTENCES', 'PARAGRAPHS', 'LINES', 'PAGES'];
+var EXPECTATION_UNITS = ['CHARACTERS', 'WORDS', 'SENTENCES', 'LINES', 'PARAGRAPHS', 'PAGES'];
 /**
  * TODO: [💝] Unite object for expecting amount and format - remove expectFormat
  * TODO: use one helper type> (string_prompt | string_javascript | string_markdown) & string_template
@@ -1619,11 +1698,11 @@ function promptbookStringToJson(promptbookString) {
         finally { if (e_1) throw e_1.error; }
     }
     var _loop_1 = function (section) {
-        var e_3, _e, e_4, _f, e_5, _g;
+        var e_3, _e;
         // TODO: Parse prompt template description (the content out of the codeblock and lists)
         var templateModelRequirements = __assign({}, defaultModelRequirements);
         var listItems_3 = extractAllListItemsFromMarkdown(section.content);
-        var dependentParameterNames = [];
+        var dependentParameterNames = new Set();
         var executionType = 'PROMPT_TEMPLATE';
         var jokers = [];
         var postprocessing = [];
@@ -1637,7 +1716,7 @@ function promptbookStringToJson(promptbookString) {
                 switch (command.type) {
                     case 'JOKER':
                         jokers.push(command.parameterName);
-                        dependentParameterNames.push(command.parameterName);
+                        dependentParameterNames.add(command.parameterName);
                         break;
                     case 'EXECUTE':
                         if (isExecutionTypeChanged) {
@@ -1691,7 +1770,7 @@ function promptbookStringToJson(promptbookString) {
             }
             finally { if (e_3) throw e_3.error; }
         }
-        var _h = extractOneBlockFromMarkdown(section.content), language = _h.language, content = _h.content;
+        var _f = extractOneBlockFromMarkdown(section.content), language = _f.language, content = _f.content;
         if (executionType === 'SCRIPT') {
             if (!language) {
                 throw new PromptbookSyntaxError('You must specify the language of the script in the prompt template');
@@ -1730,40 +1809,12 @@ function promptbookStringToJson(promptbookString) {
         if (Object.keys(postprocessing).length === 0) {
             postprocessing = undefined;
         }
-        try {
-            for (var _j = (e_4 = void 0, __values(__spreadArray(__spreadArray(__spreadArray([], __read(extractParameters(section.title)), false), __read(extractParameters(description_1 || '')), false), __read(extractParameters(content)), false))), _k = _j.next(); !_k.done; _k = _j.next()) {
-                var parameterName = _k.value;
-                dependentParameterNames.push(parameterName);
-            }
-        }
-        catch (e_4_1) { e_4 = { error: e_4_1 }; }
-        finally {
-            try {
-                if (_k && !_k.done && (_f = _j.return)) _f.call(_j);
-            }
-            finally { if (e_4) throw e_4.error; }
-        }
-        if (executionType === 'SCRIPT') {
-            try {
-                for (var _l = (e_5 = void 0, __values(extractVariables(content))), _m = _l.next(); !_m.done; _m = _l.next()) {
-                    var parameterName = _m.value;
-                    dependentParameterNames.push(parameterName);
-                }
-            }
-            catch (e_5_1) { e_5 = { error: e_5_1 }; }
-            finally {
-                try {
-                    if (_m && !_m.done && (_g = _l.return)) _g.call(_l);
-                }
-                finally { if (e_5) throw e_5.error; }
-            }
-        }
-        dependentParameterNames = __spreadArray([], __read(new Set(dependentParameterNames)), false);
+        dependentParameterNames = union(dependentParameterNames, extractParametersFromPromptTemplate(__assign(__assign({}, section), { description: description_1, executionType: executionType, content: content })));
         promptbookJson.promptTemplates.push({
             name: titleToName(section.title),
             title: section.title,
             description: description_1,
-            dependentParameterNames: dependentParameterNames,
+            dependentParameterNames: Array.from(dependentParameterNames),
             executionType: executionType,
             jokers: jokers,
             postprocessing: postprocessing,