From e39569be17ddb0ad7ed2025e7ab32a4225637e56 Mon Sep 17 00:00:00 2001 From: Nitzan Uziely Date: Sun, 18 Aug 2019 13:51:09 +0300 Subject: [PATCH 1/3] added typescript --- package-lock.json | 12 ++++++++++++ package.json | 15 +++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 package-lock.json create mode 100644 package.json diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..58e5df3 --- /dev/null +++ b/package-lock.json @@ -0,0 +1,12 @@ +{ + "requires": true, + "lockfileVersion": 1, + "dependencies": { + "typescript": { + "version": "3.5.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.5.3.tgz", + "integrity": "sha512-ACzBtm/PhXBDId6a6sDJfroT2pOWt/oOnk4/dElG5G33ZL776N3Y6/6bKZJBFpd+b05F3Ct9qDjMeJmRWtE2/g==", + "dev": true + } + } +} diff --git a/package.json b/package.json new file mode 100644 index 0000000..89e5e3b --- /dev/null +++ b/package.json @@ -0,0 +1,15 @@ +{ + "name": "lesson02", + "version": "1.0.0", + "description": "lesson02 ========", + "main": "ArithmeticServer.js", + "dependencies": { + "typescript": "^3.5.3" + }, + "devDependencies": {}, + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + }, + "author": "Ilantc", + "license": "ISC" +} From b7fad5055ea966bc43fc52c00bac5a389a9a792d Mon Sep 17 00:00:00 2001 From: Nitzan Uziely Date: Sun, 18 Aug 2019 14:15:22 +0300 Subject: [PATCH 2/3] added types and fixed bug --- ArithmeticServer.js => ArithmeticServer.ts | 6 +++--- Fibo1.js => Fibo1.ts | 2 +- package-lock.json | 13 ++++++++++--- package.json | 6 ++++-- polyn.js => polyn.ts | 2 +- 5 files changed, 19 insertions(+), 10 deletions(-) rename ArithmeticServer.js => ArithmeticServer.ts (95%) rename Fibo1.js => Fibo1.ts (87%) rename polyn.js => polyn.ts (91%) diff --git a/ArithmeticServer.js b/ArithmeticServer.ts similarity index 95% rename from ArithmeticServer.js rename to ArithmeticServer.ts index 764039b..82d786e 100644 --- a/ArithmeticServer.js +++ b/ArithmeticServer.ts @@ -18,9 +18,9 @@ http.createServer(function (request, response) { ans = 'num must be used with fibonacci pathname!'; } else { - n = parseInt(queryData.num); + let n = parseInt(queryData.num); if (n < 0) { - ans = 'no fibonacci response for negative values, num =' + num; + ans = 'no fibonacci response for negative values, num =' + queryData.num; } else { ans = fibonaci(n); @@ -67,7 +67,7 @@ http.createServer(function (request, response) { console.log('running - listening on port ', port); -function fibonaci(n) { +function fibonaci(n:number) { if ((1 == n) || (0 == n) ) { return 1; } diff --git a/Fibo1.js b/Fibo1.ts similarity index 87% rename from Fibo1.js rename to Fibo1.ts index 6cba7e8..47a0676 100644 --- a/Fibo1.js +++ b/Fibo1.ts @@ -1,7 +1,7 @@ /** * Created by User on 3/17/14. */ -function fibonaci(n) { +function fibonaci(n:number) { if ((1 == n) || (0 == n) ) { return 1; } diff --git a/package-lock.json b/package-lock.json index 58e5df3..fe827cd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,19 @@ { - "requires": true, + "name": "lesson02", + "version": "1.0.0", "lockfileVersion": 1, + "requires": true, "dependencies": { + "@types/node": { + "version": "12.7.2", + "resolved": "https://registry.npmjs.org/@types/node/-/node-12.7.2.tgz", + "integrity": "sha512-dyYO+f6ihZEtNPDcWNR1fkoTDf3zAK3lAABDze3mz6POyIercH0lEUawUFXlG8xaQZmm1yEBON/4TsYv/laDYg==", + "dev": true + }, "typescript": { "version": "3.5.3", "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.5.3.tgz", - "integrity": "sha512-ACzBtm/PhXBDId6a6sDJfroT2pOWt/oOnk4/dElG5G33ZL776N3Y6/6bKZJBFpd+b05F3Ct9qDjMeJmRWtE2/g==", - "dev": true + "integrity": "sha512-ACzBtm/PhXBDId6a6sDJfroT2pOWt/oOnk4/dElG5G33ZL776N3Y6/6bKZJBFpd+b05F3Ct9qDjMeJmRWtE2/g==" } } } diff --git a/package.json b/package.json index 89e5e3b..fbaa976 100644 --- a/package.json +++ b/package.json @@ -6,10 +6,12 @@ "dependencies": { "typescript": "^3.5.3" }, - "devDependencies": {}, + "devDependencies": { + "@types/node": "^12.7.2" + }, "scripts": { "test": "echo \"Error: no test specified\" && exit 1" - }, + }, "author": "Ilantc", "license": "ISC" } diff --git a/polyn.js b/polyn.ts similarity index 91% rename from polyn.js rename to polyn.ts index 12e1d8a..8493a28 100644 --- a/polyn.js +++ b/polyn.ts @@ -1,7 +1,7 @@ /** * Created by User on 3/17/14. */ -function isPolyndrom(a) { +function isPolyndrom(a:string) { for(var i = 0, j =a.length-1 ; i < j ; i++,j--){ if (a.charAt(i) != a.charAt(j)) { return false; From 1ab59411243d82d82e9574362e3e1c5d726ce500 Mon Sep 17 00:00:00 2001 From: linkgoron Date: Sun, 18 Aug 2019 16:33:41 +0300 Subject: [PATCH 3/3] Update ArithmeticServer.ts --- ArithmeticServer.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ArithmeticServer.ts b/ArithmeticServer.ts index 82d786e..0ea4c17 100644 --- a/ArithmeticServer.ts +++ b/ArithmeticServer.ts @@ -18,7 +18,7 @@ http.createServer(function (request, response) { ans = 'num must be used with fibonacci pathname!'; } else { - let n = parseInt(queryData.num); + let n:number = parseInt(queryData.num); if (n < 0) { ans = 'no fibonacci response for negative values, num =' + queryData.num; } @@ -74,4 +74,4 @@ function fibonaci(n:number) { else { return (fibonaci(n-1) + fibonaci(n-2)); } -} \ No newline at end of file +}