resin 0.2.1 → 0.2.2

data/amber/st/Kernel-Objects.st

@@ -1,7 +1,7 @@
 Smalltalk current createPackage: 'Kernel-Objects' properties: #{}!
 nil subclass: #Object
 	instanceVariableNames: ''
-	category: 'Kernel-Objects'!
+	package: 'Kernel-Objects'!
 !Object commentStamp!
 *Object is the root of the Smalltalk class system*. All classes in the system are subclasses of Object.
 
@@ -41,16 +41,30 @@ Objects understand equality  `#=` and identity `#==` comparison.
 
 !Object methodsFor: 'accessing'!
 
-yourself
-	^self
+basicAt: aString
+	<return self[aString]>
+!
+
+basicAt: aString put: anObject
+	<return self[aString] = anObject>
+!
+
+basicDelete: aString
+    <delete self[aString]; return aString>
 !
 
 class
 	<return self.klass>
 !
 
-size
-	self error: 'Object not indexable'
+identityHash
+	<
+	var hash=self.identityHash;
+	if (hash) return hash;
+	hash=smalltalk.nextId();
+	Object.defineProperty(self, 'identityHash', {value:hash});
+	return hash;
+	>
 !
 
 instVarAt: aSymbol
@@ -65,20 +79,12 @@ instVarAt: aSymbol put: anObject
 	<self['@' + varname] = anObject>
 !
 
-basicAt: aString
-	<return self[aString]>
-!
-
-basicAt: aString put: anObject
-	<return self[aString] = anObject>
-!
-
-basicDelete: aString
-    <delete self[aString]; return aString>
+size
+	self error: 'Object not indexable'
 !
 
-identityHash
-	<return self.identityHash || (self.identityHash = smalltalk.nextId());>
+yourself
+	^self
 ! !
 
 !Object methodsFor: 'comparing'!
@@ -87,14 +93,14 @@ identityHash
 	^self == anObject
 !
 
-~= anObject
-	^(self = anObject) = false
-!
-
 == anObject
 	^self identityHash = anObject identityHash
 !
 
+~= anObject
+	^(self = anObject) = false
+!
+
 ~~ anObject
 	^(self == anObject) = false
 ! !
@@ -105,14 +111,6 @@ identityHash
 	^Association key: self value: anObject
 !
 
-asString
-	^self printString
-!
-
-asJavascript
-	^self asString
-!
-
 asJSON
 	| variables |
 	variables := HashedCollection new.
@@ -123,6 +121,14 @@ asJSON
 
 asJSONString
 	^JSON stringify: self asJSON
+!
+
+asJavascript
+	^self asString
+!
+
+asString
+	^self printString
 ! !
 
 !Object methodsFor: 'copying'!
@@ -131,50 +137,40 @@ copy
 	^self shallowCopy postCopy
 !
 
-shallowCopy
-	<
+deepCopy
+	<    
 	    var copy = self.klass._new();
 	    for(var i in self) {
 		if(/^@.+/.test(i)) {
-		    copy[i] = self[i];
+		    copy[i] = self[i]._deepCopy();
 		}
 	    }
 	    return copy;
 	>
 !
 
-deepCopy
-	<    
+postCopy
+!
+
+shallowCopy
+	<
 	    var copy = self.klass._new();
 	    for(var i in self) {
 		if(/^@.+/.test(i)) {
-		    copy[i] = self[i]._deepCopy();
+		    copy[i] = self[i];
 		}
 	    }
 	    return copy;
 	>
-!
-
-postCopy
 ! !
 
 !Object methodsFor: 'error handling'!
 
-error: aString
-	Error signal: aString
-!
-
-subclassResponsibility
-	self error: 'This method is a responsibility of a subclass'
-!
-
-shouldNotImplement
-	self error: 'This method should not be implemented in ', self class name
-!
-
-try: aBlock catch: anotherBlock
-	<try{result = aBlock()} catch(e) {result = anotherBlock(e)};
-	return result;>
+deprecatedAPI
+	"Just a simple way to deprecate methods.
+	#deprecatedAPI is in the 'error handling' protocol even if it doesn't throw an error,
+	but it could in the future."
+	console warn: thisContext home asString, ' is deprecated!! (in ', thisContext home home asString, ')'
 !
 
 doesNotUnderstand: aMessage
@@ -184,15 +180,25 @@ doesNotUnderstand: aMessage
 		signal
 !
 
+error: aString
+	Error signal: aString
+!
+
 halt
 	self error: 'Halt encountered'
 !
 
-deprecatedAPI
-	"Just a simple way to deprecate methods.
-	#deprecatedAPI is in the 'error handling' protocol even if it doesn't throw an error,
-	but it could in the future."
-	console warn: thisContext home asString, ' is deprecated!! (in ', thisContext home home asString, ')'
+shouldNotImplement
+	self error: 'This method should not be implemented in ', self class name
+!
+
+subclassResponsibility
+	self error: 'This method is a responsibility of a subclass'
+!
+
+try: aBlock catch: anotherBlock
+	<try{result = aBlock()} catch(e) {result = anotherBlock(e)};
+	return result;>
 ! !
 
 !Object methodsFor: 'initialization'!
@@ -202,37 +208,43 @@ initialize
 
 !Object methodsFor: 'message handling'!
 
-perform: aSymbol
-	^self perform: aSymbol withArguments: #()
-!
-
-perform: aSymbol withArguments: aCollection
-	^self basicPerform: aSymbol asSelector withArguments: aCollection
-!
-
 basicPerform: aSymbol 
 	^self basicPerform: aSymbol withArguments: #()
 !
 
 basicPerform: aSymbol withArguments: aCollection
 	<return self[aSymbol].apply(self, aCollection);>
+!
+
+perform: aSymbol
+	^self perform: aSymbol withArguments: #()
+!
+
+perform: aSymbol withArguments: aCollection
+	| selector |
+	selector := aSymbol asSelector.
+	<return smalltalk.send(self, selector, aCollection)>
 ! !
 
 !Object methodsFor: 'printing'!
 
-printString
-	^'a ', self class name
+log: aString block: aBlock
+
+	| result |
+	console log:  aString,  ' time: ', (Date millisecondsToRun: [result := aBlock value]) printString.
+	^result
 !
 
 printNl
 	<console.log(self)>
 !
 
-log: aString block: aBlock
+printString
+	^'a ', self class name
+!
 
-	| result |
-	console log:  aString,  ' time: ', (Date millisecondsToRun: [result := aBlock value]) printString.
-	^result
+storeOn: aStream
+	aStream nextPutAll: self printString
 !
 
 storeString
@@ -240,24 +252,10 @@ storeString
 	can be reconstructed."
 
 	^ String streamContents: [:s | self storeOn: s]
-!
-
-storeOn: aStream
-	aStream nextPutAll: self printString
 ! !
 
 !Object methodsFor: 'testing'!
 
-isKindOf: aClass
-	^(self isMemberOf: aClass)
-	    ifTrue: [true]
-	    ifFalse: [self class inheritsFrom: aClass]
-!
-
-isMemberOf: aClass
-	^self class = aClass
-!
-
 ifNil: aBlock
 	"inlined in the Compiler"
 	^self
@@ -278,27 +276,29 @@ ifNotNil: aBlock ifNil: anotherBlock
 	^aBlock value
 !
 
-isNil
+isClass
 	^false
 !
 
-notNil
-	^self isNil not
+isKindOf: aClass
+	^(self isMemberOf: aClass)
+	    ifTrue: [true]
+	    ifFalse: [self class inheritsFrom: aClass]
 !
 
-isClass
-	^false
+isMemberOf: aClass
+	^self class = aClass
 !
 
 isMetaclass
 	^false
 !
 
-isNumber
+isNil
 	^false
 !
 
-isString
+isNumber
 	^false
 !
 
@@ -306,8 +306,20 @@ isParseFailure
 	^false
 !
 
+isString
+	^false
+!
+
 isSymbol
 	^false
