Merge branch 'main' of https://github.com/Small-JS/SmallJS

Small-JS · Jul 22, 2024 · e7dbed7 · e7dbed7
2 parents 549bc2e + 3465a99
commit e7dbed7
Show file tree

Hide file tree

Showing 34 changed files with 101 additions and 103 deletions.
diff --git a/Compiler/package-lock.json b/Compiler/package-lock.json
diff --git 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
@@ -24,19 +24,19 @@
 					<thead>
 						<tr class="tableHeader">
 							<th scope="col">
-								<label>Name</label>
+								Name
 							</th>
 							<th scope="col">
-								<label>Size</label>
+								Size
 							</th>
 							<th scope="col">
-								<label>Time JS</label>
+								Time JS
 							</th>
 							<th scope="col">
-								<label>Time ST</label>
+								Time ST
 							</th>
 							<th scope="col">
-								<label>Factor</label>
+								Factor
 							</th>
 						</tr>
 					</thead>

diff --git 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
@@ -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
@@ -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
diff --git a/Examples/Counter/web/index.html b/Examples/Counter/web/index.html
@@ -22,7 +22,7 @@
 		</tr>
 		<tr>
 			<td>
-				<label id="counterLabel"></label>
+				<span id="counterSpan"></span>
 			</td>
 		</tr>
 		<tr>

diff --git 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
@@ -55,7 +55,7 @@
 		</tr>
 		<tr>
 			<td>
-				<label id="loginErrorLabel"></label>
+				<span id="loginErrorSpan"></soan>
 			</td>
 		</tr>
 	</table>

diff --git 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
@@ -9,7 +9,7 @@
 				<img id="shopLogo" src="../ShopLogo.png" alt="Shop logo" width="32" height="32"/>
 			</td>
 			<td>
-				<label id="navBarLabel">Shop</label>
+				<span id="navBarSpan">Shop</span>
 			</td>
 			<td>
 				<a id="productsLink" href="../Product/Product.html">Products</a>

diff --git a/Examples/Shop/Client/web/Order/Order.html b/Examples/Shop/Client/web/Order/Order.html
@@ -32,13 +32,13 @@
 					<thead>
 						<tr>
 							<th scope="col">
-								<label id="productLabel" class="orderTableHeader">Product</label>
+								<span id="productSpan" class="orderTableHeader">Product</span>
 							</th>
 							<th scope="col">
-								<label id="amountLabel" class="orderTableHeader">Amount</label>
+								<span id="amountSpan" class="orderTableHeader">Amount</span>
 							</th>
 							<th scope="col">
-								<label id="priceLabel" class="orderTableHeader">Price</label>
+								<span id="priceSpan" class="orderTableHeader">Price</span>
 							</th>
 						</tr>
 					</thead>

diff --git a/Examples/Shop/Client/web/Product/Product.html b/Examples/Shop/Client/web/Product/Product.html
@@ -31,10 +31,10 @@
 					<thead>
 						<tr>
 							<th scope="col">
-								<label id="productNameLabel" class="productTableHeader">Name</label>
+								<span id="productNameSpan" class="productTableHeader">Name</span>
 							</th>
 							<th scope="col">
-								<label id="productNameLabel" class="productTableHeader">Price</label>
+								<span id="productNameSpan" class="productTableHeader">Price</span>
 							</th>
 						</tr>
 					</thead>

diff --git 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
@@ -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
@@ -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
@@ -41,7 +41,7 @@
 	</tr>
 	<tr>
 		<td>
-			<label id="loginErrorLabel"></label>
+			<span id="loginErrorSpan"></span>
 		</td>
 	</tr>
 </table>
diff --git 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
@@ -6,12 +6,12 @@
 			<img id="shopLogo" src="../ShopLogo.png" alt="Shop logo" width="32" height="32"/>
 		</td>
 		<td>
-			<label id="navBarLabel">Shop</label>
+			<span id="navBarSpan">Shop</span>
 		</td>
 		<td>
-			<label id="navBarProductsLabel" class="navBarMenuItem">Products</label>
+			<span id="navBarProductsSpan" class="navBarMenuItem">Products</span>
 		<td>
-			<label id="navBarOrdersLabel" class="navBarMenuItem">Orders</label>
+			<span id="navBarOrdersSpan" class="navBarMenuItem">Orders</span>
 		</td>
 	</tr>
 </table>
diff --git 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
@@ -17,13 +17,13 @@
 				<thead>
 					<tr>
 						<th scope="col">
-							<label id="productLabel" class="orderTableHeader">Product</label>
+							<span id="productSpan" class="orderTableHeader">Product</span>
 						</th>
 						<th scope="col">
-							<label id="amountLabel" class="orderTableHeader">Amount</label>
+							<span id="amountSpan" class="orderTableHeader">Amount</span>
 						</th>
 						<th scope="col">
-							<label id="priceLabel" class="orderTableHeader">Price</label>
+							<span id="priceSpan" class="orderTableHeader">Price</span>
 						</th>
 					</tr>
 				</thead>

diff --git a/Examples/Shop/ClientSpa/web/Product/Product.html b/Examples/Shop/ClientSpa/web/Product/Product.html
@@ -17,10 +17,10 @@
 				<thead>
 					<tr>
 						<th scope="col">
-							<label id="productNameLabel" class="productTableHeader">Name</label>
+							<span id="productNameSpan" class="productTableHeader">Name</span>
 						</th>
 						<th scope="col">
-							<label id="productNameLabel" class="productTableHeader">Price</label>
+							<span id="productNameSpan" class="productTableHeader">Price</span>
 						</th>
 					</tr>
 				</thead>

diff --git a/Examples/Shop/Server/package-lock.json b/Examples/Shop/Server/package-lock.json
diff --git 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",
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,7 +22,7 @@ @@
     		</tr>
     		<tr>
     			<td>
-    				<label id="counterLabel"></label>
+    				<span id="counterSpan"></span>
     			</td>
     		</tr>
     		<tr>
@@ Expand Down @@