Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/three-apples-draw.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"@workflow/builders": patch
---

Fix discovery of serde classes to detect `[WORKFLOW_SERIALIZE]` and `[WORKFLOW_DESERIALIZE]` computed property usage in bundled code
5 changes: 3 additions & 2 deletions packages/builders/src/base-builder.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -417,6 +417,7 @@ export abstract class BaseBuilder {
entriesToBundle: externalizeNonSteps
? [
...stepFiles,
...serdeFiles,
...(resolvedBuiltInSteps ? [resolvedBuiltInSteps] : []),
]
: undefined,
Expand DownExpand Up@@ -520,8 +521,8 @@ export abstract class BaseBuilder {
await this.writeDebugFile(outfile, { workflowFiles, serdeOnlyFiles });

// Helper to create import statement from file path
// For workspace/node_modules packages, uses the package name so esbuild
// will resolve through package.json exports with conditions: ['workflow']
// For packages, uses the package name so esbuild will resolve through
// package.json exports with conditions: ['workflow']
const createImport = (file: string) => {
const { importPath, isPackage } = getImportPath(
file,
Expand Down
137 changes: 137 additions & 0 deletions packages/builders/src/transform-utils.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
import { describe, expect, it } from 'vitest';
import {
detectWorkflowPatterns,
useStepPattern,
useWorkflowPattern,
workflowSerdeComputedPropertyPattern,
workflowSerdeImportPattern,
workflowSerdeSymbolPattern,
} from './transform-utils.js';
Expand DownExpand Up@@ -195,4 +197,139 @@ describe('transform-utils patterns', () => {
expect(workflowSerdeSymbolPattern.test(source)).toBe(true);
});
});

describe('workflowSerdeComputedPropertyPattern', () => {
it('should match [WORKFLOW_SERIALIZE] computed property', () => {
const source = `static [WORKFLOW_SERIALIZE](instance) {}`;
expect(workflowSerdeComputedPropertyPattern.test(source)).toBe(true);
});

it('should match [WORKFLOW_DESERIALIZE] computed property', () => {
const source = `static [WORKFLOW_DESERIALIZE](data) {}`;
expect(workflowSerdeComputedPropertyPattern.test(source)).toBe(true);
});

it('should match with whitespace inside brackets', () => {
expect(
workflowSerdeComputedPropertyPattern.test(`[ WORKFLOW_SERIALIZE ]`)
).toBe(true);
expect(
workflowSerdeComputedPropertyPattern.test(`[ WORKFLOW_DESERIALIZE ]`)
).toBe(true);
});

it('should match in bundled code where symbols are imported from chunks', () => {
// This is the pattern seen in bundled packages like just-bash
const source = `
import {
WORKFLOW_DESERIALIZE,
WORKFLOW_SERIALIZE
} from "./chunks/chunk-453323QY.js";

var Bash = class _Bash {
static [WORKFLOW_SERIALIZE](instance) {
return { fs: instance.fs };
}
static [WORKFLOW_DESERIALIZE](serialized) {
return Object.create(_Bash.prototype, {
fs: { value: serialized.fs }
});
}
};
`;
expect(workflowSerdeComputedPropertyPattern.test(source)).toBe(true);
// Note: import pattern won't match because it's from a chunk, not @workflow/serde
expect(workflowSerdeImportPattern.test(source)).toBe(false);
});

it('should not match partial names', () => {
expect(
workflowSerdeComputedPropertyPattern.test(`[WORKFLOW_SERIALIZE_EXTRA]`)
).toBe(false);
expect(
workflowSerdeComputedPropertyPattern.test(`[MY_WORKFLOW_SERIALIZE]`)
).toBe(false);
});

it('should not match string literals', () => {
expect(
workflowSerdeComputedPropertyPattern.test(`['WORKFLOW_SERIALIZE']`)
).toBe(false);
expect(
workflowSerdeComputedPropertyPattern.test(`["WORKFLOW_DESERIALIZE"]`)
).toBe(false);
});
});

describe('detectWorkflowPatterns', () => {
it('should detect hasSerde for @workflow/serde import', () => {
const source = `import { WORKFLOW_SERIALIZE } from '@workflow/serde';`;
const result = detectWorkflowPatterns(source);
expect(result.hasSerde).toBe(true);
expect(result.hasSerdeImport).toBe(true);
});

it('should detect hasSerde for Symbol.for pattern', () => {
const source = `static [Symbol.for('workflow-serialize')](instance) {}`;
const result = detectWorkflowPatterns(source);
expect(result.hasSerde).toBe(true);
expect(result.hasSerdeSymbol).toBe(true);
});

it('should detect hasSerde for computed property pattern', () => {
const source = `static [WORKFLOW_SERIALIZE](instance) {}`;
const result = detectWorkflowPatterns(source);
expect(result.hasSerde).toBe(true);
});

it('should detect hasSerde for bundled third-party packages', () => {
// Simulates bundled output from packages like just-bash
const source = `
import {
WORKFLOW_DESERIALIZE,
WORKFLOW_SERIALIZE
} from "./chunks/chunk-ABC123.js";

var MyClass = class {
static [WORKFLOW_SERIALIZE](instance) {
return { data: instance.data };
}
static [WORKFLOW_DESERIALIZE](serialized) {
return new MyClass(serialized.data);
}
};
`;
const result = detectWorkflowPatterns(source);
expect(result.hasSerde).toBe(true);
});

it('should not detect hasSerde for unrelated code', () => {
const source = `
export class RegularClass {
constructor(value) {
this.value = value;
}
}
`;
const result = detectWorkflowPatterns(source);
expect(result.hasSerde).toBe(false);
});

it('should detect both directive and serde patterns', () => {
const source = `
'use step';
import { WORKFLOW_SERIALIZE } from '@workflow/serde';

export class Point {
static [WORKFLOW_SERIALIZE](instance) {
return { x: instance.x };
}
}
`;
const result = detectWorkflowPatterns(source);
expect(result.hasDirective).toBe(true);
expect(result.hasUseStep).toBe(true);
expect(result.hasSerde).toBe(true);
});
});
});
15 changes: 12 additions & 3 deletions packages/builders/src/transform-utils.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,12 @@ export const workflowSerdeImportPattern = /from\s+(['"])@workflow\/serde\1/;
export const workflowSerdeSymbolPattern =
/Symbol\.for\s*\(\s*(['"])workflow-(?:serialize|deserialize)\1\s*\)/;

// Matches usage of WORKFLOW_SERIALIZE or WORKFLOW_DESERIALIZE as computed property names
// e.g.: static [WORKFLOW_SERIALIZE](instance) { ... }
// This catches cases where the symbols are imported and used (even if bundled/re-exported)
export const workflowSerdeComputedPropertyPattern =
/\[\s*WORKFLOW_(?:SERIALIZE|DESERIALIZE)\s*\]/;

// Pattern to detect generated workflow route files that should be excluded
// These files are generated by the build process and should not be re-processed
export const generatedWorkflowPathPattern =
Expand DownExpand Up@@ -56,14 +62,16 @@ export function detectWorkflowPatterns(source: string): WorkflowPatternMatch {
const hasUseStep = useStepPattern.test(source);
const hasSerdeImport = workflowSerdeImportPattern.test(source);
const hasSerdeSymbol = workflowSerdeSymbolPattern.test(source);
const hasSerdeComputedProperty =
workflowSerdeComputedPropertyPattern.test(source);

return {
hasUseWorkflow,
hasUseStep,
hasSerdeImport,
hasSerdeSymbol,
hasDirective: hasUseWorkflow || hasUseStep,
hasSerde: hasSerdeImport || hasSerdeSymbol,
hasSerde: hasSerdeImport || hasSerdeSymbol || hasSerdeComputedProperty,
};
}

Expand DownExpand Up@@ -123,7 +131,8 @@ export function shouldTransformFile(
/**
* Combined regex pattern for turbopack content matching.
* Uses backreferences to ensure matching quote types.
* Matches: 'use workflow', 'use step', @workflow/serde imports, and Symbol.for serialization symbols
* Matches: 'use workflow', 'use step', @workflow/serde imports, Symbol.for serialization symbols,
* and WORKFLOW_SERIALIZE/WORKFLOW_DESERIALIZE computed property usage
*/
export const turbopackContentPattern =
/(use workflow|use step|from\s+(['"])@workflow\/serde\2|Symbol\.for\s*\(\s*(['"])workflow-(?:serialize|deserialize)\3\s*\))/;
/(use workflow|use step|from\s+(['"])@workflow\/serde\2|Symbol\.for\s*\(\s*(['"])workflow-(?:serialize|deserialize)\3\s*\)|\[\s*WORKFLOW_(?:SERIALIZE|DESERIALIZE)\s*\])/;
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/three-apples-draw.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"@workflow/builders": patch
---

Fix discovery of serde classes to detect `[WORKFLOW_SERIALIZE]` and `[WORKFLOW_DESERIALIZE]` computed property usage in bundled code
5 changes: 3 additions & 2 deletions packages/builders/src/base-builder.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -417,6 +417,7 @@ export abstract class BaseBuilder {
entriesToBundle: externalizeNonSteps
? [
...stepFiles,
...serdeFiles,
...(resolvedBuiltInSteps ? [resolvedBuiltInSteps] : []),
]
: undefined,
Expand DownExpand Up@@ -520,8 +521,8 @@ export abstract class BaseBuilder {
await this.writeDebugFile(outfile, { workflowFiles, serdeOnlyFiles });

// Helper to create import statement from file path
// For workspace/node_modules packages, uses the package name so esbuild
// will resolve through package.json exports with conditions: ['workflow']
// For packages, uses the package name so esbuild will resolve through
// package.json exports with conditions: ['workflow']
const createImport = (file: string) => {
const { importPath, isPackage } = getImportPath(
file,
Expand Down
137 changes: 137 additions & 0 deletions packages/builders/src/transform-utils.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
import { describe, expect, it } from 'vitest';
import {
detectWorkflowPatterns,
useStepPattern,
useWorkflowPattern,
workflowSerdeComputedPropertyPattern,
workflowSerdeImportPattern,
workflowSerdeSymbolPattern,
} from './transform-utils.js';
Expand DownExpand Up@@ -195,4 +197,139 @@ describe('transform-utils patterns', () => {
expect(workflowSerdeSymbolPattern.test(source)).toBe(true);
});
});

describe('workflowSerdeComputedPropertyPattern', () => {
it('should match [WORKFLOW_SERIALIZE] computed property', () => {
const source = `static [WORKFLOW_SERIALIZE](instance) {}`;
expect(workflowSerdeComputedPropertyPattern.test(source)).toBe(true);
});

it('should match [WORKFLOW_DESERIALIZE] computed property', () => {
const source = `static [WORKFLOW_DESERIALIZE](data) {}`;
expect(workflowSerdeComputedPropertyPattern.test(source)).toBe(true);
});

it('should match with whitespace inside brackets', () => {
expect(
workflowSerdeComputedPropertyPattern.test(`[ WORKFLOW_SERIALIZE ]`)
).toBe(true);
expect(
workflowSerdeComputedPropertyPattern.test(`[ WORKFLOW_DESERIALIZE ]`)
).toBe(true);
});

it('should match in bundled code where symbols are imported from chunks', () => {
// This is the pattern seen in bundled packages like just-bash
const source = `
import {
WORKFLOW_DESERIALIZE,
WORKFLOW_SERIALIZE
} from "./chunks/chunk-453323QY.js";

var Bash = class _Bash {
static [WORKFLOW_SERIALIZE](instance) {
return { fs: instance.fs };
}
static [WORKFLOW_DESERIALIZE](serialized) {
return Object.create(_Bash.prototype, {
fs: { value: serialized.fs }
});
}
};
`;
expect(workflowSerdeComputedPropertyPattern.test(source)).toBe(true);
// Note: import pattern won't match because it's from a chunk, not @workflow/serde
expect(workflowSerdeImportPattern.test(source)).toBe(false);
});

it('should not match partial names', () => {
expect(
workflowSerdeComputedPropertyPattern.test(`[WORKFLOW_SERIALIZE_EXTRA]`)
).toBe(false);
expect(
workflowSerdeComputedPropertyPattern.test(`[MY_WORKFLOW_SERIALIZE]`)
).toBe(false);
});

it('should not match string literals', () => {
expect(
workflowSerdeComputedPropertyPattern.test(`['WORKFLOW_SERIALIZE']`)
).toBe(false);
expect(
workflowSerdeComputedPropertyPattern.test(`["WORKFLOW_DESERIALIZE"]`)
).toBe(false);
});
});

describe('detectWorkflowPatterns', () => {
it('should detect hasSerde for @workflow/serde import', () => {
const source = `import { WORKFLOW_SERIALIZE } from '@workflow/serde';`;
const result = detectWorkflowPatterns(source);
expect(result.hasSerde).toBe(true);
expect(result.hasSerdeImport).toBe(true);
});

it('should detect hasSerde for Symbol.for pattern', () => {
const source = `static [Symbol.for('workflow-serialize')](instance) {}`;
const result = detectWorkflowPatterns(source);
expect(result.hasSerde).toBe(true);
expect(result.hasSerdeSymbol).toBe(true);
});

it('should detect hasSerde for computed property pattern', () => {
const source = `static [WORKFLOW_SERIALIZE](instance) {}`;
const result = detectWorkflowPatterns(source);
expect(result.hasSerde).toBe(true);
});

it('should detect hasSerde for bundled third-party packages', () => {
// Simulates bundled output from packages like just-bash
const source = `
import {
WORKFLOW_DESERIALIZE,
WORKFLOW_SERIALIZE
} from "./chunks/chunk-ABC123.js";

var MyClass = class {
static [WORKFLOW_SERIALIZE](instance) {
return { data: instance.data };
}
static [WORKFLOW_DESERIALIZE](serialized) {
return new MyClass(serialized.data);
}
};
`;
const result = detectWorkflowPatterns(source);
expect(result.hasSerde).toBe(true);
});

it('should not detect hasSerde for unrelated code', () => {
const source = `
export class RegularClass {
constructor(value) {
this.value = value;
}
}
`;
const result = detectWorkflowPatterns(source);
expect(result.hasSerde).toBe(false);
});

it('should detect both directive and serde patterns', () => {
const source = `
'use step';
import { WORKFLOW_SERIALIZE } from '@workflow/serde';

export class Point {
static [WORKFLOW_SERIALIZE](instance) {
return { x: instance.x };
}
}
`;
const result = detectWorkflowPatterns(source);
expect(result.hasDirective).toBe(true);
expect(result.hasUseStep).toBe(true);
expect(result.hasSerde).toBe(true);
});
});
});
15 changes: 12 additions & 3 deletions packages/builders/src/transform-utils.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,12 @@ export const workflowSerdeImportPattern = /from\s+(['"])@workflow\/serde\1/;
export const workflowSerdeSymbolPattern =
/Symbol\.for\s*\(\s*(['"])workflow-(?:serialize|deserialize)\1\s*\)/;

// Matches usage of WORKFLOW_SERIALIZE or WORKFLOW_DESERIALIZE as computed property names
// e.g.: static [WORKFLOW_SERIALIZE](instance) { ... }
// This catches cases where the symbols are imported and used (even if bundled/re-exported)
export const workflowSerdeComputedPropertyPattern =
/\[\s*WORKFLOW_(?:SERIALIZE|DESERIALIZE)\s*\]/;

// Pattern to detect generated workflow route files that should be excluded
// These files are generated by the build process and should not be re-processed
export const generatedWorkflowPathPattern =
Expand DownExpand Up@@ -56,14 +62,16 @@ export function detectWorkflowPatterns(source: string): WorkflowPatternMatch {
const hasUseStep = useStepPattern.test(source);
const hasSerdeImport = workflowSerdeImportPattern.test(source);
const hasSerdeSymbol = workflowSerdeSymbolPattern.test(source);
const hasSerdeComputedProperty =
workflowSerdeComputedPropertyPattern.test(source);

return {
hasUseWorkflow,
hasUseStep,
hasSerdeImport,
hasSerdeSymbol,
hasDirective: hasUseWorkflow || hasUseStep,
hasSerde: hasSerdeImport || hasSerdeSymbol,
hasSerde: hasSerdeImport || hasSerdeSymbol || hasSerdeComputedProperty,
};
}

Expand DownExpand Up@@ -123,7 +131,8 @@ export function shouldTransformFile(
/**
* Combined regex pattern for turbopack content matching.
* Uses backreferences to ensure matching quote types.
* Matches: 'use workflow', 'use step', @workflow/serde imports, and Symbol.for serialization symbols
* Matches: 'use workflow', 'use step', @workflow/serde imports, Symbol.for serialization symbols,
* and WORKFLOW_SERIALIZE/WORKFLOW_DESERIALIZE computed property usage
*/
export const turbopackContentPattern =
/(use workflow|use step|from\s+(['"])@workflow\/serde\2|Symbol\.for\s*\(\s*(['"])workflow-(?:serialize|deserialize)\3\s*\))/;
/(use workflow|use step|from\s+(['"])@workflow\/serde\2|Symbol\.for\s*\(\s*(['"])workflow-(?:serialize|deserialize)\3\s*\)|\[\s*WORKFLOW_(?:SERIALIZE|DESERIALIZE)\s*\])/;
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/three-apples-draw.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"@workflow/builders": patch
---

Fix discovery of serde classes to detect `[WORKFLOW_SERIALIZE]` and `[WORKFLOW_DESERIALIZE]` computed property usage in bundled code
5 changes: 3 additions & 2 deletions packages/builders/src/base-builder.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -417,6 +417,7 @@ export abstract class BaseBuilder {
entriesToBundle: externalizeNonSteps
? [
...stepFiles,
...serdeFiles,
...(resolvedBuiltInSteps ? [resolvedBuiltInSteps] : []),
]
: undefined,
Expand DownExpand Up@@ -520,8 +521,8 @@ export abstract class BaseBuilder {
await this.writeDebugFile(outfile, { workflowFiles, serdeOnlyFiles });

// Helper to create import statement from file path
// For workspace/node_modules packages, uses the package name so esbuild
// will resolve through package.json exports with conditions: ['workflow']
// For packages, uses the package name so esbuild will resolve through
// package.json exports with conditions: ['workflow']
const createImport = (file: string) => {
const { importPath, isPackage } = getImportPath(
file,
Expand Down
137 changes: 137 additions & 0 deletions packages/builders/src/transform-utils.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
import { describe, expect, it } from 'vitest';
import {
detectWorkflowPatterns,
useStepPattern,
useWorkflowPattern,
workflowSerdeComputedPropertyPattern,
workflowSerdeImportPattern,
workflowSerdeSymbolPattern,
} from './transform-utils.js';
Expand DownExpand Up@@ -195,4 +197,139 @@ describe('transform-utils patterns', () => {
expect(workflowSerdeSymbolPattern.test(source)).toBe(true);
});
});

describe('workflowSerdeComputedPropertyPattern', () => {
it('should match [WORKFLOW_SERIALIZE] computed property', () => {
const source = `static [WORKFLOW_SERIALIZE](instance) {}`;
expect(workflowSerdeComputedPropertyPattern.test(source)).toBe(true);
});

it('should match [WORKFLOW_DESERIALIZE] computed property', () => {
const source = `static [WORKFLOW_DESERIALIZE](data) {}`;
expect(workflowSerdeComputedPropertyPattern.test(source)).toBe(true);
});

it('should match with whitespace inside brackets', () => {
expect(
workflowSerdeComputedPropertyPattern.test(`[ WORKFLOW_SERIALIZE ]`)
).toBe(true);
expect(
workflowSerdeComputedPropertyPattern.test(`[ WORKFLOW_DESERIALIZE ]`)
).toBe(true);
});

it('should match in bundled code where symbols are imported from chunks', () => {
// This is the pattern seen in bundled packages like just-bash
const source = `
import {
WORKFLOW_DESERIALIZE,
WORKFLOW_SERIALIZE
} from "./chunks/chunk-453323QY.js";

var Bash = class _Bash {
static [WORKFLOW_SERIALIZE](instance) {
return { fs: instance.fs };
}
static [WORKFLOW_DESERIALIZE](serialized) {
return Object.create(_Bash.prototype, {
fs: { value: serialized.fs }
});
}
};
`;
expect(workflowSerdeComputedPropertyPattern.test(source)).toBe(true);
// Note: import pattern won't match because it's from a chunk, not @workflow/serde
expect(workflowSerdeImportPattern.test(source)).toBe(false);
});

it('should not match partial names', () => {
expect(
workflowSerdeComputedPropertyPattern.test(`[WORKFLOW_SERIALIZE_EXTRA]`)
).toBe(false);
expect(
workflowSerdeComputedPropertyPattern.test(`[MY_WORKFLOW_SERIALIZE]`)
).toBe(false);
});

it('should not match string literals', () => {
expect(
workflowSerdeComputedPropertyPattern.test(`['WORKFLOW_SERIALIZE']`)
).toBe(false);
expect(
workflowSerdeComputedPropertyPattern.test(`["WORKFLOW_DESERIALIZE"]`)
).toBe(false);
});
});

describe('detectWorkflowPatterns', () => {
it('should detect hasSerde for @workflow/serde import', () => {
const source = `import { WORKFLOW_SERIALIZE } from '@workflow/serde';`;
const result = detectWorkflowPatterns(source);
expect(result.hasSerde).toBe(true);
expect(result.hasSerdeImport).toBe(true);
});

it('should detect hasSerde for Symbol.for pattern', () => {
const source = `static [Symbol.for('workflow-serialize')](instance) {}`;
const result = detectWorkflowPatterns(source);
expect(result.hasSerde).toBe(true);
expect(result.hasSerdeSymbol).toBe(true);
});

it('should detect hasSerde for computed property pattern', () => {
const source = `static [WORKFLOW_SERIALIZE](instance) {}`;
const result = detectWorkflowPatterns(source);
expect(result.hasSerde).toBe(true);
});

it('should detect hasSerde for bundled third-party packages', () => {
// Simulates bundled output from packages like just-bash
const source = `
import {
WORKFLOW_DESERIALIZE,
WORKFLOW_SERIALIZE
} from "./chunks/chunk-ABC123.js";

var MyClass = class {
static [WORKFLOW_SERIALIZE](instance) {
return { data: instance.data };
}
static [WORKFLOW_DESERIALIZE](serialized) {
return new MyClass(serialized.data);
}
};
`;
const result = detectWorkflowPatterns(source);
expect(result.hasSerde).toBe(true);
});

it('should not detect hasSerde for unrelated code', () => {
const source = `
export class RegularClass {
constructor(value) {
this.value = value;
}
}
`;
const result = detectWorkflowPatterns(source);
expect(result.hasSerde).toBe(false);
});

it('should detect both directive and serde patterns', () => {
const source = `
'use step';
import { WORKFLOW_SERIALIZE } from '@workflow/serde';

export class Point {
static [WORKFLOW_SERIALIZE](instance) {
return { x: instance.x };
}
}
`;
const result = detectWorkflowPatterns(source);
expect(result.hasDirective).toBe(true);
expect(result.hasUseStep).toBe(true);
expect(result.hasSerde).toBe(true);
});
});
});
15 changes: 12 additions & 3 deletions packages/builders/src/transform-utils.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,12 @@ export const workflowSerdeImportPattern = /from\s+(['"])@workflow\/serde\1/;
export const workflowSerdeSymbolPattern =
/Symbol\.for\s*\(\s*(['"])workflow-(?:serialize|deserialize)\1\s*\)/;

// Matches usage of WORKFLOW_SERIALIZE or WORKFLOW_DESERIALIZE as computed property names
// e.g.: static [WORKFLOW_SERIALIZE](instance) { ... }
// This catches cases where the symbols are imported and used (even if bundled/re-exported)
export const workflowSerdeComputedPropertyPattern =
/\[\s*WORKFLOW_(?:SERIALIZE|DESERIALIZE)\s*\]/;

// Pattern to detect generated workflow route files that should be excluded
// These files are generated by the build process and should not be re-processed
export const generatedWorkflowPathPattern =
Expand DownExpand Up@@ -56,14 +62,16 @@ export function detectWorkflowPatterns(source: string): WorkflowPatternMatch {
const hasUseStep = useStepPattern.test(source);
const hasSerdeImport = workflowSerdeImportPattern.test(source);
const hasSerdeSymbol = workflowSerdeSymbolPattern.test(source);
const hasSerdeComputedProperty =
workflowSerdeComputedPropertyPattern.test(source);

return {
hasUseWorkflow,
hasUseStep,
hasSerdeImport,
hasSerdeSymbol,
hasDirective: hasUseWorkflow || hasUseStep,
hasSerde: hasSerdeImport || hasSerdeSymbol,
hasSerde: hasSerdeImport || hasSerdeSymbol || hasSerdeComputedProperty,
};
}

Expand DownExpand Up@@ -123,7 +131,8 @@ export function shouldTransformFile(
/**
* Combined regex pattern for turbopack content matching.
* Uses backreferences to ensure matching quote types.
* Matches: 'use workflow', 'use step', @workflow/serde imports, and Symbol.for serialization symbols
* Matches: 'use workflow', 'use step', @workflow/serde imports, Symbol.for serialization symbols,
* and WORKFLOW_SERIALIZE/WORKFLOW_DESERIALIZE computed property usage
*/
export const turbopackContentPattern =
/(use workflow|use step|from\s+(['"])@workflow\/serde\2|Symbol\.for\s*\(\s*(['"])workflow-(?:serialize|deserialize)\3\s*\))/;
/(use workflow|use step|from\s+(['"])@workflow\/serde\2|Symbol\.for\s*\(\s*(['"])workflow-(?:serialize|deserialize)\3\s*\)|\[\s*WORKFLOW_(?:SERIALIZE|DESERIALIZE)\s*\])/;
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/three-apples-draw.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"@workflow/builders": patch
---

Fix discovery of serde classes to detect `[WORKFLOW_SERIALIZE]` and `[WORKFLOW_DESERIALIZE]` computed property usage in bundled code
5 changes: 3 additions & 2 deletions packages/builders/src/base-builder.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -417,6 +417,7 @@ export abstract class BaseBuilder {
entriesToBundle: externalizeNonSteps
? [
...stepFiles,
...serdeFiles,
...(resolvedBuiltInSteps ? [resolvedBuiltInSteps] : []),
]
: undefined,
Expand DownExpand Up@@ -520,8 +521,8 @@ export abstract class BaseBuilder {
await this.writeDebugFile(outfile, { workflowFiles, serdeOnlyFiles });

// Helper to create import statement from file path
// For workspace/node_modules packages, uses the package name so esbuild
// will resolve through package.json exports with conditions: ['workflow']
// For packages, uses the package name so esbuild will resolve through
// package.json exports with conditions: ['workflow']
const createImport = (file: string) => {
const { importPath, isPackage } = getImportPath(
file,
Expand Down
137 changes: 137 additions & 0 deletions packages/builders/src/transform-utils.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
import { describe, expect, it } from 'vitest';
import {
detectWorkflowPatterns,
useStepPattern,
useWorkflowPattern,
workflowSerdeComputedPropertyPattern,
workflowSerdeImportPattern,
workflowSerdeSymbolPattern,
} from './transform-utils.js';
Expand DownExpand Up@@ -195,4 +197,139 @@ describe('transform-utils patterns', () => {
expect(workflowSerdeSymbolPattern.test(source)).toBe(true);
});
});

describe('workflowSerdeComputedPropertyPattern', () => {
it('should match [WORKFLOW_SERIALIZE] computed property', () => {
const source = `static [WORKFLOW_SERIALIZE](instance) {}`;
expect(workflowSerdeComputedPropertyPattern.test(source)).toBe(true);
});

it('should match [WORKFLOW_DESERIALIZE] computed property', () => {
const source = `static [WORKFLOW_DESERIALIZE](data) {}`;
expect(workflowSerdeComputedPropertyPattern.test(source)).toBe(true);
});

it('should match with whitespace inside brackets', () => {
expect(
workflowSerdeComputedPropertyPattern.test(`[ WORKFLOW_SERIALIZE ]`)
).toBe(true);
expect(
workflowSerdeComputedPropertyPattern.test(`[ WORKFLOW_DESERIALIZE ]`)
).toBe(true);
});

it('should match in bundled code where symbols are imported from chunks', () => {
// This is the pattern seen in bundled packages like just-bash
const source = `
import {
WORKFLOW_DESERIALIZE,
WORKFLOW_SERIALIZE
} from "./chunks/chunk-453323QY.js";

var Bash = class _Bash {
static [WORKFLOW_SERIALIZE](instance) {
return { fs: instance.fs };
}
static [WORKFLOW_DESERIALIZE](serialized) {
return Object.create(_Bash.prototype, {
fs: { value: serialized.fs }
});
}
};
`;
expect(workflowSerdeComputedPropertyPattern.test(source)).toBe(true);
// Note: import pattern won't match because it's from a chunk, not @workflow/serde
expect(workflowSerdeImportPattern.test(source)).toBe(false);
});

it('should not match partial names', () => {
expect(
workflowSerdeComputedPropertyPattern.test(`[WORKFLOW_SERIALIZE_EXTRA]`)
).toBe(false);
expect(
workflowSerdeComputedPropertyPattern.test(`[MY_WORKFLOW_SERIALIZE]`)
).toBe(false);
});

it('should not match string literals', () => {
expect(
workflowSerdeComputedPropertyPattern.test(`['WORKFLOW_SERIALIZE']`)
).toBe(false);
expect(
workflowSerdeComputedPropertyPattern.test(`["WORKFLOW_DESERIALIZE"]`)
).toBe(false);
});
});

describe('detectWorkflowPatterns', () => {
it('should detect hasSerde for @workflow/serde import', () => {
const source = `import { WORKFLOW_SERIALIZE } from '@workflow/serde';`;
const result = detectWorkflowPatterns(source);
expect(result.hasSerde).toBe(true);
expect(result.hasSerdeImport).toBe(true);
});

it('should detect hasSerde for Symbol.for pattern', () => {
const source = `static [Symbol.for('workflow-serialize')](instance) {}`;
const result = detectWorkflowPatterns(source);
expect(result.hasSerde).toBe(true);
expect(result.hasSerdeSymbol).toBe(true);
});

it('should detect hasSerde for computed property pattern', () => {
const source = `static [WORKFLOW_SERIALIZE](instance) {}`;
const result = detectWorkflowPatterns(source);
expect(result.hasSerde).toBe(true);
});

it('should detect hasSerde for bundled third-party packages', () => {
// Simulates bundled output from packages like just-bash
const source = `
import {
WORKFLOW_DESERIALIZE,
WORKFLOW_SERIALIZE
} from "./chunks/chunk-ABC123.js";

var MyClass = class {
static [WORKFLOW_SERIALIZE](instance) {
return { data: instance.data };
}
static [WORKFLOW_DESERIALIZE](serialized) {
return new MyClass(serialized.data);
}
};
`;
const result = detectWorkflowPatterns(source);
expect(result.hasSerde).toBe(true);
});

it('should not detect hasSerde for unrelated code', () => {
const source = `
export class RegularClass {
constructor(value) {
this.value = value;
}
}
`;
const result = detectWorkflowPatterns(source);
expect(result.hasSerde).toBe(false);
});

it('should detect both directive and serde patterns', () => {
const source = `
'use step';
import { WORKFLOW_SERIALIZE } from '@workflow/serde';

export class Point {
static [WORKFLOW_SERIALIZE](instance) {
return { x: instance.x };
}
}
`;
const result = detectWorkflowPatterns(source);
expect(result.hasDirective).toBe(true);
expect(result.hasUseStep).toBe(true);
expect(result.hasSerde).toBe(true);
});
});
});
15 changes: 12 additions & 3 deletions packages/builders/src/transform-utils.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,12 @@ export const workflowSerdeImportPattern = /from\s+(['"])@workflow\/serde\1/;
export const workflowSerdeSymbolPattern =
/Symbol\.for\s*\(\s*(['"])workflow-(?:serialize|deserialize)\1\s*\)/;

// Matches usage of WORKFLOW_SERIALIZE or WORKFLOW_DESERIALIZE as computed property names
// e.g.: static [WORKFLOW_SERIALIZE](instance) { ... }
// This catches cases where the symbols are imported and used (even if bundled/re-exported)
export const workflowSerdeComputedPropertyPattern =
/\[\s*WORKFLOW_(?:SERIALIZE|DESERIALIZE)\s*\]/;

// Pattern to detect generated workflow route files that should be excluded
// These files are generated by the build process and should not be re-processed
export const generatedWorkflowPathPattern =
Expand DownExpand Up@@ -56,14 +62,16 @@ export function detectWorkflowPatterns(source: string): WorkflowPatternMatch {
const hasUseStep = useStepPattern.test(source);
const hasSerdeImport = workflowSerdeImportPattern.test(source);
const hasSerdeSymbol = workflowSerdeSymbolPattern.test(source);
const hasSerdeComputedProperty =
workflowSerdeComputedPropertyPattern.test(source);

return {
hasUseWorkflow,
hasUseStep,
hasSerdeImport,
hasSerdeSymbol,
hasDirective: hasUseWorkflow || hasUseStep,
hasSerde: hasSerdeImport || hasSerdeSymbol,
hasSerde: hasSerdeImport || hasSerdeSymbol || hasSerdeComputedProperty,
};
}

Expand DownExpand Up@@ -123,7 +131,8 @@ export function shouldTransformFile(
/**
* Combined regex pattern for turbopack content matching.
* Uses backreferences to ensure matching quote types.
* Matches: 'use workflow', 'use step', @workflow/serde imports, and Symbol.for serialization symbols
* Matches: 'use workflow', 'use step', @workflow/serde imports, Symbol.for serialization symbols,
* and WORKFLOW_SERIALIZE/WORKFLOW_DESERIALIZE computed property usage
*/
export const turbopackContentPattern =
/(use workflow|use step|from\s+(['"])@workflow\/serde\2|Symbol\.for\s*\(\s*(['"])workflow-(?:serialize|deserialize)\3\s*\))/;
/(use workflow|use step|from\s+(['"])@workflow\/serde\2|Symbol\.for\s*\(\s*(['"])workflow-(?:serialize|deserialize)\3\s*\)|\[\s*WORKFLOW_(?:SERIALIZE|DESERIALIZE)\s*\])/;
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/three-apples-draw.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"@workflow/builders": patch
---

Fix discovery of serde classes to detect `[WORKFLOW_SERIALIZE]` and `[WORKFLOW_DESERIALIZE]` computed property usage in bundled code
5 changes: 3 additions & 2 deletions packages/builders/src/base-builder.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -417,6 +417,7 @@ export abstract class BaseBuilder {
entriesToBundle: externalizeNonSteps
? [
...stepFiles,
...serdeFiles,
...(resolvedBuiltInSteps ? [resolvedBuiltInSteps] : []),
]
: undefined,
Expand DownExpand Up@@ -520,8 +521,8 @@ export abstract class BaseBuilder {
await this.writeDebugFile(outfile, { workflowFiles, serdeOnlyFiles });

// Helper to create import statement from file path
// For workspace/node_modules packages, uses the package name so esbuild
// will resolve through package.json exports with conditions: ['workflow']
// For packages, uses the package name so esbuild will resolve through
// package.json exports with conditions: ['workflow']
const createImport = (file: string) => {
const { importPath, isPackage } = getImportPath(
file,
Expand Down
137 changes: 137 additions & 0 deletions packages/builders/src/transform-utils.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
import { describe, expect, it } from 'vitest';
import {
detectWorkflowPatterns,
useStepPattern,
useWorkflowPattern,
workflowSerdeComputedPropertyPattern,
workflowSerdeImportPattern,
workflowSerdeSymbolPattern,
} from './transform-utils.js';
Expand DownExpand Up@@ -195,4 +197,139 @@ describe('transform-utils patterns', () => {
expect(workflowSerdeSymbolPattern.test(source)).toBe(true);
});
});

describe('workflowSerdeComputedPropertyPattern', () => {
it('should match [WORKFLOW_SERIALIZE] computed property', () => {
const source = `static [WORKFLOW_SERIALIZE](instance) {}`;
expect(workflowSerdeComputedPropertyPattern.test(source)).toBe(true);
});

it('should match [WORKFLOW_DESERIALIZE] computed property', () => {
const source = `static [WORKFLOW_DESERIALIZE](data) {}`;
expect(workflowSerdeComputedPropertyPattern.test(source)).toBe(true);
});

it('should match with whitespace inside brackets', () => {
expect(
workflowSerdeComputedPropertyPattern.test(`[ WORKFLOW_SERIALIZE ]`)
).toBe(true);
expect(
workflowSerdeComputedPropertyPattern.test(`[ WORKFLOW_DESERIALIZE ]`)
).toBe(true);
});

it('should match in bundled code where symbols are imported from chunks', () => {
// This is the pattern seen in bundled packages like just-bash
const source = `
import {
WORKFLOW_DESERIALIZE,
WORKFLOW_SERIALIZE
} from "./chunks/chunk-453323QY.js";

var Bash = class _Bash {
static [WORKFLOW_SERIALIZE](instance) {
return { fs: instance.fs };
}
static [WORKFLOW_DESERIALIZE](serialized) {
return Object.create(_Bash.prototype, {
fs: { value: serialized.fs }
});
}
};
`;
expect(workflowSerdeComputedPropertyPattern.test(source)).toBe(true);
// Note: import pattern won't match because it's from a chunk, not @workflow/serde
expect(workflowSerdeImportPattern.test(source)).toBe(false);
});

it('should not match partial names', () => {
expect(
workflowSerdeComputedPropertyPattern.test(`[WORKFLOW_SERIALIZE_EXTRA]`)
).toBe(false);
expect(
workflowSerdeComputedPropertyPattern.test(`[MY_WORKFLOW_SERIALIZE]`)
).toBe(false);
});

it('should not match string literals', () => {
expect(
workflowSerdeComputedPropertyPattern.test(`['WORKFLOW_SERIALIZE']`)
).toBe(false);
expect(
workflowSerdeComputedPropertyPattern.test(`["WORKFLOW_DESERIALIZE"]`)
).toBe(false);
});
});

describe('detectWorkflowPatterns', () => {
it('should detect hasSerde for @workflow/serde import', () => {
const source = `import { WORKFLOW_SERIALIZE } from '@workflow/serde';`;
const result = detectWorkflowPatterns(source);
expect(result.hasSerde).toBe(true);
expect(result.hasSerdeImport).toBe(true);
});

it('should detect hasSerde for Symbol.for pattern', () => {
const source = `static [Symbol.for('workflow-serialize')](instance) {}`;
const result = detectWorkflowPatterns(source);
expect(result.hasSerde).toBe(true);
expect(result.hasSerdeSymbol).toBe(true);
});

it('should detect hasSerde for computed property pattern', () => {
const source = `static [WORKFLOW_SERIALIZE](instance) {}`;
const result = detectWorkflowPatterns(source);
expect(result.hasSerde).toBe(true);
});

it('should detect hasSerde for bundled third-party packages', () => {
// Simulates bundled output from packages like just-bash
const source = `
import {
WORKFLOW_DESERIALIZE,
WORKFLOW_SERIALIZE
} from "./chunks/chunk-ABC123.js";

var MyClass = class {
static [WORKFLOW_SERIALIZE](instance) {
return { data: instance.data };
}
static [WORKFLOW_DESERIALIZE](serialized) {
return new MyClass(serialized.data);
}
};
`;
const result = detectWorkflowPatterns(source);
expect(result.hasSerde).toBe(true);
});

it('should not detect hasSerde for unrelated code', () => {
const source = `
export class RegularClass {
constructor(value) {
this.value = value;
}
}
`;
const result = detectWorkflowPatterns(source);
expect(result.hasSerde).toBe(false);
});

it('should detect both directive and serde patterns', () => {
const source = `
'use step';
import { WORKFLOW_SERIALIZE } from '@workflow/serde';

export class Point {
static [WORKFLOW_SERIALIZE](instance) {
return { x: instance.x };
}
}
`;
const result = detectWorkflowPatterns(source);
expect(result.hasDirective).toBe(true);
expect(result.hasUseStep).toBe(true);
expect(result.hasSerde).toBe(true);
});
});
});
15 changes: 12 additions & 3 deletions packages/builders/src/transform-utils.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,12 @@ export const workflowSerdeImportPattern = /from\s+(['"])@workflow\/serde\1/;
export const workflowSerdeSymbolPattern =
/Symbol\.for\s*\(\s*(['"])workflow-(?:serialize|deserialize)\1\s*\)/;

// Matches usage of WORKFLOW_SERIALIZE or WORKFLOW_DESERIALIZE as computed property names
// e.g.: static [WORKFLOW_SERIALIZE](instance) { ... }
// This catches cases where the symbols are imported and used (even if bundled/re-exported)
export const workflowSerdeComputedPropertyPattern =
/\[\s*WORKFLOW_(?:SERIALIZE|DESERIALIZE)\s*\]/;

// Pattern to detect generated workflow route files that should be excluded
// These files are generated by the build process and should not be re-processed
export const generatedWorkflowPathPattern =
Expand DownExpand Up@@ -56,14 +62,16 @@ export function detectWorkflowPatterns(source: string): WorkflowPatternMatch {
const hasUseStep = useStepPattern.test(source);
const hasSerdeImport = workflowSerdeImportPattern.test(source);
const hasSerdeSymbol = workflowSerdeSymbolPattern.test(source);
const hasSerdeComputedProperty =
workflowSerdeComputedPropertyPattern.test(source);

return {
hasUseWorkflow,
hasUseStep,
hasSerdeImport,
hasSerdeSymbol,
hasDirective: hasUseWorkflow || hasUseStep,
hasSerde: hasSerdeImport || hasSerdeSymbol,
hasSerde: hasSerdeImport || hasSerdeSymbol || hasSerdeComputedProperty,
};
}

Expand DownExpand Up@@ -123,7 +131,8 @@ export function shouldTransformFile(
/**
* Combined regex pattern for turbopack content matching.
* Uses backreferences to ensure matching quote types.
* Matches: 'use workflow', 'use step', @workflow/serde imports, and Symbol.for serialization symbols
* Matches: 'use workflow', 'use step', @workflow/serde imports, Symbol.for serialization symbols,
* and WORKFLOW_SERIALIZE/WORKFLOW_DESERIALIZE computed property usage
*/
export const turbopackContentPattern =
/(use workflow|use step|from\s+(['"])@workflow\/serde\2|Symbol\.for\s*\(\s*(['"])workflow-(?:serialize|deserialize)\3\s*\))/;
/(use workflow|use step|from\s+(['"])@workflow\/serde\2|Symbol\.for\s*\(\s*(['"])workflow-(?:serialize|deserialize)\3\s*\)|\[\s*WORKFLOW_(?:SERIALIZE|DESERIALIZE)\s*\])/;
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/three-apples-draw.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"@workflow/builders": patch
---

Fix discovery of serde classes to detect `[WORKFLOW_SERIALIZE]` and `[WORKFLOW_DESERIALIZE]` computed property usage in bundled code
5 changes: 3 additions & 2 deletions packages/builders/src/base-builder.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -417,6 +417,7 @@ export abstract class BaseBuilder {
entriesToBundle: externalizeNonSteps
? [
...stepFiles,
...serdeFiles,
...(resolvedBuiltInSteps ? [resolvedBuiltInSteps] : []),
]
: undefined,
Expand DownExpand Up@@ -520,8 +521,8 @@ export abstract class BaseBuilder {
await this.writeDebugFile(outfile, { workflowFiles, serdeOnlyFiles });

// Helper to create import statement from file path
// For workspace/node_modules packages, uses the package name so esbuild
// will resolve through package.json exports with conditions: ['workflow']
// For packages, uses the package name so esbuild will resolve through
// package.json exports with conditions: ['workflow']
const createImport = (file: string) => {
const { importPath, isPackage } = getImportPath(
file,
Expand Down
137 changes: 137 additions & 0 deletions packages/builders/src/transform-utils.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
import { describe, expect, it } from 'vitest';
import {
detectWorkflowPatterns,
useStepPattern,
useWorkflowPattern,
workflowSerdeComputedPropertyPattern,
workflowSerdeImportPattern,
workflowSerdeSymbolPattern,
} from './transform-utils.js';
Expand DownExpand Up@@ -195,4 +197,139 @@ describe('transform-utils patterns', () => {
expect(workflowSerdeSymbolPattern.test(source)).toBe(true);
});
});

describe('workflowSerdeComputedPropertyPattern', () => {
it('should match [WORKFLOW_SERIALIZE] computed property', () => {
const source = `static [WORKFLOW_SERIALIZE](instance) {}`;
expect(workflowSerdeComputedPropertyPattern.test(source)).toBe(true);
});

it('should match [WORKFLOW_DESERIALIZE] computed property', () => {
const source = `static [WORKFLOW_DESERIALIZE](data) {}`;
expect(workflowSerdeComputedPropertyPattern.test(source)).toBe(true);
});

it('should match with whitespace inside brackets', () => {
expect(
workflowSerdeComputedPropertyPattern.test(`[ WORKFLOW_SERIALIZE ]`)
).toBe(true);
expect(
workflowSerdeComputedPropertyPattern.test(`[ WORKFLOW_DESERIALIZE ]`)
).toBe(true);
});

it('should match in bundled code where symbols are imported from chunks', () => {
// This is the pattern seen in bundled packages like just-bash
const source = `
import {
WORKFLOW_DESERIALIZE,
WORKFLOW_SERIALIZE
} from "./chunks/chunk-453323QY.js";

var Bash = class _Bash {
static [WORKFLOW_SERIALIZE](instance) {
return { fs: instance.fs };
}
static [WORKFLOW_DESERIALIZE](serialized) {
return Object.create(_Bash.prototype, {
fs: { value: serialized.fs }
});
}
};
`;
expect(workflowSerdeComputedPropertyPattern.test(source)).toBe(true);
// Note: import pattern won't match because it's from a chunk, not @workflow/serde
expect(workflowSerdeImportPattern.test(source)).toBe(false);
});

it('should not match partial names', () => {
expect(
workflowSerdeComputedPropertyPattern.test(`[WORKFLOW_SERIALIZE_EXTRA]`)
).toBe(false);
expect(
workflowSerdeComputedPropertyPattern.test(`[MY_WORKFLOW_SERIALIZE]`)
).toBe(false);
});

it('should not match string literals', () => {
expect(
workflowSerdeComputedPropertyPattern.test(`['WORKFLOW_SERIALIZE']`)
).toBe(false);
expect(
workflowSerdeComputedPropertyPattern.test(`["WORKFLOW_DESERIALIZE"]`)
).toBe(false);
});
});

describe('detectWorkflowPatterns', () => {
it('should detect hasSerde for @workflow/serde import', () => {
const source = `import { WORKFLOW_SERIALIZE } from '@workflow/serde';`;
const result = detectWorkflowPatterns(source);
expect(result.hasSerde).toBe(true);
expect(result.hasSerdeImport).toBe(true);
});

it('should detect hasSerde for Symbol.for pattern', () => {
const source = `static [Symbol.for('workflow-serialize')](instance) {}`;
const result = detectWorkflowPatterns(source);
expect(result.hasSerde).toBe(true);
expect(result.hasSerdeSymbol).toBe(true);
});

it('should detect hasSerde for computed property pattern', () => {
const source = `static [WORKFLOW_SERIALIZE](instance) {}`;
const result = detectWorkflowPatterns(source);
expect(result.hasSerde).toBe(true);
});

it('should detect hasSerde for bundled third-party packages', () => {
// Simulates bundled output from packages like just-bash
const source = `
import {
WORKFLOW_DESERIALIZE,
WORKFLOW_SERIALIZE
} from "./chunks/chunk-ABC123.js";

var MyClass = class {
static [WORKFLOW_SERIALIZE](instance) {
return { data: instance.data };
}
static [WORKFLOW_DESERIALIZE](serialized) {
return new MyClass(serialized.data);
}
};
`;
const result = detectWorkflowPatterns(source);
expect(result.hasSerde).toBe(true);
});

it('should not detect hasSerde for unrelated code', () => {
const source = `
export class RegularClass {
constructor(value) {
this.value = value;
}
}
`;
const result = detectWorkflowPatterns(source);
expect(result.hasSerde).toBe(false);
});

it('should detect both directive and serde patterns', () => {
const source = `
'use step';
import { WORKFLOW_SERIALIZE } from '@workflow/serde';

export class Point {
static [WORKFLOW_SERIALIZE](instance) {
return { x: instance.x };
}
}
`;
const result = detectWorkflowPatterns(source);
expect(result.hasDirective).toBe(true);
expect(result.hasUseStep).toBe(true);
expect(result.hasSerde).toBe(true);
});
});
});
15 changes: 12 additions & 3 deletions packages/builders/src/transform-utils.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,12 @@ export const workflowSerdeImportPattern = /from\s+(['"])@workflow\/serde\1/;
export const workflowSerdeSymbolPattern =
/Symbol\.for\s*\(\s*(['"])workflow-(?:serialize|deserialize)\1\s*\)/;

// Matches usage of WORKFLOW_SERIALIZE or WORKFLOW_DESERIALIZE as computed property names
// e.g.: static [WORKFLOW_SERIALIZE](instance) { ... }
// This catches cases where the symbols are imported and used (even if bundled/re-exported)
export const workflowSerdeComputedPropertyPattern =
/\[\s*WORKFLOW_(?:SERIALIZE|DESERIALIZE)\s*\]/;

// Pattern to detect generated workflow route files that should be excluded
// These files are generated by the build process and should not be re-processed
export const generatedWorkflowPathPattern =
Expand DownExpand Up@@ -56,14 +62,16 @@ export function detectWorkflowPatterns(source: string): WorkflowPatternMatch {
const hasUseStep = useStepPattern.test(source);
const hasSerdeImport = workflowSerdeImportPattern.test(source);
const hasSerdeSymbol = workflowSerdeSymbolPattern.test(source);
const hasSerdeComputedProperty =
workflowSerdeComputedPropertyPattern.test(source);

return {
hasUseWorkflow,
hasUseStep,
hasSerdeImport,
hasSerdeSymbol,
hasDirective: hasUseWorkflow || hasUseStep,
hasSerde: hasSerdeImport || hasSerdeSymbol,
hasSerde: hasSerdeImport || hasSerdeSymbol || hasSerdeComputedProperty,
};
}

Expand DownExpand Up@@ -123,7 +131,8 @@ export function shouldTransformFile(
/**
* Combined regex pattern for turbopack content matching.
* Uses backreferences to ensure matching quote types.
* Matches: 'use workflow', 'use step', @workflow/serde imports, and Symbol.for serialization symbols
* Matches: 'use workflow', 'use step', @workflow/serde imports, Symbol.for serialization symbols,
* and WORKFLOW_SERIALIZE/WORKFLOW_DESERIALIZE computed property usage
*/
export const turbopackContentPattern =
/(use workflow|use step|from\s+(['"])@workflow\/serde\2|Symbol\.for\s*\(\s*(['"])workflow-(?:serialize|deserialize)\3\s*\))/;
/(use workflow|use step|from\s+(['"])@workflow\/serde\2|Symbol\.for\s*\(\s*(['"])workflow-(?:serialize|deserialize)\3\s*\)|\[\s*WORKFLOW_(?:SERIALIZE|DESERIALIZE)\s*\])/;
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/three-apples-draw.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"@workflow/builders": patch
---

Fix discovery of serde classes to detect `[WORKFLOW_SERIALIZE]` and `[WORKFLOW_DESERIALIZE]` computed property usage in bundled code
5 changes: 3 additions & 2 deletions packages/builders/src/base-builder.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -417,6 +417,7 @@ export abstract class BaseBuilder {
entriesToBundle: externalizeNonSteps
? [
...stepFiles,
...serdeFiles,
...(resolvedBuiltInSteps ? [resolvedBuiltInSteps] : []),
]
: undefined,
Expand DownExpand Up@@ -520,8 +521,8 @@ export abstract class BaseBuilder {
await this.writeDebugFile(outfile, { workflowFiles, serdeOnlyFiles });

// Helper to create import statement from file path
// For workspace/node_modules packages, uses the package name so esbuild
// will resolve through package.json exports with conditions: ['workflow']
// For packages, uses the package name so esbuild will resolve through
// package.json exports with conditions: ['workflow']
const createImport = (file: string) => {
const { importPath, isPackage } = getImportPath(
file,
Expand Down
137 changes: 137 additions & 0 deletions packages/builders/src/transform-utils.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
import { describe, expect, it } from 'vitest';
import {
detectWorkflowPatterns,
useStepPattern,
useWorkflowPattern,
workflowSerdeComputedPropertyPattern,
workflowSerdeImportPattern,
workflowSerdeSymbolPattern,
} from './transform-utils.js';
Expand DownExpand Up@@ -195,4 +197,139 @@ describe('transform-utils patterns', () => {
expect(workflowSerdeSymbolPattern.test(source)).toBe(true);
});
});

describe('workflowSerdeComputedPropertyPattern', () => {
it('should match [WORKFLOW_SERIALIZE] computed property', () => {
const source = `static [WORKFLOW_SERIALIZE](instance) {}`;
expect(workflowSerdeComputedPropertyPattern.test(source)).toBe(true);
});

it('should match [WORKFLOW_DESERIALIZE] computed property', () => {
const source = `static [WORKFLOW_DESERIALIZE](data) {}`;
expect(workflowSerdeComputedPropertyPattern.test(source)).toBe(true);
});

it('should match with whitespace inside brackets', () => {
expect(
workflowSerdeComputedPropertyPattern.test(`[ WORKFLOW_SERIALIZE ]`)
).toBe(true);
expect(
workflowSerdeComputedPropertyPattern.test(`[ WORKFLOW_DESERIALIZE ]`)
).toBe(true);
});

it('should match in bundled code where symbols are imported from chunks', () => {
// This is the pattern seen in bundled packages like just-bash
const source = `
import {
WORKFLOW_DESERIALIZE,
WORKFLOW_SERIALIZE
} from "./chunks/chunk-453323QY.js";

var Bash = class _Bash {
static [WORKFLOW_SERIALIZE](instance) {
return { fs: instance.fs };
}
static [WORKFLOW_DESERIALIZE](serialized) {
return Object.create(_Bash.prototype, {
fs: { value: serialized.fs }
});
}
};
`;
expect(workflowSerdeComputedPropertyPattern.test(source)).toBe(true);
// Note: import pattern won't match because it's from a chunk, not @workflow/serde
expect(workflowSerdeImportPattern.test(source)).toBe(false);
});

it('should not match partial names', () => {
expect(
workflowSerdeComputedPropertyPattern.test(`[WORKFLOW_SERIALIZE_EXTRA]`)
).toBe(false);
expect(
workflowSerdeComputedPropertyPattern.test(`[MY_WORKFLOW_SERIALIZE]`)
).toBe(false);
});

it('should not match string literals', () => {
expect(
workflowSerdeComputedPropertyPattern.test(`['WORKFLOW_SERIALIZE']`)
).toBe(false);
expect(
workflowSerdeComputedPropertyPattern.test(`["WORKFLOW_DESERIALIZE"]`)
).toBe(false);
});
});

describe('detectWorkflowPatterns', () => {
it('should detect hasSerde for @workflow/serde import', () => {
const source = `import { WORKFLOW_SERIALIZE } from '@workflow/serde';`;
const result = detectWorkflowPatterns(source);
expect(result.hasSerde).toBe(true);
expect(result.hasSerdeImport).toBe(true);
});

it('should detect hasSerde for Symbol.for pattern', () => {
const source = `static [Symbol.for('workflow-serialize')](instance) {}`;
const result = detectWorkflowPatterns(source);
expect(result.hasSerde).toBe(true);
expect(result.hasSerdeSymbol).toBe(true);
});

it('should detect hasSerde for computed property pattern', () => {
const source = `static [WORKFLOW_SERIALIZE](instance) {}`;
const result = detectWorkflowPatterns(source);
expect(result.hasSerde).toBe(true);
});

it('should detect hasSerde for bundled third-party packages', () => {
// Simulates bundled output from packages like just-bash
const source = `
import {
WORKFLOW_DESERIALIZE,
WORKFLOW_SERIALIZE
} from "./chunks/chunk-ABC123.js";

var MyClass = class {
static [WORKFLOW_SERIALIZE](instance) {
return { data: instance.data };
}
static [WORKFLOW_DESERIALIZE](serialized) {
return new MyClass(serialized.data);
}
};
`;
const result = detectWorkflowPatterns(source);
expect(result.hasSerde).toBe(true);
});

it('should not detect hasSerde for unrelated code', () => {
const source = `
export class RegularClass {
constructor(value) {
this.value = value;
}
}
`;
const result = detectWorkflowPatterns(source);
expect(result.hasSerde).toBe(false);
});

it('should detect both directive and serde patterns', () => {
const source = `
'use step';
import { WORKFLOW_SERIALIZE } from '@workflow/serde';

export class Point {
static [WORKFLOW_SERIALIZE](instance) {
return { x: instance.x };
}
}
`;
const result = detectWorkflowPatterns(source);
expect(result.hasDirective).toBe(true);
expect(result.hasUseStep).toBe(true);
expect(result.hasSerde).toBe(true);
});
});
});
15 changes: 12 additions & 3 deletions packages/builders/src/transform-utils.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,12 @@ export const workflowSerdeImportPattern = /from\s+(['"])@workflow\/serde\1/;
export const workflowSerdeSymbolPattern =
/Symbol\.for\s*\(\s*(['"])workflow-(?:serialize|deserialize)\1\s*\)/;

// Matches usage of WORKFLOW_SERIALIZE or WORKFLOW_DESERIALIZE as computed property names
// e.g.: static [WORKFLOW_SERIALIZE](instance) { ... }
// This catches cases where the symbols are imported and used (even if bundled/re-exported)
export const workflowSerdeComputedPropertyPattern =
/\[\s*WORKFLOW_(?:SERIALIZE|DESERIALIZE)\s*\]/;

// Pattern to detect generated workflow route files that should be excluded
// These files are generated by the build process and should not be re-processed
export const generatedWorkflowPathPattern =
Expand DownExpand Up@@ -56,14 +62,16 @@ export function detectWorkflowPatterns(source: string): WorkflowPatternMatch {
const hasUseStep = useStepPattern.test(source);
const hasSerdeImport = workflowSerdeImportPattern.test(source);
const hasSerdeSymbol = workflowSerdeSymbolPattern.test(source);
const hasSerdeComputedProperty =
workflowSerdeComputedPropertyPattern.test(source);

return {
hasUseWorkflow,
hasUseStep,
hasSerdeImport,
hasSerdeSymbol,
hasDirective: hasUseWorkflow || hasUseStep,
hasSerde: hasSerdeImport || hasSerdeSymbol,
hasSerde: hasSerdeImport || hasSerdeSymbol || hasSerdeComputedProperty,
};
}

Expand DownExpand Up@@ -123,7 +131,8 @@ export function shouldTransformFile(
/**
* Combined regex pattern for turbopack content matching.
* Uses backreferences to ensure matching quote types.
* Matches: 'use workflow', 'use step', @workflow/serde imports, and Symbol.for serialization symbols
* Matches: 'use workflow', 'use step', @workflow/serde imports, Symbol.for serialization symbols,
* and WORKFLOW_SERIALIZE/WORKFLOW_DESERIALIZE computed property usage
*/
export const turbopackContentPattern =
/(use workflow|use step|from\s+(['"])@workflow\/serde\2|Symbol\.for\s*\(\s*(['"])workflow-(?:serialize|deserialize)\3\s*\))/;
/(use workflow|use step|from\s+(['"])@workflow\/serde\2|Symbol\.for\s*\(\s*(['"])workflow-(?:serialize|deserialize)\3\s*\)|\[\s*WORKFLOW_(?:SERIALIZE|DESERIALIZE)\s*\])/;
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/three-apples-draw.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"@workflow/builders": patch
---

Fix discovery of serde classes to detect `[WORKFLOW_SERIALIZE]` and `[WORKFLOW_DESERIALIZE]` computed property usage in bundled code
5 changes: 3 additions & 2 deletions packages/builders/src/base-builder.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -417,6 +417,7 @@ export abstract class BaseBuilder {
entriesToBundle: externalizeNonSteps
? [
...stepFiles,
...serdeFiles,
...(resolvedBuiltInSteps ? [resolvedBuiltInSteps] : []),
]
: undefined,
Expand DownExpand Up@@ -520,8 +521,8 @@ export abstract class BaseBuilder {
await this.writeDebugFile(outfile, { workflowFiles, serdeOnlyFiles });

// Helper to create import statement from file path
// For workspace/node_modules packages, uses the package name so esbuild
// will resolve through package.json exports with conditions: ['workflow']
// For packages, uses the package name so esbuild will resolve through
// package.json exports with conditions: ['workflow']
const createImport = (file: string) => {
const { importPath, isPackage } = getImportPath(
file,
Expand Down
137 changes: 137 additions & 0 deletions packages/builders/src/transform-utils.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
import { describe, expect, it } from 'vitest';
import {
detectWorkflowPatterns,
useStepPattern,
useWorkflowPattern,
workflowSerdeComputedPropertyPattern,
workflowSerdeImportPattern,
workflowSerdeSymbolPattern,
} from './transform-utils.js';
Expand DownExpand Up@@ -195,4 +197,139 @@ describe('transform-utils patterns', () => {
expect(workflowSerdeSymbolPattern.test(source)).toBe(true);
});
});

describe('workflowSerdeComputedPropertyPattern', () => {
it('should match [WORKFLOW_SERIALIZE] computed property', () => {
const source = `static [WORKFLOW_SERIALIZE](instance) {}`;
expect(workflowSerdeComputedPropertyPattern.test(source)).toBe(true);
});

it('should match [WORKFLOW_DESERIALIZE] computed property', () => {
const source = `static [WORKFLOW_DESERIALIZE](data) {}`;
expect(workflowSerdeComputedPropertyPattern.test(source)).toBe(true);
});

it('should match with whitespace inside brackets', () => {
expect(
workflowSerdeComputedPropertyPattern.test(`[ WORKFLOW_SERIALIZE ]`)
).toBe(true);
expect(
workflowSerdeComputedPropertyPattern.test(`[ WORKFLOW_DESERIALIZE ]`)
).toBe(true);
});

it('should match in bundled code where symbols are imported from chunks', () => {
// This is the pattern seen in bundled packages like just-bash
const source = `
import {
WORKFLOW_DESERIALIZE,
WORKFLOW_SERIALIZE
} from "./chunks/chunk-453323QY.js";

var Bash = class _Bash {
static [WORKFLOW_SERIALIZE](instance) {
return { fs: instance.fs };
}
static [WORKFLOW_DESERIALIZE](serialized) {
return Object.create(_Bash.prototype, {
fs: { value: serialized.fs }
});
}
};
`;
expect(workflowSerdeComputedPropertyPattern.test(source)).toBe(true);
// Note: import pattern won't match because it's from a chunk, not @workflow/serde
expect(workflowSerdeImportPattern.test(source)).toBe(false);
});

it('should not match partial names', () => {
expect(
workflowSerdeComputedPropertyPattern.test(`[WORKFLOW_SERIALIZE_EXTRA]`)
).toBe(false);
expect(
workflowSerdeComputedPropertyPattern.test(`[MY_WORKFLOW_SERIALIZE]`)
).toBe(false);
});

it('should not match string literals', () => {
expect(
workflowSerdeComputedPropertyPattern.test(`['WORKFLOW_SERIALIZE']`)
).toBe(false);
expect(
workflowSerdeComputedPropertyPattern.test(`["WORKFLOW_DESERIALIZE"]`)
).toBe(false);
});
});

describe('detectWorkflowPatterns', () => {
it('should detect hasSerde for @workflow/serde import', () => {
const source = `import { WORKFLOW_SERIALIZE } from '@workflow/serde';`;
const result = detectWorkflowPatterns(source);
expect(result.hasSerde).toBe(true);
expect(result.hasSerdeImport).toBe(true);
});

it('should detect hasSerde for Symbol.for pattern', () => {
const source = `static [Symbol.for('workflow-serialize')](instance) {}`;
const result = detectWorkflowPatterns(source);
expect(result.hasSerde).toBe(true);
expect(result.hasSerdeSymbol).toBe(true);
});

it('should detect hasSerde for computed property pattern', () => {
const source = `static [WORKFLOW_SERIALIZE](instance) {}`;
const result = detectWorkflowPatterns(source);
expect(result.hasSerde).toBe(true);
});

it('should detect hasSerde for bundled third-party packages', () => {
// Simulates bundled output from packages like just-bash
const source = `
import {
WORKFLOW_DESERIALIZE,
WORKFLOW_SERIALIZE
} from "./chunks/chunk-ABC123.js";

var MyClass = class {
static [WORKFLOW_SERIALIZE](instance) {
return { data: instance.data };
}
static [WORKFLOW_DESERIALIZE](serialized) {
return new MyClass(serialized.data);
}
};
`;
const result = detectWorkflowPatterns(source);
expect(result.hasSerde).toBe(true);
});

it('should not detect hasSerde for unrelated code', () => {
const source = `
export class RegularClass {
constructor(value) {
this.value = value;
}
}
`;
const result = detectWorkflowPatterns(source);
expect(result.hasSerde).toBe(false);
});

it('should detect both directive and serde patterns', () => {
const source = `
'use step';
import { WORKFLOW_SERIALIZE } from '@workflow/serde';

export class Point {
static [WORKFLOW_SERIALIZE](instance) {
return { x: instance.x };
}
}
`;
const result = detectWorkflowPatterns(source);
expect(result.hasDirective).toBe(true);
expect(result.hasUseStep).toBe(true);
expect(result.hasSerde).toBe(true);
});
});
});
15 changes: 12 additions & 3 deletions packages/builders/src/transform-utils.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,12 @@ export const workflowSerdeImportPattern = /from\s+(['"])@workflow\/serde\1/;
export const workflowSerdeSymbolPattern =
/Symbol\.for\s*\(\s*(['"])workflow-(?:serialize|deserialize)\1\s*\)/;

// Matches usage of WORKFLOW_SERIALIZE or WORKFLOW_DESERIALIZE as computed property names
// e.g.: static [WORKFLOW_SERIALIZE](instance) { ... }
// This catches cases where the symbols are imported and used (even if bundled/re-exported)
export const workflowSerdeComputedPropertyPattern =
/\[\s*WORKFLOW_(?:SERIALIZE|DESERIALIZE)\s*\]/;

// Pattern to detect generated workflow route files that should be excluded
// These files are generated by the build process and should not be re-processed
export const generatedWorkflowPathPattern =
Expand DownExpand Up@@ -56,14 +62,16 @@ export function detectWorkflowPatterns(source: string): WorkflowPatternMatch {
const hasUseStep = useStepPattern.test(source);
const hasSerdeImport = workflowSerdeImportPattern.test(source);
const hasSerdeSymbol = workflowSerdeSymbolPattern.test(source);
const hasSerdeComputedProperty =
workflowSerdeComputedPropertyPattern.test(source);

return {
hasUseWorkflow,
hasUseStep,
hasSerdeImport,
hasSerdeSymbol,
hasDirective: hasUseWorkflow || hasUseStep,
hasSerde: hasSerdeImport || hasSerdeSymbol,
hasSerde: hasSerdeImport || hasSerdeSymbol || hasSerdeComputedProperty,
};
}

Expand DownExpand Up@@ -123,7 +131,8 @@ export function shouldTransformFile(
/**
* Combined regex pattern for turbopack content matching.
* Uses backreferences to ensure matching quote types.
* Matches: 'use workflow', 'use step', @workflow/serde imports, and Symbol.for serialization symbols
* Matches: 'use workflow', 'use step', @workflow/serde imports, Symbol.for serialization symbols,
* and WORKFLOW_SERIALIZE/WORKFLOW_DESERIALIZE computed property usage
*/
export const turbopackContentPattern =
/(use workflow|use step|from\s+(['"])@workflow\/serde\2|Symbol\.for\s*\(\s*(['"])workflow-(?:serialize|deserialize)\3\s*\))/;
/(use workflow|use step|from\s+(['"])@workflow\/serde\2|Symbol\.for\s*\(\s*(['"])workflow-(?:serialize|deserialize)\3\s*\)|\[\s*WORKFLOW_(?:SERIALIZE|DESERIALIZE)\s*\])/;
Loading