+!
+
+notNil
+	^self isNil not
+!
+
+respondsTo: aSelector
+	^self class canUnderstand: aSelector
 ! !
 
 !Object class methodsFor: 'initialization'!
@@ -316,358 +328,383 @@ initialize
 	"no op"
 ! !
 
-Object subclass: #Smalltalk
+Object subclass: #Boolean
 	instanceVariableNames: ''
-	category: 'Kernel-Objects'!
-!Smalltalk commentStamp!
-Smalltalk has only one instance, accessed with `Smalltalk current`. 
-It represents the global JavaScript variable `smalltalk` declared in `js/boot.js`.
-
-The `smalltalk` object holds all class and packages defined in the system.
-
-## Classes
-
-Classes can be accessed using the following methods:
-
-- `#classes` answers the full list of Smalltalk classes in the system
-- `#at:` answers a specific class of `nil`
-
-## Packages
+	package: 'Kernel-Objects'!
+!Boolean commentStamp!
+Boolean wraps the JavaScript `Boolean()` constructor. The `true` and `false` objects are the JavaScript boolean objects.
 
-Packages can be accessed using the following methods:
+Boolean defines the protocol for logic testing operations and conditional control structures for the logical values.
+Boolean instances are weither `true` or `false`.!
 
-- `#packages` answers the full list of packages
-- `#packageAt:` answers a specific class of `nil`
+!Boolean methodsFor: 'comparing'!
 
-__note:__ classes and packages are accessed using strings, not symbols
+= aBoolean
+	aBoolean class = self class ifFalse: [^false].
+	<return Boolean(self == true) == aBoolean>
+!
 
-## Parsing
+== aBoolean
+	^self = aBoolean
+! !
 
-The `#parse:` method is used to parse Smalltalk source code. 
-It requires the `Compiler` package and the `js/parser.js` parser file in order to work!
+!Boolean methodsFor: 'controlling'!
 
-!Smalltalk methodsFor: 'accessing'!
+& aBoolean
+	<
+	    if(self == true) {
+		return aBoolean;
+	    } else {
+		return false;
+	    }
+	>
+!
 
-classes
-	<return self.classes()>
+and: aBlock
+	^self = true
+	    ifTrue: aBlock
+	    ifFalse: [false]
 !
 
-at: aString
-	<return self[aString]>
+ifFalse: aBlock
+	"inlined in the Compiler"
+	^self ifTrue: [] ifFalse: aBlock
 !
 
-basicParse: aString
-	<return smalltalk.parser.parse(aString)>
+ifFalse: aBlock ifTrue: anotherBlock
+	"inlined in the Compiler"
+	^self ifTrue: anotherBlock ifFalse: aBlock
 !
 
-parse: aString
-	| result | 
-	self try: [result := self basicParse: aString] catch: [:ex | (self parseError: ex parsing: aString) signal].
-	^result
+ifTrue: aBlock
+	"inlined in the Compiler"
+	^self ifTrue: aBlock ifFalse: []
 !
 
-parseError: anException parsing: aString
-	| row col message lines badLine code |
-	<row = anException.line;
-	col = anException.column;
-	message = anException.message;>.
-	lines := aString lines.
-	badLine := lines at: row.
-	badLine := (badLine copyFrom: 1 to: col - 1), ' ===>', (badLine copyFrom:  col to: badLine size).
-	lines at: row put: badLine.
-	code := String streamContents: [:s |
-                  lines withIndexDo: [:l :i |
-                     s nextPutAll: i asString, ': ', l, String lf]].
-	^ Error new messageText: ('Parse error on line ' , row , ' column ' , col , ' : ' , message , ' Below is code with line numbers and ===> marker inserted:' , String lf, code)
+ifTrue: aBlock ifFalse: anotherBlock
+	"inlined in the Compiler"
+	<
+	    if(self == true) {
+		return aBlock();
+	    } else {
+		return anotherBlock();
+	    }
+	>
 !
 
-reservedWords
-	"JavaScript reserved words"
-	<return self.reservedWords>
+not
+	^self = false
 !
 
-readJSObject: anObject
-	<return self.readJSObject(anObject)>
+or: aBlock
+	^self = true
+	    ifTrue: [true]
+	    ifFalse: aBlock
 !
 
-send: aSelector to: anObject arguments: aCollection
-	| selector |
-	selector := aSelector asString asSelector.
-	<self.send(anObject, selector, aCollection)>
+| aBoolean
+	<
+	    if(self == true) {
+		return true;
+	    } else {
+		return aBoolean;
+	    }
+	>
 ! !
 
-!Smalltalk methodsFor: 'classes'!
+!Boolean methodsFor: 'converting'!
 
-removeClass: aClass
-	aClass isMetaclass ifTrue: [self error: aClass asString, ' is a Metaclass and cannot be removed!!'].
-	aClass methodDictionary values do: [:each |
-		aClass removeCompiledMethod: each].
-	aClass class methodDictionary values do: [:each |
-		aClass class removeCompiledMethod: each].
-	self basicDelete: aClass name
+asJSON
+	^self
 ! !
 
-!Smalltalk methodsFor: 'packages'!
-
-packages
-	"Return all Package instances in the system."
-
-	<return self.packages.all()>
-!
-
-packageAt: packageName
-       <return self.packages[packageName]>
-!
+!Boolean methodsFor: 'copying'!
 
-packageAt: packageName ifAbsent: aBlock
-       ^(self packageAt: packageName) ifNil: aBlock
+deepCopy
+	^self
 !
 
-removePackage: packageName
-	"Removes a package and all its classes."
-
-	| pkg |
-	pkg := self packageAt: packageName ifAbsent: [self error: 'Missing package: ', packageName].
-	pkg classes do: [:each |
-        	self removeClass: each].
-	self deletePackage: packageName
-!
+shallowCopy
+	^self
+! !
 
-renamePackage: packageName to: newName
-	"Rename a package."
+!Boolean methodsFor: 'printing'!
 
-	| pkg |
-	pkg := self packageAt: packageName ifAbsent: [self error: 'Missing package: ', packageName].
-	(self packageAt: newName) ifNotNil: [self error: 'Already exists a package called: ', newName].
-	<smalltalk.packages[newName] = smalltalk.packages[packageName]>.
-	pkg name: newName.
-	self deletePackage: packageName.
+printString
+	<return self.toString()>
 ! !
 
-!Smalltalk methodsFor: 'private'!
-
-createPackage: packageName
-	"Create and bind a new package with given name and return it."
+Object subclass: #Date
+	instanceVariableNames: ''
+	package: 'Kernel-Objects'!
+!Date commentStamp!
+The Date class is used to work with dates and times. Therefore `Date today` and `Date now` are both valid in
+Amber and answer the same date object.
 
-      <return smalltalk.addPackage(packageName, nil)>
-!
+Date wraps the `Date()` JavaScript constructor, and Smalltalk date objects are JavaScript date objects.!
 
-deletePackage: packageName
-	"Deletes a package by deleting its binding, but does not check if it contains classes etc.
-	To remove a package, use #removePackage instead."
+!Date methodsFor: 'accessing'!
 
-       <delete smalltalk.packages[packageName]>
+day
+	^self dayOfWeek
 !
 
-createPackage: packageName properties: aDict
-	"Create and bind a new package with given name and return it."
-
-	| object |
-	<object = {};>.
-	aDict keysAndValuesDo: [:key :value |
-		<object[key] = value>.
-	].
-       <return smalltalk.addPackage(packageName, object)>
-! !
-
-Smalltalk class instanceVariableNames: 'current'!
-
-!Smalltalk class methodsFor: 'accessing'!
-
-current
-	<return smalltalk>
-! !
-
-Object subclass: #Package
-	instanceVariableNames: 'commitPathJs commitPathSt'
-	category: 'Kernel-Objects'!
-!Package commentStamp!
-A Package is similar to a "class category" typically found in other Smalltalks like Pharo or Squeak. Amber does not have class categories anymore, it had in the beginning but now each class in the system knows which package it belongs to.
+day: aNumber
+	self dayOfWeek: aNumber
+!
 
