Jean-Yves Didier

fixes in order to pass the loop test

1 -/******/ (() => { // webpackBootstrap
2 /******/ "use strict"; 1 /******/ "use strict";
3 /******/ var __webpack_modules__ = ([ 2 /******/ var __webpack_modules__ = ([
4 /* 0 */, 3 /* 0 */,
...@@ -200,7 +199,7 @@ var Component = { ...@@ -200,7 +199,7 @@ var Component = {
200 } 199 }
201 }; 200 };
202 201
203 -/* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = ({ Component: Component}); 202 +/* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (Component);
204 203
205 204
206 /***/ }), 205 /***/ }),
...@@ -227,7 +226,8 @@ __webpack_require__.r(__webpack_exports__); ...@@ -227,7 +226,8 @@ __webpack_require__.r(__webpack_exports__);
227 * @param obj {object} an object describing a state machine. If obj is empty then the statemachine is empty 226 * @param obj {object} an object describing a state machine. If obj is empty then the statemachine is empty
228 * @class 227 * @class
229 */ 228 */
230 -let Statemachine = new _component_js__WEBPACK_IMPORTED_MODULE_0__.default.create(function (obj) { 229 +
230 +let StateMachine = _component_js__WEBPACK_IMPORTED_MODULE_0__.default.create(function (obj) {
231 // dynamic construction: properties are initial state that have properties 231 // dynamic construction: properties are initial state that have properties
232 // that are tokens and value that are the final state 232 // that are tokens and value that are the final state
233 var initial = "", final = "", transitions = {}, currentState = "", self= this; 233 var initial = "", final = "", transitions = {}, currentState = "", self= this;
...@@ -304,7 +304,7 @@ let Statemachine = new _component_js__WEBPACK_IMPORTED_MODULE_0__.default.create ...@@ -304,7 +304,7 @@ let Statemachine = new _component_js__WEBPACK_IMPORTED_MODULE_0__.default.create
304 var t, tsd, ts, tsc; 304 var t, tsd, ts, tsc;
305 try { 305 try {
306 306
307 - var tsd = ARCS.EventLogicParser.parse(token); 307 + var tsd = _eventlogicparser_js__WEBPACK_IMPORTED_MODULE_2__.default.parse(token);
308 if (typeof tsd === "string") { 308 if (typeof tsd === "string") {
309 addToken(tsd); 309 addToken(tsd);
310 } else { 310 } else {
...@@ -367,7 +367,7 @@ let Statemachine = new _component_js__WEBPACK_IMPORTED_MODULE_0__.default.create ...@@ -367,7 +367,7 @@ let Statemachine = new _component_js__WEBPACK_IMPORTED_MODULE_0__.default.create
367 * the initial state (by default, it is the departure of the first transition 367 * the initial state (by default, it is the departure of the first transition
368 */ 368 */
369 this.start = function () { 369 this.start = function () {
370 - console.log("statemachine", this, initial,obj); 370 + //console.log("statemachine", this, initial,obj);
371 setSheet(initial); 371 setSheet(initial);
372 }; 372 };
373 373
...@@ -385,7 +385,7 @@ let Statemachine = new _component_js__WEBPACK_IMPORTED_MODULE_0__.default.create ...@@ -385,7 +385,7 @@ let Statemachine = new _component_js__WEBPACK_IMPORTED_MODULE_0__.default.create
385 ['requestSheet', 'requestTermination'] 385 ['requestSheet', 'requestTermination']
386 ); 386 );
387 387
388 -/* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = ({ StateMachine: StateMachine}); 388 +/* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (StateMachine);
389 389
390 390
391 /***/ }), 391 /***/ }),
...@@ -455,7 +455,7 @@ TransitionNetwork.build = function(tree, tokenEvents) { ...@@ -455,7 +455,7 @@ TransitionNetwork.build = function(tree, tokenEvents) {
455 return res; 455 return res;
456 }; 456 };
457 457
458 -/* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = ({TransitionNetwork: TransitionNetwork}); 458 +/* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (TransitionNetwork);
459 459
460 460
461 /***/ }), 461 /***/ }),
...@@ -487,7 +487,7 @@ let TokenEvent = function() { ...@@ -487,7 +487,7 @@ let TokenEvent = function() {
487 }; 487 };
488 }; 488 };
489 489
490 -/* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = ({TokenEvent: TokenEvent}); 490 +/* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (TokenEvent);
491 491
492 492
493 /***/ }), 493 /***/ }),
...@@ -1162,7 +1162,7 @@ let EventLogicParser = (function() { ...@@ -1162,7 +1162,7 @@ let EventLogicParser = (function() {
1162 }; 1162 };
1163 })(); 1163 })();
1164 1164
1165 -/* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = ({ EventLogicParser: EventLogicParser}); 1165 +/* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (EventLogicParser);
1166 1166
1167 1167
1168 /***/ }), 1168 /***/ }),
...@@ -1237,7 +1237,7 @@ let Context = function( ctx ) { ...@@ -1237,7 +1237,7 @@ let Context = function( ctx ) {
1237 var instanciateComponents; 1237 var instanciateComponents;
1238 1238
1239 1239
1240 - factories.StateMachine = Statemachine; 1240 + factories.StateMachine = _statemachine_js__WEBPACK_IMPORTED_MODULE_0__.default;
1241 1241
1242 1242
1243 if (ctx !== undefined) { 1243 if (ctx !== undefined) {
...@@ -1357,6 +1357,7 @@ let Context = function( ctx ) { ...@@ -1357,6 +1357,7 @@ let Context = function( ctx ) {
1357 // TODO promisify call to cbFunction 1357 // TODO promisify call to cbFunction
1358 return import(/* webpackIgnore: true */libUrl).then( function(module) { 1358 return import(/* webpackIgnore: true */libUrl).then( function(module) {
1359 // TODO insert here component factories 1359 // TODO insert here component factories
1360 +
1360 for (p in module.default) { 1361 for (p in module.default) {
1361 if (module.default.hasOwnProperty(p)) { 1362 if (module.default.hasOwnProperty(p)) {
1362 Context.currentContext.setFactory(p,module.default[p]); 1363 Context.currentContext.setFactory(p,module.default[p]);
...@@ -1366,7 +1367,7 @@ let Context = function( ctx ) { ...@@ -1366,7 +1367,7 @@ let Context = function( ctx ) {
1366 if (cbFunction !== undefined) { 1367 if (cbFunction !== undefined) {
1367 cbFunction(); 1368 cbFunction();
1368 } 1369 }
1369 - }).catch( function(msg) { console.error("[ARCS] Trouble loading '",libUrl,"' with reason -", msg) }); 1370 + }).catch( function(msg) { console.error("[ARCS] Trouble loading '",libUrl,"' with reason -", {msg}) });
1370 }; 1371 };
1371 1372
1372 /** 1373 /**
...@@ -1531,7 +1532,7 @@ let Context = function( ctx ) { ...@@ -1531,7 +1532,7 @@ let Context = function( ctx ) {
1531 /** pseudo-singleton to current context being used */ 1532 /** pseudo-singleton to current context being used */
1532 Context.currentContext = null; 1533 Context.currentContext = null;
1533 1534
1534 -/* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = ({Context: Context}); 1535 +/* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (Context);
1535 1536
1536 1537
1537 1538
...@@ -1611,7 +1612,7 @@ Invocation.PRE_CONNECTION = 0; ...@@ -1611,7 +1612,7 @@ Invocation.PRE_CONNECTION = 0;
1611 Invocation.POST_CONNECTION = 1; 1612 Invocation.POST_CONNECTION = 1;
1612 Invocation.CLEAN_UP = 2; 1613 Invocation.CLEAN_UP = 2;
1613 1614
1614 -/* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = ({ Invocation: Invocation}); 1615 +/* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (Invocation);
1615 1616
1616 1617
1617 /***/ }), 1618 /***/ }),
...@@ -1682,7 +1683,7 @@ Connection.cast = function (obj, context) { ...@@ -1682,7 +1683,7 @@ Connection.cast = function (obj, context) {
1682 }; 1683 };
1683 1684
1684 1685
1685 -/* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = ({ Connection: Connection}); 1686 +/* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (Connection);
1686 1687
1687 1688
1688 /***/ }), 1689 /***/ }),
...@@ -1970,7 +1971,7 @@ let Sheet = function (ctx /*context*/) { ...@@ -1970,7 +1971,7 @@ let Sheet = function (ctx /*context*/) {
1970 context.setParent(ctx); 1971 context.setParent(ctx);
1971 }; 1972 };
1972 1973
1973 -/* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = ({Sheet: Sheet}); 1974 +/* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (Sheet);
1974 1975
1975 1976
1976 /***/ }), 1977 /***/ }),
...@@ -2203,7 +2204,7 @@ _component_js__WEBPACK_IMPORTED_MODULE_2__.default.create(Application); ...@@ -2203,7 +2204,7 @@ _component_js__WEBPACK_IMPORTED_MODULE_2__.default.create(Application);
2203 Application.slot("setSheet"); 2204 Application.slot("setSheet");
2204 Application.slot("finish"); 2205 Application.slot("finish");
2205 2206
2206 -/* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = ({Application: Application}); 2207 +/* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (Application);
2207 2208
2208 2209
2209 /***/ }) 2210 /***/ })
...@@ -2289,7 +2290,7 @@ __webpack_require__.r(__webpack_exports__); ...@@ -2289,7 +2290,7 @@ __webpack_require__.r(__webpack_exports__);
2289 2290
2290 2291
2291 2292
2292 -/* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = ({ 2293 +let ARCS = {
2293 Component: _component_js__WEBPACK_IMPORTED_MODULE_0__.default, 2294 Component: _component_js__WEBPACK_IMPORTED_MODULE_0__.default,
2294 isInNode : _arcs_js__WEBPACK_IMPORTED_MODULE_2__.default, 2295 isInNode : _arcs_js__WEBPACK_IMPORTED_MODULE_2__.default,
2295 StateMachine: _statemachine_js__WEBPACK_IMPORTED_MODULE_1__.default, 2296 StateMachine: _statemachine_js__WEBPACK_IMPORTED_MODULE_1__.default,
...@@ -2298,9 +2299,11 @@ __webpack_require__.r(__webpack_exports__); ...@@ -2298,9 +2299,11 @@ __webpack_require__.r(__webpack_exports__);
2298 Connection: _connection_js__WEBPACK_IMPORTED_MODULE_5__.default, 2299 Connection: _connection_js__WEBPACK_IMPORTED_MODULE_5__.default,
2299 Sheet: _sheet_js__WEBPACK_IMPORTED_MODULE_6__.default, 2300 Sheet: _sheet_js__WEBPACK_IMPORTED_MODULE_6__.default,
2300 Application: _application_js__WEBPACK_IMPORTED_MODULE_7__.default 2301 Application: _application_js__WEBPACK_IMPORTED_MODULE_7__.default
2301 -}); 2302 +};
2303 +
2304 +/* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (ARCS);
2302 2305
2303 })(); 2306 })();
2304 2307
2305 -/******/ })()
2306 -;
...\ No newline at end of file ...\ No newline at end of file
2308 +var __webpack_exports__default = __webpack_exports__.default;
2309 +export { __webpack_exports__default as default };
......
1 /* ugly hack in order to display data in web page instead of console */ 1 /* ugly hack in order to display data in web page instead of console */
2 import ARCS from '../build/arcs.js'; 2 import ARCS from '../build/arcs.js';
3 3
4 -var Console; 4 +let Console;
5 /** 5 /**
6 * @class Console 6 * @class Console
7 * @classdesc Redirects console messages to a given HTML element in the page. 7 * @classdesc Redirects console messages to a given HTML element in the page.
...@@ -44,3 +44,4 @@ Console = ARCS.Component.create( ...@@ -44,3 +44,4 @@ Console = ARCS.Component.create(
44 44
45 45
46 export default { Console: Console}; 46 export default { Console: Console};
47 +//export default {};
......
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
6 */ 6 */
7 7
8 import ARCS from '../build/arcs.js'; 8 import ARCS from '../build/arcs.js';
9 -
10 /** 9 /**
11 * @class Loop 10 * @class Loop
12 * @classdesc loop component creation using a compact style. 11 * @classdesc loop component creation using a compact style.
......
...@@ -217,4 +217,4 @@ Component.create(Application); ...@@ -217,4 +217,4 @@ Component.create(Application);
217 Application.slot("setSheet"); 217 Application.slot("setSheet");
218 Application.slot("finish"); 218 Application.slot("finish");
219 219
220 -export default {Application: Application}; 220 +export default Application;
......
1 -import ARCS from './arcs.js';
2 -
3 1
4 /** 2 /**
5 * Bootstrap for the ARCS engine in a browser environment. 3 * Bootstrap for the ARCS engine in a browser environment.
...@@ -9,7 +7,7 @@ import ARCS from './arcs.js'; ...@@ -9,7 +7,7 @@ import ARCS from './arcs.js';
9 "use strict"; 7 "use strict";
10 8
11 // basically, here we start by importing the module ARCS 9 // basically, here we start by importing the module ARCS
12 -import ARCS from './arcs.js'; 10 +import ARCS from './exports.js';
13 11
14 12
15 console.log("[ARCS] Bootstrapping..."); 13 console.log("[ARCS] Bootstrapping...");
......
...@@ -189,4 +189,4 @@ var Component = { ...@@ -189,4 +189,4 @@ var Component = {
189 } 189 }
190 }; 190 };
191 191
192 -export default { Component: Component}; 192 +export default Component;
......
...@@ -57,4 +57,4 @@ Connection.cast = function (obj, context) { ...@@ -57,4 +57,4 @@ Connection.cast = function (obj, context) {
57 }; 57 };
58 58
59 59
60 -export default { Connection: Connection}; 60 +export default Connection;
......
...@@ -20,7 +20,7 @@ let Context = function( ctx ) { ...@@ -20,7 +20,7 @@ let Context = function( ctx ) {
20 var instanciateComponents; 20 var instanciateComponents;
21 21
22 22
23 - factories.StateMachine = Statemachine; 23 + factories.StateMachine = StateMachine;
24 24
25 25
26 if (ctx !== undefined) { 26 if (ctx !== undefined) {
...@@ -140,6 +140,7 @@ let Context = function( ctx ) { ...@@ -140,6 +140,7 @@ let Context = function( ctx ) {
140 // TODO promisify call to cbFunction 140 // TODO promisify call to cbFunction
141 return import(/* webpackIgnore: true */libUrl).then( function(module) { 141 return import(/* webpackIgnore: true */libUrl).then( function(module) {
142 // TODO insert here component factories 142 // TODO insert here component factories
143 +
143 for (p in module.default) { 144 for (p in module.default) {
144 if (module.default.hasOwnProperty(p)) { 145 if (module.default.hasOwnProperty(p)) {
145 Context.currentContext.setFactory(p,module.default[p]); 146 Context.currentContext.setFactory(p,module.default[p]);
...@@ -149,7 +150,7 @@ let Context = function( ctx ) { ...@@ -149,7 +150,7 @@ let Context = function( ctx ) {
149 if (cbFunction !== undefined) { 150 if (cbFunction !== undefined) {
150 cbFunction(); 151 cbFunction();
151 } 152 }
152 - }).catch( function(msg) { console.error("[ARCS] Trouble loading '",libUrl,"' with reason -", msg) }); 153 + }).catch( function(msg) { console.error("[ARCS] Trouble loading '",libUrl,"' with reason -", {msg}) });
153 }; 154 };
154 155
155 /** 156 /**
...@@ -314,5 +315,5 @@ let Context = function( ctx ) { ...@@ -314,5 +315,5 @@ let Context = function( ctx ) {
314 /** pseudo-singleton to current context being used */ 315 /** pseudo-singleton to current context being used */
315 Context.currentContext = null; 316 Context.currentContext = null;
316 317
317 -export default {Context: Context}; 318 +export default Context;
318 319
......
...@@ -662,4 +662,4 @@ let EventLogicParser = (function() { ...@@ -662,4 +662,4 @@ let EventLogicParser = (function() {
662 }; 662 };
663 })(); 663 })();
664 664
665 -export default { EventLogicParser: EventLogicParser}; 665 +export default EventLogicParser;
......
...@@ -9,7 +9,7 @@ import Connection from './connection.js'; ...@@ -9,7 +9,7 @@ import Connection from './connection.js';
9 import Sheet from './sheet.js'; 9 import Sheet from './sheet.js';
10 import Application from './application.js'; 10 import Application from './application.js';
11 11
12 -export default { 12 +let ARCS = {
13 Component: Component, 13 Component: Component,
14 isInNode : isInNode, 14 isInNode : isInNode,
15 StateMachine: StateMachine, 15 StateMachine: StateMachine,
...@@ -19,3 +19,5 @@ export default { ...@@ -19,3 +19,5 @@ export default {
19 Sheet: Sheet, 19 Sheet: Sheet,
20 Application: Application 20 Application: Application
21 }; 21 };
22 +
23 +export default ARCS;
......
...@@ -66,4 +66,4 @@ Invocation.PRE_CONNECTION = 0; ...@@ -66,4 +66,4 @@ Invocation.PRE_CONNECTION = 0;
66 Invocation.POST_CONNECTION = 1; 66 Invocation.POST_CONNECTION = 1;
67 Invocation.CLEAN_UP = 2; 67 Invocation.CLEAN_UP = 2;
68 68
69 -export default { Invocation: Invocation}; 69 +export default Invocation;
......
...@@ -272,4 +272,4 @@ let Sheet = function (ctx /*context*/) { ...@@ -272,4 +272,4 @@ let Sheet = function (ctx /*context*/) {
272 context.setParent(ctx); 272 context.setParent(ctx);
273 }; 273 };
274 274
275 -export default {Sheet: Sheet}; 275 +export default Sheet;
......
...@@ -11,7 +11,8 @@ import EventLogicParser from './eventlogicparser.js'; ...@@ -11,7 +11,8 @@ import EventLogicParser from './eventlogicparser.js';
11 * @param obj {object} an object describing a state machine. If obj is empty then the statemachine is empty 11 * @param obj {object} an object describing a state machine. If obj is empty then the statemachine is empty
12 * @class 12 * @class
13 */ 13 */
14 -let Statemachine = new Component.create(function (obj) { 14 +
15 +let StateMachine = Component.create(function (obj) {
15 // dynamic construction: properties are initial state that have properties 16 // dynamic construction: properties are initial state that have properties
16 // that are tokens and value that are the final state 17 // that are tokens and value that are the final state
17 var initial = "", final = "", transitions = {}, currentState = "", self= this; 18 var initial = "", final = "", transitions = {}, currentState = "", self= this;
...@@ -88,7 +89,7 @@ let Statemachine = new Component.create(function (obj) { ...@@ -88,7 +89,7 @@ let Statemachine = new Component.create(function (obj) {
88 var t, tsd, ts, tsc; 89 var t, tsd, ts, tsc;
89 try { 90 try {
90 91
91 - var tsd = ARCS.EventLogicParser.parse(token); 92 + var tsd = EventLogicParser.parse(token);
92 if (typeof tsd === "string") { 93 if (typeof tsd === "string") {
93 addToken(tsd); 94 addToken(tsd);
94 } else { 95 } else {
...@@ -151,7 +152,7 @@ let Statemachine = new Component.create(function (obj) { ...@@ -151,7 +152,7 @@ let Statemachine = new Component.create(function (obj) {
151 * the initial state (by default, it is the departure of the first transition 152 * the initial state (by default, it is the departure of the first transition
152 */ 153 */
153 this.start = function () { 154 this.start = function () {
154 - console.log("statemachine", this, initial,obj); 155 + //console.log("statemachine", this, initial,obj);
155 setSheet(initial); 156 setSheet(initial);
156 }; 157 };
157 158
...@@ -169,4 +170,4 @@ let Statemachine = new Component.create(function (obj) { ...@@ -169,4 +170,4 @@ let Statemachine = new Component.create(function (obj) {
169 ['requestSheet', 'requestTermination'] 170 ['requestSheet', 'requestTermination']
170 ); 171 );
171 172
172 -export default { StateMachine: StateMachine}; 173 +export default StateMachine;
......
...@@ -19,4 +19,4 @@ let TokenEvent = function() { ...@@ -19,4 +19,4 @@ let TokenEvent = function() {
19 }; 19 };
20 }; 20 };
21 21
22 -export default {TokenEvent: TokenEvent}; 22 +export default TokenEvent;
......
...@@ -56,4 +56,4 @@ TransitionNetwork.build = function(tree, tokenEvents) { ...@@ -56,4 +56,4 @@ TransitionNetwork.build = function(tree, tokenEvents) {
56 return res; 56 return res;
57 }; 57 };
58 58
59 -export default {TransitionNetwork: TransitionNetwork}; 59 +export default TransitionNetwork;
......
1 const path = require('path'); 1 const path = require('path');
2 2
3 module.exports = { 3 module.exports = {
4 - entry: './src/exports.js', 4 + experiments : {
5 + outputModule: true
6 + },
7 + entry: {
8 + 'arcs' : {
9 + import : './src/exports.js',
10 + },
11 + 'arcs_browser' : {
12 + import : './src/arcs_browser.js'
13 + //dependOn : ['arcs']
14 + }
15 + },
5 mode: 'none', 16 mode: 'none',
6 output: { 17 output: {
7 - filename: 'arcs.js', 18 + filename: '[name].js',
8 path: path.resolve(__dirname, 'build'), 19 path: path.resolve(__dirname, 'build'),
20 + library: {
21 + type: 'module',
22 + }
9 }, 23 },
10 module: { 24 module: {
11 parser: { 25 parser: {
......