diff --git a/Compiler/package-lock.json b/Compiler/package-lock.json index f3239ef..e4f6465 100644 --- a/Compiler/package-lock.json +++ b/Compiler/package-lock.json @@ -5,14 +5,14 @@ "packages": { "": { "dependencies": { - "@types/node": "^20.14.9", + "@types/node": "^20.14.10", "source-map": "^0.7.4" } }, "node_modules/@types/node": { - "version": "20.14.9", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.9.tgz", - "integrity": "sha512-06OCtnTXtWOZBJlRApleWndH4JsRVs1pDCc8dLSQp+7PpUpX3ePdHyeNSFTeSe7FtKyQkrlPvHwJOW3SLd8Oyg==", + "version": "20.14.10", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.10.tgz", + "integrity": "sha512-MdiXf+nDuMvY0gJKxyfZ7/6UFsETO7mGKF54MVD/ekJS6HdFtpZFBgrh6Pseu64XTb2MLyFPlbW6hj8HYRQNOQ==", "license": "MIT", "dependencies": { "undici-types": "~5.26.4" @@ -34,9 +34,9 @@ }, "dependencies": { "@types/node": { - "version": "20.14.9", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.9.tgz", - "integrity": "sha512-06OCtnTXtWOZBJlRApleWndH4JsRVs1pDCc8dLSQp+7PpUpX3ePdHyeNSFTeSe7FtKyQkrlPvHwJOW3SLd8Oyg==", + "version": "20.14.10", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.10.tgz", + "integrity": "sha512-MdiXf+nDuMvY0gJKxyfZ7/6UFsETO7mGKF54MVD/ekJS6HdFtpZFBgrh6Pseu64XTb2MLyFPlbW6hj8HYRQNOQ==", "requires": { "undici-types": "~5.26.4" } diff --git a/Compiler/package.json b/Compiler/package.json index f452449..fa9a1de 100644 --- a/Compiler/package.json +++ b/Compiler/package.json @@ -1,7 +1,7 @@ { "type": "module", "dependencies": { - "@types/node": "^20.14.9", + "@types/node": "^20.14.10", "source-map": "^0.7.4" } } diff --git a/Examples/Benchmark/web/index.html b/Examples/Benchmark/web/index.html index 0486365..8764e23 100644 --- a/Examples/Benchmark/web/index.html +++ b/Examples/Benchmark/web/index.html @@ -24,19 +24,19 @@ - + Name - + Size - + Time JS - + Time ST - + Factor diff --git a/Examples/Counter/src/CounterApp.st b/Examples/Counter/src/CounterApp.st index d952960..d258438 100644 --- a/Examples/Counter/src/CounterApp.st +++ b/Examples/Counter/src/CounterApp.st @@ -1,5 +1,5 @@ CLASS CounterApp EXTENDS BrowserApp MODULE CounterApp CLASSVARS '' - VARS 'counter counterLabel incrementButton resetButton' + VARS 'counter counterSpan incrementButton resetButton' start counter := Counter new. @@ -12,7 +12,7 @@ start bindElements "Bind HTML elements to vars, set defaults, set event listeners." - counterLabel := Document getElementById: 'counterLabel' class: HtmlLabelElement. + counterSpan := Document getElementById: 'counterSpan' class: HtmlSpanElement. incrementButton := Document getElementById: 'incrementButton' class: HtmlButtonElement. incrementButton onClick: [ self increment ]. @@ -23,7 +23,7 @@ bindElements update "Update counter in HTML page." - counterLabel textContent: counter value toString. + counterSpan textContent: counter value toString. ! increment "Increase the counter and update the view." @@ -40,8 +40,8 @@ reset "Accessing (used by tests)" -counterLabel - ^ counterLabel. +counterSpan + ^ counterSpan. ! incrementButton ^ incrementButton. diff --git a/Examples/Counter/src/Test/TestCounterApp.st b/Examples/Counter/src/Test/TestCounterApp.st index ee75df0..9fdc905 100644 --- a/Examples/Counter/src/Test/TestCounterApp.st +++ b/Examples/Counter/src/Test/TestCounterApp.st @@ -27,6 +27,6 @@ testButton: button result: result then: block "Press argument button and check result in counter label." button click. Timer timeout: 500 then: [ - self assert: [ counterApp counterLabel textContent = result ]. + self assert: [ counterApp counterSpan textContent = result ]. block value ]. ! diff --git a/Examples/Counter/web/App.css b/Examples/Counter/web/App.css index ee9d752..f9b0f55 100644 --- a/Examples/Counter/web/App.css +++ b/Examples/Counter/web/App.css @@ -28,7 +28,7 @@ margin-bottom: 0px; } -#counterLabel { +#counterSpan { font-family: Garamond; font-size: 100px; font-weight: bold; diff --git a/Examples/Counter/web/favicon.ico b/Examples/Counter/web/favicon.ico index 40f36be..aac5b6e 100644 Binary files a/Examples/Counter/web/favicon.ico and b/Examples/Counter/web/favicon.ico differ diff --git a/Examples/Counter/web/index.html b/Examples/Counter/web/index.html index 691441f..feb5629 100644 --- a/Examples/Counter/web/index.html +++ b/Examples/Counter/web/index.html @@ -22,7 +22,7 @@ - + diff --git a/Examples/Shop/Client/src/App/LoginApp.st b/Examples/Shop/Client/src/App/LoginApp.st index 198b0bb..3afb60e 100644 --- a/Examples/Shop/Client/src/App/LoginApp.st +++ b/Examples/Shop/Client/src/App/LoginApp.st @@ -1,5 +1,5 @@ CLASS LoginApp EXTENDS BrowserApp MODULE ShopClient CLASSVARS '' - VARS 'userNameInput passwordInput loginButton loginErrorLabel' + VARS 'userNameInput passwordInput loginButton loginErrorSpan' METHODS @@ -27,7 +27,7 @@ bindElements loginButton := Document getElementById: 'loginButton' class: HtmlButtonElement. loginButton onClick: [ :event | self onLogin ]. - loginErrorLabel := Document getElementById: 'loginErrorLabel' class: HtmlLabelElement. + loginErrorSpan := Document getElementById: 'loginErrorSpan' class: HtmlSpanElement. ! onLogin | userName password loginApi | @@ -50,10 +50,10 @@ onLoginResponse: object success ifTrue: [ self navigateTo: '../Product/Product.html' ] - ifFalse: [ loginErrorLabel textContent: message ]. + ifFalse: [ loginErrorSpan textContent: message ]. ! onLoginError: error - loginErrorLabel textContent: error message. + loginErrorSpan textContent: error message. ! "Accessing (used by tests)" diff --git a/Examples/Shop/Client/web/Login/Login.html b/Examples/Shop/Client/web/Login/Login.html index d2cc432..13d9296 100644 --- a/Examples/Shop/Client/web/Login/Login.html +++ b/Examples/Shop/Client/web/Login/Login.html @@ -55,7 +55,7 @@ - + diff --git a/Examples/Shop/Client/web/NavBar/NavBar.css b/Examples/Shop/Client/web/NavBar/NavBar.css index 261204f..e97ed10 100644 --- a/Examples/Shop/Client/web/NavBar/NavBar.css +++ b/Examples/Shop/Client/web/NavBar/NavBar.css @@ -4,7 +4,7 @@ justify-content: center; } -#navBarLabel { +#navBarSpan { font-weight: bold; } diff --git a/Examples/Shop/Client/web/NavBar/NavBar.html b/Examples/Shop/Client/web/NavBar/NavBar.html index 8e907f5..6c1ec94 100644 --- a/Examples/Shop/Client/web/NavBar/NavBar.html +++ b/Examples/Shop/Client/web/NavBar/NavBar.html @@ -9,7 +9,7 @@ - + Shop Products diff --git a/Examples/Shop/Client/web/Order/Order.html b/Examples/Shop/Client/web/Order/Order.html index 7f9d933..7bb82a0 100644 --- a/Examples/Shop/Client/web/Order/Order.html +++ b/Examples/Shop/Client/web/Order/Order.html @@ -32,13 +32,13 @@ - + Product - + Amount - + Price diff --git a/Examples/Shop/Client/web/Product/Product.html b/Examples/Shop/Client/web/Product/Product.html index df188d4..398a93c 100644 --- a/Examples/Shop/Client/web/Product/Product.html +++ b/Examples/Shop/Client/web/Product/Product.html @@ -31,10 +31,10 @@ - + Name - + Price diff --git a/Examples/Shop/ClientSpa/src/Component/LoginComponent.st b/Examples/Shop/ClientSpa/src/Component/LoginComponent.st index 126eb5d..9d5c1f2 100644 --- a/Examples/Shop/ClientSpa/src/Component/LoginComponent.st +++ b/Examples/Shop/ClientSpa/src/Component/LoginComponent.st @@ -1,5 +1,5 @@ CLASS LoginComponent EXTENDS Component MODULE ShopClient CLASSVARS '' - VARS 'userNameInput passwordInput loginButton loginErrorLabel' + VARS 'userNameInput passwordInput loginButton loginErrorSpan' htmlPath ^ 'Login/Login.html'. @@ -21,7 +21,7 @@ bindElements loginButton := Document getElementById: 'loginButton' class: HtmlButtonElement. loginButton onClick: [ :event | self onLogin ]. - loginErrorLabel := Document getElementById: 'loginErrorLabel' class: HtmlLabelElement. + loginErrorSpan := Document getElementById: 'loginErrorSpan' class: HtmlSpanElement. ! onLogin | userName password loginApi | @@ -44,10 +44,10 @@ onLoginResponse: object success ifTrue: [ self app loadComponent: ProductComponent ] - ifFalse: [ loginErrorLabel textContent: message ]. + ifFalse: [ loginErrorSpan textContent: message ]. ! onLoginError: error - loginErrorLabel textContent: error message. + loginErrorSpan textContent: error message. ! "Accessing (used by tests)" diff --git a/Examples/Shop/ClientSpa/src/Component/NavBarComponent.st b/Examples/Shop/ClientSpa/src/Component/NavBarComponent.st index ffe70b7..b6edcc9 100644 --- a/Examples/Shop/ClientSpa/src/Component/NavBarComponent.st +++ b/Examples/Shop/ClientSpa/src/Component/NavBarComponent.st @@ -1,5 +1,5 @@ CLASS NavBarComponent EXTENDS Component MODULE ShopClient CLASSVARS '' - VARS 'productsLabel ordersLabel' + VARS 'productsSpan ordersSpan' htmlPath ^ 'NavBar/NavBar.html'. @@ -8,9 +8,9 @@ start self bindElements. ! bindElements - productsLabel := Document getElementById: 'navBarProductsLabel' class: HtmlLabelElement. - productsLabel onClick: [ :event | self app loadComponent: ProductComponent ]. + productsSpan := Document getElementById: 'navBarProductsSpan' class: HtmlSpanElement. + productsSpan onClick: [ :event | self app loadComponent: ProductComponent ]. - ordersLabel := Document getElementById: 'navBarOrdersLabel' class: HtmlLabelElement. - ordersLabel onClick: [ :event | self app loadComponent: OrderComponent ]. + ordersSpan := Document getElementById: 'navBarOrdersSpan' class: HtmlSpanElement. + ordersSpan onClick: [ :event | self app loadComponent: OrderComponent ]. ! diff --git a/Examples/Shop/ClientSpa/src/Component/Test/TestProductComponent.st b/Examples/Shop/ClientSpa/src/Component/Test/TestProductComponent.st index bc80628..1cb32fb 100644 --- a/Examples/Shop/ClientSpa/src/Component/Test/TestProductComponent.st +++ b/Examples/Shop/ClientSpa/src/Component/Test/TestProductComponent.st @@ -27,8 +27,8 @@ testProductFields self assert: [ ( cells at: 1 ) textContent = '1.00' ]. ! navigateToOrders - | ordersLabel | + | ordersSpan | - ordersLabel := Document getElementById: 'navBarOrdersLabel' class: HtmlLabelElement. - ordersLabel click. + ordersSpan := Document getElementById: 'navBarOrdersSpan' class: HtmlSpanElement. + ordersSpan click. ! diff --git a/Examples/Shop/ClientSpa/web/Login/Login.html b/Examples/Shop/ClientSpa/web/Login/Login.html index be60d88..1a40160 100644 --- a/Examples/Shop/ClientSpa/web/Login/Login.html +++ b/Examples/Shop/ClientSpa/web/Login/Login.html @@ -41,7 +41,7 @@ - + diff --git a/Examples/Shop/ClientSpa/web/NavBar/NavBar.css b/Examples/Shop/ClientSpa/web/NavBar/NavBar.css index ef10bc3..af38c1f 100644 --- a/Examples/Shop/ClientSpa/web/NavBar/NavBar.css +++ b/Examples/Shop/ClientSpa/web/NavBar/NavBar.css @@ -4,7 +4,7 @@ justify-content: center; } -#navBarLabel { +#navBarSpan { font-weight: bold; } diff --git a/Examples/Shop/ClientSpa/web/NavBar/NavBar.html b/Examples/Shop/ClientSpa/web/NavBar/NavBar.html index 8f6ed64..7cea81f 100644 --- a/Examples/Shop/ClientSpa/web/NavBar/NavBar.html +++ b/Examples/Shop/ClientSpa/web/NavBar/NavBar.html @@ -6,12 +6,12 @@ - + Shop - + Products - + Orders diff --git a/Examples/Shop/ClientSpa/web/Order/Order.css b/Examples/Shop/ClientSpa/web/Order/Order.css index bb2bea2..2761dc1 100644 --- a/Examples/Shop/ClientSpa/web/Order/Order.css +++ b/Examples/Shop/ClientSpa/web/Order/Order.css @@ -1,6 +1,4 @@ -@import "../App.css"; - -#orderTable { +#orderTable { margin-left: auto; margin-right: auto; border: 2px solid grey; diff --git a/Examples/Shop/ClientSpa/web/Order/Order.html b/Examples/Shop/ClientSpa/web/Order/Order.html index 228b571..aef484b 100644 --- a/Examples/Shop/ClientSpa/web/Order/Order.html +++ b/Examples/Shop/ClientSpa/web/Order/Order.html @@ -17,13 +17,13 @@ - + Product - + Amount - + Price diff --git a/Examples/Shop/ClientSpa/web/Product/Product.html b/Examples/Shop/ClientSpa/web/Product/Product.html index 02b9319..cf797aa 100644 --- a/Examples/Shop/ClientSpa/web/Product/Product.html +++ b/Examples/Shop/ClientSpa/web/Product/Product.html @@ -17,10 +17,10 @@ - + Name - + Price diff --git a/Examples/Shop/Server/package-lock.json b/Examples/Shop/Server/package-lock.json index 4cbe67f..17b7f73 100644 --- a/Examples/Shop/Server/package-lock.json +++ b/Examples/Shop/Server/package-lock.json @@ -5,7 +5,7 @@ "packages": { "": { "dependencies": { - "@types/node": "^20.14.9", + "@types/node": "^20.14.10", "express": "^4.19.2", "express-session": "^1.18.0", "http-terminator": "^3.2.0", @@ -21,9 +21,9 @@ "integrity": "sha512-WCfD5Ht3ZesJUsONdhvm84dmzWOiOzOAqOncN0++w0lBw1o8OuDNJF2McvvCef/yBqb/HYRahp1BYtODFQ8bRg==" }, "node_modules/@types/node": { - "version": "20.14.9", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.9.tgz", - "integrity": "sha512-06OCtnTXtWOZBJlRApleWndH4JsRVs1pDCc8dLSQp+7PpUpX3ePdHyeNSFTeSe7FtKyQkrlPvHwJOW3SLd8Oyg==", + "version": "20.14.10", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.10.tgz", + "integrity": "sha512-MdiXf+nDuMvY0gJKxyfZ7/6UFsETO7mGKF54MVD/ekJS6HdFtpZFBgrh6Pseu64XTb2MLyFPlbW6hj8HYRQNOQ==", "license": "MIT", "dependencies": { "undici-types": "~5.26.4" @@ -1347,9 +1347,9 @@ "integrity": "sha512-WCfD5Ht3ZesJUsONdhvm84dmzWOiOzOAqOncN0++w0lBw1o8OuDNJF2McvvCef/yBqb/HYRahp1BYtODFQ8bRg==" }, "@types/node": { - "version": "20.14.9", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.9.tgz", - "integrity": "sha512-06OCtnTXtWOZBJlRApleWndH4JsRVs1pDCc8dLSQp+7PpUpX3ePdHyeNSFTeSe7FtKyQkrlPvHwJOW3SLd8Oyg==", + "version": "20.14.10", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.10.tgz", + "integrity": "sha512-MdiXf+nDuMvY0gJKxyfZ7/6UFsETO7mGKF54MVD/ekJS6HdFtpZFBgrh6Pseu64XTb2MLyFPlbW6hj8HYRQNOQ==", "requires": { "undici-types": "~5.26.4" } diff --git a/Examples/Shop/Server/package.json b/Examples/Shop/Server/package.json index 848ab3f..38d8d97 100644 --- a/Examples/Shop/Server/package.json +++ b/Examples/Shop/Server/package.json @@ -1,7 +1,7 @@ { "type": "module", "dependencies": { - "@types/node": "^20.14.9", + "@types/node": "^20.14.10", "express": "^4.19.2", "express-session": "^1.18.0", "http-terminator": "^3.2.0", diff --git a/Examples/Todo/src/Test/TestTodoApp.st b/Examples/Todo/src/Test/TestTodoApp.st index 5bfe6f6..78b741c 100644 --- a/Examples/Todo/src/Test/TestTodoApp.st +++ b/Examples/Todo/src/Test/TestTodoApp.st @@ -79,7 +79,7 @@ testSortTasksThen: block testLanguageThen: block "Select second language (Spanish) and check of GUI changed to it." - | languageName inputEvent titleLabel | + | languageName inputEvent titleSpan | languageName := ( todoApp languageDataList children at: 1 ) value. todoApp languageInput value: languageName. @@ -87,8 +87,8 @@ testLanguageThen: block todoApp languageInput dispatchEvent: inputEvent. Timer timeout: 1000 then: [ - titleLabel := Document getElementById: 'titleLabel' class: HtmlLabelElement. - self assert: [ titleLabel textContent = 'Hacer' ]. + titleSpan := Document getElementById: 'titleSpan' class: HtmlSpanElement. + self assert: [ titleSpan textContent = 'Hacer' ]. block value ]. ! stop diff --git a/Examples/Todo/web/App.css b/Examples/Todo/web/App.css index 641f2e6..7f19094 100644 --- a/Examples/Todo/web/App.css +++ b/Examples/Todo/web/App.css @@ -63,7 +63,7 @@ body { padding: 4px; } -.newTaskLabel { +.newTaskSpan { color: black; font-weight: bold; } diff --git a/Examples/Todo/web/Language/en-US.json b/Examples/Todo/web/Language/en-US.json index 4240c8f..945da85 100644 --- a/Examples/Todo/web/Language/en-US.json +++ b/Examples/Todo/web/Language/en-US.json @@ -1,13 +1,13 @@ { "todoImage": "Todo logo", - "titleLabel": "Todo", + "titleSpan": "Todo", "languageLabel": "Language", - "newTaskLabel": "New task", + "newTaskSpan": "New task", "newTaskTitleLabel": "Title", "newTaskDueLabel": "Due", "newTaskAddButton": "Add", - "tasksLabel": "Tasks", - "taskTitleLabel": "Title", - "taskDueLabel": "Due", - "taskDoneLabel": "Done" + "tasksSpan": "Tasks", + "taskTitleSpan": "Title", + "taskDueSpan": "Due", + "taskDoneSpan": "Done" } diff --git a/Examples/Todo/web/Language/es.json b/Examples/Todo/web/Language/es.json index 914cf33..7679de1 100644 --- a/Examples/Todo/web/Language/es.json +++ b/Examples/Todo/web/Language/es.json @@ -1,13 +1,13 @@ { "todoImage": "Etiqueta de hacer", - "titleLabel": "Hacer", + "titleSpan": "Hacer", "languageLabel": "Idioma", - "newTaskLabel": "Nueva tarea", + "newTaskSpan": "Nueva tarea", "newTaskTitleLabel": "Título", "newTaskDueLabel": "Pendiente", "newTaskAddButton": "Agregar", - "tasksLabel": "Tareas", - "taskTitleLabel": "Título", - "taskDueLabel": "Pendiente", - "taskDoneLabel": "Hecho" + "tasksSpan": "Tareas", + "taskTitleSpan": "Título", + "taskDueSpan": "Pendiente", + "taskDoneSpan": "Hecho" } diff --git a/Examples/Todo/web/index.html b/Examples/Todo/web/index.html index 14254d3..545a7df 100644 --- a/Examples/Todo/web/index.html +++ b/Examples/Todo/web/index.html @@ -16,14 +16,14 @@
- - +   + Todo
- +