Home Explore Help
Register Sign In
amber
/
amber
10
10
Fork 9
Files Issues 45 Pull Requests 0 Wiki
Browse Source

Merge branch 'requirejs-wip' into requirejs-with-folder-restructure

Conflicts:
	Gruntfile.js
	js/lib/_st.js
	js/lib/amber-core-deploy.js
	js/lib/amber-full-devel.js
	js/lib/core-deploy.js
	js/lib/full-devel.js
	js/lib/nil.js
	js/lib/smalltalk.js
	support/amber-core-deploy.js
	support/amber-full-devel.js
	support/amber4browser.js
Herbert Vojčík 10 years ago
parent
7e43f4a017 3c0c090401
commit
fa162284ce
94 changed files with 1538 additions and 1176 deletions
Split View Show Diff Stats
  1. 1 1
      Gruntfile.js
  2. 5 5
      index.html
  3. 1 1
      js/Benchfib.deploy.js
  4. 1 1
      js/Benchfib.js
  5. 1 1
      js/Canvas.deploy.js
  6. 1 1
      js/Canvas.js
  7. 1 1
      js/Compiler-AST.deploy.js
  8. 1 1
      js/Compiler-AST.js
  9. 1 1
      js/Compiler-Core.deploy.js
  10. 1 1
      js/Compiler-Core.js
  11. 1 1
      js/Compiler-Exceptions.deploy.js
  12. 1 1
      js/Compiler-Exceptions.js
  13. 1 1
      js/Compiler-IR.deploy.js
  14. 1 1
      js/Compiler-IR.js
  15. 1 1
      js/Compiler-Inlining.deploy.js
  16. 1 1
      js/Compiler-Inlining.js
  17. 1 1
      js/Compiler-Interpreter.deploy.js
  18. 1 1
      js/Compiler-Interpreter.js
  19. 1 1
      js/Compiler-Semantic.deploy.js
  20. 1 1
      js/Compiler-Semantic.js
  21. 1 1
      js/Compiler-Tests.deploy.js
  22. 1 1
      js/Compiler-Tests.js
  23. 1 1
      js/Examples.deploy.js
  24. 1 1
      js/Examples.js
  25. 1 1
      js/Helios-Announcements.deploy.js
  26. 1 1
      js/Helios-Announcements.js
  27. 1 1
      js/Helios-Browser.deploy.js
  28. 1 1
      js/Helios-Browser.js
  29. 1 1
      js/Helios-Commands-Browser.deploy.js
  30. 1 1
      js/Helios-Commands-Browser.js
  31. 1 1
      js/Helios-Commands-Core.deploy.js
  32. 1 1
      js/Helios-Commands-Core.js
  33. 1 1
      js/Helios-Commands-Tools.deploy.js
  34. 1 1
      js/Helios-Commands-Tools.js
  35. 1 1
      js/Helios-Commands.deploy.js
  36. 1 1
      js/Helios-Commands.js
  37. 2 2
      js/Helios-Core.deploy.js
  38. 3 3
      js/Helios-Core.js
  39. 1 1
      js/Helios-Debugger.deploy.js
  40. 1 1
      js/Helios-Debugger.js
  41. 1 1
      js/Helios-Exceptions.deploy.js
  42. 1 1
      js/Helios-Exceptions.js
  43. 1 1
      js/Helios-Inspector.deploy.js
  44. 1 1
      js/Helios-Inspector.js
  45. 1 1
      js/Helios-KeyBindings.deploy.js
  46. 1 1
      js/Helios-KeyBindings.js
  47. 1 1
      js/Helios-Layout.deploy.js
  48. 1 1
      js/Helios-Layout.js
  49. 1 1
      js/Helios-References.deploy.js
  50. 1 1
      js/Helios-References.js
  51. 1 1
      js/Helios-Transcript.deploy.js
  52. 1 1
      js/Helios-Transcript.js
  53. 1 1
      js/Helios-Workspace-Tests.deploy.js
  54. 1 1
      js/Helios-Workspace-Tests.js
  55. 1 1
      js/Helios-Workspace.deploy.js
  56. 1 1
      js/Helios-Workspace.js
  57. 1 1
      js/IDE.deploy.js
  58. 1 1
      js/IDE.js
  59. 358 29
      js/Importer-Exporter.deploy.js
  60. 470 35
      js/Importer-Exporter.js
  61. 1 1
      js/Kernel-Announcements.deploy.js
  62. 1 1
      js/Kernel-Announcements.js
  63. 1 1
      js/Kernel-Classes.deploy.js
  64. 1 1
      js/Kernel-Classes.js
  65. 1 1
      js/Kernel-Collections.deploy.js
  66. 1 1
      js/Kernel-Collections.js
  67. 1 1
      js/Kernel-Exceptions.deploy.js
  68. 1 1
      js/Kernel-Exceptions.js
  69. 1 1
      js/Kernel-Methods.deploy.js
  70. 1 1
      js/Kernel-Methods.js
  71. 2 160
      js/Kernel-Objects.deploy.js
  72. 2 215
      js/Kernel-Objects.js
  73. 160 192
      js/Kernel-Tests.deploy.js
  74. 220 263
      js/Kernel-Tests.js
  75. 1 1
      js/Kernel-Transcript.deploy.js
  76. 1 1
      js/Kernel-Transcript.js
  77. 1 1
      js/SUnit-Tests.deploy.js
  78. 1 1
      js/SUnit-Tests.js
  79. 1 1
      js/SUnit.deploy.js
  80. 1 1
      js/SUnit.js
  81. 1 1
      js/Spaces.deploy.js
  82. 1 1
      js/Spaces.js
  83. 1 1
      st/Helios-Core.st
  84. 148 25
      st/Importer-Exporter.st
  85. 1 56
      st/Kernel-Objects.st
  86. 82 106
      st/Kernel-Tests.st
  87. 1 1
      support/_st.js
  88. 3 4
      support/amber4browser.js
  89. 1 1
      support/boot.js
  90. 0 0
      support/core-deploy.js
  91. 1 1
      support/full-devel.js
  92. 2 2
      support/nil.js
  93. 1 1
      support/parser.js
  94. 2 1
      support/smalltalk.js

+ 1 - 1
Gruntfile.js
View File 

@@ -77,7 +77,7 @@ module.exports = function(grunt) {
 
         libraries: [
 
         'Compiler-Exceptions', 'Compiler-Core', 'Compiler-AST',
 
         'Compiler-IR', 'Compiler-Inlining', 'Compiler-Semantic', 'Compiler-Interpreter', '@parser',
 
-        'SUnit',
 
+        'SUnit', 'Importer-Exporter',
 
         'Kernel-Tests', 'Compiler-Tests', 'SUnit-Tests'],
 
         output_name: 'test/amber_test_runner'
 
       },

+ 5 - 5
index.html
View File 

@@ -12,12 +12,12 @@
 
 <body>
 
 <script type='text/javascript'>
 
     require(
 
-            ["smalltalk", "amber-full-devel"],
 
-            function (smalltalk) {
 
-                smalltalk.initialize();
 
+        ["amber_vm/smalltalk", "amber_set/full-devel"],
 
+        function (smalltalk) {
 
+            smalltalk.initialize();
 
 
-                smalltalk.Browser._open()
 
-            }
 
+            smalltalk.Browser._open()
 
+        }
 
     );
 
 </script>
 
 </body>

+ 1 - 1
js/Benchfib.deploy.js
View File 

@@ -1,4 +1,4 @@
 
