@synergenius/flow-weaver 0.30.1 → 0.30.3

package/dist/annotation-generator.js

@@ -202,6 +202,49 @@ export class AnnotationGenerator {
                 line += ` period="${t.period}"`;
             lines.push(line);
         }
+        // CI/CD annotations round-trip (from pack-contributed tag handlers)
+        if (workflow.options?.cicd) {
+            const cicd = workflow.options.cicd;
+            // @trigger (CI/CD style: push, pull_request, etc.)
+            if (cicd.triggers && Array.isArray(cicd.triggers)) {
+                for (const trigger of cicd.triggers) {
+                    const parts = [String(trigger.type || '')];
+                    if (trigger.branches)
+                        parts.push(`branches="${trigger.branches}"`);
+                    if (trigger.types)
+                        parts.push(`types="${trigger.types}"`);
+                    if (trigger.pattern)
+                        parts.push(`pattern="${trigger.pattern}"`);
+                    if (trigger.cron)
+                        parts.push(`cron="${trigger.cron}"`);
+                    lines.push(` * @trigger ${parts.join(' ')}`);
+                }
+            }
+            // @secret
+            if (cicd.secrets && Array.isArray(cicd.secrets)) {
+                for (const secret of cicd.secrets) {
+                    let line = ` * @secret ${secret.name}`;
+                    if (secret.description)
+                        line += ` - ${secret.description}`;
+                    lines.push(line);
+                }
+            }
+            // @runner
+            if (cicd.runner) {
+                lines.push(` * @runner ${cicd.runner}`);
+            }
+            // @cache
+            if (cicd.caches && Array.isArray(cicd.caches)) {
+                for (const cache of cicd.caches) {
+                    let line = ` * @cache ${cache.strategy || 'npm'}`;
+                    if (cache.key)
+                        line += ` key="${cache.key}"`;
+                    if (cache.path)
+                        line += ` path="${cache.path}"`;
+                    lines.push(line);
+                }
+            }
+        }
         // Add name if different from export name
         if (workflow.name && workflow.name !== workflow.functionName) {
             lines.push(` * @name ${workflow.name}`);
@@ -627,7 +670,17 @@ export function generateNodeInstanceTag(instance) {
     if (instance.config?.x !== undefined && instance.config?.y !== undefined) {
         positionAttr = ` [position: ${Math.round(instance.config.x)} ${Math.round(instance.config.y)}]`;
     }
-    return ` * @node ${instance.id} ${instance.nodeType}${parent}${labelAttr}${portOrderAttr}${portLabelAttr}${exprAttr}${pullExecutionAttr}${minimizedAttr}${colorAttr}${iconAttr}${tagsAttr}${suppressAttr}${sizeAttr}${positionAttr}`;
+    // Generate [job: "name"] attribute if present (CI/CD job group)
+    let jobAttr = '';
+    if (instance.job) {
+        jobAttr = ` [job: "${instance.job}"]`;
+    }
+    // Generate [environment: "name"] attribute if present (CI/CD environment)
+    let environmentAttr = '';
+    if (instance.environment) {
+        environmentAttr = ` [environment: "${instance.environment}"]`;
+    }
+    return ` * @node ${instance.id} ${instance.nodeType}${parent}${labelAttr}${portOrderAttr}${portLabelAttr}${exprAttr}${pullExecutionAttr}${minimizedAttr}${colorAttr}${iconAttr}${tagsAttr}${suppressAttr}${sizeAttr}${positionAttr}${jobAttr}${environmentAttr}`;
 }
 /**
  * Generate a TypeScript function signature from a node type definition.

package/dist/api/generate-in-place.js

@@ -42,9 +42,19 @@ export function generateInPlace(sourceCode, ast, options = {}) {
         }
         // Skip node types imported from other files — the import statement handles them.
         // Inlining would create duplicate declarations (TS2440) and duplicate node type names.
-        if (nodeType.sourceLocation?.file &&
-            path.resolve(nodeType.sourceLocation.file) !== path.resolve(ast.sourceFile)) {
-            continue;
+        // Compare basenames as a fallback: after a client roundtrip (JSON serialization),
+        // sourceLocation.file may contain a virtual path ("/testing.ts") instead of the
+        // real workspace path. Full-path comparison would incorrectly skip the node type.
+        // Normalize separators for cross-platform (Windows backslash → forward slash).
+        if (nodeType.sourceLocation?.file) {
+            const ntFile = nodeType.sourceLocation.file.replace(/\\/g, '/');
+            const astFile = ast.sourceFile.replace(/\\/g, '/');
+            const ntBase = ntFile.split('/').filter(Boolean).pop() ?? '';
+            const astBase = astFile.split('/').filter(Boolean).pop() ?? '';
+            if (path.resolve(ntFile) !== path.resolve(astFile) &&
+                ntBase !== astBase) {
+                continue;
+            }
         }
         // Skip built-in auto-injected nodes — step 1.2 handles their insertion
         if (!nodeType.sourceLocation && nodeType.helperText != null) {

package/dist/cli/flow-weaver.mjs

@@ -5987,7 +5987,7 @@ var VERSION;
 var init_generated_version = __esm({
   "src/generated-version.ts"() {
     "use strict";
-    VERSION = "0.30.1";
+    VERSION = "0.30.3";
   }
 });
 
@@ -14894,7 +14894,15 @@ function generateNodeInstanceTag(instance) {
   if (instance.config?.x !== void 0 && instance.config?.y !== void 0) {
     positionAttr = ` [position: ${Math.round(instance.config.x)} ${Math.round(instance.config.y)}]`;
   }
-  return ` * @node ${instance.id} ${instance.nodeType}${parent}${labelAttr}${portOrderAttr}${portLabelAttr}${exprAttr}${pullExecutionAttr}${minimizedAttr}${colorAttr}${iconAttr}${tagsAttr}${suppressAttr}${sizeAttr}${positionAttr}`;
+  let jobAttr = "";
+  if (instance.job) {
+    jobAttr = ` [job: "${instance.job}"]`;
+  }
+  let environmentAttr = "";
+  if (instance.environment) {
+    environmentAttr = ` [environment: "${instance.environment}"]`;
+  }
+  return ` * @node ${instance.id} ${instance.nodeType}${parent}${labelAttr}${portOrderAttr}${portLabelAttr}${exprAttr}${pullExecutionAttr}${minimizedAttr}${colorAttr}${iconAttr}${tagsAttr}${suppressAttr}${sizeAttr}${positionAttr}${jobAttr}${environmentAttr}`;
 }
 function generateFunctionSignature(nodeType) {
   const lines = [];
@@ -15124,6 +15132,37 @@ var init_annotation_generator = __esm({
           if (t.period) line += ` period="${t.period}"`;
           lines.push(line);
         }
+        if (workflow.options?.cicd) {
+          const cicd = workflow.options.cicd;
+          if (cicd.triggers && Array.isArray(cicd.triggers)) {
+            for (const trigger of cicd.triggers) {
+              const parts = [String(trigger.type || "")];
+              if (trigger.branches) parts.push(`branches="${trigger.branches}"`);
+              if (trigger.types) parts.push(`types="${trigger.types}"`);
+              if (trigger.pattern) parts.push(`pattern="${trigger.pattern}"`);
+              if (trigger.cron) parts.push(`cron="${trigger.cron}"`);
+              lines.push(` * @trigger ${parts.join(" ")}`);
+            }
+          }
+          if (cicd.secrets && Array.isArray(cicd.secrets)) {
+            for (const secret of cicd.secrets) {
+              let line = ` * @secret ${secret.name}`;
+              if (secret.description) line += ` - ${secret.description}`;
+              lines.push(line);
+            }
+          }
+          if (cicd.runner) {
+            lines.push(` * @runner ${cicd.runner}`);
+          }
+          if (cicd.caches && Array.isArray(cicd.caches)) {
+            for (const cache of cicd.caches) {
+              let line = ` * @cache ${cache.strategy || "npm"}`;
+              if (cache.key) line += ` key="${cache.key}"`;
+              if (cache.path) line += ` path="${cache.path}"`;
+              lines.push(line);
+            }
+          }
+        }
         if (workflow.name && workflow.name !== workflow.functionName) {
           lines.push(` * @name ${workflow.name}`);
         }
@@ -15285,8 +15324,14 @@ function generateInPlace(sourceCode, ast, options = {}) {
     if (nodeType.variant === "IMPORTED_WORKFLOW" || nodeType.variant === "WORKFLOW" || nodeType.variant === "MAP_ITERATOR") {
       continue;
     }
-    if (nodeType.sourceLocation?.file && path2.resolve(nodeType.sourceLocation.file) !== path2.resolve(ast.sourceFile)) {
-      continue;
+    if (nodeType.sourceLocation?.file) {
+      const ntFile = nodeType.sourceLocation.file.replace(/\\/g, "/");
+      const astFile = ast.sourceFile.replace(/\\/g, "/");
+      const ntBase = ntFile.split("/").filter(Boolean).pop() ?? "";
+      const astBase = astFile.split("/").filter(Boolean).pop() ?? "";
+      if (path2.resolve(ntFile) !== path2.resolve(astFile) && ntBase !== astBase) {
+        continue;
+      }
     }
     if (!nodeType.sourceLocation && nodeType.helperText != null) {
       continue;
@@ -26949,22 +26994,24 @@ var init_jsdoc_parser = __esm({
        */
       parseTriggerTag(tag, config2, warnings, tagRegistry) {
         const comment = (tag.getCommentText() || "").trim();
+        const cicdKeywords = ["push", "pull_request", "dispatch", "tag", "schedule"];
+        const firstToken = comment.split(/\s/)[0];
+        if (cicdKeywords.includes(firstToken) && tagRegistry && tagRegistry.has("_cicdTrigger")) {
+          if (!config2.deploy) config2.deploy = {};
+          tagRegistry.handle("_cicdTrigger", comment, "workflow", config2.deploy, warnings);
+          return;
+        }
         const result = parseTriggerLine(`@trigger ${comment}`, warnings);
         if (result) {
-          const cicdKeywords = ["push", "pull_request", "dispatch", "tag", "schedule"];
-          if (result.event && cicdKeywords.includes(result.event)) {
-            warnings.push(
-              `@trigger event="${result.event}" is treated as an Inngest event trigger, not a CI/CD trigger. For CI/CD, use: @trigger ${result.event}`
-            );
-          }
           config2.trigger = config2.trigger || {};
           if (result.event) config2.trigger.event = result.event;
           if (result.cron) config2.trigger.cron = result.cron;
           return;
         }
-        if (tagRegistry && tagRegistry.has("_cicdTrigger")) {
-          if (!config2.deploy) config2.deploy = {};
-          tagRegistry.handle("_cicdTrigger", comment, "workflow", config2.deploy, warnings);
+        if (cicdKeywords.includes(firstToken)) {
+          warnings.push(
+            `@trigger ${firstToken} looks like a CI/CD trigger but no CI/CD pack is installed. Install @synergenius/flow-weaver-pack-cicd to enable CI/CD pipeline annotations.`
+          );
           return;
         }
         warnings.push(`Invalid @trigger format: @trigger ${comment}`);
@@ -88846,7 +88893,7 @@ function parseIntStrict(value) {
 // src/cli/index.ts
 init_logger();
 init_error_utils();
-var version2 = true ? "0.30.1" : "0.0.0-dev";
+var version2 = true ? "0.30.3" : "0.0.0-dev";
 var program2 = new Command();
 program2.name("fw").description("Flow Weaver Annotations - Compile and validate workflow files").option("-v, --version", "Output the current version").option("--no-color", "Disable colors").option("--color", "Force colors").on("option:version", () => {
   logger.banner(version2);

package/dist/generated-version.d.ts

@@ -1,2 +1,2 @@
-export declare const VERSION = "0.30.1";
+export declare const VERSION = "0.30.3";
 //# sourceMappingURL=generated-version.d.ts.map

package/dist/generated-version.js

@@ -1,3 +1,3 @@
 // Auto-generated by scripts/generate-version.ts — do not edit manually
-export const VERSION = '0.30.1';
+export const VERSION = '0.30.3';
 //# sourceMappingURL=generated-version.js.map

package/dist/jsdoc-parser.js

@@ -1059,15 +1059,19 @@ export class JSDocParser {
      */
     parseTriggerTag(tag, config, warnings, tagRegistry) {
         const comment = (tag.getCommentText() || '').trim();
-        // Try core FW trigger parsing first (event= and/or cron=)
+        // Check if the trigger looks like a CI/CD keyword (push, pull_request, etc.)
+        const cicdKeywords = ['push', 'pull_request', 'dispatch', 'tag', 'schedule'];
+        const firstToken = comment.split(/\s/)[0];
+        // CI/CD triggers: delegate to pack handler if registered
+        if (cicdKeywords.includes(firstToken) && tagRegistry && tagRegistry.has('_cicdTrigger')) {
+            if (!config.deploy)
+                config.deploy = {};
+            tagRegistry.handle('_cicdTrigger', comment, 'workflow', config.deploy, warnings);
+            return;
+        }
+        // Core FW trigger parsing (event= and/or cron=)
         const result = parseTriggerLine(`@trigger ${comment}`, warnings);
         if (result) {
-            // Warn if the event name matches a CI/CD trigger keyword (likely user error)
-            const cicdKeywords = ['push', 'pull_request', 'dispatch', 'tag', 'schedule'];
-            if (result.event && cicdKeywords.includes(result.event)) {
-                warnings.push(`@trigger event="${result.event}" is treated as an Inngest event trigger, not a CI/CD trigger. ` +
-                    `For CI/CD, use: @trigger ${result.event}`);
-            }
             // Merge: multiple @trigger tags accumulate (event + cron can be separate tags)
             config.trigger = config.trigger || {};
             if (result.event)
@@ -1076,11 +1080,10 @@ export class JSDocParser {
                 config.trigger.cron = result.cron;
             return;
         }
-        // Not a core trigger. Delegate to domain-specific handlers (e.g. CI/CD).
-        if (tagRegistry && tagRegistry.has('_cicdTrigger')) {
-            if (!config.deploy)
-                config.deploy = {};
-            tagRegistry.handle('_cicdTrigger', comment, 'workflow', config.deploy, warnings);
+        // Not a core trigger and no CI/CD handler available. Try CI/CD keywords as fallback hint.
+        if (cicdKeywords.includes(firstToken)) {
+            warnings.push(`@trigger ${firstToken} looks like a CI/CD trigger but no CI/CD pack is installed. ` +
+                `Install @synergenius/flow-weaver-pack-cicd to enable CI/CD pipeline annotations.`);
             return;
         }
         warnings.push(`Invalid @trigger format: @trigger ${comment}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@synergenius/flow-weaver",
-  "version": "0.30.1",
+  "version": "0.30.3",
   "description": "Flow Weaver: deterministic TypeScript workflow compiler. Define workflows with JSDoc annotations, compile to standalone functions with zero runtime dependencies.",
   "private": false,
   "type": "module",