-A Package has a name, an Array of "requires", a comment and a Dictionary with other optional key value attributes. A Package can also be queried for its classes, but it will then resort to a reverse scan of all classes to find them.
-Packages are manipulated through "Smalltalk current", like for example finding one based on a name:
+dayOfMonth
+	<return self.getDate()>
+!
 
-	Smalltalk current packageAt: 'Kernel'
+dayOfMonth: aNumber
+	<self.setDate(aNumber)>
+!
 
-...but you can also use:
+dayOfWeek
+	<return self.getDay() + 1>
+!
 
-	Package named: 'Kernel'
+dayOfWeek: aNumber
+	<return self.setDay(aNumber - 1)>
+!
 
-A Package differs slightly from a Monticello package which can span multiple class categories using a naming convention based on hyphenation. But just as in Monticello a Package supports "class extensions" so a Package
-can define behaviors in foreign classes using a naming convention for method categories where the category starts with an asterisk and then the name of the owning package follows. This can easily be seen in for example class
-String where the method category "*IDE" defines #inspectOn: which thus is a method belonging to the IDE package.
+hours
+	<return self.getHours()>
+!
 
-You can fetch a package from the server:
+hours: aNumber
+	<self.setHours(aNumber)>
+!
 
-	Package fetch: 'Additional-Examples'!
+milliseconds
+	<return self.getMilliseconds()>
+!
 
-!Package methodsFor: 'accessing'!
+milliseconds: aNumber
+	<self.setMilliseconds(aNumber)>
+!
 
-name
-	<return self.pkgName>
+minutes
+	<return self.getMinutes()>
 !
 
-name: aString
-	<self.pkgName = aString>
+minutes: aNumber
+	<self.setMinutes(aNumber)>
 !
 
-dependencies
-	^self propertyAt: 'dependencies' ifAbsent: [#()]
+month
+	<return self.getMonth() + 1>
 !
 
-dependencies: anArray
-	^self propertyAt: 'dependencies' put: anArray
+month: aNumber
+	<self.setMonth(aNumber - 1)>
 !
 
-properties
-	^Smalltalk current readJSObject: (self basicAt: 'properties')
+seconds
+	<return self.getSeconds()>
 !
 
-properties: aDict
-	"We store it as a javascript object."
-	
-	| object |
-	<object = {};>.
-	aDict keysAndValuesDo: [:key :value |
-		<object[key] = value>.
-	].
-	<return self.properties = object>
+seconds: aNumber
+	<self.setSeconds(aNumber)>
 !
 
-commitPathJs
-	^ commitPathJs ifNil: [self class defaultCommitPathJs]
+time
+	<return self.getTime()>
 !
 
-commitPathJs: aString
-	commitPathJs := aString
+time: aNumber
+	<self.setTime(aNumber)>
 !
 
-commitPathSt
-	^ commitPathSt ifNil: [self class defaultCommitPathSt]
+year
+	<return self.getFullYear()>
 !
 
-commitPathSt: aString
-	commitPathSt := aString
+year: aNumber
+	<self.setFullYear(aNumber)>
 ! !
 
-!Package methodsFor: 'classes'!
+!Date methodsFor: 'arithmetic'!
 
-classes
-	"We need to do a reverse scan."
-	^Smalltalk current classes select: [:c | c package == self]
++ aDate
+	<return self + aDate>
 !
 
-sortedClasses
-	"Answer all classes in the receiver, sorted by superclass/subclasses"
-	
-	^self classes inject: #() into: [:acc :each | 
-		acc isEmpty 
-			ifTrue: [acc add: each; yourself]
-			ifFalse: [(acc includes: each superclass)
-				ifTrue: [acc add: each; yourself]
-				ifFalse: [{each}, acc]]]
+- aDate
+	<return self - aDate>
 ! !
 
-!Package methodsFor: 'printing'!
-
-printString
-	^self name
-! !
+!Date methodsFor: 'comparing'!
 
-!Package methodsFor: 'private'!
+< aDate
+	<return self < aDate>
+!
 
-propertiesAsJSON
-	<return JSON.stringify(self.properties)>
+<= aDate
+	<return self <= aDate>
 !
 
-jsProperties
-	<return self.properties>
+> aDate
+	<return self >> aDate>
 !
 
-jsProperties: aJSObject
-	<return self.properties = aJSObject>
+>= aDate
+	<return self >>= aDate>
 ! !
 
-!Package methodsFor: 'properties'!
+!Date methodsFor: 'converting'!
 
-propertyAt: key
+asDateString
+	<return self.toDateString()>
+!
 
-	<return self.properties[key]>
+asLocaleString
+	<return self.toLocaleString()>
 !
 
-propertyAt: key put: value
+asMilliseconds
+	^self time
+!
 
-	<return self.properties[key] = value>
+asNumber
+	^self asMilliseconds
 !
 
-propertyAt: key ifAbsent: block
+asString
+	<return self.toString()>
+!
 
-	^(self propertyAt: key) ifNil: [block value]
+asTimeString
+	<return self.toTimeString()>
 ! !
 
-Package class instanceVariableNames: 'defaultCommitPathJs defaultCommitPathSt'!
+!Date methodsFor: 'printing'!
 
-!Package class methodsFor: 'commit paths'!
+printString
+	^self asString
+! !
 
-defaultCommitPathJs
-	^ defaultCommitPathJs ifNil: [ defaultCommitPathJs := 'js']
+!Date class methodsFor: 'instance creation'!
+
+fromMilliseconds: aNumber
+	^self new: aNumber
 !
 
-defaultCommitPathJs: aString
-	defaultCommitPathJs := aString
+fromSeconds: aNumber
+	^self fromMilliseconds: aNumber * 1000
 !
 
-defaultCommitPathSt
-	^ defaultCommitPathSt ifNil: [ defaultCommitPathSt := 'st']
+fromString: aString
+	"Example: Date fromString('2011/04/15 00:00:00')"
+	^self new: aString
 !
 
-defaultCommitPathSt: aString
-	defaultCommitPathSt := aString
+millisecondsToRun: aBlock
+	| t |
+	t := Date now.
+	aBlock value.
+	^Date now - t
 !
 
-resetCommitPaths
-        defaultCommitPathJs := nil.
-        defaultCommitPathSt := nil.
+new: anObject
+	<return new Date(anObject)>
+!
+
+now
+	^self today
+!
+
+today
+	^self new
 ! !
 
-!Package class methodsFor: 'loading-storing'!
+Object subclass: #JSObjectProxy
+	instanceVariableNames: 'jsObject'
+	package: 'Kernel-Objects'!
+!JSObjectProxy commentStamp!
+JSObjectProxy handles sending messages to JavaScript object, therefore accessing JavaScript objects from Amber is transparent.
+JSOjbectProxy makes intensive use of `#doesNotUnderstand:`.
 
-fetch: aPackageName prefix: aPrefix
-	jQuery getScript: (aPrefix , aPackageName , '.js') onSuccess: [ Package init: aPackageName ]
+## Examples
+
+JSObjectProxy objects are instanciated by Amber when a Smalltalk message is sent to a JavaScript object.
+
+    window alert: 'hello world'.
+    window inspect.
+    (window jQuery: 'body') append: 'hello world'
+
+Smalltalk messages sends are converted to JavaScript function calls or object property access _(in this order)_. If n one of them match, a `MessageNotUnderstood` error will be thrown. 
+
+## Message conversion rules
+
+- `someUser name` becomes  `someUser.name`
+- `someUser name: 'John'` becomes `someUser name = "John"`
+- `console log: 'hello world'` becomes `console.log('hello world')`
+- `(window jQuery: 'foo') css: 'background' color: 'red'` becomes `window.jQuery('foo').css('background', 'red')`
+
+__Note:__ For keyword-based messages, only the first keyword is kept: `window foo: 1 bar: 2` is equivalent to `window foo: 1 baz: 2`.!
+
+!JSObjectProxy methodsFor: 'accessing'!
+
+at: aSymbol
+	| attr |
+	attr := aSymbol asString.
+	<return self['@jsObject'][attr]>
 !
 