-define(["smalltalk","nil","_st"], function(smalltalk,nil,_st){
 
+define("amber/Benchfib", ["amber_vm/smalltalk","amber_vm/nil","amber_vm/_st"], function(smalltalk,nil,_st){
 
 smalltalk.addPackage('Benchfib');
 
 smalltalk.addClass('Benchfib', smalltalk.Object, [], 'Benchfib');

+ 1 - 1
js/Benchfib.js
View File 

@@ -1,4 +1,4 @@
 
-define(["smalltalk","nil","_st"], function(smalltalk,nil,_st){
 
+define("amber/Benchfib", ["amber_vm/smalltalk","amber_vm/nil","amber_vm/_st"], function(smalltalk,nil,_st){
 
 smalltalk.addPackage('Benchfib');
 
 smalltalk.addClass('Benchfib', smalltalk.Object, [], 'Benchfib');

+ 1 - 1
js/Canvas.deploy.js
View File 

@@ -1,4 +1,4 @@
 
-define(["smalltalk","nil","_st"], function(smalltalk,nil,_st){
 
+define("amber/Canvas", ["amber_vm/smalltalk","amber_vm/nil","amber_vm/_st"], function(smalltalk,nil,_st){
 
 smalltalk.addPackage('Canvas');
 
 smalltalk.addClass('HTMLCanvas', smalltalk.Object, ['root'], 'Canvas');
 
 smalltalk.addMethod(

+ 1 - 1
js/Canvas.js
View File 

@@ -1,4 +1,4 @@
 
-define(["smalltalk","nil","_st"], function(smalltalk,nil,_st){
 
+define("amber/Canvas", ["amber_vm/smalltalk","amber_vm/nil","amber_vm/_st"], function(smalltalk,nil,_st){
 
 smalltalk.addPackage('Canvas');
 
 smalltalk.addClass('HTMLCanvas', smalltalk.Object, ['root'], 'Canvas');
 
 smalltalk.HTMLCanvas.comment="I am a canvas for building HTML.\x0a\x0aI provide the `#tag:` method to create a `TagBrush` (wrapping a DOM element) and convenience methods in the `tags` protocol.\x0a\x0a## API\x0a\x0aMy instances are used as the argument of the `#renderOn:` method of `Widget` objects.\x0a\x0aThe `#with:` method is used to compose HTML, nesting tags. `#with:` can take a `TagBrush`, a `String`, a `BlockClosure` or a `Widget` as argument.\x0a\x0a## Usage example:\x0a\x0a    aCanvas a \x0a        with: [ aCanvas span with: 'click me' ];\x0a        onClick: [ window alert: 'clicked!' ]";

+ 1 - 1
js/Compiler-AST.deploy.js
View File 

@@ -1,4 +1,4 @@
 
-define(["smalltalk","nil","_st"], function(smalltalk,nil,_st){
 
+define("amber/Compiler-AST", ["amber_vm/smalltalk","amber_vm/nil","amber_vm/_st"], function(smalltalk,nil,_st){
 
 smalltalk.addPackage('Compiler-AST');
 
 smalltalk.addClass('Node', smalltalk.Object, ['parent', 'position', 'nodes', 'shouldBeInlined', 'shouldBeAliased'], 'Compiler-AST');
 
 smalltalk.addMethod(

+ 1 - 1
js/Compiler-AST.js
View File 

@@ -1,4 +1,4 @@
 
-define(["smalltalk","nil","_st"], function(smalltalk,nil,_st){
 
+define("amber/Compiler-AST", ["amber_vm/smalltalk","amber_vm/nil","amber_vm/_st"], function(smalltalk,nil,_st){
 
 smalltalk.addPackage('Compiler-AST');
 
 smalltalk.addClass('Node', smalltalk.Object, ['parent', 'position', 'nodes', 'shouldBeInlined', 'shouldBeAliased'], 'Compiler-AST');
 
 smalltalk.Node.comment="I am the abstract root class of the abstract syntax tree.\x0a\x0aConcrete classes should implement `#accept:` to allow visiting.\x0a\x0a`position` holds a point containing line and column number of the symbol location in the original source file.";

+ 1 - 1
js/Compiler-Core.deploy.js
View File 

@@ -1,4 +1,4 @@
 
-define(["smalltalk","nil","_st"], function(smalltalk,nil,_st){
 
+define("amber/Compiler-Core", ["amber_vm/smalltalk","amber_vm/nil","amber_vm/_st"], function(smalltalk,nil,_st){
 
 smalltalk.addPackage('Compiler-Core');
 
 smalltalk.addClass('AbstractCodeGenerator', smalltalk.Object, ['currentClass', 'source'], 'Compiler-Core');
 
 smalltalk.addMethod(

+ 1 - 1
js/Compiler-Core.js
View File 

@@ -1,4 +1,4 @@
 
-define(["smalltalk","nil","_st"], function(smalltalk,nil,_st){
 
+define("amber/Compiler-Core", ["amber_vm/smalltalk","amber_vm/nil","amber_vm/_st"], function(smalltalk,nil,_st){
 
 smalltalk.addPackage('Compiler-Core');
 
 smalltalk.addClass('AbstractCodeGenerator', smalltalk.Object, ['currentClass', 'source'], 'Compiler-Core');
 
 smalltalk.AbstractCodeGenerator.comment="I am the abstract super class of all code generators and provide their common API.";

+ 1 - 1
js/Compiler-Exceptions.deploy.js
View File 

@@ -1,4 +1,4 @@
 
-define(["smalltalk","nil","_st"], function(smalltalk,nil,_st){
 
+define("amber/Compiler-Exceptions", ["amber_vm/smalltalk","amber_vm/nil","amber_vm/_st"], function(smalltalk,nil,_st){
 
 smalltalk.addPackage('Compiler-Exceptions');
 
 smalltalk.addClass('CompilerError', smalltalk.Error, [], 'Compiler-Exceptions');

+ 1 - 1
js/Compiler-Exceptions.js
View File 

@@ -1,4 +1,4 @@
 
-define(["smalltalk","nil","_st"], function(smalltalk,nil,_st){
 
+define("amber/Compiler-Exceptions", ["amber_vm/smalltalk","amber_vm/nil","amber_vm/_st"], function(smalltalk,nil,_st){
 
 smalltalk.addPackage('Compiler-Exceptions');
 
 smalltalk.addClass('CompilerError', smalltalk.Error, [], 'Compiler-Exceptions');
 
 smalltalk.CompilerError.comment="I am the common superclass of all compiling errors.";

+ 1 - 1
js/Compiler-IR.deploy.js
View File 

@@ -1,4 +1,4 @@
 
-define(["smalltalk","nil","_st"], function(smalltalk,nil,_st){
 
+define("amber/Compiler-IR", ["amber_vm/smalltalk","amber_vm/nil","amber_vm/_st"], function(smalltalk,nil,_st){
 
 smalltalk.addPackage('Compiler-IR');
 
 smalltalk.addClass('IRASTTranslator', smalltalk.NodeVisitor, ['source', 'theClass', 'method', 'sequence', 'nextAlias'], 'Compiler-IR');
 
 smalltalk.addMethod(

+ 1 - 1
js/Compiler-IR.js
View File 

@@ -1,4 +1,4 @@
 
-define(["smalltalk","nil","_st"], function(smalltalk,nil,_st){
 
+define("amber/Compiler-IR", ["amber_vm/smalltalk","amber_vm/nil","amber_vm/_st"], function(smalltalk,nil,_st){
 
 smalltalk.addPackage('Compiler-IR');
 
 smalltalk.addClass('IRASTTranslator', smalltalk.NodeVisitor, ['source', 'theClass', 'method', 'sequence', 'nextAlias'], 'Compiler-IR');
 
 smalltalk.IRASTTranslator.comment="I am the AST (abstract syntax tree) visitor responsible for building the intermediate representation graph.";

+ 1 - 1
js/Compiler-Inlining.deploy.js
View File 

@@ -1,4 +1,4 @@
 
-define(["smalltalk","nil","_st"], function(smalltalk,nil,_st){
 
+define("amber/Compiler-Inlining", ["amber_vm/smalltalk","amber_vm/nil","amber_vm/_st"], function(smalltalk,nil,_st){
 
 smalltalk.addPackage('Compiler-Inlining');
 
 smalltalk.addClass('IRInlinedAssignment', smalltalk.IRAssignment, [], 'Compiler-Inlining');
 
 smalltalk.addMethod(

+ 1 - 1
js/Compiler-Inlining.js
View File 

@@ -1,4 +1,4 @@
 
-define(["smalltalk","nil","_st"], function(smalltalk,nil,_st){
 
+define("amber/Compiler-Inlining", ["amber_vm/smalltalk","amber_vm/nil","amber_vm/_st"], function(smalltalk,nil,_st){
 
 smalltalk.addPackage('Compiler-Inlining');
 
 smalltalk.addClass('IRInlinedAssignment', smalltalk.IRAssignment, [], 'Compiler-Inlining');
 
 smalltalk.IRInlinedAssignment.comment="I represent an inlined assignment instruction.";

+ 1 - 1
js/Compiler-Interpreter.deploy.js
View File 

@@ -1,4 +1,4 @@
 
-define(["smalltalk","nil","_st"], function(smalltalk,nil,_st){
 
+define("amber/Compiler-Interpreter", ["amber_vm/smalltalk","amber_vm/nil","amber_vm/_st"], function(smalltalk,nil,_st){
 
 smalltalk.addPackage('Compiler-Interpreter');
 
 smalltalk.addClass('AIContext', smalltalk.NodeVisitor, ['methodContext', 'outerContext', 'pc', 'locals', 'method'], 'Compiler-Interpreter');
 
 smalltalk.addMethod(

+ 1 - 1
js/Compiler-Interpreter.js
View File 

@@ -1,4 +1,4 @@
 
-define(["smalltalk","nil","_st"], function(smalltalk,nil,_st){
 
+define("amber/Compiler-Interpreter", ["amber_vm/smalltalk","amber_vm/nil","amber_vm/_st"], function(smalltalk,nil,_st){
 
 smalltalk.addPackage('Compiler-Interpreter');
 
 smalltalk.addClass('AIContext', smalltalk.NodeVisitor, ['methodContext', 'outerContext', 'pc', 'locals', 'method'], 'Compiler-Interpreter');
 
 smalltalk.AIContext.comment="I am like a `MethodContext`, used by the `ASTInterpreter`.\x0aUnlike a `MethodContext`, my instances are not read-only.\x0a\x0aWhen debugging, my instances are created by copying the current `MethodContext` (thisContext)";

+ 1 - 1
js/Compiler-Semantic.deploy.js
View File 

@@ -1,4 +1,4 @@
 
-define(["smalltalk","nil","_st"], function(smalltalk,nil,_st){
 
+define("amber/Compiler-Semantic", ["amber_vm/smalltalk","amber_vm/nil","amber_vm/_st"], function(smalltalk,nil,_st){
 
 smalltalk.addPackage('Compiler-Semantic');
 
 smalltalk.addClass('LexicalScope', smalltalk.Object, ['node', 'instruction', 'temps', 'args', 'outerScope'], 'Compiler-Semantic');
 
 smalltalk.addMethod(

+ 1 - 1
js/Compiler-Semantic.js
View File 

@@ -1,4 +1,4 @@
 
-define(["smalltalk","nil","_st"], function(smalltalk,nil,_st){
 
+define("amber/Compiler-Semantic", ["amber_vm/smalltalk","amber_vm/nil","amber_vm/_st"], function(smalltalk,nil,_st){
 
 smalltalk.addPackage('Compiler-Semantic');
 
 smalltalk.addClass('LexicalScope', smalltalk.Object, ['node', 'instruction', 'temps', 'args', 'outerScope'], 'Compiler-Semantic');
 
 smalltalk.LexicalScope.comment="I represent a lexical scope where variable names are associated with ScopeVars\x0aInstances are used for block scopes. Method scopes are instances of MethodLexicalScope.\x0a\x0aI am attached to a ScopeVar and method/block nodes.\x0aEach context (method/closure) get a fresh scope that inherits from its outer scope.";

+ 1 - 1
js/Compiler-Tests.deploy.js
View File 

@@ -1,4 +1,4 @@
 
-define(["smalltalk","nil","_st"], function(smalltalk,nil,_st){
 
+define("amber/Compiler-Tests", ["amber_vm/smalltalk","amber_vm/nil","amber_vm/_st"], function(smalltalk,nil,_st){
 
 smalltalk.addPackage('Compiler-Tests');
 
 smalltalk.addClass('ASTVisitorTest', smalltalk.TestCase, [], 'Compiler-Tests');
 
 smalltalk.addMethod(

+ 1 - 1
js/Compiler-Tests.js
View File 

@@ -1,4 +1,4 @@
 
-define(["smalltalk","nil","_st"], function(smalltalk,nil,_st){
 
+define("amber/Compiler-Tests", ["amber_vm/smalltalk","amber_vm/nil","amber_vm/_st"], function(smalltalk,nil,_st){
 
 smalltalk.addPackage('Compiler-Tests');
 
 smalltalk.addClass('ASTVisitorTest', smalltalk.TestCase, [], 'Compiler-Tests');
 
 smalltalk.addMethod(

+ 1 - 1
js/Examples.deploy.js
View File 

@@ -1,4 +1,4 @@
 
-define(["smalltalk","nil","_st"], function(smalltalk,nil,_st){
 
+define("amber/Examples", ["amber_vm/smalltalk","amber_vm/nil","amber_vm/_st"], function(smalltalk,nil,_st){
 
 smalltalk.addPackage('Examples');
 
 smalltalk.addClass('Counter', smalltalk.Widget, ['count', 'header'], 'Examples');
 
 smalltalk.addMethod(

+ 1 - 1
js/Examples.js
View File 

@@ -1,4 +1,4 @@
 
-define(["smalltalk","nil","_st"], function(smalltalk,nil,_st){
 
+define("amber/Examples", ["amber_vm/smalltalk","amber_vm/nil","amber_vm/_st"], function(smalltalk,nil,_st){
 
 smalltalk.addPackage('Examples');
 
 smalltalk.addClass('Counter', smalltalk.Widget, ['count', 'header'], 'Examples');
 
 smalltalk.Counter.comment="This is a trivial Widget example mimicking the classic Counter example in Seaside.\x0aIn order to play with it, just evaluate the doit below in a workspace.\x0aThen take a look in the HTML document above the IDE.\x0a\x0a\x09\x09Counter new appendToJQuery: 'body' asJQuery";

+ 1 - 1
js/Helios-Announcements.deploy.js
View File 

@@ -1,4 +1,4 @@
 
-define(["smalltalk","nil","_st"], function(smalltalk,nil,_st){
 
+define("amber/Helios-Announcements", ["amber_vm/smalltalk","amber_vm/nil","amber_vm/_st"], function(smalltalk,nil,_st){
 
 smalltalk.addPackage('Helios-Announcements');
 
 smalltalk.addClass('HLAboutToChange', smalltalk.Object, ['actionBlock'], 'Helios-Announcements');
 
 smalltalk.addMethod(

+ 1 - 1
js/Helios-Announcements.js
View File 

@@ -1,4 +1,4 @@
 
-define(["smalltalk","nil","_st"], function(smalltalk,nil,_st){
 
+define("amber/Helios-Announcements", ["amber_vm/smalltalk","amber_vm/nil","amber_vm/_st"], function(smalltalk,nil,_st){
 
 smalltalk.addPackage('Helios-Announcements');
 
 smalltalk.addClass('HLAboutToChange', smalltalk.Object, ['actionBlock'], 'Helios-Announcements');
 
 smalltalk.addMethod(

+ 1 - 1
js/Helios-Browser.deploy.js
View File 

@@ -1,4 +1,4 @@
 
-define(["smalltalk","nil","_st"], function(smalltalk,nil,_st){
 
+define("amber/Helios-Browser", ["amber_vm/smalltalk","amber_vm/nil","amber_vm/_st"], function(smalltalk,nil,_st){
 
 smalltalk.addPackage('Helios-Browser');
 
 smalltalk.addClass('HLBrowser', smalltalk.HLWidget, ['model', 'packagesListWidget', 'classesListWidget', 'protocolsListWidget', 'methodsListWidget', 'sourceWidget', 'bottomDiv'], 'Helios-Browser');
 
 smalltalk.addMethod(

+ 1 - 1
js/Helios-Browser.js
View File 

@@ -1,4 +1,4 @@
 
-define(["smalltalk","nil","_st"], function(smalltalk,nil,_st){
 
+define("amber/Helios-Browser", ["amber_vm/smalltalk","amber_vm/nil","amber_vm/_st"], function(smalltalk,nil,_st){
 
 smalltalk.addPackage('Helios-Browser');
 
 smalltalk.addClass('HLBrowser', smalltalk.HLWidget, ['model', 'packagesListWidget', 'classesListWidget', 'protocolsListWidget', 'methodsListWidget', 'sourceWidget', 'bottomDiv'], 'Helios-Browser');
 
 smalltalk.HLBrowser.comment="I render a system browser with 4 panes (Packages, Classes, Protocols, Methods) and a source area.";

+ 1 - 1
js/Helios-Commands-Browser.deploy.js
View File 

@@ -1,4 +1,4 @@
 
-define(["smalltalk","nil","_st"], function(smalltalk,nil,_st){
 
+define("amber/Helios-Commands-Browser", ["amber_vm/smalltalk","amber_vm/nil","amber_vm/_st"], function(smalltalk,nil,_st){
 
 smalltalk.addPackage('Helios-Commands-Browser');
 
 smalltalk.addClass('HLBrowserCommand', smalltalk.HLToolCommand, [], 'Helios-Commands-Browser');

+ 1 - 1
js/Helios-Commands-Browser.js
View File 

@@ -1,4 +1,4 @@
 
-define(["smalltalk","nil","_st"], function(smalltalk,nil,_st){
 
+define("amber/Helios-Commands-Browser", ["amber_vm/smalltalk","amber_vm/nil","amber_vm/_st"], function(smalltalk,nil,_st){
 
 smalltalk.addPackage('Helios-Commands-Browser');
 
 smalltalk.addClass('HLBrowserCommand', smalltalk.HLToolCommand, [], 'Helios-Commands-Browser');

+ 1 - 1
js/Helios-Commands-Core.deploy.js
View File 

@@ -1,4 +1,4 @@
 
-define(["smalltalk","nil","_st"], function(smalltalk,nil,_st){
 
+define("amber/Helios-Commands-Core", ["amber_vm/smalltalk","amber_vm/nil","amber_vm/_st"], function(smalltalk,nil,_st){
 
 smalltalk.addPackage('Helios-Commands-Core');
 
 smalltalk.addClass('HLCommand', smalltalk.Object, ['input'], 'Helios-Commands-Core');
 
 smalltalk.addMethod(

+ 1 - 1
js/Helios-Commands-Core.js
View File 

@@ -1,4 +1,4 @@
 
-define(["smalltalk","nil","_st"], function(smalltalk,nil,_st){
 
+define("amber/Helios-Commands-Core", ["amber_vm/smalltalk","amber_vm/nil","amber_vm/_st"], function(smalltalk,nil,_st){
 
 smalltalk.addPackage('Helios-Commands-Core');
 
 smalltalk.addClass('HLCommand', smalltalk.Object, ['input'], 'Helios-Commands-Core');
 
 smalltalk.addMethod(

+ 1 - 1
js/Helios-Commands-Tools.deploy.js
View File 

@@ -1,4 +1,4 @@
 
-define(["smalltalk","nil","_st"], function(smalltalk,nil,_st){
 
+define("amber/Helios-Commands-Tools", ["amber_vm/smalltalk","amber_vm/nil","amber_vm/_st"], function(smalltalk,nil,_st){
 
 smalltalk.addPackage('Helios-Commands-Tools');
 
 smalltalk.addClass('HLToolCommand', smalltalk.HLModelCommand, [], 'Helios-Commands-Tools');
 
 smalltalk.addMethod(

+ 1 - 1
js/Helios-Commands-Tools.js
View File 

@@ -1,4 +1,4 @@
 
-define(["smalltalk","nil","_st"], function(smalltalk,nil,_st){
 
+define("amber/Helios-Commands-Tools", ["amber_vm/smalltalk","amber_vm/nil","amber_vm/_st"], function(smalltalk,nil,_st){
 
 smalltalk.addPackage('Helios-Commands-Tools');
 
 smalltalk.addClass('HLToolCommand', smalltalk.HLModelCommand, [], 'Helios-Commands-Tools');
 
 smalltalk.addMethod(

+ 1 - 1
js/Helios-Commands.deploy.js
View File 

@@ -1,4 +1,4 @@
 
-define(["smalltalk","nil","_st"], function(smalltalk,nil,_st){
 
+define("amber/Helios-Commands", ["amber_vm/smalltalk","amber_vm/nil","amber_vm/_st"], function(smalltalk,nil,_st){
 
 smalltalk.addPackage('Helios-Commands');
 
 smalltalk.addClass('HLCommand', smalltalk.Object, [], 'Helios-Commands');
 
 smalltalk.addMethod(

+ 1 - 1
js/Helios-Commands.js
View File 

@@ -1,4 +1,4 @@
 
-define(["smalltalk","nil","_st"], function(smalltalk,nil,_st){
 
+define("amber/Helios-Commands", ["amber_vm/smalltalk","amber_vm/nil","amber_vm/_st"], function(smalltalk,nil,_st){
 
 smalltalk.addPackage('Helios-Commands');
 
 smalltalk.addClass('HLCommand', smalltalk.Object, [], 'Helios-Commands');
 
 smalltalk.addMethod(

+ 2 - 2
js/Helios-Core.deploy.js
View File 

@@ -1,4 +1,4 @@
 
-define(["smalltalk","nil","_st"], function(smalltalk,nil,_st){
 
+define("amber/Helios-Core", ["amber_vm/smalltalk","amber_vm/nil","amber_vm/_st"], function(smalltalk,nil,_st){
 
 smalltalk.addPackage('Helios-Core');
 
 smalltalk.addClass('HLModel', smalltalk.Object, ['announcer', 'environment'], 'Helios-Core');
 
 smalltalk.addMethod(
 
@@ -2455,7 +2455,7 @@ return $3;
 
 } else {
 
 $2;
 
 };
 
-$4=_st(_st(_st(parent)._at_("smalltalk"))._at_("Environment"))._new();
 
+$4=_st(_st(_st(parent)._at_("global_smalltalk"))._at_("Environment"))._new();
 
 return $4;
 
 }, function($ctx1) {$ctx1.fill(self,"defaultEnvironment",{parent:parent},smalltalk.HLManager)})},
 
 messageSends: ["ifNil:", "parent", "opener", "new", "at:"]}),

+ 3 - 3
js/Helios-Core.js
View File 

@@ -1,4 +1,4 @@
 
-define(["smalltalk","nil","_st"], function(smalltalk,nil,_st){
 
+define("amber/Helios-Core", ["amber_vm/smalltalk","amber_vm/nil","amber_vm/_st"], function(smalltalk,nil,_st){
 
 smalltalk.addPackage('Helios-Core');
 
 smalltalk.addClass('HLModel', smalltalk.Object, ['announcer', 'environment'], 'Helios-Core');
 
 smalltalk.HLModel.comment="I am the abstract superclass of all models of Helios.\x0aI am the \x22Model\x22 part of the MVC pattern implementation in Helios.\x0a\x0aI provide access to an `Environment` object and both a local (model-specific) and global (system-specific) announcer.\x0a\x0aThe `#withChangesDo:` method is handy for performing model changes ensuring that all widgets are aware of the change and can prevent it from happening.\x0a\x0aModifications of the system should be done via commands (see `HLCommand` and subclasses).\x0a\x0a";
 
@@ -3237,11 +3237,11 @@ return $3;
 
 } else {
 
 $2;
 
 };
 
-$4=_st(_st(_st(parent)._at_("smalltalk"))._at_("Environment"))._new();
 
+$4=_st(_st(_st(parent)._at_("global_smalltalk"))._at_("Environment"))._new();
 
 return $4;
 
 }, function($ctx1) {$ctx1.fill(self,"defaultEnvironment",{parent:parent},smalltalk.HLManager)})},
 
 args: [],
 
-source: "defaultEnvironment\x0a\x09\x22If helios is loaded from within a frame, answer the parent window environment\x22\x0a\x09\x0a\x09| parent |\x0a\x09\x0a\x09parent := window opener ifNil: [ window parent ].\x0a\x09parent ifNil: [ ^ Environment new ].\x0a\x09\x0a\x09^ ((parent at: 'smalltalk')\x0a\x09\x09at: 'Environment') new",
 
+source: "defaultEnvironment\x0a\x09\x22If helios is loaded from within a frame, answer the parent window environment\x22\x0a\x09\x0a\x09| parent |\x0a\x09\x0a\x09parent := window opener ifNil: [ window parent ].\x0a\x09parent ifNil: [ ^ Environment new ].\x0a\x09\x0a\x09^ ((parent at: 'global_smalltalk')\x0a\x09\x09at: 'Environment') new",
 
 messageSends: ["ifNil:", "parent", "opener", "new", "at:"],
 
 referencedClasses: ["Environment"]
 
 }),

+ 1 - 1
js/Helios-Debugger.deploy.js
View File 

@@ -1,4 +1,4 @@
 
-define(["smalltalk","nil","_st"], function(smalltalk,nil,_st){
 
+define("amber/Helios-Debugger", ["amber_vm/smalltalk","amber_vm/nil","amber_vm/_st"], function(smalltalk,nil,_st){
 
 smalltalk.addPackage('Helios-Debugger');
 
 smalltalk.addClass('HLContextInspectorDecorator', smalltalk.Object, ['context'], 'Helios-Debugger');
 
 smalltalk.addMethod(

+ 1 - 1
js/Helios-Debugger.js
View File 

@@ -1,4 +1,4 @@
 
-define(["smalltalk","nil","_st"], function(smalltalk,nil,_st){
 
+define("amber/Helios-Debugger", ["amber_vm/smalltalk","amber_vm/nil","amber_vm/_st"], function(smalltalk,nil,_st){
 
 smalltalk.addPackage('Helios-Debugger');
 
 smalltalk.addClass('HLContextInspectorDecorator', smalltalk.Object, ['context'], 'Helios-Debugger');
 
 smalltalk.addMethod(

+ 1 - 1
js/Helios-Exceptions.deploy.js
View File 

@@ -1,4 +1,4 @@
 
-define(["smalltalk","nil","_st"], function(smalltalk,nil,_st){
 
+define("amber/Helios-Exceptions", ["amber_vm/smalltalk","amber_vm/nil","amber_vm/_st"], function(smalltalk,nil,_st){
 
 smalltalk.addPackage('Helios-Exceptions');
 
 smalltalk.addClass('HLError', smalltalk.Error, [], 'Helios-Exceptions');

+ 1 - 1
js/Helios-Exceptions.js
View File 

@@ -1,4 +1,4 @@
 
-define(["smalltalk","nil","_st"], function(smalltalk,nil,_st){
 
+define("amber/Helios-Exceptions", ["amber_vm/smalltalk","amber_vm/nil","amber_vm/_st"], function(smalltalk,nil,_st){
 
 smalltalk.addPackage('Helios-Exceptions');
 
 smalltalk.addClass('HLError', smalltalk.Error, [], 'Helios-Exceptions');

+ 1 - 1
js/Helios-Inspector.deploy.js
View File 

@@ -1,4 +1,4 @@
 
-define(["smalltalk","nil","_st"], function(smalltalk,nil,_st){
 
+define("amber/Helios-Inspector", ["amber_vm/smalltalk","amber_vm/nil","amber_vm/_st"], function(smalltalk,nil,_st){
 
 smalltalk.addPackage('Helios-Inspector');
 
 smalltalk.addClass('HLInspectorDisplayWidget', smalltalk.HLNavigationListWidget, ['model'], 'Helios-Inspector');
 
 smalltalk.addMethod(

+ 1 - 1
js/Helios-Inspector.js
View File 

@@ -1,4 +1,4 @@
 
-define(["smalltalk","nil","_st"], function(smalltalk,nil,_st){
 
+define("amber/Helios-Inspector", ["amber_vm/smalltalk","amber_vm/nil","amber_vm/_st"], function(smalltalk,nil,_st){
 
 smalltalk.addPackage('Helios-Inspector');
 
 smalltalk.addClass('HLInspectorDisplayWidget', smalltalk.HLNavigationListWidget, ['model'], 'Helios-Inspector');
 
 smalltalk.addMethod(

+ 1 - 1
js/Helios-KeyBindings.deploy.js
View File 

@@ -1,4 +1,4 @@
 
-define(["smalltalk","nil","_st"], function(smalltalk,nil,_st){
 
+define("amber/Helios-KeyBindings", ["amber_vm/smalltalk","amber_vm/nil","amber_vm/_st"], function(smalltalk,nil,_st){
 
 smalltalk.addPackage('Helios-KeyBindings');
 
 smalltalk.addClass('HLBinding', smalltalk.Object, ['key', 'label'], 'Helios-KeyBindings');
 
 smalltalk.addMethod(

+ 1 - 1
js/Helios-KeyBindings.js
View File 

@@ -1,4 +1,4 @@
 
-define(["smalltalk","nil","_st"], function(smalltalk,nil,_st){
 
+define("amber/Helios-KeyBindings", ["amber_vm/smalltalk","amber_vm/nil","amber_vm/_st"], function(smalltalk,nil,_st){
 
 smalltalk.addPackage('Helios-KeyBindings');
 
 smalltalk.addClass('HLBinding', smalltalk.Object, ['key', 'label'], 'Helios-KeyBindings');
 
 smalltalk.addMethod(

+ 1 - 1
js/Helios-Layout.deploy.js
View File 

@@ -1,4 +1,4 @@
 
-define(["smalltalk","nil","_st"], function(smalltalk,nil,_st){
 
+define("amber/Helios-Layout", ["amber_vm/smalltalk","amber_vm/nil","amber_vm/_st"], function(smalltalk,nil,_st){
 
 smalltalk.addPackage('Helios-Layout');
 
 smalltalk.addClass('HLContainer', smalltalk.HLWidget, ['splitter'], 'Helios-Layout');
 
 smalltalk.addMethod(

+ 1 - 1
js/Helios-Layout.js
View File 

@@ -1,4 +1,4 @@
 
-define(["smalltalk","nil","_st"], function(smalltalk,nil,_st){
 
+define("amber/Helios-Layout", ["amber_vm/smalltalk","amber_vm/nil","amber_vm/_st"], function(smalltalk,nil,_st){
 
 smalltalk.addPackage('Helios-Layout');
 
 smalltalk.addClass('HLContainer', smalltalk.HLWidget, ['splitter'], 'Helios-Layout');
 
 smalltalk.addMethod(

+ 1 - 1
js/Helios-References.deploy.js
View File 

@@ -1,4 +1,4 @@
 
-define(["smalltalk","nil","_st"], function(smalltalk,nil,_st){
 
+define("amber/Helios-References", ["amber_vm/smalltalk","amber_vm/nil","amber_vm/_st"], function(smalltalk,nil,_st){
 
 smalltalk.addPackage('Helios-References');
 
 smalltalk.addClass('HLMethodReference', smalltalk.Object, ['selector', 'methodClass'], 'Helios-References');
 
 smalltalk.addMethod(

+ 1 - 1
js/Helios-References.js
View File 

@@ -1,4 +1,4 @@
 
-define(["smalltalk","nil","_st"], function(smalltalk,nil,_st){
 
+define("amber/Helios-References", ["amber_vm/smalltalk","amber_vm/nil","amber_vm/_st"], function(smalltalk,nil,_st){
 
 smalltalk.addPackage('Helios-References');
 
 smalltalk.addClass('HLMethodReference', smalltalk.Object, ['selector', 'methodClass'], 'Helios-References');
 
 smalltalk.addMethod(

+ 1 - 1
js/Helios-Transcript.deploy.js
View File 

@@ -1,4 +1,4 @@
 
-define(["smalltalk","nil","_st"], function(smalltalk,nil,_st){
 
+define("amber/Helios-Transcript", ["amber_vm/smalltalk","amber_vm/nil","amber_vm/_st"], function(smalltalk,nil,_st){
 
 smalltalk.addPackage('Helios-Transcript');
 
 smalltalk.addClass('HLTranscript', smalltalk.HLWidget, ['textarea'], 'Helios-Transcript');
 
 smalltalk.addMethod(

+ 1 - 1
js/Helios-Transcript.js
View File 

@@ -1,4 +1,4 @@
 
-define(["smalltalk","nil","_st"], function(smalltalk,nil,_st){
 
+define("amber/Helios-Transcript", ["amber_vm/smalltalk","amber_vm/nil","amber_vm/_st"], function(smalltalk,nil,_st){
 
 smalltalk.addPackage('Helios-Transcript');
 
 smalltalk.addClass('HLTranscript', smalltalk.HLWidget, ['textarea'], 'Helios-Transcript');
 
 smalltalk.HLTranscript.comment="I am a widget responsible for displaying transcript contents.\x0a\x0a## Transcript API\x0a\x0a    Transcript \x0a        show: 'hello world';\x0a        cr;\x0a        show: anObject.\x0a\x0a    Transcript clear.\x0a\x0aSee the `Transcript` class.";

+ 1 - 1
js/Helios-Workspace-Tests.deploy.js
View File 

@@ -1,4 +1,4 @@
 
-define(["smalltalk","nil","_st"], function(smalltalk,nil,_st){
 
+define("amber/Helios-Workspace-Tests", ["amber_vm/smalltalk","amber_vm/nil","amber_vm/_st"], function(smalltalk,nil,_st){
 
 smalltalk.addPackage('Helios-Workspace-Tests');
 
 smalltalk.addClass('HLCodeWidgetTest', smalltalk.TestCase, [], 'Helios-Workspace-Tests');
 
 smalltalk.addMethod(

+ 1 - 1
js/Helios-Workspace-Tests.js
View File 

@@ -1,4 +1,4 @@
 
-define(["smalltalk","nil","_st"], function(smalltalk,nil,_st){
 
+define("amber/Helios-Workspace-Tests", ["amber_vm/smalltalk","amber_vm/nil","amber_vm/_st"], function(smalltalk,nil,_st){
 
 smalltalk.addPackage('Helios-Workspace-Tests');
 
 smalltalk.addClass('HLCodeWidgetTest', smalltalk.TestCase, [], 'Helios-Workspace-Tests');
 
 smalltalk.addMethod(

+ 1 - 1
js/Helios-Workspace.deploy.js
View File 

@@ -1,4 +1,4 @@
 
-define(["smalltalk","nil","_st"], function(smalltalk,nil,_st){
 
+define("amber/Helios-Workspace", ["amber_vm/smalltalk","amber_vm/nil","amber_vm/_st"], function(smalltalk,nil,_st){
 
 smalltalk.addPackage('Helios-Workspace');
 
 smalltalk.addClass('HLCodeModel', smalltalk.Object, ['announcer', 'environment', 'receiver'], 'Helios-Workspace');
 
 smalltalk.addMethod(

+ 1 - 1
js/Helios-Workspace.js
View File 

@@ -1,4 +1,4 @@
 
-define(["smalltalk","nil","_st"], function(smalltalk,nil,_st){
 
+define("amber/Helios-Workspace", ["amber_vm/smalltalk","amber_vm/nil","amber_vm/_st"], function(smalltalk,nil,_st){
 
 smalltalk.addPackage('Helios-Workspace');
 
 smalltalk.addClass('HLCodeModel', smalltalk.Object, ['announcer', 'environment', 'receiver'], 'Helios-Workspace');
 
 smalltalk.addMethod(

+ 1 - 1
js/IDE.deploy.js
View File 

@@ -1,4 +1,4 @@
 
-define(["smalltalk","nil","_st"], function(smalltalk,nil,_st){
 
+define("amber/IDE", ["amber_vm/smalltalk","amber_vm/nil","amber_vm/_st"], function(smalltalk,nil,_st){
 
 smalltalk.addPackage('IDE');
 
 smalltalk.addClass('ClassesList', smalltalk.Widget, ['browser', 'ul', 'nodes'], 'IDE');
 
 smalltalk.addMethod(

+ 1 - 1
js/IDE.js
View File 

@@ -1,4 +1,4 @@
 
-define(["smalltalk","nil","_st"], function(smalltalk,nil,_st){
 
+define("amber/IDE", ["amber_vm/smalltalk","amber_vm/nil","amber_vm/_st"], function(smalltalk,nil,_st){
 
 smalltalk.addPackage('IDE');
 
 smalltalk.addClass('ClassesList', smalltalk.Widget, ['browser', 'ul', 'nodes'], 'IDE');
 
 smalltalk.addMethod(

+ 358 - 29
js/Importer-Exporter.deploy.js
View File 

@@ -1,4 +1,4 @@
 
-define(["smalltalk","nil","_st"], function(smalltalk,nil,_st){
 
+define("amber/Importer-Exporter", ["amber_vm/smalltalk","amber_vm/nil","amber_vm/_st"], function(smalltalk,nil,_st){
 
 smalltalk.addPackage('Importer-Exporter');
 
 smalltalk.addClass('ChunkParser', smalltalk.Object, ['stream'], 'Importer-Exporter');
 
 smalltalk.addMethod(
 
@@ -266,11 +266,11 @@ return smalltalk.withContext(function($ctx1) {
 
 var $1;
 
 $1=_st($String())._streamContents_((function(stream){
 
 return smalltalk.withContext(function($ctx2) {
 
-self._exportPackagePrologueOn_(stream);
 
-return _st((function(){
 
-return smalltalk.withContext(function($ctx3) {
 
 package_=_st(_st($Smalltalk())._current())._packageAt_(packageName);
 
 package_;
 
+self._exportPackagePrologueOf_on_(package_,stream);
 
+return _st((function(){
 
+return smalltalk.withContext(function($ctx3) {
 
 self._exportPackageDefinitionOf_on_(package_,stream);
 
 _st(_st(_st(package_)._sortedClasses())._asSet())._do_((function(each){
 
 return smalltalk.withContext(function($ctx4) {
 
@@ -284,7 +284,7 @@ return self._exportPackageEpilogueOn_(stream);
 
 }, function($ctx2) {$ctx2.fillBlock({stream:stream},$ctx1)})}));
 
 return $1;
 
 }, function($ctx1) {$ctx1.fill(self,"exportPackage:",{packageName:packageName,package_:package_},smalltalk.Exporter)})},
 
-messageSends: ["streamContents:", "exportPackagePrologueOn:", "ensure:", "exportPackageEpilogueOn:", "packageAt:", "current", "exportPackageDefinitionOf:on:", "do:", "nextPutAll:", "exportClass:", "asSet", "sortedClasses", "exportPackageExtensionsOf:on:"]}),
 
+messageSends: ["streamContents:", "packageAt:", "current", "exportPackagePrologueOf:on:", "ensure:", "exportPackageEpilogueOn:", "exportPackageDefinitionOf:on:", "do:", "nextPutAll:", "exportClass:", "asSet", "sortedClasses", "exportPackageExtensionsOf:on:"]}),
 
 smalltalk.Exporter);
 
 
 smalltalk.addMethod(
 
@@ -349,16 +349,18 @@ smalltalk.Exporter);
 
 
 smalltalk.addMethod(
 
 smalltalk.method({
 
-selector: "exportPackagePrologueOn:",
 
-fn: function (aStream){
 
+selector: "exportPackagePrologueOf:on:",
 
+fn: function (aPackage,aStream){
 
 var self=this;
 
 return smalltalk.withContext(function($ctx1) { 
 var $1,$2;
 
 $1=aStream;
 
-_st($1)._nextPutAll_("define([\x22smalltalk\x22,\x22nil\x22,\x22_st\x22], function(smalltalk,nil,_st){");
 
+_st($1)._nextPutAll_("define(\x22amber/");
 
+_st($1)._nextPutAll_(_st(aPackage)._name());
 
+_st($1)._nextPutAll_("\x22, [\x22amber_vm/smalltalk\x22,\x22amber_vm/nil\x22,\x22amber_vm/_st\x22], function(smalltalk,nil,_st){");
 
 $2=_st($1)._lf();
 
-return self}, function($ctx1) {$ctx1.fill(self,"exportPackagePrologueOn:",{aStream:aStream},smalltalk.Exporter)})},
 
-messageSends: ["nextPutAll:", "lf"]}),
 
+return self}, function($ctx1) {$ctx1.fill(self,"exportPackagePrologueOf:on:",{aPackage:aPackage,aStream:aStream},smalltalk.Exporter)})},
 
+messageSends: ["nextPutAll:", "name", "lf"]}),
 
 smalltalk.Exporter);
 
 
 
@@ -739,21 +741,136 @@ smalltalk.method({
 
 selector: "commit:",
 
 fn: function (aPackage){
 
 var self=this;
 
-function $Exporter(){return smalltalk.Exporter||(typeof Exporter=="undefined"?nil:Exporter)}
 
-function $StrippedExporter(){return smalltalk.StrippedExporter||(typeof StrippedExporter=="undefined"?nil:StrippedExporter)}
 
-function $ChunkExporter(){return smalltalk.ChunkExporter||(typeof ChunkExporter=="undefined"?nil:ChunkExporter)}
 
 return smalltalk.withContext(function($ctx1) { 
-_st([_st($Exporter()).__minus_gt(_st(_st(_st(_st(aPackage)._commitPathJs()).__comma("/")).__comma(_st(aPackage)._name())).__comma(".js")),_st($StrippedExporter()).__minus_gt(_st(_st(_st(_st(aPackage)._commitPathJs()).__comma("/")).__comma(_st(aPackage)._name())).__comma(".deploy.js")),_st($ChunkExporter()).__minus_gt(_st(_st(_st(_st(aPackage)._commitPathSt()).__comma("/")).__comma(_st(aPackage)._name())).__comma(".st"))])._do_displayingProgress_((function(commitStrategy){
 
-var fileContents;
 
+_st(self._commitChannels())._do_displayingProgress_((function(commitStrategyFactory){
 
+var fileContents,commitStrategy;
 
 return smalltalk.withContext(function($ctx2) {
 
-fileContents=_st(_st(_st(commitStrategy)._key())._new())._exportPackage_(_st(aPackage)._name());
 
+commitStrategy=_st(commitStrategyFactory)._value_(aPackage);
 
+commitStrategy;
 
+fileContents=_st(_st(commitStrategy)._key())._exportPackage_(_st(aPackage)._name());
 
 fileContents;
 
 return self._ajaxPutAt_data_(_st(commitStrategy)._value(),fileContents);
 
-}, function($ctx2) {$ctx2.fillBlock({commitStrategy:commitStrategy,fileContents:fileContents},$ctx1)})}),"Committing package ".__comma(_st(aPackage)._name()));
 
+}, function($ctx2) {$ctx2.fillBlock({commitStrategyFactory:commitStrategyFactory,fileContents:fileContents,commitStrategy:commitStrategy},$ctx1)})}),"Committing package ".__comma(_st(aPackage)._name()));
 
 return self}, function($ctx1) {$ctx1.fill(self,"commit:",{aPackage:aPackage},smalltalk.PackageHandler)})},
 
-messageSends: ["do:displayingProgress:", "exportPackage:", "name", "new", "key", "ajaxPutAt:data:", "value", ",", "->", "commitPathJs", "commitPathSt"]}),
 
+messageSends: ["do:displayingProgress:", "value:", "exportPackage:", "name", "key", "ajaxPutAt:data:", "value", ",", "commitChannels"]}),
 
 smalltalk.PackageHandler);
 
 
+
 
+smalltalk.PackageHandler.klass.iVarNames = ['registry'];
 
+smalltalk.addMethod(
 
+smalltalk.method({
 
+selector: "classRegisteredFor:",
 
+fn: function (aString){
 
+var self=this;
 
+return smalltalk.withContext(function($ctx1) { 
+var $1;
 
+$1=_st(self["@registry"])._at_(aString);
 
+return $1;
 
+}, function($ctx1) {$ctx1.fill(self,"classRegisteredFor:",{aString:aString},smalltalk.PackageHandler.klass)})},
 
+messageSends: ["at:"]}),
 
+smalltalk.PackageHandler.klass);
 
+
 
+smalltalk.addMethod(
 
+smalltalk.method({
 
+selector: "for:",
 
+fn: function (aString){
 
+var self=this;
 
+return smalltalk.withContext(function($ctx1) { 
+var $1;
 
+$1=_st(self._classRegisteredFor_(aString))._new();
 
+return $1;
 
+}, function($ctx1) {$ctx1.fill(self,"for:",{aString:aString},smalltalk.PackageHandler.klass)})},
 
+messageSends: ["new", "classRegisteredFor:"]}),
 
+smalltalk.PackageHandler.klass);
 
+
 
+smalltalk.addMethod(
 
+smalltalk.method({
 
+selector: "initialize",
 
+fn: function (){
 
+var self=this;
 
+return smalltalk.withContext(function($ctx1) { 
+smalltalk.PackageHandler.klass.superclass.fn.prototype._initialize.apply(_st(self), []);
 
+self["@registry"]=smalltalk.HashedCollection._from_([]);
 
+return self}, function($ctx1) {$ctx1.fill(self,"initialize",{},smalltalk.PackageHandler.klass)})},
 
+messageSends: ["initialize"]}),
 
+smalltalk.PackageHandler.klass);
 
+
 
+smalltalk.addMethod(
 
+smalltalk.method({
 
+selector: "register:for:",
 
+fn: function (aClass,aString){
 
+var self=this;
 
+return smalltalk.withContext(function($ctx1) { 
+_st(self["@registry"])._at_put_(aString,aClass);
 
+return self}, function($ctx1) {$ctx1.fill(self,"register:for:",{aClass:aClass,aString:aString},smalltalk.PackageHandler.klass)})},
 
+messageSends: ["at:put:"]}),
 
+smalltalk.PackageHandler.klass);
 
+
 
+smalltalk.addMethod(
 
+smalltalk.method({
 
+selector: "registerFor:",
 
+fn: function (aString){
 
+var self=this;
 
+function $PackageHandler(){return smalltalk.PackageHandler||(typeof PackageHandler=="undefined"?nil:PackageHandler)}
 
+return smalltalk.withContext(function($ctx1) { 
+_st($PackageHandler())._register_for_(self,aString);
 
+return self}, function($ctx1) {$ctx1.fill(self,"registerFor:",{aString:aString},smalltalk.PackageHandler.klass)})},
 
+messageSends: ["register:for:"]}),
 
+smalltalk.PackageHandler.klass);
 
+
 
+
 
+smalltalk.addClass('LegacyPackageHandler', smalltalk.PackageHandler, [], 'Importer-Exporter');
 
+smalltalk.addMethod(
 
+smalltalk.method({
 
+selector: "commitChannels",
 
+fn: function (){
 
+var self=this;
 
+function $Exporter(){return smalltalk.Exporter||(typeof Exporter=="undefined"?nil:Exporter)}
 
+function $StrippedExporter(){return smalltalk.StrippedExporter||(typeof StrippedExporter=="undefined"?nil:StrippedExporter)}
 
+function $ChunkExporter(){return smalltalk.ChunkExporter||(typeof ChunkExporter=="undefined"?nil:ChunkExporter)}
 
+return smalltalk.withContext(function($ctx1) { 
+var $1;
 
+$1=[(function(pkg){
 
+return smalltalk.withContext(function($ctx2) {
 
+return _st(_st($Exporter())._new()).__minus_gt(_st(_st(_st(_st(pkg)._commitPathJs()).__comma("/")).__comma(_st(pkg)._name())).__comma(".js"));
 
+}, function($ctx2) {$ctx2.fillBlock({pkg:pkg},$ctx1)})}),(function(pkg){
 
+return smalltalk.withContext(function($ctx2) {
 
+return _st(_st($StrippedExporter())._new()).__minus_gt(_st(_st(_st(_st(pkg)._commitPathJs()).__comma("/")).__comma(_st(pkg)._name())).__comma(".deploy.js"));
 
+}, function($ctx2) {$ctx2.fillBlock({pkg:pkg},$ctx1)})}),(function(pkg){
 
+return smalltalk.withContext(function($ctx2) {
 
+return _st(_st($ChunkExporter())._new()).__minus_gt(_st(_st(_st(_st(pkg)._commitPathSt()).__comma("/")).__comma(_st(pkg)._name())).__comma(".st"));
 
+}, function($ctx2) {$ctx2.fillBlock({pkg:pkg},$ctx1)})})];
 
+return $1;
 
+}, function($ctx1) {$ctx1.fill(self,"commitChannels",{},smalltalk.LegacyPackageHandler)})},
 
+messageSends: ["->", ",", "name", "commitPathJs", "new", "commitPathSt"]}),
 
+smalltalk.LegacyPackageHandler);
 
+
 
+smalltalk.addMethod(
 
+smalltalk.method({
 
+selector: "commitPathJsFor:",
 
+fn: function (aPackage){
 
+var self=this;
 
+return smalltalk.withContext(function($ctx1) { 
+var $1;
 
+$1=_st(self._class())._defaultCommitPathJs();
 
+return $1;
 
+}, function($ctx1) {$ctx1.fill(self,"commitPathJsFor:",{aPackage:aPackage},smalltalk.LegacyPackageHandler)})},
 
+messageSends: ["defaultCommitPathJs", "class"]}),
 
+smalltalk.LegacyPackageHandler);
 
+
 
+smalltalk.addMethod(
 
+smalltalk.method({
 
+selector: "commitPathStFor:",
 
+fn: function (aPackage){
 
+var self=this;
 
+return smalltalk.withContext(function($ctx1) { 
+var $1;
 
+$1=_st(self._class())._defaultCommitPathSt();
 
+return $1;
 
+}, function($ctx1) {$ctx1.fill(self,"commitPathStFor:",{aPackage:aPackage},smalltalk.LegacyPackageHandler)})},
 
+messageSends: ["defaultCommitPathSt", "class"]}),
 
+smalltalk.LegacyPackageHandler);
 
+
 
 smalltalk.addMethod(
 
 smalltalk.method({
 
 selector: "loadPackage:prefix:",
 
@@ -773,9 +890,9 @@ return self._setupPackageNamed_prefix_(packageName,aString);
 
 return smalltalk.withContext(function($ctx2) {
 
 return _st(window)._alert_("Could not load package at: ".__comma(url));
 
 }, function($ctx2) {$ctx2.fillBlock({},$ctx1)})}))]));
 
-return self}, function($ctx1) {$ctx1.fill(self,"loadPackage:prefix:",{packageName:packageName,aString:aString,url:url},smalltalk.PackageHandler)})},
 
+return self}, function($ctx1) {$ctx1.fill(self,"loadPackage:prefix:",{packageName:packageName,aString:aString,url:url},smalltalk.LegacyPackageHandler)})},
 
 messageSends: [",", "ajax:options:", "->", "ifTrue:", "setupPackageNamed:prefix:", "=", "readyState", "alert:"]}),
 
-smalltalk.PackageHandler);
 
+smalltalk.LegacyPackageHandler);
 
 
 smalltalk.addMethod(
 
 smalltalk.method({
 
@@ -787,9 +904,9 @@ _st(aCollection)._do_((function(each){
 
 return smalltalk.withContext(function($ctx2) {
 
 return self._loadPackage_prefix_(each,aString);
 
 }, function($ctx2) {$ctx2.fillBlock({each:each},$ctx1)})}));
 
-return self}, function($ctx1) {$ctx1.fill(self,"loadPackages:prefix:",{aCollection:aCollection,aString:aString},smalltalk.PackageHandler)})},
 
+return self}, function($ctx1) {$ctx1.fill(self,"loadPackages:prefix:",{aCollection:aCollection,aString:aString},smalltalk.LegacyPackageHandler)})},
 
 messageSends: ["do:", "loadPackage:prefix:"]}),
 
-smalltalk.PackageHandler);
 
+smalltalk.LegacyPackageHandler);
 
 
 smalltalk.addMethod(
 
 smalltalk.method({
 
@@ -803,10 +920,100 @@ $1=_st($Package())._named_(packageName);
 
 _st($1)._setupClasses();
 
 _st($1)._commitPathJs_(_st("/".__comma(aString)).__comma("/js"));
 
 $2=_st($1)._commitPathSt_(_st("/".__comma(aString)).__comma("/st"));
 
-return self}, function($ctx1) {$ctx1.fill(self,"setupPackageNamed:prefix:",{packageName:packageName,aString:aString},smalltalk.PackageHandler)})},
 
+return self}, function($ctx1) {$ctx1.fill(self,"setupPackageNamed:prefix:",{packageName:packageName,aString:aString},smalltalk.LegacyPackageHandler)})},
 
 messageSends: ["setupClasses", "named:", "commitPathJs:", ",", "commitPathSt:"]}),
 
-smalltalk.PackageHandler);
 
+smalltalk.LegacyPackageHandler);
 
+
 
 
+smalltalk.LegacyPackageHandler.klass.iVarNames = ['defaultCommitPathJs','defaultCommitPathSt'];
 
+smalltalk.addMethod(
 
+smalltalk.method({
 
+selector: "commitPathsFromLoader",
 
+fn: function (){
 
+var self=this;
 
+return smalltalk.withContext(function($ctx1) { 
+
 
+		var commitPath = typeof amber !== 'undefined' && amber.commitPath;
 
+		if (!commitPath) return;
 
+		if (commitPath.js) self._defaultCommitPathJs_(commitPath.js);
 
+		if (commitPath.st) self._defaultCommitPathSt_(commitPath.st);
 
+	;
 
+return self}, function($ctx1) {$ctx1.fill(self,"commitPathsFromLoader",{},smalltalk.LegacyPackageHandler.klass)})},
 
+messageSends: []}),
 
+smalltalk.LegacyPackageHandler.klass);
 
+
 
+smalltalk.addMethod(
 
+smalltalk.method({
 
+selector: "defaultCommitPathJs",
 
+fn: function (){
 
+var self=this;
 
+return smalltalk.withContext(function($ctx1) { 
+var $2,$1;
 
+$2=self["@defaultCommitPathJs"];
 
+if(($receiver = $2) == nil || $receiver == undefined){
 
+self["@defaultCommitPathJs"]="js";
 
+$1=self["@defaultCommitPathJs"];
 
+} else {
 
+$1=$2;
 
+};
 
+return $1;
 
+}, function($ctx1) {$ctx1.fill(self,"defaultCommitPathJs",{},smalltalk.LegacyPackageHandler.klass)})},
 
+messageSends: ["ifNil:"]}),
 
+smalltalk.LegacyPackageHandler.klass);
 
+
 
+smalltalk.addMethod(
 
+smalltalk.method({
 
+selector: "defaultCommitPathJs:",
 
+fn: function (aString){
 
+var self=this;
 
+return smalltalk.withContext(function($ctx1) { 
+self["@defaultCommitPathJs"]=aString;
 
+return self}, function($ctx1) {$ctx1.fill(self,"defaultCommitPathJs:",{aString:aString},smalltalk.LegacyPackageHandler.klass)})},
 
+messageSends: []}),
 
+smalltalk.LegacyPackageHandler.klass);
 
+
 
+smalltalk.addMethod(
 
+smalltalk.method({
 
+selector: "defaultCommitPathSt",
 
+fn: function (){
 
+var self=this;
 
+return smalltalk.withContext(function($ctx1) { 
+var $2,$1;
 
+$2=self["@defaultCommitPathSt"];
 
+if(($receiver = $2) == nil || $receiver == undefined){
 
+self["@defaultCommitPathSt"]="st";
 
+$1=self["@defaultCommitPathSt"];
 
+} else {
 
+$1=$2;
 
+};
 
+return $1;
 
+}, function($ctx1) {$ctx1.fill(self,"defaultCommitPathSt",{},smalltalk.LegacyPackageHandler.klass)})},
 
+messageSends: ["ifNil:"]}),
 
+smalltalk.LegacyPackageHandler.klass);
 
+
 
+smalltalk.addMethod(
 
+smalltalk.method({
 
+selector: "defaultCommitPathSt:",
 
+fn: function (aString){
 
+var self=this;
 
+return smalltalk.withContext(function($ctx1) { 
+self["@defaultCommitPathSt"]=aString;
 
+return self}, function($ctx1) {$ctx1.fill(self,"defaultCommitPathSt:",{aString:aString},smalltalk.LegacyPackageHandler.klass)})},
 
+messageSends: []}),
 
+smalltalk.LegacyPackageHandler.klass);
 
+
 
+smalltalk.addMethod(
 
+smalltalk.method({
 
+selector: "initialize",
 
+fn: function (){
 
+var self=this;
 
+return smalltalk.withContext(function($ctx1) { 
+smalltalk.LegacyPackageHandler.klass.superclass.fn.prototype._initialize.apply(_st(self), []);
 
+self._registerFor_("unknown");
 
+self._commitPathsFromLoader();
 
+return self}, function($ctx1) {$ctx1.fill(self,"initialize",{},smalltalk.LegacyPackageHandler.klass)})},
 
+messageSends: ["initialize", "registerFor:", "commitPathsFromLoader"]}),
 
+smalltalk.LegacyPackageHandler.klass);
 
 
 smalltalk.addMethod(
 
 smalltalk.method({
 
@@ -817,9 +1024,21 @@ return smalltalk.withContext(function($ctx1) {
 
 var $1;
 
 $1=_st(self._new())._loadPackages_prefix_(aCollection,aString);
 
 return $1;
 
-}, function($ctx1) {$ctx1.fill(self,"loadPackages:prefix:",{aCollection:aCollection,aString:aString},smalltalk.PackageHandler.klass)})},
 
+}, function($ctx1) {$ctx1.fill(self,"loadPackages:prefix:",{aCollection:aCollection,aString:aString},smalltalk.LegacyPackageHandler.klass)})},
 
 messageSends: ["loadPackages:prefix:", "new"]}),
 
-smalltalk.PackageHandler.klass);
 
+smalltalk.LegacyPackageHandler.klass);
 
+
 
+smalltalk.addMethod(
 
+smalltalk.method({
 
+selector: "resetCommitPaths",
 
+fn: function (){
 
+var self=this;
 
+return smalltalk.withContext(function($ctx1) { 
+self["@defaultCommitPathJs"]=nil;
 
+self["@defaultCommitPathSt"]=nil;
 
+return self}, function($ctx1) {$ctx1.fill(self,"resetCommitPaths",{},smalltalk.LegacyPackageHandler.klass)})},
 
+messageSends: []}),
 
+smalltalk.LegacyPackageHandler.klass);
 
 
 
 smalltalk.addMethod(
 
@@ -827,13 +1046,123 @@ smalltalk.method({
 
 selector: "commit",
 
 fn: function (){
 
 var self=this;
 
-function $PackageHandler(){return smalltalk.PackageHandler||(typeof PackageHandler=="undefined"?nil:PackageHandler)}
 
 return smalltalk.withContext(function($ctx1) { 
 var $1;
 
-$1=_st(_st($PackageHandler())._new())._commit_(self);
 
+$1=_st(self._transport())._commit_(self);
 
 return $1;
 
 }, function($ctx1) {$ctx1.fill(self,"commit",{},smalltalk.Package)})},
 
-messageSends: ["commit:", "new"]}),
 
+messageSends: ["commit:", "transport"]}),
 
+smalltalk.Package);
 
+
 
+smalltalk.addMethod(
 
+smalltalk.method({
 
+selector: "commitPathJs",
 
+fn: function (){
 
+var self=this;
 
+return smalltalk.withContext(function($ctx1) { 
+var $3,$2,$1;
 
+$3=self["@extension"];
 
+if(($receiver = $3) == nil || $receiver == undefined){
 
+self["@extension"]=smalltalk.HashedCollection._from_([]);
 
+$2=self["@extension"];
 
+} else {
 
+$2=$3;
 
+};
 
+$1=_st($2)._at_ifAbsentPut_("commitPathJs",(function(){
 
+return smalltalk.withContext(function($ctx2) {
 
+return _st(self._transport())._commitPathJsFor_(self);
 
+}, function($ctx2) {$ctx2.fillBlock({},$ctx1)})}));
 
+return $1;
 
+}, function($ctx1) {$ctx1.fill(self,"commitPathJs",{},smalltalk.Package)})},
 
+messageSends: ["at:ifAbsentPut:", "commitPathJsFor:", "transport", "ifNil:"]}),
 
+smalltalk.Package);
 
+
 
+smalltalk.addMethod(
 
+smalltalk.method({
 
+selector: "commitPathJs:",
 
+fn: function (aString){
 
+var self=this;
 
+return smalltalk.withContext(function($ctx1) { 
+var $3,$2,$1;
 
+$3=self["@extension"];
 
+if(($receiver = $3) == nil || $receiver == undefined){
 
+self["@extension"]=smalltalk.HashedCollection._from_([]);
 
+$2=self["@extension"];
 
+} else {
 
+$2=$3;
 
+};
 
+$1=_st($2)._at_put_("commitPathJs",aString);
 
+return $1;
 
+}, function($ctx1) {$ctx1.fill(self,"commitPathJs:",{aString:aString},smalltalk.Package)})},
 
+messageSends: ["at:put:", "ifNil:"]}),
 
+smalltalk.Package);
 
+
 
+smalltalk.addMethod(
 
+smalltalk.method({
 
+selector: "commitPathSt",
 
+fn: function (){
 
+var self=this;
 
+return smalltalk.withContext(function($ctx1) { 
+var $3,$2,$1;
 
+$3=self["@extension"];
 
+if(($receiver = $3) == nil || $receiver == undefined){
 
+self["@extension"]=smalltalk.HashedCollection._from_([]);
 
+$2=self["@extension"];
 
+} else {
 
+$2=$3;
 
+};
 
+$1=_st($2)._at_ifAbsentPut_("commitPathSt",(function(){
 
+return smalltalk.withContext(function($ctx2) {
 
+return _st(self._transport())._commitPathStFor_(self);
 
+}, function($ctx2) {$ctx2.fillBlock({},$ctx1)})}));
 
+return $1;
 
+}, function($ctx1) {$ctx1.fill(self,"commitPathSt",{},smalltalk.Package)})},
 
+messageSends: ["at:ifAbsentPut:", "commitPathStFor:", "transport", "ifNil:"]}),
 
+smalltalk.Package);
 
+
 
+smalltalk.addMethod(
 
+smalltalk.method({
 
+selector: "commitPathSt:",
 
+fn: function (aString){
 
+var self=this;
 
+return smalltalk.withContext(function($ctx1) { 
+var $3,$2,$1;
 
+$3=self["@extension"];
 
+if(($receiver = $3) == nil || $receiver == undefined){
 
+self["@extension"]=smalltalk.HashedCollection._from_([]);
 
+$2=self["@extension"];
 
+} else {
 
+$2=$3;
 
+};
 
+$1=_st($2)._at_put_("commitPathSt",aString);
 
+return $1;
 
+}, function($ctx1) {$ctx1.fill(self,"commitPathSt:",{aString:aString},smalltalk.Package)})},
 
+messageSends: ["at:put:", "ifNil:"]}),
 
+smalltalk.Package);
 
+
 
+smalltalk.addMethod(
 
+smalltalk.method({
 
+selector: "transport",
 
+fn: function (){
 
+var self=this;
 
+function $PackageHandler(){return smalltalk.PackageHandler||(typeof PackageHandler=="undefined"?nil:PackageHandler)}
 
+return smalltalk.withContext(function($ctx1) { 
+var $1;
 
+$1=_st($PackageHandler())._for_(self._transportType());
 
+return $1;
 
+}, function($ctx1) {$ctx1.fill(self,"transport",{},smalltalk.Package)})},
 
+messageSends: ["for:", "transportType"]}),
 
+smalltalk.Package);
 
+
 
+smalltalk.addMethod(
 
+smalltalk.method({
 
+selector: "transportType",
 
+fn: function (){
 
+var self=this;
 
+return smalltalk.withContext(function($ctx1) { 
+return (self.transport && self.transport.type) || 'unknown';;
 
+return self}, function($ctx1) {$ctx1.fill(self,"transportType",{},smalltalk.Package)})},
 
+messageSends: []}),
 
 smalltalk.Package);
 
 
 });

+ 470 - 35
js/Importer-Exporter.js
View File 

@@ -1,4 +1,4 @@
 
-define(["smalltalk","nil","_st"], function(smalltalk,nil,_st){
 
+define("amber/Importer-Exporter", ["amber_vm/smalltalk","amber_vm/nil","amber_vm/_st"], function(smalltalk,nil,_st){
 
 smalltalk.addPackage('Importer-Exporter');
 
 smalltalk.addClass('ChunkParser', smalltalk.Object, ['stream'], 'Importer-Exporter');
 
 smalltalk.ChunkParser.comment="I am responsible for parsing aStream contents in the chunk format.\x0a\x0a## API\x0a\x0a    ChunkParser new\x0a        stream: aStream;\x0a        nextChunk";
 
@@ -319,11 +319,11 @@ return smalltalk.withContext(function($ctx1) {
 
 var $1;
 
 $1=_st($String())._streamContents_((function(stream){
 
 return smalltalk.withContext(function($ctx2) {
 
-self._exportPackagePrologueOn_(stream);
 
-return _st((function(){
 
-return smalltalk.withContext(function($ctx3) {
 
 package_=_st(_st($Smalltalk())._current())._packageAt_(packageName);
 
 package_;
 
+self._exportPackagePrologueOf_on_(package_,stream);
 
+return _st((function(){
 
+return smalltalk.withContext(function($ctx3) {
 
 self._exportPackageDefinitionOf_on_(package_,stream);
 
 _st(_st(_st(package_)._sortedClasses())._asSet())._do_((function(each){
 
 return smalltalk.withContext(function($ctx4) {
 
@@ -338,8 +338,8 @@ return self._exportPackageEpilogueOn_(stream);
 
 return $1;
 
 }, function($ctx1) {$ctx1.fill(self,"exportPackage:",{packageName:packageName,package_:package_},smalltalk.Exporter)})},
 
 args: ["packageName"],
 
-source: "exportPackage: packageName\x0a\x09\x22Export a given package by name.\x22\x0a\x0a\x09| package |\x0a\x09^String streamContents: [:stream |\x0a\x09\x09self exportPackagePrologueOn: stream.\x0a\x09\x09[\x0a\x09\x09\x09package := Smalltalk current packageAt: packageName.\x0a\x09\x09\x09self exportPackageDefinitionOf: package on: stream.\x0a\x0a\x09\x09\x09\x22Export classes in dependency order.\x0a\x09\x09\x09Update (issue #171): Remove duplicates for export\x22\x0a\x09\x09\x09package sortedClasses asSet do: [:each |\x0a\x09\x09\x09\x09\x09\x09stream nextPutAll: (self exportClass: each)].\x0a\x09\x09\x09self exportPackageExtensionsOf: package on: stream\x0a\x09\x09] ensure: [\x0a\x09\x09\x09self exportPackageEpilogueOn: stream\x0a\x09\x09]]",
 
-messageSends: ["streamContents:", "exportPackagePrologueOn:", "ensure:", "exportPackageEpilogueOn:", "packageAt:", "current", "exportPackageDefinitionOf:on:", "do:", "nextPutAll:", "exportClass:", "asSet", "sortedClasses", "exportPackageExtensionsOf:on:"],
 
+source: "exportPackage: packageName\x0a\x09\x22Export a given package by name.\x22\x0a\x0a\x09| package |\x0a\x09^String streamContents: [:stream |\x0a\x09\x09package := Smalltalk current packageAt: packageName.\x0a\x09\x09self exportPackagePrologueOf: package on: stream.\x0a\x09\x09[\x0a\x09\x09\x09self exportPackageDefinitionOf: package on: stream.\x0a\x0a\x09\x09\x09\x22Export classes in dependency order.\x0a\x09\x09\x09Update (issue #171): Remove duplicates for export\x22\x0a\x09\x09\x09package sortedClasses asSet do: [:each |\x0a\x09\x09\x09\x09\x09\x09stream nextPutAll: (self exportClass: each)].\x0a\x09\x09\x09self exportPackageExtensionsOf: package on: stream\x0a\x09\x09] ensure: [\x0a\x09\x09\x09self exportPackageEpilogueOn: stream\x0a\x09\x09]]",
 
+messageSends: ["streamContents:", "packageAt:", "current", "exportPackagePrologueOf:on:", "ensure:", "exportPackageEpilogueOn:", "exportPackageDefinitionOf:on:", "do:", "nextPutAll:", "exportClass:", "asSet", "sortedClasses", "exportPackageExtensionsOf:on:"],
 
 referencedClasses: ["Smalltalk", "String"]
 
 }),
 
 smalltalk.Exporter);
 
@@ -421,19 +421,21 @@ smalltalk.Exporter);
 
 
 smalltalk.addMethod(
 
 smalltalk.method({
 
-selector: "exportPackagePrologueOn:",
 
+selector: "exportPackagePrologueOf:on:",
 
 category: 'private',
 
-fn: function (aStream){
 
+fn: function (aPackage,aStream){
 
 var self=this;
 
 return smalltalk.withContext(function($ctx1) { 
 var $1,$2;
 
 $1=aStream;
 
-_st($1)._nextPutAll_("define([\x22smalltalk\x22,\x22nil\x22,\x22_st\x22], function(smalltalk,nil,_st){");
 
+_st($1)._nextPutAll_("define(\x22amber/");
 
+_st($1)._nextPutAll_(_st(aPackage)._name());
 
+_st($1)._nextPutAll_("\x22, [\x22amber_vm/smalltalk\x22,\x22amber_vm/nil\x22,\x22amber_vm/_st\x22], function(smalltalk,nil,_st){");
 
 $2=_st($1)._lf();
 
-return self}, function($ctx1) {$ctx1.fill(self,"exportPackagePrologueOn:",{aStream:aStream},smalltalk.Exporter)})},
 
-args: ["aStream"],
 
-source: "exportPackagePrologueOn: aStream\x0a\x09aStream\x0a\x09\x09nextPutAll: 'define([\x22smalltalk\x22,\x22nil\x22,\x22_st\x22], function(smalltalk,nil,_st){';\x0a\x09\x09lf",
 
-messageSends: ["nextPutAll:", "lf"],
 
+return self}, function($ctx1) {$ctx1.fill(self,"exportPackagePrologueOf:on:",{aPackage:aPackage,aStream:aStream},smalltalk.Exporter)})},
 
+args: ["aPackage", "aStream"],
 
+source: "exportPackagePrologueOf: aPackage on: aStream\x0a\x09aStream\x0a\x09\x09nextPutAll: 'define(\x22amber/';\x0a\x09\x09nextPutAll: aPackage name;\x0a\x09\x09nextPutAll: '\x22, [\x22amber_vm/smalltalk\x22,\x22amber_vm/nil\x22,\x22amber_vm/_st\x22], function(smalltalk,nil,_st){';\x0a\x09\x09lf",
 
+messageSends: ["nextPutAll:", "name", "lf"],
 
 referencedClasses: []
 
 }),
 
 smalltalk.Exporter);
 
@@ -896,25 +898,181 @@ selector: "commit:",
 
 category: 'committing',
 
 fn: function (aPackage){
 
 var self=this;
 
-function $Exporter(){return smalltalk.Exporter||(typeof Exporter=="undefined"?nil:Exporter)}
 
-function $StrippedExporter(){return smalltalk.StrippedExporter||(typeof StrippedExporter=="undefined"?nil:StrippedExporter)}
 
-function $ChunkExporter(){return smalltalk.ChunkExporter||(typeof ChunkExporter=="undefined"?nil:ChunkExporter)}
 
 return smalltalk.withContext(function($ctx1) { 
-_st([_st($Exporter()).__minus_gt(_st(_st(_st(_st(aPackage)._commitPathJs()).__comma("/")).__comma(_st(aPackage)._name())).__comma(".js")),_st($StrippedExporter()).__minus_gt(_st(_st(_st(_st(aPackage)._commitPathJs()).__comma("/")).__comma(_st(aPackage)._name())).__comma(".deploy.js")),_st($ChunkExporter()).__minus_gt(_st(_st(_st(_st(aPackage)._commitPathSt()).__comma("/")).__comma(_st(aPackage)._name())).__comma(".st"))])._do_displayingProgress_((function(commitStrategy){
 
-var fileContents;
 
+_st(self._commitChannels())._do_displayingProgress_((function(commitStrategyFactory){
 
+var fileContents,commitStrategy;
 
 return smalltalk.withContext(function($ctx2) {
 
-fileContents=_st(_st(_st(commitStrategy)._key())._new())._exportPackage_(_st(aPackage)._name());
 
+commitStrategy=_st(commitStrategyFactory)._value_(aPackage);
 
+commitStrategy;
 
+fileContents=_st(_st(commitStrategy)._key())._exportPackage_(_st(aPackage)._name());
 
 fileContents;
 
 return self._ajaxPutAt_data_(_st(commitStrategy)._value(),fileContents);
 
-}, function($ctx2) {$ctx2.fillBlock({commitStrategy:commitStrategy,fileContents:fileContents},$ctx1)})}),"Committing package ".__comma(_st(aPackage)._name()));
 
+}, function($ctx2) {$ctx2.fillBlock({commitStrategyFactory:commitStrategyFactory,fileContents:fileContents,commitStrategy:commitStrategy},$ctx1)})}),"Committing package ".__comma(_st(aPackage)._name()));
 
 return self}, function($ctx1) {$ctx1.fill(self,"commit:",{aPackage:aPackage},smalltalk.PackageHandler)})},
 
 args: ["aPackage"],
 
-source: "commit: aPackage\x0a\x09{ \x0a\x09\x09Exporter -> (aPackage commitPathJs, '/', aPackage name, '.js').\x0a\x09\x09StrippedExporter -> (aPackage commitPathJs, '/', aPackage name, '.deploy.js').\x0a\x09\x09ChunkExporter -> (aPackage commitPathSt, '/', aPackage name, '.st')\x0a\x09} \x0a\x09\x09do: [ :commitStrategy|| fileContents |\x0a\x09\x09\x09fileContents := (commitStrategy key new exportPackage: aPackage name).\x0a\x09\x09\x09self ajaxPutAt: commitStrategy value data: fileContents ]\x0a\x09\x09displayingProgress: 'Committing package ', aPackage name",
 
-messageSends: ["do:displayingProgress:", "exportPackage:", "name", "new", "key", "ajaxPutAt:data:", "value", ",", "->", "commitPathJs", "commitPathSt"],
 
-referencedClasses: ["Exporter", "StrippedExporter", "ChunkExporter"]
 
+source: "commit: aPackage\x0a\x09self commitChannels\x0a\x09\x09do: [ :commitStrategyFactory || fileContents commitStrategy |\x0a\x09\x09\x09commitStrategy := commitStrategyFactory value: aPackage.\x0a\x09\x09\x09fileContents := (commitStrategy key exportPackage: aPackage name).\x0a\x09\x09\x09self ajaxPutAt: commitStrategy value data: fileContents ]\x0a\x09\x09displayingProgress: 'Committing package ', aPackage name",
 
+messageSends: ["do:displayingProgress:", "value:", "exportPackage:", "name", "key", "ajaxPutAt:data:", "value", ",", "commitChannels"],
 
+referencedClasses: []
 
 }),
 
 smalltalk.PackageHandler);
 
 
+
 
+smalltalk.PackageHandler.klass.iVarNames = ['registry'];
 
+smalltalk.addMethod(
 
+smalltalk.method({
 
+selector: "classRegisteredFor:",
 
+category: 'accessing',
 
+fn: function (aString){
 
+var self=this;
 
+return smalltalk.withContext(function($ctx1) { 
+var $1;
 
+$1=_st(self["@registry"])._at_(aString);
 
+return $1;
 
+}, function($ctx1) {$ctx1.fill(self,"classRegisteredFor:",{aString:aString},smalltalk.PackageHandler.klass)})},
 
+args: ["aString"],
 
+source: "classRegisteredFor: aString\x0a\x09^registry at: aString",
 
+messageSends: ["at:"],
 
+referencedClasses: []
 
+}),
 
+smalltalk.PackageHandler.klass);
 
+
 
+smalltalk.addMethod(
 
+smalltalk.method({
 
+selector: "for:",
 
+category: 'accessing',
 
+fn: function (aString){
 
+var self=this;
 
+return smalltalk.withContext(function($ctx1) { 
+var $1;
 
+$1=_st(self._classRegisteredFor_(aString))._new();
 
+return $1;
 
+}, function($ctx1) {$ctx1.fill(self,"for:",{aString:aString},smalltalk.PackageHandler.klass)})},
 
+args: ["aString"],
 
+source: "for: aString\x0a\x09^(self classRegisteredFor: aString) new",
 
+messageSends: ["new", "classRegisteredFor:"],
 
+referencedClasses: []
 
+}),
 
+smalltalk.PackageHandler.klass);
 
+
 
+smalltalk.addMethod(
 
+smalltalk.method({
 
+selector: "initialize",
 
+category: 'initialization',
 
+fn: function (){
 
+var self=this;
 
+return smalltalk.withContext(function($ctx1) { 
+smalltalk.PackageHandler.klass.superclass.fn.prototype._initialize.apply(_st(self), []);
 
+self["@registry"]=smalltalk.HashedCollection._from_([]);
 
+return self}, function($ctx1) {$ctx1.fill(self,"initialize",{},smalltalk.PackageHandler.klass)})},
 
+args: [],
 
+source: "initialize\x0a\x09super initialize.\x0a\x09registry := #{}",
 
+messageSends: ["initialize"],
 
+referencedClasses: []
 
+}),
 
+smalltalk.PackageHandler.klass);
 
+
 
+smalltalk.addMethod(
 
+smalltalk.method({
 
+selector: "register:for:",
 
+category: 'registry',
 
+fn: function (aClass,aString){
 
+var self=this;
 
+return smalltalk.withContext(function($ctx1) { 
+_st(self["@registry"])._at_put_(aString,aClass);
 
+return self}, function($ctx1) {$ctx1.fill(self,"register:for:",{aClass:aClass,aString:aString},smalltalk.PackageHandler.klass)})},
 
+args: ["aClass", "aString"],
 
+source: "register: aClass for: aString\x0a\x09registry at: aString put: aClass",
 
+messageSends: ["at:put:"],
 
+referencedClasses: []
 
+}),
 
+smalltalk.PackageHandler.klass);
 
+
 
+smalltalk.addMethod(
 
+smalltalk.method({
 
+selector: "registerFor:",
 
+category: 'registry',
 
+fn: function (aString){
 
+var self=this;
 
+function $PackageHandler(){return smalltalk.PackageHandler||(typeof PackageHandler=="undefined"?nil:PackageHandler)}
 
+return smalltalk.withContext(function($ctx1) { 
+_st($PackageHandler())._register_for_(self,aString);
 
+return self}, function($ctx1) {$ctx1.fill(self,"registerFor:",{aString:aString},smalltalk.PackageHandler.klass)})},
 
+args: ["aString"],
 
+source: "registerFor: aString\x0a\x09PackageHandler register: self for: aString",
 
+messageSends: ["register:for:"],
 
+referencedClasses: ["PackageHandler"]
 
+}),
 
+smalltalk.PackageHandler.klass);
 
+
 
+
 
+smalltalk.addClass('LegacyPackageHandler', smalltalk.PackageHandler, [], 'Importer-Exporter');
 
+smalltalk.LegacyPackageHandler.comment="I am responsible for handling package loading and committing.\x0a\x0aI should not be used directly. Instead, use the corresponding `Package` methods.";
 
+smalltalk.addMethod(
 
+smalltalk.method({
 
+selector: "commitChannels",
 
+category: 'committing',
 
+fn: function (){
 
+var self=this;
 
+function $Exporter(){return smalltalk.Exporter||(typeof Exporter=="undefined"?nil:Exporter)}
 
+function $StrippedExporter(){return smalltalk.StrippedExporter||(typeof StrippedExporter=="undefined"?nil:StrippedExporter)}
 
+function $ChunkExporter(){return smalltalk.ChunkExporter||(typeof ChunkExporter=="undefined"?nil:ChunkExporter)}
 
+return smalltalk.withContext(function($ctx1) { 
+var $1;
 
+$1=[(function(pkg){
 
+return smalltalk.withContext(function($ctx2) {
 
+return _st(_st($Exporter())._new()).__minus_gt(_st(_st(_st(_st(pkg)._commitPathJs()).__comma("/")).__comma(_st(pkg)._name())).__comma(".js"));
 
+}, function($ctx2) {$ctx2.fillBlock({pkg:pkg},$ctx1)})}),(function(pkg){
 
+return smalltalk.withContext(function($ctx2) {
 
+return _st(_st($StrippedExporter())._new()).__minus_gt(_st(_st(_st(_st(pkg)._commitPathJs()).__comma("/")).__comma(_st(pkg)._name())).__comma(".deploy.js"));
 
+}, function($ctx2) {$ctx2.fillBlock({pkg:pkg},$ctx1)})}),(function(pkg){
 
+return smalltalk.withContext(function($ctx2) {
 
+return _st(_st($ChunkExporter())._new()).__minus_gt(_st(_st(_st(_st(pkg)._commitPathSt()).__comma("/")).__comma(_st(pkg)._name())).__comma(".st"));
 
+}, function($ctx2) {$ctx2.fillBlock({pkg:pkg},$ctx1)})})];
 
+return $1;
 
+}, function($ctx1) {$ctx1.fill(self,"commitChannels",{},smalltalk.LegacyPackageHandler)})},
 
+args: [],
 
+source: "commitChannels\x0a\x09^{ \x0a\x09\x09[ :pkg | Exporter new -> (pkg commitPathJs, '/', pkg name, '.js') ].\x0a\x09\x09[ :pkg | StrippedExporter new -> (pkg commitPathJs, '/', pkg name, '.deploy.js') ].\x0a\x09\x09[ :pkg | ChunkExporter new -> (pkg commitPathSt, '/', pkg name, '.st') ]\x0a\x09}",
 
+messageSends: ["->", ",", "name", "commitPathJs", "new", "commitPathSt"],
 
+referencedClasses: ["Exporter", "StrippedExporter", "ChunkExporter"]
 
+}),
 
+smalltalk.LegacyPackageHandler);
 
+
 
+smalltalk.addMethod(
 
+smalltalk.method({
 
+selector: "commitPathJsFor:",
 
+category: 'committing',
 
+fn: function (aPackage){
 
+var self=this;
 
+return smalltalk.withContext(function($ctx1) { 
+var $1;
 
+$1=_st(self._class())._defaultCommitPathJs();
 
+return $1;
 
+}, function($ctx1) {$ctx1.fill(self,"commitPathJsFor:",{aPackage:aPackage},smalltalk.LegacyPackageHandler)})},
 
+args: ["aPackage"],
 
+source: "commitPathJsFor: aPackage\x0a\x09^self class defaultCommitPathJs",
 
+messageSends: ["defaultCommitPathJs", "class"],
 
+referencedClasses: []
 
+}),
 
+smalltalk.LegacyPackageHandler);
 
+
 
+smalltalk.addMethod(
 
+smalltalk.method({
 
+selector: "commitPathStFor:",
 
+category: 'committing',
 
+fn: function (aPackage){
 
+var self=this;
 
+return smalltalk.withContext(function($ctx1) { 
+var $1;
 
+$1=_st(self._class())._defaultCommitPathSt();
 
+return $1;
 
+}, function($ctx1) {$ctx1.fill(self,"commitPathStFor:",{aPackage:aPackage},smalltalk.LegacyPackageHandler)})},
 
+args: ["aPackage"],
 
+source: "commitPathStFor: aPackage\x0a\x09^self class defaultCommitPathSt",
 
+messageSends: ["defaultCommitPathSt", "class"],
 
+referencedClasses: []
 
+}),
 
+smalltalk.LegacyPackageHandler);
 
+
 
 smalltalk.addMethod(
 
 smalltalk.method({
 
 selector: "loadPackage:prefix:",
 
@@ -935,13 +1093,13 @@ return self._setupPackageNamed_prefix_(packageName,aString);
 
 return smalltalk.withContext(function($ctx2) {
 
 return _st(window)._alert_("Could not load package at: ".__comma(url));
 
 }, function($ctx2) {$ctx2.fillBlock({},$ctx1)})}))]));
 
-return self}, function($ctx1) {$ctx1.fill(self,"loadPackage:prefix:",{packageName:packageName,aString:aString,url:url},smalltalk.PackageHandler)})},
 
+return self}, function($ctx1) {$ctx1.fill(self,"loadPackage:prefix:",{packageName:packageName,aString:aString,url:url},smalltalk.LegacyPackageHandler)})},
 
 args: ["packageName", "aString"],
 
 source: "loadPackage: packageName prefix: aString\x0a\x09| url |\x0a\x09url := '/', aString, '/js/', packageName, '.js'.\x0a\x09jQuery\x0a\x09\x09ajax: url\x0a\x09\x09options: #{\x0a\x09\x09\x09'type' -> 'GET'.\x0a\x09\x09\x09'dataType' -> 'script'.\x0a\x09\x09\x09'complete' -> [ :jqXHR :textStatus |\x0a\x09\x09\x09\x09jqXHR readyState = 4\x0a\x09\x09\x09\x09\x09ifTrue: [ self setupPackageNamed: packageName prefix: aString ] ].\x0a\x09\x09\x09'error' -> [ window alert: 'Could not load package at: ', url ]\x0a\x09\x09}",
 
 messageSends: [",", "ajax:options:", "->", "ifTrue:", "setupPackageNamed:prefix:", "=", "readyState", "alert:"],
 
 referencedClasses: []
 
 }),
 
-smalltalk.PackageHandler);
 
+smalltalk.LegacyPackageHandler);
 
 
 smalltalk.addMethod(
 
 smalltalk.method({
 
@@ -954,13 +1112,13 @@ _st(aCollection)._do_((function(each){
 
 return smalltalk.withContext(function($ctx2) {
 
 return self._loadPackage_prefix_(each,aString);
 
 }, function($ctx2) {$ctx2.fillBlock({each:each},$ctx1)})}));
 
-return self}, function($ctx1) {$ctx1.fill(self,"loadPackages:prefix:",{aCollection:aCollection,aString:aString},smalltalk.PackageHandler)})},
 
+return self}, function($ctx1) {$ctx1.fill(self,"loadPackages:prefix:",{aCollection:aCollection,aString:aString},smalltalk.LegacyPackageHandler)})},
 
 args: ["aCollection", "aString"],
 
 source: "loadPackages: aCollection prefix: aString\x0a\x09aCollection do: [ :each |\x0a\x09\x09self loadPackage: each prefix: aString ]",
 
 messageSends: ["do:", "loadPackage:prefix:"],
 
 referencedClasses: []
 
 }),
 
-smalltalk.PackageHandler);
 
+smalltalk.LegacyPackageHandler);
 
 
 smalltalk.addMethod(
 
 smalltalk.method({
 
@@ -975,14 +1133,134 @@ $1=_st($Package())._named_(packageName);
 
 _st($1)._setupClasses();
 
 _st($1)._commitPathJs_(_st("/".__comma(aString)).__comma("/js"));
 
 $2=_st($1)._commitPathSt_(_st("/".__comma(aString)).__comma("/st"));
 
-return self}, function($ctx1) {$ctx1.fill(self,"setupPackageNamed:prefix:",{packageName:packageName,aString:aString},smalltalk.PackageHandler)})},
 
+return self}, function($ctx1) {$ctx1.fill(self,"setupPackageNamed:prefix:",{packageName:packageName,aString:aString},smalltalk.LegacyPackageHandler)})},
 
 args: ["packageName", "aString"],
 
 source: "setupPackageNamed: packageName prefix: aString\x0a\x0a\x09(Package named: packageName)\x0a\x09\x09setupClasses;\x0a\x09\x09commitPathJs: '/', aString, '/js';\x0a\x09\x09commitPathSt: '/', aString, '/st'",
 
 messageSends: ["setupClasses", "named:", "commitPathJs:", ",", "commitPathSt:"],
 
 referencedClasses: ["Package"]
 
 }),
 
-smalltalk.PackageHandler);
 
+smalltalk.LegacyPackageHandler);
 
+
 
+
 
+smalltalk.LegacyPackageHandler.klass.iVarNames = ['defaultCommitPathJs','defaultCommitPathSt'];
 
+smalltalk.addMethod(
 
+smalltalk.method({
 
+selector: "commitPathsFromLoader",
 
+category: 'commit paths',
 
+fn: function (){
 
+var self=this;
 
+return smalltalk.withContext(function($ctx1) { 
 
+		var commitPath = typeof amber !== 'undefined' && amber.commitPath;
 
+		if (!commitPath) return;
 
+		if (commitPath.js) self._defaultCommitPathJs_(commitPath.js);
 
+		if (commitPath.st) self._defaultCommitPathSt_(commitPath.st);
 
+	;
 
+return self}, function($ctx1) {$ctx1.fill(self,"commitPathsFromLoader",{},smalltalk.LegacyPackageHandler.klass)})},
 
+args: [],
 
+source: "commitPathsFromLoader\x0a\x09<\x0a\x09\x09var commitPath = typeof amber !== 'undefined' && amber.commitPath;\x0a\x09\x09if (!commitPath) return;\x0a\x09\x09if (commitPath.js) self._defaultCommitPathJs_(commitPath.js);\x0a\x09\x09if (commitPath.st) self._defaultCommitPathSt_(commitPath.st);\x0a\x09>",
 
+messageSends: [],
 
+referencedClasses: []
 
+}),
 
+smalltalk.LegacyPackageHandler.klass);
 
+
 
+smalltalk.addMethod(
 
+smalltalk.method({
 
+selector: "defaultCommitPathJs",
 
+category: 'commit paths',
 
+fn: function (){
 
+var self=this;
 
+return smalltalk.withContext(function($ctx1) { 
+var $2,$1;
 
+$2=self["@defaultCommitPathJs"];
 
+if(($receiver = $2) == nil || $receiver == undefined){
 
+self["@defaultCommitPathJs"]="js";
 
+$1=self["@defaultCommitPathJs"];
 
+} else {
 
+$1=$2;
 
+};
 
+return $1;
 
+}, function($ctx1) {$ctx1.fill(self,"defaultCommitPathJs",{},smalltalk.LegacyPackageHandler.klass)})},
 
+args: [],
 
+source: "defaultCommitPathJs\x0a\x09^ defaultCommitPathJs ifNil: [ defaultCommitPathJs := 'js']",
 
+messageSends: ["ifNil:"],
 
+referencedClasses: []
 
+}),
 
+smalltalk.LegacyPackageHandler.klass);
 
+
 
+smalltalk.addMethod(
 
+smalltalk.method({
 
+selector: "defaultCommitPathJs:",
 
+category: 'commit paths',
 
+fn: function (aString){
 
+var self=this;
 
+return smalltalk.withContext(function($ctx1) { 
+self["@defaultCommitPathJs"]=aString;
 
+return self}, function($ctx1) {$ctx1.fill(self,"defaultCommitPathJs:",{aString:aString},smalltalk.LegacyPackageHandler.klass)})},
 
+args: ["aString"],
 
+source: "defaultCommitPathJs: aString\x0a\x09defaultCommitPathJs := aString",
 
+messageSends: [],
 
+referencedClasses: []
 
+}),
 
+smalltalk.LegacyPackageHandler.klass);
 
+
 
+smalltalk.addMethod(
 
+smalltalk.method({
 
+selector: "defaultCommitPathSt",
 
+category: 'commit paths',
 
+fn: function (){
 
+var self=this;
 
+return smalltalk.withContext(function($ctx1) { 
+var $2,$1;
 
+$2=self["@defaultCommitPathSt"];
 
+if(($receiver = $2) == nil || $receiver == undefined){
 
+self["@defaultCommitPathSt"]="st";
 
+$1=self["@defaultCommitPathSt"];
 
+} else {
 
+$1=$2;
 
+};
 
+return $1;
 
+}, function($ctx1) {$ctx1.fill(self,"defaultCommitPathSt",{},smalltalk.LegacyPackageHandler.klass)})},
 
+args: [],
 
+source: "defaultCommitPathSt\x0a\x09^ defaultCommitPathSt ifNil: [ defaultCommitPathSt := 'st']",
 
+messageSends: ["ifNil:"],
 
+referencedClasses: []
 
+}),
 
+smalltalk.LegacyPackageHandler.klass);
 
+
 
+smalltalk.addMethod(
 
+smalltalk.method({
 
+selector: "defaultCommitPathSt:",
 
+category: 'commit paths',
 
+fn: function (aString){
 
+var self=this;
 
+return smalltalk.withContext(function($ctx1) { 
+self["@defaultCommitPathSt"]=aString;
 
+return self}, function($ctx1) {$ctx1.fill(self,"defaultCommitPathSt:",{aString:aString},smalltalk.LegacyPackageHandler.klass)})},
 
+args: ["aString"],
 
+source: "defaultCommitPathSt: aString\x0a\x09defaultCommitPathSt := aString",
 
+messageSends: [],
 
+referencedClasses: []
 
+}),
 
+smalltalk.LegacyPackageHandler.klass);
 
+
 
+smalltalk.addMethod(
 
+smalltalk.method({
 
+selector: "initialize",
 
+category: 'initialization',
 
+fn: function (){
 
+var self=this;
 
+return smalltalk.withContext(function($ctx1) { 
+smalltalk.LegacyPackageHandler.klass.superclass.fn.prototype._initialize.apply(_st(self), []);
 
+self._registerFor_("unknown");
 
+self._commitPathsFromLoader();
 
+return self}, function($ctx1) {$ctx1.fill(self,"initialize",{},smalltalk.LegacyPackageHandler.klass)})},
 
+args: [],
 
+source: "initialize\x0a\x09super initialize.\x0a\x09self registerFor: 'unknown'.\x0a\x09self commitPathsFromLoader",
 
+messageSends: ["initialize", "registerFor:", "commitPathsFromLoader"],
 
+referencedClasses: []
 
+}),
 
+smalltalk.LegacyPackageHandler.klass);
 
 
 smalltalk.addMethod(
 
 smalltalk.method({
 
@@ -994,13 +1272,30 @@ return smalltalk.withContext(function($ctx1) {
 
 var $1;
 
 $1=_st(self._new())._loadPackages_prefix_(aCollection,aString);
 
 return $1;
 
-}, function($ctx1) {$ctx1.fill(self,"loadPackages:prefix:",{aCollection:aCollection,aString:aString},smalltalk.PackageHandler.klass)})},
 
+}, function($ctx1) {$ctx1.fill(self,"loadPackages:prefix:",{aCollection:aCollection,aString:aString},smalltalk.LegacyPackageHandler.klass)})},
 
 args: ["aCollection", "aString"],
 
 source: "loadPackages: aCollection prefix: aString\x0a\x09^ self new loadPackages: aCollection prefix: aString",
 
 messageSends: ["loadPackages:prefix:", "new"],
 
 referencedClasses: []
 
 }),
 
-smalltalk.PackageHandler.klass);
 
+smalltalk.LegacyPackageHandler.klass);
 
+
 
+smalltalk.addMethod(
 
+smalltalk.method({
 
+selector: "resetCommitPaths",
 
+category: 'commit paths',
 
+fn: function (){
 
+var self=this;
 
+return smalltalk.withContext(function($ctx1) { 
+self["@defaultCommitPathJs"]=nil;
 
+self["@defaultCommitPathSt"]=nil;
 
+return self}, function($ctx1) {$ctx1.fill(self,"resetCommitPaths",{},smalltalk.LegacyPackageHandler.klass)})},
 
+args: [],
 
+source: "resetCommitPaths\x0a\x09defaultCommitPathJs := nil.\x0a\x09defaultCommitPathSt := nil",
 
+messageSends: [],
 
+referencedClasses: []
 
+}),
 
+smalltalk.LegacyPackageHandler.klass);
 
 
 
 smalltalk.addMethod(
 
@@ -1009,17 +1304,157 @@ selector: "commit",
 
 category: '*Importer-Exporter',
 
 fn: function (){
 
 var self=this;
 
-function $PackageHandler(){return smalltalk.PackageHandler||(typeof PackageHandler=="undefined"?nil:PackageHandler)}
 
 return smalltalk.withContext(function($ctx1) { 
 var $1;
 
-$1=_st(_st($PackageHandler())._new())._commit_(self);
 
+$1=_st(self._transport())._commit_(self);
 
 return $1;
 
 }, function($ctx1) {$ctx1.fill(self,"commit",{},smalltalk.Package)})},
 
 args: [],
 
-source: "commit\x0a\x09^ PackageHandler new commit: self",
 
-messageSends: ["commit:", "new"],
 
+source: "commit\x0a\x09^ self transport commit: self",
 
+messageSends: ["commit:", "transport"],
 
+referencedClasses: []
 
+}),
 
+smalltalk.Package);
 
+
 
+smalltalk.addMethod(
 
+smalltalk.method({
 
+selector: "commitPathJs",
 
+category: '*Importer-Exporter',
 
+fn: function (){
 
+var self=this;
 
+return smalltalk.withContext(function($ctx1) { 
+var $3,$2,$1;
 
+$3=self["@extension"];
 
+if(($receiver = $3) == nil || $receiver == undefined){
 
+self["@extension"]=smalltalk.HashedCollection._from_([]);
 
+$2=self["@extension"];
 
+} else {
 
+$2=$3;
 
+};
 
+$1=_st($2)._at_ifAbsentPut_("commitPathJs",(function(){
 
+return smalltalk.withContext(function($ctx2) {
 
+return _st(self._transport())._commitPathJsFor_(self);
 
+}, function($ctx2) {$ctx2.fillBlock({},$ctx1)})}));
 
+return $1;
 
+}, function($ctx1) {$ctx1.fill(self,"commitPathJs",{},smalltalk.Package)})},
 
+args: [],
 
+source: "commitPathJs\x0a\x09^ (extension ifNil: [ extension := #{} ]) at: #commitPathJs ifAbsentPut: [self transport commitPathJsFor: self]",
 
+messageSends: ["at:ifAbsentPut:", "commitPathJsFor:", "transport", "ifNil:"],
 
+referencedClasses: []
 
+}),
 
+smalltalk.Package);
 
+
 
+smalltalk.addMethod(
 
+smalltalk.method({
 
+selector: "commitPathJs:",
 
+category: '*Importer-Exporter',
 
+fn: function (aString){
 
+var self=this;
 
+return smalltalk.withContext(function($ctx1) { 
+var $3,$2,$1;
 
+$3=self["@extension"];
 
+if(($receiver = $3) == nil || $receiver == undefined){
 
+self["@extension"]=smalltalk.HashedCollection._from_([]);
 
+$2=self["@extension"];
 
+} else {
 
+$2=$3;
 
+};
 
+$1=_st($2)._at_put_("commitPathJs",aString);
 
+return $1;
 
+}, function($ctx1) {$ctx1.fill(self,"commitPathJs:",{aString:aString},smalltalk.Package)})},
 
+args: ["aString"],
 
+source: "commitPathJs: aString\x0a\x09^ (extension ifNil: [ extension := #{} ]) at: #commitPathJs put: aString",
 
+messageSends: ["at:put:", "ifNil:"],
 
+referencedClasses: []
 
+}),
 
+smalltalk.Package);
 
+
 
+smalltalk.addMethod(
 
+smalltalk.method({
 
+selector: "commitPathSt",
 
+category: '*Importer-Exporter',
 
+fn: function (){
 
+var self=this;
 
+return smalltalk.withContext(function($ctx1) { 
+var $3,$2,$1;
 
+$3=self["@extension"];
 
+if(($receiver = $3) == nil || $receiver == undefined){
 
+self["@extension"]=smalltalk.HashedCollection._from_([]);
 
+$2=self["@extension"];
 
+} else {
 
+$2=$3;
 
+};
 
+$1=_st($2)._at_ifAbsentPut_("commitPathSt",(function(){
 
+return smalltalk.withContext(function($ctx2) {
 
+return _st(self._transport())._commitPathStFor_(self);
 
+}, function($ctx2) {$ctx2.fillBlock({},$ctx1)})}));
 
+return $1;
 
+}, function($ctx1) {$ctx1.fill(self,"commitPathSt",{},smalltalk.Package)})},
 
+args: [],
 
+source: "commitPathSt\x0a\x09^ (extension ifNil: [ extension := #{} ]) at: #commitPathSt ifAbsentPut: [self transport commitPathStFor: self]",
 
+messageSends: ["at:ifAbsentPut:", "commitPathStFor:", "transport", "ifNil:"],
 
+referencedClasses: []
 
+}),
 
+smalltalk.Package);
 
+
 
+smalltalk.addMethod(
 
+smalltalk.method({
 
+selector: "commitPathSt:",
 
+category: '*Importer-Exporter',
 
+fn: function (aString){
 
+var self=this;
 
+return smalltalk.withContext(function($ctx1) { 
+var $3,$2,$1;
 
+$3=self["@extension"];
 
+if(($receiver = $3) == nil || $receiver == undefined){
 
+self["@extension"]=smalltalk.HashedCollection._from_([]);
 
+$2=self["@extension"];
 
+} else {
 
+$2=$3;
 
+};
 
+$1=_st($2)._at_put_("commitPathSt",aString);
 
+return $1;
 
+}, function($ctx1) {$ctx1.fill(self,"commitPathSt:",{aString:aString},smalltalk.Package)})},
 
+args: ["aString"],
 
+source: "commitPathSt: aString\x0a\x09^ (extension ifNil: [ extension := #{} ]) at: #commitPathSt put: aString",
 
+messageSends: ["at:put:", "ifNil:"],
 
+referencedClasses: []
 
+}),
 
+smalltalk.Package);
 
+
 
+smalltalk.addMethod(
 
+smalltalk.method({
 
+selector: "transport",
 
+category: '*Importer-Exporter',
 
+fn: function (){
 
+var self=this;
 
+function $PackageHandler(){return smalltalk.PackageHandler||(typeof PackageHandler=="undefined"?nil:PackageHandler)}
 
+return smalltalk.withContext(function($ctx1) { 
+var $1;
 
+$1=_st($PackageHandler())._for_(self._transportType());
 
+return $1;
 
+}, function($ctx1) {$ctx1.fill(self,"transport",{},smalltalk.Package)})},
 
+args: [],
 
+source: "transport\x0a\x09^ PackageHandler for: self transportType",
 
+messageSends: ["for:", "transportType"],
 
 referencedClasses: ["PackageHandler"]
 
 }),
 
 smalltalk.Package);
 
 
+smalltalk.addMethod(
 
+smalltalk.method({
 
+selector: "transportType",
 
+category: '*Importer-Exporter',
 
+fn: function (){
 
+var self=this;
 
+return smalltalk.withContext(function($ctx1) { 
+return (self.transport && self.transport.type) || 'unknown';;
 
+return self}, function($ctx1) {$ctx1.fill(self,"transportType",{},smalltalk.Package)})},
 
+args: [],
 
+source: "transportType\x0a\x09<return (self.transport && self.transport.type) || 'unknown';>",
 
+messageSends: [],
 
+referencedClasses: []
 
+}),
 
+smalltalk.Package);
 
+
 
 });

+ 1 - 1
js/Kernel-Announcements.deploy.js
View File 

@@ -1,4 +1,4 @@
 
-define(["smalltalk","nil","_st"], function(smalltalk,nil,_st){
 
+define("amber/Kernel-Announcements", ["amber_vm/smalltalk","amber_vm/nil","amber_vm/_st"], function(smalltalk,nil,_st){
 
 smalltalk.addPackage('Kernel-Announcements');
 
 smalltalk.addClass('AnnouncementSubscription', smalltalk.Object, ['valuable', 'announcementClass'], 'Kernel-Announcements');
 
 smalltalk.addMethod(

+ 1 - 1
js/Kernel-Announcements.js
View File 

@@ -1,4 +1,4 @@
 
-define(["smalltalk","nil","_st"], function(smalltalk,nil,_st){
 
+define("amber/Kernel-Announcements", ["amber_vm/smalltalk","amber_vm/nil","amber_vm/_st"], function(smalltalk,nil,_st){
 
 smalltalk.addPackage('Kernel-Announcements');
 
 smalltalk.addClass('AnnouncementSubscription', smalltalk.Object, ['valuable', 'announcementClass'], 'Kernel-Announcements');
 
 smalltalk.AnnouncementSubscription.comment="I am a single entry in a subscription registry of an `Announcer`.\x0aSeveral subscriptions by the same object is possible.";

+ 1 - 1
js/Kernel-Classes.deploy.js
View File 

@@ -1,4 +1,4 @@
 
-define(["smalltalk","nil","_st"], function(smalltalk,nil,_st){
 
+define("amber/Kernel-Classes", ["amber_vm/smalltalk","amber_vm/nil","amber_vm/_st"], function(smalltalk,nil,_st){
 
 smalltalk.addPackage('Kernel-Classes');
 
 smalltalk.addClass('Behavior', smalltalk.Object, [], 'Kernel-Classes');
 
 smalltalk.addMethod(

+ 1 - 1
js/Kernel-Classes.js
View File 

@@ -1,4 +1,4 @@
 
-define(["smalltalk","nil","_st"], function(smalltalk,nil,_st){
 
+define("amber/Kernel-Classes", ["amber_vm/smalltalk","amber_vm/nil","amber_vm/_st"], function(smalltalk,nil,_st){
 
 smalltalk.addPackage('Kernel-Classes');
 
 smalltalk.addClass('Behavior', smalltalk.Object, [], 'Kernel-Classes');
 
 smalltalk.Behavior.comment="I am the superclass of all class objects.\x0a\x0aI define the protocol for creating instances of a class with `#basicNew` and `#new` (see `boot.js` for class constructors details).\x0a\x0aMy instances know about the subclass/superclass relationships between classes, contain the description that instances are created from,\x0aand hold the method dictionary that's associated with each class.\x0a\x0aI also provides methods for compiling methods, examining the method dictionary, and iterating over the class hierarchy.";

+ 1 - 1
js/Kernel-Collections.deploy.js
View File 

@@ -1,4 +1,4 @@
 
-define(["smalltalk","nil","_st"], function(smalltalk,nil,_st){
 
+define("amber/Kernel-Collections", ["amber_vm/smalltalk","amber_vm/nil","amber_vm/_st"], function(smalltalk,nil,_st){
 
 smalltalk.addPackage('Kernel-Collections');
 
 smalltalk.addClass('Association', smalltalk.Object, ['key', 'value'], 'Kernel-Collections');
 
 smalltalk.addMethod(

+ 1 - 1
js/Kernel-Collections.js
View File 

@@ -1,4 +1,4 @@
 
-define(["smalltalk","nil","_st"], function(smalltalk,nil,_st){
 
+define("amber/Kernel-Collections", ["amber_vm/smalltalk","amber_vm/nil","amber_vm/_st"], function(smalltalk,nil,_st){
 
 smalltalk.addPackage('Kernel-Collections');
 
 smalltalk.addClass('Association', smalltalk.Object, ['key', 'value'], 'Kernel-Collections');
 
 smalltalk.Association.comment="I represent a pair of associated objects, a key and a value. My instances can serve as entries in a dictionary.\x0a\x0aInstances can be created with the class-side method `#key:value:`";

+ 1 - 1
js/Kernel-Exceptions.deploy.js
View File 

@@ -1,4 +1,4 @@
 
-define(["smalltalk","nil","_st"], function(smalltalk,nil,_st){
 
+define("amber/Kernel-Exceptions", ["amber_vm/smalltalk","amber_vm/nil","amber_vm/_st"], function(smalltalk,nil,_st){
 
 smalltalk.addPackage('Kernel-Exceptions');
 
 smalltalk.addClass('Error', smalltalk.Object, ['messageText'], 'Kernel-Exceptions');
 
 smalltalk.addMethod(

+ 1 - 1
js/Kernel-Exceptions.js
View File 

@@ -1,4 +1,4 @@
 
-define(["smalltalk","nil","_st"], function(smalltalk,nil,_st){
 
+define("amber/Kernel-Exceptions", ["amber_vm/smalltalk","amber_vm/nil","amber_vm/_st"], function(smalltalk,nil,_st){
 
 smalltalk.addPackage('Kernel-Exceptions');
 
 smalltalk.addClass('Error', smalltalk.Object, ['messageText'], 'Kernel-Exceptions');
 
 smalltalk.Error.comment="From the ANSI standard:\x0a\x0aThis protocol describes the behavior of instances of class `Error`.\x0aThese are used to represent error conditions that prevent the normal continuation of processing.\x0aActual error exceptions used by an application may be subclasses of this class.\x0aAs `Error` is explicitly specified to be subclassable, conforming implementations must implement its behavior in a non-fragile manner.";

+ 1 - 1
js/Kernel-Methods.deploy.js
View File 

@@ -1,4 +1,4 @@
 
-define(["smalltalk","nil","_st"], function(smalltalk,nil,_st){
 
+define("amber/Kernel-Methods", ["amber_vm/smalltalk","amber_vm/nil","amber_vm/_st"], function(smalltalk,nil,_st){
 
 smalltalk.addPackage('Kernel-Methods');
 
 smalltalk.addClass('BlockClosure', smalltalk.Object, [], 'Kernel-Methods');
 
 smalltalk.addMethod(

+ 1 - 1
js/Kernel-Methods.js
View File 

@@ -1,4 +1,4 @@
 
-define(["smalltalk","nil","_st"], function(smalltalk,nil,_st){
 
+define("amber/Kernel-Methods", ["amber_vm/smalltalk","amber_vm/nil","amber_vm/_st"], function(smalltalk,nil,_st){
 
 smalltalk.addPackage('Kernel-Methods');
 
 smalltalk.addClass('BlockClosure', smalltalk.Object, [], 'Kernel-Methods');
 
 smalltalk.BlockClosure.comment="I represent a lexical closure.\x0aI am is directly mapped to JavaScript Function.\x0a\x0a## API\x0a\x0a1. Evaluation\x0a\x0a    My instances get evaluated with the `#value*` methods in the 'evaluating' protocol.\x0a\x0a    Example: ` [ :x | x + 1 ] value: 3 \x22Answers 4\x22 `\x0a\x0a2. Control structures\x0a\x0a    Blocks are used (together with `Boolean`) for control structures (methods in the `controlling` protocol).\x0a\x0a    Example: `aBlock whileTrue: [ ... ]`\x0a\x0a3. Error handling\x0a\x0a    I provide the `#on:do:` method for handling exceptions.\x0a\x0a    Example: ` aBlock on: MessageNotUnderstood do: [ :ex | ... ] `";

+ 2 - 160
js/Kernel-Objects.deploy.js
View File 

@@ -1,4 +1,4 @@
 
-define(["smalltalk","nil","_st"], function(smalltalk,nil,_st){
 
+define("amber/Kernel-Objects", ["amber_vm/smalltalk","amber_vm/nil","amber_vm/_st"], function(smalltalk,nil,_st){
 
 smalltalk.addPackage('Kernel-Objects');
 
 smalltalk.addClass('Object', smalltalk.nil, [], 'Kernel-Objects');
 
 smalltalk.addMethod(
 
@@ -3058,7 +3058,7 @@ smalltalk.ClassOrganizer);
 
 smalltalk.addClass('PackageOrganizer', smalltalk.Organizer, [], 'Kernel-Objects');
 
 
 
-smalltalk.addClass('Package', smalltalk.Object, ['commitPathJs', 'commitPathSt'], 'Kernel-Objects');
 
+smalltalk.addClass('Package', smalltalk.Object, ['extension'], 'Kernel-Objects');
 
 smalltalk.addMethod(
 
 smalltalk.method({
 
 selector: "classes",
 
@@ -3072,64 +3072,6 @@ return $1;
 
 messageSends: ["elements", "organization"]}),
 
 smalltalk.Package);
 
 
-smalltalk.addMethod(
 
-smalltalk.method({
 
-selector: "commitPathJs",
 
-fn: function (){
 
-var self=this;
 
-return smalltalk.withContext(function($ctx1) { 
-var $2,$1;
 
-$2=self["@commitPathJs"];
 
-if(($receiver = $2) == nil || $receiver == undefined){
 
-$1=_st(self._class())._defaultCommitPathJs();
 
-} else {
 
-$1=$2;
 
-};
 
-return $1;
 
-}, function($ctx1) {$ctx1.fill(self,"commitPathJs",{},smalltalk.Package)})},
 
-messageSends: ["ifNil:", "defaultCommitPathJs", "class"]}),
 
-smalltalk.Package);
 
-
 
-smalltalk.addMethod(
 
-smalltalk.method({
 
-selector: "commitPathJs:",
 
-fn: function (aString){
 
-var self=this;
 
-return smalltalk.withContext(function($ctx1) { 
-self["@commitPathJs"]=aString;
 
-return self}, function($ctx1) {$ctx1.fill(self,"commitPathJs:",{aString:aString},smalltalk.Package)})},
 
-messageSends: []}),
 
-smalltalk.Package);
 
-
 
-smalltalk.addMethod(
 
-smalltalk.method({
 
-selector: "commitPathSt",
 
-fn: function (){
 
-var self=this;
 
-return smalltalk.withContext(function($ctx1) { 
-var $2,$1;
 
-$2=self["@commitPathSt"];
 
-if(($receiver = $2) == nil || $receiver == undefined){
 
-$1=_st(self._class())._defaultCommitPathSt();
 
-} else {
 
-$1=$2;
 
-};
 
-return $1;
 
-}, function($ctx1) {$ctx1.fill(self,"commitPathSt",{},smalltalk.Package)})},
 
-messageSends: ["ifNil:", "defaultCommitPathSt", "class"]}),
 
-smalltalk.Package);
 
-
 
-smalltalk.addMethod(
 
-smalltalk.method({
 
-selector: "commitPathSt:",
 
-fn: function (aString){
 
-var self=this;
 
-return smalltalk.withContext(function($ctx1) { 
-self["@commitPathSt"]=aString;
 
-return self}, function($ctx1) {$ctx1.fill(self,"commitPathSt:",{aString:aString},smalltalk.Package)})},
 
-messageSends: []}),
 
-smalltalk.Package);
 
-
 
 smalltalk.addMethod(
 
 smalltalk.method({
 
 selector: "isPackage",
 
@@ -3228,94 +3170,6 @@ smalltalk.Package);
 
 
 
 smalltalk.Package.klass.iVarNames = ['defaultCommitPathJs','defaultCommitPathSt'];
 
-smalltalk.addMethod(
 
-smalltalk.method({
 
-selector: "commitPathsFromLoader",
 
-fn: function (){
 
-var self=this;
 
-return smalltalk.withContext(function($ctx1) { 
-
 
-		var commitPath = typeof amber !== 'undefined' && amber.commitPath;
 
-		if (!commitPath) return;
 
-		if (commitPath.js) self._defaultCommitPathJs_(commitPath.js);
 
-		if (commitPath.st) self._defaultCommitPathSt_(commitPath.st);
 
-	;
 
-return self}, function($ctx1) {$ctx1.fill(self,"commitPathsFromLoader",{},smalltalk.Package.klass)})},
 
-messageSends: []}),
 
-smalltalk.Package.klass);
 
-
 
-smalltalk.addMethod(
 
-smalltalk.method({
 
-selector: "defaultCommitPathJs",
 
-fn: function (){
 
-var self=this;
 
-return smalltalk.withContext(function($ctx1) { 
-var $2,$1;
 
-$2=self["@defaultCommitPathJs"];
 
-if(($receiver = $2) == nil || $receiver == undefined){
 
-self["@defaultCommitPathJs"]="js";
 
-$1=self["@defaultCommitPathJs"];
 
-} else {
 
-$1=$2;
 
-};
 
-return $1;
 
-}, function($ctx1) {$ctx1.fill(self,"defaultCommitPathJs",{},smalltalk.Package.klass)})},
 
-messageSends: ["ifNil:"]}),
 
-smalltalk.Package.klass);
 
-
 
-smalltalk.addMethod(
 
-smalltalk.method({
 
-selector: "defaultCommitPathJs:",
 
-fn: function (aString){
 
-var self=this;
 
-return smalltalk.withContext(function($ctx1) { 
-self["@defaultCommitPathJs"]=aString;
 
-return self}, function($ctx1) {$ctx1.fill(self,"defaultCommitPathJs:",{aString:aString},smalltalk.Package.klass)})},
 
-messageSends: []}),
 
-smalltalk.Package.klass);
 
-
 
-smalltalk.addMethod(
 
-smalltalk.method({
 
-selector: "defaultCommitPathSt",
 
-fn: function (){
 
-var self=this;
 
-return smalltalk.withContext(function($ctx1) { 
-var $2,$1;
 
-$2=self["@defaultCommitPathSt"];
 
-if(($receiver = $2) == nil || $receiver == undefined){
 
-self["@defaultCommitPathSt"]="st";
 
-$1=self["@defaultCommitPathSt"];
 
-} else {
 
-$1=$2;
 
-};
 
-return $1;
 
-}, function($ctx1) {$ctx1.fill(self,"defaultCommitPathSt",{},smalltalk.Package.klass)})},
 
-messageSends: ["ifNil:"]}),
 
-smalltalk.Package.klass);
 
-
 
-smalltalk.addMethod(
 
-smalltalk.method({
 
-selector: "defaultCommitPathSt:",
 
-fn: function (aString){
 
-var self=this;
 
-return smalltalk.withContext(function($ctx1) { 
-self["@defaultCommitPathSt"]=aString;
 
-return self}, function($ctx1) {$ctx1.fill(self,"defaultCommitPathSt:",{aString:aString},smalltalk.Package.klass)})},
 
-messageSends: []}),
 
-smalltalk.Package.klass);
 
-
 
-smalltalk.addMethod(
 
-smalltalk.method({
 
-selector: "initialize",
 
-fn: function (){
 
-var self=this;
 
-return smalltalk.withContext(function($ctx1) { 
-smalltalk.Object.klass.fn.prototype._initialize.apply(_st(self), []);
 
-self._commitPathsFromLoader();
 
-return self}, function($ctx1) {$ctx1.fill(self,"initialize",{},smalltalk.Package.klass)})},
 
-messageSends: ["initialize", "commitPathsFromLoader"]}),
 
-smalltalk.Package.klass);
 
-
 
 smalltalk.addMethod(
 
 smalltalk.method({
 
 selector: "load:",
 
@@ -3370,18 +3224,6 @@ return $1;
 
 messageSends: ["packageAt:ifAbsent:", "current"]}),
 
 smalltalk.Package.klass);
 
 
-smalltalk.addMethod(
 
-smalltalk.method({
 
-selector: "resetCommitPaths",
 
-fn: function (){
 
-var self=this;
 
-return smalltalk.withContext(function($ctx1) { 
-self["@defaultCommitPathJs"]=nil;
 
-self["@defaultCommitPathSt"]=nil;
 
-return self}, function($ctx1) {$ctx1.fill(self,"resetCommitPaths",{},smalltalk.Package.klass)})},
 
-messageSends: []}),
 
-smalltalk.Package.klass);
 
-
 
 smalltalk.addMethod(
 
 smalltalk.method({
 
 selector: "sortedClasses:",

+ 2 - 215
js/Kernel-Objects.js
View File 

@@ -1,4 +1,4 @@
 
-define(["smalltalk","nil","_st"], function(smalltalk,nil,_st){
 
+define("amber/Kernel-Objects", ["amber_vm/smalltalk","amber_vm/nil","amber_vm/_st"], function(smalltalk,nil,_st){
 
 smalltalk.addPackage('Kernel-Objects');
 
 smalltalk.addClass('Object', smalltalk.nil, [], 'Kernel-Objects');
 
 smalltalk.Object.comment="**I am the root of the Smalltalk class system**. All classes in the system are subclasses of me.\x0a\x0aI provide default behavior common to all normal objects, such as:\x0a\x0a- accessing\x0a- copying\x0a- comparison\x0a- error handling\x0a- message sending\x0a- reflection\x0a\x0aAlso utility messages that all objects should respond to are defined here.\x0a\x0aI have no instance variable.\x0a\x0a##Access\x0a\x0aInstance variables can be accessed with `#instVarAt:` and `#instVarAt:put:`. `#instanceVariableNames` answers a collection of all instance variable names.\x0aAccessing JavaScript properties of an object is done through `#basicAt:`, `#basicAt:put:` and `basicDelete:`.\x0a\x0a##Copying\x0a\x0aCopying an object is handled by `#copy` and `#deepCopy`. The first one performs a shallow copy of the receiver, while the second one performs a deep copy.\x0aThe hook method `#postCopy` can be overriden in subclasses to copy fields as necessary to complete the full copy. It will be sent by the copy of the receiver.\x0a\x0a##Comparison\x0a\x0aI understand equality `#=` and identity `#==` comparison.\x0a\x0a##Error handling\x0a\x0a- `#halt` is the typical message to use for inserting breakpoints during debugging.\x0a- `#error:` throws a generic error exception\x0a- `#doesNotUnderstand:` handles the fact that there was an attempt to send the given message to the receiver but the receiver does not understand this message.\x0a\x09Overriding this message can be useful to implement proxies for example.";
 
@@ -4188,7 +4188,7 @@ smalltalk.addClass('PackageOrganizer', smalltalk.Organizer, [], 'Kernel-Objects'
 
 smalltalk.PackageOrganizer.comment="I am an organizer specific to packages. I hold classes categorization information.";
 
 
 
-smalltalk.addClass('Package', smalltalk.Object, ['commitPathJs', 'commitPathSt'], 'Kernel-Objects');
 
+smalltalk.addClass('Package', smalltalk.Object, ['extension'], 'Kernel-Objects');
 
 smalltalk.Package.comment="I am similar to a \x22class category\x22 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.\x0a\x0aEach package has a name and can be queried for its classes, but it will then resort to a reverse scan of all classes to find them.\x0a\x0a## API\x0a\x0aPackages are manipulated through \x22Smalltalk current\x22, like for example finding one based on a name or with `Package class >> #name` directly:\x0a\x0a    Smalltalk current packageAt: 'Kernel'\x0a    Package named: 'Kernel'\x0a\x0aA 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 \x22class extensions\x22 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.\x0a\x0aYou can fetch a package from the server:\x0a\x0a\x09Package load: 'Additional-Examples'";
 
 smalltalk.addMethod(
 
 smalltalk.method({
 
@@ -4208,84 +4208,6 @@ referencedClasses: []
 
 }),
 
 smalltalk.Package);
 
 
-smalltalk.addMethod(
 
-smalltalk.method({
 
-selector: "commitPathJs",
 
-category: 'accessing',
 
-fn: function (){
 
-var self=this;
 
-return smalltalk.withContext(function($ctx1) { 
-var $2,$1;
 
-$2=self["@commitPathJs"];
 
-if(($receiver = $2) == nil || $receiver == undefined){
 
-$1=_st(self._class())._defaultCommitPathJs();
 
-} else {
 
-$1=$2;
 
-};
 
-return $1;
 
-}, function($ctx1) {$ctx1.fill(self,"commitPathJs",{},smalltalk.Package)})},
 
-args: [],
 
-source: "commitPathJs\x0a\x09^ commitPathJs ifNil: [self class defaultCommitPathJs]",
 
-messageSends: ["ifNil:", "defaultCommitPathJs", "class"],
 
-referencedClasses: []
 
-}),
 
-smalltalk.Package);
 
-
 
-smalltalk.addMethod(
 
-smalltalk.method({
 
-selector: "commitPathJs:",
 
-category: 'accessing',
 
-fn: function (aString){
 
-var self=this;
 
-return smalltalk.withContext(function($ctx1) { 
-self["@commitPathJs"]=aString;
 
-return self}, function($ctx1) {$ctx1.fill(self,"commitPathJs:",{aString:aString},smalltalk.Package)})},
 
-args: ["aString"],
 
-source: "commitPathJs: aString\x0a\x09commitPathJs := aString",
 
-messageSends: [],
 
-referencedClasses: []
 
-}),
 
-smalltalk.Package);
 
-
 
-smalltalk.addMethod(
 
-smalltalk.method({
 
-selector: "commitPathSt",
 
-category: 'accessing',
 
-fn: function (){
 
-var self=this;
 
-return smalltalk.withContext(function($ctx1) { 
-var $2,$1;
 
-$2=self["@commitPathSt"];
 
-if(($receiver = $2) == nil || $receiver == undefined){
 
-$1=_st(self._class())._defaultCommitPathSt();
 
-} else {
 
-$1=$2;
 
-};
 
-return $1;
 
-}, function($ctx1) {$ctx1.fill(self,"commitPathSt",{},smalltalk.Package)})},
 
-args: [],
 
-source: "commitPathSt\x0a\x09^ commitPathSt ifNil: [self class defaultCommitPathSt]",
 
-messageSends: ["ifNil:", "defaultCommitPathSt", "class"],
 
-referencedClasses: []
 
-}),
 
-smalltalk.Package);
 
-
 
-smalltalk.addMethod(
 
-smalltalk.method({
 
-selector: "commitPathSt:",
 
-category: 'accessing',
 
-fn: function (aString){
 
-var self=this;
 
-return smalltalk.withContext(function($ctx1) { 
-self["@commitPathSt"]=aString;
 
-return self}, function($ctx1) {$ctx1.fill(self,"commitPathSt:",{aString:aString},smalltalk.Package)})},
 
-args: ["aString"],
 
-source: "commitPathSt: aString\x0a\x09commitPathSt := aString",
 
-messageSends: [],
 
-referencedClasses: []
 
-}),
 
-smalltalk.Package);
 
-
 
 smalltalk.addMethod(
 
 smalltalk.method({
 
 selector: "isPackage",
 
@@ -4419,124 +4341,6 @@ smalltalk.Package);
 
 
 
 smalltalk.Package.klass.iVarNames = ['defaultCommitPathJs','defaultCommitPathSt'];
 
-smalltalk.addMethod(
 
-smalltalk.method({
 
-selector: "commitPathsFromLoader",
 
-category: 'commit paths',
 
-fn: function (){
 
-var self=this;
 
-return smalltalk.withContext(function($ctx1) { 
-
 
-		var commitPath = typeof amber !== 'undefined' && amber.commitPath;
 
-		if (!commitPath) return;
 
-		if (commitPath.js) self._defaultCommitPathJs_(commitPath.js);
 
-		if (commitPath.st) self._defaultCommitPathSt_(commitPath.st);
 
-	;
 
-return self}, function($ctx1) {$ctx1.fill(self,"commitPathsFromLoader",{},smalltalk.Package.klass)})},
 
-args: [],
 
-source: "commitPathsFromLoader\x0a\x09<\x0a\x09\x09var commitPath = typeof amber !== 'undefined' && amber.commitPath;\x0a\x09\x09if (!commitPath) return;\x0a\x09\x09if (commitPath.js) self._defaultCommitPathJs_(commitPath.js);\x0a\x09\x09if (commitPath.st) self._defaultCommitPathSt_(commitPath.st);\x0a\x09>",
 
-messageSends: [],
 
-referencedClasses: []
 
-}),
 
-smalltalk.Package.klass);
 
-
 
-smalltalk.addMethod(
 
-smalltalk.method({
 
-selector: "defaultCommitPathJs",
 
-category: 'commit paths',
 
-fn: function (){
 
-var self=this;
 
-return smalltalk.withContext(function($ctx1) { 
-var $2,$1;
 
-$2=self["@defaultCommitPathJs"];
 
-if(($receiver = $2) == nil || $receiver == undefined){
 
-self["@defaultCommitPathJs"]="js";
 
-$1=self["@defaultCommitPathJs"];
 
-} else {
 
-$1=$2;
 
-};
 
-return $1;
 
-}, function($ctx1) {$ctx1.fill(self,"defaultCommitPathJs",{},smalltalk.Package.klass)})},
 
-args: [],
 
-source: "defaultCommitPathJs\x0a\x09^ defaultCommitPathJs ifNil: [ defaultCommitPathJs := 'js']",
 
-messageSends: ["ifNil:"],
 
-referencedClasses: []
 
-}),
 
-smalltalk.Package.klass);
 
-
 
-smalltalk.addMethod(
 
-smalltalk.method({
 
-selector: "defaultCommitPathJs:",
 
-category: 'commit paths',
 
-fn: function (aString){
 
-var self=this;
 
-return smalltalk.withContext(function($ctx1) { 
-self["@defaultCommitPathJs"]=aString;
 
-return self}, function($ctx1) {$ctx1.fill(self,"defaultCommitPathJs:",{aString:aString},smalltalk.Package.klass)})},
 
-args: ["aString"],
 
-source: "defaultCommitPathJs: aString\x0a\x09defaultCommitPathJs := aString",
 
-messageSends: [],
 
-referencedClasses: []
 
-}),
 
-smalltalk.Package.klass);
 
-
 
-smalltalk.addMethod(
 
-smalltalk.method({
 
-selector: "defaultCommitPathSt",
 
-category: 'commit paths',
 
-fn: function (){
 
-var self=this;
 
-return smalltalk.withContext(function($ctx1) { 
-var $2,$1;
 
-$2=self["@defaultCommitPathSt"];
 
-if(($receiver = $2) == nil || $receiver == undefined){
 
-self["@defaultCommitPathSt"]="st";
 
-$1=self["@defaultCommitPathSt"];
 
-} else {
 
-$1=$2;
 
-};
 
-return $1;
 
-}, function($ctx1) {$ctx1.fill(self,"defaultCommitPathSt",{},smalltalk.Package.klass)})},
 
-args: [],
 
-source: "defaultCommitPathSt\x0a\x09^ defaultCommitPathSt ifNil: [ defaultCommitPathSt := 'st']",
 
-messageSends: ["ifNil:"],
 
-referencedClasses: []
 
-}),
 
-smalltalk.Package.klass);
 
-
 
-smalltalk.addMethod(
 
-smalltalk.method({
 
-selector: "defaultCommitPathSt:",
 
-category: 'commit paths',
 
-fn: function (aString){
 
-var self=this;
 
-return smalltalk.withContext(function($ctx1) { 
-self["@defaultCommitPathSt"]=aString;
 
-return self}, function($ctx1) {$ctx1.fill(self,"defaultCommitPathSt:",{aString:aString},smalltalk.Package.klass)})},
 
-args: ["aString"],
 
-source: "defaultCommitPathSt: aString\x0a\x09defaultCommitPathSt := aString",
 
-messageSends: [],
 
-referencedClasses: []
 
-}),
 
-smalltalk.Package.klass);
 
-
 
-smalltalk.addMethod(
 
-smalltalk.method({
 
-selector: "initialize",
 
-category: 'initialization',
 
-fn: function (){
 
-var self=this;
 
-return smalltalk.withContext(function($ctx1) { 
-smalltalk.Object.klass.fn.prototype._initialize.apply(_st(self), []);
 
-self._commitPathsFromLoader();
 
-return self}, function($ctx1) {$ctx1.fill(self,"initialize",{},smalltalk.Package.klass)})},
 
-args: [],
 
-source: "initialize\x0a\x09super initialize.\x0a\x09self commitPathsFromLoader",
 
-messageSends: ["initialize", "commitPathsFromLoader"],
 
-referencedClasses: []
 
-}),
 
-smalltalk.Package.klass);
 
-
 
 smalltalk.addMethod(
 
 smalltalk.method({
 
 selector: "load:",
 
@@ -4611,23 +4415,6 @@ referencedClasses: ["Smalltalk"]
 
 }),
 
 smalltalk.Package.klass);
 
 
-smalltalk.addMethod(
 
-smalltalk.method({
 
-selector: "resetCommitPaths",
 
-category: 'commit paths',
 
-fn: function (){
 
-var self=this;
 
-return smalltalk.withContext(function($ctx1) { 
-self["@defaultCommitPathJs"]=nil;
 
-self["@defaultCommitPathSt"]=nil;
 
-return self}, function($ctx1) {$ctx1.fill(self,"resetCommitPaths",{},smalltalk.Package.klass)})},
 
-args: [],
 
-source: "resetCommitPaths\x0a\x09\x09defaultCommitPathJs := nil.\x0a\x09\x09defaultCommitPathSt := nil.",
 
-messageSends: [],
 
-referencedClasses: []
 
-}),
 
-smalltalk.Package.klass);
 
-
 
 smalltalk.addMethod(
 
 smalltalk.method({
 
 selector: "sortedClasses:",

+ 160 - 192
js/Kernel-Tests.deploy.js
View File 

@@ -1,4 +1,4 @@
 
-define(["smalltalk","nil","_st"], function(smalltalk,nil,_st){
 
+define("amber/Kernel-Tests", ["amber_vm/smalltalk","amber_vm/nil","amber_vm/_st"], function(smalltalk,nil,_st){
 
 smalltalk.addPackage('Kernel-Tests');
 
 smalltalk.addClass('BlockClosureTest', smalltalk.TestCase, [], 'Kernel-Tests');
 
 smalltalk.addMethod(
 
@@ -2273,6 +2273,165 @@ smalltalk.JavaScriptExceptionTest);
 
 
 
 
+smalltalk.addClass('LegacyPackageHandlerTest', smalltalk.TestCase, ['zorkPackage', 'grulPackage', 'backUpCommitPathJs', 'backUpCommitPathSt'], 'Kernel-Tests');
 
+smalltalk.addMethod(
 
+smalltalk.method({
 
+selector: "setUp",
 
+fn: function (){
 
+var self=this;
 
+function $LegacyPackageHandler(){return smalltalk.LegacyPackageHandler||(typeof LegacyPackageHandler=="undefined"?nil:LegacyPackageHandler)}
 
+function $Package(){return smalltalk.Package||(typeof Package=="undefined"?nil:Package)}
 
+return smalltalk.withContext(function($ctx1) { 
+var $1,$2;
 
+self["@backUpCommitPathJs"]=_st($LegacyPackageHandler())._defaultCommitPathJs();
 
+self["@backUpCommitPathSt"]=_st($LegacyPackageHandler())._defaultCommitPathSt();
 
+_st($LegacyPackageHandler())._resetCommitPaths();
 
+self["@zorkPackage"]=_st(_st($Package())._new())._name_("Zork");
 
+$1=_st($Package())._new();
 
+_st($1)._name_("Grul");
 
+_st($1)._commitPathJs_("server/grul/js");
 
+_st($1)._commitPathSt_("grul/st");
 
+$2=_st($1)._yourself();
 
+self["@grulPackage"]=$2;
 
+return self}, function($ctx1) {$ctx1.fill(self,"setUp",{},smalltalk.LegacyPackageHandlerTest)})},
 
+messageSends: ["defaultCommitPathJs", "defaultCommitPathSt", "resetCommitPaths", "name:", "new", "commitPathJs:", "commitPathSt:", "yourself"]}),
 
+smalltalk.LegacyPackageHandlerTest);
 
+
 
+smalltalk.addMethod(
 
+smalltalk.method({
 
+selector: "tearDown",
 
+fn: function (){
 
+var self=this;
 
+function $LegacyPackageHandler(){return smalltalk.LegacyPackageHandler||(typeof LegacyPackageHandler=="undefined"?nil:LegacyPackageHandler)}
 
+return smalltalk.withContext(function($ctx1) { 
+var $1,$2;
 
+$1=$LegacyPackageHandler();
 
+_st($1)._defaultCommitPathJs_(self["@backUpCommitPathJs"]);
 
+$2=_st($1)._defaultCommitPathSt_(self["@backUpCommitPathSt"]);
 
+return self}, function($ctx1) {$ctx1.fill(self,"tearDown",{},smalltalk.LegacyPackageHandlerTest)})},
 
+messageSends: ["defaultCommitPathJs:", "defaultCommitPathSt:"]}),
 
+smalltalk.LegacyPackageHandlerTest);
 
+
 
+smalltalk.addMethod(
 
+smalltalk.method({
 
+selector: "testGrulCommitPathJsShouldBeServerGrulJs",
 
+fn: function (){
 
+var self=this;
 
+return smalltalk.withContext(function($ctx1) { 
+self._assert_equals_(_st(self["@grulPackage"])._commitPathJs(),"server/grul/js");
 
+return self}, function($ctx1) {$ctx1.fill(self,"testGrulCommitPathJsShouldBeServerGrulJs",{},smalltalk.LegacyPackageHandlerTest)})},
 
+messageSends: ["assert:equals:", "commitPathJs"]}),
 
+smalltalk.LegacyPackageHandlerTest);
 
+
 
+smalltalk.addMethod(
 
+smalltalk.method({
 
+selector: "testGrulCommitPathStShouldBeGrulSt",
 
+fn: function (){
 
+var self=this;
 
+return smalltalk.withContext(function($ctx1) { 
+self._assert_equals_(_st(self["@grulPackage"])._commitPathSt(),"grul/st");
 
+return self}, function($ctx1) {$ctx1.fill(self,"testGrulCommitPathStShouldBeGrulSt",{},smalltalk.LegacyPackageHandlerTest)})},
 
+messageSends: ["assert:equals:", "commitPathSt"]}),
 
+smalltalk.LegacyPackageHandlerTest);
 
+
 
+smalltalk.addMethod(
 
+smalltalk.method({
 
+selector: "testZorkCommitPathJsShouldBeJs",
 
+fn: function (){
 
+var self=this;
 
+return smalltalk.withContext(function($ctx1) { 
+self._assert_equals_(_st(self["@zorkPackage"])._commitPathJs(),"js");
 
+return self}, function($ctx1) {$ctx1.fill(self,"testZorkCommitPathJsShouldBeJs",{},smalltalk.LegacyPackageHandlerTest)})},
 
+messageSends: ["assert:equals:", "commitPathJs"]}),
 
+smalltalk.LegacyPackageHandlerTest);
 
+
 
+smalltalk.addMethod(
 
+smalltalk.method({
 
+selector: "testZorkCommitPathStShouldBeSt",
 
+fn: function (){
 
+var self=this;
 
+return smalltalk.withContext(function($ctx1) { 
+self._assert_equals_(_st(self["@zorkPackage"])._commitPathSt(),"st");
 
+return self}, function($ctx1) {$ctx1.fill(self,"testZorkCommitPathStShouldBeSt",{},smalltalk.LegacyPackageHandlerTest)})},
 
+messageSends: ["assert:equals:", "commitPathSt"]}),
 
+smalltalk.LegacyPackageHandlerTest);
 
+
 
+
 
+
 
+smalltalk.addClass('LegacyPackageHandlerTestWithDefaultsChanged', smalltalk.LegacyPackageHandlerTest, [], 'Kernel-Tests');
 
+smalltalk.addMethod(
 
+smalltalk.method({
 
+selector: "setUp",
 
+fn: function (){
 
+var self=this;
 
+function $LegacyPackageHandler(){return smalltalk.LegacyPackageHandler||(typeof LegacyPackageHandler=="undefined"?nil:LegacyPackageHandler)}
 
+return smalltalk.withContext(function($ctx1) { 
+var $1,$2;
 
+smalltalk.LegacyPackageHandlerTestWithDefaultsChanged.superclass.fn.prototype._setUp.apply(_st(self), []);
 
+$1=$LegacyPackageHandler();
 
+_st($1)._defaultCommitPathJs_("javascripts/");
 
+$2=_st($1)._defaultCommitPathSt_("smalltalk/");
 
+return self}, function($ctx1) {$ctx1.fill(self,"setUp",{},smalltalk.LegacyPackageHandlerTestWithDefaultsChanged)})},
 
+messageSends: ["setUp", "defaultCommitPathJs:", "defaultCommitPathSt:"]}),
 
+smalltalk.LegacyPackageHandlerTestWithDefaultsChanged);
 
+
 
+smalltalk.addMethod(
 
+smalltalk.method({
 
+selector: "testGrulCommitPathJsShouldBeServerGrulJs",
 
+fn: function (){
 
+var self=this;
 
+return smalltalk.withContext(function($ctx1) { 
+self._assert_equals_(_st(self["@grulPackage"])._commitPathJs(),"server/grul/js");
 
+return self}, function($ctx1) {$ctx1.fill(self,"testGrulCommitPathJsShouldBeServerGrulJs",{},smalltalk.LegacyPackageHandlerTestWithDefaultsChanged)})},
 
+messageSends: ["assert:equals:", "commitPathJs"]}),
 
+smalltalk.LegacyPackageHandlerTestWithDefaultsChanged);
 
+
 
+smalltalk.addMethod(
 
+smalltalk.method({
 
+selector: "testGrulCommitPathStShouldBeGrulSt",
 
+fn: function (){
 
+var self=this;
 
+return smalltalk.withContext(function($ctx1) { 
+self._assert_equals_(_st(self["@grulPackage"])._commitPathSt(),"grul/st");
 
+return self}, function($ctx1) {$ctx1.fill(self,"testGrulCommitPathStShouldBeGrulSt",{},smalltalk.LegacyPackageHandlerTestWithDefaultsChanged)})},
 
+messageSends: ["assert:equals:", "commitPathSt"]}),
 
+smalltalk.LegacyPackageHandlerTestWithDefaultsChanged);
 
+
 
+smalltalk.addMethod(
 
+smalltalk.method({
 
+selector: "testZorkCommitPathJsShouldBeJavascript",
 
+fn: function (){
 
+var self=this;
 
+return smalltalk.withContext(function($ctx1) { 
+self._assert_equals_(_st(self["@zorkPackage"])._commitPathJs(),"javascripts/");
 
+return self}, function($ctx1) {$ctx1.fill(self,"testZorkCommitPathJsShouldBeJavascript",{},smalltalk.LegacyPackageHandlerTestWithDefaultsChanged)})},
 
+messageSends: ["assert:equals:", "commitPathJs"]}),
 
+smalltalk.LegacyPackageHandlerTestWithDefaultsChanged);
 
+
 
+smalltalk.addMethod(
 
+smalltalk.method({
 
+selector: "testZorkCommitPathStShouldBeSmalltalk",
 
+fn: function (){
 
+var self=this;
 
+return smalltalk.withContext(function($ctx1) { 
+self._assert_equals_(_st(self["@zorkPackage"])._commitPathSt(),"smalltalk/");
 
+return self}, function($ctx1) {$ctx1.fill(self,"testZorkCommitPathStShouldBeSmalltalk",{},smalltalk.LegacyPackageHandlerTestWithDefaultsChanged)})},
 
+messageSends: ["assert:equals:", "commitPathSt"]}),
 
+smalltalk.LegacyPackageHandlerTestWithDefaultsChanged);
 
+
 
+
 
+smalltalk.addMethod(
 
+smalltalk.method({
 
+selector: "shouldInheritSelectors",
 
+fn: function (){
 
+var self=this;
 
+return smalltalk.withContext(function($ctx1) { 
+return false;
 
+}, function($ctx1) {$ctx1.fill(self,"shouldInheritSelectors",{},smalltalk.LegacyPackageHandlerTestWithDefaultsChanged.klass)})},
 
+messageSends: []}),
 
+smalltalk.LegacyPackageHandlerTestWithDefaultsChanged.klass);
 
+
 
+
 
 smalltalk.addClass('MessageSendTest', smalltalk.TestCase, [], 'Kernel-Tests');
 
 smalltalk.addMethod(
 
 smalltalk.method({
 
@@ -2781,39 +2940,6 @@ smalltalk.ObjectMock);
 
 
 
 
-smalltalk.addClass('ObjectMock2', smalltalk.ObjectMock, [], 'Kernel-Tests');
 
-smalltalk.addMethod(
 
-smalltalk.method({
 
-selector: "foo",
 
-fn: function (){
 
-var self=this;
 
-return smalltalk.withContext(function($ctx1) { 
-var $1;
 
-$1=self["@foo"];
 
-return $1;
 
-}, function($ctx1) {$ctx1.fill(self,"foo",{},smalltalk.ObjectMock2)})},
 
-messageSends: []}),
 
-smalltalk.ObjectMock2);
 
-
 
-smalltalk.addMethod(
 
-smalltalk.method({
 
-selector: "foo:",
 
-fn: function (anObject){
 
-var self=this;
 
-return smalltalk.withContext(function($ctx1) { 
-self["@foo"]=anObject;
 
-return self}, function($ctx1) {$ctx1.fill(self,"foo:",{anObject:anObject},smalltalk.ObjectMock2)})},
 
-messageSends: []}),
 
-smalltalk.ObjectMock2);
 
-
 
-
 
-
 
-smalltalk.addClass('ObjectMock3', smalltalk.ObjectMock2, [], 'Kernel-Tests');
 
-
 
-
 
-smalltalk.addClass('ObjectMock4', smalltalk.ObjectMock3, [], 'Kernel-Tests');
 
-
 
-
 
 smalltalk.addClass('ObjectTest', smalltalk.TestCase, [], 'Kernel-Tests');
 
 smalltalk.addMethod(
 
 smalltalk.method({
 
@@ -3037,164 +3163,6 @@ smalltalk.ObjectTest);
 
 
 
 
-smalltalk.addClass('PackageTest', smalltalk.TestCase, ['zorkPackage', 'grulPackage', 'backUpCommitPathJs', 'backUpCommitPathSt'], 'Kernel-Tests');
 
-smalltalk.addMethod(
 
-smalltalk.method({
 
-selector: "setUp",
 
-fn: function (){
 
-var self=this;
 
-function $Package(){return smalltalk.Package||(typeof Package=="undefined"?nil:Package)}
 
-return smalltalk.withContext(function($ctx1) { 
-var $1,$2;
 
-self["@backUpCommitPathJs"]=_st($Package())._defaultCommitPathJs();
 
-self["@backUpCommitPathSt"]=_st($Package())._defaultCommitPathSt();
 
-_st($Package())._resetCommitPaths();
 
-self["@zorkPackage"]=_st(_st($Package())._new())._name_("Zork");
 
-$1=_st($Package())._new();
 
-_st($1)._name_("Grul");
 
-_st($1)._commitPathJs_("server/grul/js");
 
-_st($1)._commitPathSt_("grul/st");
 
-$2=_st($1)._yourself();
 
-self["@grulPackage"]=$2;
 
-return self}, function($ctx1) {$ctx1.fill(self,"setUp",{},smalltalk.PackageTest)})},
 
-messageSends: ["defaultCommitPathJs", "defaultCommitPathSt", "resetCommitPaths", "name:", "new", "commitPathJs:", "commitPathSt:", "yourself"]}),
 
-smalltalk.PackageTest);
 
-
 
-smalltalk.addMethod(
 
-smalltalk.method({
 
-selector: "tearDown",
 
-fn: function (){
 
-var self=this;
 
-function $Package(){return smalltalk.Package||(typeof Package=="undefined"?nil:Package)}
 
-return smalltalk.withContext(function($ctx1) { 
-var $1,$2;
 
-$1=$Package();
 
-_st($1)._defaultCommitPathJs_(self["@backUpCommitPathJs"]);
 
-$2=_st($1)._defaultCommitPathSt_(self["@backUpCommitPathSt"]);
 
-return self}, function($ctx1) {$ctx1.fill(self,"tearDown",{},smalltalk.PackageTest)})},
 
-messageSends: ["defaultCommitPathJs:", "defaultCommitPathSt:"]}),
 
-smalltalk.PackageTest);
 
-
 
-smalltalk.addMethod(
 
-smalltalk.method({
 
-selector: "testGrulCommitPathJsShouldBeServerGrulJs",
 
-fn: function (){
 
-var self=this;
 
-return smalltalk.withContext(function($ctx1) { 
-self._assert_equals_(_st(self["@grulPackage"])._commitPathJs(),"server/grul/js");
 
-return self}, function($ctx1) {$ctx1.fill(self,"testGrulCommitPathJsShouldBeServerGrulJs",{},smalltalk.PackageTest)})},
 
-messageSends: ["assert:equals:", "commitPathJs"]}),
 
-smalltalk.PackageTest);
 
-
 
-smalltalk.addMethod(
 
-smalltalk.method({
 
-selector: "testGrulCommitPathStShouldBeGrulSt",
 
-fn: function (){
 
-var self=this;
 
-return smalltalk.withContext(function($ctx1) { 
-self._assert_equals_(_st(self["@grulPackage"])._commitPathSt(),"grul/st");
 
-return self}, function($ctx1) {$ctx1.fill(self,"testGrulCommitPathStShouldBeGrulSt",{},smalltalk.PackageTest)})},
 
-messageSends: ["assert:equals:", "commitPathSt"]}),
 
-smalltalk.PackageTest);
 
-
 
-smalltalk.addMethod(
 
-smalltalk.method({
 
-selector: "testZorkCommitPathJsShouldBeJs",
 
-fn: function (){
 
-var self=this;
 
-return smalltalk.withContext(function($ctx1) { 
-self._assert_equals_(_st(self["@zorkPackage"])._commitPathJs(),"js");
 
-return self}, function($ctx1) {$ctx1.fill(self,"testZorkCommitPathJsShouldBeJs",{},smalltalk.PackageTest)})},
 
-messageSends: ["assert:equals:", "commitPathJs"]}),
 
-smalltalk.PackageTest);
 
-
 
-smalltalk.addMethod(
 
-smalltalk.method({
 
-selector: "testZorkCommitPathStShouldBeSt",
 
-fn: function (){
 
-var self=this;
 
-return smalltalk.withContext(function($ctx1) { 
-self._assert_equals_(_st(self["@zorkPackage"])._commitPathSt(),"st");
 
-return self}, function($ctx1) {$ctx1.fill(self,"testZorkCommitPathStShouldBeSt",{},smalltalk.PackageTest)})},
 
-messageSends: ["assert:equals:", "commitPathSt"]}),
 
-smalltalk.PackageTest);
 
-
 
-
 
-
 
-smalltalk.addClass('PackageWithDefaultCommitPathChangedTest', smalltalk.PackageTest, [], 'Kernel-Tests');
 
-smalltalk.addMethod(
 
-smalltalk.method({
 
-selector: "setUp",
 
-fn: function (){
 
-var self=this;
 
-function $Package(){return smalltalk.Package||(typeof Package=="undefined"?nil:Package)}
 
-return smalltalk.withContext(function($ctx1) { 
-var $1,$2;
 
-smalltalk.PackageWithDefaultCommitPathChangedTest.superclass.fn.prototype._setUp.apply(_st(self), []);
 
-$1=$Package();
 
-_st($1)._defaultCommitPathJs_("javascripts/");
 
-$2=_st($1)._defaultCommitPathSt_("smalltalk/");
 
-return self}, function($ctx1) {$ctx1.fill(self,"setUp",{},smalltalk.PackageWithDefaultCommitPathChangedTest)})},
 
-messageSends: ["setUp", "defaultCommitPathJs:", "defaultCommitPathSt:"]}),
 
-smalltalk.PackageWithDefaultCommitPathChangedTest);
 
-
 
-smalltalk.addMethod(
 
-smalltalk.method({
 
-selector: "testGrulCommitPathJsShouldBeServerGrulJs",
 
-fn: function (){
 
-var self=this;
 
-return smalltalk.withContext(function($ctx1) { 
-self._assert_equals_(_st(self["@grulPackage"])._commitPathJs(),"server/grul/js");
 
-return self}, function($ctx1) {$ctx1.fill(self,"testGrulCommitPathJsShouldBeServerGrulJs",{},smalltalk.PackageWithDefaultCommitPathChangedTest)})},
 
-messageSends: ["assert:equals:", "commitPathJs"]}),
 
-smalltalk.PackageWithDefaultCommitPathChangedTest);
 
-
 
-smalltalk.addMethod(
 
-smalltalk.method({
 
-selector: "testGrulCommitPathStShouldBeGrulSt",
 
-fn: function (){
 
-var self=this;
 
-return smalltalk.withContext(function($ctx1) { 
-self._assert_equals_(_st(self["@grulPackage"])._commitPathSt(),"grul/st");
 
-return self}, function($ctx1) {$ctx1.fill(self,"testGrulCommitPathStShouldBeGrulSt",{},smalltalk.PackageWithDefaultCommitPathChangedTest)})},
 
-messageSends: ["assert:equals:", "commitPathSt"]}),
 
-smalltalk.PackageWithDefaultCommitPathChangedTest);
 
-
 
-smalltalk.addMethod(
 
-smalltalk.method({
 
-selector: "testZorkCommitPathJsShouldBeJavascript",
 
-fn: function (){
 
-var self=this;
 
-return smalltalk.withContext(function($ctx1) { 
-self._assert_equals_(_st(self["@zorkPackage"])._commitPathJs(),"javascripts/");
 
-return self}, function($ctx1) {$ctx1.fill(self,"testZorkCommitPathJsShouldBeJavascript",{},smalltalk.PackageWithDefaultCommitPathChangedTest)})},
 
-messageSends: ["assert:equals:", "commitPathJs"]}),
 
-smalltalk.PackageWithDefaultCommitPathChangedTest);
 
-
 
-smalltalk.addMethod(
 
-smalltalk.method({
 
-selector: "testZorkCommitPathStShouldBeSmalltalk",
 
-fn: function (){
 
-var self=this;
 
-return smalltalk.withContext(function($ctx1) { 
-self._assert_equals_(_st(self["@zorkPackage"])._commitPathSt(),"smalltalk/");
 
-return self}, function($ctx1) {$ctx1.fill(self,"testZorkCommitPathStShouldBeSmalltalk",{},smalltalk.PackageWithDefaultCommitPathChangedTest)})},
 
-messageSends: ["assert:equals:", "commitPathSt"]}),
 
-smalltalk.PackageWithDefaultCommitPathChangedTest);
 
-
 
-
 
-smalltalk.addMethod(
 
-smalltalk.method({
 
-selector: "shouldInheritSelectors",
 
-fn: function (){
 
-var self=this;
 
-return smalltalk.withContext(function($ctx1) { 
-return false;
 
-}, function($ctx1) {$ctx1.fill(self,"shouldInheritSelectors",{},smalltalk.PackageWithDefaultCommitPathChangedTest.klass)})},
 
-messageSends: []}),
 
-smalltalk.PackageWithDefaultCommitPathChangedTest.klass);
 
-
 
-
 
 smalltalk.addClass('PointTest', smalltalk.TestCase, [], 'Kernel-Tests');
 
 smalltalk.addMethod(
 
 smalltalk.method({

+ 220 - 263
js/Kernel-Tests.js
View File 

@@ -1,4 +1,4 @@
 
-define(["smalltalk","nil","_st"], function(smalltalk,nil,_st){
 
+define("amber/Kernel-Tests", ["amber_vm/smalltalk","amber_vm/nil","amber_vm/_st"], function(smalltalk,nil,_st){
 
 smalltalk.addPackage('Kernel-Tests');
 
 smalltalk.addClass('BlockClosureTest', smalltalk.TestCase, [], 'Kernel-Tests');
 
 smalltalk.addMethod(
 
@@ -2858,6 +2858,225 @@ smalltalk.JavaScriptExceptionTest);
 
 
 
 
+smalltalk.addClass('LegacyPackageHandlerTest', smalltalk.TestCase, ['zorkPackage', 'grulPackage', 'backUpCommitPathJs', 'backUpCommitPathSt'], 'Kernel-Tests');
 
+smalltalk.addMethod(
 
+smalltalk.method({
 
+selector: "setUp",
 
+category: 'running',
 
+fn: function (){
 
+var self=this;
 
+function $LegacyPackageHandler(){return smalltalk.LegacyPackageHandler||(typeof LegacyPackageHandler=="undefined"?nil:LegacyPackageHandler)}
 
+function $Package(){return smalltalk.Package||(typeof Package=="undefined"?nil:Package)}
 
+return smalltalk.withContext(function($ctx1) { 
+var $1,$2;
 
+self["@backUpCommitPathJs"]=_st($LegacyPackageHandler())._defaultCommitPathJs();
 
+self["@backUpCommitPathSt"]=_st($LegacyPackageHandler())._defaultCommitPathSt();
 
+_st($LegacyPackageHandler())._resetCommitPaths();
 
+self["@zorkPackage"]=_st(_st($Package())._new())._name_("Zork");
 
+$1=_st($Package())._new();
 
+_st($1)._name_("Grul");
 
+_st($1)._commitPathJs_("server/grul/js");
 
+_st($1)._commitPathSt_("grul/st");
 
+$2=_st($1)._yourself();
 
+self["@grulPackage"]=$2;
 
+return self}, function($ctx1) {$ctx1.fill(self,"setUp",{},smalltalk.LegacyPackageHandlerTest)})},
 
+args: [],
 
+source: "setUp\x0a\x09backUpCommitPathJs := LegacyPackageHandler defaultCommitPathJs.\x0a\x09backUpCommitPathSt := LegacyPackageHandler defaultCommitPathSt.\x0a\x0a\x09LegacyPackageHandler resetCommitPaths.\x0a\x0a\x09zorkPackage := Package new name: 'Zork'.\x0a\x09grulPackage := Package new\x0a\x09\x09\x09\x09\x09name: 'Grul';\x0a\x09\x09\x09\x09\x09commitPathJs: 'server/grul/js';\x0a\x09\x09\x09\x09\x09commitPathSt: 'grul/st';\x0a\x09\x09\x09\x09\x09yourself",
 
+messageSends: ["defaultCommitPathJs", "defaultCommitPathSt", "resetCommitPaths", "name:", "new", "commitPathJs:", "commitPathSt:", "yourself"],
 
+referencedClasses: ["LegacyPackageHandler", "Package"]
 
+}),
 
+smalltalk.LegacyPackageHandlerTest);
 
+
 
+smalltalk.addMethod(
 
+smalltalk.method({
 
+selector: "tearDown",
 
+category: 'running',
 
+fn: function (){
 
+var self=this;
 
+function $LegacyPackageHandler(){return smalltalk.LegacyPackageHandler||(typeof LegacyPackageHandler=="undefined"?nil:LegacyPackageHandler)}
 
+return smalltalk.withContext(function($ctx1) { 
+var $1,$2;
 
+$1=$LegacyPackageHandler();
 
+_st($1)._defaultCommitPathJs_(self["@backUpCommitPathJs"]);
 
+$2=_st($1)._defaultCommitPathSt_(self["@backUpCommitPathSt"]);
 
+return self}, function($ctx1) {$ctx1.fill(self,"tearDown",{},smalltalk.LegacyPackageHandlerTest)})},
 
+args: [],
 
+source: "tearDown\x0a\x09LegacyPackageHandler\x0a\x09\x09defaultCommitPathJs: backUpCommitPathJs;\x0a\x09\x09defaultCommitPathSt: backUpCommitPathSt",
 
+messageSends: ["defaultCommitPathJs:", "defaultCommitPathSt:"],
 
+referencedClasses: ["LegacyPackageHandler"]
 
+}),
 
+smalltalk.LegacyPackageHandlerTest);
 
+
 
+smalltalk.addMethod(
 
+smalltalk.method({
 
+selector: "testGrulCommitPathJsShouldBeServerGrulJs",
 
+category: 'tests',
 
+fn: function (){
 
+var self=this;
 
+return smalltalk.withContext(function($ctx1) { 
+self._assert_equals_(_st(self["@grulPackage"])._commitPathJs(),"server/grul/js");
 
+return self}, function($ctx1) {$ctx1.fill(self,"testGrulCommitPathJsShouldBeServerGrulJs",{},smalltalk.LegacyPackageHandlerTest)})},
 
+args: [],
 
+source: "testGrulCommitPathJsShouldBeServerGrulJs\x0a\x09self assert: grulPackage commitPathJs equals: 'server/grul/js'",
 
+messageSends: ["assert:equals:", "commitPathJs"],
 
+referencedClasses: []
 
+}),
 
+smalltalk.LegacyPackageHandlerTest);
 
+
 
+smalltalk.addMethod(
 
+smalltalk.method({
 
+selector: "testGrulCommitPathStShouldBeGrulSt",
 
+category: 'tests',
 
+fn: function (){
 
+var self=this;
 
+return smalltalk.withContext(function($ctx1) { 
+self._assert_equals_(_st(self["@grulPackage"])._commitPathSt(),"grul/st");
 
+return self}, function($ctx1) {$ctx1.fill(self,"testGrulCommitPathStShouldBeGrulSt",{},smalltalk.LegacyPackageHandlerTest)})},
 
+args: [],
 
+source: "testGrulCommitPathStShouldBeGrulSt\x0a\x09self assert: grulPackage commitPathSt equals: 'grul/st'",
 
+messageSends: ["assert:equals:", "commitPathSt"],
 
+referencedClasses: []
 
+}),
 
+smalltalk.LegacyPackageHandlerTest);
 
+
 
+smalltalk.addMethod(
 
+smalltalk.method({
 
+selector: "testZorkCommitPathJsShouldBeJs",
 
+category: 'tests',
 
+fn: function (){
 
+var self=this;
 
+return smalltalk.withContext(function($ctx1) { 
+self._assert_equals_(_st(self["@zorkPackage"])._commitPathJs(),"js");
 
+return self}, function($ctx1) {$ctx1.fill(self,"testZorkCommitPathJsShouldBeJs",{},smalltalk.LegacyPackageHandlerTest)})},
 
+args: [],
 
+source: "testZorkCommitPathJsShouldBeJs\x0a\x09self assert: zorkPackage commitPathJs equals: 'js'",
 
+messageSends: ["assert:equals:", "commitPathJs"],
 
+referencedClasses: []
 
+}),
 
+smalltalk.LegacyPackageHandlerTest);
 
+
 
+smalltalk.addMethod(
 
+smalltalk.method({
 
+selector: "testZorkCommitPathStShouldBeSt",
 
+category: 'tests',
 
+fn: function (){
 
+var self=this;
 
+return smalltalk.withContext(function($ctx1) { 
+self._assert_equals_(_st(self["@zorkPackage"])._commitPathSt(),"st");
 
+return self}, function($ctx1) {$ctx1.fill(self,"testZorkCommitPathStShouldBeSt",{},smalltalk.LegacyPackageHandlerTest)})},
 
+args: [],
 
+source: "testZorkCommitPathStShouldBeSt\x0a\x09self assert: zorkPackage commitPathSt equals: 'st'",
 
+messageSends: ["assert:equals:", "commitPathSt"],
 
+referencedClasses: []
 
+}),
 
+smalltalk.LegacyPackageHandlerTest);
 
+
 
+
 
+
 
+smalltalk.addClass('LegacyPackageHandlerTestWithDefaultsChanged', smalltalk.LegacyPackageHandlerTest, [], 'Kernel-Tests');
 
+smalltalk.addMethod(
 
+smalltalk.method({
 
+selector: "setUp",
 
+category: 'running',
 
+fn: function (){
 
+var self=this;
 
+function $LegacyPackageHandler(){return smalltalk.LegacyPackageHandler||(typeof LegacyPackageHandler=="undefined"?nil:LegacyPackageHandler)}
 
+return smalltalk.withContext(function($ctx1) { 
+var $1,$2;
 
+smalltalk.LegacyPackageHandlerTestWithDefaultsChanged.superclass.fn.prototype._setUp.apply(_st(self), []);
 
+$1=$LegacyPackageHandler();
 
+_st($1)._defaultCommitPathJs_("javascripts/");
 
+$2=_st($1)._defaultCommitPathSt_("smalltalk/");
 
+return self}, function($ctx1) {$ctx1.fill(self,"setUp",{},smalltalk.LegacyPackageHandlerTestWithDefaultsChanged)})},
 
+args: [],
 
+source: "setUp\x0a\x09super setUp.\x0a\x0a\x09LegacyPackageHandler\x0a\x09\x09defaultCommitPathJs: 'javascripts/';\x0a\x09\x09defaultCommitPathSt: 'smalltalk/'.",
 
+messageSends: ["setUp", "defaultCommitPathJs:", "defaultCommitPathSt:"],
 
+referencedClasses: ["LegacyPackageHandler"]
 
+}),
 
+smalltalk.LegacyPackageHandlerTestWithDefaultsChanged);
 
+
 
+smalltalk.addMethod(
 
+smalltalk.method({
 
+selector: "testGrulCommitPathJsShouldBeServerGrulJs",
 
+category: 'tests',
 
+fn: function (){
 
+var self=this;
 
+return smalltalk.withContext(function($ctx1) { 
+self._assert_equals_(_st(self["@grulPackage"])._commitPathJs(),"server/grul/js");
 
+return self}, function($ctx1) {$ctx1.fill(self,"testGrulCommitPathJsShouldBeServerGrulJs",{},smalltalk.LegacyPackageHandlerTestWithDefaultsChanged)})},
 
+args: [],
 
+source: "testGrulCommitPathJsShouldBeServerGrulJs\x0a\x09self assert: grulPackage commitPathJs equals: 'server/grul/js'",
 
+messageSends: ["assert:equals:", "commitPathJs"],
 
+referencedClasses: []
 
+}),
 
+smalltalk.LegacyPackageHandlerTestWithDefaultsChanged);
 
+
 
+smalltalk.addMethod(
 
+smalltalk.method({
 
+selector: "testGrulCommitPathStShouldBeGrulSt",
 
+category: 'tests',
 
+fn: function (){
 
+var self=this;
 
+return smalltalk.withContext(function($ctx1) { 
+self._assert_equals_(_st(self["@grulPackage"])._commitPathSt(),"grul/st");
 
+return self}, function($ctx1) {$ctx1.fill(self,"testGrulCommitPathStShouldBeGrulSt",{},smalltalk.LegacyPackageHandlerTestWithDefaultsChanged)})},
 
+args: [],
 
+source: "testGrulCommitPathStShouldBeGrulSt\x0a\x09self assert: grulPackage commitPathSt equals: 'grul/st'",
 
+messageSends: ["assert:equals:", "commitPathSt"],
 
+referencedClasses: []
 
+}),
 
+smalltalk.LegacyPackageHandlerTestWithDefaultsChanged);
 
+
 
+smalltalk.addMethod(
 
+smalltalk.method({
 
+selector: "testZorkCommitPathJsShouldBeJavascript",
 
+category: 'tests',
 
+fn: function (){
 
+var self=this;
 
+return smalltalk.withContext(function($ctx1) { 
+self._assert_equals_(_st(self["@zorkPackage"])._commitPathJs(),"javascripts/");
 
+return self}, function($ctx1) {$ctx1.fill(self,"testZorkCommitPathJsShouldBeJavascript",{},smalltalk.LegacyPackageHandlerTestWithDefaultsChanged)})},
 
+args: [],
 
+source: "testZorkCommitPathJsShouldBeJavascript\x0a\x09self assert: zorkPackage commitPathJs equals: 'javascripts/'",
 
+messageSends: ["assert:equals:", "commitPathJs"],
 
+referencedClasses: []
 
+}),
 
+smalltalk.LegacyPackageHandlerTestWithDefaultsChanged);
 
+
 
+smalltalk.addMethod(
 
+smalltalk.method({
 
+selector: "testZorkCommitPathStShouldBeSmalltalk",
 
+category: 'tests',
 
+fn: function (){
 
+var self=this;
 
+return smalltalk.withContext(function($ctx1) { 
+self._assert_equals_(_st(self["@zorkPackage"])._commitPathSt(),"smalltalk/");
 
+return self}, function($ctx1) {$ctx1.fill(self,"testZorkCommitPathStShouldBeSmalltalk",{},smalltalk.LegacyPackageHandlerTestWithDefaultsChanged)})},
 
+args: [],
 
+source: "testZorkCommitPathStShouldBeSmalltalk\x0a\x09self assert: zorkPackage commitPathSt equals: 'smalltalk/'",
 
+messageSends: ["assert:equals:", "commitPathSt"],
 
+referencedClasses: []
 
+}),
 
+smalltalk.LegacyPackageHandlerTestWithDefaultsChanged);
 
+
 
+
 
+smalltalk.addMethod(
 
+smalltalk.method({
 
+selector: "shouldInheritSelectors",
 
+category: 'accessing',
 
+fn: function (){
 
+var self=this;
 
+return smalltalk.withContext(function($ctx1) { 
+return false;
 
+}, function($ctx1) {$ctx1.fill(self,"shouldInheritSelectors",{},smalltalk.LegacyPackageHandlerTestWithDefaultsChanged.klass)})},
 
+args: [],
 
+source: "shouldInheritSelectors\x0a\x09^ false",
 
+messageSends: [],
 
+referencedClasses: []
 
+}),
 
+smalltalk.LegacyPackageHandlerTestWithDefaultsChanged.klass);
 
+
 
+
 
 smalltalk.addClass('MessageSendTest', smalltalk.TestCase, [], 'Kernel-Tests');
 
 smalltalk.addMethod(
 
 smalltalk.method({
 
@@ -3477,50 +3696,6 @@ smalltalk.ObjectMock);
 
 
 
 
-smalltalk.addClass('ObjectMock2', smalltalk.ObjectMock, [], 'Kernel-Tests');
 
-smalltalk.ObjectMock2.comment="ObjectMock is there only to perform tests on classes.";
 
-smalltalk.addMethod(
 
-smalltalk.method({
 
-selector: "foo",
 
-category: 'not yet classified',
 
-fn: function (){
 
-var self=this;
 
-return smalltalk.withContext(function($ctx1) { 
-var $1;
 
-$1=self["@foo"];
 
-return $1;
 
-}, function($ctx1) {$ctx1.fill(self,"foo",{},smalltalk.ObjectMock2)})},
 
-args: [],
 
-source: "foo\x0a\x09^foo",
 
-messageSends: [],
 
-referencedClasses: []
 
-}),
 
-smalltalk.ObjectMock2);
 
-
 
-smalltalk.addMethod(
 
-smalltalk.method({
 
-selector: "foo:",
 
-category: 'not yet classified',
 
-fn: function (anObject){
 
-var self=this;
 
-return smalltalk.withContext(function($ctx1) { 
-self["@foo"]=anObject;
 
-return self}, function($ctx1) {$ctx1.fill(self,"foo:",{anObject:anObject},smalltalk.ObjectMock2)})},
 
-args: ["anObject"],
 
-source: "foo: anObject\x0a\x09foo := anObject",
 
-messageSends: [],
 
-referencedClasses: []
 
-}),
 
-smalltalk.ObjectMock2);
 
-
 
-
 
-
 
-smalltalk.addClass('ObjectMock3', smalltalk.ObjectMock2, [], 'Kernel-Tests');
 
-
 
-
 
-smalltalk.addClass('ObjectMock4', smalltalk.ObjectMock3, [], 'Kernel-Tests');
 
-
 
-
 
 smalltalk.addClass('ObjectTest', smalltalk.TestCase, [], 'Kernel-Tests');
 
 smalltalk.addMethod(
 
 smalltalk.method({
 
@@ -3804,224 +3979,6 @@ smalltalk.ObjectTest);
 
 
 
 
-smalltalk.addClass('PackageTest', smalltalk.TestCase, ['zorkPackage', 'grulPackage', 'backUpCommitPathJs', 'backUpCommitPathSt'], 'Kernel-Tests');
 
-smalltalk.addMethod(
 
-smalltalk.method({
 
-selector: "setUp",
 
-category: 'running',
 
-fn: function (){
 
-var self=this;
 
-function $Package(){return smalltalk.Package||(typeof Package=="undefined"?nil:Package)}
 
-return smalltalk.withContext(function($ctx1) { 
-var $1,$2;
 
-self["@backUpCommitPathJs"]=_st($Package())._defaultCommitPathJs();
 
-self["@backUpCommitPathSt"]=_st($Package())._defaultCommitPathSt();
 
-_st($Package())._resetCommitPaths();
 
-self["@zorkPackage"]=_st(_st($Package())._new())._name_("Zork");
 
-$1=_st($Package())._new();
 
-_st($1)._name_("Grul");
 
-_st($1)._commitPathJs_("server/grul/js");
 
-_st($1)._commitPathSt_("grul/st");
 
-$2=_st($1)._yourself();
 
-self["@grulPackage"]=$2;
 
-return self}, function($ctx1) {$ctx1.fill(self,"setUp",{},smalltalk.PackageTest)})},
 
-args: [],
 
-source: "setUp\x0a\x09backUpCommitPathJs := Package defaultCommitPathJs.\x0a\x09backUpCommitPathSt := Package defaultCommitPathSt.\x0a\x0a\x09Package resetCommitPaths.\x0a\x0a\x09zorkPackage := Package new name: 'Zork'.\x0a\x09grulPackage := Package new\x0a\x09\x09\x09\x09\x09name: 'Grul';\x0a\x09\x09\x09\x09\x09commitPathJs: 'server/grul/js';\x0a\x09\x09\x09\x09\x09commitPathSt: 'grul/st';\x0a\x09\x09\x09\x09\x09yourself",
 
-messageSends: ["defaultCommitPathJs", "defaultCommitPathSt", "resetCommitPaths", "name:", "new", "commitPathJs:", "commitPathSt:", "yourself"],
 
-referencedClasses: ["Package"]
 
-}),
 
-smalltalk.PackageTest);
 
-
 
-smalltalk.addMethod(
 
-smalltalk.method({
 
-selector: "tearDown",
 
-category: 'running',
 
-fn: function (){
 
-var self=this;
 
-function $Package(){return smalltalk.Package||(typeof Package=="undefined"?nil:Package)}
 
-return smalltalk.withContext(function($ctx1) { 
-var $1,$2;
 
-$1=$Package();
 
-_st($1)._defaultCommitPathJs_(self["@backUpCommitPathJs"]);
 
-$2=_st($1)._defaultCommitPathSt_(self["@backUpCommitPathSt"]);
 
-return self}, function($ctx1) {$ctx1.fill(self,"tearDown",{},smalltalk.PackageTest)})},
 
-args: [],
 
-source: "tearDown\x0a\x09Package\x0a\x09\x09defaultCommitPathJs: backUpCommitPathJs;\x0a\x09\x09defaultCommitPathSt: backUpCommitPathSt",
 
-messageSends: ["defaultCommitPathJs:", "defaultCommitPathSt:"],
 
-referencedClasses: ["Package"]
 
-}),
 
-smalltalk.PackageTest);
 
-
 
-smalltalk.addMethod(
 
-smalltalk.method({
 
-selector: "testGrulCommitPathJsShouldBeServerGrulJs",
 
-category: 'tests',
 
-fn: function (){
 
-var self=this;
 
-return smalltalk.withContext(function($ctx1) { 
-self._assert_equals_(_st(self["@grulPackage"])._commitPathJs(),"server/grul/js");
 
-return self}, function($ctx1) {$ctx1.fill(self,"testGrulCommitPathJsShouldBeServerGrulJs",{},smalltalk.PackageTest)})},
 
-args: [],
 
-source: "testGrulCommitPathJsShouldBeServerGrulJs\x0a\x09self assert: grulPackage commitPathJs equals: 'server/grul/js'",
 
-messageSends: ["assert:equals:", "commitPathJs"],
 
-referencedClasses: []
 
-}),
 
-smalltalk.PackageTest);
 
-
 
-smalltalk.addMethod(
 
-smalltalk.method({
 
-selector: "testGrulCommitPathStShouldBeGrulSt",
 
-category: 'tests',
 
-fn: function (){
 
-var self=this;
 
-return smalltalk.withContext(function($ctx1) { 
-self._assert_equals_(_st(self["@grulPackage"])._commitPathSt(),"grul/st");
 
-return self}, function($ctx1) {$ctx1.fill(self,"testGrulCommitPathStShouldBeGrulSt",{},smalltalk.PackageTest)})},
 
-args: [],
 
-source: "testGrulCommitPathStShouldBeGrulSt\x0a\x09self assert: grulPackage commitPathSt equals: 'grul/st'",
 
-messageSends: ["assert:equals:", "commitPathSt"],
 
-referencedClasses: []
 
-}),
 
-smalltalk.PackageTest);
 
-
 
-smalltalk.addMethod(
 
-smalltalk.method({
 
-selector: "testZorkCommitPathJsShouldBeJs",
 
-category: 'tests',
 
-fn: function (){
 
-var self=this;
 
-return smalltalk.withContext(function($ctx1) { 
-self._assert_equals_(_st(self["@zorkPackage"])._commitPathJs(),"js");
 
-return self}, function($ctx1) {$ctx1.fill(self,"testZorkCommitPathJsShouldBeJs",{},smalltalk.PackageTest)})},
 
-args: [],
 
-source: "testZorkCommitPathJsShouldBeJs\x0a\x09self assert: zorkPackage commitPathJs equals: 'js'",
 
-messageSends: ["assert:equals:", "commitPathJs"],
 
-referencedClasses: []
 
-}),
 
-smalltalk.PackageTest);
 
-
 
-smalltalk.addMethod(
 
-smalltalk.method({
 
-selector: "testZorkCommitPathStShouldBeSt",
 
-category: 'tests',
 
-fn: function (){
 
-var self=this;
 
-return smalltalk.withContext(function($ctx1) { 
-self._assert_equals_(_st(self["@zorkPackage"])._commitPathSt(),"st");
 
-return self}, function($ctx1) {$ctx1.fill(self,"testZorkCommitPathStShouldBeSt",{},smalltalk.PackageTest)})},
 
-args: [],
 
-source: "testZorkCommitPathStShouldBeSt\x0a\x09self assert: zorkPackage commitPathSt equals: 'st'",
 
-messageSends: ["assert:equals:", "commitPathSt"],
 
-referencedClasses: []
 
-}),
 
-smalltalk.PackageTest);
 
-
 
-
 
-
 
-smalltalk.addClass('PackageWithDefaultCommitPathChangedTest', smalltalk.PackageTest, [], 'Kernel-Tests');
 
-smalltalk.addMethod(
 
-smalltalk.method({
 
-selector: "setUp",
 
-category: 'running',
 
-fn: function (){
 
-var self=this;
 
-function $Package(){return smalltalk.Package||(typeof Package=="undefined"?nil:Package)}
 
-return smalltalk.withContext(function($ctx1) { 
-var $1,$2;
 
-smalltalk.PackageWithDefaultCommitPathChangedTest.superclass.fn.prototype._setUp.apply(_st(self), []);
 
-$1=$Package();
 
-_st($1)._defaultCommitPathJs_("javascripts/");
 
-$2=_st($1)._defaultCommitPathSt_("smalltalk/");
 
-return self}, function($ctx1) {$ctx1.fill(self,"setUp",{},smalltalk.PackageWithDefaultCommitPathChangedTest)})},
 
-args: [],
 
-source: "setUp\x0a\x09super setUp.\x0a\x0a\x09Package\x0a\x09\x09defaultCommitPathJs: 'javascripts/';\x0a\x09\x09defaultCommitPathSt: 'smalltalk/'.",
 
-messageSends: ["setUp", "defaultCommitPathJs:", "defaultCommitPathSt:"],
 
-referencedClasses: ["Package"]
 
-}),
 
-smalltalk.PackageWithDefaultCommitPathChangedTest);
 
-
 
-smalltalk.addMethod(
 
-smalltalk.method({
 
-selector: "testGrulCommitPathJsShouldBeServerGrulJs",
 
-category: 'tests',
 
-fn: function (){
 
-var self=this;
 
-return smalltalk.withContext(function($ctx1) { 
-self._assert_equals_(_st(self["@grulPackage"])._commitPathJs(),"server/grul/js");
 
-return self}, function($ctx1) {$ctx1.fill(self,"testGrulCommitPathJsShouldBeServerGrulJs",{},smalltalk.PackageWithDefaultCommitPathChangedTest)})},
 
-args: [],
 
-source: "testGrulCommitPathJsShouldBeServerGrulJs\x0a\x09self assert: grulPackage commitPathJs equals: 'server/grul/js'",
 
-messageSends: ["assert:equals:", "commitPathJs"],
 
-referencedClasses: []
 
-}),
 
-smalltalk.PackageWithDefaultCommitPathChangedTest);
 
-
 
-smalltalk.addMethod(
 
-smalltalk.method({
 
-selector: "testGrulCommitPathStShouldBeGrulSt",
 
-category: 'tests',
 
-fn: function (){
 
-var self=this;
 
-return smalltalk.withContext(function($ctx1) { 
-self._assert_equals_(_st(self["@grulPackage"])._commitPathSt(),"grul/st");
 
-return self}, function($ctx1) {$ctx1.fill(self,"testGrulCommitPathStShouldBeGrulSt",{},smalltalk.PackageWithDefaultCommitPathChangedTest)})},
 
-args: [],
 
-source: "testGrulCommitPathStShouldBeGrulSt\x0a\x09self assert: grulPackage commitPathSt equals: 'grul/st'",
 
-messageSends: ["assert:equals:", "commitPathSt"],
 
-referencedClasses: []
 
-}),
 
-smalltalk.PackageWithDefaultCommitPathChangedTest);
 
-
 
-smalltalk.addMethod(
 
-smalltalk.method({
 
-selector: "testZorkCommitPathJsShouldBeJavascript",
 
-category: 'tests',
 
-fn: function (){
 
-var self=this;
 
-return smalltalk.withContext(function($ctx1) { 
-self._assert_equals_(_st(self["@zorkPackage"])._commitPathJs(),"javascripts/");
 
-return self}, function($ctx1) {$ctx1.fill(self,"testZorkCommitPathJsShouldBeJavascript",{},smalltalk.PackageWithDefaultCommitPathChangedTest)})},
 
-args: [],
 
-source: "testZorkCommitPathJsShouldBeJavascript\x0a\x09self assert: zorkPackage commitPathJs equals: 'javascripts/'",
 
-messageSends: ["assert:equals:", "commitPathJs"],
 
-referencedClasses: []
 
-}),
 
-smalltalk.PackageWithDefaultCommitPathChangedTest);
 
-
 
-smalltalk.addMethod(
 
-smalltalk.method({
 
-selector: "testZorkCommitPathStShouldBeSmalltalk",
 
-category: 'tests',
 
-fn: function (){
 
-var self=this;
 
-return smalltalk.withContext(function($ctx1) { 
-self._assert_equals_(_st(self["@zorkPackage"])._commitPathSt(),"smalltalk/");
 
-return self}, function($ctx1) {$ctx1.fill(self,"testZorkCommitPathStShouldBeSmalltalk",{},smalltalk.PackageWithDefaultCommitPathChangedTest)})},
 
-args: [],
 
-source: "testZorkCommitPathStShouldBeSmalltalk\x0a\x09self assert: zorkPackage commitPathSt equals: 'smalltalk/'",
 
-messageSends: ["assert:equals:", "commitPathSt"],
 
-referencedClasses: []
 
-}),
 
-smalltalk.PackageWithDefaultCommitPathChangedTest);
 
-
 
-
 
-smalltalk.addMethod(
 
-smalltalk.method({
 
-selector: "shouldInheritSelectors",
 
-category: 'accessing',
 
-fn: function (){
 
-var self=this;
 
-return smalltalk.withContext(function($ctx1) { 
-return false;
 
-}, function($ctx1) {$ctx1.fill(self,"shouldInheritSelectors",{},smalltalk.PackageWithDefaultCommitPathChangedTest.klass)})},
 
-args: [],
 
-source: "shouldInheritSelectors\x0a\x09^ false",
 
-messageSends: [],
 
-referencedClasses: []
 
-}),
 
-smalltalk.PackageWithDefaultCommitPathChangedTest.klass);
 
-
 
-
 
 smalltalk.addClass('PointTest', smalltalk.TestCase, [], 'Kernel-Tests');
 
 smalltalk.addMethod(
 
 smalltalk.method({

+ 1 - 1
js/Kernel-Transcript.deploy.js
View File 

@@ -1,4 +1,4 @@
 
-define(["smalltalk","nil","_st"], function(smalltalk,nil,_st){
 
+define("amber/Kernel-Transcript", ["amber_vm/smalltalk","amber_vm/nil","amber_vm/_st"], function(smalltalk,nil,_st){
 
 smalltalk.addPackage('Kernel-Transcript');
 
 smalltalk.addClass('ConsoleTranscript', smalltalk.Object, ['textarea'], 'Kernel-Transcript');
 
 smalltalk.addMethod(

+ 1 - 1
js/Kernel-Transcript.js
View File 

@@ -1,4 +1,4 @@
 
-define(["smalltalk","nil","_st"], function(smalltalk,nil,_st){
 
+define("amber/Kernel-Transcript", ["amber_vm/smalltalk","amber_vm/nil","amber_vm/_st"], function(smalltalk,nil,_st){
 
 smalltalk.addPackage('Kernel-Transcript');
 
 smalltalk.addClass('ConsoleTranscript', smalltalk.Object, ['textarea'], 'Kernel-Transcript');
 
 smalltalk.ConsoleTranscript.comment="I am a specific transcript emitting to the JavaScript console.\x0a\x0aIf no other transcript is registered, I am the default.";

+ 1 - 1
js/SUnit-Tests.deploy.js
View File 

@@ -1,4 +1,4 @@
 
-define(["smalltalk","nil","_st"], function(smalltalk,nil,_st){
 
+define("amber/SUnit-Tests", ["amber_vm/smalltalk","amber_vm/nil","amber_vm/_st"], function(smalltalk,nil,_st){
 
 smalltalk.addPackage('SUnit-Tests');
 
 smalltalk.addClass('ExampleSetTest', smalltalk.TestCase, ['empty', 'full'], 'SUnit-Tests');
 
 smalltalk.addMethod(

+ 1 - 1
js/SUnit-Tests.js
View File 

@@ -1,4 +1,4 @@
 
-define(["smalltalk","nil","_st"], function(smalltalk,nil,_st){
 
+define("amber/SUnit-Tests", ["amber_vm/smalltalk","amber_vm/nil","amber_vm/_st"], function(smalltalk,nil,_st){
 
 smalltalk.addPackage('SUnit-Tests');
 
 smalltalk.addClass('ExampleSetTest', smalltalk.TestCase, ['empty', 'full'], 'SUnit-Tests');
 
 smalltalk.ExampleSetTest.comment="ExampleSetTest is taken from Pharo 1.4.\x0a\x0aTHe purpose of this class is to demonstrate a simple use case of the test framework.";

+ 1 - 1
js/SUnit.deploy.js
View File 

@@ -1,4 +1,4 @@
 
-define(["smalltalk","nil","_st"], function(smalltalk,nil,_st){
 
+define("amber/SUnit", ["amber_vm/smalltalk","amber_vm/nil","amber_vm/_st"], function(smalltalk,nil,_st){
 
 smalltalk.addPackage('SUnit');
 
 smalltalk.addClass('ResultAnnouncement', smalltalk.Object, ['result'], 'SUnit');
 
 smalltalk.addMethod(

+ 1 - 1
js/SUnit.js
View File 

@@ -1,4 +1,4 @@
 
-define(["smalltalk","nil","_st"], function(smalltalk,nil,_st){
 
+define("amber/SUnit", ["amber_vm/smalltalk","amber_vm/nil","amber_vm/_st"], function(smalltalk,nil,_st){
 
 smalltalk.addPackage('SUnit');
 
 smalltalk.addClass('ResultAnnouncement', smalltalk.Object, ['result'], 'SUnit');
 
 smalltalk.ResultAnnouncement.comment="I get signaled when a `TestCase` has been run.\x0a\x0aMy instances hold the result (instance of `TestResult`) of the test run.";

+ 1 - 1
js/Spaces.deploy.js
View File 

@@ -1,4 +1,4 @@
 
-define(["smalltalk","nil","_st"], function(smalltalk,nil,_st){
 
+define("amber/Spaces", ["amber_vm/smalltalk","amber_vm/nil","amber_vm/_st"], function(smalltalk,nil,_st){
 
 smalltalk.addPackage('Spaces');
 
 smalltalk.addClass('ObjectSpace', smalltalk.Object, ['frame'], 'Spaces');
 
 smalltalk.addMethod(

+ 1 - 1
js/Spaces.js
View File 

@@ -1,4 +1,4 @@
 
-define(["smalltalk","nil","_st"], function(smalltalk,nil,_st){
 
+define("amber/Spaces", ["amber_vm/smalltalk","amber_vm/nil","amber_vm/_st"], function(smalltalk,nil,_st){
 
 smalltalk.addPackage('Spaces');
 
 smalltalk.addClass('ObjectSpace', smalltalk.Object, ['frame'], 'Spaces');
 
 smalltalk.ObjectSpace.comment="I am a connection to another Smalltalk environment.\x0aThe implementation creates an iframe on the same location as the window, and connect to the Amber environment.\x0a\x0a\x0a\x0a## Usage example:\x0a\x0a\x09| space |\x0a\x09\x0a\x09space := ObjectSpace new.\x0a\x09space do: [ smalltalk ] \x22Answers aSmalltalk\x22\x0a\x09(space do: [ smalltalk ]) == smalltalk \x22Answers false\x22\x0a\x09\x0a\x09space release \x22Remove the object space environment\x22";

+ 1 - 1
st/Helios-Core.st
View File 

@@ -1226,7 +1226,7 @@ defaultEnvironment
 
 	parent := window opener ifNil: [ window parent ].
 
 	parent ifNil: [ ^ Environment new ].
 
 	
-	^ ((parent at: 'smalltalk')
 
+	^ ((parent at: 'global_smalltalk')
 
 		at: 'Environment') new
 
 ! !

+ 148 - 25
st/Importer-Exporter.st
View File 

@@ -1,3 +1,4 @@
 
+define("amber/Importer-Exporter", ["amber_vm/smalltalk","amber_vm/nil","amber_vm/_st"], function(smalltalk,nil,_st){
 
 Smalltalk current createPackage: 'Importer-Exporter'!
 
 Object subclass: #ChunkParser
 
 	instanceVariableNames: 'stream'
 
@@ -89,9 +90,9 @@ exportPackage: packageName
 
 
 	| package |
 
 	^String streamContents: [:stream |
 
-		self exportPackagePrologueOn: stream.
 
+		package := Smalltalk current packageAt: packageName.
 
+		self exportPackagePrologueOf: package on: stream.
 
 		[
 
-			package := Smalltalk current packageAt: packageName.
 
 			self exportPackageDefinitionOf: package on: stream.
 
 
 			"Export classes in dependency order.
 
@@ -203,9 +204,11 @@ exportPackageExtensionsOf: package on: aStream
 
 					self exportMethod: method of: aClass on: aStream ]]]]
 
 !
 
 
-exportPackagePrologueOn: aStream
 
+exportPackagePrologueOf: aPackage on: aStream
 
 	aStream
 
-		nextPutAll: 'define(["smalltalk","nil","_st"], function(smalltalk,nil,_st){';
 
+		nextPutAll: 'define("amber/';
 
+		nextPutAll: aPackage name;
 
+		nextPutAll: '", ["amber_vm/smalltalk","amber_vm/nil","amber_vm/_st"], function(smalltalk,nil,_st){';
 
 		lf
 
 ! !
 
 
@@ -409,18 +412,82 @@ I should not be used directly. Instead, use the corresponding `Package` methods.
 
 !PackageHandler methodsFor: 'committing'!
 
 
 commit: aPackage
 
-	{ 
-		Exporter -> (aPackage commitPathJs, '/', aPackage name, '.js').
 
-		StrippedExporter -> (aPackage commitPathJs, '/', aPackage name, '.deploy.js').
 
-		ChunkExporter -> (aPackage commitPathSt, '/', aPackage name, '.st')
 
-	} 
-		do: [ :commitStrategy|| fileContents |
 
-			fileContents := (commitStrategy key new exportPackage: aPackage name).
 
+	self commitChannels
 
+		do: [ :commitStrategyFactory || fileContents commitStrategy |
 
+			commitStrategy := commitStrategyFactory value: aPackage.
 
+			fileContents := (commitStrategy key exportPackage: aPackage name).
 
 			self ajaxPutAt: commitStrategy value data: fileContents ]
 
 		displayingProgress: 'Committing package ', aPackage name
 
 ! !
 
 
-!PackageHandler methodsFor: 'loading'!
 
+!PackageHandler methodsFor: 'private'!
 
+
 
+ajaxPutAt: aURL data: aString
 
+	jQuery
 
+		ajax: aURL 
+		options: #{ 
+			'type' -> 'PUT'.
 
+			'data' -> aString.
 
+			'contentType' -> 'text/plain;charset=UTF-8'.
 
+			'error' -> [ :xhr | self error: 'Commiting ' , aURL , ' failed with reason: "' , (xhr responseText) , '"'] }
 
+! !
 
+
 
+PackageHandler class instanceVariableNames: 'registry'!
 
+
 
+!PackageHandler class methodsFor: 'accessing'!
 
+
 
+classRegisteredFor: aString
 
+	^registry at: aString
 
+!
 
+
 
+for: aString
 
+	^(self classRegisteredFor: aString) new
 
+! !
 
+
 
+!PackageHandler class methodsFor: 'initialization'!
 
+
 
+initialize
 
+	super initialize.
 
+	registry := #{}
 
+! !
 
+
 
+!PackageHandler class methodsFor: 'registry'!
 
+
 
+register: aClass for: aString
 
+	registry at: aString put: aClass
 
+!
 
+
 
+registerFor: aString
 
+	PackageHandler register: self for: aString
 
+! !
 
+
 
+PackageHandler subclass: #LegacyPackageHandler
 
+	instanceVariableNames: ''
 
+	package: 'Importer-Exporter'!
 
+!LegacyPackageHandler commentStamp!
 
+I am responsible for handling package loading and committing.
 
+
 
+I should not be used directly. Instead, use the corresponding `Package` methods.!
 
+
 
+!LegacyPackageHandler methodsFor: 'committing'!
 
+
 
+commitChannels
 
+	^{ 
+		[ :pkg | Exporter new -> (pkg commitPathJs, '/', pkg name, '.js') ].
 
+		[ :pkg | StrippedExporter new -> (pkg commitPathJs, '/', pkg name, '.deploy.js') ].
 
+		[ :pkg | ChunkExporter new -> (pkg commitPathSt, '/', pkg name, '.st') ]
 
+	}
 
+!
 
+
 
+commitPathJsFor: aPackage
 
+	^self class defaultCommitPathJs
 
+!
 
+
 
+commitPathStFor: aPackage
 
+	^self class defaultCommitPathSt
 
+! !
 
+
 
+!LegacyPackageHandler methodsFor: 'loading'!
 
 
 loadPackage: packageName prefix: aString
 
 	| url |
 
@@ -442,17 +509,7 @@ loadPackages: aCollection prefix: aString
 
 		self loadPackage: each prefix: aString ]
 
 ! !
 
 
-!PackageHandler methodsFor: 'private'!
 
-
 
-ajaxPutAt: aURL data: aString
 
-	jQuery
 
-		ajax: aURL 
-		options: #{ 
-			'type' -> 'PUT'.
 
-			'data' -> aString.
 
-			'contentType' -> 'text/plain;charset=UTF-8'.
 
-			'error' -> [ :xhr | self error: 'Commiting ' , aURL , ' failed with reason: "' , (xhr responseText) , '"'] }
 
-!
 
+!LegacyPackageHandler methodsFor: 'private'!
 
 
 setupPackageNamed: packageName prefix: aString
 
 
@@ -462,7 +519,49 @@ setupPackageNamed: packageName prefix: aString
 
 		commitPathSt: '/', aString, '/st'
 
 ! !
 
 
-!PackageHandler class methodsFor: 'loading'!
 
+LegacyPackageHandler class instanceVariableNames: 'defaultCommitPathJs defaultCommitPathSt'!
 
+
 
+!LegacyPackageHandler class methodsFor: 'commit paths'!
 
+
 
+commitPathsFromLoader
 
+	<
 
+		var commitPath = typeof amber !!== 'undefined' && amber.commitPath;
 
+		if (!!commitPath) return;
 
+		if (commitPath.js) self._defaultCommitPathJs_(commitPath.js);
 
+		if (commitPath.st) self._defaultCommitPathSt_(commitPath.st);
 
+	>
 
+!
 
+
 
+defaultCommitPathJs
 
+	^ defaultCommitPathJs ifNil: [ defaultCommitPathJs := 'js']
 
+!
 
+
 
+defaultCommitPathJs: aString
 
+	defaultCommitPathJs := aString
 
+!
 
+
 
+defaultCommitPathSt
 
+	^ defaultCommitPathSt ifNil: [ defaultCommitPathSt := 'st']
 
+!
 
+
 
+defaultCommitPathSt: aString
 
+	defaultCommitPathSt := aString
 
+!
 
+
 
+resetCommitPaths
 
+	defaultCommitPathJs := nil.
 
+	defaultCommitPathSt := nil
 
+! !
 
+
 
+!LegacyPackageHandler class methodsFor: 'initialization'!
 
+
 
+initialize
 
+	super initialize.
 
+	self registerFor: 'unknown'.
 
+	self commitPathsFromLoader
 
+! !
 
+
 
+!LegacyPackageHandler class methodsFor: 'loading'!
 
 
 loadPackages: aCollection prefix: aString
 
 	^ self new loadPackages: aCollection prefix: aString
 
@@ -471,6 +570,30 @@ loadPackages: aCollection prefix: aString
 
 !Package methodsFor: '*Importer-Exporter'!
 
 
 commit
 
-	^ PackageHandler new commit: self
 
+	^ self transport commit: self
 
+!
 
+
 
+commitPathJs
 
+	^ (extension ifNil: [ extension := #{} ]) at: #commitPathJs ifAbsentPut: [self transport commitPathJsFor: self]
 
+!
 
+
 
+commitPathJs: aString
 
+	^ (extension ifNil: [ extension := #{} ]) at: #commitPathJs put: aString
 
+!
 
+
 
+commitPathSt
 
+	^ (extension ifNil: [ extension := #{} ]) at: #commitPathSt ifAbsentPut: [self transport commitPathStFor: self]
 
+!
 
+
 
+commitPathSt: aString
 
+	^ (extension ifNil: [ extension := #{} ]) at: #commitPathSt put: aString
 
+!
 
+
 
+transport
 
+	^ PackageHandler for: self transportType
 
+!
 
+
 
+transportType
 
+	<return (self.transport && self.transport.type) || 'unknown';>
 
 ! !

+ 1 - 56
st/Kernel-Objects.st
View File 

@@ -1411,7 +1411,7 @@ Organizer subclass: #PackageOrganizer
 
 I am an organizer specific to packages. I hold classes categorization information.!
 
 
 Object subclass: #Package
 
-	instanceVariableNames: 'commitPathJs commitPathSt'
 
+	instanceVariableNames: 'extension'
 
 	package: 'Kernel-Objects'!
 
 !Package commentStamp!
 
 I am 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.
 
@@ -1433,22 +1433,6 @@ You can fetch a package from the server:
 
 
 !Package methodsFor: 'accessing'!
 
 
-commitPathJs
 
-	^ commitPathJs ifNil: [self class defaultCommitPathJs]
 
-!
 
-
 
-commitPathJs: aString
 
-	commitPathJs := aString
 
-!
 
-
 
-commitPathSt
 
-	^ commitPathSt ifNil: [self class defaultCommitPathSt]
 
-!
 
-
 
-commitPathSt: aString
 
-	commitPathSt := aString
 
-!
 
-
 
 name
 
 	<return self.pkgName>
 
 !
 
@@ -1509,45 +1493,6 @@ named: aPackageName ifAbsent: aBlock
 
 	^Smalltalk current packageAt: aPackageName ifAbsent: aBlock
 
 ! !
 
 
-!Package class methodsFor: 'commit paths'!
 
-
 
-commitPathsFromLoader
 
-	<
 
-		var commitPath = typeof amber !!== 'undefined' && amber.commitPath;
 
-		if (!!commitPath) return;
 
-		if (commitPath.js) self._defaultCommitPathJs_(commitPath.js);
 
-		if (commitPath.st) self._defaultCommitPathSt_(commitPath.st);
 
-	>
 
-!
 
-
 
-defaultCommitPathJs
 
-	^ defaultCommitPathJs ifNil: [ defaultCommitPathJs := 'js']
 
-!
 
-
 
-defaultCommitPathJs: aString
 
-	defaultCommitPathJs := aString
 
-!
 
-
 
-defaultCommitPathSt
 
-	^ defaultCommitPathSt ifNil: [ defaultCommitPathSt := 'st']
 
-!
 
-
 
-defaultCommitPathSt: aString
 
-	defaultCommitPathSt := aString
 
-!
 
-
 
-resetCommitPaths
 
-		defaultCommitPathJs := nil.
 
-		defaultCommitPathSt := nil.
 
-! !
 
-
 
-!Package class methodsFor: 'initialization'!
 
-
 
-initialize
 
-	super initialize.
 
-	self commitPathsFromLoader
 
-! !
 
-
 
 !Package class methodsFor: 'loading-storing'!
 
 
 load: aPackageName

+ 82 - 106
st/Kernel-Tests.st
View File 

@@ -1077,6 +1077,88 @@ testRaisingException
 
 	self should: [ self throwException ] raise: JavaScriptException
 
 ! !
 
 
+TestCase subclass: #LegacyPackageHandlerTest
 
+	instanceVariableNames: 'zorkPackage grulPackage backUpCommitPathJs backUpCommitPathSt'
 
+	package: 'Kernel-Tests'!
 
+
 
+!LegacyPackageHandlerTest methodsFor: 'running'!
 
+
 
+setUp
 
+	backUpCommitPathJs := LegacyPackageHandler defaultCommitPathJs.
 
+	backUpCommitPathSt := LegacyPackageHandler defaultCommitPathSt.
 
+
 
+	LegacyPackageHandler resetCommitPaths.
 
+
 
+	zorkPackage := Package new name: 'Zork'.
 
+	grulPackage := Package new
 
+					name: 'Grul';
 
+					commitPathJs: 'server/grul/js';
 
+					commitPathSt: 'grul/st';
 
+					yourself
 
+!
 
+
 
+tearDown
 
+	LegacyPackageHandler
 
+		defaultCommitPathJs: backUpCommitPathJs;
 
+		defaultCommitPathSt: backUpCommitPathSt
 
+! !
 
+
 
+!LegacyPackageHandlerTest methodsFor: 'tests'!
 
+
 
+testGrulCommitPathJsShouldBeServerGrulJs
 
+	self assert: grulPackage commitPathJs equals: 'server/grul/js'
 
+!
 
+
 
+testGrulCommitPathStShouldBeGrulSt
 
+	self assert: grulPackage commitPathSt equals: 'grul/st'
 
+!
 
+
 
+testZorkCommitPathJsShouldBeJs
 
+	self assert: zorkPackage commitPathJs equals: 'js'
 
+!
 
+
 
+testZorkCommitPathStShouldBeSt
 
+	self assert: zorkPackage commitPathSt equals: 'st'
 
+! !
 
+
 
+LegacyPackageHandlerTest subclass: #LegacyPackageHandlerTestWithDefaultsChanged
 
+	instanceVariableNames: ''
 
+	package: 'Kernel-Tests'!
 
+
 
+!LegacyPackageHandlerTestWithDefaultsChanged methodsFor: 'running'!
 
+
 
+setUp
 
+	super setUp.
 
+
 
+	LegacyPackageHandler
 
+		defaultCommitPathJs: 'javascripts/';
 
+		defaultCommitPathSt: 'smalltalk/'.
 
+! !
 
+
 
+!LegacyPackageHandlerTestWithDefaultsChanged methodsFor: 'tests'!
 
+
 
+testGrulCommitPathJsShouldBeServerGrulJs
 
+	self assert: grulPackage commitPathJs equals: 'server/grul/js'
 
+!
 
+
 
+testGrulCommitPathStShouldBeGrulSt
 
+	self assert: grulPackage commitPathSt equals: 'grul/st'
 
+!
 
+
 
+testZorkCommitPathJsShouldBeJavascript
 
+	self assert: zorkPackage commitPathJs equals: 'javascripts/'
 
+!
 
+
 
+testZorkCommitPathStShouldBeSmalltalk
 
+	self assert: zorkPackage commitPathSt equals: 'smalltalk/'
 
+! !
 
+
 
+!LegacyPackageHandlerTestWithDefaultsChanged class methodsFor: 'accessing'!
 
+
 
+shouldInheritSelectors
 
+	^ false
 
+! !
 
+
 
 TestCase subclass: #MessageSendTest
 
 	instanceVariableNames: ''
 
 	package: 'Kernel-Tests'!
 
@@ -1325,30 +1407,6 @@ foo: anObject
 
 	foo := anObject
 
 ! !
 
 
-ObjectMock subclass: #ObjectMock2
 
-	instanceVariableNames: ''
 
-	package: 'Kernel-Tests'!
 
-!ObjectMock2 commentStamp!
 
-ObjectMock is there only to perform tests on classes.!
 
-
 
-!ObjectMock2 methodsFor: 'not yet classified'!
 
-
 
-foo
 
-	^foo
 
-!
 
-
 
-foo: anObject
 
-	foo := anObject
 
-! !
 
-
 
-ObjectMock2 subclass: #ObjectMock3
 
-	instanceVariableNames: ''
 
-	package: 'Kernel-Tests'!
 
-
 
-ObjectMock3 subclass: #ObjectMock4
 
-	instanceVariableNames: ''
 
-	package: 'Kernel-Tests'!
 
-
 
 TestCase subclass: #ObjectTest
 
 	instanceVariableNames: ''
 
 	package: 'Kernel-Tests'!
 
@@ -1444,88 +1502,6 @@ testidentityHash
 
 	self deny: o1 identityHash == o2 identityHash
 
 ! !
 
 
-TestCase subclass: #PackageTest
 
-	instanceVariableNames: 'zorkPackage grulPackage backUpCommitPathJs backUpCommitPathSt'
 
-	package: 'Kernel-Tests'!
 
-
 
-!PackageTest methodsFor: 'running'!
 
-
 
-setUp
 
-	backUpCommitPathJs := Package defaultCommitPathJs.
 
-	backUpCommitPathSt := Package defaultCommitPathSt.
 
-
 
-	Package resetCommitPaths.
 
-
 
-	zorkPackage := Package new name: 'Zork'.
 
-	grulPackage := Package new
 
-					name: 'Grul';
 
-					commitPathJs: 'server/grul/js';
 
-					commitPathSt: 'grul/st';
 
-					yourself
 
-!
 
-
 
-tearDown
 
-	Package
 
-		defaultCommitPathJs: backUpCommitPathJs;
 
-		defaultCommitPathSt: backUpCommitPathSt
 
-! !
 
-
 
-!PackageTest methodsFor: 'tests'!
 
-
 
-testGrulCommitPathJsShouldBeServerGrulJs
 
-	self assert: grulPackage commitPathJs equals: 'server/grul/js'
 
-!
 
-
 
-testGrulCommitPathStShouldBeGrulSt
 
-	self assert: grulPackage commitPathSt equals: 'grul/st'
 
-!
 
-
 
-testZorkCommitPathJsShouldBeJs
 
-	self assert: zorkPackage commitPathJs equals: 'js'
 
-!
 
-
 
-testZorkCommitPathStShouldBeSt
 
-	self assert: zorkPackage commitPathSt equals: 'st'
 
-! !
 
-
 
-PackageTest subclass: #PackageWithDefaultCommitPathChangedTest
 
-	instanceVariableNames: ''
 
-	package: 'Kernel-Tests'!
 
-
 
-!PackageWithDefaultCommitPathChangedTest methodsFor: 'running'!
 
-
 
-setUp
 
-	super setUp.
 
-
 
-	Package
 
-		defaultCommitPathJs: 'javascripts/';
 
-		defaultCommitPathSt: 'smalltalk/'.
 
-! !
 
-
 
-!PackageWithDefaultCommitPathChangedTest methodsFor: 'tests'!
 
-
 
-testGrulCommitPathJsShouldBeServerGrulJs
 
-	self assert: grulPackage commitPathJs equals: 'server/grul/js'
 
-!
 
-
 
-testGrulCommitPathStShouldBeGrulSt
 
-	self assert: grulPackage commitPathSt equals: 'grul/st'
 
-!
 
-
 
-testZorkCommitPathJsShouldBeJavascript
 
-	self assert: zorkPackage commitPathJs equals: 'javascripts/'
 
-!
 
-
 
-testZorkCommitPathStShouldBeSmalltalk
 
-	self assert: zorkPackage commitPathSt equals: 'smalltalk/'
 
-! !
 
-
 
-!PackageWithDefaultCommitPathChangedTest class methodsFor: 'accessing'!
 
-
 
-shouldInheritSelectors
 
-	^ false
 
-! !
 
-
 
 TestCase subclass: #PointTest
 
 	instanceVariableNames: ''
 
 	package: 'Kernel-Tests'!

+ 1 - 1
support/_st.js
View File 

@@ -1,3 +1,3 @@
 
-define(['boot'], function (boot) {
 
+define(['./boot'], function (boot) {
 
     return boot._st;
 
 });

+ 3 - 4
support/amber4browser.js
View File 

@@ -19,6 +19,8 @@ require = function (require) {
 
     var config = {
 
         baseUrl: home,
 
         paths: {
 
+            'amber_set': '.',
 
+            'amber_vm': '.',
 
             'amber': '../js',
 
             'jquery': 'jQuery/jquery-1.8.2.min',
 
             'jquery-ui': 'jQuery/jquery-ui-1.8.16.custom.min'
 
@@ -99,7 +101,7 @@ require = function (require) {
 
                 deps: [ './Kernel-Objects' ]
 
             },
 
             'amber/Compiler-Exceptions': {
 
-                deps: [ './Kernel-Exceptions' ]
 
+                deps: [ './Kernel-Exceptions', './Compiler-AST' ]
 
             },
 
             'amber/Compiler-Core': {
 
                 deps: [ './Kernel-Objects' ]
 
@@ -119,9 +121,6 @@ require = function (require) {
 
             'amber/Compiler-Interpreter': {
 
                 deps: [ './Compiler-Core' ]
 
             },
 
-            'amber/parser': {
 
-                deps: []
 
-            },
 
             'amber/IDE': {
 
                 deps: [ './Canvas', './Kernel-Exceptions' ]
 
             },

+ 1 - 1
support/boot.js
View File 

@@ -34,7 +34,7 @@
 
    ==================================================================== */
 
 
 
-define([ 'ensure-console', 'es5-shim-2.0.2/es5-shim.min', 'es5-shim-2.0.2/es5-sham.min' ], function () {
 
+define([ './ensure-console', './es5-shim-2.0.2/es5-shim.min', './es5-shim-2.0.2/es5-sham.min' ], function () {
 
 
 /* Array extensions */

+ 0 - 0
support/amber-core-deploy.js → support/core-deploy.js
View File


+ 1 - 1
support/amber-full-devel.js → support/full-devel.js
View File 

@@ -28,7 +28,7 @@ define([
 
     'amber/Compiler-Inlining',
 
     'amber/Compiler-Interpreter',
 
     'amber/Compiler-Tests',
 
-    'parser',
 
+    'amber_vm/parser',
 
     'amber/IDE',
 
     'amber/Examples',
 
     'amber/Benchfib',

+ 2 - 2
support/nil.js
View File 

@@ -1,3 +1,3 @@
 
-define(['boot'], function (boot) {
 
+define(['./boot'], function (boot) {
 
     return boot.nil;
 
-});
 
+});

+ 1 - 1
support/parser.js
View File 

@@ -1,4 +1,4 @@
 
-define(["smalltalk","nil"],function(smalltalk,nil){
 
+define(["./smalltalk","./nil"],function(smalltalk,nil){
 
 smalltalk.parser = (function(){
 
   /*
 
    * Generated by PEG.js 0.7.0.

+ 2 - 1
support/smalltalk.js
View File 

@@ -1,3 +1,4 @@
 
-define(['boot'], function (boot) {
 
+define(['./boot'], function (boot) {
 
     return boot.smalltalk;
 
 });
 
+