Roles now outputting at top of function

Author: mbrowne

dci-doc/tmp--old-tips.txt

@@ -1,11 +1,9 @@
+var __dci_internal__ = require('typescript-dci/dci');
+
+
 function TransferMoney(sourceAcct, destinationAcct) {
 var __context = this;
-    //Role binding
-    __context.SourceAccount = sourceAcct;
-    __context.DestinationAccount = destinationAcct;
-    //Execute the use case
-    __context.__$SourceAccount.transferOut.call(__context.SourceAccount);
-    this.__$SourceAccount = {        transferOut: function () {
+this.__$SourceAccount = {        transferOut: function () {
             //TODO test calling role methods this way:
             //this['withdraw']();
             __dci_internal__.callMethodOnSelf(__context, this, 'SourceAccount', 'withdraw');
@@ -14,10 +12,19 @@ var __context = this;
         ,withdraw: function () {
             console.log('withdraw');
         }
-}
-    this.__$DestinationAccount = {        deposit: function () {
+};
+this.__$DestinationAccount = {        deposit: function () {
             console.log('deposit');
         }
-}
+};
+    //Role binding
+    __context.SourceAccount = sourceAcct;
+    __context.DestinationAccount = destinationAcct;
+    //Execute the use case
+    __context.__$SourceAccount.transferOut.call(__context.SourceAccount);
+
+
 }
 var ctx = TransferMoney({}, {});
+module.exports = TransferMoney;
+

samples/dci/test.js

@@ -1,3 +1,4 @@
+export = TransferMoney;
 
 function TransferMoney(sourceAcct, destinationAcct) {
 	//Role binding

samples/dci/test.ts

@@ -754,25 +754,38 @@ module TypeScript {
             this.writeLineToOutput(") {");
 
 			//DCI
+			funcDecl.isDCIContext = (Object.keys(funcDecl.roleDeclarations).length > 0);
+
+			if (funcDecl.isDCIContext) {
+				this.indenter.increaseIndent();
+				this.writeLineToOutput("var __context = this;");
+				//this.writeLineToOutput("__context.__rolePlayers = {};");
+				this.indenter.decreaseIndent();
+			}
+
+			//output the role methods
+			this.indenter.increaseIndent();
+			for (var roleName in funcDecl.roleDeclarations) {
+				funcDecl.roleDeclarations[roleName].emit(this);
+			}
+			this.indenter.decreaseIndent();
+
+			/*
 			var members = funcDecl.block.statements.members;
 			var member: AST;
+			this.indenter.increaseIndent();
 			for (var i=0; i < members.length; i++) {
 				member = members[i];
 				if (member instanceof RoleDeclaration) {
 					funcDecl.isDCIContext = true;
-					break;
+
+					//output the role methods
+					this.emitIndent();
+					member.emit(this);
 				}
 			}
-			
-			if (funcDecl.isDCIContext) {
-				this.indenter.increaseIndent();
-				this.writeLineToOutput("var __context = this;");
-				//this.writeLineToOutput("__context.__rolePlayers = {};");
-				this.indenter.decreaseIndent();
-			}
-			
-			//DCI TODO
-			//Roles should be output here, at the top of the function, not wherever they happen to have been declared in the source
+			this.indenter.decreaseIndent();
+			*/
 
             if (funcDecl.isConstructor) {
                 this.recordSourceMappingNameStart("constructor");
@@ -991,7 +1004,7 @@ module TypeScript {
 				//DCI
 				//Determine whether this module contains a DCI context
 				//
-				//DCI TODO Detect other types of context declarations; this only detects `var myContext = ...`
+				//DCI TODO Detect other types of context declarations; this only detects `var myContext = ...` or `function myContext(...`
 				//Also, should this search recursively?
 
 				var hasDCIContext = false;
@@ -1003,19 +1016,27 @@ module TypeScript {
 							if (initVal instanceof FunctionDeclaration) {
 								if (Object.keys((<FunctionDeclaration>initVal).roleDeclarations).length) {
 									hasDCIContext = true;
+									return false; //exit the loop
 								}
 							}
 							else if (initVal instanceof InvocationExpression) {
                         		(<InvocationExpression>initVal).arguments.members.forEach(function(arg) {
 									if (arg instanceof FunctionDeclaration) {
 										if (Object.keys((<FunctionDeclaration>arg).roleDeclarations).length) {
 											hasDCIContext = true;
+											return false; //exit the loop
 										}
 									}
                         		});
                         	}
 						});
 					}
+                    else if (member instanceof FunctionDeclaration) {
+                        if (Object.keys((<FunctionDeclaration>member).roleDeclarations).length) {
+                            hasDCIContext = true;
+                            return false; //exit the loop
+                        }
+                    }
 				});
 
                 // if the external module has an "export =" identifier, we'll
@@ -1915,7 +1936,11 @@ module TypeScript {
 
         // tokenId is the id the preceding token
         public emitJavascript(ast: AST, startLine: boolean) {
-            if (ast === null) {
+            //DCI
+            //Roles should be output at the top of functions, or on the prototype,
+            //not just wherever they happen to have been declared, so we don't ouptut them here
+            if (ast === null || ast instanceof RoleDeclaration) {
+            //if (ast === null) {
                 return;
             }
 
@@ -2111,7 +2136,7 @@ module TypeScript {
             this.emitRoleMembers(roleDecl);
 
 			this.indenter.decreaseIndent();
-			this.writeToOutput("}");
+			this.writeLineToOutput("};");
 
             this.recordSourceMappingEnd(roleDecl);
             this.emitComments(roleDecl, false);