-fetch: aPackageName
-	self fetch: aPackageName prefix: self defaultCommitPathJs, '/'
+at: aSymbol put: anObject
+	| attr |
+	attr := aSymbol asString.
+	<self['@jsObject'][attr] = anObject>
 !
 
-commitToLocalStorage: aPackageName
-	| key sourceCode |
-	key := 'smalltalk.packages.' , aPackageName.
-	sourceCode := Exporter new exportPackage: aPackageName.
-	<localStorage[key] = escape(sourceCode)>
+jsObject
+	^jsObject
 !
 
-init: aPackageName
-	(smalltalk classes select: [ :each | <each.pkg.pkgName == aPackageName> ])
-		do: [ :each | <smalltalk.init(each)> ];
-		do: [ :each | each initialize ]
+jsObject: aJSObject
+	jsObject := aJSObject
 ! !
 
-!Package class methodsFor: 'not yet classified'!
+!JSObjectProxy methodsFor: 'proxy'!
 
-named: aPackageName
+doesNotUnderstand: aMessage
+	| obj selector jsSelector arguments |
+	obj := self jsObject.
+	selector := aMessage selector.
+	jsSelector := selector asJavaScriptSelector.
+	arguments := aMessage arguments.
+	<if(obj[jsSelector] !!= undefined) {return smalltalk.send(obj, jsSelector, arguments)}>.
+	super doesNotUnderstand: aMessage
+!
 
-	^Smalltalk current packageAt: aPackageName
+inspectOn: anInspector
+	| variables |
+	variables := Dictionary new.
+	variables at: '#self' put: self jsObject.
+	anInspector setLabel: self printString.
+	<for(var i in self['@jsObject']) {
+		variables._at_put_(i, self['@jsObject'][i]);
+	}>.
+	anInspector setVariables: variables
 !
 
-named: aPackageName ifAbsent: aBlock
+printString
+	^self jsObject toString
+! !
 
-	^Smalltalk current packageAt: aPackageName ifAbsent: aBlock
+!JSObjectProxy class methodsFor: 'instance creation'!
+
+on: aJSObject
+	^self new
+		jsObject: aJSObject;
+		yourself
 ! !
 
 Object subclass: #Number
 	instanceVariableNames: ''
-	category: 'Kernel-Objects'!
+	package: 'Kernel-Objects'!
 !Number commentStamp!
 Number holds the most general methods for dealing with numbers.  
 Number is directly mapped to JavaScript Number.
@@ -691,6 +728,11 @@ identityHash
 
 !Number methodsFor: 'arithmetic'!
 
+* aNumber
+	"Inlined in the Compiler"
+	<return self * aNumber>
+!
+
 + aNumber
 	"Inlined in the Compiler"
 	<return self + aNumber>
@@ -701,879 +743,447 @@ identityHash
 	<return self - aNumber>
 !
 
-* aNumber
-	"Inlined in the Compiler"
-	<return self * aNumber>
-!
-
 / aNumber
 	"Inlined in the Compiler"
 	<return self / aNumber>
 !
 
-max: aNumber
-	<return Math.max(self, aNumber);>
-!
-
-min: aNumber
-	<return Math.min(self, aNumber);>
-!
-
-negated
-	^0 - self
-!
-
 \\ aNumber
 	<return self % aNumber>
 !
 
-sqrt
-	<return Math.sqrt(self)>
-!
-
-squared
-	^self * self
-! !
-
-!Number methodsFor: 'comparing'!
-
-= aNumber
-	aNumber isNumber ifFalse: [^false]. 
-	<return Number(self) == aNumber>
-!
-
-> aNumber
-	"Inlined in the Compiler"
-	<return self >> aNumber>
-!
-
-< aNumber
-	"Inlined in the Compiler"
-	<return self < aNumber>
-!
-
->= aNumber
-	"Inlined in the Compiler"
-	<return self >>= aNumber>
-!
-
-<= aNumber
-	"Inlined in the Compiler"
-	<return self <= aNumber>
-! !
-
-!Number methodsFor: 'converting'!
-
-rounded
-	<return Math.round(self);>
-!
-
-truncated
-|result|
-
-    self >= 0 
-        ifTrue: [<result = Math.floor(self);>]
-        ifFalse: [<result = (Math.floor(self * (-1)) * (-1));>].
-
-    ^ result
-!
-
-to: aNumber
-	| array first last count |
-	first := self truncated.
-	last := aNumber truncated + 1.
-	count := 1.
-	array := Array new.
-	(last - first) timesRepeat: [
-	    array at: count put: first.
-	    count := count + 1.
-	    first := first + 1].
-	^array
-!
-
-asString
-	^self printString
-!
-
-asJavascript
-	^'(', self printString, ')'
-!
-
-atRandom
-    ^(Random new next * self) truncated + 1
-!
-
-@ aNumber
-	^Point x: self y: aNumber
+max: aNumber
+	<return Math.max(self, aNumber);>
 !
 
-asPoint
-	^Point x: self y: self
+min: aNumber
+	<return Math.min(self, aNumber);>
 !
