TSL Transpiler: Introduce Linker and improvements (#1717)

* TSL Transpiler: Introduce Linker and improvements

* Update

* Update three.js

Author: Methuselah96

three.js

@@ -1,9 +1,17 @@
+export class Comment {
+    constructor(comment: string);
+
+    comment: string;
+
+    readonly isComment: true;
+}
+
 export class Program {
-    constructor();
+    constructor(body?: Statement[]);
 
     body: Statement[];
 
-    isProgram: true;
+    readonly isProgram: true;
 }
 
 // Boolean seems to be handled as a Unary
@@ -23,11 +31,16 @@ export type Statement =
     | FunctionCall
     | Return
     | Discard
+    | Continue
+    | Break
     | Accessor
     | StaticElement
     | DynamicElement
     | AccessorElements
     | For
+    | While
+    | Switch
+    | SwitchCase
     | null;
 
 export class VariableDeclaration {
@@ -46,7 +59,7 @@ export class VariableDeclaration {
 
     immutable: boolean;
 
-    isVariableDeclaration: true;
+    readonly isVariableDeclaration: true;
 }
 
 export class Uniform {
@@ -55,7 +68,7 @@ export class Uniform {
     type: string;
     name: string;
 
-    isUniform: true;
+    readonly isUniform: true;
 }
 
 export class Varying {
@@ -64,7 +77,7 @@ export class Varying {
     type: string;
     name: string;
 
-    isVarying: true;
+    readonly isVarying: true;
 }
 
 export class FunctionParameter {
@@ -75,26 +88,26 @@ export class FunctionParameter {
     qualifier: string | null;
     immutable: boolean;
 
-    isFunctionParameter: true;
+    readonly isFunctionParameter: true;
 }
 
 export class FunctionDeclaration {
-    constructor(type: string, name: string, params?: FunctionParameter[]);
+    constructor(type: string, name: string, params?: FunctionParameter[], body?: Statement[]);
 
     type: string;
     name: string;
     params: FunctionParameter[];
     body: Statement[];
 
-    isFunctionDeclaration: true;
+    readonly isFunctionDeclaration: true;
 }
 
 export class Expression {
     constructor(expression: string);
 
     expression: string;
 
-    isExpression: true;
+    readonly isExpression: true;
 }
 
 export class Ternary {
@@ -104,7 +117,7 @@ export class Ternary {
     left: Statement;
     right: Statement;
 
-    isTernary: true;
+    readonly isTernary: true;
 }
 
 export class Operator {
@@ -114,7 +127,7 @@ export class Operator {
     left: Statement;
     right: Statement;
 
-    isOperator: true;
+    readonly isOperator: true;
 }
 
 export class Unary {
@@ -124,7 +137,7 @@ export class Unary {
     expression: Statement;
     after: boolean;
 
-    isUnary: true;
+    readonly isUnary: true;
 }
 
 export class Number {
@@ -133,26 +146,25 @@ export class Number {
     type: string;
     value: string;
 
-    isNumber: true;
+    readonly isNumber: true;
 }
 
 export class String {
     constructor(value: string);
 
     value: string;
 
-    isString: true;
+    readonly isString: true;
 }
 
 export class Conditional {
-    constructor(cond?: Conditional | null);
+    constructor(cond?: Conditional | null, body?: Statement[]);
 
     cond: Conditional | null;
-
     body: Statement[];
     elseConditional: Conditional | null;
 
-    isConditional: true;
+    readonly isConditional: true;
 }
 
 export class FunctionCall {
@@ -161,57 +173,57 @@ export class FunctionCall {
     name: string;
     params: Statement[];
 
-    isFunctionCall: true;
+    readonly isFunctionCall: true;
 }
 
 export class Return {
     constructor(value: Statement);
 
     value: Statement;
 
-    isReturn: true;
+    readonly isReturn: true;
 }
 
 export class Discard {
     constructor();
 
-    isDiscard: true;
+    readonly isDiscard: true;
 }
 
 export class Continue {
     constructor();
 
-    isContinue: true;
+    readonly isContinue: true;
 }
 
 export class Break {
     constructor();
 
-    isBreak: true;
+    readonly isBreak: true;
 }
 
 export class Accessor {
     constructor(property: string);
 
     property: string;
 
-    isAccessor: true;
+    readonly isAccessor: true;
 }
 
 export class StaticElement {
     constructor(value: Statement);
 
     value: Statement;
 
-    isStaticElement: true;
+    readonly isStaticElement: true;
 }
 
 export class DynamicElement {
     constructor(value: Statement);
 
     value: Statement;
 
-    isDynamicElement: true;
+    readonly isDynamicElement: true;
 }
 
 export class AccessorElements {
@@ -220,40 +232,44 @@ export class AccessorElements {
     object: FunctionCall | Accessor;
     elements: (StaticElement | DynamicElement)[];
 
-    isAccessorElements: true;
+    readonly isAccessorElements: true;
 }
 
 export class For {
-    constructor(initialization: Statement, condition: Statement, afterthought: Statement);
+    constructor(initialization: Statement, condition: Statement, afterthought: Statement, body?: Statement[]);
 
     initialization: Statement;
     condition: Statement;
     afterthought: Statement;
-
     body: Statement[];
 
-    isFor: true;
+    readonly isFor: true;
 }
 
-export class Switch {
-    constructor(discriminant: Statement);
+export class While {
+    constructor(condition: Statement, body?: Statement[]);
 
+    condition: Statement;
     body: Statement[];
 
+    readonly isWhile: true;
+}
+
+export class Switch {
+    constructor(discriminant: Statement, cases: Statement[]);
+
     discriminant: Statement;
-    case: Statement | null;
-    isSwitch: true;
+    cases: Statement[];
+
+    readonly isSwitch: true;
 }
 
 export class SwitchCase {
-    constructor(caseCondition: Statement);
-
-    caseCondition: Statement;
+    constructor(body: Statement, conditions?: Statement[] | null);
 
     body: Statement[];
-
-    nextCase: SwitchCase | null;
+    conditions: Statement[];
 
     isDefault: boolean;
-    isSwitchCase: true;
+    readonly isSwitchCase: true;
 }

types/three/examples/jsm/transpiler/AST.d.ts

@@ -1,4 +1,5 @@
 import {
+    Comment,
     Conditional,
     Expression,
     For,
@@ -10,6 +11,7 @@ import {
     Uniform,
     VariableDeclaration,
     Varying,
+    While,
 } from "./AST.js";
 
 export default class TSLEncoder {
@@ -25,19 +27,21 @@ export default class TSLEncoder {
 
     addImport(name: string): void;
     emitUniform(node: Uniform): string;
-    emitExpression(node: Expression): string;
+    emitExpression(node: Expression, output?: string | null): string;
     emitBody(body: Statement[]): string;
     emitTernary(node: Ternary): string;
     emitConditional(node: Conditional): string;
     emitLoop(node: For): string;
     emitSwitch(switchNode: Switch): string;
     emitFor(node: For): string;
     emitForWhile(node: For): string;
+    emitWhile(node: While): string;
     emitVariables(node: VariableDeclaration, isRoot?: boolean): string;
     emitVarying(node: Varying): string;
     emitOverloadingFunction(nodes: FunctionDeclaration[]): string;
     emitFunction(node: FunctionDeclaration): string;
     setLastStatement(statement: Statement | null): void;
-    emitExtraLine(statement: Statement): string;
+    emitComment(statement: Comment, body: Statement[]): string;
+    emitExtraLine(statement: Statement, body: Statement[]): string;
     emit(ast: Program): string;
 }