amended previous commit

Author: mbrowne

samples/dci/js/TransferMoney/Account.js

@@ -4,11 +4,11 @@ var __dci_internal__ = require('typescript-dci/dci');
 var Account = Context.extend(function () {
 var __context = this;
 this.__$Ledgers = {        addEntry: function (message, amount) {
-            __context.__$Ledgers.push.call(__context.Ledgers, new LedgerEntry(message, amount));
+            __context.Ledgers.push(new LedgerEntry(message, amount));
         }
         ,getBalance: function () {
             var sum = 0;
-            __context.__$Ledgers.each.call(__context.Ledgers, function (ledgerEntry) {
+            __context.Ledgers.forEach(function (ledgerEntry) {
                 sum += ledgerEntry.amount;
             });
             return sum;

samples/dci/js/TransferMoney/Account.ts

@@ -31,7 +31,7 @@ var Account = Context.extend(function() {
 
 		getBalance() {
 			var sum = 0;
-			Ledgers.each(function(ledgerEntry) {
+			Ledgers.forEach(function(ledgerEntry) {
 				sum += ledgerEntry.amount;
 			});
 			return sum;

samples/dci/js/TransferMoney/TransferMoney.js

@@ -1,5 +1,4 @@
 var __dci_internal__ = require('typescript-dci/dci');
-var DCI = '../../DCI';
 
 
 /**
@@ -11,7 +10,7 @@ var DCI = '../../DCI';
 * @param {Account} destination
 * @param {number} amount
 */
-var TransferMoney = DCI.Context.extend(function () {
+var TransferMoney = Context.extend(function () {
 var __context = this;
 this.__$SourceAccount = {        transferOut: function () {
             __dci_internal__.callMethodOnSelf(__context, this, 'SourceAccount', 'withdraw');

samples/dci/js/TransferMoney/TransferMoney.ts

@@ -1,4 +1,7 @@
-import DCI = require('../../DCI');
+///<reference path='../../DCI.d.ts'/>
+
+//import DCI = require('../../DCI');
+
 export = TransferMoney;
 
 /**
@@ -10,7 +13,7 @@ export = TransferMoney;
  * @param {Account} destination
  * @param {number} amount
  */
-var TransferMoney = DCI.Context.extend(function() {
+var TransferMoney = Context.extend(function() {
 	this.bindRoles = function(sourceAcct, destinationAcct, amount) {
 		SourceAccount <- sourceAcct;
 		DestinationAccount <- destinationAcct;

samples/dci/js/TransferMoney/index.js

@@ -1,8 +1,11 @@
 var Account = require('./Account');
 var TransferMoney = require('./TransferMoney');
 
-var src = new Account(20);
-var dst = new Account(10);
+var src = new Account();
+src.increaseBalance(20);
+
+var dst = new Account();
+dst.increaseBalance(10);
 
 var ctx = new TransferMoney(src, dst, 10);
 

samples/dci/js/TransferMoney/index.ts

@@ -1,8 +1,11 @@
 import Account = require('./Account');
 import TransferMoney = require('./TransferMoney');
 
-var src = new Account(20);
-var dst = new Account(10);
+var src = new Account();
+src.increaseBalance(20);
+
+var dst = new Account();
+dst.increaseBalance(10);
 
 var ctx = new TransferMoney(src, dst, 10);
 

src/compiler/emitter.ts

@@ -599,27 +599,29 @@ module TypeScript {
 					if (this.thisRoleNode) {
 						if (this.thisRoleNode && operand1 instanceof ThisExpression) {
 							roleName = this.thisRoleNode.name.actualText;
-							isCallToRoleMethod = true;
 							isCallToSelf = true;
 						}
-						else {
-							roleName = operand1.actualText;
-							if (roleName in dciContext.roleDeclarations) {
-								isCallToRoleMethod = true;
-							}
-						}
 					}
-					else {
+
+					if (!isCallToSelf) {
 						roleName = operand1.actualText;
 						if (roleName in dciContext.roleDeclarations) {
-							isCallToRoleMethod = true;
+							//Check whether the method exists on the role - if not, it's a data object method, not a role method
+							var methodName = operand2.actualText;
+							var roleDecl: RoleDeclaration = dciContext.roleDeclarations[roleName];
+                            roleDecl.members.members.forEach(function(member) {
+                                if ((<FunctionDeclaration>member).name.actualText == methodName) {
+                                    isCallToRoleMethod = true;
+                                    return false; //exit loop
+                                }
+                            });
 						}
 					}
 				}
 			}
 
 			//DCI
-			if (isCallToRoleMethod) {
+			if (isCallToRoleMethod || isCallToSelf) {
 				//If the call is within a role and begins with `this.`
 				if (isCallToSelf) {
 					this.writeToOutput("__dci_internal__.callMethodOnSelf");

src/compiler/typecheck/pullTypeResolution.ts

@@ -4644,10 +4644,12 @@ module TypeScript {
 
 				if (!nameSymbol) {
 					//DCI TODO is it ok to be returning an ErrorTypeSymbol here?
+					//DCI TODO is there really no reliable way to check if it's a valid data object method at compile time?
+					//  TypeScript seems to check this ordinarily, for regular objects, at compile time....
 
 					//DCI
 					//Don't check whether or not the method exists, because it could be a data object method,
-					//and there's no way to check that at compile time without a role contract (data object interface), which we don't want to require
+					//and there's probably no way to check that at compile time without a role contract (data object interface), which we don't want to require
                     if (lhs.kind != PullElementKind.Role) {
                         context.postError(this.unitPath, dottedNameAST.operand2.minChar, dottedNameAST.operand2.getLength(), DiagnosticCode.The_property_0_does_not_exist_on_value_of_type_1, [(<Identifier>dottedNameAST.operand2).actualText, lhsType.toString(enclosingDecl ? enclosingDecl.getSymbol() : null)], enclosingDecl)
                     }