@promptbook/node 0.86.22 → 0.86.30

package/esm/index.es.js

@@ -30,7 +30,7 @@ const BOOK_LANGUAGE_VERSION = '1.0.0';
  * @generated
  * @see https://github.com/webgptorg/promptbook
  */
-const PROMPTBOOK_ENGINE_VERSION = '0.86.22';
+const PROMPTBOOK_ENGINE_VERSION = '0.86.30';
 /**
  * TODO: string_promptbook_version should be constrained to the all versions of Promptbook engine
  * Note: [💞] Ignore a discrepancy between file name and entity name
@@ -2116,142 +2116,6 @@ function addUsage(...usageItems) {
     }, deepClone(ZERO_USAGE));
 }
 
-/**
- * Extract all used variable names from ginen JavaScript/TypeScript script
- *
- * @param script JavaScript/TypeScript script
- * @returns Set of variable names
- * @throws {ParseError} if the script is invalid
- * @public exported from `@promptbook/utils` <- Note: [👖] This is usable elsewhere than in Promptbook, so keeping in utils
- */
-function extractVariablesFromScript(script) {
-    if (script.trim() === '') {
-        return new Set();
-    }
-    const variables = new Set();
-    // JS keywords and builtins to exclude
-    const exclude = new Set([
-        // Keywords
-        'break',
-        'case',
-        'catch',
-        'class',
-        'const',
-        'continue',
-        'debugger',
-        'default',
-        'delete',
-        'do',
-        'else',
-        'export',
-        'extends',
-        'false',
-        'finally',
-        'for',
-        'function',
-        'if',
-        'import',
-        'in',
-        'instanceof',
-        'let',
-        'new',
-        'null',
-        'return',
-        'super',
-        'switch',
-        'this',
-        'throw',
-        'true',
-        'try',
-        'typeof',
-        'var',
-        'void',
-        'while',
-        'with',
-        'yield',
-        // Common globals
-        'console',
-        'JSON',
-        'Error',
-        // Typescript types
-        'string',
-        'number',
-        'boolean',
-        'object',
-        'symbol',
-        // Common methods on built-in objects
-        'test',
-        'match',
-        'exec',
-        'replace',
-        'search',
-        'split',
-    ]);
-    try {
-        // Note: Extract variables from template literals like ${variable}
-        const templateRegex = /\$\{([a-zA-Z_$][a-zA-Z0-9_$]*)\}/g;
-        let match;
-        while ((match = templateRegex.exec(script)) !== null) {
-            const varName = match[1];
-            if (!exclude.has(varName)) {
-                variables.add(varName);
-            }
-        }
-        // Note: Process the script to handle normal variable usage
-        const processedScript = script
-            .replace(/'(?:\\.|[^'\\])*'/g, "''") // <- Note: Remove string literals
-            .replace(/"(?:\\.|[^"\\])*"/g, '""')
-            .replace(/`(?:\\.|[^`\\])*`/g, '``')
-            .replace(/\/(?:\\.|[^/\\])*\/[gimsuy]*/g, '{}'); // <- Note: Remove regex literals
-        // Note: Find identifiers in function arguments
-        const funcArgRegex = /\b([a-zA-Z_$][a-zA-Z0-9_$]*)\s*\(/g;
-        const funcNames = new Set();
-        while ((match = funcArgRegex.exec(processedScript)) !== null) {
-            funcNames.add(match[1]);
-        }
-        // Find variable declarations to exclude them
-        const declaredVars = new Set();
-        const declRegex = /\b(const|let|var)\s+([a-zA-Z_$][a-zA-Z0-9_$]*)\b/g;
-        while ((match = declRegex.exec(processedScript)) !== null) {
-            declaredVars.add(match[2]);
-        }
-        // Note: Find identifiers in the script
-        const identifierRegex = /\b([a-zA-Z_$][a-zA-Z0-9_$]*)\b/g;
-        while ((match = identifierRegex.exec(processedScript)) !== null) {
-            const name = match[1];
-            // Add if not excluded, not a function name, and not a declared variable
-            if (!exclude.has(name) && !funcNames.has(name) && !declaredVars.has(name)) {
-                variables.add(name);
-            }
-        }
-    }
-    catch (error) {
-        if (!(error instanceof Error)) {
-            throw error;
-        }
-        throw new ParseError(spaceTrim((block) => `
-                    Can not extract variables from the script
-                    ${block(error.stack || error.message)}
-
-                    Found variables:
-                    ${Array.from(variables)
-            .map((variableName, i) => `${i + 1}) ${variableName}`)
-            .join('\n')}
-
-
-                    The script:
-
-                    \`\`\`javascript
-                    ${block(script)}
-                    \`\`\`
-                `));
-    }
-    return variables;
-}
-/**
- * TODO: [🔣] Support for multiple languages - python, java,...
- */
-
 /**
  * Parses the task and returns the set of all used parameters
  *
@@ -2261,7 +2125,7 @@ function extractVariablesFromScript(script) {
  * @public exported from `@promptbook/core` <- Note: [👖] This utility is so tightly interconnected with the Promptbook that it is not exported as util but in core
  */
 function extractParameterNamesFromTask(task) {
-    const { title, description, taskType, content, preparedContent, jokerParameterNames, foreach } = task;
+    const { title, description, /* [🙊] taskType,*/ content, preparedContent, jokerParameterNames, foreach } = task;
     const parameterNames = new Set();
     for (const parameterName of [
         ...extractParameterNames(title),
@@ -2271,11 +2135,14 @@ function extractParameterNamesFromTask(task) {
     ]) {
         parameterNames.add(parameterName);
     }
+    /*/
+    // TODO: [🙊] Fix `extractVariablesFromScript` or delete
     if (taskType === 'SCRIPT_TASK') {
         for (const parameterName of extractVariablesFromScript(content)) {
             parameterNames.add(parameterName);
         }
     }
+    /**/
     for (const jokerName of jokerParameterNames || []) {
         parameterNames.add(jokerName);
     }
@@ -10065,6 +9932,8 @@ class JavascriptEvalExecutionTools {
         // Note: Custom functions are exposed to the current scope as variables
         `const ${functionName} = customFunctions.${functionName};`)
             .join('\n');
+        script = templateParameters(script, parameters);
+        // <- Note: [🙊]
         const statementToEvaluate = spaceTrim((block) => `
 
                 // Build-in functions: