Merge commit

This commit is contained in:
atanasovg
2014-03-18 13:52:31 +02:00
16 changed files with 2333 additions and 18 deletions

View File

@ -1,5 +1,9 @@
import app_common_module = require("Application/application_common");
import console_module = require("Console/console_common");
var currentApp = app_common_module.tk.ui.Application.current;
declare var exports;
exports.tk = app_common_module.tk;
export module tk {
// TODO: This is tricky, we have a module named android down in the hierarchy and we need to declare it here
@ -96,6 +100,7 @@ export module tk {
currentApp.os = app_common_module.tk.TargetOS.Android;
currentApp.android = app;
app.init();
console = new console_module.tk.TKConsole();
}
class Application {

View File

@ -1,5 +1,31 @@
import app_common_module = require("Application/application_common");

/*
Current launch sequence for iOS looks like:
var app = require("Application/application");
app.tk.ui.Application.current.onLaunch = function() {
log("tk.ui.Application.current.onLaunch");
var myViewController = new MyViewController();
var navController = new UIKit.UINavigationController(myViewController);
return navController;
}
log("JavaScript loading started.");
app.tk.ui.ios.initApp(null);
log("JavaScript loading ended.");
log("JavaScript loading ended.");
*/
import app_common_module = require("Application/application_common");
import console_module = require("Console/console_common");
var currentApp = app_common_module.tk.ui.Application.current;
declare var exports;
exports.tk = app_common_module.tk;
export module tk {
export module ui {
@ -10,6 +36,7 @@ export module tk {
currentApp.os = app_common_module.tk.TargetOS.iOS;
currentApp.ios = app;
app.init();
console = new console_module.tk.TKConsole();
}
class Application {
@ -23,7 +50,7 @@ export module tk {
public init() {
UIKit.UIResponder.extends({/*TODO: Empty parameter here, needs API improvement*/}, {
name: "KimeraAppDelegate",
}).extends({
}).implements({
protocol: "UIApplicationDelegate",
implementation: {
applicationDidFinishLaunchingWithOptions: function () {
@ -33,10 +60,10 @@ export module tk {
this.window.setBackgroundColor(UIKit.UIColor.whiteColor());
var iosApp = <Application>currentApp.ios;
this.window.setRootViewController(iosApp.rootController);
//this.window.setRootViewController(iosApp.rootController);
if (currentApp.onLaunch) {
currentApp.onLaunch();
this.window.setRootViewController(currentApp.onLaunch());
} else {
log("Missing TK.UI.Application.current.onLaunch");
}

View File

@ -1,4 +1,5 @@
export module tk {

export module tk {
export enum TargetOS {
iOS,
Android,

View File

@ -137,9 +137,21 @@
<TypeScriptCompile Include="WebClient\web_client.d.ts" />
</ItemGroup>
<ItemGroup>
<Content Include="_references.ts" />
<TypeScriptCompile Include="Console\console.android.ts">
<DependentUpon>console.d.ts</DependentUpon>
</TypeScriptCompile>
<TypeScriptCompile Include="Console\console.d.ts" />
<TypeScriptCompile Include="Console\console.ios.ts">
<DependentUpon>console.d.ts</DependentUpon>
</TypeScriptCompile>
<TypeScriptCompile Include="Console\console_common.ts">
<DependentUpon>console.d.ts</DependentUpon>
</TypeScriptCompile>
<Content Include="Image\Readme.md" />
</ItemGroup>
<ItemGroup>
<TypeScriptCompile Include="libjs.d.ts" />
<Content Include="UserPreferences\Readme.md" />
</ItemGroup>
<ItemGroup>
@ -150,6 +162,7 @@
</ItemGroup>
<ItemGroup>
<Folder Include="Deploy\Eclipse\" />
<Content Include="Console\Readme.md" />
<Folder Include="Deploy\xCode\" />
</ItemGroup>
<PropertyGroup Condition="'$(Configuration)' == 'iOS'">
@ -193,4 +206,8 @@
<Target Name="AfterBuild">
<CopyForPlatformBuildTask TargetPlatform="$(Configuration)" Platforms="iOS;Android" InputFiles="@(GeneratedJavascript)" DestinationFolder="$(OutputPath)\$(Configuration)\" JSConfigFile="$(JSConfig)" />
</Target>
<PropertyGroup>
<PostBuildEvent>
</PostBuildEvent>
</PropertyGroup>
</Project>

19
Console/Readme.md Normal file
View File

@ -0,0 +1,19 @@
Sample code:
```
console.time('test');
console.log("this is a log test");
console.info("infoooo");
console.error("errorrrr");
console.log("test formatting: %.2f", 1.43234);
console.log("test", "more", "params");
console.assert((2 == 1), 'assertion failed:', 'error');
console.warn('calling trace');
console.trace();
console.dump(console);
console.timeEnd('test');
```

View File

@ -0,0 +1,27 @@
export module tk {
export class ConsoleHelper {
static TAG: string = 'JS';
static log(message: string): void {
android.util.Log.v(ConsoleHelper.TAG, message);
}
static info(message: string): void {
android.util.Log.i(ConsoleHelper.TAG, message);
}
static error(message: string): void {
android.util.Log.e(ConsoleHelper.TAG, message);
}
static warn(message: string): void {
android.util.Log.w(ConsoleHelper.TAG, message);
}
static timeMillis(): number {
// NOTE: we might need to use currentTimeMillis if we have troubles with the long size
return java.lang.System.nanoTime() / 1000000; // 1 ms = 1000000 ns
}
}
}

23
Console/console.d.ts vendored Normal file
View File

@ -0,0 +1,23 @@
export declare module tk {
export class TKConsole implements i.IConsole {
public time(reportName: string): void;
public timeEnd(reportName: string): void;
public assert(test: boolean, message: string, ...optionalParams: any[]): void;
public info(message: any, ...optionalParams: any[]): void;
public warn(message: any, ...optionalParams: any[]): void;
public error(message: any, ...optionalParams: any[]): void;
public log(message: any, ...optionalParams: any[]): void;
public trace(): void;
public dump(obj: any): void;
}
export class ConsoleHelper {
static log(message: string): void;
static info(message: string): void;
static error(message: string): void;
static warn(message: string): void;
static timeMillis(): number;
}
}

26
Console/console.ios.ts Normal file
View File

@ -0,0 +1,26 @@
export module tk {
export class ConsoleHelper {
// FIXME: we should use Foundation.NSLog() but it currently does not work
static log(message: string): void {
log('log: ' + message);
}
static info(message: string): void {
log('info: ' + message);
}
static error(message: string): void {
log('error: ' + message);
}
static warn(message: string): void {
log('warning: ' + message);
}
static timeMillis(): number {
return QuartzCore.CACurrentMediaTime() * 1000;
}
}
}

340
Console/console_common.ts Normal file
View File

@ -0,0 +1,340 @@
import native_module = require("Console/console");
export module tk {
export class TKConsole {
private _nativeClass: any;
private _timers: any;
constructor() {
this._nativeClass = native_module.tk.ConsoleHelper;
this._timers = {};
}
private sprintf(message: any) {
// discuss at: http://phpjs.org/functions/sprintf/
// original by: Ash Searle (http://hexmen.com/blog/)
// improved by: Michael White (http://getsprink.com)
// improved by: Jack
// improved by: Kevin van Zonneveld (http://kevin.vanzonneveld.net)
// improved by: Kevin van Zonneveld (http://kevin.vanzonneveld.net)
// improved by: Kevin van Zonneveld (http://kevin.vanzonneveld.net)
// improved by: Dj
// improved by: Allidylls
// input by: Paulo Freitas
// input by: Brett Zamir (http://brett-zamir.me)
// example 1: sprintf("%01.2f", 123.1);
// returns 1: 123.10
// example 2: sprintf("[%10s]", 'monkey');
// returns 2: '[ monkey]'
// example 3: sprintf("[%'#10s]", 'monkey');
// returns 3: '[####monkey]'
// example 4: sprintf("%d", 123456789012345);
// returns 4: '123456789012345'
// example 5: sprintf('%-03s', 'E');
// returns 5: 'E00'
var regex = /%%|%(\d+\$)?([-+\'#0 ]*)(\*\d+\$|\*|\d+)?(\.(\*\d+\$|\*|\d+))?([scboxXuideEfFgG])/g;
var a = arguments;
var i = 0;
var format = a[i++];
// pad()
var pad = function (str, len, chr, leftJustify) {
if (!chr) {
chr = ' ';
}
var padding = (str.length >= len) ? '' : new Array(1 + len - str.length >>> 0)
.join(chr);
return leftJustify ? str + padding : padding + str;
};
// justify()
var justify = function (value, prefix, leftJustify, minWidth, zeroPad, customPadChar?) {
var diff = minWidth - value.length;
if (diff > 0) {
if (leftJustify || !zeroPad) {
value = pad(value, minWidth, customPadChar, leftJustify);
} else {
value = value.slice(0, prefix.length) + pad('', diff, '0', true) + value.slice(prefix.length);
}
}
return value;
};
// formatBaseX()
var formatBaseX = function (value, base, prefix, leftJustify, minWidth, precision, zeroPad) {
// Note: casts negative numbers to positive ones
var number = value >>> 0;
prefix = prefix && number && {
'2': '0b',
'8': '0',
'16': '0x'
}[base] || '';
value = prefix + pad(number.toString(base), precision || 0, '0', false);
return justify(value, prefix, leftJustify, minWidth, zeroPad);
};
// formatString()
var formatString = function (value, leftJustify, minWidth, precision, zeroPad, customPadChar?) {
if (precision != null) {
value = value.slice(0, precision);
}
return justify(value, '', leftJustify, minWidth, zeroPad, customPadChar);
};
// doFormat()
var doFormat = function (substring, valueIndex, flags, minWidth, _, precision, type) {
var number, prefix, method, textTransform, value;
if (substring === '%%') {
return '%';
}
// parse flags
var leftJustify = false;
var positivePrefix = '';
var zeroPad = false;
var prefixBaseX = false;
var customPadChar = ' ';
var flagsl = flags.length;
for (var j = 0; flags && j < flagsl; j++) {
switch (flags.charAt(j)) {
case ' ':
positivePrefix = ' ';
break;
case '+':
positivePrefix = '+';
break;
case '-':
leftJustify = true;
break;
case "'":
customPadChar = flags.charAt(j + 1);
break;
case '0':
zeroPad = true;
customPadChar = '0';
break;
case '#':
prefixBaseX = true;
break;
}
}
// parameters may be null, undefined, empty-string or real valued
// we want to ignore null, undefined and empty-string values
if (!minWidth) {
minWidth = 0;
} else if (minWidth === '*') {
minWidth = +a[i++];
} else if (minWidth.charAt(0) == '*') {
minWidth = +a[minWidth.slice(1, -1)];
} else {
minWidth = +minWidth;
}
// Note: undocumented perl feature:
if (minWidth < 0) {
minWidth = -minWidth;
leftJustify = true;
}
if (!isFinite(minWidth)) {
throw new Error('sprintf: (minimum-)width must be finite');
}
if (!precision) {
precision = 'fFeE'.indexOf(type) > -1 ? 6 : (type === 'd') ? 0 : undefined;
} else if (precision === '*') {
precision = +a[i++];
} else if (precision.charAt(0) == '*') {
precision = +a[precision.slice(1, -1)];
} else {
precision = +precision;
}
// grab value using valueIndex if required?
value = valueIndex ? a[valueIndex.slice(0, -1)] : a[i++];
switch (type) {
case 's':
return formatString(String(value), leftJustify, minWidth, precision, zeroPad, customPadChar);
case 'c':
return formatString(String.fromCharCode(+value), leftJustify, minWidth, precision, zeroPad);
case 'b':
return formatBaseX(value, 2, prefixBaseX, leftJustify, minWidth, precision, zeroPad);
case 'o':
return formatBaseX(value, 8, prefixBaseX, leftJustify, minWidth, precision, zeroPad);
case 'x':
return formatBaseX(value, 16, prefixBaseX, leftJustify, minWidth, precision, zeroPad);
case 'X':
return formatBaseX(value, 16, prefixBaseX, leftJustify, minWidth, precision, zeroPad)
.toUpperCase();
case 'u':
return formatBaseX(value, 10, prefixBaseX, leftJustify, minWidth, precision, zeroPad);
case 'i':
case 'd':
number = +value || 0;
// Plain Math.round doesn't just truncate
number = Math.round(number - number % 1);
prefix = number < 0 ? '-' : positivePrefix;
value = prefix + pad(String(Math.abs(number)), precision, '0', false);
return justify(value, prefix, leftJustify, minWidth, zeroPad);
case 'e':
case 'E':
case 'f': // Should handle locales (as per setlocale)
case 'F':
case 'g':
case 'G':
number = +value;
prefix = number < 0 ? '-' : positivePrefix;
method = ['toExponential', 'toFixed', 'toPrecision']['efg'.indexOf(type.toLowerCase())];
textTransform = ['toString', 'toUpperCase']['eEfFgG'.indexOf(type) % 2];
value = prefix + Math.abs(number)[method](precision);
return justify(value, prefix, leftJustify, minWidth, zeroPad)[textTransform]();
default:
return substring;
}
};
return format.replace(regex, doFormat);
}
private formatParams(message: any): string {
if (arguments.length <= 1) {
return message ? message : '';
}
var res = this.sprintf.apply(this, arguments);
if (res === message) {
// we have more params but no format
var args = Array.prototype.slice.call(arguments);
return args.join(' ');
}
return res;
}
public time(reportName: string): void {
var name = reportName ? '__' + reportName : '__internal_console_time__';
if (('undefined' === typeof (this._timers[name])) || (this._timers.hasOwnProperty(name))) {
this._timers[name] = this._nativeClass.timeMillis();
}
else {
this.warn('invalid name for timer console.time(' + reportName + ')');
}
}
public timeEnd(reportName: string): void {
var name = reportName ? '__' + reportName : '__internal_console_time__';
if (this._timers.hasOwnProperty(name)) {
var val = this._timers[name];
if (val) {
var time = this._nativeClass.timeMillis();
this.info('console.time(' + reportName + '): %.6f ms', (time - val));
this._timers[name] = undefined;
}
else {
this.warn('undefined console.time(' + reportName + ')');
}
}
}
public assert(test: boolean, message: string, ...optionalParams: any[]): void {
if (!test) {
Array.prototype.shift.apply(arguments);
this._nativeClass.error(this.formatParams.apply(this, arguments));
// duplicating trace code here because android version shows only 2 frames and if we call trace()
// this would be assert() and trace() which leaves all important stack frames out of our view
//this._nativeClass.log('=== trace(): JS stack ===')
//if (i.TargetOS.Android == targetOS) {
// var e = <any>new Error('console.trace()');
// this.log(e.stack);
//}
//else if (i.TargetOS.iOS == targetOS) {
// var callstack = [];
// var currentFunction = arguments.callee.caller;
// while (currentFunction) {
// var fn = currentFunction.toString();
// var fname = fn.substring(fn.indexOf('function') + 8, fn.indexOf('{')).trim() || 'anonymous';
// if ('()' === fname) {
// fname = 'anonymous';
// }
// callstack.push(fname);
// currentFunction = currentFunction.caller;
// this.log(callstack.join('\n'));
// }
//}
}
}
public info(message: any, ...optionalParams: any[]): void {
this._nativeClass.info(this.formatParams.apply(this, arguments));
}
public warn(message: any, ...optionalParams: any[]): void {
this._nativeClass.warn(this.formatParams.apply(this, arguments));
}
public error(message: any, ...optionalParams: any[]): void {
this._nativeClass.error(this.formatParams.apply(this, arguments));
}
public log(message: any, ...optionalParams: any[]): void {
this._nativeClass.log(this.formatParams.apply(this, arguments));
}
public trace(): void {
// unsless we have a proper way to get the target OS this cannot be used
// currently this introduced a console <=> application cyclic dependency
//this._nativeClass.log('=== trace(): JS stack ===')
// if (i.TargetOS.Android == targetOS) {
// var e = <any>new Error('console.trace()');
// this.log(e.stack);
//}
//else if (i.TargetOS.iOS == targetOS) {
var callstack = [];
var currentFunction = arguments.callee.caller;
while (currentFunction) {
var fn = currentFunction.toString();
var fname = fn.substring(fn.indexOf('function') + 8, fn.indexOf('{')).trim() || 'anonymous';
if ('()' === fname) {
fname = 'anonymous';
}
callstack.push(fname);
currentFunction = currentFunction.caller;
this.log(callstack.join('\n'));
}
//}
}
public dump(obj: any): void {
if (null == obj) {
this.log("=== dump(): object is 'null' ===");
return;
}
if ("undefined" == typeof obj) {
this.log("=== dump(): object is 'undefined' ===");
return;
}
var result = ['=== dump(): dumping members ==='];
result.push(JSON.stringify(obj, null, 4));
result.push('=== dump(): dumping function names ===');
for (var id in obj) {
try {
if (typeof (obj[id]) == 'function') {
result.push(id + '()');
}
} catch (err) {
result.push(id + ': inaccessible');
}
}
result.push('=== dump(): finished ===');
this.log(result.join('\n'));
}
}
}

View File

@ -30,7 +30,7 @@
}
export class LocationChangeListener {
onLocationChange(location: Location);
//onLocationChange(location: Location);
}
export class RegionChangeListener {

View File

@ -31,8 +31,8 @@
// TODO: This might be implemented with a callback, no need of special type.
export class LocationChangeListener {
onLocationChange(location: Location) {
}
//onLocationChange(location: Location) {
//}
}
// TODO: This might be implemented with two callbacks, no need of special type.

3
_references.ts Normal file
View File

@ -0,0 +1,3 @@
///<reference no-default-lib="true"/>
///<reference path='libjs.d.ts' />
///<reference path='declarations.d.ts' />

View File

@ -108,6 +108,20 @@ declare module android {
static getExternalStorageDirectory(): java.io.File;
}
}
export module util {
export class Base64 {
static encodeToString(bytes: Array<any>, flags: number): string;
}
export class Log {
static v(tag: string, message: string): void;
static d(tag: string, message: string): void;
static w(tag: string, message: string): void;
static i(tag: string, message: string): void;
static e(tag: string, message: string): void;
}
}
}
declare module java {
@ -198,6 +212,10 @@ declare module java {
constructor(strNum: string);
floatValue(): any;
}
export class System {
static nanoTime(): number;
}
}
}
@ -297,15 +315,6 @@ declare module java {
}
}
declare module android {
export module util {
export class Base64 {
static encodeToString(bytes: Array<any>, flags: number): string;
}
}
}
declare module android {
export module widget {
export class ImageView {

19
declarations.d.ts vendored
View File

@ -6,4 +6,21 @@ declare function long(num: number): any;
declare function fail(data: any): void;
// TODO: Declaration for the missing asynchronous API
declare function runAsync(operation: () => any, onComplete?: () => any);
declare function runAsync(operation: () => any, onComplete?: () => any);
// those are interfaces for cases when user needs to have TS definitions for global variables
declare module i {
interface IConsole {
time(reportName: string): void;
timeEnd(reportName: string): void;
assert(test: boolean, message: string, ...optionalParams: any[]): void;
info(message: any, ...optionalParams: any[]): void;
warn(message: any, ...optionalParams: any[]): void;
error(message: any, ...optionalParams: any[]): void;
log(message: any, ...optionalParams: any[]): void;
trace(): void;
dump(obj: any): void;
}
}
declare var console: i.IConsole;

View File

@ -79,3 +79,7 @@ declare module Foundation {
static URLWithString(url : string): any;
}
}
declare module QuartzCore {
function CACurrentMediaTime(): number;
}

1797
libjs.d.ts vendored Normal file

File diff suppressed because it is too large Load Diff