-
-to: stop by: step
-	| array value pos |
-	value := self.
-	array := Array new.
-	pos := 1.
-	step = 0 ifTrue: [self error: 'step must be non-zero'].
-	step < 0
-		ifTrue: [[ value >= stop ] whileTrue: [
-	    			array at: pos put: value.
-	    			pos := pos + 1.
-	    			value := value + step]]
-		ifFalse: [[ value <= stop ] whileTrue: [
-	    			array at: pos put: value.
-	  			pos := pos + 1.
-	    			value := value + step]].
-	^array
-!
-
-asJSON
-	^self
-! !
-
-!Number methodsFor: 'copying'!
-
-deepCopy
-	^self copy
-!
-
-copy
-	^self
-! !
-
-!Number methodsFor: 'enumerating'!
-
-timesRepeat: aBlock
-	| integer count |
-	integer := self truncated.
-	count := 1.
-	[count > self] whileFalse: [
-	    aBlock value.
-	    count := count + 1]
-!
-
-to: stop do: aBlock
-	"Evaluate aBlock for each number from self to aNumber."
-	| nextValue |
-	nextValue := self.
-	[nextValue <= stop]
-		whileTrue: 
-			[aBlock value: nextValue.
-			nextValue := nextValue + 1]
-!
-
-to: stop by: step do: aBlock
-	| value |
-	value := self.
-	step = 0 ifTrue: [self error: 'step must be non-zero'].
-	step < 0
-		ifTrue: [[ value >= stop ] whileTrue: [
-	    			aBlock value: value.
-	    			value := value + step]]
-		ifFalse: [[ value <= stop ] whileTrue: [
-	    			aBlock value: value.
-	    			value := value + step]]
-! !
-
-!Number methodsFor: 'printing'!
-
-printString
-	<return String(self)>
-!
-
-printShowingDecimalPlaces: placesDesired
-	<return self.toFixed(placesDesired)>
-! !
-
-!Number methodsFor: 'testing'!
-
-isNumber
-	^true
-!
-
-even
-	^ 0 = (self \\ 2)
-!
-
-odd
-	^ self even not
-!
-
-negative
-	"Answer whether the receiver is mathematically negative."
-
-	^ self < 0
-!
-
-positive
-	"Answer whether the receiver is positive or equal to 0. (ST-80 protocol)."
-
-	^ self >= 0
-!
-
-isZero
-	^self = 0
-! !
-
-!Number methodsFor: 'timeouts/intervals'!
-
-clearInterval
-	<clearInterval(Number(self))>
-!
-
-clearTimeout
-	<clearTimeout(Number(self))>
-! !
-
-!Number class methodsFor: 'instance creation'!
-
-pi
-	<return Math.PI>
-! !
-
-Object subclass: #Boolean
-	instanceVariableNames: ''
-	category: 'Kernel-Objects'!
-!Boolean commentStamp!
-Boolean wraps the JavaScript `Boolean()` constructor. The `true` and `false` objects are the JavaScript boolean objects.
-
-Boolean defines the protocol for logic testing operations and conditional control structures for the logical values.
-Boolean instances are weither `true` or `false`.!
-
-!Boolean methodsFor: 'comparing'!
-
-= aBoolean
-	aBoolean class = self class ifFalse: [^false].
-	<return Boolean(self == true) == aBoolean>
-! !
-
-!Boolean methodsFor: 'controlling'!
-
-ifTrue: aBlock
-	"inlined in the Compiler"
-	^self ifTrue: aBlock ifFalse: []
-!
-
-ifFalse: aBlock
-	"inlined in the Compiler"
-	^self ifTrue: [] ifFalse: aBlock
-!
-
-ifFalse: aBlock ifTrue: anotherBlock
-	"inlined in the Compiler"
-	^self ifTrue: anotherBlock ifFalse: aBlock
-!
-
-ifTrue: aBlock ifFalse: anotherBlock
-	"inlined in the Compiler"
-	<
-	    if(self == true) {
-		return aBlock();
-	    } else {
-		return anotherBlock();
-	    }
-	>
-!
-
-and: aBlock
-	^self = true
-	    ifTrue: aBlock
-	    ifFalse: [false]
-!
-
-or: aBlock
-	^self = true
-	    ifTrue: [true]
-	    ifFalse: aBlock
-!
-
-not
-	^self = false
-!
-
-& aBoolean
-	<
-	    if(self == true) {
-		return aBoolean;
-	    } else {
-		return false;
-	    }
-	>
-!
-
-| aBoolean
-	<
-	    if(self == true) {
-		return true;
-	    } else {
-		return aBoolean;
-	    }
-	>
-! !
-
-!Boolean methodsFor: 'converting'!
-
-asJSON
-	^self
-! !
-
-!Boolean methodsFor: 'copying'!
-
-shallowCopy
-	^self
-!
-
-deepCopy
-	^self
-! !
-
-!Boolean methodsFor: 'printing'!
-
-printString
-	<return self.toString()>
-! !
-
-Object subclass: #Date
-	instanceVariableNames: ''
-	category: 'Kernel-Objects'!
-!Date commentStamp!
-The Date class is used to work with dates and times. Therefore `Date today` and `Date now` are both valid in
-Amber and answer the same date object.
-
-Date wraps the `Date()` JavaScript constructor, and Smalltalk date objects are JavaScript date objects.!
-
-!Date methodsFor: 'accessing'!
-
-year
-	<return self.getFullYear()>
-!
-
-month
-	<return self.getMonth() + 1>
-!
-
-month: aNumber
-	<self.setMonth(aNumber - 1)>
-!
-
-day
-	^self dayOfWeek
-!
-
-dayOfWeek
-	<return self.getDay() + 1>
-!
-
-dayOfWeek: aNumber
-	<return self.setDay(aNumber - 1)>
-!
-
-day: aNumber
-	self day: aNumber
-!
-
-year: aNumber
-	<self.setFullYear(aNumber)>
-!
-
-dayOfMonth
-	<return self.getDate()>
-!
-
-dayOfMonth: aNumber
-	<self.setDate(aNumber)>
-!
-
-time
-	<return self.getTime()>
-!
-
-time: aNumber
-	<self.setTime(aNumber)>
-!
-
-hours: aNumber
-	<self.setHours(aNumber)>
-!
-
-minutes: aNumber
-	<self.setMinutes(aNumber)>
-!
-
-seconds: aNumber
-	<self.setSeconds(aNumber)>
-!
-
-milliseconds: aNumber
-	<self.setMilliseconds(aNumber)>
-!
-
-hours
-	<return self.getHours()>
-!
-
-minutes
-	<return self.getMinutes()>
-!
-
-seconds
-	<return self.getSeconds()>
-!
-
-milliseconds
-	<return self.getMilliseconds()>
-! !
-
-!Date methodsFor: 'arithmetic'!
-
-- aDate
-	<return self - aDate>
-!
-
-+ aDate
-	<return self + aDate>
-! !
-
-!Date methodsFor: 'comparing'!
-
-< aDate
-	<return self < aDate>
-!
-
-> aDate
-	<return self >> aDate>
+
+negated
+	^0 - self
 !
 
-<= aDate
-	<return self <= aDate>
+sqrt
+	<return Math.sqrt(self)>
 !
 
->= aDate
-	<return self >>= aDate>
+squared
+	^self * self
 ! !
 
-!Date methodsFor: 'converting'!
-
-asString
-	<return self.toString()>
-!
+!Number methodsFor: 'comparing'!
 
-asMilliseconds
-	^self time
+< aNumber
+	"Inlined in the Compiler"
+	<return self < aNumber>
 !
 
-asDateString
-	<return self.toDateString()>
+<= aNumber
+	"Inlined in the Compiler"
+	<return self <= aNumber>
 !
 
-asTimeString
-	<return self.toTimeString()>
+= aNumber
+	aNumber isNumber ifFalse: [^false]. 
+	<return Number(self) == aNumber>
 !
 
-asLocaleString
-	<return self.toLocaleString()>
+> aNumber
+	"Inlined in the Compiler"
+	<return self >> aNumber>
 !
 
-asNumber
-	^self asMilliseconds
+>= aNumber
+	"Inlined in the Compiler"
+	<return self >>= aNumber>
 ! !
 
-!Date methodsFor: 'printing'!
-
-printString
-	^self asString
-! !
+!Number methodsFor: 'converting'!
 
-!Date class methodsFor: 'instance creation'!
+& aNumber
+	<return self & aNumber>
+!
 
-new: anObject
-	<return new Date(anObject)>
+@ aNumber
+	^Point x: self y: aNumber
 !
 
-fromString: aString
-	"Example: Date fromString('2011/04/15 00:00:00')"
-	^self new: aString
+asJSON
+	^self
 !
 
-fromSeconds: aNumber
-	^self fromMilliseconds: aNumber * 1000
+asJavascript
+	^'(', self printString, ')'
 !
 
-fromMilliseconds: aNumber
-	^self new: aNumber
+asPoint
+	^Point x: self y: self
 !
 
-today
-	^self new
+asString
+	^self printString
 !
 
-now
-	^self today
+atRandom
+    ^(Random new next * self) truncated + 1
 !
 
-millisecondsToRun: aBlock
-	| t |
-	t := Date now.
-	aBlock value.
-	^Date now - t
-! !
+rounded
+	<return Math.round(self);>
+!
 
-Object subclass: #UndefinedObject
-	instanceVariableNames: ''
-	category: 'Kernel-Objects'!
-!UndefinedObject commentStamp!
-UndefinedObject describes the behavior of its sole instance, `nil`. `nil` represents a prior value for variables that have not been initialized, or for results which are meaningless.
+to: aNumber
+	| array first last count |
+	first := self truncated.
+	last := aNumber truncated + 1.
+	count := 1.
+	array := Array new.
+	(last - first) timesRepeat: [
+	    array at: count put: first.
+	    count := count + 1.
+	    first := first + 1].
+	^array
+!
 
-`nil` is the Smalltalk representation of the `undefined` JavaScript object.!
+to: stop by: step
+	| array value pos |
+	value := self.
+	array := Array new.
+	pos := 1.
+	step = 0 ifTrue: [self error: 'step must be non-zero'].
+	step < 0
+		ifTrue: [[ value >= stop ] whileTrue: [
+	    			array at: pos put: value.
+	    			pos := pos + 1.
+	    			value := value + step]]
+		ifFalse: [[ value <= stop ] whileTrue: [
+	    			array at: pos put: value.
+	  			pos := pos + 1.
+	    			value := value + step]].
+	^array
+!
 
