@generaltranslation/python-extractor 0.2.5 → 0.2.7

package/dist/extractCalls.js

@@ -89,16 +89,35 @@ async function processCall(callNode, imports, filePath, calls, errors, _warnings
             errors.push(`${locationStr(callNode)}: no string variants produced`);
             return;
         }
-        const metadata = extractKwargs(argsNode, errors, callNode);
+        // Extract static metadata and check for derive in _context
+        const metadata = extractKwargs(argsNode, errors, callNode, imports);
+        const contextVariants = await extractDeriveContext(argsNode, imports, filePath, rootNode, errors);
         const staticId = `static-temp-id-${randomUUID()}`;
-        for (const source of strings) {
-            calls.push({
-                source,
-                ...metadata,
-                staticId,
-                line: callNode.startPosition.row + 1,
-                column: callNode.startPosition.column,
-            });
+        if (contextVariants) {
+            // Cross-product: content variants × context variants
+            for (const source of strings) {
+                for (const context of contextVariants) {
+                    calls.push({
+                        source,
+                        ...metadata,
+                        context,
+                        staticId,
+                        line: callNode.startPosition.row + 1,
+                        column: callNode.startPosition.column,
+                    });
+                }
+            }
+        }
+        else {
+            for (const source of strings) {
+                calls.push({
+                    source,
+                    ...metadata,
+                    staticId,
+                    line: callNode.startPosition.row + 1,
+                    column: callNode.startPosition.column,
+                });
+            }
         }
         return;
     }
@@ -125,16 +144,35 @@ async function processCall(callNode, imports, filePath, calls, errors, _warnings
         errors.push(`${locationStr(callNode)}: could not extract string content`);
         return;
     }
-    // Extract keyword arguments
-    const metadata = extractKwargs(argsNode, errors, callNode);
-    calls.push({
-        source,
-        ...metadata,
-        line: callNode.startPosition.row + 1,
-        column: callNode.startPosition.column,
-    });
+    // Extract keyword arguments and check for derive in _context
+    const metadata = extractKwargs(argsNode, errors, callNode, imports);
+    const rootNode = callNode.tree?.rootNode;
+    const contextVariants = rootNode
+        ? await extractDeriveContext(argsNode, imports, filePath, rootNode, errors)
+        : null;
+    if (contextVariants) {
+        const staticId = `static-temp-id-${randomUUID()}`;
+        for (const context of contextVariants) {
+            calls.push({
+                source,
+                ...metadata,
+                context,
+                staticId,
+                line: callNode.startPosition.row + 1,
+                column: callNode.startPosition.column,
+            });
+        }
+    }
+    else {
+        calls.push({
+            source,
+            ...metadata,
+            line: callNode.startPosition.row + 1,
+            column: callNode.startPosition.column,
+        });
+    }
 }
-function extractKwargs(argsNode, errors, callNode) {
+function extractKwargs(argsNode, errors, callNode, imports) {
     const result = {};
     for (let i = 0; i < argsNode.childCount; i++) {
         const child = argsNode.child(i);
@@ -166,6 +204,11 @@ function extractKwargs(argsNode, errors, callNode) {
                         result.context = value;
                 }
             }
+            else if (metadataKey === 'context' &&
+                imports &&
+                containsStaticCalls(valueNode, imports)) {
+                // _context contains derive() — skip error, caller handles derivation
+            }
             else {
                 errors.push(`${locationStr(callNode)}: _${metadataKey} must be a string literal`);
             }
@@ -173,6 +216,37 @@ function extractKwargs(argsNode, errors, callNode) {
     }
     return result;
 }
+/**
+ * Finds the _context keyword argument node and, if it contains a derive() call,
+ * parses it into context variants. Returns null if _context is static or absent.
+ */
+async function extractDeriveContext(argsNode, imports, filePath, rootNode, errors) {
+    // Find _context kwarg
+    for (let i = 0; i < argsNode.childCount; i++) {
+        const child = argsNode.child(i);
+        if (!child || child.type !== 'keyword_argument')
+            continue;
+        const nameNode = child.childForFieldName('name');
+        const valueNode = child.childForFieldName('value');
+        if (!nameNode || !valueNode)
+            continue;
+        if (nameNode.text !== '_context')
+            continue;
+        // Check if value contains derive()
+        if (!containsStaticCalls(valueNode, imports))
+            return null;
+        const contextNode = await parseStringExpression(valueNode, {
+            rootNode,
+            imports,
+            filePath,
+            errors,
+        });
+        if (!contextNode)
+            return null;
+        return nodeToStrings(contextNode);
+    }
+    return null;
+}
 function isFString(stringNode) {
     // Check if string_start begins with 'f' or 'F'
     for (let i = 0; i < stringNode.childCount; i++) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@generaltranslation/python-extractor",
-  "version": "0.2.5",
+  "version": "0.2.7",
   "description": "Python source code extraction for General Translation",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -47,7 +47,7 @@
   "dependencies": {
     "tree-sitter-python": "^0.25.0",
     "web-tree-sitter": "^0.26.6",
-    "generaltranslation": "8.2.1"
+    "generaltranslation": "8.2.2"
   },
   "scripts": {
     "build": "tsc",