ts2workflows 0.11.0 → 0.13.0

package/CHANGELOG.md

@@ -0,0 +1,117 @@
+# ts2workflows changelog
+
+## Version 0.13.0 - 2025-10-12
+
+Fixes:
+
+- function identifiers (e.g. in call_step and parallel) are included in the `--link` output
+- Improve type annotations of map.\* functions
+
+## Version 0.12.0 - 2025-08-30
+
+New features:
+
+- New command line option `--link` generates self-contained YAML files (all needed subworkflows in one file)
+- Accepts Typescript's `satisfies` expression and `debugger` statement. They do not affect the YAML output.
+
+Fixes:
+
+- Empty body in an `if` statements generated invalid code
+- In certain cases nested map literals generated invalid code
+- Some expressions with many extractable sub-expressions (map literals, blocking calls) generated invalid code because a temporary variable was re-used incorrectly
+- Empty statements are accepted at the top level
+- Ignore extra arguments in blocking function calls in all cases. Previously, extra arguments were ignored in some cases but threw errors in other cases.
+- Call expressions in optional chaining (`data?.getPerson()?.name`) now result in error. Previously, they were incorrectly treated as non-optional in the generated code.
+- Fixed code generation for an object rest element nested in an array pattern: `const [{...rest}] = data`
+
+## Version 0.11.0 - 2025-06-28
+
+Breaking changes:
+
+- Requires Node 20 or newer and Typescript 5.4.0 or newer
+- retry_policy() must be called inside a try block, not after
+- Variable declarations with `var` are not supported, only `let` and `const`
+- Step name numbering starts from 1 at the start of each subworkflow
+
+Fixes:
+
+- Type annotation fixes in workflowslib
+
+## Version 0.10.0 - 2025-04-28
+
+- Accept binary expressions as properties in assignments: `a[i + 4] = 1` (regression in 0.9.0)
+- Evaluate side-effects only once on the left-hand side in compound assignments: `x[f()] += 1`
+- Fix calling `call_step()` on the right-hand side of a compound assignment: `x += call_step(sum, {a: 10, b: 11})`
+- Output an error if a subworkflow is empty because empty body is not allowed on GCP
+
+## Version 0.9.0 - 2025-04-23
+
+Breaking changes:
+
+- `True`, `TRUE`, `False` and `FALSE` no longer are synonyms for `true` and `false`
+
+New features:
+
+- Array and object destructuring: `const [a, b] = getArray()`
+
+Fixes:
+
+- Fix a deployment error caused by the same temp variable name being used inside and outside of a parallel branch
+
+## Version 0.8.0 - 2025-03-03
+
+- Multiple input files can be given on the command line
+- Argument `--outdir` sets the output directory
+- Argument `--project` defines the TSConfig location for the source files
+- `--(no-)generated-file-comment`: optionally include a comment about the output file being generated
+- `--version` prints the correct version number
+- Accept instantiation expressions `func<TYPE>`
+
+## Version 0.7.0 - 2025-02-02
+
+- `typeof` operator
+- `null` is allowed as interpolated value in template literal `${null}`
+- Accept `undefined` as a function argument default argument: `func(a: number | undefined = undefined)`
+- Optional function arguments: `func(a?: number)`
+
+## Version 0.6.0 - 2025-01-09
+
+Breaking changes:
+
+- retry_policy() takes a plain policy function name instead of a {policy: ...} object
+
+Fixes:
+
+- The try statement supports a finally block
+- Support empty body in a catch block
+- retry_policy() parameter values can now be expressions in addition to number literals
+- 0, "", false and null can now be used as subworkflow parameter default values
+- Type annotation fixes
+
+## Version 0.5.0 - 2024-11-09
+
+- Move nested map expressions to assign steps where necessary
+- Array.isArray() is transformed correcly in nested expressions
+
+## Version 0.4.0 - 2024-11-05
+
+- Optional chaining a?.b is converted to map.get(a, "b")
+- Non-null assertions person!.name is accepted but ignored to the transpiler
+- Merge a next step to a preceeding assign step
+- Accept a single-statement body (body without braces {}) in if, while, etc
+- Assign the result of call_step() to a member variable: obj.property = call_step()
+- parallel() and retry_policy() special functions can only be used as statements
+- Better error messages on RegExp, BigInt, spread syntax and other non-supported Javascript features
+
+## Version 0.3.0 - 2024-10-19
+
+- Function invocations no longer generate invalid empty variable names
+- Include more utility types: ReturnType, Partial, Required, etc.
+- Type annotation fixes
+
+## Version 0.2.0 - 2024-10-09
+
+- Reduce cases where maps are needlessly split off into assign statements
+- Accept (but ignore) "declare function"
+- Implemented Array.isArray()
+- Fixes to type annotations