-!UndefinedObject methodsFor: 'class creation'!
+truncated
+|result|
 
-subclass: aString instanceVariableNames: anotherString
-	^self subclass: aString instanceVariableNames: anotherString package: nil
-!
+    self >= 0 
+        ifTrue: [<result = Math.floor(self);>]
+        ifFalse: [<result = (Math.floor(self * (-1)) * (-1));>].
 
-subclass: aString instanceVariableNames: aString2 category: aString3
-	"Kept for compatibility."
-	self deprecatedAPI.
-	^self subclass: aString instanceVariableNames: aString2 package: aString3
+    ^ result
 !
 
-subclass: aString instanceVariableNames: aString2 package: aString3
-	^ClassBuilder new
-	    superclass: self subclass: aString instanceVariableNames: aString2 package: aString3
+| aNumber
+	<return self | aNumber>
 ! !
 
-!UndefinedObject methodsFor: 'converting'!
+!Number methodsFor: 'copying'!
 
-asJSON
-	^null
+copy
+	^self
+!
+
+deepCopy
+	^self copy
 ! !
 
-!UndefinedObject methodsFor: 'copying'!
+!Number methodsFor: 'enumerating'!
 
-shallowCopy
-	^self
+timesRepeat: aBlock
+	| integer count |
+	integer := self truncated.
+	count := 1.
+	[count > self] whileFalse: [
+	    aBlock value.
+	    count := count + 1]
 !
 
-deepCopy
-	^self
+to: stop by: step do: aBlock
+	| value |
+	value := self.
+	step = 0 ifTrue: [self error: 'step must be non-zero'].
+	step < 0
+		ifTrue: [[ value >= stop ] whileTrue: [
+	    			aBlock value: value.
+	    			value := value + step]]
+		ifFalse: [[ value <= stop ] whileTrue: [
+	    			aBlock value: value.
+	    			value := value + step]]
+!
+
+to: stop do: aBlock
+	"Evaluate aBlock for each number from self to aNumber."
+	| nextValue |
+	nextValue := self.
+	[nextValue <= stop]
+		whileTrue: 
+			[aBlock value: nextValue.
+			nextValue := nextValue + 1]
 ! !
 
-!UndefinedObject methodsFor: 'printing'!
+!Number methodsFor: 'printing'!
+
+printShowingDecimalPlaces: placesDesired
+	<return self.toFixed(placesDesired)>
+!
 
 printString
-    ^'nil'
+	<return String(self)>
 ! !
 
-!UndefinedObject methodsFor: 'testing'!
+!Number methodsFor: 'testing'!
 
-ifNil: aBlock
-	"inlined in the Compiler"
-	^self ifNil: aBlock ifNotNil: []
+even
+	^ 0 = (self \\ 2)
 !
 
-ifNotNil: aBlock
-	"inlined in the Compiler"
-	^self
+isNumber
+	^true
 !
 
-ifNil: aBlock ifNotNil: anotherBlock
-	"inlined in the Compiler"
-	^aBlock value
+isZero
+	^self = 0
 !
 
-ifNotNil: aBlock ifNil: anotherBlock
-	"inlined in the Compiler"
-	^anotherBlock value
-!
+negative
+	"Answer whether the receiver is mathematically negative."
 
-isNil
-	^true
+	^ self < 0
 !
 
-notNil
-	^false
-! !
+odd
+	^ self even not
+!
 
-!UndefinedObject class methodsFor: 'instance creation'!
+positive
+	"Answer whether the receiver is positive or equal to 0. (ST-80 protocol)."
 
-new
-	    self error: 'You cannot create new instances of UndefinedObject. Use nil'
+	^ self >= 0
 ! !
 
-Object subclass: #Date
-	instanceVariableNames: ''
-	category: 'Kernel-Objects'!
-!Date commentStamp!
-The Date class is used to work with dates and times. Therefore `Date today` and `Date now` are both valid in
-Amber and answer the same date object.
+!Number methodsFor: 'timeouts/intervals'!
 
-Date wraps the `Date()` JavaScript constructor, and Smalltalk date objects are JavaScript date objects.!
+clearInterval
+	<clearInterval(Number(self))>
+!
 
-!Date methodsFor: 'accessing'!
+clearTimeout
+	<clearTimeout(Number(self))>
+! !
 
-year
-	<return self.getFullYear()>
-!
+!Number class methodsFor: 'instance creation'!
 
-month
-	<return self.getMonth() + 1>
-!
+pi
+	<return Math.PI>
+! !
 
-month: aNumber
-	<self.setMonth(aNumber - 1)>
-!
+Object subclass: #Package
+	instanceVariableNames: 'commitPathJs commitPathSt'
+	package: 'Kernel-Objects'!
+!Package commentStamp!
+A Package is similar to a "class category" typically found in other Smalltalks like Pharo or Squeak. Amber does not have class categories anymore, it had in the beginning but now each class in the system knows which package it belongs to.
 
-day
-	^self dayOfWeek
-!
+A Package has a name, an Array of "requires", a comment and a Dictionary with other optional key value attributes. A Package can also be queried for its classes, but it will then resort to a reverse scan of all classes to find them.
+Packages are manipulated through "Smalltalk current", like for example finding one based on a name:
 
-dayOfWeek
-	<return self.getDay() + 1>
-!
+	Smalltalk current packageAt: 'Kernel'
 
-dayOfWeek: aNumber
-	<return self.setDay(aNumber - 1)>
-!
+...but you can also use:
 
-day: aNumber
-	self day: aNumber
-!
+	Package named: 'Kernel'
 
-year: aNumber
-	<self.setFullYear(aNumber)>
-!
+A Package differs slightly from a Monticello package which can span multiple class categories using a naming convention based on hyphenation. But just as in Monticello a Package supports "class extensions" so a Package
+can define behaviors in foreign classes using a naming convention for method categories where the category starts with an asterisk and then the name of the owning package follows. This can easily be seen in for example class
+String where the method category "*IDE" defines #inspectOn: which thus is a method belonging to the IDE package.
 
-dayOfMonth
-	<return self.getDate()>
-!
+You can fetch a package from the server:
 
-dayOfMonth: aNumber
-	<self.setDate(aNumber)>
-!
+	Package fetch: 'Additional-Examples'!
 
-time
-	<return self.getTime()>
+!Package methodsFor: 'accessing'!
+
+commitPathJs
+	^ commitPathJs ifNil: [self class defaultCommitPathJs]
 !
 
-time: aNumber
-	<self.setTime(aNumber)>
+commitPathJs: aString
+	commitPathJs := aString
 !
 
-hours: aNumber
-	<self.setHours(aNumber)>
+commitPathSt
+	^ commitPathSt ifNil: [self class defaultCommitPathSt]
 !
 
-minutes: aNumber
-	<self.setMinutes(aNumber)>
+commitPathSt: aString
+	commitPathSt := aString
 !
 
