functional ES modules

@@ -4,6 +4,14 @@ module.exports = function (grunt) {
 // Project configuration.
 // Project configuration.
     grunt.initConfig({
     grunt.initConfig({
         pkg: grunt.file.readJSON('package.json'),
         pkg: grunt.file.readJSON('package.json'),
+        copy: {
+            dist: {
+                files:[
+                   {src: 'src/arcs_browser.js', dest: 'build/arcs_browser.js'}
+                ]
+                
+            }            
+        },
         jsdoc: {
         jsdoc: {
             dist: {
             dist: {
                 src: ['src/*.js', 'docs/Readme.md'], //, 'components/*.js'],
                 src: ['src/*.js', 'docs/Readme.md'], //, 'components/*.js'],
@@ -43,29 +51,13 @@ module.exports = function (grunt) {
                 }
                 }
             }
             }
         },
         },
-        file_minify: {
-            build: {
-                files: {
-                    'build/arcs.min.js': [
-                        'build/arcs.js'
-                    ],
-                    'build/arcs_browser.js': [
-                        'src/arcs_browser.js'
-                    ],
-                    'build/arcseditor.min.js': [
-                        'build/arcseditor.js'
-                    ]
- 
-                }
-            }
-        },
         terser: {
         terser: {
             build: {
             build: {
                 files: { 
                 files: { 
                     'build/arcs.min.js': [
                     'build/arcs.min.js': [
                         'build/arcs.js'
                         'build/arcs.js'
                     ],
                     ],
-                    'build/arcs_browser.js': [
+                    'build/arcs_browser.min.js': [
                         'src/arcs_browser.js'
                         'src/arcs_browser.js'
                     ],
                     ],
                     'build/arcseditor.min.js': [
                     'build/arcseditor.min.js': [
@@ -101,7 +93,6 @@ module.exports = function (grunt) {
                         'src/transitionnetwork.js',
                         'src/transitionnetwork.js',
                         'src/statemachine.js',
                         'src/statemachine.js',
                         'src/application.js',
                         'src/application.js',
-                        'src/arcs_module.js',
                         'src/exports.js'
                         'src/exports.js'
                     ],
                     ],
                 dest: 'build/arcs.js'
                 dest: 'build/arcs.js'
@@ -124,16 +115,15 @@ module.exports = function (grunt) {
     });
     });
 
 
     // Load the plugin that provides the "uglify" task.
     // Load the plugin that provides the "uglify" task.
-    grunt.loadNpmTasks('grunt-contrib-obfuscator');
-    grunt.loadNpmTasks('grunt-file-minify');
     grunt.loadNpmTasks('grunt-contrib-concat');
     grunt.loadNpmTasks('grunt-contrib-concat');
+    grunt.loadNpmTasks('grunt-contrib-copy');
     grunt.loadNpmTasks('grunt-jsdoc');
     grunt.loadNpmTasks('grunt-jsdoc');
     grunt.loadNpmTasks('grunt-jslint');
     grunt.loadNpmTasks('grunt-jslint');
     grunt.loadNpmTasks('grunt-terser');
     grunt.loadNpmTasks('grunt-terser');
     grunt.loadNpmTasks('grunt-bower-task');
     grunt.loadNpmTasks('grunt-bower-task');
 
 
     // Default task(s).
     // Default task(s).
-    grunt.registerTask('default', ['concat','terser'/*'file_minify','obfuscator'*/]);
+    grunt.registerTask('default', ['concat','copy','terser']);
     grunt.registerTask('lint', ['jslint']);
     grunt.registerTask('lint', ['jslint']);
     grunt.registerTask('doc', ['jsdoc']);
     grunt.registerTask('doc', ['jsdoc']);
 };
 };

@@ -247,6 +247,7 @@ ARCS.Context = function( ctx ) {
     if (ctx !== undefined) {
     if (ctx !== undefined) {
         libraries = ctx.libraries;
         libraries = ctx.libraries;
     
     
+        var p;
         for (p in ctx.components) {
         for (p in ctx.components) {
             if (ctx.components.hasOwnProperty(p)) {
             if (ctx.components.hasOwnProperty(p)) {
                 components[p] = ctx.components[p];
                 components[p] = ctx.components[p];
@@ -263,8 +264,7 @@ ARCS.Context = function( ctx ) {
         
         
     }
     }
 
 
-    //! TODO use fetch API? 
-    loadDataFile =async function(fileName) {
+    var loadDataFile =async function(fileName) {
         var dataPromise ;
         var dataPromise ;
                 
                 
         if (ARCS.isInNode()) {
         if (ARCS.isInNode()) {
@@ -281,19 +281,8 @@ ARCS.Context = function( ctx ) {
             return client.json();
             return client.json();
         }
         }
     };
     };
-    
-    //! TODO not needed anymore? 
-    /*this.addLibraryPromise = function(p) {
-        depLibPromises.push(p);
-    };*/
-            
-    /*promiseLibrary = function(libName) {
-        return import(libName);    
-    };*/
-    
-    //! TODO modify loadLibraries and loadLibrary to directly register
-    // factories so that arcs_module is not needed anymore ?    
-    loadLibraries = function () {
+        
+    var loadLibraries = function () {
         var i;
         var i;
         // we will use different instances of require either the one of node 
         // we will use different instances of require either the one of node 
         // or the one from require.js
         // or the one from require.js
@@ -301,16 +290,13 @@ ARCS.Context = function( ctx ) {
         
         
         var res=[];
         var res=[];
         for(i=0; i < libraries.length; i++) {
         for(i=0; i < libraries.length; i++) {
-            //! TODO
-            res.push(loadLibrary(libraries[i]));
-                //import(libraries[i]));
+            res.push(self.loadLibrary(libraries[i]));
         }
         }
         return Promise.all(res);        
         return Promise.all(res);        
     };
     };
     
     
-    instanciateComponents = function() {
+    var instanciateComponents = function() {
         var p, promises=[];
         var p, promises=[];
-        console.log(components);
         
         
         for (p in components) {
         for (p in components) {
            if (components.hasOwnProperty(p)) {
            if (components.hasOwnProperty(p)) {
@@ -319,7 +305,7 @@ ARCS.Context = function( ctx ) {
                     console.error("[ARCS] Context dump follows: ", libraries, components, constants);
                     console.error("[ARCS] Context dump follows: ", libraries, components, constants);
                     return ;
                     return ;
                 }                    
                 }                    
-                factory = factories[components[p].type];
+                var factory = factories[components[p].type];
                 //console.log("instanciating ", p);
                 //console.log("instanciating ", p);
                 try {
                 try {
                 if (components[p].value !== undefined || components[p].url !== undefined || components[p].ref !== undefined) {                
                 if (components[p].value !== undefined || components[p].url !== undefined || components[p].ref !== undefined) {                
@@ -368,21 +354,23 @@ ARCS.Context = function( ctx ) {
             libActualName = libName.name;
             libActualName = libName.name;
             libUrl = libName.url;
             libUrl = libName.url;
         }
         }
-                
-        libraries.push(libActualName);
+
+        if (libraries.indexOf(libActualName) < 0) {
+            libraries.push(libActualName);
+        }
         // TODO promisify call to cbFunction
         // TODO promisify call to cbFunction
         return import(libUrl).then( function(module) {
         return import(libUrl).then( function(module) {
             // TODO insert here component factories
             // TODO insert here component factories
-            for (p in module) {
-                if (module.hasOwnProperty(p)) {
-                    ARCS.Context.currentContext.setFactory(p,module[p]);
+            for (p in module.default) {
+                if (module.default.hasOwnProperty(p)) {
+                    ARCS.Context.currentContext.setFactory(p,module.default[p]);
                 }
                 }
             }
             }
 
 
             if (cbFunction !== undefined) {
             if (cbFunction !== undefined) {
                 cbFunction();
                 cbFunction();
             }
             }
-        });
+        }).catch( function(msg) { console.error("[ARCS] Trouble loading '",libUrl,"' with reason -", msg) });
     };
     };
     
     
     /**
     /**
@@ -501,7 +489,7 @@ ARCS.Context = function( ctx ) {
     this.instanciate = function () {
     this.instanciate = function () {
         //! TODO
         //! TODO
         return loadLibraries().then(instanciateComponents)
         return loadLibraries().then(instanciateComponents)
-                    .catch(function(msg) { console.log("[ARCS] Trouble instanciating context", msg); });
+                    .catch(function(msg) { console.error("[ARCS] Trouble instanciating context", msg); });
         
         
     };
     };
     
     
@@ -2049,7 +2037,7 @@ ARCS.Application = function () {
      * Starts the application
      * Starts the application
      */
      */
     this.start = function () {
     this.start = function () {
-        console.log("[ARCS] Starting application");
+        console.log("[ARCS] Starting application...");
         context.instanciate().then(preProcess);
         context.instanciate().then(preProcess);
     };
     };
 };
 };
@@ -2065,103 +2053,6 @@ ARCS.Application.slot("setSheet");
 ARCS.Application.slot("finish");
 ARCS.Application.slot("finish");
 
 
 
 
-/**
- * definition of the main module function: 
- * it takes an anonymous function as a parameter
- * the anonymous function has one parameter: the object encompassing 
- * ARCS definitions (in order to able to use ARCS.Component.create, ...)
- * @param moduleDefinition {function} main function of the module. 
- * It should return a list of components
- * @param deps {mixed[]} dependencies
- */
-
-// TODO arcs_module seems to be not needed anymore!!!!
-// more cunning, this time, we export an arcs_module function 
-// that we call later!
-// still we need to do something about it in order to register
-// components.
-// in fact factories should be registered in load library.
-
-// reimplementation using native promises
-arcs_module = function(moduleDefinition, deps) {
-    var storeComponents, i;
-    
-    if (typeof module !== 'undefined') {
-        if (module.parent.exports) {
-            ARCS = module.exports; 
-        }
-    }
-    
-    if (deps === undefined) { deps = []; }
-    
-    storeComponents = function (deps) {
-        var mdef, p;
-        // we should insert ARCS at the beginning of deps !
-        deps.unshift(ARCS);
-        
-        mdef = (typeof moduleDefinition === 'function') ?
-                moduleDefinition.apply(this, deps) : moduleDefinition;
-
-        if (mdef === undefined) {
-            throw new Error("[ARCS] Your module is undefined. Did you forget to export components?\nCode of module follows:\n" +moduleDefinition);
-        }
-
-        for (p in mdef) {
-            if (mdef.hasOwnProperty(p) && ARCS.Context.currentContext != null) {
-                ARCS.Context.currentContext.setFactory(p,mdef[p]); //.setFactory(ARCS.Application.currentApplication, p, mdef[p]);
-            }
-        }
-        
-        return Promise.resolve();
-    };
-    // until now, it is the very same code.
-    
-    // here we create a promise to solve dependency
-    // reject has the dependency name, while resolve has the object
-    var depResolve = function(dep) {
-        return new Promise(function(resolve, reject) {  
-            var d,shimConfig;
-            if (ARCS.isInNode()) {
-                d = require(dep);
-                if (d === undefined) {
-                    reject(dep);
-                } else {
-                    resolve(d);
-                }
-            } else {
-                // this one a little bit trickier since we have to shim.
-                if (dep.name !== undefined) {
-                    shimConfig = { shim: {} };
-                    shimConfig.shim[dep.name] = { exports: dep.exports };
-                    if (dep.deps !== undefined) {
-                        shimConfig.shim[dep.name].deps = dep.deps;
-                    }
-                    require.config(shimConfig);
-                    dep = dep.name;
-                }
-                // shim performed
-                require([dep], 
-                        function(d) { resolve(d); },
-                        function(err) { console.log("[ARCS] Trouble with module ", dep); reject(dep, err); }
-                );
-            }
-        });            
-    };
-        
-    var depResolves = [];
-    for (i=0; i<deps.length; i++) {
-        depResolves[i] = depResolve(deps[i]);
-    }
-    
- 
-    
-        ARCS.Context.currentContext.addLibraryPromise(
-            Promise.all(depResolves).then(storeComponents,
-            function(reason) { console.error("[ARCS] Failed to load dependency ", reason ); })
-        
-        );
-    
-}
 // no longer needed with the use of imports
 // no longer needed with the use of imports
 
 
-export default ARCS;
\ No newline at end of file
+export { ARCS as default};
\ No newline at end of file

-var ARCS=ARCS||{};ARCS.isInNode=function(){return"function"==typeof require&&require.resolve},ARCS.Component={SourceIsNotComponent:{message:"Source is not a component"},UndefinedSignal:{message:"Signal is not defined"},UndefinedSlot:{message:"Slot is not defined"},create:function(n,t,e){return void 0===n.prototype?(console.error("Cannot create such a component"),0):(n.prototype.slots=[],n.prototype.signals={},n.slotList=function(){return n.prototype.slots},n.prototype.slotList=function(){return n.prototype.slots},n.prototype.signalList=function(){var t,e=[];for(t in n.prototype.signals)e.push(t);return e},n.signalList=function(){return n.prototype.signalList()},n.prototype.emit=function(n){var t,e,o,i=Array.prototype.slice.call(arguments,1);for(t in this.signals[n])e=this.signals[n][t].func,o=this.signals[n][t].obj,e.apply(o,i)},n.slot=function(t,e){var o;if(t instanceof Array)for(o=0;o<t.length;o++)n.prototype.slots.push(t[o]);else n.prototype.slots.push(t),void 0!==e&&(n.prototype[t]=e)},n.signal=function(t){var e;if(t instanceof Array)for(e=0;e<t.length;e++)n.prototype.signals[t[e]]=1;else n.prototype.signals[t]=1},void 0!==t&&n.slot(t),void 0!==e&&n.signal(e),n)},check:function(n){return void 0!==n.prototype&&(void 0!==n.prototype.signals&&void 0!==n.prototype.slots)},connect:function(n,t,e,o){var i,r;if(void 0===n.signals)throw ARCS.Component.SourceIsNotComponent;if(void 0===n.signals[t])throw ARCS.Component.UndefinedSignal;if(void 0===e[o])throw ARCS.Component.UndefinedSlot;if(!n.hasOwnProperty("signals"))for(r in i=n.signals,n.signals={},i)n.signals[r]=[];n.signals[t].push({obj:e,func:e[o]})},disconnect:function(n,t,e,o){var i;for(i=0;i<n.signals[t].length;i++)n.signals[t][i].obj===e&&n.signals[t][i].func===e[o]&&(n.signals[t].splice(i,1),i--)},invoke:function(n,t,e){if(void 0===n[t])throw ARCS.Component.UndefinedSlot;n[t].apply(n,e)},config:function(n,t){"function"==typeof n.config&&n.config(t)}},ARCS.Context=function(n){var t,e,o,i={},r={},s={},c=[],a=this;if(s.StateMachine=ARCS.Statemachine,void 0!==n){for(p in c=n.libraries,n.components)n.components.hasOwnProperty(p)&&(i[p]=n.components[p]);if(void 0!==n.constants)for(p in n.constants)n.constants.hasOwnProperty(p)&&(r[p]=n.constants[p])}e=async function(n){return ARCS.isInNode()?new Promise((function(t,e){var o=require(n);void 0!==o?t(o):e("[ARCS] File not found")})):(await fetch(n)).json()},t=function(){var n;ARCS.Context.currentContext=a;var t=[];for(n=0;n<c.length;n++)t.push(loadLibrary(c[n]));return Promise.all(t)},o=function(){var n,t=[];for(n in console.log(i),i)if(i.hasOwnProperty(n)){if(void 0===s[i[n].type])return console.error("[ARCS] Factory "+i[n].type+" not found."),void console.error("[ARCS] Context dump follows: ",c,i,r);factory=s[i[n].type];try{if(void 0!==i[n].value||void 0!==i[n].url||void 0!==i[n].ref){if(void 0!==i[n].value&&(i[n].instance=new factory(i[n].value)),void 0!==i[n].url){console.log("loading data file",i[n].url),t.push(e(i[n].url).then(function(n,t){return function(e){return console.log("instanciating from data file"),i[n].instance=new t(e),Promise.resolve()}}(n,factory)))}void 0!==i[n].ref&&void 0!==r[i[n].ref]&&(i[n].instance=new factory(r[i[n].ref]))}else i[n].instance=new factory}catch(t){console.error("[ARCS] Component of type ",n," not instanciated.",t)}}return Promise.all(t)},this.loadLibrary=function(n,t){var e=n,o=n;return ARCS.Context.currentContext=a,"string"!=typeof n&&(o=n.name,e=n.url),c.push(o),import(e).then((function(n){for(p in n)n.hasOwnProperty(p)&&ARCS.Context.currentContext.setFactory(p,n[p]);void 0!==t&&t()}))},this.getComponentList=function(){var n,t=Object.keys(i);for(n=0;n<t.length;n++)i.hasOwnProperty(t[n])||t.splice(n--,1);return t},this.getConstant=function(n){return r[n]},this.getComponentType=function(n){if(void 0!==i[n])return i[n].type},this.getComponentValue=function(n){if(void 0!==i[n])return i[n].value},this.getComponent=function(n){if(void 0!==i[n])return i[n].instance},this.getComponentName=function(n){var t,e;for(e=i.getComponentList(),t=0;t<e.length;t++)if(i[e[t]].instance===n)return e[t]},this.setFactory=function(n,t){s[n]=t},this.toJSON=function(){var n,t={};for(n in i)i.hasOwnProperty(n)&&(t[n]={type:i[n].type,value:i[n].value});return t},this.setComponentValue=function(n,t){i[n].value=t},this.addComponent=function(n,t,e){var o;i[n]={},i[n].type=t,i[n].value=e;var r=s[t];void 0!==r&&(o=new r(e)),i[n].instance=o},this.removeComponent=function(n){delete i[n]},this.getFactory=function(n){return s[n]},this.getFactoryList=function(){return Object.keys(s)},this.instanciate=function(){return t().then(o).catch((function(n){console.log("[ARCS] Trouble instanciating context",n)}))};var u=function(n,t){var e,o=Object.create(t);for(e in n)n.hasOwnProperty(e)&&(o[e]=n[e]);return o};this.chain=function(n,t,e){return[u(n,i),u(t,r),u(e,s)]},this.setParent=function(n){if(void 0!==n){var t=n.chain(i,r,s);i=t[0],r=t[1],s=t[2]}}},ARCS.Context.currentContext=null,ARCS.Invocation=function(n,t,e){this.getDestination=function(){return n},this.getSlot=function(){return t},this.getValue=function(){return e},this.invoke=function(){var o=n[t];void 0!==o?o.apply(n,e):console.error("Undefined slot %s of component %s",t,n)}},ARCS.Invocation.cast=function(n,t){if(void 0!==n.value){var e=t.getComponent(n.destination);return void 0===e&&console.error("[ARCS] Destination ",n.destination," is undefined"),new ARCS.Invocation(e,n.slot,n.value)}if(void 0!==n.ref)return new ARCS.Invocation(t.getComponent(n.destination),n.slot,t.getConstant(n.ref))},ARCS.Invocation.PRE_CONNECTION=0,ARCS.Invocation.POST_CONNECTION=1,ARCS.Invocation.CLEAN_UP=2,ARCS.Connection=function(n,t,e,o){this.connect=function(){try{ARCS.Component.connect(n,t,e,o)}catch(i){console.log(i,n,t,e,o)}},this.disconnect=function(){ARCS.Component.disconnect(n,t,e,o)},this.getSource=function(){return n},this.getDestination=function(){return e},this.getSlot=function(){return o},this.getSignal=function(){return t}},ARCS.Connection.cast=function(n,t){return new ARCS.Connection(t.getComponent(n.source),n.signal,t.getComponent(n.destination),n.slot)},ARCS.Sheet=function(n){var t,e,o,i,r,s=new ARCS.Context,c=[],a=[],u=[],f=[],l=0,p=0,h=0,d=0;t=function(){var n;for(n=0;n<c.length;n++)c[n].invoke()},e=function(){var n;for(n=0;n<a.length;n++)a[n].invoke()},o=function(){var n;for(n=0;n<u.length;n++)u[n].invoke()},i=function(){var n;for(n=0;n<f.length;n++)f[n].connect()},r=function(){var n;for(n=0;n<f.length;n++)f[n].disconnect()},this.setContext=function(n){s=n},this.activate=function(){s.instanciate().then((function(){t(),i(),e()}))},this.deactivate=function(){r(),o()},this.addPreConnection=function(n){var t=ARCS.Invocation.cast(n,s);return t.id=l++,c.push(t),t.id},this.addPostConnection=function(n){var t=ARCS.Invocation.cast(n,s);return t.id=p++,a.push(t),t.id},this.addCleanup=function(n){var t=ARCS.Invocation.cast(n,s);return t.id=h++,u.push(t),t.id},this.addConnection=function(n){var t=ARCS.Connection.cast(n,s);return t.id=d++,f.push(t),t.id};var C=function(n,t){for(var e=t.length;e--&&t[e].id!==n;);e>=0?t.splice(e,1):console.warn("Could not remove data with id",n)};this.removePreConnection=function(n){C(n,c)},this.removePostConnection=function(n){C(n,a)},this.removeCleanup=function(n){C(n,u)};var v=function(n,t,e){for(var o=e.length;o--&&e[o].id!==n;);o>=0&&(e[o].value=t)};this.changePreConnection=function(n,t){v(n,t,c)},this.changePostConnection=function(n,t){v(n,t,a)},this.changeCleanup=function(n,t){v(n,t,u)},this.removeConnection=function(n){C(n,f)};var g=function(n,t,e){for(var o,i=e.length,r=e.length;i--&&e[i].id!==n;);for(;r--&&e[r].id!==t;);i>=0&&r>=0&&(o=e[i],e[i]=e[r],e[r]=o,e[i].id=n,e[r].id=t)};this.swapConnections=function(n,t){g(n,t,f)},this.swapCleanups=function(n,t){g(n,t,u)},this.swapPreConnections=function(n,t){g(n,t,c)},this.swapPostConnections=function(n,t){g(n,t,a)};this.import=function(t){t.hasOwnProperty("context")&&(s=new ARCS.Context(t.context)).setParent(n),s.instanciate().then((function(){!function(n){var t=0,e=ARCS.Invocation.cast,o=ARCS.Connection.cast;for(t=0;t<n.preconnections.length;t++)c.push(e(n.preconnections[t],s));for(t=0;t<n.postconnections.length;t++)a.push(e(n.postconnections[t],s));for(t=0;t<n.cleanups.length;t++)u.push(e(n.cleanups[t],s));for(t=0;t<n.connections.length;t++)f.push(o(n.connections[t],s))}(t)}))};var S=function(n){return{destination:s.getComponentName(n.getDestination()),slot:n.getSlot(),value:n.getValue()}};this.toJSON=function(){var n,t,e=[],o=[],i=[],r=[];for(n=0;n<f.length;n++)i.push((t=f[n],{source:s.getComponentName(t.getSource()),signal:t.getSignal(),destination:s.getComponentName(t.getDestination()),slot:t.getSlot()}));for(n=0;n<c.length;n++)e.push(S(c[n]));for(n=0;n<a.length;n++)o.push(S(a[n]));for(n=0;n<u.length;n++)r.push(S(u[n]));return{preconnections:e,postconnections:o,connections:i,cleanups:r}},s.setParent(n)},ARCS.EventLogicParser=function(){function n(n,t,e,o,i,r){this.message=n,this.expected=t,this.found=e,this.offset=o,this.line=i,this.column=r,this.name="SyntaxError"}return function(n,t){function e(){this.constructor=n}e.prototype=t.prototype,n.prototype=new e}(n,Error),{SyntaxError:n,parse:function(t){var e,o=arguments.length>1?arguments[1]:{},i={},r={start:D},s=D,c=i,a=function(n,t){return[n].concat(t)},u=function(n){return{and:n}},f=function(n){return{or:n}},l=function(n){return n},p="(",h={type:"literal",value:"(",description:'"("'},d=")",C={type:"literal",value:")",description:'")"'},v=function(n){return[n]},g={type:"other",description:"id"},S=function(n){return n.trim()},m=/^[_a-zA-Z]/,A={type:"class",value:"[_a-zA-Z]",description:"[_a-zA-Z]"},y=/^[_a-zA-Z0-9]/,R={type:"class",value:"[_a-zA-Z0-9]",description:"[_a-zA-Z0-9]"},w="&",x={type:"literal",value:"&",description:'"&"'},P="|",O={type:"literal",value:"|",description:'"|"'},N=/^[ \r\n\t]/,T={type:"class",value:"[ \\r\\n\\t]",description:"[ \\r\\n\\t]"},b=0,k=0,F={line:1,column:1,seenCR:!1},I=0,E=[],L=0;if("startRule"in o){if(!(o.startRule in r))throw new Error("Can't start parsing from rule \""+o.startRule+'".');s=r[o.startRule]}function q(n){return k!==n&&(k>n&&(k=0,F={line:1,column:1,seenCR:!1}),function(n,e,o){var i,r;for(i=e;i<o;i++)"\n"===(r=t.charAt(i))?(n.seenCR||n.line++,n.column=1,n.seenCR=!1):"\r"===r||"\u2028"===r||"\u2029"===r?(n.line++,n.column=1,n.seenCR=!0):(n.column++,n.seenCR=!1)}(F,k,n),k=n),F}function _(n){b<I||(b>I&&(I=b,E=[]),E.push(n))}function j(e,o,i){var r=q(i),s=i<t.length?t.charAt(i):null;return null!==o&&function(n){var t=1;for(n.sort((function(n,t){return n.description<t.description?-1:n.description>t.description?1:0}));t<n.length;)n[t-1]===n[t]?n.splice(t,1):t++}(o),new n(null!==e?e:function(n,t){var e,o=new Array(n.length);for(e=0;e<n.length;e++)o[e]=n[e].description;return"Expected "+(n.length>1?o.slice(0,-1).join(", ")+" or "+o[n.length-1]:o[0])+" but "+(t?'"'+function(n){function t(n){return n.charCodeAt(0).toString(16).toUpperCase()}return n.replace(/\\/g,"\\\\").replace(/"/g,'\\"').replace(/\x08/g,"\\b").replace(/\t/g,"\\t").replace(/\n/g,"\\n").replace(/\f/g,"\\f").replace(/\r/g,"\\r").replace(/[\x00-\x07\x0B\x0E\x0F]/g,(function(n){return"\\x0"+t(n)})).replace(/[\x10-\x1F\x80-\xFF]/g,(function(n){return"\\x"+t(n)})).replace(/[\u0180-\u0FFF]/g,(function(n){return"\\u0"+t(n)})).replace(/[\u1080-\uFFFF]/g,(function(n){return"\\u"+t(n)}))}(t)+'"':"end of input")+" found."}(o,s),o,s,i,r.line,r.column)}function D(){return U()}function U(){var n,t,e,o;if(n=b,(t=Z())!==i){if(e=[],(o=z())!==i)for(;o!==i;)e.push(o),o=z();else e=c;e!==i?(n,n=t=a(t,e)):(b=n,n=c)}else b=n,n=c;return n===i&&(n=Z()),n}function z(){var n,e;return n=b,function(){var n,e,o,r;n=b,(e=V())!==i?(38===t.charCodeAt(b)?(o=w,b++):(o=i,0===L&&_(x)),o!==i&&(r=V())!==i?n=e=[e,o,r]:(b=n,n=c)):(b=n,n=c);return n}()!==i&&(e=Z())!==i?(n,n=u(e)):(b=n,n=c),n===i&&(n=b,function(){var n,e,o,r;n=b,(e=V())!==i?(124===t.charCodeAt(b)?(o=P,b++):(o=i,0===L&&_(O)),o!==i&&(r=V())!==i?n=e=[e,o,r]:(b=n,n=c)):(b=n,n=c);return n}()!==i&&(e=Z())!==i?(n,n=f(e)):(b=n,n=c)),n}function Z(){var n,e,o,r;return n=b,(e=function(){var n,e,o;L++,n=b,e=b,(o=function(){var n,e,o,r,s;if(n=b,(e=V())!==i)if(m.test(t.charAt(b))?(o=t.charAt(b),b++):(o=i,0===L&&_(A)),o!==i){for(r=[],y.test(t.charAt(b))?(s=t.charAt(b),b++):(s=i,0===L&&_(R));s!==i;)r.push(s),y.test(t.charAt(b))?(s=t.charAt(b),b++):(s=i,0===L&&_(R));r!==i&&(s=V())!==i?n=e=[e,o,r,s]:(b=n,n=c)}else b=n,n=c;else b=n,n=c;return n}())!==i&&(o=t.substring(e,b));(e=o)!==i&&(n,e=S(e));L--,(n=e)===i&&(e=i,0===L&&_(g));return n}())!==i&&(n,e=l(e)),(n=e)===i&&(n=b,40===t.charCodeAt(b)?(e=p,b++):(e=i,0===L&&_(h)),e!==i&&(o=U())!==i?(41===t.charCodeAt(b)?(r=d,b++):(r=i,0===L&&_(C)),r!==i?(n,n=e=v(o)):(b=n,n=c)):(b=n,n=c)),n}function V(){var n,e;for(n=[],N.test(t.charAt(b))?(e=t.charAt(b),b++):(e=i,0===L&&_(T));e!==i;)n.push(e),N.test(t.charAt(b))?(e=t.charAt(b),b++):(e=i,0===L&&_(T));return n}if((e=s())!==i&&b===t.length)return e;throw e!==i&&b<t.length&&_({type:"end",description:"end of input"}),j(null,E,I)}}}(),ARCS.TokenEvent=function(){var n,t;this.promise=new Promise((function(e,o){n=e,t=o})),this.accept=function(){n()},this.abort=function(){t()}},ARCS.TransitionNetwork=function(){this.promise={},this.and=function(n){return this.promise=Promise.all([this.promise,n.promise]),this},this.or=function(n){return this.promise=Promise.race([this.promise,n.promise]),this}},ARCS.TransitionNetwork.build=function(n,t){var e,o,r;if("string"==typeof n){var s;t.hasOwnProperty(n)?s=t[n]:t[n]=s=new ARCS.TokenEvent;var c=new ARCS.TransitionNetwork;return c.promise=s.promise,c}for(e=ARCS.TransitionNetwork.build(n[0],t),i=1;i<n.length;i++)n[i].hasOwnProperty("and")?(r=ARCS.TransitionNetwork.build(n[i].and,t),o=e.and(r)):n[i].hasOwnProperty("or")?(r=ARCS.TransitionNetwork.build(n[i].or,t),o=e.or(r)):console.warn("[ARCS] Illegal tree"),e=o;return e},ARCS.Statemachine=new ARCS.Component.create((function(n){var t="",e="",o={},i="",r=this,s={},c={},a=function(n){var t;r.slots.indexOf(n)<0&&(r.slots.push(n),r[n]=(t=n,function(){r.setToken(t)}))},u=function(n){var t;if(o.hasOwnProperty(n))for(t in c={},o[n])o[n].hasOwnProperty(t)&&ARCS.TransitionNetwork.build(s[t],c).promise.then((function(){var e;for(e in c)c.hasOwnProperty(e)&&c[e].abort();u(o[n][t])}));i=n,r.emit("requestSheet",i),i===e&&r.emit("requestTermination")};this.setInitialState=function(n){i=t=n},this.setFinalState=function(n){e=n},this.addTransition=function(n,t,e){var i,r=/([A-Za-z_]\w*)/g;try{var c;if("string"==typeof(c=ARCS.EventLogicParser.parse(t)))a(c);else for(;null!==(i=r.exec(t));)a(i[0]);s[t]=c,void 0===o[n]&&(o[n]={}),o[n][t]=e}catch(n){}},this.setToken=function(n){c.hasOwnProperty(n)&&c[n].accept()},this.setTransitions=function(n){var t,e;for(t in n)if(n.hasOwnProperty(t))for(e in n[t])n[t].hasOwnProperty(e)&&this.addTransition(t,e,n[t][e])},this.start=function(){console.log("statemachine",this,t,n),u(t)},void 0!==n&&(t=n.initial,e=n.final,this.setTransitions(n.transitions),i="")}),["setToken"],["requestSheet","requestTermination"]),ARCS.Application=function(){var n,t=new ARCS.Context,e={},o={},i=[],r=this,s="";this.export=function(){return{context:t,controller:t.getComponentName(o),sheets:e}},this.getContext=function(){return t},this.getSheetList=function(){return Object.keys(e)},this.getSheet=function(n){return e[n]},this.addSheet=function(n,o){e[n]=o,o.setContext(t)},this.removeSheet=function(n){delete e[n]},n=function(){var n,i,s;for(i=t.getComponent(o),o=i,s=Object.keys(e),n=0;n<s.length;n++)(i=new ARCS.Sheet(t)).import(e[s[n]],t),e[s[n]]=i;ARCS.Component.connect(o,"requestSheet",r,"setSheet"),ARCS.Component.connect(o,"requestTermination",r,"finish"),o.start()},this.setController=function(n){o=t.getComponent(n)},this.setSheet=function(n){e.hasOwnProperty(n)?(s&&e[s].deactivate(),e[s=n].activate()):console.warn("[ARCS] Tried to activate hollow sheet named: "+n)},this.finish=function(){s&&e[s].deactivate()},this.import=function(n){t=new ARCS.Context(n.context),e=n.sheets,void 0===(o=n.controller)&&console.error("[ARCS] Undefined controller. Cannot start application.")},this.setFactory=function(n,t){factories[n]=t},this.setDependency=function(n){i[n]={}},this.start=function(){console.log("[ARCS] Starting application"),t.instanciate().then(n)}},ARCS.Application.setDependency=function(n,t){n.setDependency(t)},ARCS.Component.create(ARCS.Application),ARCS.Application.slot("setSheet"),ARCS.Application.slot("finish"),arcs_module=function(n,t){var e,o;"undefined"!=typeof module&&module.parent.exports&&(ARCS=module.exports),void 0===t&&(t=[]),e=function(t){var e,o;if(t.unshift(ARCS),void 0===(e="function"==typeof n?n.apply(this,t):n))throw new Error("[ARCS] Your module is undefined. Did you forget to export components?\nCode of module follows:\n"+n);for(o in e)e.hasOwnProperty(o)&&null!=ARCS.Context.currentContext&&ARCS.Context.currentContext.setFactory(o,e[o]);return Promise.resolve()};var i=function(n){return new Promise((function(t,e){var o,i;ARCS.isInNode()?void 0===(o=require(n))?e(n):t(o):(void 0!==n.name&&((i={shim:{}}).shim[n.name]={exports:n.exports},void 0!==n.deps&&(i.shim[n.name].deps=n.deps),require.config(i),n=n.name),require([n],(function(n){t(n)}),(function(t){console.log("[ARCS] Trouble with module ",n),e(n,t)})))}))},r=[];for(o=0;o<t.length;o++)r[o]=i(t[o]);ARCS.Context.currentContext.addLibraryPromise(Promise.all(r).then(e,(function(n){console.error("[ARCS] Failed to load dependency ",n)})))};export default ARCS;
\ No newline at end of file
+var ARCS=ARCS||{};ARCS.isInNode=function(){return"function"==typeof require&&require.resolve},ARCS.Component={SourceIsNotComponent:{message:"Source is not a component"},UndefinedSignal:{message:"Signal is not defined"},UndefinedSlot:{message:"Slot is not defined"},create:function(n,t,e){return void 0===n.prototype?(console.error("Cannot create such a component"),0):(n.prototype.slots=[],n.prototype.signals={},n.slotList=function(){return n.prototype.slots},n.prototype.slotList=function(){return n.prototype.slots},n.prototype.signalList=function(){var t,e=[];for(t in n.prototype.signals)e.push(t);return e},n.signalList=function(){return n.prototype.signalList()},n.prototype.emit=function(n){var t,e,o,i=Array.prototype.slice.call(arguments,1);for(t in this.signals[n])e=this.signals[n][t].func,o=this.signals[n][t].obj,e.apply(o,i)},n.slot=function(t,e){var o;if(t instanceof Array)for(o=0;o<t.length;o++)n.prototype.slots.push(t[o]);else n.prototype.slots.push(t),void 0!==e&&(n.prototype[t]=e)},n.signal=function(t){var e;if(t instanceof Array)for(e=0;e<t.length;e++)n.prototype.signals[t[e]]=1;else n.prototype.signals[t]=1},void 0!==t&&n.slot(t),void 0!==e&&n.signal(e),n)},check:function(n){return void 0!==n.prototype&&(void 0!==n.prototype.signals&&void 0!==n.prototype.slots)},connect:function(n,t,e,o){var i,r;if(void 0===n.signals)throw ARCS.Component.SourceIsNotComponent;if(void 0===n.signals[t])throw ARCS.Component.UndefinedSignal;if(void 0===e[o])throw ARCS.Component.UndefinedSlot;if(!n.hasOwnProperty("signals"))for(r in i=n.signals,n.signals={},i)n.signals[r]=[];n.signals[t].push({obj:e,func:e[o]})},disconnect:function(n,t,e,o){var i;for(i=0;i<n.signals[t].length;i++)n.signals[t][i].obj===e&&n.signals[t][i].func===e[o]&&(n.signals[t].splice(i,1),i--)},invoke:function(n,t,e){if(void 0===n[t])throw ARCS.Component.UndefinedSlot;n[t].apply(n,e)},config:function(n,t){"function"==typeof n.config&&n.config(t)}},ARCS.Context=function(n){var t={},e={},o={},i=[],r=this;if(o.StateMachine=ARCS.Statemachine,void 0!==n){var s;for(s in i=n.libraries,n.components)n.components.hasOwnProperty(s)&&(t[s]=n.components[s]);if(void 0!==n.constants)for(s in n.constants)n.constants.hasOwnProperty(s)&&(e[s]=n.constants[s])}var c=async function(n){return ARCS.isInNode()?new Promise((function(t,e){var o=require(n);void 0!==o?t(o):e("[ARCS] File not found")})):(await fetch(n)).json()},a=function(){var n,r=[];for(n in t)if(t.hasOwnProperty(n)){if(void 0===o[t[n].type])return console.error("[ARCS] Factory "+t[n].type+" not found."),void console.error("[ARCS] Context dump follows: ",i,t,e);var s=o[t[n].type];try{if(void 0!==t[n].value||void 0!==t[n].url||void 0!==t[n].ref){if(void 0!==t[n].value&&(t[n].instance=new s(t[n].value)),void 0!==t[n].url){console.log("loading data file",t[n].url),r.push(c(t[n].url).then(function(n,e){return function(o){return console.log("instanciating from data file"),t[n].instance=new e(o),Promise.resolve()}}(n,s)))}void 0!==t[n].ref&&void 0!==e[t[n].ref]&&(t[n].instance=new s(e[t[n].ref]))}else t[n].instance=new s}catch(t){console.error("[ARCS] Component of type ",n," not instanciated.",t)}}return Promise.all(r)};this.loadLibrary=function(n,t){var e=n,o=n;return ARCS.Context.currentContext=r,"string"!=typeof n&&(o=n.name,e=n.url),i.indexOf(o)<0&&i.push(o),import(e).then((function(n){for(s in n.default)n.default.hasOwnProperty(s)&&ARCS.Context.currentContext.setFactory(s,n.default[s]);void 0!==t&&t()})).catch((function(n){console.error("[ARCS] Trouble loading '",e,"' with reason -",n)}))},this.getComponentList=function(){var n,e=Object.keys(t);for(n=0;n<e.length;n++)t.hasOwnProperty(e[n])||e.splice(n--,1);return e},this.getConstant=function(n){return e[n]},this.getComponentType=function(n){if(void 0!==t[n])return t[n].type},this.getComponentValue=function(n){if(void 0!==t[n])return t[n].value},this.getComponent=function(n){if(void 0!==t[n])return t[n].instance},this.getComponentName=function(n){var e,o;for(o=t.getComponentList(),e=0;e<o.length;e++)if(t[o[e]].instance===n)return o[e]},this.setFactory=function(n,t){o[n]=t},this.toJSON=function(){var n,e={};for(n in t)t.hasOwnProperty(n)&&(e[n]={type:t[n].type,value:t[n].value});return e},this.setComponentValue=function(n,e){t[n].value=e},this.addComponent=function(n,e,i){var r;t[n]={},t[n].type=e,t[n].value=i;var s=o[e];void 0!==s&&(r=new s(i)),t[n].instance=r},this.removeComponent=function(n){delete t[n]},this.getFactory=function(n){return o[n]},this.getFactoryList=function(){return Object.keys(o)},this.instanciate=function(){return function(){var n;ARCS.Context.currentContext=r;var t=[];for(n=0;n<i.length;n++)t.push(r.loadLibrary(i[n]));return Promise.all(t)}().then(a).catch((function(n){console.error("[ARCS] Trouble instanciating context",n)}))};var u=function(n,t){var e,o=Object.create(t);for(e in n)n.hasOwnProperty(e)&&(o[e]=n[e]);return o};this.chain=function(n,i,r){return[u(n,t),u(i,e),u(r,o)]},this.setParent=function(n){if(void 0!==n){var i=n.chain(t,e,o);t=i[0],e=i[1],o=i[2]}}},ARCS.Context.currentContext=null,ARCS.Invocation=function(n,t,e){this.getDestination=function(){return n},this.getSlot=function(){return t},this.getValue=function(){return e},this.invoke=function(){var o=n[t];void 0!==o?o.apply(n,e):console.error("Undefined slot %s of component %s",t,n)}},ARCS.Invocation.cast=function(n,t){if(void 0!==n.value){var e=t.getComponent(n.destination);return void 0===e&&console.error("[ARCS] Destination ",n.destination," is undefined"),new ARCS.Invocation(e,n.slot,n.value)}if(void 0!==n.ref)return new ARCS.Invocation(t.getComponent(n.destination),n.slot,t.getConstant(n.ref))},ARCS.Invocation.PRE_CONNECTION=0,ARCS.Invocation.POST_CONNECTION=1,ARCS.Invocation.CLEAN_UP=2,ARCS.Connection=function(n,t,e,o){this.connect=function(){try{ARCS.Component.connect(n,t,e,o)}catch(i){console.log(i,n,t,e,o)}},this.disconnect=function(){ARCS.Component.disconnect(n,t,e,o)},this.getSource=function(){return n},this.getDestination=function(){return e},this.getSlot=function(){return o},this.getSignal=function(){return t}},ARCS.Connection.cast=function(n,t){return new ARCS.Connection(t.getComponent(n.source),n.signal,t.getComponent(n.destination),n.slot)},ARCS.Sheet=function(n){var t,e,o,i,r,s=new ARCS.Context,c=[],a=[],u=[],f=[],l=0,p=0,h=0,C=0;t=function(){var n;for(n=0;n<c.length;n++)c[n].invoke()},e=function(){var n;for(n=0;n<a.length;n++)a[n].invoke()},o=function(){var n;for(n=0;n<u.length;n++)u[n].invoke()},i=function(){var n;for(n=0;n<f.length;n++)f[n].connect()},r=function(){var n;for(n=0;n<f.length;n++)f[n].disconnect()},this.setContext=function(n){s=n},this.activate=function(){s.instanciate().then((function(){t(),i(),e()}))},this.deactivate=function(){r(),o()},this.addPreConnection=function(n){var t=ARCS.Invocation.cast(n,s);return t.id=l++,c.push(t),t.id},this.addPostConnection=function(n){var t=ARCS.Invocation.cast(n,s);return t.id=p++,a.push(t),t.id},this.addCleanup=function(n){var t=ARCS.Invocation.cast(n,s);return t.id=h++,u.push(t),t.id},this.addConnection=function(n){var t=ARCS.Connection.cast(n,s);return t.id=C++,f.push(t),t.id};var d=function(n,t){for(var e=t.length;e--&&t[e].id!==n;);e>=0?t.splice(e,1):console.warn("Could not remove data with id",n)};this.removePreConnection=function(n){d(n,c)},this.removePostConnection=function(n){d(n,a)},this.removeCleanup=function(n){d(n,u)};var v=function(n,t,e){for(var o=e.length;o--&&e[o].id!==n;);o>=0&&(e[o].value=t)};this.changePreConnection=function(n,t){v(n,t,c)},this.changePostConnection=function(n,t){v(n,t,a)},this.changeCleanup=function(n,t){v(n,t,u)},this.removeConnection=function(n){d(n,f)};var g=function(n,t,e){for(var o,i=e.length,r=e.length;i--&&e[i].id!==n;);for(;r--&&e[r].id!==t;);i>=0&&r>=0&&(o=e[i],e[i]=e[r],e[r]=o,e[i].id=n,e[r].id=t)};this.swapConnections=function(n,t){g(n,t,f)},this.swapCleanups=function(n,t){g(n,t,u)},this.swapPreConnections=function(n,t){g(n,t,c)},this.swapPostConnections=function(n,t){g(n,t,a)};this.import=function(t){t.hasOwnProperty("context")&&(s=new ARCS.Context(t.context)).setParent(n),s.instanciate().then((function(){!function(n){var t=0,e=ARCS.Invocation.cast,o=ARCS.Connection.cast;for(t=0;t<n.preconnections.length;t++)c.push(e(n.preconnections[t],s));for(t=0;t<n.postconnections.length;t++)a.push(e(n.postconnections[t],s));for(t=0;t<n.cleanups.length;t++)u.push(e(n.cleanups[t],s));for(t=0;t<n.connections.length;t++)f.push(o(n.connections[t],s))}(t)}))};var S=function(n){return{destination:s.getComponentName(n.getDestination()),slot:n.getSlot(),value:n.getValue()}};this.toJSON=function(){var n,t,e=[],o=[],i=[],r=[];for(n=0;n<f.length;n++)i.push((t=f[n],{source:s.getComponentName(t.getSource()),signal:t.getSignal(),destination:s.getComponentName(t.getDestination()),slot:t.getSlot()}));for(n=0;n<c.length;n++)e.push(S(c[n]));for(n=0;n<a.length;n++)o.push(S(a[n]));for(n=0;n<u.length;n++)r.push(S(u[n]));return{preconnections:e,postconnections:o,connections:i,cleanups:r}},s.setParent(n)},ARCS.EventLogicParser=function(){function n(n,t,e,o,i,r){this.message=n,this.expected=t,this.found=e,this.offset=o,this.line=i,this.column=r,this.name="SyntaxError"}return function(n,t){function e(){this.constructor=n}e.prototype=t.prototype,n.prototype=new e}(n,Error),{SyntaxError:n,parse:function(t){var e,o=arguments.length>1?arguments[1]:{},i={},r={start:U},s=U,c=i,a=function(n,t){return[n].concat(t)},u=function(n){return{and:n}},f=function(n){return{or:n}},l=function(n){return n},p="(",h={type:"literal",value:"(",description:'"("'},C=")",d={type:"literal",value:")",description:'")"'},v=function(n){return[n]},g={type:"other",description:"id"},S=function(n){return n.trim()},A=/^[_a-zA-Z]/,m={type:"class",value:"[_a-zA-Z]",description:"[_a-zA-Z]"},y=/^[_a-zA-Z0-9]/,R={type:"class",value:"[_a-zA-Z0-9]",description:"[_a-zA-Z0-9]"},w="&",x={type:"literal",value:"&",description:'"&"'},P="|",O={type:"literal",value:"|",description:'"|"'},T=/^[ \r\n\t]/,N={type:"class",value:"[ \\r\\n\\t]",description:"[ \\r\\n\\t]"},b=0,k=0,F={line:1,column:1,seenCR:!1},I=0,E=[],L=0;if("startRule"in o){if(!(o.startRule in r))throw new Error("Can't start parsing from rule \""+o.startRule+'".');s=r[o.startRule]}function j(n){return k!==n&&(k>n&&(k=0,F={line:1,column:1,seenCR:!1}),function(n,e,o){var i,r;for(i=e;i<o;i++)"\n"===(r=t.charAt(i))?(n.seenCR||n.line++,n.column=1,n.seenCR=!1):"\r"===r||"\u2028"===r||"\u2029"===r?(n.line++,n.column=1,n.seenCR=!0):(n.column++,n.seenCR=!1)}(F,k,n),k=n),F}function _(n){b<I||(b>I&&(I=b,E=[]),E.push(n))}function q(e,o,i){var r=j(i),s=i<t.length?t.charAt(i):null;return null!==o&&function(n){var t=1;for(n.sort((function(n,t){return n.description<t.description?-1:n.description>t.description?1:0}));t<n.length;)n[t-1]===n[t]?n.splice(t,1):t++}(o),new n(null!==e?e:function(n,t){var e,o=new Array(n.length);for(e=0;e<n.length;e++)o[e]=n[e].description;return"Expected "+(n.length>1?o.slice(0,-1).join(", ")+" or "+o[n.length-1]:o[0])+" but "+(t?'"'+function(n){function t(n){return n.charCodeAt(0).toString(16).toUpperCase()}return n.replace(/\\/g,"\\\\").replace(/"/g,'\\"').replace(/\x08/g,"\\b").replace(/\t/g,"\\t").replace(/\n/g,"\\n").replace(/\f/g,"\\f").replace(/\r/g,"\\r").replace(/[\x00-\x07\x0B\x0E\x0F]/g,(function(n){return"\\x0"+t(n)})).replace(/[\x10-\x1F\x80-\xFF]/g,(function(n){return"\\x"+t(n)})).replace(/[\u0180-\u0FFF]/g,(function(n){return"\\u0"+t(n)})).replace(/[\u1080-\uFFFF]/g,(function(n){return"\\u"+t(n)}))}(t)+'"':"end of input")+" found."}(o,s),o,s,i,r.line,r.column)}function U(){return D()}function D(){var n,t,e,o;if(n=b,(t=Z())!==i){if(e=[],(o=z())!==i)for(;o!==i;)e.push(o),o=z();else e=c;e!==i?(n,n=t=a(t,e)):(b=n,n=c)}else b=n,n=c;return n===i&&(n=Z()),n}function z(){var n,e;return n=b,function(){var n,e,o,r;n=b,(e=V())!==i?(38===t.charCodeAt(b)?(o=w,b++):(o=i,0===L&&_(x)),o!==i&&(r=V())!==i?n=e=[e,o,r]:(b=n,n=c)):(b=n,n=c);return n}()!==i&&(e=Z())!==i?(n,n=u(e)):(b=n,n=c),n===i&&(n=b,function(){var n,e,o,r;n=b,(e=V())!==i?(124===t.charCodeAt(b)?(o=P,b++):(o=i,0===L&&_(O)),o!==i&&(r=V())!==i?n=e=[e,o,r]:(b=n,n=c)):(b=n,n=c);return n}()!==i&&(e=Z())!==i?(n,n=f(e)):(b=n,n=c)),n}function Z(){var n,e,o,r;return n=b,(e=function(){var n,e,o;L++,n=b,e=b,(o=function(){var n,e,o,r,s;if(n=b,(e=V())!==i)if(A.test(t.charAt(b))?(o=t.charAt(b),b++):(o=i,0===L&&_(m)),o!==i){for(r=[],y.test(t.charAt(b))?(s=t.charAt(b),b++):(s=i,0===L&&_(R));s!==i;)r.push(s),y.test(t.charAt(b))?(s=t.charAt(b),b++):(s=i,0===L&&_(R));r!==i&&(s=V())!==i?n=e=[e,o,r,s]:(b=n,n=c)}else b=n,n=c;else b=n,n=c;return n}())!==i&&(o=t.substring(e,b));(e=o)!==i&&(n,e=S(e));L--,(n=e)===i&&(e=i,0===L&&_(g));return n}())!==i&&(n,e=l(e)),(n=e)===i&&(n=b,40===t.charCodeAt(b)?(e=p,b++):(e=i,0===L&&_(h)),e!==i&&(o=D())!==i?(41===t.charCodeAt(b)?(r=C,b++):(r=i,0===L&&_(d)),r!==i?(n,n=e=v(o)):(b=n,n=c)):(b=n,n=c)),n}function V(){var n,e;for(n=[],T.test(t.charAt(b))?(e=t.charAt(b),b++):(e=i,0===L&&_(N));e!==i;)n.push(e),T.test(t.charAt(b))?(e=t.charAt(b),b++):(e=i,0===L&&_(N));return n}if((e=s())!==i&&b===t.length)return e;throw e!==i&&b<t.length&&_({type:"end",description:"end of input"}),q(null,E,I)}}}(),ARCS.TokenEvent=function(){var n,t;this.promise=new Promise((function(e,o){n=e,t=o})),this.accept=function(){n()},this.abort=function(){t()}},ARCS.TransitionNetwork=function(){this.promise={},this.and=function(n){return this.promise=Promise.all([this.promise,n.promise]),this},this.or=function(n){return this.promise=Promise.race([this.promise,n.promise]),this}},ARCS.TransitionNetwork.build=function(n,t){var e,o,r;if("string"==typeof n){var s;t.hasOwnProperty(n)?s=t[n]:t[n]=s=new ARCS.TokenEvent;var c=new ARCS.TransitionNetwork;return c.promise=s.promise,c}for(e=ARCS.TransitionNetwork.build(n[0],t),i=1;i<n.length;i++)n[i].hasOwnProperty("and")?(r=ARCS.TransitionNetwork.build(n[i].and,t),o=e.and(r)):n[i].hasOwnProperty("or")?(r=ARCS.TransitionNetwork.build(n[i].or,t),o=e.or(r)):console.warn("[ARCS] Illegal tree"),e=o;return e},ARCS.Statemachine=new ARCS.Component.create((function(n){var t="",e="",o={},i="",r=this,s={},c={},a=function(n){var t;r.slots.indexOf(n)<0&&(r.slots.push(n),r[n]=(t=n,function(){r.setToken(t)}))},u=function(n){var t;if(o.hasOwnProperty(n))for(t in c={},o[n])o[n].hasOwnProperty(t)&&ARCS.TransitionNetwork.build(s[t],c).promise.then((function(){var e;for(e in c)c.hasOwnProperty(e)&&c[e].abort();u(o[n][t])}));i=n,r.emit("requestSheet",i),i===e&&r.emit("requestTermination")};this.setInitialState=function(n){i=t=n},this.setFinalState=function(n){e=n},this.addTransition=function(n,t,e){var i,r=/([A-Za-z_]\w*)/g;try{var c;if("string"==typeof(c=ARCS.EventLogicParser.parse(t)))a(c);else for(;null!==(i=r.exec(t));)a(i[0]);s[t]=c,void 0===o[n]&&(o[n]={}),o[n][t]=e}catch(n){}},this.setToken=function(n){c.hasOwnProperty(n)&&c[n].accept()},this.setTransitions=function(n){var t,e;for(t in n)if(n.hasOwnProperty(t))for(e in n[t])n[t].hasOwnProperty(e)&&this.addTransition(t,e,n[t][e])},this.start=function(){console.log("statemachine",this,t,n),u(t)},void 0!==n&&(t=n.initial,e=n.final,this.setTransitions(n.transitions),i="")}),["setToken"],["requestSheet","requestTermination"]),ARCS.Application=function(){var n,t=new ARCS.Context,e={},o={},i=[],r=this,s="";this.export=function(){return{context:t,controller:t.getComponentName(o),sheets:e}},this.getContext=function(){return t},this.getSheetList=function(){return Object.keys(e)},this.getSheet=function(n){return e[n]},this.addSheet=function(n,o){e[n]=o,o.setContext(t)},this.removeSheet=function(n){delete e[n]},n=function(){var n,i,s;for(i=t.getComponent(o),o=i,s=Object.keys(e),n=0;n<s.length;n++)(i=new ARCS.Sheet(t)).import(e[s[n]],t),e[s[n]]=i;ARCS.Component.connect(o,"requestSheet",r,"setSheet"),ARCS.Component.connect(o,"requestTermination",r,"finish"),o.start()},this.setController=function(n){o=t.getComponent(n)},this.setSheet=function(n){e.hasOwnProperty(n)?(s&&e[s].deactivate(),e[s=n].activate()):console.warn("[ARCS] Tried to activate hollow sheet named: "+n)},this.finish=function(){s&&e[s].deactivate()},this.import=function(n){t=new ARCS.Context(n.context),e=n.sheets,void 0===(o=n.controller)&&console.error("[ARCS] Undefined controller. Cannot start application.")},this.setFactory=function(n,t){factories[n]=t},this.setDependency=function(n){i[n]={}},this.start=function(){console.log("[ARCS] Starting application..."),t.instanciate().then(n)}},ARCS.Application.setDependency=function(n,t){n.setDependency(t)},ARCS.Component.create(ARCS.Application),ARCS.Application.slot("setSheet"),ARCS.Application.slot("finish");export{ARCS as default};
\ No newline at end of file

 /* ugly hack in order to display data in web page instead of console */
 /* ugly hack in order to display data in web page instead of console */
+import ARCS from '../build/arcs.js';
 
 
+var Console;
+/**
+    * @class Console
+    * @classdesc Redirects console messages to a given HTML element in the page.
+    * @param id {string} id of the HTML element in which console messages will be added.
+    */
+Console = ARCS.Component.create(
+    function (id) {
+        if (id === undefined) {
+            return ;
+        }
+        
+        var output = document.getElementById(id);
+        
+        if (output) {
+            window.console = {
+                timeRef: new Date().getTime(),
+                output : output,
+                display: function(color,args) {
+                    var s = document.createElement("span");
+                    s.style.color=color;
+                    var elapsed = (new Date().getTime() - this.timeRef);
 
 
-arcs_module(
-    function(ARCS) {
-        var Console;
-        /**
-         * @class Console
-         * @classdesc Redirects console messages to a given HTML element in the page.
-         * @param id {string} id of the HTML element in which console messages will be added.
-         */
-        Console = ARCS.Component.create(
-            function (id) {
-                if (id === undefined) {
-                    return ;
+                    s.innerHTML = '<span class="marker">' + (elapsed/1000).toFixed(3) + '</span>' + Array.prototype.join.call(args, ' '); 
+                    output.appendChild(s);
+                    output.appendChild(document.createElement("br"));
+                },
+                log: function () {
+                    this.display('green',arguments);
+                },
+                error: function () {
+                    this.display('red',arguments);        
+                },
+                warn: function () {
+                    this.display('orange',arguments);        
                 }
                 }
-                
-                var output = document.getElementById(id);
-                
-                if (output) {
-                    window.console = {
-                        timeRef: new Date().getTime(),
-                        output : output,
-                        display: function(color,args) {
-                            var s = document.createElement("span");
-                            s.style.color=color;
-                            var elapsed = (new Date().getTime() - this.timeRef);
-
-                            s.innerHTML = '<span class="marker">' + (elapsed/1000).toFixed(3) + '</span>' + Array.prototype.join.call(args, ' '); 
-                            output.appendChild(s);
-                            output.appendChild(document.createElement("br"));
-                        },
-                        log: function () {
-                            this.display('green',arguments);
-                        },
-                        error: function () {
-                            this.display('red',arguments);        
-                        },
-                        warn: function () {
-                            this.display('orange',arguments);        
-                        }
-                    };
-                }
-            }
-        );
-        return { Console: Console};
+            };
+        }
     }
     }
+);
+
 
 
-);
\ No newline at end of file
+export default { Console: Console};

@@ -5,111 +5,99 @@
  * @file
  * @file
  */
  */
 
 
-// TODO first strategy: import ARCS and export components
-// TODO second strategy: make an anonymous function to export
-// in any case, arcs_module disappears
+import ARCS from '../build/arcs.js';
 
 
-
-
-//! TODO to comment or uncomment (maybe)
-// imports ARCS from '../build/arcs.js';
-function (ARCS) {
-    var Loop, DisplayInt, Sum;
-    /** @exports loop */
-    //console.log("loop: ", ARCS);
+/**
+    * @class Loop
+    * @classdesc loop component creation using a compact style.
+    * This component iterates for a given number of times
+    */
+var Loop = ARCS.Component.create(
+    function () {
     /**
     /**
-     * @class Loop
-     * @classdesc loop component creation using a compact style.
-     * This component iterates for a given number of times
-     */
-    Loop = ARCS.Component.create(
-        function () {
-        /**
-         * Sets the number of times the component should iterate.
-         * It starts the iterations. At each iteration, a signal newIteration is 
-         * emitted, then, at the end of the iterations, a signal sendToken is 
-         * eventually triggered.
-         * @param n {numeric} number of iterations
-         * @function Loop#setIterations
-         * @slot
-         * @emits newIteration
-         * @emits sendToken
-         */
-            this.setIterations = function (n) {
-                var i;
-                for (i = 0; i < n; i++) {
-                    console.log("Loop : emitting ", i);
-                    this.emit("newIteration", i);
-                }
-                this.emit("endLoop");
-            };
-            
-            /** @function Loop#newIteration
-             * @signal
-             * @param n {number} current iteration number.             
-             */ 
-            
-            /** @function Loop#sendToken
-             * @signal
-             * @param s {string} token to emit.
-             */
-            
-        },
-        "setIterations", //slotList 
-        ["endLoop", "newIteration"] // signalList
-    );
+        * Sets the number of times the component should iterate.
+        * It starts the iterations. At each iteration, a signal newIteration is 
+        * emitted, then, at the end of the iterations, a signal sendToken is 
+        * eventually triggered.
+        * @param n {numeric} number of iterations
+        * @function Loop#setIterations
+        * @slot
+        * @emits newIteration
+        * @emits sendToken
+        */
+        this.setIterations = function (n) {
+            var i;
+            for (i = 0; i < n; i++) {
+                console.log("Loop : emitting ", i);
+                this.emit("newIteration", i);
+            }
+            this.emit("endLoop");
+        };
+        
+        /** @function Loop#newIteration
+            * @signal
+            * @param n {number} current iteration number.             
+            */ 
+        
+        /** @function Loop#sendToken
+            * @signal
+            * @param s {string} token to emit.
+            */
+        
+    },
+    "setIterations", //slotList 
+    ["endLoop", "newIteration"] // signalList
+);
 
 
 
 
-    /** 
-     * @class DisplayInt 
-     * @classdesc displayInt component creation using a variation with defined slots
-     * in the constructor (a slot is a function). DisplayInt will display an integer
-     * received on its display slot.
-     */
-    DisplayInt = function () {
-    /**
-     * @param n {numeric} number to display
-     * @function DisplayInt#display
-     * @slot
-     */
-        this.display = function (n) {
-            console.log("  DisplayInt : " + n);
-        };
+/** 
+    * @class DisplayInt 
+    * @classdesc displayInt component creation using a variation with defined slots
+    * in the constructor (a slot is a function). DisplayInt will display an integer
+    * received on its display slot.
+    */
+var DisplayInt = function () {
+/**
+    * @param n {numeric} number to display
+    * @function DisplayInt#display
+    * @slot
+    */
+    this.display = function (n) {
+        console.log("  DisplayInt : " + n);
     };
     };
+};
 
 
-    ARCS.Component.create(DisplayInt);
-    DisplayInt.slot("display");
+ARCS.Component.create(DisplayInt);
+DisplayInt.slot("display");
 
 
 
 
-    /**
-     * @class Sum
-     * @classdec Sum is a component summing integers passed to its slot "add" 
-     * and the result is sent back by signal "sum".
-     * This component is declared in two different phases: declaration of the 
-     * constructor and declaration of the slot "add".
-     */
-    Sum = function () {
-        this.total = 0;
-    };
+/**
+    * @class Sum
+    * @classdec Sum is a component summing integers passed to its slot "add" 
+    * and the result is sent back by signal "sum".
+    * This component is declared in two different phases: declaration of the 
+    * constructor and declaration of the slot "add".
+    */
+var Sum = function () {
+    this.total = 0;
+};
 
 
-    ARCS.Component.create(Sum);
-    /**
-     * This slot adds its parameter to its internal sum and send it back by using 
-     * the signal "sum".
-     * @param n {integer} add n to the internal sum of the component.
-     * @function Sum#add
-     * @slot
-     */
-    Sum.slot("add", function (n) {
-        this.total = this.total + n;
-        this.emit("sum", this.total); //console.log("  Total : " + this.total);
-    });
-    Sum.signal("sum");
+ARCS.Component.create(Sum);
+/**
+    * This slot adds its parameter to its internal sum and send it back by using 
+    * the signal "sum".
+    * @param n {integer} add n to the internal sum of the component.
+    * @function Sum#add
+    * @slot
+    */
+Sum.slot("add", function (n) {
+    this.total = this.total + n;
+    this.emit("sum", this.total); //console.log("  Total : " + this.total);
+});
+Sum.signal("sum");
 
 
-    // the anonymous function must return the components in one object:
-    // keys are factory names, value are actual constructors modified by 
-    // ARCS.Component.create
+// the anonymous function must return the components in one object:
+// keys are factory names, value are actual constructors modified by 
+// ARCS.Component.create
 
 
-    return {Loop: Loop, DisplayInt: DisplayInt, Sum: Sum};
-//! TODO comment or uncomment (maybe)
-}
+export default {Loop: Loop, DisplayInt: DisplayInt, Sum: Sum};

@@ -16,11 +16,10 @@
     "bower": ">=1.3.9",
     "bower": ">=1.3.9",
     "grunt": ">=0.4.5",
     "grunt": ">=0.4.5",
     "grunt-jslint": ">=1.1.12",
     "grunt-jslint": ">=1.1.12",
-    "grunt-contrib-obfuscator": "*",
     "grunt-terser": "*",
     "grunt-terser": "*",
-    "grunt-file-minify": ">=1.0.0",
     "grunt-jsdoc": ">=0.5.6",
     "grunt-jsdoc": ">=0.5.6",
     "grunt-bower-task": ">=0.4.0",
     "grunt-bower-task": ">=0.4.0",
-    "grunt-contrib-concat": ">=0.5.0"
+    "grunt-contrib-concat": ">=0.5.0",
+    "grunt-contrib-copy": ">=1.0.0"
   }
   }
 }
 }

@@ -199,7 +199,7 @@ ARCS.Application = function () {
      * Starts the application
      * Starts the application
      */
      */
     this.start = function () {
     this.start = function () {
-        console.log("[ARCS] Starting application");
+        console.log("[ARCS] Starting application...");
         context.instanciate().then(preProcess);
         context.instanciate().then(preProcess);
     };
     };
 };
 };

@@ -3,31 +3,31 @@
  * It relies on require.js to get the job done.
  * It relies on require.js to get the job done.
  * @file
  * @file
  */
  */
+"use strict";
 
 
 // basically, here we start by importing the module ARCS
 // basically, here we start by importing the module ARCS
 import ARCS from './arcs.js';
 import ARCS from './arcs.js';
 
 
 
 
-console.log("Bootstrapping ARCS...");
+console.log("[ARCS] Bootstrapping...");
 
 
 var baseUrl, appDescription, requireMarkup, xhr;
 var baseUrl, appDescription, requireMarkup, xhr;
 
 
-requireMarkup = document.querySelector('[data-main]');
+requireMarkup = document.querySelector('[data-arcsapp]');
 if (requireMarkup !== undefined) {
 if (requireMarkup !== undefined) {
         baseUrl = requireMarkup.dataset.baseUrl ;
         baseUrl = requireMarkup.dataset.baseUrl ;
         appDescription = requireMarkup.dataset.arcsapp || "arcsapp.json";    
         appDescription = requireMarkup.dataset.arcsapp || "arcsapp.json";    
 }
 }
 
 
+
+(async function toto() {
 var description = await(fetch(appDescription));
 var description = await(fetch(appDescription));
 var applicationObject = await(description.json());
 var applicationObject = await(description.json());
 
 
 
 
-console.log("ARCS application description loaded");
+console.log("[ARCS] Application description loaded");
 
 
-if (baseUrl) {
-    require.config( { baseUrl: baseUrl });
-}
 var aap = new ARCS.Application();
 var aap = new ARCS.Application();
 aap.import(applicationObject);
 aap.import(applicationObject);
-console.log("Starting application...");
 aap.start();
 aap.start();
+})();
\ No newline at end of file

-/**
- * definition of the main module function: 
- * it takes an anonymous function as a parameter
- * the anonymous function has one parameter: the object encompassing 
- * ARCS definitions (in order to able to use ARCS.Component.create, ...)
- * @param moduleDefinition {function} main function of the module. 
- * It should return a list of components
- * @param deps {mixed[]} dependencies
- */
-
-// TODO arcs_module seems to be not needed anymore!!!!
-// more cunning, this time, we export an arcs_module function 
-// that we call later!
-// still we need to do something about it in order to register
-// components.
-// in fact factories should be registered in load library.
-
-// reimplementation using native promises
-arcs_module = function(moduleDefinition, deps) {
-    var storeComponents, i;
-    
-    if (typeof module !== 'undefined') {
-        if (module.parent.exports) {
-            ARCS = module.exports; 
-        }
-    }
-    
-    if (deps === undefined) { deps = []; }
-    
-    storeComponents = function (deps) {
-        var mdef, p;
-        // we should insert ARCS at the beginning of deps !
-        deps.unshift(ARCS);
-        
-        mdef = (typeof moduleDefinition === 'function') ?
-                moduleDefinition.apply(this, deps) : moduleDefinition;
-
-        if (mdef === undefined) {
-            throw new Error("[ARCS] Your module is undefined. Did you forget to export components?\nCode of module follows:\n" +moduleDefinition);
-        }
-
-        for (p in mdef) {
-            if (mdef.hasOwnProperty(p) && ARCS.Context.currentContext != null) {
-                ARCS.Context.currentContext.setFactory(p,mdef[p]); //.setFactory(ARCS.Application.currentApplication, p, mdef[p]);
-            }
-        }
-        
-        return Promise.resolve();
-    };
-    // until now, it is the very same code.
-    
-    // here we create a promise to solve dependency
-    // reject has the dependency name, while resolve has the object
-    var depResolve = function(dep) {
-        return new Promise(function(resolve, reject) {  
-            var d,shimConfig;
-            if (ARCS.isInNode()) {
-                d = require(dep);
-                if (d === undefined) {
-                    reject(dep);
-                } else {
-                    resolve(d);
-                }
-            } else {
-                // this one a little bit trickier since we have to shim.
-                if (dep.name !== undefined) {
-                    shimConfig = { shim: {} };
-                    shimConfig.shim[dep.name] = { exports: dep.exports };
-                    if (dep.deps !== undefined) {
-                        shimConfig.shim[dep.name].deps = dep.deps;
-                    }
-                    require.config(shimConfig);
-                    dep = dep.name;
-                }
-                // shim performed
-                require([dep], 
-                        function(d) { resolve(d); },
-                        function(err) { console.log("[ARCS] Trouble with module ", dep); reject(dep, err); }
-                );
-            }
-        });            
-    };
-        
-    var depResolves = [];
-    for (i=0; i<deps.length; i++) {
-        depResolves[i] = depResolve(deps[i]);
-    }
-    
- 
-    
-        ARCS.Context.currentContext.addLibraryPromise(
-            Promise.all(depResolves).then(storeComponents,
-            function(reason) { console.error("[ARCS] Failed to load dependency ", reason ); })
-        
-        );
-    
-}
\ No newline at end of file

@@ -23,6 +23,7 @@ ARCS.Context = function( ctx ) {
     if (ctx !== undefined) {
     if (ctx !== undefined) {
         libraries = ctx.libraries;
         libraries = ctx.libraries;
     
     
+        var p;
         for (p in ctx.components) {
         for (p in ctx.components) {
             if (ctx.components.hasOwnProperty(p)) {
             if (ctx.components.hasOwnProperty(p)) {
                 components[p] = ctx.components[p];
                 components[p] = ctx.components[p];
@@ -39,8 +40,7 @@ ARCS.Context = function( ctx ) {
         
         
     }
     }
 
 
-    //! TODO use fetch API? 
-    loadDataFile =async function(fileName) {
+    var loadDataFile =async function(fileName) {
         var dataPromise ;
         var dataPromise ;
                 
                 
         if (ARCS.isInNode()) {
         if (ARCS.isInNode()) {
@@ -57,19 +57,8 @@ ARCS.Context = function( ctx ) {
             return client.json();
             return client.json();
         }
         }
     };
     };
-    
-    //! TODO not needed anymore? 
-    /*this.addLibraryPromise = function(p) {
-        depLibPromises.push(p);
-    };*/
-            
-    /*promiseLibrary = function(libName) {
-        return import(libName);    
-    };*/
-    
-    //! TODO modify loadLibraries and loadLibrary to directly register
-    // factories so that arcs_module is not needed anymore ?    
-    loadLibraries = function () {
+        
+    var loadLibraries = function () {
         var i;
         var i;
         // we will use different instances of require either the one of node 
         // we will use different instances of require either the one of node 
         // or the one from require.js
         // or the one from require.js
@@ -77,16 +66,13 @@ ARCS.Context = function( ctx ) {
         
         
         var res=[];
         var res=[];
         for(i=0; i < libraries.length; i++) {
         for(i=0; i < libraries.length; i++) {
-            //! TODO
-            res.push(loadLibrary(libraries[i]));
-                //import(libraries[i]));
+            res.push(self.loadLibrary(libraries[i]));
         }
         }
         return Promise.all(res);        
         return Promise.all(res);        
     };
     };
     
     
-    instanciateComponents = function() {
+    var instanciateComponents = function() {
         var p, promises=[];
         var p, promises=[];
-        console.log(components);
         
         
         for (p in components) {
         for (p in components) {
            if (components.hasOwnProperty(p)) {
            if (components.hasOwnProperty(p)) {
@@ -95,7 +81,7 @@ ARCS.Context = function( ctx ) {
                     console.error("[ARCS] Context dump follows: ", libraries, components, constants);
                     console.error("[ARCS] Context dump follows: ", libraries, components, constants);
                     return ;
                     return ;
                 }                    
                 }                    
-                factory = factories[components[p].type];
+                var factory = factories[components[p].type];
                 //console.log("instanciating ", p);
                 //console.log("instanciating ", p);
                 try {
                 try {
                 if (components[p].value !== undefined || components[p].url !== undefined || components[p].ref !== undefined) {                
                 if (components[p].value !== undefined || components[p].url !== undefined || components[p].ref !== undefined) {                
@@ -144,21 +130,23 @@ ARCS.Context = function( ctx ) {
             libActualName = libName.name;
             libActualName = libName.name;
             libUrl = libName.url;
             libUrl = libName.url;
         }
         }
-                
-        libraries.push(libActualName);
+
+        if (libraries.indexOf(libActualName) < 0) {
+            libraries.push(libActualName);
+        }
         // TODO promisify call to cbFunction
         // TODO promisify call to cbFunction
         return import(libUrl).then( function(module) {
         return import(libUrl).then( function(module) {
             // TODO insert here component factories
             // TODO insert here component factories
-            for (p in module) {
-                if (module.hasOwnProperty(p)) {
-                    ARCS.Context.currentContext.setFactory(p,module[p]);
+            for (p in module.default) {
+                if (module.default.hasOwnProperty(p)) {
+                    ARCS.Context.currentContext.setFactory(p,module.default[p]);
                 }
                 }
             }
             }
 
 
             if (cbFunction !== undefined) {
             if (cbFunction !== undefined) {
                 cbFunction();
                 cbFunction();
             }
             }
-        });
+        }).catch( function(msg) { console.error("[ARCS] Trouble loading '",libUrl,"' with reason -", msg) });
     };
     };
     
     
     /**
     /**
@@ -277,7 +265,7 @@ ARCS.Context = function( ctx ) {
     this.instanciate = function () {
     this.instanciate = function () {
         //! TODO
         //! TODO
         return loadLibraries().then(instanciateComponents)
         return loadLibraries().then(instanciateComponents)
-                    .catch(function(msg) { console.log("[ARCS] Trouble instanciating context", msg); });
+                    .catch(function(msg) { console.error("[ARCS] Trouble instanciating context", msg); });
         
         
     };
     };
     
     

 // no longer needed with the use of imports
 // no longer needed with the use of imports
 
 
-export default ARCS;
\ No newline at end of file
+export { ARCS as default};
\ No newline at end of file

 {
 {
   "context" : {
   "context" : {
-    "libraries" : [ "components/loop","components/console"],
+    "libraries" : [ "../components/loop.js","../components/console.js"],
     "components" : {
     "components" : {
       "loop": { "type": "Loop" },
       "loop": { "type": "Loop" },
       "dint": { "type": "DisplayInt" }, 
       "dint": { "type": "DisplayInt" }, 

@@ -4,7 +4,7 @@
 		<script data-base-url="../.." 
 		<script data-base-url="../.." 
                 data-arcsapp="arcsapp.json" 
                 data-arcsapp="arcsapp.json" 
                 type="module"
                 type="module"
-                src="../../build/arcs_browser">
+                src="../../build/arcs_browser.js">
         </script>
         </script>
 	</head>
 	</head>
 	<body>
 	<body>