package/README.md

@@ -9,11 +9,9 @@ Only a subset of Typescript features are supported. The [language reference](lan
 
 See the [samples](samples) directory for code examples.
 
-Project status: It's possible to write Workflows programs, but the transpiler has not been extensively tested. Expect some rough edges!
-
 ## Installation
 
-```
+```sh
 npm install ts2workflows
 ```
 
@@ -31,12 +29,24 @@ Compile multiple files and write result to an output directory `workflowsfiles`.
 npx ts2workflows --project samples/tsconfig.json --outdir workflowsfiles samples/*.ts
 ```
 
+The `--link` argument generates YAML output that includes all necessary subworkflows (i.e. imported Typescript functions) in a single file. It will generate one output file for each input file.
+
+```sh
+npx ts2workflows --link --project samples/tsconfig.json --outdir workflowsfiles samples/sample*.ts
+```
+
 When developing ts2workflows, you can run the transpiler directly from the source directory:
 
 ```sh
 npx tsx src/cli.ts samples/sample1.ts
 ```
 
+### Command arguments
+
+- `--project`: Path to TSConfig for the Typescript sources files
+- `--link`: Emit a self-contained YAML. That is, the output includes code from the main input file and all subworkflows imported from the main file. Without this, emits only subworkflows in the input file. Requires --project.
+- `--[no-]generated-file-comment`: Start the output with a comment mentioning that the file has been generated by ts2workflows.
+
 ## Type checking workflow sources
 
 One benefit of writing the workflow programs in Typescript is that the sources can be type checked.
@@ -61,20 +71,20 @@ Type checking step is completely separate from the transpiling. The ts2workflows
 
 ### Build
 
-```
+```sh
 npm install
 npm run build
 ```
 
 ### Run unit tests
 
-```
+```sh
 npm run test
 ```
 
 Run tests and print the test coverage:
 
-```
+```sh
 npm run test-coverage
 ```
 
@@ -92,7 +102,7 @@ The main function implementing these phases is `transpile()` in [src/transpiler/
 
 The transpiler parses a Typescript source file using [@typescript-eslint/typescript-estree](https://www.npmjs.com/package/@typescript-eslint/typescript-estree) module by the [typescript-eslint](https://typescript-eslint.io/) project. The result of the parsing is an [ESTree](https://github.com/estree/estree/blob/master/README.md)-compatible abstract syntax tree (AST) of the source code. [typescript-eslint playgroud](https://typescript-eslint.io/play/) is an useful tool for exploring the Typescript parsing.
 
-Next, ts2workflows converts the AST to a custom intermediate representation (IR). The IR format brings the representation of the program closer the GCP Workflows language than Typescript code. The types for IR are defined in the [src/ast](src/ast) directory. Particularly, see [src/ast/steps.ts](src/ast/steps.ts) for Workflow step types and [src/ast/expressions.ts](src/ast/expressions.ts) for expression types.
+Next, ts2workflows converts the AST to a custom intermediate representation (IR). The IR format brings the representation of the program closer the GCP Workflows language than Typescript code. The types for IR are defined in the [src/ast](src/ast) directory. Particularly, see [src/ast/statements.ts](src/ast/statements.ts) for statement types and [src/ast/expressions.ts](src/ast/expressions.ts) for expression types.
 
 The transpiler applies a few transformations to the IR to make it a valid and optimized Workflows program. These transformations, for example, merge consecutive assignments into a single assign step and ensure that blocking function are invoked by call steps (as required by Workflows). The transformations are implemented in [src/transpiler/transformations.ts](src/transpiler/transformations.ts).
 

package/dist/ast/expressions.d.ts

@@ -1,66 +1,62 @@
 export type VariableName = string;
 export type BinaryOperator = '+' | '-' | '*' | '/' | '//' | '%' | '==' | '!=' | '>' | '>=' | '<' | '<=' | 'in' | 'and' | 'or';
 export type UnaryOperator = '-' | '+' | 'not';
-export type Primitive = null | string | number | boolean | (Primitive | Expression)[] | {
-    [key: string]: Primitive | Expression;
-};
 export type LiteralValueOrLiteralExpression = null | string | number | boolean | LiteralValueOrLiteralExpression[] | {
     [key: string]: LiteralValueOrLiteralExpression;
 };
-export type Expression = PrimitiveExpression | BinaryExpression | VariableReferenceExpression | FunctionInvocationExpression | MemberExpression | UnaryExpression;
-export declare class PrimitiveExpression {
-    readonly expressionType = "primitive";
-    readonly value: Primitive;
-    constructor(value: Primitive);
-    toString(): string;
+export type Expression = NullExpression | StringExpression | NumberExpression | BooleanExpression | ListExpression | MapExpression | BinaryExpression | VariableReferenceExpression | FunctionInvocationExpression | MemberExpression | UnaryExpression;
+interface ExpressionLiteral<V, Tag> {
+    readonly tag: Tag;
+    readonly value: V;
 }
-export declare const nullEx: PrimitiveExpression;
-export declare const trueEx: PrimitiveExpression;
-export declare const falseEx: PrimitiveExpression;
-export declare class BinaryExpression {
-    readonly expressionType = "binary";
+export type NullExpression = ExpressionLiteral<null, 'null'>;
+export type StringExpression = ExpressionLiteral<string, 'string'>;
+export type NumberExpression = ExpressionLiteral<number, 'number'>;
+export type BooleanExpression = ExpressionLiteral<boolean, 'boolean'>;
+export type ListExpression = ExpressionLiteral<Expression[], 'list'>;
+export type MapExpression = ExpressionLiteral<Record<string, Expression>, 'map'>;
+export declare const nullEx: NullExpression;
+export declare function stringEx(value: string): StringExpression;
+export declare function numberEx(value: number): NumberExpression;
+export declare function booleanEx(value: boolean): BooleanExpression;
+export declare const trueEx: BooleanExpression;
+export declare const falseEx: BooleanExpression;
+export declare function listEx(value: Expression[]): ListExpression;
+export declare function mapEx(value: Record<string, Expression>): MapExpression;
+export interface BinaryExpression {
+    readonly tag: 'binary';
     readonly binaryOperator: BinaryOperator;
     readonly left: Expression;
     readonly right: Expression;
-    constructor(left: Expression, binaryOperator: BinaryOperator, right: Expression);
-    toString(): string;
 }
-export declare class VariableReferenceExpression {
-    readonly expressionType = "variableReference";
+export declare function binaryEx(left: Expression, binaryOperator: BinaryOperator, right: Expression): BinaryExpression;
+export interface VariableReferenceExpression {
+    readonly tag: 'variableReference';
     readonly variableName: VariableName;
-    constructor(variableName: VariableName);
-    toString(): string;
 }
-export declare class FunctionInvocationExpression {
-    readonly expressionType = "functionInvocation";
+export declare function variableReferenceEx(variableName: VariableName): VariableReferenceExpression;
+export interface FunctionInvocationExpression {
+    readonly tag: 'functionInvocation';
     readonly functionName: string;
     readonly arguments: Expression[];
-    constructor(functionName: string, argumentExpressions: Expression[]);
-    toString(): string;
 }
-export declare class MemberExpression {
-    readonly expressionType = "member";
+export declare function functionInvocationEx(functionName: string, argumentExpressions: Expression[]): FunctionInvocationExpression;
+export interface MemberExpression {
+    readonly tag: 'member';
     readonly object: Expression;
     readonly property: Expression;
     readonly computed: boolean;
-    constructor(object: Expression, property: Expression, computed: boolean);
-    toString(): string;
 }
-export declare class UnaryExpression {
-    readonly expressionType = "unary";
+export declare function memberEx(object: Expression, property: Expression, computed: boolean): MemberExpression;
+export interface UnaryExpression {
+    readonly tag: 'unary';
     readonly operator: UnaryOperator;
     readonly value: Expression;
-    constructor(operator: UnaryOperator, value: Expression);
-    toString(): string;
 }
-export declare function isExpression(val: Primitive | Expression): val is Expression;
-export declare function asExpression(x: Primitive | Expression): Expression;
-export declare function safeAsExpression(x: Primitive | Expression | undefined): Expression | undefined;
+export declare function unaryEx(operator: UnaryOperator, value: Expression): UnaryExpression;
+export declare function expressionToString(ex: Expression): string;
 export declare function expressionToLiteralValueOrLiteralExpression(ex: Expression): LiteralValueOrLiteralExpression;
-export declare function isLiteral(ex: Expression): boolean;
-export declare function isFullyQualifiedName(ex: Expression): boolean;
-/**
- * Returns true if ex is pure expression (can't have side-effects)
- */
-export declare function isPure(ex: Expression): boolean;
+export declare function isQualifiedName(ex: Expression): boolean;
+export declare function isPrimitive(ex: Expression): ex is StringExpression | NumberExpression | BooleanExpression | NullExpression;
+export {};
 //# sourceMappingURL=expressions.d.ts.map

package/dist/ast/expressions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"expressions.d.ts","sourceRoot":"","sources":["../../src/ast/expressions.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"expressions.d.ts","sourceRoot":"","sources":["../../src/ast/expressions.ts"],"names":[],"mappings":"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"}