refinement

Author: clavery

packages/b2c-tooling-sdk/src/operations/pipeline/generator/blocks.ts

@@ -80,9 +80,21 @@ function generateLoop(block: LoopBlock, context: GeneratorContext): string {
   const lines: string[] = [];
   const ind = indent(context.indent);
 
-  const iteratorVar = transformVariable(block.iteratorVar);
+  // Transform iterator - handle dotted paths properly
+  let iteratorVar = block.iteratorVar;
+  if (iteratorVar.includes('.')) {
+    const parts = iteratorVar.split('.');
+    const firstPart = transformVariable(parts[0]);
+    iteratorVar = [firstPart, ...parts.slice(1)].join('.');
+  } else {
+    iteratorVar = transformVariable(iteratorVar);
+  }
+
   const elementVar = block.elementVar;
 
+  // Track loop variable to avoid pdict prefixing inside loop body
+  context.declaredVars.add(elementVar);
+
   // Use for..of for iterators
   lines.push(`${ind}for (var ${elementVar} of ${iteratorVar}) {`);
 

packages/b2c-tooling-sdk/src/operations/pipeline/generator/helpers.ts

@@ -118,7 +118,8 @@ export function transformExpression(expr: string): string {
 
   // Match capitalized identifiers that are NOT preceded by a dot (not property access)
   // and NOT followed by a dot or open paren (not a namespace or function call)
-  result = result.replace(/(?<![.\w])([A-Z][a-zA-Z0-9_]*)(?!\s*[.(])/g, (match, name, offset) => {
+  // Use word boundary \b to prevent backtracking from matching partial identifiers
+  result = result.replace(/(?<![.\w])([A-Z][a-zA-Z0-9_]*)\b(?!\s*[.(])/g, (match, name, offset) => {
     // Skip our placeholder tokens
     if (name.startsWith('___') && name.endsWith('___')) {
       return match;
@@ -149,7 +150,29 @@ export function transformExpression(expr: string): string {
  * Transforms a pipeline variable reference to JavaScript.
  */
 export function transformVariable(varRef: string): string {
-  if (!varRef) return varRef;
+  if (!varRef || varRef === 'null') return varRef;
+
+  // Don't transform JavaScript built-in names
+  const jsBuiltins = new Set([
+    'Object',
+    'Array',
+    'String',
+    'Number',
+    'Boolean',
+    'Date',
+    'Error',
+    'JSON',
+    'Math',
+    'RegExp',
+    'Function',
+    'Symbol',
+    'Map',
+    'Set',
+    'Promise',
+  ]);
+  if (jsBuiltins.has(varRef)) {
+    return varRef;
+  }
 
   // Apply known mappings
   for (const [prefix, replacement] of Object.entries(VARIABLE_MAPPINGS)) {

packages/b2c-tooling-sdk/src/operations/pipeline/generator/index.ts

@@ -105,6 +105,8 @@ function generateFunction(func: AnalyzedFunction, context: GeneratorContext): st
   const bodyCode = generateBlock(func.body, context);
   if (bodyCode.trim()) {
     lines.push(bodyCode);
+  } else {
+    lines.push(`${indent(1)}// TODO: Empty pipeline - no nodes to convert`);
   }
 
   lines.push('}');

packages/b2c-tooling-sdk/src/operations/pipeline/generator/nodes.ts

@@ -198,23 +198,32 @@ function generateCallNode(node: CallNodeIR, context: GeneratorContext): string {
  */
 function generateJumpNode(node: JumpNodeIR, context: GeneratorContext): string {
   const ind = indent(context.indent);
+  const lines: string[] = [];
 
   // Dynamic dispatch - target determined at runtime from site preference
   if (node.isDynamic && node.dynamicKey) {
-    return `${ind}// TODO: Dynamic pipeline jump - target resolved from key: ${node.dynamicKey}\n${ind}// Original: jump-node start-name-key="${node.dynamicKey}"`;
+    lines.push(`${ind}// TODO: Dynamic pipeline jump - target resolved from key: ${node.dynamicKey}`);
+    lines.push(`${ind}// Original: jump-node start-name-key="${node.dynamicKey}"`);
+  } else {
+    // Convert Pipeline-Start to Controller-Action URL
+    lines.push(`${ind}response.redirect(URLUtils.url('${node.pipelineName}-${node.startName}'));`);
   }
+  lines.push(`${ind}return;`);
 
-  // Convert Pipeline-Start to Controller-Action URL
-  return `${ind}response.redirect(URLUtils.url('${node.pipelineName}-${node.startName}'));`;
+  return lines.join('\n');
 }
 
 /**
  * Generates code for an interaction node.
  */
 function generateInteractionNode(node: InteractionNodeIR, context: GeneratorContext): string {
   const ind = indent(context.indent);
+  const lines: string[] = [];
 
-  return `${ind}ISML.renderTemplate('${node.templateName}', pdict);`;
+  lines.push(`${ind}ISML.renderTemplate('${node.templateName}', pdict);`);
+  lines.push(`${ind}return;`);
+
+  return lines.join('\n');
 }
 
 /**

packages/b2c-tooling-sdk/src/operations/pipeline/generator/pipelets/misc.ts

@@ -26,15 +26,19 @@ export function generateUpdatePageMetaDataPipelet(node: PipeletNodeIR, context:
 
   lines.push(`${ind}var pageMetaData = request.pageMetaData;`);
 
-  if (product) {
-    lines.push(`${ind}pageMetaData.setTitle(${transformExpression(product)}.name);`);
-    lines.push(`${ind}pageMetaData.setDescription(${transformExpression(product)}.shortDescription);`);
-  } else if (category) {
-    lines.push(`${ind}pageMetaData.setTitle(${transformExpression(category)}.displayName);`);
-    lines.push(`${ind}pageMetaData.setDescription(${transformExpression(category)}.description);`);
-  } else if (content) {
-    lines.push(`${ind}pageMetaData.setTitle(${transformExpression(content)}.name);`);
-    lines.push(`${ind}pageMetaData.setDescription(${transformExpression(content)}.description);`);
+  // Only generate if binding exists and is not null
+  if (product && product !== 'null') {
+    const prodExpr = transformExpression(product);
+    lines.push(`${ind}pageMetaData.setTitle(${prodExpr}.name);`);
+    lines.push(`${ind}pageMetaData.setDescription(${prodExpr}.shortDescription);`);
+  } else if (category && category !== 'null') {
+    const catExpr = transformExpression(category);
+    lines.push(`${ind}pageMetaData.setTitle(${catExpr}.displayName);`);
+    lines.push(`${ind}pageMetaData.setDescription(${catExpr}.description);`);
+  } else if (content && content !== 'null') {
+    const contentExpr = transformExpression(content);
+    lines.push(`${ind}pageMetaData.setTitle(${contentExpr}.name);`);
+    lines.push(`${ind}pageMetaData.setDescription(${contentExpr}.description);`);
   }
 
   return lines.join('\n');

packages/b2c-tooling-sdk/src/operations/pipeline/parser.ts

@@ -315,8 +315,8 @@ function parseNodeWrapper(
 
     if (raw['key-binding']) {
       for (const kb of raw['key-binding']) {
-        // Skip null bindings
-        if (kb.$.alias !== 'null' || kb.$.key !== 'null') {
+        // Skip null bindings - only add if BOTH alias and key are not 'null'
+        if (kb.$.alias !== 'null' && kb.$.key !== 'null') {
           keyBindings.push({
             key: kb.$.key,
             value: kb.$.alias,