-seconds: aNumber
-	<self.setSeconds(aNumber)>
+dependencies
+	^self propertyAt: 'dependencies' ifAbsent: [#()]
 !
 
-milliseconds: aNumber
-	<self.setMilliseconds(aNumber)>
+dependencies: anArray
+	^self propertyAt: 'dependencies' put: anArray
 !
 
-hours
-	<return self.getHours()>
+name
+	<return self.pkgName>
 !
 
-minutes
-	<return self.getMinutes()>
+name: aString
+	<self.pkgName = aString>
 !
 
-seconds
-	<return self.getSeconds()>
+properties
+	^Smalltalk current readJSObject: (self basicAt: 'properties')
 !
 
-milliseconds
-	<return self.getMilliseconds()>
+properties: aDict
+	"We store it as a javascript object."
+	
+	| object |
+	<object = {};>.
+	aDict keysAndValuesDo: [:key :value |
+		<object[key] = value>.
+	].
+	<return self.properties = object>
 ! !
 
-!Date methodsFor: 'arithmetic'!
+!Package methodsFor: 'classes'!
 
-- aDate
-	<return self - aDate>
+classes
+	"We need to do a reverse scan."
+	^Smalltalk current classes select: [:c | c package == self]
 !
 
-+ aDate
-	<return self + aDate>
+sortedClasses
+	"Answer all classes in the receiver, sorted by superclass/subclasses and by class name for common subclasses (Issue #143)."
+
+	^self class sortedClasses: self classes
 ! !
 
-!Date methodsFor: 'comparing'!
+!Package methodsFor: 'printing'!
 
-< aDate
-	<return self < aDate>
-!
+printString
+	^self name
+! !
 
-> aDate
-	<return self >> aDate>
+!Package methodsFor: 'private'!
+
+jsProperties
+	<return self.properties>
 !
 
-<= aDate
-	<return self <= aDate>
+jsProperties: aJSObject
+	<return self.properties = aJSObject>
 !
 
->= aDate
-	<return self >>= aDate>
+propertiesAsJSON
+	<return JSON.stringify(self.properties)>
 ! !
 
-!Date methodsFor: 'converting'!
-
-asString
-	<return self.toString()>
-!
+!Package methodsFor: 'properties'!
 
-asMilliseconds
-	^self time
-!
+propertyAt: key
 
-asDateString
-	<return self.toDateString()>
+	<return self.properties[key]>
 !
 
-asTimeString
-	<return self.toTimeString()>
-!
+propertyAt: key ifAbsent: block
 
-asLocaleString
-	<return self.toLocaleString()>
+	^(self propertyAt: key) ifNil: [block value]
 !
 
-asNumber
-	^self asMilliseconds
-! !
-
-!Date methodsFor: 'printing'!
+propertyAt: key put: value
 
-printString
-	^self asString
+	<return self.properties[key] = value>
 ! !
 
-!Date class methodsFor: 'instance creation'!
-
-new: anObject
-	<return new Date(anObject)>
-!
+Package class instanceVariableNames: 'defaultCommitPathJs defaultCommitPathSt'!
 
-fromString: aString
-	"Example: Date fromString('2011/04/15 00:00:00')"
-	^self new: aString
-!
+!Package class methodsFor: 'commit paths'!
 
-fromSeconds: aNumber
-	^self fromMilliseconds: aNumber * 1000
+defaultCommitPathJs
+	^ defaultCommitPathJs ifNil: [ defaultCommitPathJs := 'js']
 !
 
-fromMilliseconds: aNumber
-	^self new: aNumber
+defaultCommitPathJs: aString
+	defaultCommitPathJs := aString
 !
 
-today
-	^self new
+defaultCommitPathSt
+	^ defaultCommitPathSt ifNil: [ defaultCommitPathSt := 'st']
 !
 
-now
-	^self today
+defaultCommitPathSt: aString
+	defaultCommitPathSt := aString
 !
 
-millisecondsToRun: aBlock
-	| t |
-	t := Date now.
-	aBlock value.
-	^Date now - t
+resetCommitPaths
+        defaultCommitPathJs := nil.
+        defaultCommitPathSt := nil.
 ! !
 
-Object subclass: #JSObjectProxy
-	instanceVariableNames: 'jsObject'
-	category: 'Kernel-Objects'!
-!JSObjectProxy commentStamp!
-JSObjectProxy handles sending messages to JavaScript object, therefore accessing JavaScript objects from Amber is transparent.
-JSOjbectProxy makes intensive use of `#doesNotUnderstand:`.
-
-## Examples
-
-JSObjectProxy objects are instanciated by Amber when a Smalltalk message is sent to a JavaScript object.
-
-    window alert: 'hello world'.
-    window inspect.
-    (window jQuery: 'body') append: 'hello world'
-
-Smalltalk messages sends are converted to JavaScript function calls or object property access _(in this order)_. If n one of them match, a `MessageNotUnderstood` error will be thrown. 
-
-## Message conversion rules
-
-- `someUser name` becomes  `someUser.name`
-- `someUser name: 'John'` becomes `someUser name = "John"`
-- `console log: 'hello world'` becomes `console.log('hello world')`
-- `(window jQuery: 'foo') css: 'background' color: 'red'` becomes `window.jQuery('foo').css('background', 'red')`
-
-__Note:__ For keyword-based messages, only the first keyword is kept: `window foo: 1 bar: 2` is equivalent to `window foo: 1 baz: 2`.!
-
-!JSObjectProxy methodsFor: 'accessing'!
+!Package class methodsFor: 'loading-storing'!
 
-jsObject: aJSObject
-	jsObject := aJSObject
+commitToLocalStorage: aPackageName
+	| key sourceCode |
+	key := 'smalltalk.packages.' , aPackageName.
+	sourceCode := Exporter new exportPackage: aPackageName.
+	<localStorage[key] = escape(sourceCode)>
 !
 
-jsObject
-	^jsObject
+fetch: aPackageName
+	self fetch: aPackageName prefix: self defaultCommitPathJs, '/'
 !
 
-at: aSymbol
-	| attr |
-	attr := aSymbol asString.
-	<return self['@jsObject'][attr]>
+fetch: aPackageName prefix: aPrefix
+	jQuery getScript: (aPrefix , aPackageName , '.js') onSuccess: [ Package init: aPackageName ]
 !
 
-at: aSymbol put: anObject
-	| attr |
-	attr := aSymbol asString.
-	<self['@jsObject'][attr] = anObject>
+init: aPackageName
+	(smalltalk classes select: [ :each | <each.pkg.pkgName == aPackageName> ])
+		do: [ :each | <smalltalk.init(each)> ];
+		do: [ :each | each initialize ]
 ! !
 
-!JSObjectProxy methodsFor: 'proxy'!
+!Package class methodsFor: 'not yet classified'!
 
-printString
-	^self jsObject toString
-!
+named: aPackageName
 
-inspectOn: anInspector
-	| variables |
-	variables := Dictionary new.
-	variables at: '#self' put: self jsObject.
-	anInspector setLabel: self printString.
-	<for(var i in self['@jsObject']) {
-		variables._at_put_(i, self['@jsObject'][i]);
-	}>.
-	anInspector setVariables: variables
+	^Smalltalk current packageAt: aPackageName
 !
 
-doesNotUnderstand: aMessage
-	| obj selector jsSelector arguments |
-	obj := self jsObject.
-	selector := aMessage selector.
-	jsSelector := selector asJavaScriptSelector.
-	arguments := aMessage arguments.
-	<if(obj[jsSelector] !!= undefined) {return smalltalk.send(obj, jsSelector, arguments)}>.
-	super doesNotUnderstand: aMessage
+named: aPackageName ifAbsent: aBlock
+
+	^Smalltalk current packageAt: aPackageName ifAbsent: aBlock
 ! !
 
-!JSObjectProxy class methodsFor: 'instance creation'!
+!Package class methodsFor: 'sorting'!
+
+sortedClasses: classes
+	"Answer classes, sorted by superclass/subclasses and by class name for common subclasses (Issue #143)"
 
-on: aJSObject
-	^self new
-		jsObject: aJSObject;
-		yourself
+	| children others nodes expandedClasses |
+	children := #().
+	others := #().
+	classes do: [:each |
+		(classes includes: each superclass)
+			ifFalse: [children add: each]
+			ifTrue: [others add: each]].
+	nodes := children collect: [:each |
+		ClassSorterNode on: each classes: others level: 0].
+	nodes := nodes sorted: [:a :b | a theClass name <= b theClass name ].
+	expandedClasses := Array new.
+	nodes do: [:aNode |
+		aNode traverseClassesWith: expandedClasses].
+	^expandedClasses
 ! !
 
 Object subclass: #Point
 	instanceVariableNames: 'x y'
-	category: 'Kernel-Objects'!
+	package: 'Kernel-Objects'!
 !Point commentStamp!
 A `Point` represents an x-y pair of numbers usually designating a geometric coordinate.
 Points are traditionally created using the binary `#@` message to a number:
@@ -1600,16 +1210,16 @@ x
 	^x
 !
 
+x: aNumber
+	x := aNumber
+!
+
 y
 	^y
 !
 
 y: aNumber
 	y := aNumber
-!
-
-x: aNumber
-	x := aNumber
 ! !
 
 !Point methodsFor: 'arithmetic'!
@@ -1673,7 +1283,7 @@ x: aNumber y: anotherNumber
 
 Object subclass: #Random
 	instanceVariableNames: ''
-	category: 'Kernel-Objects'!
+	package: 'Kernel-Objects'!
 !Random commentStamp!
 `Random` is a random number generator and is implemented as a trivial wrapper around javascript `Math.random()` and is used like this:
 
@@ -1711,3 +1321,248 @@ next: anInteger
     ^(1 to: anInteger) collect: [:each | self next]
 ! !
 
+Object subclass: #Smalltalk
+	instanceVariableNames: ''
+	package: 'Kernel-Objects'!
+!Smalltalk commentStamp!
+Smalltalk has only one instance, accessed with `Smalltalk current`. 
+It represents the global JavaScript variable `smalltalk` declared in `js/boot.js`.
+
+The `smalltalk` object holds all class and packages defined in the system.
+
+## Classes
+
+Classes can be accessed using the following methods:
+
+- `#classes` answers the full list of Smalltalk classes in the system
+- `#at:` answers a specific class of `nil`
+
+## Packages
+
+Packages can be accessed using the following methods:
+
+- `#packages` answers the full list of packages
+- `#packageAt:` answers a specific class of `nil`
+
+__note:__ classes and packages are accessed using strings, not symbols
+
+## Parsing
+
+The `#parse:` method is used to parse Smalltalk source code. 
+It requires the `Compiler` package and the `js/parser.js` parser file in order to work!
+
+!Smalltalk methodsFor: 'accessing'!
+
+at: aString
+	<return self[aString]>
+!
+
+basicParse: aString
+	<return smalltalk.parser.parse(aString)>
+!
+
+classes
+	<return self.classes()>
+!
+
+parse: aString
+	| result | 
+	self try: [result := self basicParse: aString] catch: [:ex | (self parseError: ex parsing: aString) signal].
+	^result
+!
+
+parseError: anException parsing: aString
+	| row col message lines badLine code |
+	<row = anException.line;
+	col = anException.column;
+	message = anException.message;>.
+	lines := aString lines.
+	badLine := lines at: row.
+	badLine := (badLine copyFrom: 1 to: col - 1), ' ===>', (badLine copyFrom:  col to: badLine size).
+	lines at: row put: badLine.
+	code := String streamContents: [:s |
+                  lines withIndexDo: [:l :i |
+                     s nextPutAll: i asString, ': ', l, String lf]].
+	^ Error new messageText: ('Parse error on line ' , row , ' column ' , col , ' : ' , message , ' Below is code with line numbers and ===> marker inserted:' , String lf, code)
+!
+
+readJSObject: anObject
+	<return self.readJSObject(anObject)>
+!
+
+reservedWords
+	"JavaScript reserved words"
+	<return self.reservedWords>
+!
+
+send: aSelector to: anObject arguments: aCollection
+	| selector |
+	selector := aSelector asString asSelector.
+	<self.send(anObject, selector, aCollection)>
+! !
+
+!Smalltalk methodsFor: 'classes'!
+
+removeClass: aClass
+	aClass isMetaclass ifTrue: [self error: aClass asString, ' is a Metaclass and cannot be removed!!'].
+	aClass methodDictionary values do: [:each |
+		aClass removeCompiledMethod: each].
+	aClass class methodDictionary values do: [:each |
+		aClass class removeCompiledMethod: each].
+	self basicDelete: aClass name
+! !
+
+!Smalltalk methodsFor: 'packages'!
+
+packageAt: packageName
+       <return self.packages[packageName]>
+!
+
+packageAt: packageName ifAbsent: aBlock
+       ^(self packageAt: packageName) ifNil: aBlock
+!
+
+packages
+	"Return all Package instances in the system."
+
+	<return self.packages.all()>
+!
+
+removePackage: packageName
+	"Removes a package and all its classes."
+
+	| pkg |
+	pkg := self packageAt: packageName ifAbsent: [self error: 'Missing package: ', packageName].
+	pkg classes do: [:each |
+        	self removeClass: each].
+	self deletePackage: packageName
+!
+
+renamePackage: packageName to: newName
+	"Rename a package."
+
+	| pkg |
+	pkg := self packageAt: packageName ifAbsent: [self error: 'Missing package: ', packageName].
+	(self packageAt: newName) ifNotNil: [self error: 'Already exists a package called: ', newName].
+	<smalltalk.packages[newName] = smalltalk.packages[packageName]>.
+	pkg name: newName.
+	self deletePackage: packageName.
+! !
+
+!Smalltalk methodsFor: 'private'!
+
+createPackage: packageName
+	"Create and bind a new package with given name and return it."
+
+      <return smalltalk.addPackage(packageName, nil)>
+!
+
+createPackage: packageName properties: aDict
+	"Create and bind a new package with given name and return it."
+
+	| object |
+	<object = {};>.
+	aDict keysAndValuesDo: [:key :value |
+		<object[key] = value>.
+	].
+       <return smalltalk.addPackage(packageName, object)>
+!
+
+deletePackage: packageName
+	"Deletes a package by deleting its binding, but does not check if it contains classes etc.
+	To remove a package, use #removePackage instead."
+
+       <delete smalltalk.packages[packageName]>
+! !
+
+Smalltalk class instanceVariableNames: 'current'!
+
+!Smalltalk class methodsFor: 'accessing'!
+
+current
+	<return smalltalk>
+! !
+
+Object subclass: #UndefinedObject
+	instanceVariableNames: ''
+	package: 'Kernel-Objects'!
+!UndefinedObject commentStamp!
+UndefinedObject describes the behavior of its sole instance, `nil`. `nil` represents a prior value for variables that have not been initialized, or for results which are meaningless.
+
+`nil` is the Smalltalk representation of the `undefined` JavaScript object.!
+
+!UndefinedObject methodsFor: 'class creation'!
+
+subclass: aString instanceVariableNames: anotherString
+	^self subclass: aString instanceVariableNames: anotherString package: nil
+!
+
+subclass: aString instanceVariableNames: aString2 category: aString3
+	"Kept for compatibility."
+	self deprecatedAPI.
+	^self subclass: aString instanceVariableNames: aString2 package: aString3
+!
+
+subclass: aString instanceVariableNames: aString2 package: aString3
+	^ClassBuilder new
+	    superclass: self subclass: aString instanceVariableNames: aString2 package: aString3
+! !
+
+!UndefinedObject methodsFor: 'converting'!
+
+asJSON
+	^null
+! !
+
+!UndefinedObject methodsFor: 'copying'!
+
+deepCopy
+	^self
+!
+
+shallowCopy
+	^self
+! !
+
+!UndefinedObject methodsFor: 'printing'!
+
+printString
+    ^'nil'
+! !
+
+!UndefinedObject methodsFor: 'testing'!
+
+ifNil: aBlock
+	"inlined in the Compiler"
+	^self ifNil: aBlock ifNotNil: []
+!
+
+ifNil: aBlock ifNotNil: anotherBlock
+	"inlined in the Compiler"
+	^aBlock value
+!
+
+ifNotNil: aBlock
+	"inlined in the Compiler"
+	^self
+!
+
+ifNotNil: aBlock ifNil: anotherBlock
+	"inlined in the Compiler"
+	^anotherBlock value
+!
+
+isNil
+	^true
+!
+
+notNil
+	^false
+! !
+
+!UndefinedObject class methodsFor: 'instance creation'!
+
+new
+	    self error: 'You cannot create new instances of UndefinedObject. Use nil'
+! !
+